Merge branch 'stable-3.0' into stable-3.1v3.1.8

* stable-3.0:
  Fix naming for delay for draining the replication event queue

Change-Id: If0462b358be65730f4d6531b1260f2ad3d9d972e

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 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 @@ 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 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 @@ 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");