summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEryk Szymanski <eryksz@gmail.com>2019-07-03 16:41:47 +0200
committerDavid Pursehouse <dpursehouse@collab.net>2019-07-04 12:39:48 +0900
commit9547d76a375827d79804704dadf716f47d176f0d (patch)
treefd1e3b73f2db15be3218697bda6403faac387aa5
parent57077fda223d7c77c4df4ffd1054fb5237a7b919 (diff)
Add missing log statement if replication was canceled
-rw-r--r--src/main/java/com/googlesource/gerrit/plugins/replication/PushOne.java4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/main/java/com/googlesource/gerrit/plugins/replication/PushOne.java b/src/main/java/com/googlesource/gerrit/plugins/replication/PushOne.java
index fdf6109..889e94d 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/replication/PushOne.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/replication/PushOne.java
@@ -301,7 +301,9 @@ class PushOne implements ProjectRunnable, CanceledWhileRunning {
MDC.put(ID_MDC_KEY, IdGenerator.format(id));
RunwayStatus status = pool.requestRunway(this);
if (!status.isAllowed()) {
- if (!status.isCanceled()) {
+ if (status.isCanceled()) {
+ repLog.info("PushOp for replication to {} was canceled and thus won't be rescheduled", uri);
+ } else {
repLog.info(
"Rescheduling replication to {} to avoid collision with the in-flight push [{}].",
uri,