Skip to content

[SPARK-30025][Core] Continuous shuffle block fetching should be disabled by default when the old fetch protocol is used #26663

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
xuanyuanking wants to merge 3 commits into from
Closed

[SPARK-30025][Core] Continuous shuffle block fetching should be disabled by default when the old fetch protocol is used #26663

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
bdb172c
Continuous shuffle block fetching should be disabled by default when …
xuanyuanking Nov 25, 2019
4e14191
Add safeguard in server side
xuanyuanking Nov 26, 2019
9c53b4a
delete duplicate check logic
xuanyuanking Nov 29, 2019
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
8 changes: 6 additions & 2 deletions core/src/main/scala/org/apache/spark/network/netty/NettyBlockRpcServer.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,8 +56,12 @@ class NettyBlockRpcServer(
message match {
case openBlocks: OpenBlocks =>
val blocksNum = openBlocks.blockIds.length
val blocks = for (i <- (0 until blocksNum).view)
yield blockManager.getLocalBlockData(BlockId.apply(openBlocks.blockIds(i)))
val blocks = (0 until blocksNum).map { i =>
val blockId = BlockId.apply(openBlocks.blockIds(i))
assert(!blockId.isInstanceOf[ShuffleBlockBatchId],
"Continuous shuffle block fetching only works for new fetch protocol.")
blockManager.getLocalBlockData(blockId)
}
val streamId = streamManager.registerStream(appId, blocks.iterator.asJava,
client.getChannel)
logTrace(s"Registered streamId $streamId with $blocksNum buffers")
Expand Down
6 changes: 4 additions & 2 deletions core/src/main/scala/org/apache/spark/shuffle/BlockStoreShuffleReader.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,14 +50,16 @@ private[spark] class BlockStoreShuffleReader[K, C](
} else {
true
}
val useOldFetchProtocol = conf.get(config.SHUFFLE_USE_OLD_FETCH_PROTOCOL)

val doBatchFetch = shouldBatchFetch && serializerRelocatable &&
(!compressed || codecConcatenation)
(!compressed || codecConcatenation) && !useOldFetchProtocol
if (shouldBatchFetch && !doBatchFetch) {
logDebug("The feature tag of continuous shuffle block fetching is set to true, but " +
"we can not enable the feature because other conditions are not satisfied. " +
s"Shuffle compress: $compressed, serializer relocatable: $serializerRelocatable, " +
s"codec concatenation: $codecConcatenation.")
s"codec concatenation: $codecConcatenation, use old shuffle fetch protocol: " +
s"$useOldFetchProtocol.")
}
doBatchFetch
}
Expand Down
3 changes: 2 additions & 1 deletion sql/catalyst/src/main/scala/org/apache/spark/sql/internal/SQLConf.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -367,7 +367,8 @@ object SQLConf {
"reduce IO and improve performance. Note, multiple continuous blocks exist in single " +
s"fetch request only happen when '${ADAPTIVE_EXECUTION_ENABLED.key}' and " +
s"'${REDUCE_POST_SHUFFLE_PARTITIONS_ENABLED.key}' is enabled, this feature also depends " +
"on a relocatable serializer and the concatenation support codec in use.")
"on a relocatable serializer, the concatenation support codec in use and the new version" +
"shuffle fetch protocol.")
.booleanConf
.createWithDefault(true)

Expand Down