diff options
author | Abhinav Gupta <abhi.951990@gmail.com> | 2016-05-04 22:22:01 -0700 |
---|---|---|
committer | Davies Liu <davies.liu@gmail.com> | 2016-05-04 22:22:01 -0700 |
commit | 1a5c6fcef131c60db4bc8852ca96445b9cb3bfac (patch) | |
tree | ceae412d3a28b17b3c76c96fdf39e8ac9a52aacf /core | |
parent | 1a9b341581478f39421c7313e5e3981e8ab46abb (diff) | |
download | spark-1a5c6fcef131c60db4bc8852ca96445b9cb3bfac.tar.gz spark-1a5c6fcef131c60db4bc8852ca96445b9cb3bfac.tar.bz2 spark-1a5c6fcef131c60db4bc8852ca96445b9cb3bfac.zip |
[SPARK-15045] [CORE] Remove dead code in TaskMemoryManager.cleanUpAllAllocatedMemory for pageTable
## What changes were proposed in this pull request?
Removed the DeadCode as suggested.
Author: Abhinav Gupta <abhi.951990@gmail.com>
Closes #12829 from abhi951990/master.
Diffstat (limited to 'core')
-rw-r--r-- | core/src/main/java/org/apache/spark/memory/TaskMemoryManager.java | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/core/src/main/java/org/apache/spark/memory/TaskMemoryManager.java b/core/src/main/java/org/apache/spark/memory/TaskMemoryManager.java index 2796114fc5..89521c1d6c 100644 --- a/core/src/main/java/org/apache/spark/memory/TaskMemoryManager.java +++ b/core/src/main/java/org/apache/spark/memory/TaskMemoryManager.java @@ -379,7 +379,6 @@ public class TaskMemoryManager { */ public long cleanUpAllAllocatedMemory() { synchronized (this) { - Arrays.fill(pageTable, null); for (MemoryConsumer c: consumers) { if (c != null && c.getUsed() > 0) { // In case of failed task, it's normal to see leaked memory @@ -387,14 +386,16 @@ public class TaskMemoryManager { } } consumers.clear(); - } - for (MemoryBlock page : pageTable) { - if (page != null) { - memoryManager.tungstenMemoryAllocator().free(page); + for (MemoryBlock page : pageTable) { + if (page != null) { + logger.warn("leak a page: " + page + " in task " + taskAttemptId); + memoryManager.tungstenMemoryAllocator().free(page); + } } + Arrays.fill(pageTable, null); } - Arrays.fill(pageTable, null); + // release the memory that is not used by any consumer. memoryManager.releaseExecutionMemory(acquiredButNotUsed, taskAttemptId, tungstenMemoryMode); |