From 47f5f25f220dace76e5bad04ec8f0f0b16691f5e Mon Sep 17 00:00:00 2001
From: Pasin Suriyentrakorn <pasin@couchbase.com>
Date: Mon, 18 May 2026 13:06:25 -0700
Subject: [PATCH 1/2] CBL-8160 : Restore the close database timeout waiting for
 active processes

* The previous fix reduce the timeout waiting for the active processes to 10 seconds which is too low (e.g. WebSocket close timeout is 9 seconds). Restore the timeout back to 30 seconds.

* Restore the previous logic that will try to close the database anyway even though the active processes are not all finished.

* Noted that the original code before the fix has a bug that the dabase close only retries once after getting BUSY error but wait for total 30 seconds then timeout after.
---
 common/main/java/com/couchbase/lite/AbstractDatabase.java | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/common/main/java/com/couchbase/lite/AbstractDatabase.java b/common/main/java/com/couchbase/lite/AbstractDatabase.java
index 34987442e..c4c0e13c7 100644
--- a/common/main/java/com/couchbase/lite/AbstractDatabase.java
+++ b/common/main/java/com/couchbase/lite/AbstractDatabase.java
@@ -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.
@@ -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++) {

From 65e023122e6f1b0326eba4940b28f5132d5e0fd7 Mon Sep 17 00:00:00 2001
From: Pasin Suriyentrakorn <pasin@couchbase.com>
Date: Mon, 18 May 2026 14:12:49 -0700
Subject: [PATCH 2/2] Update warn_release

---
 .github/workflows/warn_release.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/warn_release.yml b/.github/workflows/warn_release.yml
index 7035de86a..576d311e9 100644
--- a/.github/workflows/warn_release.yml
+++ b/.github/workflows/warn_release.yml
@@ -1,5 +1,6 @@
 on:
   pull_request:
+    types: [opened]
     branches: ['**/release/**']
 
 jobs: