Skip to content

[SPARK-33933][SQL] Materialize BroadcastQueryStage first to avoid broadcast timeout in AQE #30998

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
zhongyu09 wants to merge 4 commits into from
Closed

[SPARK-33933][SQL] Materialize BroadcastQueryStage first to avoid broadcast timeout in AQE #30998

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
25be218
SPARK-33933: materialize BroadcastQueryState first to avoid broadcast…
Jan 3, 2021
c49065c
update comment
Jan 4, 2021
83e3e4e
reduce UT time within 5 sec
Jan 5, 2021
7cbeb14
move UT from BroadcastJoinSuite to AdaptiveQueryExecSuite
Jan 6, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 10 additions & 1 deletion sql/core/src/main/scala/org/apache/spark/sql/execution/adaptive/AdaptiveSparkPlanExec.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -189,8 +189,17 @@ case class AdaptiveSparkPlanExec(
stagesToReplace = result.newStages ++ stagesToReplace
executionId.foreach(onUpdatePlan(_, result.newStages.map(_.plan)))

// SPARK-33933: we should submit tasks of broadcast stages first, to avoid waiting
// for tasks to be scheduled and leading to broadcast timeout.
val reorderedNewStages = result.newStages
Comment thread
zhongyu09 marked this conversation as resolved.
.sortWith {
case (_: BroadcastQueryStageExec, _: BroadcastQueryStageExec) => false
case (_: BroadcastQueryStageExec, _) => true
case _ => false
}

// Start materialization of all new stages and fail fast if any stages failed eagerly
result.newStages.foreach { stage =>
reorderedNewStages.foreach { stage =>
try {
stage.materialize().onComplete { res =>
if (res.isSuccess) {
Expand Down
23 changes: 23 additions & 0 deletions sql/core/src/test/scala/org/apache/spark/sql/execution/joins/BroadcastJoinSuite.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -425,6 +425,29 @@ abstract class BroadcastJoinSuiteBase extends QueryTest with SQLTestUtils
}
}

test("SPARK-33933: AQE broadcast should not timeout with slow map tasks") {
Comment thread
zhongyu09 marked this conversation as resolved.
Outdated
Comment thread
zhongyu09 marked this conversation as resolved.
Outdated
val broadcastTimeoutInSec = 5
val df = spark.sparkContext.parallelize(Range(0, 1000), 1000)
.flatMap(x => {
Thread.sleep(20)
for (i <- Range(0, 100)) yield (x % 26, x % 10)
}).toDF("index", "pv")
val dim = Range(0, 26).map(x => (x, ('a' + x).toChar.toString))
.toDF("index", "name")
val testDf = df.groupBy("index")
.agg(sum($"pv").alias("pv"))
.join(dim, Seq("index"))
withSQLConf(SQLConf.BROADCAST_TIMEOUT.key -> broadcastTimeoutInSec.toString,
SQLConf.ADAPTIVE_EXECUTION_ENABLED.key -> "true") {
val startTime = System.currentTimeMillis()
val result = testDf.collect()
val queryTime = System.currentTimeMillis() - startTime
assert(result.length == 26)
// make sure the execution time is large enough
assert(queryTime > (broadcastTimeoutInSec + 1) * 1000)
}
}

test("broadcast join where streamed side's output partitioning is HashPartitioning") {
withTable("t1", "t3") {
withSQLConf(SQLConf.AUTO_BROADCASTJOIN_THRESHOLD.key -> "500") {
Expand Down