diff options
author | Luca Milanesio <luca.milanesio@gmail.com> | 2020-07-15 23:06:13 +0100 |
---|---|---|
committer | Luca Milanesio <luca.milanesio@gmail.com> | 2020-07-15 23:06:13 +0100 |
commit | f3018192441107e430294c7ddfc44d72e74061e8 (patch) | |
tree | 36826c8d5fdb11ead49e60a906999804106d74b2 | |
parent | 6cfdeb49a0cbfe94f66b0d6c25c627bf5d6c98ec (diff) | |
parent | a23367b33527cba1d7efdcdc77f1e4180eb6d6da (diff) |
Merge branch 'stable-3.1' into stable-3.2v3.2.3
* stable-3.1:
Fix naming for delay for draining the replication event queue
Change-Id: I1b3977e395bba314c7c87e7b26835659f4c222f3
-rw-r--r-- | src/main/java/com/googlesource/gerrit/plugins/replication/Destination.java | 4 | ||||
-rw-r--r-- | src/main/java/com/googlesource/gerrit/plugins/replication/DestinationsCollection.java | 2 |
2 files changed, 3 insertions, 3 deletions
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 8f04c74..e2f9515 100644 --- a/src/main/java/com/googlesource/gerrit/plugins/replication/Destination.java +++ b/src/main/java/com/googlesource/gerrit/plugins/replication/Destination.java @@ -757,8 +757,8 @@ public class Destination { 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 ac14657..747c0f6 100644 --- a/src/main/java/com/googlesource/gerrit/plugins/replication/DestinationsCollection.java +++ b/src/main/java/com/googlesource/gerrit/plugins/replication/DestinationsCollection.java @@ -225,7 +225,7 @@ public class DestinationsCollection implements ReplicationDestinations { 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"); |