| commit | a23367b33527cba1d7efdcdc77f1e4180eb6d6da | [log] [tgz] |
|---|---|---|
| author | Luca Milanesio <luca.milanesio@gmail.com> | Wed Jul 15 22:14:03 2020 +0100 |
| committer | Luca Milanesio <luca.milanesio@gmail.com> | Wed Jul 15 22:14:03 2020 +0100 |
| tree | 5993e4a576171fc37939e2d85c05fed43018d902 | |
| parent | a2f3dba7722e68a7ac1ee917c2bf4d59c3c8d80b [diff] | |
| parent | 7c31087623674bea9b3848a0323853344c5aa260 [diff] |
Merge branch 'stable-3.0' into stable-3.1 * stable-3.0: Fix naming for delay for draining the replication event queue Change-Id: If0462b358be65730f4d6531b1260f2ad3d9d972e
diff --git a/src/main/java/com/googlesource/gerrit/plugins/replication/Destination.java b/src/main/java/com/googlesource/gerrit/plugins/replication/Destination.java index 985056b..35470eb 100644 --- a/src/main/java/com/googlesource/gerrit/plugins/replication/Destination.java +++ b/src/main/java/com/googlesource/gerrit/plugins/replication/Destination.java
@@ -742,8 +742,8 @@ return config.getDrainQueueAttempts(); } - public int getReplicationDelaySeconds() { - return config.getDelay() * 1000; + public long getReplicationDelayMilliseconds() { + return config.getDelay() * 1000L; } int getSlowLatencyThreshold() {
diff --git a/src/main/java/com/googlesource/gerrit/plugins/replication/DestinationsCollection.java b/src/main/java/com/googlesource/gerrit/plugins/replication/DestinationsCollection.java index 20c5bf3..eaf5b27 100644 --- a/src/main/java/com/googlesource/gerrit/plugins/replication/DestinationsCollection.java +++ b/src/main/java/com/googlesource/gerrit/plugins/replication/DestinationsCollection.java
@@ -224,7 +224,7 @@ logger.atInfo().log( "Draining replication events, postpone shutdown. Events left: inFlight %d, pending %d", inFlight, pending); - Thread.sleep(destination.getReplicationDelaySeconds()); + Thread.sleep(destination.getReplicationDelayMilliseconds()); } catch (InterruptedException ie) { logger.atWarning().withCause(ie).log( "Wait for replication events to drain has been interrupted");