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

Limiting ProcessTree.killAll to InboundAgentRule.after #802

Merged
merged 1 commit into from
Jul 10, 2024
Merged

Limiting ProcessTree.killAll to InboundAgentRule.after #802

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
25 changes: 18 additions & 7 deletions src/main/java/org/jvnet/hudson/test/InboundAgentRule.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,13 +43,13 @@
import java.io.IOException;
import java.io.Serializable;
import java.util.ArrayList;
import java.util.Collections;
import java.util.HashMap;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
import java.util.Objects;
import java.util.UUID;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentMap;
import java.util.jar.JarFile;
import java.util.logging.Level;
import java.util.logging.Logger;
Expand Down Expand Up @@ -80,7 +80,7 @@ public final class InboundAgentRule extends ExternalResource {
private static final Logger LOGGER = Logger.getLogger(InboundAgentRule.class.getName());

private final String id = UUID.randomUUID().toString();
private final ConcurrentMap<String, Process> procs = new ConcurrentHashMap<>();
private final Map<String, Process> procs = Collections.synchronizedMap(new HashMap<>());
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

(to allow null values)


/**
* The options used to (re)start an inbound agent.
Expand Down Expand Up @@ -394,11 +394,14 @@ public void stop(@NonNull RealJenkinsRule rjr, @NonNull String name) throws Thro
* You need only call this to simulate an agent crash, followed by {@link #start}.
*/
public void stop(@NonNull String name) throws InterruptedException {
Process proc = procs.remove(name);
Process proc = procs.put(name, null);
if (proc != null) {
ProcessTree.get().killAll(proc, Map.of("INBOUND_AGENT_RULE_ID", id, "INBOUND_AGENT_RULE_NAME", name));
LOGGER.info(() -> "Killing " + name + " agent JVM (but not subprocesses)");
proc.destroyForcibly();
proc.waitFor();
} else {
// (normal when called from #start)
LOGGER.fine(() -> "No " + name + " agent JVM found to kill");
}
}

Expand All @@ -412,14 +415,22 @@ public boolean isAlive(String name) {
}

@Override protected void after() {
for (String name : procs.keySet()) {
for (var entry : procs.entrySet()) {
String name = entry.getKey();
Process proc = entry.getValue();
try {
stop(name);
LOGGER.info(() -> "Cleaning up " + name + " agent JVM and/or any subprocesses");
ProcessTree.get().killAll(proc, Map.of("INBOUND_AGENT_RULE_ID", id, "INBOUND_AGENT_RULE_NAME", name));
if (proc != null) {
proc.destroyForcibly();
proc.waitFor();
}
} catch (InterruptedException e) {
e.printStackTrace();
Thread.currentThread().interrupt();
}
}
procs.clear();
}

public static class AgentArguments implements Serializable {
Expand Down
Loading