Raincloud/sheepit-shadow-nabber
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'fix/race-condition-unzip' into 'master'

Browse Source 
Fix: race condition on shutdown of zip extractor

See merge request sheepitrenderfarm/client!347
This commit is contained in:
Sheepit Renderfarm
2024-12-14 09:38:44 +00:00
parent 912a07850f 54b5a6ca6c
commit 943b194c39
1 changed files with 11 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/main/java/com/sheepit/client/UnzipUtils.java
View File

@@ -245,6 +245,17 @@ public class UnzipUtils {
private static void writeWait(WriteQueue queue, ExecutorService executor) throws InterruptedException { private static void writeWait(WriteQueue queue, ExecutorService executor) throws InterruptedException {
queue.doneAdding = true; queue.doneAdding = true;
executor.shutdown(); executor.shutdown();
try {
if (executor.awaitTermination(60, TimeUnit.MINUTES) == false) {
executor.shutdownNow();
}
}
catch (InterruptedException e) {
executor.shutdownNow();
Thread.currentThread().interrupt();
}
//Encourage the JVM to release memory used while decompressing //Encourage the JVM to release memory used while decompressing
GC_RUNNER.execute(System::gc); GC_RUNNER.execute(System::gc);
} }