diff options
| author | Liang-Chi Hsieh <simonh@tw.ibm.com> | 2016-09-27 16:00:39 -0700 |
|---|---|---|
| committer | Josh Rosen <joshrosen@databricks.com> | 2016-09-27 16:00:39 -0700 |
| commit | e7bce9e1876de6ee975ccc89351db58119674aef (patch) | |
| tree | 98c4d2d1d5103871f3867cc6a9aa76cbc545a11d | |
| parent | 2f84a686604b298537bfd4d087b41594d2aa7ec6 (diff) | |
| download | spark-e7bce9e1876de6ee975ccc89351db58119674aef.tar.gz spark-e7bce9e1876de6ee975ccc89351db58119674aef.tar.bz2 spark-e7bce9e1876de6ee975ccc89351db58119674aef.zip | |
[SPARK-17056][CORE] Fix a wrong assert regarding unroll memory in MemoryStore
## What changes were proposed in this pull request?
There is an assert in MemoryStore's putIteratorAsValues method which is used to check if unroll memory is not released too much. This assert looks wrong.
## How was this patch tested?
Jenkins tests.
Author: Liang-Chi Hsieh <simonh@tw.ibm.com>
Closes #14642 from viirya/fix-unroll-memory.
| -rw-r--r-- | core/src/main/scala/org/apache/spark/storage/memory/MemoryStore.scala | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/src/main/scala/org/apache/spark/storage/memory/MemoryStore.scala b/core/src/main/scala/org/apache/spark/storage/memory/MemoryStore.scala index 205d469f48..095d32407f 100644 --- a/core/src/main/scala/org/apache/spark/storage/memory/MemoryStore.scala +++ b/core/src/main/scala/org/apache/spark/storage/memory/MemoryStore.scala @@ -273,7 +273,7 @@ private[spark] class MemoryStore( blockId, Utils.bytesToString(size), Utils.bytesToString(maxMemory - blocksMemoryUsed))) Right(size) } else { - assert(currentUnrollMemoryForThisTask >= currentUnrollMemoryForThisTask, + assert(currentUnrollMemoryForThisTask >= unrollMemoryUsedByThisBlock, "released too much unroll memory") Left(new PartiallyUnrolledIterator( this, |