Merge branch 'stable-3.6' into stable-3.7 * stable-3.6: Set the config files after Gerrit init step Make sure project is indexed after creation Allow creation of new projects Introduce concept of permanent failure Document need for Access Database capability Do not try to delete inexistent refs Make variable used by constructor final Stream events listener should respect excluded refs param Stream events listener should respect `remote.NAME.projects` param Remove unnecessary test Add ref deletion functionality to the StreamEventsListener Add guard clauses to improve readability Use Gerrit 3.5.5 in example setup Return empty list when prefix is not matched in suggest Add metric to count when ref size is larger that maxApiPayloadSize Improve fetch logging by adding replication task id and refs list Change the base docker image in the broker topology. Update docker http/broker topologies. Listen to GitBatchRefUpdateListener for a set of events Pull-replication does not require DELETE refs permissions. Move Gerrit init and reindexing steps to entrypoint.sh. Fix init step for pull-replication. Add init step for pull-replication Add example using broker notification (Kafka) Set correct 3.6 broker version Set correct 3.5 broker version Give execute permission to entrypoint.sh Remove unused env variables Expose debug ports in Gerrit Do no update Gerrit rpm Remove /a from fetch url in replication.config.template Add docker-compose to spinup test environment Updated Dockerfile to latest Gerrit version (3.7.2) Change-Id: I55b5c3fb31588f963335e6eeda058a24487be415
diff --git a/example-setup/broker/Dockerfile b/example-setup/broker/Dockerfile index 566e839..acc34b9 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 b966b5f..3a68b59 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 20122a7..7027239 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
@@ -140,7 +140,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);