This is an automated email from the ASF dual-hosted git repository.
yao pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/spark.git
The following commit(s) were added to refs/heads/master by this push:
new ea8e9412b1ce Revert "[SPARK-54830][CORE] Enable checksum based
indeterminate shuffle retry by default"
ea8e9412b1ce is described below
commit ea8e9412b1ceb24a0fce6300baccd8ff307a00ef
Author: Kent Yao <[email protected]>
AuthorDate: Tue Dec 30 13:24:29 2025 +0800
Revert "[SPARK-54830][CORE] Enable checksum based indeterminate shuffle
retry by default"
This reverts commit 2afc713698bc480c5fa1a8aa09e4812787af4f41.
---
project/SparkBuild.scala | 3 ---
.../src/main/scala/org/apache/spark/sql/internal/SQLConf.scala | 4 ++--
2 files changed, 2 insertions(+), 5 deletions(-)
diff --git a/project/SparkBuild.scala b/project/SparkBuild.scala
index 83b5ee84478a..924b4df98a56 100644
--- a/project/SparkBuild.scala
+++ b/project/SparkBuild.scala
@@ -1322,9 +1322,6 @@ object SqlApi {
object SQL {
import BuildCommons.protoVersion
lazy val settings = Seq(
- // SPARK-54830: avoid AdaptiveQueryExecSuite OOM, since computing order
independent shuffle checksum needs more
- // memory for test case introduced by SPARK-48037 which set shuffle
partition to 16777216
- (Test / javaOptions) += "-Xmx6g",
// Setting version for the protobuf compiler. This has to be propagated to
every sub-project
// even if the project is not using it.
PB.protocVersion := BuildCommons.protoVersion,
diff --git
a/sql/catalyst/src/main/scala/org/apache/spark/sql/internal/SQLConf.scala
b/sql/catalyst/src/main/scala/org/apache/spark/sql/internal/SQLConf.scala
index a8178ce8ce2b..95f5a3a4fabf 100644
--- a/sql/catalyst/src/main/scala/org/apache/spark/sql/internal/SQLConf.scala
+++ b/sql/catalyst/src/main/scala/org/apache/spark/sql/internal/SQLConf.scala
@@ -907,7 +907,7 @@ object SQLConf {
"retry all tasks of the consumer stages to avoid correctness issues.")
.version("4.1.0")
.booleanConf
- .createWithDefault(true)
+ .createWithDefault(false)
private[spark] val SHUFFLE_CHECKSUM_MISMATCH_FULL_RETRY_ENABLED =
buildConf("spark.sql.shuffle.orderIndependentChecksum.enableFullRetryOnMismatch")
@@ -915,7 +915,7 @@ object SQLConf {
"with its producer stages.")
.version("4.1.0")
.booleanConf
- .createWithDefault(true)
+ .createWithDefault(false)
val SHUFFLE_TARGET_POSTSHUFFLE_INPUT_SIZE =
buildConf("spark.sql.adaptive.shuffle.targetPostShuffleInputSize")
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
