Merge branch 'stable-3.6' into stable-3.7 * stable-3.6: Do not propagate internal indexing operations Change-Id: Id64ca5784237c5d810da0f27f1cc766d538cf1a4
diff --git a/docker-compose.kafka-broker.yaml b/docker-compose.kafka-broker.yaml deleted file mode 100644 index d3fc713..0000000 --- a/docker-compose.kafka-broker.yaml +++ /dev/null
@@ -1,14 +0,0 @@ -version: '3' -services: - zookeeper: - image: wurstmeister/zookeeper:latest - ports: - - "2181:2181" - kafka: - image: wurstmeister/kafka:2.13-2.6.3 - ports: - - "9092:9092" - environment: - KAFKA_ADVERTISED_HOST_NAME: 127.0.0.1 - KAFKA_CREATE_TOPICS: "gerrit:1:1" - KAFKA_ZOOKEEPER_CONNECT: zookeeper:2181
diff --git a/e2e-tests/docker-compose-kafka.yaml b/e2e-tests/docker-compose-kafka.yaml index addb8d5..b02b58d 100644 --- a/e2e-tests/docker-compose-kafka.yaml +++ b/e2e-tests/docker-compose-kafka.yaml
@@ -1,12 +1,11 @@ version: '3' services: kafka: - image: wurstmeister/kafka:2.13-2.6.3 + image: bitnami/kafka:3.6.0 depends_on: - zookeeper environment: - KAFKA_ADVERTISED_HOST_NAME: kafka - KAFKA_ZOOKEEPER_CONNECT: zookeeper:2181 + - KAFKA_CFG_ZOOKEEPER_CONNECT=zookeeper:2181 gerrit1: depends_on:
diff --git a/e2e-tests/docker-compose.yaml b/e2e-tests/docker-compose.yaml index 3abb757..2ac7b06 100644 --- a/e2e-tests/docker-compose.yaml +++ b/e2e-tests/docker-compose.yaml
@@ -1,7 +1,9 @@ version: '3' services: zookeeper: - image: wurstmeister/zookeeper:latest + image: bitnami/zookeeper:3.8.3 + environment: + ALLOW_ANONYMOUS_LOGIN: "true" gerrit1: image: gerritcodereview/gerrit:${GERRIT_IMAGE}
diff --git a/e2e-tests/test.sh b/e2e-tests/test.sh index b069565..58029ba 100755 --- a/e2e-tests/test.sh +++ b/e2e-tests/test.sh
@@ -16,11 +16,11 @@ LOCATION="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )" LOCAL_ENV="$( cd "${LOCATION}/../setup_local_env" >/dev/null 2>&1 && pwd )" -GERRIT_BRANCH=stable-3.6 +GERRIT_BRANCH=stable-3.7 GERRIT_CI=https://gerrit-ci.gerritforge.com/view/Plugins-$GERRIT_BRANCH/job LAST_BUILD=lastSuccessfulBuild/artifact/bazel-bin/plugins DEF_MULTISITE_LOCATION=${LOCATION}/../../../bazel-bin/plugins/multi-site/multi-site.jar -DEF_GERRIT_IMAGE=3.4.0-centos8 +DEF_GERRIT_IMAGE=3.7.4 DEF_GERRIT_HEALTHCHECK_START_PERIOD=60s DEF_GERRIT_HEALTHCHECK_INTERVAL=5s DEF_GERRIT_HEALTHCHECK_TIMEOUT=5s
diff --git a/setup_local_env/docker-compose-core.yaml b/setup_local_env/docker-compose-core.yaml index dab168d..f8ef318 100644 --- a/setup_local_env/docker-compose-core.yaml +++ b/setup_local_env/docker-compose-core.yaml
@@ -1,10 +1,12 @@ version: '3' services: zookeeper: - image: wurstmeister/zookeeper:latest + image: bitnami/zookeeper:3.8.3 ports: - "2181:2181" container_name: zk_test_node + environment: + ALLOW_ANONYMOUS_LOGIN: "true" prometheus: container_name: prometheus_test_node image: prom/prometheus:v2.16.0
diff --git a/setup_local_env/docker-compose-kafka.yaml b/setup_local_env/docker-compose-kafka.yaml index 2a5b0fc..70fda58 100644 --- a/setup_local_env/docker-compose-kafka.yaml +++ b/setup_local_env/docker-compose-kafka.yaml
@@ -1,13 +1,13 @@ version: '3' services: kafka: - image: wurstmeister/kafka:2.13-2.6.3 + image: bitnami/kafka:3.6.0 ports: - "9092:9092" container_name: kafka_test_node environment: - KAFKA_ADVERTISED_HOST_NAME: 127.0.0.1 - KAFKA_ZOOKEEPER_CONNECT: zookeeper:2181 + - KAFKA_CFG_ADVERTISED_LISTENERS=PLAINTEXT://localhost:9092 + - KAFKA_CFG_ZOOKEEPER_CONNECT=zookeeper:2181 networks: - setup_local_env_default networks:
diff --git a/setup_local_env/setup.sh b/setup_local_env/setup.sh index 7697f24..d5ded8c 100755 --- a/setup_local_env/setup.sh +++ b/setup_local_env/setup.sh
@@ -16,7 +16,7 @@ SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )" -GERRIT_BRANCH=stable-3.6 +GERRIT_BRANCH=stable-3.7 GERRIT_CI=https://gerrit-ci.gerritforge.com/view/Plugins-$GERRIT_BRANCH/job LAST_BUILD=lastSuccessfulBuild/artifact/bazel-bin/plugins
diff --git a/src/main/java/com/googlesource/gerrit/plugins/multisite/forwarder/ForwardedIndexChangeHandler.java b/src/main/java/com/googlesource/gerrit/plugins/multisite/forwarder/ForwardedIndexChangeHandler.java index 522a78f..b3fb27c 100644 --- a/src/main/java/com/googlesource/gerrit/plugins/multisite/forwarder/ForwardedIndexChangeHandler.java +++ b/src/main/java/com/googlesource/gerrit/plugins/multisite/forwarder/ForwardedIndexChangeHandler.java
@@ -95,7 +95,7 @@ Optional<ChangeNotes> changeNotes = checker.getChangeNotes(); ChangeNotes notes = changeNotes.get(); notes.reload(); - indexer.index(notes.getChange()); + indexer.index(notes); } }
diff --git a/src/test/java/com/googlesource/gerrit/plugins/multisite/forwarder/ForwardedIndexChangeHandlerTest.java b/src/test/java/com/googlesource/gerrit/plugins/multisite/forwarder/ForwardedIndexChangeHandlerTest.java index 2c4b157..7133a0d 100644 --- a/src/test/java/com/googlesource/gerrit/plugins/multisite/forwarder/ForwardedIndexChangeHandlerTest.java +++ b/src/test/java/com/googlesource/gerrit/plugins/multisite/forwarder/ForwardedIndexChangeHandlerTest.java
@@ -88,7 +88,6 @@ when(ctxMock.open()).thenReturn(manualRequestContextMock); id = Change.id(TEST_CHANGE_NUMBER); change = new Change(null, id, null, null, TimeUtil.now()); - when(changeNotes.getChange()).thenReturn(change); when(changeCheckerFactoryMock.create(any())).thenReturn(changeCheckerAbsentMock); when(configurationMock.index()).thenReturn(index); when(index.numStripedLocks()).thenReturn(10); @@ -102,7 +101,7 @@ public void changeIsIndexedWhenUpToDate() throws Exception { setupChangeAccessRelatedMocks(CHANGE_EXISTS, CHANGE_UP_TO_DATE, CHANGE_CONSISTENT); handler.index(TEST_CHANGE_ID, Operation.INDEX, Optional.empty()); - verify(indexerMock, times(1)).index(any(Change.class)); + verify(indexerMock, times(1)).index(any(ChangeNotes.class)); } @Test @@ -112,7 +111,7 @@ TEST_CHANGE_ID, Operation.INDEX, Optional.of(new ChangeIndexEvent("foo", 1, false, "instance-id"))); - verify(indexerMock, times(1)).index(any(Change.class)); + verify(indexerMock, times(1)).index(any(ChangeNotes.class)); } @Test @@ -127,14 +126,14 @@ TEST_CHANGE_ID, Operation.INDEX, Optional.of(new ChangeIndexEvent("foo", 1, false, "instance-id"))); - verify(indexerMock, never()).index(any(Change.class)); + verify(indexerMock, never()).index(any(ChangeNotes.class)); verify(indexExecutorMock, times(1)).schedule(any(Runnable.class), anyLong(), any()); handler.index( TEST_CHANGE_ID, Operation.INDEX, Optional.of(new ChangeIndexEvent("foo", 1, false, "instance-id"))); - verify(indexerMock, times(1)).index(any(Change.class)); + verify(indexerMock, times(1)).index(any(ChangeNotes.class)); } @Test @@ -172,13 +171,13 @@ return null; }) .when(indexerMock) - .index(any(Change.class)); + .index(any(ChangeNotes.class)); assertThat(Context.isForwardedEvent()).isFalse(); handler.index(TEST_CHANGE_ID, Operation.INDEX, Optional.empty()); assertThat(Context.isForwardedEvent()).isFalse(); - verify(indexerMock, times(1)).index(any(Change.class)); + verify(indexerMock, times(1)).index(any(ChangeNotes.class)); } @Test @@ -191,7 +190,7 @@ throw new IOException("someMessage"); }) .when(indexerMock) - .index(any(Change.class)); + .index(any(ChangeNotes.class)); assertThat(Context.isForwardedEvent()).isFalse(); IOException thrown = @@ -201,7 +200,7 @@ assertThat(thrown).hasMessageThat().isEqualTo("someMessage"); assertThat(Context.isForwardedEvent()).isFalse(); - verify(indexerMock, times(1)).index(any(Change.class)); + verify(indexerMock, times(1)).index(any(ChangeNotes.class)); } private void setupChangeAccessRelatedMocks(boolean changeExist, boolean changeUpToDate) @@ -226,7 +225,7 @@ when(changeCheckerFactoryMock.create(TEST_CHANGE_ID)).thenReturn(changeCheckerPresentMock); when(changeCheckerPresentMock.getChangeNotes()).thenReturn(Optional.of(changeNotes)); if (storageException) { - doThrow(new StorageException("io-error")).when(indexerMock).index(any(Change.class)); + doThrow(new StorageException("io-error")).when(indexerMock).index(any(ChangeNotes.class)); } }