Merge branch 'stable-3.6' into stable-3.7 * stable-3.6: Rename metric tasks/max_retries to tasks/failed_max_retries Document metrics Fix completed tasks metrics Log fetch tasks when graceful shutdown fails Displaying refs for fetch tasks Leverage ShutdownState in SourcesCollection Fix pull replication queue metric prefix Set pull replication tests as large Introduce replication queue metrics Handle fetch tasks gracefully during shutdown Add integration test for new project creation Do not honor gerrit.replicateOnStartup on primary side Change-Id: I5e4bb45b72a9595116534c88ec60ab3cedba766c
diff --git a/example-setup/broker/Dockerfile b/example-setup/broker/Dockerfile index b79470c..67eecd9 100644 --- a/example-setup/broker/Dockerfile +++ b/example-setup/broker/Dockerfile
@@ -1,4 +1,4 @@ -FROM gerritcodereview/gerrit:3.6.3-almalinux8 +FROM gerritcodereview/gerrit:3.7.2-almalinux8 USER root
diff --git a/example-setup/http/Dockerfile b/example-setup/http/Dockerfile index 77fed72..afadb4f 100644 --- a/example-setup/http/Dockerfile +++ b/example-setup/http/Dockerfile
@@ -1,4 +1,4 @@ -FROM gerritcodereview/gerrit:3.6.3-almalinux8 +FROM gerritcodereview/gerrit:3.7.2-almalinux8 USER root
diff --git a/src/main/java/com/googlesource/gerrit/plugins/replication/pull/api/PullReplicationFilter.java b/src/main/java/com/googlesource/gerrit/plugins/replication/pull/api/PullReplicationFilter.java index ca90c02..40e39ad 100644 --- a/src/main/java/com/googlesource/gerrit/plugins/replication/pull/api/PullReplicationFilter.java +++ b/src/main/java/com/googlesource/gerrit/plugins/replication/pull/api/PullReplicationFilter.java
@@ -157,7 +157,7 @@ } catch (AuthException e) { RestApiServlet.replyError( httpRequest, httpResponse, SC_FORBIDDEN, e.getMessage(), e.caching(), e); - } catch (MalformedJsonException | JsonParseException e) { + } catch (MalformedJsonException | JsonParseException | IllegalArgumentException e) { logger.atFine().withCause(e).log("REST call failed on JSON parsing"); RestApiServlet.replyError( httpRequest, httpResponse, SC_BAD_REQUEST, "Invalid json in request", e);