commit a663643c31a198d30660c66eee7f97bb23bd9ec8
author Edwin Kempin <ekempin@google.com> Tue Sep 01 06:00:01 2020 +0000
committer Edwin Kempin <ekempin@google.com> Tue Sep 01 06:00:36 2020 +0000
tree b1d264bb54884ca91e96627193ceb9eade65220a
parent 2dd99cca73e79b1c8cd295bd3821257a3a8fb6f9

Revert "ReceiveCommits: Retry inserting changes and patch sets"

This reverts commit 7f3121bec4a1e1c4269866a96fcb309227f6557a.

Reason for revert: The retrying doesn't work and always fails with
"java.lang.IllegalArgumentException: cannot chain ref update" and as
a result the user gets non-understandable error message.

Change-Id: I6a5c8ea4aabaf2cafba7a551cb6a1156c2751948

java/com/google/gerrit/server/git/receive/ReceiveCommits.java

diff --git a/java/com/google/gerrit/server/git/receive/ReceiveCommits.java b/java/com/google/gerrit/server/git/receive/ReceiveCommits.java
index 22772e7..1d10045 100644
--- a/java/com/google/gerrit/server/git/receive/ReceiveCommits.java
+++ b/java/com/google/gerrit/server/git/receive/ReceiveCommits.java
@@ -952,17 +952,9 @@
         updateGroups.forEach(r -> r.addOps(bu));
 
         logger.atFine().log("Executing batch");
-
         try {
-          retryHelper
-              .changeUpdate(
-                  "insertChangesAndPatchSets",
-                  () -> {
-                    bu.execute();
-                    return null;
-                  })
-              .call();
-        } catch (Exception e) {
+          bu.execute();
+        } catch (UpdateException e) {
           throw asRestApiException(e);
         }