Skip to content

Add bounded timeouts to BlobStore shutdown join() calls #6183

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
joewiz wants to merge 1 commit into from
+14 −3
Closed

Add bounded timeouts to BlobStore shutdown join() calls #6183

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
17 changes: 14 additions & 3 deletions exist-core/src/main/java/org/exist/storage/blob/BlobStoreImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -447,13 +447,21 @@ private void normalClose() throws IOException {
if (persistentWriter != null) {
persistQueue.put(PersistentWriter.POISON_PILL);
}
persistentWriterThread.join();
persistentWriterThread.join(30_000);
if (persistentWriterThread.isAlive()) {
LOG.warn("BlobStore PersistentWriter did not terminate within 30s, interrupting");
persistentWriterThread.interrupt();
persistentWriterThread.join(5_000);
}

// shutdown the vacuum
if (blobVacuum != null) {
blobVacuumThread.interrupt();
}
blobVacuumThread.join();
blobVacuumThread.join(30_000);
if (blobVacuumThread.isAlive()) {
LOG.warn("BlobStore BlobVacuum did not terminate within 30s");
}
} catch (final InterruptedException e) {
// Restore the interrupted status
Thread.currentThread().interrupt();
Expand Down Expand Up @@ -523,7 +531,10 @@ private void abnormalPersistentWriterShutdown() {
if (blobVacuum != null) {
blobVacuumThread.interrupt();
}
blobVacuumThread.join();
blobVacuumThread.join(30_000);
if (blobVacuumThread.isAlive()) {
LOG.warn("BlobStore BlobVacuum did not terminate within 30s during abnormal shutdown");
}

} catch (final InterruptedException e) {
// Restore the interrupted status
Expand Down
Loading