Github user viirya commented on a diff in the pull request:
https://github.com/apache/spark/pull/16603#discussion_r97908207
--- Diff: core/src/main/java/org/apache/spark/memory/TaskMemoryManager.java
---
@@ -144,23 +152,49 @@ public long acquireExecutionMemory(long required,
MemoryConsumer consumer) {
// spilling, avoid to have too many spilled files.
if (got < required) {
// Call spill() on other consumers to release memory
+ // Sort the consumers according their memory usage. So we avoid
spilling the same consumer
+ // which is just spilled in last few times and re-spilling on it
will produce many small
+ // spill files.
+ sortedConsumers.clear();
for (MemoryConsumer c: consumers) {
if (c != consumer && c.getUsed() > 0 && c.getMode() == mode) {
- try {
- long released = c.spill(required - got, consumer);
- if (released > 0) {
- logger.debug("Task {} released {} from {} for {}",
taskAttemptId,
- Utils.bytesToString(released), c, consumer);
- got += memoryManager.acquireExecutionMemory(required -
got, taskAttemptId, mode);
- if (got >= required) {
- break;
- }
+ Long key = c.getUsed();
+ // If there is existing consumer using the same amount of
memory,
+ // increasing the key.
+ while (sortedConsumers.containsKey(key)) {
+ key += 1;
+ }
+ sortedConsumers.put(key, c);
+ }
+ }
+ // Get the consumer using the least memory more than the remaining
required memory.
+ Map.Entry<Long, MemoryConsumer> currentEntry =
sortedConsumers.ceilingEntry(required - got);
+ if (currentEntry == null) {
+ // No consumer has used memory more than the remaining required
memory.
+ // Get the consumer of largest used memory.
+ currentEntry = sortedConsumers.lastEntry();
+ }
+ while (currentEntry != null) {
--- End diff --
When entry this loop, `currentEntry` could be `null`.
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastruct...@apache.org or file a JIRA ticket
with INFRA.
---
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscr...@spark.apache.org
For additional commands, e-mail: reviews-h...@spark.apache.org
