You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by no...@apache.org on 2015/11/08 15:42:32 UTC

svn commit: r1713231 - /lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/OverseerTest.java

Author: noble
Date: Sun Nov  8 14:42:32 2015
New Revision: 1713231

URL: http://svn.apache.org/viewvc?rev=1713231&view=rev
Log:
SOLR-8249: Addressing the test failures due to Leader election changes

Modified:
    lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/OverseerTest.java

Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/OverseerTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/OverseerTest.java?rev=1713231&r1=1713230&r2=1713231&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/OverseerTest.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/OverseerTest.java Sun Nov  8 14:42:32 2015
@@ -718,8 +718,17 @@ public class OverseerTest extends SolrTe
 
       mockController.publishState(collection, "core1", "core_node1", Replica.State.RECOVERING, 1);
 
+      // Wait till the leader election has finished
+      long maxWaitTimeForLeaderElection = 5000;
+      for (int i = 0; i < maxWaitTimeForLeaderElection / 200; i++) {
+        if (overseer.getStats().getSuccessCount(OverseerAction.LEADER.toLower()) > 0) {
+          break;
+        }
+        Thread.sleep(200);
+      }
       assertNotNull(overseer.getStats());
-      assertEquals(1, (overseer.getStats().getSuccessCount(OverseerAction.STATE.toLower())));
+      assertEquals(1, (overseer.getStats().getSuccessCount(OverseerAction.LEADER.toLower())));
+      assertTrue((overseer.getStats().getSuccessCount(OverseerAction.STATE.toLower())) > 0);
 
       // shut it down
       overseer.close();
@@ -730,6 +739,7 @@ public class OverseerTest extends SolrTe
       overseerElector.joinElection(ec, false);
       assertNotNull(overseer.getStats());
       assertEquals(0, (overseer.getStats().getSuccessCount(OverseerAction.STATE.toLower())));
+      assertEquals(0, (overseer.getStats().getSuccessCount(OverseerAction.LEADER.toLower())));
 
     } finally {
       close(mockController);