diff options
| author | Andrew Or <andrew@databricks.com> | 2014-11-17 18:10:49 -0800 |
|---|---|---|
| committer | Andrew Or <andrew@databricks.com> | 2014-11-17 18:10:49 -0800 |
| commit | aa9ebdaa28bebccc8f65a323d7c6fc34cf68ef73 (patch) | |
| tree | f13b59cc4735763f809af667dbcb1f31b06084b8 | |
| parent | e4f5695ec4240a57e38565906851b03f98898175 (diff) | |
| download | spark-aa9ebdaa28bebccc8f65a323d7c6fc34cf68ef73.tar.gz spark-aa9ebdaa28bebccc8f65a323d7c6fc34cf68ef73.tar.bz2 spark-aa9ebdaa28bebccc8f65a323d7c6fc34cf68ef73.zip | |
[SPARK-4467] Partial fix for fetch failure in sort-based shuffle (1.1)
This is the 1.1 version of #3302. There has been some refactoring in master so we can't cherry-pick that PR.
Author: Andrew Or <andrew@databricks.com>
Closes #3330 from andrewor14/sort-fetch-fail and squashes the following commits:
486fc49 [Andrew Or] Reset `elementsRead`
| -rw-r--r-- | core/src/main/scala/org/apache/spark/util/collection/ExternalSorter.scala | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/core/src/main/scala/org/apache/spark/util/collection/ExternalSorter.scala b/core/src/main/scala/org/apache/spark/util/collection/ExternalSorter.scala index 3136306a3a..97ddd96c98 100644 --- a/core/src/main/scala/org/apache/spark/util/collection/ExternalSorter.scala +++ b/core/src/main/scala/org/apache/spark/util/collection/ExternalSorter.scala @@ -288,6 +288,7 @@ private[spark] class ExternalSorter[K, V, C]( myMemoryThreshold = 0 _memoryBytesSpilled += memorySize + elementsRead = 0 } /** |