Merge branch 'stable-3.0' into stable-3.1
* stable-3.0:
PushOne: Improve logging of lock failure
Change-Id: Id73f36de2b7d3a86520b58c31725d36a22828d5f
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 17fb6c0..4cff68e 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/replication/PushOne.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/replication/PushOne.java
@@ -374,9 +374,7 @@
repLog.atSevere().log("Cannot replicate to %s: %s", uri, cause.getMessage());
} else if (e instanceof LockFailureException) {
lockRetryCount++;
- // The LockFailureException message contains both URI and reason
- // for this failure.
- repLog.atSevere().log("Cannot replicate to %s: %s", uri, e.getMessage());
+ repLog.atSevere().log("Cannot replicate to %s due to lock failure", uri);
// The remote push operation should be retried.
if (lockRetryCount <= maxLockRetries) {
@@ -387,8 +385,7 @@
}
} else {
repLog.atSevere().log(
- "Giving up after %d occurrences of this error: %s during replication to %s",
- lockRetryCount, e.getMessage(), uri);
+ "Giving up after %d lock failures during replication to %s", lockRetryCount, uri);
}
} else {
if (canceledWhileRunning.get()) {