File tree Expand file tree Collapse file tree 2 files changed +6
-7
lines changed
main/scala/org/apache/spark
test/scala/org/apache/spark/scheduler Expand file tree Collapse file tree 2 files changed +6
-7
lines changed Original file line number Diff line number Diff line change @@ -131,12 +131,7 @@ class SparkHadoopWriter(@transient jobConf: JobConf)
131131 // attempts, which should only occur if speculation is enabled
132132 val speculationEnabled = sparkConf.getBoolean(" spark.speculation" , false )
133133 // This (undocumented) setting is an escape-hatch in case the commit code introduces bugs
134- // sparkConf.getBoolean("spark.hadoop.outputCommitCoordination.enabled", speculationEnabled)
135-
136- // TODO: revert this before merging the PR; this is enabled so this code path is exercised
137- // by more tests (even though it might not be _necessary_, it should be _safe_ to do the
138- // extra coordination)
139- true
134+ sparkConf.getBoolean(" spark.hadoop.outputCommitCoordination.enabled" , speculationEnabled)
140135 }
141136 if (shouldCoordinateWithDriver) {
142137 val outputCommitCoordinator = SparkEnv .get.outputCommitCoordinator
Original file line number Diff line number Diff line change @@ -72,7 +72,11 @@ class OutputCommitCoordinatorSuite extends FunSuite with BeforeAndAfter {
7272
7373 before {
7474 tempDir = Utils .createTempDir()
75- sc = new SparkContext (" local[4]" , classOf [OutputCommitCoordinatorSuite ].getSimpleName) {
75+ val conf = new SparkConf ()
76+ .setMaster(" local[4]" )
77+ .setAppName(classOf [OutputCommitCoordinatorSuite ].getSimpleName)
78+ .set(" spark.speculation" , " true" )
79+ sc = new SparkContext (conf) {
7680 override private [spark] def createSparkEnv (
7781 conf : SparkConf ,
7882 isLocal : Boolean ,
You can’t perform that action at this time.
0 commit comments