Skip to content

Commit ea8e941

Browse files
committed
Revert "[SPARK-54830][CORE] Enable checksum based indeterminate shuffle retry by default"
This reverts commit 2afc713.
1 parent 8095c39 commit ea8e941

File tree

2 files changed

+2
-5
lines changed

2 files changed

+2
-5
lines changed

project/SparkBuild.scala

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1322,9 +1322,6 @@ object SqlApi {
13221322
object SQL {
13231323
import BuildCommons.protoVersion
13241324
lazy val settings = Seq(
1325-
// SPARK-54830: avoid AdaptiveQueryExecSuite OOM, since computing order independent shuffle checksum needs more
1326-
// memory for test case introduced by SPARK-48037 which set shuffle partition to 16777216
1327-
(Test / javaOptions) += "-Xmx6g",
13281325
// Setting version for the protobuf compiler. This has to be propagated to every sub-project
13291326
// even if the project is not using it.
13301327
PB.protocVersion := BuildCommons.protoVersion,

sql/catalyst/src/main/scala/org/apache/spark/sql/internal/SQLConf.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -907,15 +907,15 @@ object SQLConf {
907907
"retry all tasks of the consumer stages to avoid correctness issues.")
908908
.version("4.1.0")
909909
.booleanConf
910-
.createWithDefault(true)
910+
.createWithDefault(false)
911911

912912
private[spark] val SHUFFLE_CHECKSUM_MISMATCH_FULL_RETRY_ENABLED =
913913
buildConf("spark.sql.shuffle.orderIndependentChecksum.enableFullRetryOnMismatch")
914914
.doc("Whether to retry all tasks of a consumer stage when we detect checksum mismatches " +
915915
"with its producer stages.")
916916
.version("4.1.0")
917917
.booleanConf
918-
.createWithDefault(true)
918+
.createWithDefault(false)
919919

920920
val SHUFFLE_TARGET_POSTSHUFFLE_INPUT_SIZE =
921921
buildConf("spark.sql.adaptive.shuffle.targetPostShuffleInputSize")

0 commit comments

Comments
 (0)