Merge changes from topics "remove-redundant-specification-of-LockFailureException-for-retrying", "remove-retrying-index-queries-on-StorageException", "simplify-retrying-index-queries"
* changes:
Adapt to removal of RetryHelper#indexQuery method
Remove retrying index queries on StorageException
Remove redundant specification of LockFailureExceptions for retrying
diff --git a/java/com/google/gerrit/plugins/checks/CheckerQuery.java b/java/com/google/gerrit/plugins/checks/CheckerQuery.java
index 77cd4b0..56f065d 100644
--- a/java/com/google/gerrit/plugins/checks/CheckerQuery.java
+++ b/java/com/google/gerrit/plugins/checks/CheckerQuery.java
@@ -44,6 +44,7 @@
import com.google.gerrit.server.query.change.ChangeStatusPredicate;
import com.google.gerrit.server.query.change.ProjectPredicate;
import com.google.gerrit.server.update.RetryHelper;
+import com.google.gerrit.server.update.RetryableAction.ActionType;
import com.google.inject.Inject;
import com.google.inject.Provider;
import java.util.ArrayList;
@@ -335,7 +336,8 @@
throws StorageException, QueryParseException {
try {
return retryHelper
- .indexQuery(
+ .action(
+ ActionType.INDEX_QUERY,
actionName,
() -> {
ChangeQueryProcessor qp = changeQueryProcessorProvider.get();
@@ -344,7 +346,6 @@
.map(predicate -> predicate.entities())
.collect(toImmutableList());
})
- .retryOn(StorageException.class::isInstance)
.call();
} catch (Exception e) {
Throwables.throwIfUnchecked(e);
diff --git a/java/com/google/gerrit/plugins/checks/db/NoteDbCheckersUpdate.java b/java/com/google/gerrit/plugins/checks/db/NoteDbCheckersUpdate.java
index 19ae2a5..72b01c2 100644
--- a/java/com/google/gerrit/plugins/checks/db/NoteDbCheckersUpdate.java
+++ b/java/com/google/gerrit/plugins/checks/db/NoteDbCheckersUpdate.java
@@ -17,7 +17,6 @@
import com.google.common.base.Throwables;
import com.google.gerrit.entities.Project;
import com.google.gerrit.exceptions.DuplicateKeyException;
-import com.google.gerrit.git.LockFailureException;
import com.google.gerrit.git.RefUpdateUtil;
import com.google.gerrit.plugins.checks.Checker;
import com.google.gerrit.plugins.checks.CheckerCreation;
@@ -139,7 +138,6 @@
return retryHelper
.pluginUpdate(
"createChecker", () -> createCheckerInNoteDb(checkerCreation, checkerUpdate))
- .retryOn(LockFailureException.class::isInstance)
.call();
} catch (Exception e) {
Throwables.throwIfUnchecked(e);
@@ -233,7 +231,6 @@
try {
return retryHelper
.pluginUpdate("updateChecker", () -> updateCheckerInNoteDb(checkerUuid, checkerUpdate))
- .retryOn(LockFailureException.class::isInstance)
.call();
} catch (Exception e) {
Throwables.throwIfUnchecked(e);
diff --git a/java/com/google/gerrit/plugins/checks/db/NoteDbChecksUpdate.java b/java/com/google/gerrit/plugins/checks/db/NoteDbChecksUpdate.java
index 05ad0dc..e9cb9bb 100644
--- a/java/com/google/gerrit/plugins/checks/db/NoteDbChecksUpdate.java
+++ b/java/com/google/gerrit/plugins/checks/db/NoteDbChecksUpdate.java
@@ -21,7 +21,6 @@
import com.google.common.base.Throwables;
import com.google.common.collect.Maps;
import com.google.gerrit.exceptions.DuplicateKeyException;
-import com.google.gerrit.git.LockFailureException;
import com.google.gerrit.git.RefUpdateUtil;
import com.google.gerrit.plugins.checks.Check;
import com.google.gerrit.plugins.checks.CheckKey;
@@ -144,7 +143,6 @@
return retryHelper
.pluginUpdate(
"createCheck", () -> upsertCheckInNoteDb(checkKey, checkUpdate, Operation.CREATE))
- .retryOn(LockFailureException.class::isInstance)
.call();
} catch (Exception e) {
Throwables.throwIfUnchecked(e);
@@ -160,7 +158,6 @@
return retryHelper
.pluginUpdate(
"updateCheck", () -> upsertCheckInNoteDb(checkKey, checkUpdate, Operation.UPDATE))
- .retryOn(LockFailureException.class::isInstance)
.call();
} catch (Exception e) {
Throwables.throwIfUnchecked(e);
