diff options
author | Nasser Grainawi <nasser@codeaurora.org> | 2020-07-13 16:42:02 -0600 |
---|---|---|
committer | Nasser Grainawi <nasser@codeaurora.org> | 2020-07-15 11:14:39 -0600 |
commit | 9f679b030aedcb5cdae6810798f2602b62f58fa0 (patch) | |
tree | b30985abfde77fe981ee9e688f69aef8173a4da2 | |
parent | 58778e145d83dfa05035626aca62d968f11b7e3d (diff) |
Fix naming for delay for draining the replication event queuev2.16.22
Thread.sleep() takes milliseconds as an argument, not seconds.
Otherwise, multiplying by 1000 would be a bug.
Also switches to returning a long, which fixes a potential overflow when
multiplying by 1000.
Change-Id: I3fc5c939e8c09c134e24fa9381e96e6529b5be4d
-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/ReplicationFileBasedConfig.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 545b537..e057626 100644 --- a/src/main/java/com/googlesource/gerrit/plugins/replication/Destination.java +++ b/src/main/java/com/googlesource/gerrit/plugins/replication/Destination.java @@ -750,8 +750,8 @@ public class Destination { return config.getDrainQueueAttempts(); } - public int getReplicationDelaySeconds() { - return config.getDelay() * 1000; + public long getReplicationDelayMilliseconds() { + return config.getDelay() * 1000L; } private static boolean matches(URIish uri, String urlMatch) { diff --git a/src/main/java/com/googlesource/gerrit/plugins/replication/ReplicationFileBasedConfig.java b/src/main/java/com/googlesource/gerrit/plugins/replication/ReplicationFileBasedConfig.java index 68db6c6..37d63e3 100644 --- a/src/main/java/com/googlesource/gerrit/plugins/replication/ReplicationFileBasedConfig.java +++ b/src/main/java/com/googlesource/gerrit/plugins/replication/ReplicationFileBasedConfig.java @@ -259,7 +259,7 @@ public class ReplicationFileBasedConfig implements ReplicationConfig { 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"); |