honeymoose
/
OpenSearch
mirror of https://github.com/honeymoose/OpenSearch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Ensure test replicas have valid recovery state 

When starting a new replication group in an index level replication test
case, a started replica would not have a valid recovery state. This
violates simple assumptions as replicas always have to have recovered
before being started. This commit causes this to be the case that this
assumption is not violated too.
This commit is contained in:
Jason Tedor 2017-05-08 15:50:52 -04:00
parent 89b305c09e
commit 1de5bb8cd5
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
core/src/test/java/org/elasticsearch/index/replication/ESIndexLevelReplicationTestCase.java
View File

@ -209,6 +209,10 @@ public abstract class ESIndexLevelReplicationTestCase extends IndexShardTestCase
primary.markAsRecovering("store", new RecoveryState(primary.routingEntry(), pNode, null)); primary.markAsRecovering("store", new RecoveryState(primary.routingEntry(), pNode, null));
primary.recoverFromStore(); primary.recoverFromStore();
primary.updateRoutingEntry(ShardRoutingHelper.moveToStarted(primary.routingEntry())); primary.updateRoutingEntry(ShardRoutingHelper.moveToStarted(primary.routingEntry()));
for (final IndexShard replica : replicas) {
//replica.markAsRecovering("peer recovery", new RecoveryState(replica.routingEntry(), getDiscoveryNode(replica.routingEntry().currentNodeId()), pNode));
recoverReplica(replica);
}
updateAllocationIDsOnPrimary(); updateAllocationIDsOnPrimary();
} }

2
core/src/test/java/org/elasticsearch/index/replication/IndexLevelReplicationTests.java
View File

@ -77,7 +77,6 @@ public class IndexLevelReplicationTests extends ESIndexLevelReplicationTestCase
public void testAppendWhileRecovering() throws Exception { public void testAppendWhileRecovering() throws Exception {
try (ReplicationGroup shards = createGroup(0)) { try (ReplicationGroup shards = createGroup(0)) {
shards.startAll(); shards.startAll();
IndexShard replica = shards.addReplica();
CountDownLatch latch = new CountDownLatch(2); CountDownLatch latch = new CountDownLatch(2);
int numDocs = randomIntBetween(100, 200); int numDocs = randomIntBetween(100, 200);
shards.appendDocs(1);// just append one to the translog so we can assert below shards.appendDocs(1);// just append one to the translog so we can assert below
@ -94,6 +93,7 @@ public class IndexLevelReplicationTests extends ESIndexLevelReplicationTestCase
} }
}; };
thread.start(); thread.start();
IndexShard replica = shards.addReplica();
Future<Void> future = shards.asyncRecoverReplica(replica, (indexShard, node) Future<Void> future = shards.asyncRecoverReplica(replica, (indexShard, node)
-> new RecoveryTarget(indexShard, node, recoveryListener, version -> { -> new RecoveryTarget(indexShard, node, recoveryListener, version -> {
}) { }) {