commit 8eca3e95316bacc64d296acbbe1cc5e6534954c6
author Martin Fick <mfick@codeaurora.org> Fri Mar 27 14:18:25 2020 -0600
committer Luca Milanesio <luca.milanesio@gmail.com> Wed Apr 29 16:04:46 2020 +0000
tree 81800456a63207c4a2680f18896294e179a62d79
parent ffac099ba7295784e92e1b3b63e4d5b68123a21f

Don't reset storage when rescheduling for collisions

When rescheduling to avoid a collision with an already inflight push, do
not reset the persistent storage as this was not started to begin with
as the "runway" was denied. This avoids extra bogus FileNotFound log
messages.

Bug: Issue 12073
Change-Id: I99cc9e2346ea942b91672ff478605ea9e79d4ad3

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 467db2c..53fb392 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/replication/Destination.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/replication/Destination.java
@@ -537,7 +537,6 @@
         pending.put(uri, pushOp);
         switch (reason) {
           case COLLISION:
-            replicationTasksStorage.get().reset(pushOp);
             @SuppressWarnings("unused")
             ScheduledFuture<?> ignored =
                 pool.schedule(pushOp, config.getRescheduleDelay(), TimeUnit.SECONDS);