Skip to content

fix: Fix race in emulator controller #2836

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

Merged
gcf-merge-on-green merged 2 commits into from
Mar 9, 2026
Merged

fix: Fix race in emulator controller #2836

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f9a7686
fix: Fix race in emulator controller
mutianf Mar 9, 2026
b2aa81b
format
mutianf Mar 9, 2026
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
26 changes: 23 additions & 3 deletions ...ulator-core/src/main/java/com/google/cloud/bigtable/emulator/core/EmulatorController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,8 @@ public class EmulatorController {

private final Path executable;
private Process process;
private Thread stdoutThread;
private Thread stderrThread;
private boolean isStopped = true;
private Thread shutdownHook;

Expand Down Expand Up @@ -127,8 +129,8 @@ public synchronized void start(int port)
throw e;
}
}
pipeStreamToLog(process.getInputStream(), Level.INFO);
pipeStreamToLog(process.getErrorStream(), Level.WARNING);
Thread stdoutThread = pipeStreamToLog(process.getInputStream(), Level.INFO);
Thread stderrThread = pipeStreamToLog(process.getErrorStream(), Level.WARNING);
isStopped = false;

shutdownHook =
Expand Down Expand Up @@ -164,6 +166,23 @@ public synchronized void stop() {
} finally {
isStopped = true;
process.destroy();

try {
process.waitFor();
if (stdoutThread != null) {
stdoutThread.join();
}
if (stderrThread != null) {
stderrThread.join();
}
} catch (InterruptedException e) {
Thread.currentThread().interrupt();
LOGGER.log(Level.WARNING, "Interrupted while waiting for emulator to stop", e);
} finally {
stdoutThread = null;
stderrThread = null;
process = null;
}
}
}

Expand Down Expand Up @@ -239,7 +258,7 @@ private static void waitForPort(int port) throws InterruptedException, TimeoutEx
}

/** Creates a thread that will pipe an {@link InputStream} to this class' Logger. */
private static void pipeStreamToLog(final InputStream stream, final Level level) {
private static Thread pipeStreamToLog(final InputStream stream, final Level level) {
final BufferedReader reader = new BufferedReader(new InputStreamReader(stream));

Thread thread =
Expand All @@ -258,6 +277,7 @@ private static void pipeStreamToLog(final InputStream stream, final Level level)
});
thread.setDaemon(true);
thread.start();
return thread;
}
// </editor-fold>
}
Loading