Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[CELEBORN-845][BUG] Sort memory counter won't decrease after sort failed #1766

Closed
wants to merge 2 commits into from
Closed

[CELEBORN-845][BUG] Sort memory counter won't decrease after sort failed #1766

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ac9f8be
[CELEBORN-845][BUG] Sort memory counter won't decrease after sort fai…
FMX Jul 27, 2023
afe16b8
update.
FMX Jul 27, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions common/src/main/scala/org/apache/celeborn/common/CelebornConf.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2173,6 +2173,7 @@ object CelebornConf extends Logging {
.doc("Reserved memory when sorting a shuffle file off-heap.")
.version("0.3.0")
.bytesConf(ByteUnit.BYTE)
.checkValue(v => v < Int.MaxValue, "Reserved memory per partition must be less than 2GB.")
.createWithDefaultString("1mb")

val WORKER_FLUSHER_BUFFER_SIZE: ConfigEntry[Long] =
Expand Down
7 changes: 3 additions & 4 deletions ...src/main/java/org/apache/celeborn/service/deploy/worker/storage/PartitionFilesSorter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,8 +134,9 @@ public PartitionFilesSorter(
try {
task.sort();
} catch (InterruptedException e) {
logger.warn(
"File sorter thread was interrupted when expanding padding buffer.");
logger.warn("File sorter thread was interrupted.");
} finally {
memoryManager.releaseSortMemory(reservedMemoryPerPartition);
}
});
}
Expand Down Expand Up @@ -586,8 +587,6 @@ public void sort() throws InterruptedException {
sortedBlockInfoMap.put(mapId, sortedShuffleBlocks);
}

memoryManager.releaseSortMemory(reserveMemory);

writeIndex(sortedBlockInfoMap, indexFilePath, isHdfs);
updateSortedShuffleFiles(shuffleKey, fileId, originFileLen);
deleteOriginFiles();
Expand Down
Loading