You are viewing a plain text version of this content. The canonical link for it is here.
Posted to solr-commits@lucene.apache.org by ma...@apache.org on 2010/02/10 19:30:02 UTC
svn commit: r908622 - in /lucene/solr/branches/cloud/src:
java/org/apache/solr/cloud/CloudDescriptor.java
java/org/apache/solr/cloud/ZkController.java
java/org/apache/solr/core/CoreContainer.java
test/org/apache/solr/cloud/ZkControllerTest.java
Author: markrmiller
Date: Wed Feb 10 18:29:23 2010
New Revision: 908622
URL: http://svn.apache.org/viewvc?rev=908622&view=rev
Log:
quick change: remove 'role' from nodes - change nodes zknode to live_nodes
Modified:
lucene/solr/branches/cloud/src/java/org/apache/solr/cloud/CloudDescriptor.java
lucene/solr/branches/cloud/src/java/org/apache/solr/cloud/ZkController.java
lucene/solr/branches/cloud/src/java/org/apache/solr/core/CoreContainer.java
lucene/solr/branches/cloud/src/test/org/apache/solr/cloud/ZkControllerTest.java
Modified: lucene/solr/branches/cloud/src/java/org/apache/solr/cloud/CloudDescriptor.java
URL: http://svn.apache.org/viewvc/lucene/solr/branches/cloud/src/java/org/apache/solr/cloud/CloudDescriptor.java?rev=908622&r1=908621&r2=908622&view=diff
==============================================================================
--- lucene/solr/branches/cloud/src/java/org/apache/solr/cloud/CloudDescriptor.java (original)
+++ lucene/solr/branches/cloud/src/java/org/apache/solr/cloud/CloudDescriptor.java Wed Feb 10 18:29:23 2010
@@ -21,15 +21,6 @@
private String shardId;
private String collectionName;
- private String role = "none";
-
- public String getRole() {
- return role;
- }
-
- public void setRole(String role) {
- this.role = role;
- }
public void setShardId(String shardId) {
this.shardId = shardId;
Modified: lucene/solr/branches/cloud/src/java/org/apache/solr/cloud/ZkController.java
URL: http://svn.apache.org/viewvc/lucene/solr/branches/cloud/src/java/org/apache/solr/cloud/ZkController.java?rev=908622&r1=908621&r2=908622&view=diff
==============================================================================
--- lucene/solr/branches/cloud/src/java/org/apache/solr/cloud/ZkController.java (original)
+++ lucene/solr/branches/cloud/src/java/org/apache/solr/cloud/ZkController.java Wed Feb 10 18:29:23 2010
@@ -67,10 +67,9 @@
static final String SHARDS_ZKNODE = "/shards";
static final String CONFIGS_ZKNODE = "/configs";
static final String COLLECTIONS_ZKNODE = "/collections";
- static final String NODES_ZKNODE = "/nodes";
+ static final String NODES_ZKNODE = "/live_nodes";
public static final String URL_PROP = "url";
- public static final String ROLE_PROP = "role";
public static final String NODE_NAME = "node_name";
private SolrZkClient zkClient;
@@ -510,8 +509,6 @@
ZkNodeProps props = new ZkNodeProps();
props.put(URL_PROP, shardUrl);
-
- props.put(ROLE_PROP, cloudDesc.getRole());
props.put(NODE_NAME, getNodeName());
Modified: lucene/solr/branches/cloud/src/java/org/apache/solr/core/CoreContainer.java
URL: http://svn.apache.org/viewvc/lucene/solr/branches/cloud/src/java/org/apache/solr/core/CoreContainer.java?rev=908622&r1=908621&r2=908622&view=diff
==============================================================================
--- lucene/solr/branches/cloud/src/java/org/apache/solr/core/CoreContainer.java (original)
+++ lucene/solr/branches/cloud/src/java/org/apache/solr/core/CoreContainer.java Wed Feb 10 18:29:23 2010
@@ -396,10 +396,6 @@
} else if (opt != null) {
p.getCloudDescriptor().setShardId(opt);
}
- opt = DOMUtil.getAttr(node, "role", null);
- if (opt != null) {
- p.getCloudDescriptor().setRole(opt);
- }
opt = DOMUtil.getAttr(node, "collection", null);
if (opt != null) {
p.getCloudDescriptor().setCollectionName(opt);
Modified: lucene/solr/branches/cloud/src/test/org/apache/solr/cloud/ZkControllerTest.java
URL: http://svn.apache.org/viewvc/lucene/solr/branches/cloud/src/test/org/apache/solr/cloud/ZkControllerTest.java?rev=908622&r1=908621&r2=908622&view=diff
==============================================================================
--- lucene/solr/branches/cloud/src/test/org/apache/solr/cloud/ZkControllerTest.java (original)
+++ lucene/solr/branches/cloud/src/test/org/apache/solr/cloud/ZkControllerTest.java Wed Feb 10 18:29:23 2010
@@ -71,9 +71,9 @@
// nocommit
//zkClient.makePath("collections/collection1/config=collection1");
- addShardToZk(zkClient, shardsPath, SHARD1, URL1, "slave");
- addShardToZk(zkClient, shardsPath, SHARD2, URL2, "master");
- addShardToZk(zkClient, shardsPath, SHARD3, URL3, "slave");
+ addShardToZk(zkClient, shardsPath, SHARD1, URL1);
+ addShardToZk(zkClient, shardsPath, SHARD2, URL2);
+ addShardToZk(zkClient, shardsPath, SHARD3, URL3);
if (DEBUG) {
zkClient.printLayoutToStdOut();
@@ -101,17 +101,14 @@
assertNotNull(shards.get(SHARD3));
ZkNodeProps props = shards.get(SHARD1);
- assertEquals("slave", props.get(ZkController.ROLE_PROP));
assertEquals(URL1, props.get(ZkController.URL_PROP));
assertEquals(TEST_NODE_NAME, props.get(ZkController.NODE_NAME));
props = shards.get(SHARD2);
- assertEquals("master", props.get(ZkController.ROLE_PROP));
assertEquals(URL2, props.get(ZkController.URL_PROP));
assertEquals(TEST_NODE_NAME, props.get(ZkController.NODE_NAME));
props = shards.get(SHARD3);
- assertEquals("slave", props.get(ZkController.ROLE_PROP));
assertEquals(URL3, props.get(ZkController.URL_PROP));
assertEquals(TEST_NODE_NAME, props.get(ZkController.NODE_NAME));
@@ -201,12 +198,11 @@
}
private void addShardToZk(SolrZkClient zkClient, String shardsPath,
- String zkNodeName, String url, String role) throws IOException,
+ String zkNodeName, String url) throws IOException,
KeeperException, InterruptedException {
ZkNodeProps props = new ZkNodeProps();
props.put(ZkController.URL_PROP, url);
- props.put(ZkController.ROLE_PROP, role);
props.put(ZkController.NODE_NAME, TEST_NODE_NAME);
byte[] bytes = props.store();