joshrosen-stripe commented on a change in pull request #25985:
[SPARK-29310][CORE][TESTS] TestMemoryManager should implement
getExecutionMemoryUsageForTask()
URL: https://github.com/apache/spark/pull/25985#discussion_r335046406
##########
File path: core/src/test/scala/org/apache/spark/memory/TestMemoryManager.scala
##########
@@ -17,60 +17,110 @@
package org.apache.spark.memory
+import javax.annotation.concurrent.GuardedBy
+
+import scala.collection.mutable
+
import org.apache.spark.SparkConf
import org.apache.spark.storage.BlockId
class TestMemoryManager(conf: SparkConf)
extends MemoryManager(conf, numCores = 1, Long.MaxValue, Long.MaxValue) {
+ @GuardedBy("this")
+ private var consequentOOM = 0
+ @GuardedBy("this")
+ private var available = Long.MaxValue
+ @GuardedBy("this")
+ private val memoryForTask = mutable.HashMap[Long,
Long]().withDefaultValue(0L)
+
override private[memory] def acquireExecutionMemory(
numBytes: Long,
taskAttemptId: Long,
- memoryMode: MemoryMode): Long = {
- if (consequentOOM > 0) {
- consequentOOM -= 1
- 0
- } else if (available >= numBytes) {
- available -= numBytes
- numBytes
- } else {
- val grant = available
- available = 0
- grant
+ memoryMode: MemoryMode): Long = synchronized {
+ require(numBytes >= 0)
+ val acquired = {
+ if (consequentOOM > 0) {
+ consequentOOM -= 1
+ 0
+ } else if (available >= numBytes) {
+ available -= numBytes
+ numBytes
+ } else {
+ val grant = available
+ available = 0
+ grant
+ }
}
+ memoryForTask(taskAttemptId) = memoryForTask.getOrElse(taskAttemptId, 0L)
+ acquired
+ acquired
+ }
+
+ override private[memory] def releaseExecutionMemory(
+ numBytes: Long,
+ taskAttemptId: Long,
+ memoryMode: MemoryMode): Unit = synchronized {
+ require(numBytes >= 0)
+ available += numBytes
+ val existingMemoryUsage = memoryForTask.getOrElse(taskAttemptId, 0L)
+ val newMemoryUsage = existingMemoryUsage - numBytes
+ require(
+ newMemoryUsage >= 0,
+ s"Attempting to free $numBytes of memory for task attempt
$taskAttemptId, but it only " +
+ s"allocated $existingMemoryUsage bytes of memory")
+ memoryForTask(taskAttemptId) = newMemoryUsage
+ }
+
+ override private[memory] def releaseAllExecutionMemoryForTask(taskAttemptId:
Long): Long = {
Review comment:
Yes, good catch 👍
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
[email protected]
With regards,
Apache Git Services
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
