Merge "ReceiveCommits: Retry inserting changes and patch sets"

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

@@ -933,9 +933,17 @@ class ReceiveCommits {
         updateGroups.forEach(r -> r.addOps(bu));
 
         logger.atFine().log("Executing batch");
+
         try {
+          retryHelper
+              .changeUpdate(
+                  "insertChangesAndPatchSets",
+                  () -> {
                     bu.execute();
-        } catch (UpdateException e) {
+                    return null;
+                  })
+              .call();
+        } catch (Exception e) {
           throw asRestApiException(e);
         }