svn commit: r1446926 - /lucene/dev/trunk/solr/core/src/java/org/apache/solr/cloud/ZkController.java

[ma...@apache.org]

Author: markrmiller
Date: Sat Feb 16 19:17:43 2013
New Revision: 1446926

URL: http://svn.apache.org/r1446926
Log:
SOLR-4421,SOLR-4165: Fix wait loop to sleep, reduce max wait time, wait min 1 second

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

Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/cloud/ZkController.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/cloud/ZkController.java?rev=1446926&r1=1446925&r2=1446926&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/cloud/ZkController.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/cloud/ZkController.java Sat Feb 16 19:17:43 2013
@@ -564,7 +564,7 @@ public final class ZkController {
     
     // now wait till the updates are in our state
     long now = System.currentTimeMillis();
-    long timeout = now + 1000 * 300;
+    long timeout = now + 1000 * 30;
     boolean foundStates = false;
     while (System.currentTimeMillis() < timeout) {
       clusterState = zkStateReader.getClusterState();
@@ -586,8 +586,10 @@ public final class ZkController {
       
       if (updatedNodes.size() == 0) {
         foundStates = true;
+        Thread.sleep(1000);
         break;
       }
+      Thread.sleep(1000);
     }
     if (!foundStates) {
       log.warn("Timed out waiting to see all nodes published as DOWN in our cluster state.");