Remove ops from pending when max retries reachedv2.14-rc1v2.14-rc0v2.14

When a push operation is not retried anymore, remove it from
the pending queue as well and log the error on replication.log.

Failing to do so, it would result in the destination to refrain from
retrying again at then next Gerrit event.

Change-Id: I1f3dd4011e2822a2e0b52037fcb130e820af156f
Signed-off-by: Luca Milanesio <luca.milanesio@gmail.com>

1 files changed, 6 insertions, 0 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 de705f0..603a70f 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/replication/Destination.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/replication/Destination.java
@@ -395,6 +395,12 @@ public class Destination {
           default:
             if (pushOp.setToRetry()) {
               pool.schedule(pushOp, config.getRetryDelay(), TimeUnit.MINUTES);
+            } else {
+              pushOp.canceledByReplication();
+              pending.remove(uri);
+              stateLog.error(
+                  "Push to " + pushOp.getURI() + " cancelled after maximum number of retries",
+                  pushOp.getStatesAsArray());
             }
             break;
         }