diff options
author | David Pursehouse <dpursehouse@collab.net> | 2020-01-30 10:29:46 +0900 |
---|---|---|
committer | David Pursehouse <dpursehouse@collab.net> | 2020-01-30 10:30:17 +0900 |
commit | fa51424daafdb2502d36a7fdeaff92c289bfa2c3 (patch) | |
tree | 26013152a682b1d4a4dfd96067a9e2ebcbe04fed | |
parent | 88fc59257e0a711643ddc05b906a53b518029d64 (diff) | |
parent | 8bf1d9985415d2f7a5b5c5c2cd9c90d2a31902d9 (diff) |
Merge branch 'stable-2.15' into stable-2.16
* stable-2.15:
Improve log if VersionedMetaData fails to update
Change-Id: Ic2635cf7319276dbf32d18c2c690bb3f38d0a3e7
-rw-r--r-- | java/com/google/gerrit/server/git/meta/VersionedMetaData.java | 24 |
1 files changed, 9 insertions, 15 deletions
diff --git a/java/com/google/gerrit/server/git/meta/VersionedMetaData.java b/java/com/google/gerrit/server/git/meta/VersionedMetaData.java index 2e79a1a47c..f8cfce5651 100644 --- a/java/com/google/gerrit/server/git/meta/VersionedMetaData.java +++ b/java/com/google/gerrit/server/git/meta/VersionedMetaData.java @@ -23,6 +23,7 @@ import com.google.gerrit.server.git.LockFailureException; import com.google.gerrit.server.logging.TraceContext; import com.google.gerrit.server.logging.TraceContext.TraceTimer; import java.io.BufferedReader; +import java.io.File; import java.io.IOException; import java.io.StringReader; import java.util.ArrayList; @@ -419,14 +420,7 @@ public abstract class VersionedMetaData { update.fireGitRefUpdatedEvent(ru); return revision; case LOCK_FAILURE: - throw new LockFailureException( - "Cannot update " - + ru.getName() - + " in " - + db.getDirectory() - + ": " - + ru.getResult(), - ru); + throw new LockFailureException(errorMsg(ru, db.getDirectory()), ru); case FORCED: case IO_FAILURE: case NOT_ATTEMPTED: @@ -437,15 +431,15 @@ public abstract class VersionedMetaData { case REJECTED_MISSING_OBJECT: case REJECTED_OTHER_REASON: default: - throw new IOException( - "Cannot update " - + ru.getName() - + " in " - + db.getDirectory() - + ": " - + ru.getResult()); + throw new IOException(errorMsg(ru, db.getDirectory())); } } + + private String errorMsg(RefUpdate ru, File location) { + return String.format( + "Cannot update %s in %s: %s (%s)", + ru.getName(), location, ru.getResult(), ru.getRefLogMessage()); + } }; } |