Skip to content

Commit 709ecf2

Browse files
committed
Fix TaskMemoryManagerSuite.
1 parent 542dd56 commit 709ecf2

File tree

2 files changed

+4
-1
lines changed

2 files changed

+4
-1
lines changed

core/src/main/java/org/apache/spark/memory/TaskMemoryManager.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -368,6 +368,7 @@ public long cleanUpAllAllocatedMemory() {
368368
}
369369
consumers.clear();
370370
}
371+
371372
return memoryManager.releaseAllExecutionMemoryForTask(taskAttemptId);
372373
}
373374

core/src/test/scala/org/apache/spark/memory/TestMemoryManager.scala

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,9 @@ class TestMemoryManager(conf: SparkConf)
5858
override private[memory] def releaseExecutionMemory(
5959
numBytes: Long,
6060
taskAttemptId: Long,
61-
memoryMode: MemoryMode): Unit = {}
61+
memoryMode: MemoryMode): Unit = {
62+
available += numBytes
63+
}
6264
override def maxStorageMemory: Long = Long.MaxValue
6365

6466
private var oomOnce = false

0 commit comments

Comments
 (0)