Merge branch 'stable-3.0' into stable-3.1 * stable-3.0: Fix synopsis in replication start cmd documentation Don't wait for pending events to process on startup Change-Id: Icea01fdde4004a358698cc853cf46a78e2ce1e54
diff --git a/src/main/java/com/googlesource/gerrit/plugins/replication/ReplicationQueue.java b/src/main/java/com/googlesource/gerrit/plugins/replication/ReplicationQueue.java index 6a89e80..0a34d11 100644 --- a/src/main/java/com/googlesource/gerrit/plugins/replication/ReplicationQueue.java +++ b/src/main/java/com/googlesource/gerrit/plugins/replication/ReplicationQueue.java
@@ -81,7 +81,9 @@ destinations.get().startup(workQueue); running = true; replicationTasksStorage.resetAll(); - firePendingEvents(); + Thread t = new Thread(this::firePendingEvents, "firePendingEvents"); + t.setDaemon(true); + t.start(); fireBeforeStartupEvents(); } } @@ -198,6 +200,8 @@ repLog.error("Encountered malformed URI for persisted event %s", t); } } + } catch (Throwable e) { + repLog.error("Unexpected error while firing pending events", e); } finally { replaying = false; }
diff --git a/src/main/resources/Documentation/cmd-start.md b/src/main/resources/Documentation/cmd-start.md index 8291421..e12ec92 100644 --- a/src/main/resources/Documentation/cmd-start.md +++ b/src/main/resources/Documentation/cmd-start.md
@@ -11,8 +11,7 @@ ssh -p @SSH_PORT@ @SSH_HOST@ @PLUGIN@ start [--now] [--wait] - [--url <PATTERN>] - {--all | <PROJECT PATTERN> ...} + {--url <PATTERN> | [--url <PATTERN>] --all | [--url <PATTERN>] <PROJECT PATTERN> ...} ``` DESCRIPTION