commit d614bfad94a6310eced5579a879ef1a9eb2e9f9a
author Marcin Czech <maczech@gmail.com> Fri May 22 17:57:53 2020 +0200
committer Marcin Czech <maczech@gmail.com> Fri May 29 10:32:31 2020 +0200
tree 44aec9ee5fe95162301c3212e6759105a4a37622
parent eca2eb3bc0c461e6d9280725d5304ec375094d0e

Add e2e test to check if all task data are cleaned up

Issue with cleaning up tasks after replication caused situation when
URI locks were never released and replication for that URI was blocked.
This issue has been fixed on stable-3.1. Add e2e test to make
sure that locks are released and prevent future regression.

Bug: Issue 12754
Change-Id: Idc25d8ac6037cb18c262746f187e217affb13aa8

src/test/java/com/googlesource/gerrit/plugins/replication/ReplicationIT.java

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 3eb6baf..61d0b9b 100644
--- a/src/test/java/com/googlesource/gerrit/plugins/replication/ReplicationIT.java
+++ b/src/test/java/com/googlesource/gerrit/plugins/replication/ReplicationIT.java
@@ -73,6 +73,7 @@
   private Path gitPath;
   private Path storagePath;
   private FileBasedConfig config;
+  private ReplicationConfig replicationConfig;
   private ReplicationTasksStorage tasksStorage;
 
   @Override
@@ -90,6 +91,7 @@
     super.setUpTestPlugin();
 
     pluginDataDir = plugin.getSysInjector().getInstance(Key.get(Path.class, PluginData.class));
+    replicationConfig = plugin.getSysInjector().getInstance(ReplicationConfig.class);
     storagePath = pluginDataDir.resolve("ref-updates");
     tasksStorage = plugin.getSysInjector().getInstance(ReplicationTasksStorage.class);
     cleanupReplicationTasks();
@@ -400,6 +402,20 @@
     waitUntil(() -> tasksStorage.listRunning().size() == 0);
   }
 
+  @Test
+  public void shouldCleanupBothTasksAndLocksAfterNewProjectReplication() throws Exception {
+    tasksStorage.disableDeleteForTesting(false);
+    setReplicationDestination("task_cleanup_locks_project", "replica", ALL_PROJECTS);
+    config.setInt("remote", "task_cleanup_locks_project", "replicationRetry", 0);
+    config.save();
+    reloadConfig();
+    assertThat(tasksStorage.listRunning()).hasSize(0);
+    Project.NameKey sourceProject = createTestProject("task_cleanup_locks_project");
+
+    waitUntil(() -> nonEmptyProjectExists(Project.nameKey(sourceProject + "replica.git")));
+    waitUntil(() -> isTaskCleanedUp());
+  }
+
   private Ref getRef(Repository repo, String branchName) throws IOException {
     return repo.getRefDatabase().exactRef(branchName);
   }
@@ -499,6 +515,16 @@
     }
   }
 
+  private boolean isTaskCleanedUp() {
+    Path refUpdates = replicationConfig.getEventsDirectory().resolve("ref-updates");
+    Path runningUpdates = refUpdates.resolve("running");
+    try {
+      return Files.list(runningUpdates).count() == 0;
+    } catch (IOException e) {
+      throw new RuntimeException(e.getMessage(), e);
+    }
+  }
+
   private boolean nonEmptyProjectExists(Project.NameKey name) {
     try (Repository r = repoManager.openRepository(name)) {
       return !r.getAllRefsByPeeledObjectId().isEmpty();