You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by ds...@apache.org on 2016/04/27 20:22:28 UTC
[44/50] [abbrv] lucene-solr:solr-5750: SOLR-5750: revert
ClusterStateMutator default state_format change; tests failed
SOLR-5750: revert ClusterStateMutator default state_format change; tests failed
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/17c7a228
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/17c7a228
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/17c7a228
Branch: refs/heads/solr-5750
Commit: 17c7a228c2c121b0775836562e1269a6385e04f9
Parents: 97b49d8
Author: David Smiley <ds...@apache.org>
Authored: Wed Apr 27 10:08:57 2016 -0400
Committer: David Smiley <ds...@apache.org>
Committed: Wed Apr 27 10:08:57 2016 -0400
----------------------------------------------------------------------
.../java/org/apache/solr/cloud/overseer/ClusterStateMutator.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/17c7a228/solr/core/src/java/org/apache/solr/cloud/overseer/ClusterStateMutator.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/cloud/overseer/ClusterStateMutator.java b/solr/core/src/java/org/apache/solr/cloud/overseer/ClusterStateMutator.java
index 2ace3cb..9db42ac 100644
--- a/solr/core/src/java/org/apache/solr/cloud/overseer/ClusterStateMutator.java
+++ b/solr/core/src/java/org/apache/solr/cloud/overseer/ClusterStateMutator.java
@@ -104,7 +104,8 @@ public class ClusterStateMutator {
collectionProps.put("autoCreated", "true");
}
- String znode = message.getInt(DocCollection.STATE_FORMAT, 2) == 1 ? null
+ //TODO default to 2; but need to debug why BasicDistributedZk2Test fails early on
+ String znode = message.getInt(DocCollection.STATE_FORMAT, 1) == 1 ? null
: ZkStateReader.getCollectionPath(cName);
DocCollection newCollection = new DocCollection(cName,