diff options
| author | Martin Fick <mfick@codeaurora.org> | 2021-02-24 17:02:30 -0700 |
|---|---|---|
| committer | Nasser Grainawi <nasser@codeaurora.org> | 2021-02-24 22:49:14 -0700 |
| commit | a6c453782de3f684a40a242bad9460faff75ffc3 (patch) | |
| tree | f0144f881a55ba6416dd7e2faf76c2a670dd4c0d | |
| parent | bd4e15aa6b0e4c47c9826837c87e24f285f9eeb8 (diff) | |
Call retryDone() when giving up after lock failuresv2.16.28upstream/stable-2.16
Previously when giving up after retrying due to too many lock failures,
a 'replication start --wait' command would wait indefinitely if it was
waiting on the push that gave up. Fix this by calling retryDone() after
giving up which will trigger the ReplicationStatus to reflect a failure
allowing the waiting to complete.
Change-Id: I0debade83612eb7ce51bab0191ab99464a6e7cd3
| -rw-r--r-- | src/main/java/com/googlesource/gerrit/plugins/replication/PushOne.java | 1 |
1 files changed, 1 insertions, 0 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 45a9201..21a630e 100644 --- a/src/main/java/com/googlesource/gerrit/plugins/replication/PushOne.java +++ b/src/main/java/com/googlesource/gerrit/plugins/replication/PushOne.java @@ -403,6 +403,7 @@ class PushOne implements ProjectRunnable, CanceledWhileRunning { pool.reschedule(this, Destination.RetryReason.TRANSPORT_ERROR); } } else { + retryDone(); repLog.error( "Giving up after {} '{}' failures during replication to {}", updateRefRetryCount, |