Rebased against apache master

otterc · otterc · commit 69fcc23cdcde · 2021-06-28T15:40:27.000-07:00
diff --git a/core/src/main/scala/org/apache/spark/storage/ShuffleBlockFetcherIterator.scala b/core/src/main/scala/org/apache/spark/storage/ShuffleBlockFetcherIterator.scala
@@ -387,7 +387,6 @@ final class ShuffleBlockFetcherIterator(
           pushMergedLocalBlocks ++= blockInfos.map(_._1)
           pushMergedLocalBlockBytes += blockInfos.map(_._3).sum
         } else {
-          remoteBlockBytes += blockInfos.map(_._2).sum
           collectFetchRequests(address, blockInfos, collectedRemoteRequests)
         }
       } else if (mutable.HashSet(blockManager.blockManagerId.executorId, fallback)

Original file line number	Diff line number	Diff line change
`@@ -387,7 +387,6 @@ final class ShuffleBlockFetcherIterator(`
`387`	`387`	`pushMergedLocalBlocks ++= blockInfos.map(_._1)`
`388`	`388`	`pushMergedLocalBlockBytes += blockInfos.map(_._3).sum`
`389`	`389`	`} else {`
`390`		`- remoteBlockBytes += blockInfos.map(_._2).sum`
`391`	`390`	`collectFetchRequests(address, blockInfos, collectedRemoteRequests)`
`392`	`391`	`}`
`393`	`392`	`} else if (mutable.HashSet(blockManager.blockManagerId.executorId, fallback)`