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 2016/06/16 12:08:32 UTC
[02/50] [abbrv] lucene-solr:apiv2: SOLR-9199:
ZkController#publishAndWaitForDownStates logic is inefficient
SOLR-9199: ZkController#publishAndWaitForDownStates logic is inefficient
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/d55cc8f2
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/d55cc8f2
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/d55cc8f2
Branch: refs/heads/apiv2
Commit: d55cc8f293aec4ccc882b1a92ed450c9ec3877dc
Parents: 067fb25
Author: Gregory Chanan <gc...@cloudera.com>
Authored: Wed Jun 8 17:31:47 2016 -0700
Committer: Gregory Chanan <gc...@cloudera.com>
Committed: Thu Jun 9 13:24:29 2016 -0700
----------------------------------------------------------------------
solr/CHANGES.txt | 2 ++
.../src/java/org/apache/solr/cloud/ZkController.java | 11 ++++-------
2 files changed, 6 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/d55cc8f2/solr/CHANGES.txt
----------------------------------------------------------------------
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index c8e7c1f..ceb7a4a 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -52,6 +52,8 @@ Bug Fixes
* SOLR-9191: OverseerTaskQueue.peekTopN() fatally flawed (Scott Blum, Noble Paul)
+* SOLR-9199: ZkController#publishAndWaitForDownStates logic is inefficient (Hrishikesh Gadre)
+
================== 6.1.0 ==================
Upgrading from Solr any prior release
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/d55cc8f2/solr/core/src/java/org/apache/solr/cloud/ZkController.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/cloud/ZkController.java b/solr/core/src/java/org/apache/solr/cloud/ZkController.java
index b36e766..1388ee5 100644
--- a/solr/core/src/java/org/apache/solr/cloud/ZkController.java
+++ b/solr/core/src/java/org/apache/solr/cloud/ZkController.java
@@ -686,9 +686,9 @@ public final class ZkController {
// now wait till the updates are in our state
long now = System.nanoTime();
long timeout = now + TimeUnit.NANOSECONDS.convert(WAIT_DOWN_STATES_TIMEOUT_SECONDS, TimeUnit.SECONDS);
- boolean foundStates = true;
while (System.nanoTime() < timeout) {
+ boolean foundStates = true;
ClusterState clusterState = zkStateReader.getClusterState();
Map<String, DocCollection> collections = clusterState.getCollectionsMap();
for (Map.Entry<String, DocCollection> entry : collections.entrySet()) {
@@ -704,16 +704,13 @@ public final class ZkController {
}
}
+ Thread.sleep(1000);
if (foundStates) {
- Thread.sleep(1000);
- break;
+ return;
}
- Thread.sleep(1000);
- }
- if (!foundStates) {
- log.warn("Timed out waiting to see all nodes published as DOWN in our cluster state.");
}
+ log.warn("Timed out waiting to see all nodes published as DOWN in our cluster state.");
}
/**