commit dc853c4136ed68ecf6b7fe49abdbf1ee53450351
author Edwin Kempin <ekempin@google.com> Tue Sep 01 07:01:29 2020 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Sep 01 07:01:29 2020 +0000
tree c75d0e772afdda4143ba4e33ca8dd7fcc1ab7d69
parent 1a785bac228b87895d236d565b70487a8cf4bd5b
parent a663643c31a198d30660c66eee7f97bb23bd9ec8

Merge "Revert "ReceiveCommits: Retry inserting changes and patch sets""

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);
         }