Add remote recovery to ShardFollowTaskReplicationTests (#39007)

We simulate remote recovery in ShardFollowTaskReplicationTests by bootstrapping the follower with the safe commit of the leader. Relates #35975
elastic · Feb 18, 2019 · 25503ef · 25503ef
1 parent 268a3ad
commit 25503ef
Show file tree

Hide file tree

Showing 2 changed files with 301 additions and 221 deletions.
diff --git a/...rk/src/main/java/org/elasticsearch/index/replication/ESIndexLevelReplicationTestCase.java b/...rk/src/main/java/org/elasticsearch/index/replication/ESIndexLevelReplicationTestCase.java
@@ -267,9 +267,7 @@ public synchronized int startReplicas(int numOfReplicasToStart) throws IOExcepti
         }
 
         public void startPrimary() throws IOException {
-            final DiscoveryNode pNode = getDiscoveryNode(primary.routingEntry().currentNodeId());
-            primary.markAsRecovering("store", new RecoveryState(primary.routingEntry(), pNode, null));
-            primary.recoverFromStore();
+            recoverPrimary(primary);
             HashSet<String> activeIds = new HashSet<>();
             activeIds.addAll(activeIds());
             activeIds.add(primary.routingEntry().allocationId().getId());
@@ -302,6 +300,11 @@ assert shardRoutings().stream()
             updateAllocationIDsOnPrimary();
         }
 
+        protected synchronized void recoverPrimary(IndexShard primary) {
+            final DiscoveryNode pNode = getDiscoveryNode(primary.routingEntry().currentNodeId());
+            primary.markAsRecovering("store", new RecoveryState(primary.routingEntry(), pNode, null));
+            primary.recoverFromStore();
+        }
 
         public synchronized IndexShard addReplicaWithExistingPath(final ShardPath shardPath, final String nodeId) throws IOException {
             final ShardRouting shardRouting = TestShardRouting.newShardRouting(