Rename ReplicationTasksStorage.resetAll() to ReplicationTasksStorage.recoverAll()
This method is called on startup to recover all running tasks to
their initial waiting state. Renaming this method to recoverAll()
would explain its behaviour aptly.
Change-Id: I8e92590f5939a575368977622b2c7bcb02868c7d
diff --git a/src/main/java/com/googlesource/gerrit/plugins/replication/ReplicationQueue.java b/src/main/java/com/googlesource/gerrit/plugins/replication/ReplicationQueue.java
index 9932628..3b22fa1 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/replication/ReplicationQueue.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/replication/ReplicationQueue.java
@@ -86,7 +86,7 @@
if (!running) {
destinations.get().startup(workQueue);
running = true;
- replicationTasksStorage.resetAll();
+ replicationTasksStorage.recoverAll();
firePendingEvents();
fireBeforeStartupEvents();
distributor = new Distributor(workQueue);
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 b996a33..d6cc8be 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/replication/ReplicationTasksStorage.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/replication/ReplicationTasksStorage.java
@@ -139,8 +139,8 @@
}
}
- public synchronized void resetAll() {
- streamRunning().forEach(r -> new Task(r).reset());
+ public synchronized void recoverAll() {
+ streamRunning().forEach(r -> new Task(r).recover());
}
public boolean isWaiting(UriUpdates uriUpdates) {
@@ -236,6 +236,10 @@
rename(running, waiting);
}
+ public void recover() {
+ rename(running, waiting);
+ }
+
public boolean isWaiting() {
return Files.exists(waiting);
}
diff --git a/src/test/java/com/googlesource/gerrit/plugins/replication/ReplicationTasksStorageMPTest.java b/src/test/java/com/googlesource/gerrit/plugins/replication/ReplicationTasksStorageMPTest.java
index b5c01b9..25752b4 100644
--- a/src/test/java/com/googlesource/gerrit/plugins/replication/ReplicationTasksStorageMPTest.java
+++ b/src/test/java/com/googlesource/gerrit/plugins/replication/ReplicationTasksStorageMPTest.java
@@ -127,11 +127,11 @@
}
@Test
- public void canBeResetAllAndCompletedByOtherNode() {
+ public void canBeRecoveredAndCompletedByOtherNode() {
nodeA.create(REF_UPDATE);
nodeA.start(URI_UPDATES);
- nodeB.resetAll();
+ nodeB.recoverAll();
assertThatStream(persistedView.streamWaiting()).containsExactly(REF_UPDATE);
nodeB.start(URI_UPDATES);
@@ -146,10 +146,10 @@
}
@Test
- public void canBeResetAllAndCompletedByOtherNodeFastOriginalNode() {
+ public void canBeRecoveredAndCompletedByOtherNodeFastOriginalNode() {
nodeA.create(REF_UPDATE);
nodeA.start(URI_UPDATES);
- nodeB.resetAll();
+ nodeB.recoverAll();
nodeA.finish(URI_UPDATES);
assertThatStream(persistedView.streamWaiting()).containsExactly(REF_UPDATE);
@@ -162,10 +162,10 @@
}
@Test
- public void canBeResetAllAndCompletedByOtherNodeSlowOriginalNode() {
+ public void canBeRecoveredAndCompletedByOtherNodeSlowOriginalNode() {
nodeA.create(REF_UPDATE);
nodeA.start(URI_UPDATES);
- nodeB.resetAll();
+ nodeB.recoverAll();
nodeB.start(URI_UPDATES);
assertThatStream(persistedView.streamRunning()).containsExactly(REF_UPDATE);
diff --git a/src/test/java/com/googlesource/gerrit/plugins/replication/ReplicationTasksStorageTaskMPTest.java b/src/test/java/com/googlesource/gerrit/plugins/replication/ReplicationTasksStorageTaskMPTest.java
index b646bc6..202cac9 100644
--- a/src/test/java/com/googlesource/gerrit/plugins/replication/ReplicationTasksStorageTaskMPTest.java
+++ b/src/test/java/com/googlesource/gerrit/plugins/replication/ReplicationTasksStorageTaskMPTest.java
@@ -132,11 +132,11 @@
}
@Test
- public void canBeResetAllAndCompletedByOtherNode() {
+ public void canBeRecoveredAndCompletedByOtherNode() {
taskA.create();
taskA.start();
- nodeB.resetAll();
+ nodeB.recoverAll();
assertIsWaiting(taskA);
taskB.create();
@@ -155,10 +155,10 @@
}
@Test
- public void resetAllAndCompletedByOtherNodeWhenTaskAFinishesBeforeTaskB() {
+ public void recoveredAndCompletedByOtherNodeWhenTaskAFinishesBeforeTaskB() {
taskA.create();
taskA.start();
- nodeB.resetAll();
+ nodeB.recoverAll();
taskA.finish();
assertIsWaiting(taskA);
@@ -174,10 +174,10 @@
}
@Test
- public void resetAllAndCompletedByOtherNodeWhenTaskAFinishesAfterTaskB() {
+ public void recoveredAndCompletedByOtherNodeWhenTaskAFinishesAfterTaskB() {
taskA.create();
taskA.start();
- nodeB.resetAll();
+ nodeB.recoverAll();
taskB.start();
assertIsRunning(taskA);
diff --git a/src/test/java/com/googlesource/gerrit/plugins/replication/ReplicationTasksStorageTest.java b/src/test/java/com/googlesource/gerrit/plugins/replication/ReplicationTasksStorageTest.java
index 4b1a827..48e145b 100644
--- a/src/test/java/com/googlesource/gerrit/plugins/replication/ReplicationTasksStorageTest.java
+++ b/src/test/java/com/googlesource/gerrit/plugins/replication/ReplicationTasksStorageTest.java
@@ -262,27 +262,27 @@
}
@Test
- public void canResetAllEmpty() throws Exception {
- storage.resetAll();
+ public void canRecoverEmpty() throws Exception {
+ storage.recoverAll();
assertNoIncompleteTasks(storage);
}
@Test
- public void canResetAllUpdate() throws Exception {
+ public void canRecoverUpdate() throws Exception {
storage.create(REF_UPDATE);
storage.start(uriUpdates);
- storage.resetAll();
+ storage.recoverAll();
assertThatStream(storage.streamWaiting()).containsExactly(REF_UPDATE);
assertThatStream(storage.streamRunning()).isEmpty();
assertTrue(storage.isWaiting(uriUpdates));
}
@Test
- public void canCompleteResetAllUpdate() throws Exception {
+ public void canCompleteRecoveredUpdate() throws Exception {
storage.create(REF_UPDATE);
storage.start(uriUpdates);
- storage.resetAll();
+ storage.recoverAll();
storage.start(uriUpdates);
assertThatStream(storage.streamRunning()).containsExactly(REF_UPDATE);
@@ -294,7 +294,7 @@
}
@Test
- public void canResetAllMultipleUpdates() throws Exception {
+ public void canRecoverMultipleUpdates() throws Exception {
ReplicateRefUpdate updateB =
ReplicateRefUpdate.create(
PROJECT,
@@ -307,12 +307,12 @@
storage.start(uriUpdates);
storage.start(uriUpdatesB);
- storage.resetAll();
+ storage.recoverAll();
assertThatStream(storage.streamWaiting()).containsExactly(REF_UPDATE, updateB);
}
@Test
- public void canCompleteMultipleResetAllUpdates() throws Exception {
+ public void canCompleteMultipleRecoveredUpdates() throws Exception {
ReplicateRefUpdate updateB =
ReplicateRefUpdate.create(
PROJECT,
@@ -324,7 +324,7 @@
storage.create(updateB);
storage.start(uriUpdates);
storage.start(uriUpdatesB);
- storage.resetAll();
+ storage.recoverAll();
storage.start(uriUpdates);
assertThatStream(storage.streamRunning()).containsExactly(REF_UPDATE);
