Merge branch 'stable-2.16' into stable-3.0
* stable-2.16:
Fix test build rule to include *IT tests
ReplicationIT: Do not use deprecated getRef()
First ReplicationIT test for new project and change
Revert "Delete event file only after replication completed for all destinations"
Adjust ReplicationIT to use ProjectOperations and compose the project name
accordingly.
Change-Id: I6cf94217e745da88b3343e2a8fd3d9a85884ca79
diff --git a/BUILD b/BUILD
index b6494b5..17ddf50 100644
--- a/BUILD
+++ b/BUILD
@@ -20,7 +20,10 @@
junit_tests(
name = "replication_tests",
- srcs = glob(["src/test/java/**/*Test.java"]),
+ srcs = glob([
+ "src/test/java/**/*Test.java",
+ "src/test/java/**/*IT.java",
+ ]),
tags = ["replication"],
visibility = ["//visibility:public"],
deps = PLUGIN_TEST_DEPS + PLUGIN_DEPS + [
diff --git a/src/main/java/com/googlesource/gerrit/plugins/replication/AutoReloadConfigDecorator.java b/src/main/java/com/googlesource/gerrit/plugins/replication/AutoReloadConfigDecorator.java
index 171069d..21c3960 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/replication/AutoReloadConfigDecorator.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/replication/AutoReloadConfigDecorator.java
@@ -13,6 +13,7 @@
// limitations under the License.
package com.googlesource.gerrit.plugins.replication;
+import com.google.common.annotations.VisibleForTesting;
import com.google.common.collect.Multimap;
import com.google.common.flogger.FluentLogger;
import com.google.gerrit.common.FileUtil;
@@ -95,15 +96,25 @@
}
private synchronized void reloadIfNeeded() {
- if (isAutoReload()) {
+ reload(false);
+ }
+
+ @VisibleForTesting
+ public void forceReload() {
+ reload(true);
+ }
+
+ private void reload(boolean force) {
+ if (force || isAutoReload()) {
ReplicationQueue queue = replicationQueue.get();
long lastModified = getLastModified(currentConfig);
try {
- if (lastModified > currentConfigTs
- && lastModified > lastFailedConfigTs
- && queue.isRunning()
- && !queue.isReplaying()) {
+ if (force
+ || (lastModified > currentConfigTs
+ && lastModified > lastFailedConfigTs
+ && queue.isRunning()
+ && !queue.isReplaying())) {
queue.stop();
currentConfig = loadConfig();
currentConfigTs = lastModified;
diff --git a/src/main/java/com/googlesource/gerrit/plugins/replication/ReplicationState.java b/src/main/java/com/googlesource/gerrit/plugins/replication/ReplicationState.java
index ec878db..6f0803a 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/replication/ReplicationState.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/replication/ReplicationState.java
@@ -86,6 +86,7 @@
URIish uri,
RefPushResult status,
RemoteRefUpdate.Status refUpdateStatus) {
+ deleteEvent();
pushResultProcessing.onRefReplicatedToOneNode(project, ref, uri, status, refUpdateStatus);
RefReplicationStatus completedRefStatus = null;
@@ -115,6 +116,12 @@
}
}
+ private void deleteEvent() {
+ if (eventKey != null) {
+ eventsStorage.delete(eventKey);
+ }
+ }
+
public void markAllPushTasksScheduled() {
countingLock.lock();
try {
@@ -145,17 +152,10 @@
}
private void doRefPushTasksCompleted(RefReplicationStatus refStatus) {
- deleteEvent();
pushResultProcessing.onRefReplicatedToAllNodes(
refStatus.project, refStatus.ref, refStatus.nodesToReplicateCount);
}
- private void deleteEvent() {
- if (eventKey != null) {
- eventsStorage.delete(eventKey);
- }
- }
-
private RefReplicationStatus getRefStatus(String project, String ref) {
if (!statusByProjectRef.contains(project, ref)) {
RefReplicationStatus refStatus = new RefReplicationStatus(project, ref);
diff --git a/src/test/java/com/googlesource/gerrit/plugins/replication/ReplicationIT.java b/src/test/java/com/googlesource/gerrit/plugins/replication/ReplicationIT.java
new file mode 100644
index 0000000..fe800b0
--- /dev/null
+++ b/src/test/java/com/googlesource/gerrit/plugins/replication/ReplicationIT.java
@@ -0,0 +1,134 @@
+// Copyright (C) 2019 The Android Open Source Project
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package com.googlesource.gerrit.plugins.replication;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import com.google.common.base.Stopwatch;
+import com.google.gerrit.acceptance.LightweightPluginDaemonTest;
+import com.google.gerrit.acceptance.PushOneCommit.Result;
+import com.google.gerrit.acceptance.TestPlugin;
+import com.google.gerrit.acceptance.UseLocalDisk;
+import com.google.gerrit.acceptance.testsuite.project.ProjectOperations;
+import com.google.gerrit.extensions.common.ProjectInfo;
+import com.google.gerrit.reviewdb.client.Project;
+import com.google.gerrit.server.config.SitePaths;
+import com.google.inject.Inject;
+import java.io.IOException;
+import java.nio.file.Path;
+import java.time.Duration;
+import java.util.concurrent.TimeUnit;
+import java.util.function.Supplier;
+import org.eclipse.jgit.lib.Ref;
+import org.eclipse.jgit.lib.Repository;
+import org.eclipse.jgit.revwalk.RevCommit;
+import org.eclipse.jgit.storage.file.FileBasedConfig;
+import org.eclipse.jgit.util.FS;
+import org.junit.Test;
+
+@UseLocalDisk
+@TestPlugin(
+ name = "replication",
+ sysModule = "com.googlesource.gerrit.plugins.replication.ReplicationModule")
+public class ReplicationIT extends LightweightPluginDaemonTest {
+ private static final int TEST_REPLICATION_DELAY = 1;
+ private static final Duration TEST_TIMEMOUT = Duration.ofSeconds(TEST_REPLICATION_DELAY * 10);
+
+ @Inject private SitePaths sitePaths;
+ @Inject private ProjectOperations projectOperations;
+ private Path gitPath;
+ private FileBasedConfig config;
+
+ @Override
+ public void setUpTestPlugin() throws Exception {
+ config =
+ new FileBasedConfig(sitePaths.etc_dir.resolve("replication.config").toFile(), FS.DETECTED);
+ config.save();
+
+ gitPath = sitePaths.site_path.resolve("git");
+
+ super.setUpTestPlugin();
+ }
+
+ @Test
+ public void shouldReplicateNewProject() throws Exception {
+ setReplicationDestination("foo", "replica");
+
+ Project.NameKey sourceProject = projectOperations.newProject().name("foo").create();
+ waitUntil(() -> gitPath.resolve(sourceProject + "replica.git").toFile().isDirectory());
+
+ ProjectInfo replicaProject = gApi.projects().name(sourceProject + "replica").get();
+ assertThat(replicaProject).isNotNull();
+ }
+
+ @Test
+ public void shouldReplicateNewBranch() throws Exception {
+ setReplicationDestination("foo", "replica");
+
+ Project.NameKey targetProject =
+ projectOperations.newProject().name(project + "replica").create();
+
+ Result pushResult = createChange();
+ RevCommit sourceCommit = pushResult.getCommit();
+ String sourceRef = pushResult.getPatchSet().getRefName();
+
+ waitUntil(() -> getRef(getRepo(targetProject), sourceRef) != null);
+
+ Ref targetBranchRef = getRef(getRepo(targetProject), sourceRef);
+ assertThat(targetBranchRef).isNotNull();
+ assertThat(targetBranchRef.getObjectId()).isEqualTo(sourceCommit.getId());
+ }
+
+ private Repository getRepo(Project.NameKey targetProject) {
+ try {
+ return repoManager.openRepository(targetProject);
+ } catch (Exception e) {
+ e.printStackTrace();
+ return null;
+ }
+ }
+
+ private Ref getRef(Repository repo, String branchName) {
+ try {
+ return repo.getRefDatabase().exactRef(branchName);
+ } catch (IOException e) {
+ e.printStackTrace();
+ return null;
+ }
+ }
+
+ private void setReplicationDestination(String remoteName, String replicaSuffix)
+ throws IOException {
+ config.setString(
+ "remote",
+ remoteName,
+ "url",
+ gitPath.resolve("${name}" + replicaSuffix + ".git").toString());
+ config.setInt("remote", remoteName, "replicationDelay", TEST_REPLICATION_DELAY);
+ config.save();
+ reloadConfig();
+ }
+
+ private void waitUntil(Supplier<Boolean> waitCondition) throws InterruptedException {
+ Stopwatch stopwatch = Stopwatch.createStarted();
+ while (!waitCondition.get() && stopwatch.elapsed().compareTo(TEST_TIMEMOUT) < 0) {
+ TimeUnit.SECONDS.sleep(1);
+ }
+ }
+
+ private void reloadConfig() {
+ plugin.getSysInjector().getInstance(AutoReloadConfigDecorator.class).forceReload();
+ }
+}
