commit 0e9dae4cc48ecb56ca21ff05cfb22b080f1821fc
author Nasser Grainawi <nasser@codeaurora.org> Thu Jan 28 18:21:14 2021 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Jan 28 18:21:14 2021 +0000
tree 1388ffa072299ac9a7bde9a0d8ebf28963898393
parent fa41b7f8518725fcea4c649faa8065bd7a2451f4
parent d112393b960f544b8c3b05bebb9d952b77e4f66b

Merge "Fix inconsistent logging for scheduled pushes"

src/main/java/com/googlesource/gerrit/plugins/replication/Destination.java

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 ea8657d..6117abf 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/replication/Destination.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/replication/Destination.java
@@ -434,13 +434,16 @@
         ScheduledFuture<?> ignored =
             pool.schedule(task, now ? 0 : config.getDelay(), TimeUnit.SECONDS);
         pending.put(uri, task);
+        repLog.atInfo().log(
+            "scheduled %s:%s => %s to run %s",
+            project, ref, task, now ? "now" : "after " + config.getDelay() + "s");
       } else {
         addRef(task, ref);
         task.addState(ref, state);
+        repLog.atInfo().log(
+            "consolidated %s:%s => %s with an existing pending push", project, ref, task);
       }
       state.increasePushTaskCount(project.get(), ref);
-      repLog.atInfo().log(
-          "scheduled %s:%s => %s to run after %ds", project, ref, task, config.getDelay());
     }
   }