You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by sa...@apache.org on 2017/07/28 17:59:34 UTC
[3/6] lucene-solr:branch_7x: SOLR-10756: Undeprecate
ZkStateReader.updateClusterState(), mark as @lucene.internal,
and rename to forciblyRefreshAllClusterStateSlow().
SOLR-10756: Undeprecate ZkStateReader.updateClusterState(), mark as @lucene.internal, and rename to forciblyRefreshAllClusterStateSlow().
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/15b7403a
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/15b7403a
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/15b7403a
Branch: refs/heads/branch_7x
Commit: 15b7403addfa6df73ca8b154f56668ef6764e4c5
Parents: d838a7a
Author: Steve Rowe <sa...@apache.org>
Authored: Fri Jul 28 13:52:13 2017 -0400
Committer: Steve Rowe <sa...@apache.org>
Committed: Fri Jul 28 13:53:25 2017 -0400
----------------------------------------------------------------------
solr/CHANGES.txt | 3 +++
solr/core/src/java/org/apache/solr/cloud/Overseer.java | 2 +-
.../apache/solr/cloud/TestTolerantUpdateProcessorCloud.java | 2 +-
.../src/java/org/apache/solr/common/cloud/ZkStateReader.java | 7 ++++---
4 files changed, 9 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/15b7403a/solr/CHANGES.txt
----------------------------------------------------------------------
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index f08f4fb..6b642a5 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -558,6 +558,9 @@ Other Changes
* SOLR-11155: /analysis/field and /analysis/document requests should support points fields.
(Jason Gerlowski, Steve Rowe)
+
+* SOLR-10756: Undeprecate ZkStateReader.updateClusterState(), mark as @lucene.internal, and rename to
+ forciblyRefreshAllClusterStateSlow().
================== 6.7.0 ==================
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/15b7403a/solr/core/src/java/org/apache/solr/cloud/Overseer.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/cloud/Overseer.java b/solr/core/src/java/org/apache/solr/cloud/Overseer.java
index 521434a..7dd85bc 100644
--- a/solr/core/src/java/org/apache/solr/cloud/Overseer.java
+++ b/solr/core/src/java/org/apache/solr/cloud/Overseer.java
@@ -142,7 +142,7 @@ public class Overseer implements Closeable {
//TODO consider removing 'refreshClusterState' and simply check if clusterState is null
if (refreshClusterState) {
try {
- reader.updateClusterState();
+ reader.forciblyRefreshAllClusterStateSlow();
clusterState = reader.getClusterState();
zkStateWriter = new ZkStateWriter(reader, stats);
refreshClusterState = false;
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/15b7403a/solr/core/src/test/org/apache/solr/cloud/TestTolerantUpdateProcessorCloud.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/cloud/TestTolerantUpdateProcessorCloud.java b/solr/core/src/test/org/apache/solr/cloud/TestTolerantUpdateProcessorCloud.java
index f66f892..8641720 100644
--- a/solr/core/src/test/org/apache/solr/cloud/TestTolerantUpdateProcessorCloud.java
+++ b/solr/core/src/test/org/apache/solr/cloud/TestTolerantUpdateProcessorCloud.java
@@ -132,7 +132,7 @@ public class TestTolerantUpdateProcessorCloud extends SolrCloudTestCase {
String nodeKey = jettyURL.getHost() + ":" + jettyURL.getPort() + jettyURL.getPath().replace("/","_");
urlMap.put(nodeKey, jettyURL.toString());
}
- zkStateReader.updateClusterState();
+ zkStateReader.forceUpdateCollection(COLLECTION_NAME);
ClusterState clusterState = zkStateReader.getClusterState();
for (Slice slice : clusterState.getSlices(COLLECTION_NAME)) {
String shardName = slice.getName();
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/15b7403a/solr/solrj/src/java/org/apache/solr/common/cloud/ZkStateReader.java
----------------------------------------------------------------------
diff --git a/solr/solrj/src/java/org/apache/solr/common/cloud/ZkStateReader.java b/solr/solrj/src/java/org/apache/solr/common/cloud/ZkStateReader.java
index 1b03534..c01f15b 100644
--- a/solr/solrj/src/java/org/apache/solr/common/cloud/ZkStateReader.java
+++ b/solr/solrj/src/java/org/apache/solr/common/cloud/ZkStateReader.java
@@ -261,10 +261,11 @@ public class ZkStateReader implements Closeable {
/**
* Forcibly refresh cluster state from ZK. Do this only to avoid race conditions because it's expensive.
*
- * @deprecated Don't call this, call {@link #forceUpdateCollection(String)} on a single collection if you must.
+ * It is cheaper to call {@link #forceUpdateCollection(String)} on a single collection if you must.
+ *
+ * @lucene.internal
*/
- @Deprecated
- public void updateClusterState() throws KeeperException, InterruptedException {
+ public void forciblyRefreshAllClusterStateSlow() throws KeeperException, InterruptedException {
synchronized (getUpdateLock()) {
if (clusterState == null) {
// Never initialized, just run normal initialization.