Skip to content

ZOOKEEPER-3598. Fix trunk build #1143

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

Closed
anmolnar wants to merge 2 commits into from
Closed

ZOOKEEPER-3598. Fix trunk build #1143

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
410e5d6
ZOOKEEPER-3598. Junit interrupts tearDown() thread which causes the e…
anmolnar Nov 14, 2019
12638ec
ZOOKEEPER-3598. Checkstyle fix
anmolnar Nov 14, 2019
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
22 changes: 10 additions & 12 deletions zookeeper-server/src/main/java/org/apache/zookeeper/server/quorum/CommitProcessor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -624,21 +624,19 @@ public void shutdown() {

try {
this.join(workerShutdownTimeoutMS);
if (this.isAlive()) {
LOG.warn("CommitProcessor does not shutdown gracefully after "
+ "waiting for {} ms, exit to avoid potential "
+ "inconsistency issue", workerShutdownTimeoutMS);
System.exit(ExitCode.SHUTDOWN_UNGRACEFULLY.getValue());

@eolivelli eolivelli Nov 14, 2019

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Catch (InterruptedException) won't help for System.exit.

Maybe the best idea is to have a system property to disable the real 'System.exit' and add such property in tests (Maven surefire plugin config)

}

if (nextProcessor != null) {
nextProcessor.shutdown();
}
} catch (InterruptedException e) {
LOG.warn("Interrupted while waiting for CommitProcessor to finish");
Thread.currentThread().interrupt();
}

if (this.isAlive()) {
LOG.warn("CommitProcessor does not shutdown gracefully after "
+ "waiting for {} ms, exit to avoid potential "
+ "inconsistency issue", workerShutdownTimeoutMS);
System.exit(ExitCode.SHUTDOWN_UNGRACEFULLY.getValue());
}

if (nextProcessor != null) {
nextProcessor.shutdown();
}
}

}