fix: Include active spiller when computing peak shuffle memory (#196)

apache · Mar 13, 2024 · e920aa4 · e920aa4
1 parent 93e81cc
commit e920aa4
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/spark/src/main/java/org/apache/spark/shuffle/sort/CometShuffleExternalSorter.java b/spark/src/main/java/org/apache/spark/shuffle/sort/CometShuffleExternalSorter.java
@@ -257,6 +257,9 @@ private long getMemoryUsage() {
     for (SpillSorter sorter : spillingSorters) {
       totalPageSize += sorter.getMemoryUsage();
     }
+    if (activeSpillSorter != null) {
+      totalPageSize += activeSpillSorter.getMemoryUsage();
+    }
     return totalPageSize;
   }
 
@@ -274,6 +277,7 @@ public long getPeakMemoryUsedBytes() {
   }
 
   private long freeMemory() {
+    updatePeakMemoryUsed();
     long memoryFreed = 0;
     if (isAsync) {
       for (SpillSorter sorter : spillingSorters) {