starred/pkl
1
0
Fork 0
mirror of https://github.com/apple/pkl.git synced 2026-06-12 16:44:33 +02:00
Code Issues 198 Packages Projects Releases 10 Wiki Activity

Fix a possible deadlock during external reader process close (#786) (#787)

Browse Source 
* Fix a possible deadlock during external reader process close

* Apply spotless

---------

Co-authored-by: Philip K.F. Hölzenspies <holzensp@gmail.com>
This commit is contained in:
Josh B
2024-11-08 13:18:13 -08:00
committed by GitHub
parent 552b301451
commit 077497d9b8
1 changed files with 13 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkl-core/src/main/java/org/pkl/core/externalreader/ExternalReaderProcessImpl.java
+13 -31
View File
@@ -17,17 +17,16 @@ package org.pkl.core.externalreader;
import java.io.IOException; import java.io.IOException;
import java.lang.ProcessBuilder.Redirect; import java.lang.ProcessBuilder.Redirect;
import java.time.Duration;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Map; import java.util.Map;
import java.util.Objects; import java.util.Objects;
import java.util.Random; import java.util.Random;
import java.util.Timer;
import java.util.TimerTask;
import java.util.concurrent.CompletableFuture; import java.util.concurrent.CompletableFuture;
import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.Future; import java.util.concurrent.Future;
import java.util.concurrent.TimeUnit;
import javax.annotation.concurrent.GuardedBy; import javax.annotation.concurrent.GuardedBy;
import org.pkl.core.Duration;
import org.pkl.core.evaluatorSettings.PklEvaluatorSettings.ExternalReader; import org.pkl.core.evaluatorSettings.PklEvaluatorSettings.ExternalReader;
import org.pkl.core.externalreader.ExternalReaderMessages.*; import org.pkl.core.externalreader.ExternalReaderMessages.*;
import org.pkl.core.messaging.MessageTransport; import org.pkl.core.messaging.MessageTransport;
@@ -152,40 +151,23 @@ final class ExternalReaderProcessImpl implements ExternalReaderProcess {
@Override @Override
public void close() { public void close() {
synchronized (lock) { synchronized (lock) {
if (closed) return;
closed = true; closed = true;
if (process == null || !process.isAlive()) {
return;
}
try { try {
if (transport != null) { if (transport != null && process != null && process.isAlive()) {
transport.send(new CloseExternalProcess()); transport.send(new CloseExternalProcess());
process.waitFor(CLOSE_TIMEOUT.toMillis(), TimeUnit.MILLISECONDS);
}
} catch (Exception ignored) {
} finally {
if (process != null) {
// no-op unless process is alive
process.destroyForcibly();
}
if (transport != null) {
transport.close(); transport.close();
} }
// forcefully stop the process after the timeout
// note that both transport.close() and process.destroy() are safe to call multiple times
new Timer()
.schedule(
new TimerTask() {
@Override
public void run() {
if (process != null) {
transport.close();
process.destroyForcibly();
}
}
},
CLOSE_TIMEOUT.inWholeMillis());
// block on process exit
process.onExit().get();
} catch (Exception e) {
transport.close();
process.destroyForcibly();
} finally {
process = null;
transport = null;
} }
} }
} }