Merge branch 'stable-3.1'
* stable-3.1:
Fix ReplicationIT flakiness by listing all persistent tasks
Revert "ReplicationIT: Retry/timeout on assertion of replication tasks count"
Revert "ReplicationIT: Increase timeout for tests"
Change-Id: I67824461340b6a693df18de59e11572ceed8ed7a
diff --git a/src/main/java/com/googlesource/gerrit/plugins/replication/ReplicationTasksStorage.java b/src/main/java/com/googlesource/gerrit/plugins/replication/ReplicationTasksStorage.java
index 992cf5b..e827d4f 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/replication/ReplicationTasksStorage.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/replication/ReplicationTasksStorage.java
@@ -194,6 +194,16 @@
return list(createDir(waitingUpdates));
}
+ @VisibleForTesting
+ public List<ReplicateRefUpdate> listRunning() {
+ return list(createDir(runningUpdates));
+ }
+
+ @VisibleForTesting
+ public List<ReplicateRefUpdate> listBuilding() {
+ return list(createDir(buildingUpdates));
+ }
+
private List<ReplicateRefUpdate> list(Path tasks) {
List<ReplicateRefUpdate> results = new ArrayList<>();
try (DirectoryStream<Path> events = Files.newDirectoryStream(tasks)) {
diff --git a/src/test/java/com/googlesource/gerrit/plugins/replication/ReplicationIT.java b/src/test/java/com/googlesource/gerrit/plugins/replication/ReplicationIT.java
index e7415f9..41f93b3 100644
--- a/src/test/java/com/googlesource/gerrit/plugins/replication/ReplicationIT.java
+++ b/src/test/java/com/googlesource/gerrit/plugins/replication/ReplicationIT.java
@@ -42,6 +42,7 @@
import java.util.Optional;
import java.util.function.Supplier;
import java.util.regex.Pattern;
+import java.util.stream.Stream;
import org.eclipse.jgit.lib.Constants;
import org.eclipse.jgit.lib.Ref;
import org.eclipse.jgit.lib.Repository;
@@ -60,7 +61,7 @@
private static final Optional<String> ALL_PROJECTS = Optional.empty();
private static final FluentLogger logger = FluentLogger.forEnclosingClass();
private static final int TEST_REPLICATION_DELAY = 1;
- private static final Duration TEST_TIMEOUT = Duration.ofSeconds(TEST_REPLICATION_DELAY * 4);
+ private static final Duration TEST_TIMEOUT = Duration.ofSeconds(TEST_REPLICATION_DELAY * 2);
@Inject private SitePaths sitePaths;
@Inject private ProjectOperations projectOperations;
@@ -98,7 +99,7 @@
Project.NameKey sourceProject = createTestProject("foo");
- assertReplicationTaskCount("refs/meta/config", 1);
+ assertThat(listReplicationTasks("refs/meta/config")).hasSize(1);
waitUntil(() -> projectExists(Project.nameKey(sourceProject + "replica.git")));
@@ -117,7 +118,7 @@
RevCommit sourceCommit = pushResult.getCommit();
String sourceRef = pushResult.getPatchSet().refName();
- assertReplicationTaskCount("refs/changes/\\d*/\\d*/\\d*", 1);
+ assertThat(listReplicationTasks("refs/changes/\\d*/\\d*/\\d*")).hasSize(1);
try (Repository repo = repoManager.openRepository(targetProject)) {
waitUntil(() -> checkedGetRef(repo, sourceRef) != null);
@@ -140,7 +141,7 @@
input.revision = master;
gApi.projects().name(project.get()).branch(newBranch).create(input);
- assertReplicationTaskCount("refs/heads/(mybranch|master)", 2);
+ assertThat(listReplicationTasks("refs/heads/(mybranch|master)")).hasSize(2);
try (Repository repo = repoManager.openRepository(targetProject);
Repository sourceRepo = repoManager.openRepository(project)) {
@@ -166,7 +167,7 @@
RevCommit sourceCommit = pushResult.getCommit();
String sourceRef = pushResult.getPatchSet().refName();
- assertReplicationTaskCount("refs/changes/\\d*/\\d*/\\d*", 2);
+ assertThat(listReplicationTasks("refs/changes/\\d*/\\d*/\\d*")).hasSize(2);
try (Repository repo1 = repoManager.openRepository(targetProject1);
Repository repo2 = repoManager.openRepository(targetProject2)) {
@@ -198,7 +199,7 @@
createChange();
- assertReplicationTaskCount("refs/changes/\\d*/\\d*/\\d*", 4);
+ assertThat(listReplicationTasks("refs/changes/\\d*/\\d*/\\d*")).hasSize(4);
setReplicationDestination("foo1", replicaSuffixes, ALL_PROJECTS);
setReplicationDestination("foo2", replicaSuffixes, ALL_PROJECTS);
@@ -234,7 +235,7 @@
.getInstance(ReplicationQueue.class)
.scheduleFullSync(project, null, new ReplicationState(pushResultProcessing), true);
- assertReplicationTaskCount(".*all.*", 1);
+ assertThat(listReplicationTasks(".*all.*")).hasSize(1);
}
@Test
@@ -397,13 +398,12 @@
return projectOperations.newProject().name(name).create();
}
- private void assertReplicationTaskCount(String refRegex, int expectedCount) throws Exception {
- waitUntil(() -> listReplicationTasks(refRegex).size() == expectedCount);
- }
-
private List<ReplicateRefUpdate> listReplicationTasks(String refRegex) {
Pattern refmaskPattern = Pattern.compile(refRegex);
- return tasksStorage.listWaiting().stream()
+ return Stream.concat(
+ tasksStorage.listWaiting().stream(),
+ Stream.concat(
+ tasksStorage.listBuilding().stream(), tasksStorage.listRunning().stream()))
.filter(task -> refmaskPattern.matcher(task.ref).matches())
.collect(toList());
}
