Skip to content

CBL-8160 : Restore the close database timeout waiting for active processes #485

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
pasin merged 2 commits into from
May 19, 2026
+5 −2
Merged

CBL-8160 : Restore the close database timeout waiting for active processes #485

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
47f5f25
CBL-8160 : Restore the close database timeout waiting for active proc…
pasin May 18, 2026
65e0231
Update warn_release
pasin May 18, 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
1 change: 1 addition & 0 deletions .github/workflows/warn_release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
on:
pull_request:
types: [opened]
branches: ['**/release/**']

jobs:
Expand Down
6 changes: 4 additions & 2 deletions common/main/java/com/couchbase/lite/AbstractDatabase.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ abstract class AbstractDatabase extends BaseDatabase
private static final LogDomain DOMAIN = LogDomain.DATABASE;

// Max time to wait for active processes to finish.
private static final int DB_CLOSE_PROCESS_TIMEOUT_SECS = 10;
private static final int DB_CLOSE_PROCESS_TIMEOUT_SECS = 30;
// Backoff between BUSY retries on close.
private static final int DB_CLOSE_RETRY_DELAY_SECS = 2;
// Max number of BUSY retries before giving up.
Expand Down Expand Up @@ -1591,7 +1591,9 @@ private void shutdown(boolean failIfClosed, Fn.ConsumerThrows<C4Database, LiteCo
try {
verifyActiveProcesses();
if (!closeLatch.await(DB_CLOSE_PROCESS_TIMEOUT_SECS, TimeUnit.SECONDS)) {
throw new CouchbaseLiteException("Shutdown failed", CBLError.Domain.CBLITE, CBLError.Code.BUSY);
// Java-side process tracking can lag (stuck callbacks, stale entries);
// let LiteCore be the ground truth on whether close is actually possible.
Log.w(DOMAIN, "Timed out waiting for active processes to finish; attempting close anyway");
}

for (int i = 0; ; i++) {
Expand Down
Loading