Skip to content

HBASE-27426 - Fix ZKWatcher shutdown seqence to avoid InterruptExcept… #4829

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
apurtell merged 5 commits into from
Oct 17, 2022
Merged

HBASE-27426 - Fix ZKWatcher shutdown seqence to avoid InterruptExcept… #4829

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
f4cac8b
HBASE-27426 - Fix ZKWatcher shutdown seqence to avoid InterruptExcept…
Oct 12, 2022
c6aa731
Remove unnecessary/redundant logs.
Oct 13, 2022
eb154ba
Dummy change for triggering tests in hbase-server.
Oct 13, 2022
258ee35
Revert the dummy change.
Oct 14, 2022
67394bd
Reduce the wait to 15 seconds and add a force shutdown if the wait ti…
Oct 15, 2022
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
1 change: 1 addition & 0 deletions hbase-server/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -824,3 +824,4 @@
</profile>
</profiles>
</project>
<!-- trigger tests in this module -->
10 changes: 8 additions & 2 deletions hbase-zookeeper/src/main/java/org/apache/hadoop/hbase/zookeeper/ZKWatcher.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -735,12 +735,18 @@ public void interruptedExceptionNoThrow(InterruptedException ie, boolean throwLa
*/
@Override
public void close() {
zkEventProcessor.shutdown();
try {
recoverableZooKeeper.close();
zkEventProcessor.awaitTermination(60, TimeUnit.SECONDS);
} catch (InterruptedException e) {
LOG.warn("ZKWatcher event processor has not finished to terminate.");
Thread.currentThread().interrupt();
} finally {
zkEventProcessor.shutdownNow();
try {
recoverableZooKeeper.close();
} catch (InterruptedException e) {
Thread.currentThread().interrupt();
}
}
}

Expand Down