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: diff --git a/common/main/java/com/couchbase/lite/AbstractDatabase.java b/common/main/java/com/couchbase/lite/AbstractDatabase.java index eba360a90..22f2d3a39 100644 --- a/common/main/java/com/couchbase/lite/AbstractDatabase.java +++ b/common/main/java/com/couchbase/lite/AbstractDatabase.java @@ -92,7 +92,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. @@ -1257,7 +1257,9 @@ private void shutdown(boolean failIfClosed, Fn.ConsumerThrows