Repository: spark Updated Branches: refs/heads/branch-2.0 0914296cb -> e28d21d3f
[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 <[email protected]> Closes #12829 from abhi951990/master. (cherry picked from commit 1a5c6fcef131c60db4bc8852ca96445b9cb3bfac) Signed-off-by: Davies Liu <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/spark/repo Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/e28d21d3 Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/e28d21d3 Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/e28d21d3 Branch: refs/heads/branch-2.0 Commit: e28d21d3f5c71598bc45d920db706772c7deb19e Parents: 0914296 Author: Abhinav Gupta <[email protected]> Authored: Wed May 4 22:22:01 2016 -0700 Committer: Davies Liu <[email protected]> Committed: Wed May 4 22:26:11 2016 -0700 ---------------------------------------------------------------------- .../org/apache/spark/memory/TaskMemoryManager.java | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/spark/blob/e28d21d3/core/src/main/java/org/apache/spark/memory/TaskMemoryManager.java ---------------------------------------------------------------------- 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 2796114..89521c1 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); --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
