svn commit: r1585276 - in /lucene/dev/branches/branch_4x/solr: ./ core/ core/src/test/org/apache/solr/cloud/OverseerRolesTest.java

[no...@apache.org]

Author: noble
Date: Sun Apr  6 10:19:02 2014
New Revision: 1585276

URL: http://svn.apache.org/r1585276
Log:
SOLR-5859 Fixing test errors

Modified:
    lucene/dev/branches/branch_4x/solr/   (props changed)
    lucene/dev/branches/branch_4x/solr/core/   (props changed)
    lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/cloud/OverseerRolesTest.java

Modified: lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/cloud/OverseerRolesTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/cloud/OverseerRolesTest.java?rev=1585276&r1=1585275&r2=1585276&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/cloud/OverseerRolesTest.java (original)
+++ lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/cloud/OverseerRolesTest.java Sun Apr  6 10:19:02 2014
@@ -91,8 +91,8 @@ public class OverseerRolesTest  extends 
 
   @Override
   public void doTest() throws Exception {
-    testOverseerRole();
     testQuitCommand();
+    testOverseerRole();
 
   }
 
@@ -110,11 +110,11 @@ public class OverseerRolesTest  extends 
     String s = (String) m.get("id");
     String leader = LeaderElector.getNodeName(s);
     Overseer.getInQueue(zk).offer(ZkStateReader.toJSON(new ZkNodeProps(Overseer.QUEUE_OPERATION, Overseer.QUIT)));
-    long timeout = System.currentTimeMillis()+5000;
+    long timeout = System.currentTimeMillis()+10000;
     String newLeader=null;
     for(;System.currentTimeMillis() < timeout;){
       newLeader = OverseerCollectionProcessor.getLeaderNode(zk);
-      if(!newLeader.equals(leader)) break;
+      if(newLeader!=null && !newLeader.equals(leader)) break;
       Thread.sleep(100);
     }
     assertNotSame( "Leader not changed yet",newLeader,leader);
@@ -197,13 +197,16 @@ public class OverseerRolesTest  extends 
     Matcher m = pattern.matcher(currentOverseer);
     JettySolrRunner stoppedJetty =null;
 
+    String hostPort = null;
+    StringBuilder sb = new StringBuilder();
     if(m.matches()){
-      String hostPort =  m.group(1)+":"+m.group(2);
+      hostPort =  m.group(1)+":"+m.group(2);
 
       log.info("hostPort : {}", hostPort);
 
       for (JettySolrRunner jetty : jettys) {
         String s = jetty.getBaseUrl().toString();
+        sb.append(s).append(" , ");
         if(s.contains(hostPort)){
           log.info("leader node {}",s);
           ChaosMonkey.stop(jetty);
@@ -223,23 +226,28 @@ public class OverseerRolesTest  extends 
 
       }
 
+    } else{
+      fail("pattern didn't match for"+currentOverseer );
     }
 
-    ChaosMonkey.start(stoppedJetty);
+    if(stoppedJetty !=null) {
+      ChaosMonkey.start(stoppedJetty);
 
-    timeout = System.currentTimeMillis()+10000;
-    leaderchanged = false;
-    for(;System.currentTimeMillis() < timeout;){
-      List<String> sortedNodeNames = getSortedOverseerNodeNames(client.getZkStateReader().getZkClient());
-      if(sortedNodeNames.get(1).equals(killedOverseer) || sortedNodeNames.get(0).equals(killedOverseer)){
-        leaderchanged =true;
-        break;
+      timeout = System.currentTimeMillis() + 10000;
+      leaderchanged = false;
+      for (; System.currentTimeMillis() < timeout; ) {
+        List<String> sortedNodeNames = getSortedOverseerNodeNames(client.getZkStateReader().getZkClient());
+        if (sortedNodeNames.get(1).equals(killedOverseer) || sortedNodeNames.get(0).equals(killedOverseer)) {
+          leaderchanged = true;
+          break;
+        }
+        Thread.sleep(100);
       }
-      Thread.sleep(100);
-    }
-
-    assertTrue("New overseer not the frontrunner : "+ getSortedOverseerNodeNames(client.getZkStateReader().getZkClient()) + " expected : "+ killedOverseer, leaderchanged);
 
+      assertTrue("New overseer not the frontrunner : " + getSortedOverseerNodeNames(client.getZkStateReader().getZkClient()) + " expected : " + killedOverseer, leaderchanged);
+    } else {
+      log.warn("The jetty where the overseer {} is running could not be located in {}",hostPort,sb);
+    }
   }
 
   private void setOverseerRole(CollectionAction action, String overseerDesignate) throws Exception, IOException {