mridulm commented on a change in pull request #30164:
URL: https://github.com/apache/spark/pull/30164#discussion_r521626452
##########
File path:
core/src/main/scala/org/apache/spark/storage/BlockManagerMasterEndpoint.scala
##########
@@ -684,22 +684,25 @@ class BlockManagerMasterEndpoint(
private def getShufflePushMergerLocations(
numMergersNeeded: Int,
hostsToFilter: Set[String]): Seq[BlockManagerId] = {
- val activeBlockManagers = blockManagerIdByExecutor.groupBy(_._2.host)
+ val blockManagersWithExecutors =
blockManagerIdByExecutor.groupBy(_._2.host)
.mapValues(_.head).values.map(_._2).toSet
- val filteredActiveBlockManagers = activeBlockManagers
+ val filteredBlockManagersWithExecutors = blockManagersWithExecutors
.filterNot(x => hostsToFilter.contains(x.host))
- val filteredActiveMergers = filteredActiveBlockManagers.map(
+ val filteredMergersWithExecutors = filteredBlockManagersWithExecutors.map(
x => BlockManagerId(x.executorId, x.host,
StorageUtils.externalShuffleServicePort(conf)))
// Enough mergers are available as part of active executors list
- if (filteredActiveMergers.size >= numMergersNeeded) {
- filteredActiveMergers.toSeq
+ if (filteredMergersWithExecutors.size >= numMergersNeeded) {
+ filteredMergersWithExecutors.toSeq
} else {
// Delta mergers added from inactive mergers list to the active mergers
list
- val filteredDeadMergers = shuffleMergerLocations.values
- .filterNot(mergerHost => filteredActiveMergers.exists(x => x.host ==
mergerHost.host))
- filteredActiveMergers.toSeq ++
- filteredDeadMergers.toSeq.take(numMergersNeeded -
filteredActiveMergers.size)
+ val filteredMergersWithExecutorsHosts =
filteredMergersWithExecutors.map(_.host)
Review comment:
Yeah, I missed that - hence my second followup comment :-)
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
[email protected]
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
