diff options
| author | David Pursehouse <dpursehouse@digital.ai> | 2020-05-01 07:20:32 +0900 |
|---|---|---|
| committer | David Pursehouse <dpursehouse@digital.ai> | 2020-05-01 07:20:32 +0900 |
| commit | ab6af46f5d191c10a163f4d8a77b75e920bde372 (patch) | |
| tree | 534533d672fb662cddbb31b6d11c8d0e411a3a26 | |
| parent | 42a2306d9b746f97f436f9c75982a6dc2b4d84d3 (diff) | |
| parent | fb0b8393644e0ec447d9fab73b520d9cc7b803e1 (diff) | |
Merge branch 'stable-3.1'v3.2.0-rc2v3.2.0-rc1
* stable-3.1:
Do not remove replication tasks if they are retrying
Change-Id: I5cbdcd29541f6d88fe93364cc4769b93123138b5
| -rw-r--r-- | src/main/java/com/googlesource/gerrit/plugins/replication/Destination.java | 4 |
1 files changed, 3 insertions, 1 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 d53b9c0..38cc9e0 100644 --- a/src/main/java/com/googlesource/gerrit/plugins/replication/Destination.java +++ b/src/main/java/com/googlesource/gerrit/plugins/replication/Destination.java @@ -584,7 +584,9 @@ public class Destination { void notifyFinished(PushOne op) { synchronized (stateLock) { - replicationTasksStorage.get().finish(op); + if (!op.isRetrying()) { + replicationTasksStorage.get().finish(op); + } inFlight.remove(op.getURI()); } } |