Apache
/
lucene
mirror of https://github.com/apache/lucene.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

SOLR-11452: testOutOfOrderDBQWithInPlaceUpdates test should wait for new replica gets elected first

This commit is contained in:
Cao Manh Dat 2017-10-23 10:19:43 +07:00
parent 2cd434e786
commit 79f31d1d34
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
solr/core/src/test/org/apache/solr/cloud/TestTlogReplica.java
View File

@ -464,12 +464,12 @@ public class TestTlogReplica extends SolrCloudTestCase {
{ {
long docsPending = (long) getSolrCore(true).get(0).getMetricRegistry().getGauges().get("UPDATE.updateHandler.docsPending").getValue(); long docsPending = (long) getSolrCore(true).get(0).getMetricRegistry().getGauges().get("UPDATE.updateHandler.docsPending").getValue();
assertEquals(4, docsPending); assertEquals("Expected 4 docs are pending in core " + getSolrCore(true).get(0).getCoreDescriptor(),4, docsPending);
} }
for (SolrCore solrCore : getSolrCore(false)) { for (SolrCore solrCore : getSolrCore(false)) {
long docsPending = (long) solrCore.getMetricRegistry().getGauges().get("UPDATE.updateHandler.docsPending").getValue(); long docsPending = (long) solrCore.getMetricRegistry().getGauges().get("UPDATE.updateHandler.docsPending").getValue();
assertEquals(0, docsPending); assertEquals("Expected non docs are pending in core " + solrCore.getCoreDescriptor(),0, docsPending);
} }
checkRTG(1, 4, cluster.getJettySolrRunners()); checkRTG(1, 4, cluster.getJettySolrRunners());
@ -673,8 +673,12 @@ public class TestTlogReplica extends SolrCloudTestCase {
} }
} }
JettySolrRunner oldLeaderJetty = getSolrRunner(true).get(0); JettySolrRunner oldLeaderJetty = getSolrRunner(true).get(0);
String oldLeaderNodeName = oldLeaderJetty.getNodeName();
ChaosMonkey.kill(oldLeaderJetty); ChaosMonkey.kill(oldLeaderJetty);
waitForState("Replica not removed", collectionName, activeReplicaCount(0, 1, 0)); waitForState("Replica not removed", collectionName, activeReplicaCount(0, 1, 0));
waitForState("Expect new leader", collectionName, (liveNodes, collectionState) ->
!collectionState.getLeader("shard1").getNodeName().equals(oldLeaderNodeName)
);
ChaosMonkey.start(oldLeaderJetty); ChaosMonkey.start(oldLeaderJetty);
waitForState("Replica not added", collectionName, activeReplicaCount(0, 2, 0)); waitForState("Replica not added", collectionName, activeReplicaCount(0, 2, 0));
checkRTG(1,1, cluster.getJettySolrRunners()); checkRTG(1,1, cluster.getJettySolrRunners());