You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by ma...@apache.org on 2012/08/04 20:39:09 UTC
svn commit: r1369398 [1/2] - in /lucene/dev/branches/branch_4x: ./ solr/
solr/core/ solr/core/src/java/org/apache/solr/
solr/core/src/java/org/apache/solr/cloud/
solr/core/src/java/org/apache/solr/handler/admin/
solr/core/src/java/org/apache/solr/handl...
Author: markrmiller
Date: Sat Aug 4 18:39:08 2012
New Revision: 1369398
URL: http://svn.apache.org/viewvc?rev=1369398&view=rev
Log:
rename CloudState to ClusterState
Added:
lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/cloud/ClusterStateTest.java
- copied unchanged from r1369396, lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/ClusterStateTest.java
lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/cloud/ClusterStateUpdateTest.java
- copied unchanged from r1369396, lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/ClusterStateUpdateTest.java
lucene/dev/branches/branch_4x/solr/solrj/src/java/org/apache/solr/common/cloud/ClusterState.java
- copied unchanged from r1369396, lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/common/cloud/ClusterState.java
Removed:
lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/cloud/CloudStateTest.java
lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/cloud/CloudStateUpdateTest.java
lucene/dev/branches/branch_4x/solr/solrj/src/java/org/apache/solr/common/cloud/CloudState.java
Modified:
lucene/dev/branches/branch_4x/ (props changed)
lucene/dev/branches/branch_4x/solr/ (props changed)
lucene/dev/branches/branch_4x/solr/core/ (props changed)
lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/SolrLogFormatter.java
lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/cloud/AssignShard.java
lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/cloud/ElectionContext.java
lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/cloud/Overseer.java
lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/cloud/OverseerCollectionProcessor.java
lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/cloud/SyncStrategy.java
lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/cloud/ZkController.java
lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/handler/admin/CollectionsHandler.java
lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/handler/admin/CoreAdminHandler.java
lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/handler/component/HttpShardHandler.java
lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/handler/component/RealTimeGetComponent.java
lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/servlet/SolrDispatchFilter.java
lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/update/processor/DistributedUpdateProcessor.java
lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/cloud/AbstractDistributedZkTestCase.java
lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/cloud/BasicDistributedZkTest.java
lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/cloud/BasicZkTest.java
lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/cloud/ChaosMonkey.java
lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/cloud/ChaosMonkeyNothingIsSafeTest.java
lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/cloud/FullSolrCloudTest.java
lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/cloud/OverseerTest.java
lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/cloud/SyncSliceTest.java
lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/cloud/ZkControllerTest.java
lucene/dev/branches/branch_4x/solr/solrj/ (props changed)
lucene/dev/branches/branch_4x/solr/solrj/src/java/org/apache/solr/client/solrj/impl/CloudSolrServer.java
lucene/dev/branches/branch_4x/solr/solrj/src/java/org/apache/solr/common/cloud/ZkStateReader.java
Modified: lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/SolrLogFormatter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/SolrLogFormatter.java?rev=1369398&r1=1369397&r2=1369398&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/SolrLogFormatter.java (original)
+++ lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/SolrLogFormatter.java Sat Aug 4 18:39:08 2012
@@ -250,10 +250,10 @@ sb.append("(group_name=").append(tg.getN
/*** Isn't core specific... prob better logged from zkController
if (info != null) {
- CloudState cloudState = zkController.getCloudState();
- if (info.cloudState != cloudState) {
+ ClusterState clusterState = zkController.getClusterState();
+ if (info.clusterState != clusterState) {
// something has changed in the matrix...
- sb.append(zkController.getBaseUrl() + " sees new CloudState:");
+ sb.append(zkController.getBaseUrl() + " sees new ClusterState:");
}
}
***/
@@ -263,7 +263,7 @@ sb.append("(group_name=").append(tg.getN
private Map<String,String> getCoreProps(ZkController zkController, SolrCore core) {
final String collection = core.getCoreDescriptor().getCloudDescriptor().getCollectionName();
- ZkNodeProps props = zkController.getCloudState().getShardProps(collection, ZkStateReader.getCoreNodeName(zkController.getNodeName(), core.getName()));
+ ZkNodeProps props = zkController.getClusterState().getShardProps(collection, ZkStateReader.getCoreNodeName(zkController.getNodeName(), core.getName()));
if(props!=null) {
return props.getProperties();
}
Modified: lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/cloud/AssignShard.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/cloud/AssignShard.java?rev=1369398&r1=1369397&r2=1369398&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/cloud/AssignShard.java (original)
+++ lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/cloud/AssignShard.java Sat Aug 4 18:39:08 2012
@@ -24,7 +24,7 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import org.apache.solr.common.cloud.CloudState;
+import org.apache.solr.common.cloud.ClusterState;
import org.apache.solr.common.cloud.Slice;
public class AssignShard {
@@ -36,7 +36,7 @@ public class AssignShard {
* @param state
* @return the assigned shard id
*/
- public static String assignShard(String collection, CloudState state, Integer numShards) {
+ public static String assignShard(String collection, ClusterState state, Integer numShards) {
if (numShards == null) {
numShards = 1;
}
Modified: lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/cloud/ElectionContext.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/cloud/ElectionContext.java?rev=1369398&r1=1369397&r2=1369398&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/cloud/ElectionContext.java (original)
+++ lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/cloud/ElectionContext.java Sat Aug 4 18:39:08 2012
@@ -5,7 +5,7 @@ import java.util.Map;
import org.apache.solr.common.SolrException;
import org.apache.solr.common.SolrException.ErrorCode;
-import org.apache.solr.common.cloud.CloudState;
+import org.apache.solr.common.cloud.ClusterState;
import org.apache.solr.common.cloud.Slice;
import org.apache.solr.common.cloud.SolrZkClient;
import org.apache.solr.common.cloud.ZkCoreNodeProps;
@@ -13,7 +13,6 @@ import org.apache.solr.common.cloud.ZkNo
import org.apache.solr.common.cloud.ZkStateReader;
import org.apache.solr.core.CoreContainer;
import org.apache.solr.core.SolrCore;
-import org.apache.solr.handler.component.ShardHandler;
import org.apache.zookeeper.CreateMode;
import org.apache.zookeeper.KeeperException;
import org.apache.zookeeper.KeeperException.NodeExistsException;
@@ -195,8 +194,8 @@ final class ShardLeaderElectionContext e
}
private boolean shouldIBeLeader(ZkNodeProps leaderProps) {
- CloudState cloudState = zkController.getZkStateReader().getCloudState();
- Map<String,Slice> slices = cloudState.getSlices(this.collection);
+ ClusterState clusterState = zkController.getZkStateReader().getClusterState();
+ Map<String,Slice> slices = clusterState.getSlices(this.collection);
Slice slice = slices.get(shardId);
Map<String,ZkNodeProps> shards = slice.getShards();
boolean foundSomeoneElseActive = false;
@@ -206,7 +205,7 @@ final class ShardLeaderElectionContext e
if (new ZkCoreNodeProps(shard.getValue()).getCoreUrl().equals(
new ZkCoreNodeProps(leaderProps).getCoreUrl())) {
if (state.equals(ZkStateReader.ACTIVE)
- && cloudState.liveNodesContain(shard.getValue().get(
+ && clusterState.liveNodesContain(shard.getValue().get(
ZkStateReader.NODE_NAME_PROP))) {
// we are alive
return true;
@@ -214,7 +213,7 @@ final class ShardLeaderElectionContext e
}
if ((state.equals(ZkStateReader.ACTIVE))
- && cloudState.liveNodesContain(shard.getValue().get(
+ && clusterState.liveNodesContain(shard.getValue().get(
ZkStateReader.NODE_NAME_PROP))
&& !new ZkCoreNodeProps(shard.getValue()).getCoreUrl().equals(
new ZkCoreNodeProps(leaderProps).getCoreUrl())) {
@@ -226,8 +225,8 @@ final class ShardLeaderElectionContext e
}
private boolean anyoneElseActive() {
- CloudState cloudState = zkController.getZkStateReader().getCloudState();
- Map<String,Slice> slices = cloudState.getSlices(this.collection);
+ ClusterState clusterState = zkController.getZkStateReader().getClusterState();
+ Map<String,Slice> slices = clusterState.getSlices(this.collection);
Slice slice = slices.get(shardId);
Map<String,ZkNodeProps> shards = slice.getShards();
@@ -236,7 +235,7 @@ final class ShardLeaderElectionContext e
if ((state.equals(ZkStateReader.ACTIVE))
- && cloudState.liveNodesContain(shard.getValue().get(
+ && clusterState.liveNodesContain(shard.getValue().get(
ZkStateReader.NODE_NAME_PROP))) {
return true;
}
Modified: lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/cloud/Overseer.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/cloud/Overseer.java?rev=1369398&r1=1369397&r2=1369398&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/cloud/Overseer.java (original)
+++ lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/cloud/Overseer.java Sat Aug 4 18:39:08 2012
@@ -24,7 +24,7 @@ import java.util.Map;
import java.util.Map.Entry;
import org.apache.solr.common.SolrException;
-import org.apache.solr.common.cloud.CloudState;
+import org.apache.solr.common.cloud.ClusterState;
import org.apache.solr.common.cloud.Slice;
import org.apache.solr.common.cloud.SolrZkClient;
import org.apache.solr.common.cloud.ZkCoreNodeProps;
@@ -47,7 +47,7 @@ public class Overseer {
private static Logger log = LoggerFactory.getLogger(Overseer.class);
- private class CloudStateUpdater implements Runnable {
+ private class ClusterStateUpdater implements Runnable {
private static final String DELETECORE = "deletecore";
private final ZkStateReader reader;
@@ -59,7 +59,7 @@ public class Overseer {
//If Overseer dies while extracting the main queue a new overseer will start from this queue
private final DistributedQueue workQueue;
- public CloudStateUpdater(final ZkStateReader reader, final String myId) {
+ public ClusterStateUpdater(final ZkStateReader reader, final String myId) {
this.zkClient = reader.getZkClient();
this.stateUpdateQueue = getInQueue(zkClient);
this.workQueue = getInternalQueue(zkClient);
@@ -78,17 +78,17 @@ public class Overseer {
byte[] head = workQueue.peek();
if (head != null) {
- reader.updateCloudState(true);
- CloudState cloudState = reader.getCloudState();
+ reader.updateClusterState(true);
+ ClusterState clusterState = reader.getClusterState();
log.info("Replaying operations from work queue.");
while (head != null && amILeader()) {
final ZkNodeProps message = ZkNodeProps.load(head);
final String operation = message
.get(QUEUE_OPERATION);
- cloudState = processMessage(cloudState, message, operation);
+ clusterState = processMessage(clusterState, message, operation);
zkClient.setData(ZkStateReader.CLUSTER_STATE,
- ZkStateReader.toJSON(cloudState), true);
+ ZkStateReader.toJSON(clusterState), true);
workQueue.remove();
head = workQueue.peek();
}
@@ -116,20 +116,20 @@ public class Overseer {
byte[] head = stateUpdateQueue.peek();
if (head != null) {
- reader.updateCloudState(true);
- CloudState cloudState = reader.getCloudState();
+ reader.updateClusterState(true);
+ ClusterState clusterState = reader.getClusterState();
while (head != null) {
final ZkNodeProps message = ZkNodeProps.load(head);
final String operation = message.get(QUEUE_OPERATION);
- cloudState = processMessage(cloudState, message, operation);
+ clusterState = processMessage(clusterState, message, operation);
byte[] processed = stateUpdateQueue.remove();
workQueue.offer(processed);
head = stateUpdateQueue.peek();
}
zkClient.setData(ZkStateReader.CLUSTER_STATE,
- ZkStateReader.toJSON(cloudState), true);
+ ZkStateReader.toJSON(clusterState), true);
}
// clean work queue
while (workQueue.poll() != null);
@@ -157,12 +157,12 @@ public class Overseer {
}
}
- private CloudState processMessage(CloudState cloudState,
+ private ClusterState processMessage(ClusterState clusterState,
final ZkNodeProps message, final String operation) {
if ("state".equals(operation)) {
- cloudState = updateState(cloudState, message);
+ clusterState = updateState(clusterState, message);
} else if (DELETECORE.equals(operation)) {
- cloudState = removeCore(cloudState, message);
+ clusterState = removeCore(clusterState, message);
} else if (ZkStateReader.LEADER_PROP.equals(operation)) {
StringBuilder sb = new StringBuilder();
String baseUrl = message.get(ZkStateReader.BASE_URL_PROP);
@@ -172,14 +172,14 @@ public class Overseer {
sb.append(coreName == null ? "" : coreName);
if (!(sb.substring(sb.length() - 1).equals("/"))) sb
.append("/");
- cloudState = setShardLeader(cloudState,
+ clusterState = setShardLeader(clusterState,
message.get(ZkStateReader.COLLECTION_PROP),
message.get(ZkStateReader.SHARD_ID_PROP), sb.toString());
} else {
throw new RuntimeException("unknown operation:" + operation
+ " contents:" + message.getProperties());
}
- return cloudState;
+ return clusterState;
}
private boolean amILeader() {
@@ -199,7 +199,7 @@ public class Overseer {
/**
* Try to assign core to the cluster.
*/
- private CloudState updateState(CloudState state, final ZkNodeProps message) {
+ private ClusterState updateState(ClusterState state, final ZkNodeProps message) {
final String collection = message.get(ZkStateReader.COLLECTION_PROP);
final String zkCoreNodeName = message.get(ZkStateReader.NODE_NAME_PROP) + "_" + message.get(ZkStateReader.CORE_NAME_PROP);
final Integer numShards = message.get(ZkStateReader.NUM_SHARDS_PROP)!=null?Integer.parseInt(message.get(ZkStateReader.NUM_SHARDS_PROP)):null;
@@ -214,7 +214,7 @@ public class Overseer {
String shardId = message.get(ZkStateReader.SHARD_ID_PROP);
if (shardId == null) {
String nodeName = message.get(ZkStateReader.NODE_NAME_PROP);
- //get shardId from CloudState
+ //get shardId from ClusterState
shardId = getAssignedId(state, nodeName, message);
}
if(shardId == null) {
@@ -242,11 +242,11 @@ public class Overseer {
shardProps.put(zkCoreNodeName, zkProps);
slice = new Slice(shardId, shardProps);
- CloudState newCloudState = updateSlice(state, collection, slice);
- return newCloudState;
+ ClusterState newClusterState = updateSlice(state, collection, slice);
+ return newClusterState;
}
- private CloudState createCollection(CloudState state, String collectionName, int numShards) {
+ private ClusterState createCollection(ClusterState state, String collectionName, int numShards) {
Map<String, Map<String, Slice>> newStates = new LinkedHashMap<String,Map<String, Slice>>();
Map<String, Slice> newSlices = new LinkedHashMap<String,Slice>();
newStates.putAll(state.getCollectionStates());
@@ -255,14 +255,14 @@ public class Overseer {
newSlices.put(sliceName, new Slice(sliceName, Collections.EMPTY_MAP));
}
newStates.put(collectionName, newSlices);
- CloudState newCloudState = new CloudState(state.getLiveNodes(), newStates);
- return newCloudState;
+ ClusterState newClusterState = new ClusterState(state.getLiveNodes(), newStates);
+ return newClusterState;
}
/*
* Return an already assigned id or null if not assigned
*/
- private String getAssignedId(final CloudState state, final String nodeName,
+ private String getAssignedId(final ClusterState state, final String nodeName,
final ZkNodeProps coreState) {
final String key = coreState.get(ZkStateReader.NODE_NAME_PROP) + "_" + coreState.get(ZkStateReader.CORE_NAME_PROP);
Map<String, Slice> slices = state.getSlices(coreState.get(ZkStateReader.COLLECTION_PROP));
@@ -276,7 +276,7 @@ public class Overseer {
return null;
}
- private CloudState updateSlice(CloudState state, String collection, Slice slice) {
+ private ClusterState updateSlice(ClusterState state, String collection, Slice slice) {
final Map<String, Map<String, Slice>> newStates = new LinkedHashMap<String,Map<String,Slice>>();
newStates.putAll(state.getCollectionStates());
@@ -306,10 +306,10 @@ public class Overseer {
final Slice updatedSlice = new Slice(slice.getName(), shards);
slices.put(slice.getName(), updatedSlice);
}
- return new CloudState(state.getLiveNodes(), newStates);
+ return new ClusterState(state.getLiveNodes(), newStates);
}
- private CloudState setShardLeader(CloudState state, String collection, String sliceName, String leaderUrl) {
+ private ClusterState setShardLeader(ClusterState state, String collection, String sliceName, String leaderUrl) {
final Map<String, Map<String, Slice>> newStates = new LinkedHashMap<String,Map<String,Slice>>();
newStates.putAll(state.getCollectionStates());
@@ -341,21 +341,21 @@ public class Overseer {
Slice slice = new Slice(sliceName, newShards);
slices.put(sliceName, slice);
}
- return new CloudState(state.getLiveNodes(), newStates);
+ return new ClusterState(state.getLiveNodes(), newStates);
}
/*
* Remove core from cloudstate
*/
- private CloudState removeCore(final CloudState cloudState, ZkNodeProps message) {
+ private ClusterState removeCore(final ClusterState clusterState, ZkNodeProps message) {
final String coreNodeName = message.get(ZkStateReader.NODE_NAME_PROP) + "_" + message.get(ZkStateReader.CORE_NAME_PROP);
final String collection = message.get(ZkStateReader.COLLECTION_PROP);
final LinkedHashMap<String, Map<String, Slice>> newStates = new LinkedHashMap<String,Map<String,Slice>>();
- for(String collectionName: cloudState.getCollections()) {
+ for(String collectionName: clusterState.getCollections()) {
if(collection.equals(collectionName)) {
- Map<String, Slice> slices = cloudState.getSlices(collection);
+ Map<String, Slice> slices = clusterState.getSlices(collection);
LinkedHashMap<String, Slice> newSlices = new LinkedHashMap<String, Slice>();
for(Slice slice: slices.values()) {
if(slice.getShards().containsKey(coreNodeName)) {
@@ -393,10 +393,10 @@ public class Overseer {
}
}
} else {
- newStates.put(collectionName, cloudState.getSlices(collectionName));
+ newStates.put(collectionName, clusterState.getSlices(collectionName));
}
}
- CloudState newState = new CloudState(cloudState.getLiveNodes(), newStates);
+ ClusterState newState = new ClusterState(clusterState.getLiveNodes(), newStates);
return newState;
}
@@ -425,7 +425,7 @@ public class Overseer {
createOverseerNode(reader.getZkClient());
//launch cluster state updater thread
ThreadGroup tg = new ThreadGroup("Overseer state updater.");
- updaterThread = new Thread(tg, new CloudStateUpdater(reader, id));
+ updaterThread = new Thread(tg, new ClusterStateUpdater(reader, id));
updaterThread.setDaemon(true);
ThreadGroup ccTg = new ThreadGroup("Overseer collection creation process.");
Modified: lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/cloud/OverseerCollectionProcessor.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/cloud/OverseerCollectionProcessor.java?rev=1369398&r1=1369397&r2=1369398&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/cloud/OverseerCollectionProcessor.java (original)
+++ lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/cloud/OverseerCollectionProcessor.java Sat Aug 4 18:39:08 2012
@@ -25,7 +25,7 @@ import java.util.Set;
import org.apache.solr.common.SolrException;
import org.apache.solr.common.SolrException.ErrorCode;
-import org.apache.solr.common.cloud.CloudState;
+import org.apache.solr.common.cloud.ClusterState;
import org.apache.solr.common.cloud.Slice;
import org.apache.solr.common.cloud.ZkNodeProps;
import org.apache.solr.common.cloud.ZkStateReader;
@@ -132,22 +132,22 @@ public class OverseerCollectionProcessor
private boolean processMessage(ZkNodeProps message, String operation) {
if (CREATECOLLECTION.equals(operation)) {
- return createCollection(zkStateReader.getCloudState(), message);
+ return createCollection(zkStateReader.getClusterState(), message);
} else if (DELETECOLLECTION.equals(operation)) {
ModifiableSolrParams params = new ModifiableSolrParams();
params.set(CoreAdminParams.ACTION, CoreAdminAction.UNLOAD.toString());
params.set(CoreAdminParams.DELETE_INSTANCE_DIR, true);
- return collectionCmd(zkStateReader.getCloudState(), message, params);
+ return collectionCmd(zkStateReader.getClusterState(), message, params);
} else if (RELOADCOLLECTION.equals(operation)) {
ModifiableSolrParams params = new ModifiableSolrParams();
params.set(CoreAdminParams.ACTION, CoreAdminAction.RELOAD.toString());
- return collectionCmd(zkStateReader.getCloudState(), message, params);
+ return collectionCmd(zkStateReader.getClusterState(), message, params);
}
// unknown command, toss it from our queue
return true;
}
- private boolean createCollection(CloudState cloudState, ZkNodeProps message) {
+ private boolean createCollection(ClusterState clusterState, ZkNodeProps message) {
// look at the replication factor and see if it matches reality
// if it does not, find best nodes to create more cores
@@ -182,7 +182,7 @@ public class OverseerCollectionProcessor
// TODO: add smarter options that look at the current number of cores per node?
// for now we just go random
- Set<String> nodes = cloudState.getLiveNodes();
+ Set<String> nodes = clusterState.getLiveNodes();
List<String> nodeList = new ArrayList<String>(nodes.size());
nodeList.addAll(nodes);
Collections.shuffle(nodeList);
@@ -235,11 +235,11 @@ public class OverseerCollectionProcessor
return true;
}
- private boolean collectionCmd(CloudState cloudState, ZkNodeProps message, ModifiableSolrParams params) {
+ private boolean collectionCmd(ClusterState clusterState, ZkNodeProps message, ModifiableSolrParams params) {
log.info("Executing Collection Cmd : " + params);
String name = message.get("name");
- Map<String,Slice> slices = cloudState.getCollectionStates().get(name);
+ Map<String,Slice> slices = clusterState.getCollectionStates().get(name);
if (slices == null) {
throw new SolrException(ErrorCode.BAD_REQUEST, "Could not find collection:" + name);
@@ -251,7 +251,7 @@ public class OverseerCollectionProcessor
Set<Map.Entry<String,ZkNodeProps>> shardEntries = shards.entrySet();
for (Map.Entry<String,ZkNodeProps> shardEntry : shardEntries) {
final ZkNodeProps node = shardEntry.getValue();
- if (cloudState.liveNodesContain(node.get(ZkStateReader.NODE_NAME_PROP))) {
+ if (clusterState.liveNodesContain(node.get(ZkStateReader.NODE_NAME_PROP))) {
params.set(CoreAdminParams.CORE, node.get(ZkStateReader.CORE_NAME_PROP));
String replica = node.get(ZkStateReader.BASE_URL_PROP);
Modified: lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/cloud/SyncStrategy.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/cloud/SyncStrategy.java?rev=1369398&r1=1369397&r2=1369398&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/cloud/SyncStrategy.java (original)
+++ lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/cloud/SyncStrategy.java Sat Aug 4 18:39:08 2012
@@ -28,7 +28,7 @@ import org.apache.solr.client.solrj.impl
import org.apache.solr.client.solrj.impl.HttpSolrServer;
import org.apache.solr.client.solrj.request.CoreAdminRequest.RequestRecovery;
import org.apache.solr.common.SolrException;
-import org.apache.solr.common.cloud.CloudState;
+import org.apache.solr.common.cloud.ClusterState;
import org.apache.solr.common.cloud.Slice;
import org.apache.solr.common.cloud.ZkCoreNodeProps;
import org.apache.solr.common.cloud.ZkNodeProps;
@@ -132,8 +132,8 @@ public class SyncStrategy {
private boolean areAnyOtherReplicasActive(ZkController zkController,
ZkNodeProps leaderProps, String collection, String shardId) {
- CloudState cloudState = zkController.getZkStateReader().getCloudState();
- Map<String,Slice> slices = cloudState.getSlices(collection);
+ ClusterState clusterState = zkController.getZkStateReader().getClusterState();
+ Map<String,Slice> slices = clusterState.getSlices(collection);
Slice slice = slices.get(shardId);
Map<String,ZkNodeProps> shards = slice.getShards();
for (Map.Entry<String,ZkNodeProps> shard : shards.entrySet()) {
@@ -142,10 +142,10 @@ public class SyncStrategy {
// + state
// + shard.getValue().get(ZkStateReader.NODE_NAME_PROP)
// + " live: "
-// + cloudState.liveNodesContain(shard.getValue().get(
+// + clusterState.liveNodesContain(shard.getValue().get(
// ZkStateReader.NODE_NAME_PROP)));
if ((state.equals(ZkStateReader.ACTIVE))
- && cloudState.liveNodesContain(shard.getValue().get(
+ && clusterState.liveNodesContain(shard.getValue().get(
ZkStateReader.NODE_NAME_PROP))
&& !new ZkCoreNodeProps(shard.getValue()).getCoreUrl().equals(
new ZkCoreNodeProps(leaderProps).getCoreUrl())) {
Modified: lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/cloud/ZkController.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/cloud/ZkController.java?rev=1369398&r1=1369397&r2=1369398&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/cloud/ZkController.java (original)
+++ lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/cloud/ZkController.java Sat Aug 4 18:39:08 2012
@@ -38,7 +38,7 @@ import org.apache.solr.client.solrj.impl
import org.apache.solr.client.solrj.request.CoreAdminRequest.WaitForState;
import org.apache.solr.common.SolrException;
import org.apache.solr.common.SolrException.ErrorCode;
-import org.apache.solr.common.cloud.CloudState;
+import org.apache.solr.common.cloud.ClusterState;
import org.apache.solr.common.cloud.OnReconnect;
import org.apache.solr.common.cloud.SolrZkClient;
import org.apache.solr.common.cloud.ZkCmdExecutor;
@@ -274,8 +274,8 @@ public final class ZkController {
/**
* @return information about the cluster from ZooKeeper
*/
- public CloudState getCloudState() {
- return zkStateReader.getCloudState();
+ public ClusterState getClusterState() {
+ return zkStateReader.getClusterState();
}
/**
@@ -545,17 +545,17 @@ public final class ZkController {
String leaderUrl = getLeaderProps(collection, cloudDesc.getShardId()).getCoreUrl();
// now wait until our currently cloud state contains the latest leader
- String cloudStateLeader = zkStateReader.getLeaderUrl(collection, shardId, 30000);
+ String clusterStateLeader = zkStateReader.getLeaderUrl(collection, shardId, 30000);
int tries = 0;
- while (!leaderUrl.equals(cloudStateLeader)) {
+ while (!leaderUrl.equals(clusterStateLeader)) {
if (tries == 60) {
throw new SolrException(ErrorCode.SERVER_ERROR,
"There is conflicting information about the leader of shard: "
- + cloudDesc.getShardId() + " our state says:" + cloudStateLeader + " but zookeeper says:" + leaderUrl);
+ + cloudDesc.getShardId() + " our state says:" + clusterStateLeader + " but zookeeper says:" + leaderUrl);
}
Thread.sleep(1000);
tries++;
- cloudStateLeader = zkStateReader.getLeaderUrl(collection, shardId, 30000);
+ clusterStateLeader = zkStateReader.getLeaderUrl(collection, shardId, 30000);
leaderUrl = getLeaderProps(collection, cloudDesc.getShardId()).getCoreUrl();
}
@@ -608,7 +608,7 @@ public final class ZkController {
}
// make sure we have an update cluster state right away
- zkStateReader.updateCloudState(true);
+ zkStateReader.updateClusterState(true);
return shardId;
}
@@ -741,7 +741,7 @@ public final class ZkController {
}
private boolean needsToBeAssignedShardId(final CoreDescriptor desc,
- final CloudState state, final String shardZkNodeName) {
+ final ClusterState state, final String shardZkNodeName) {
final CloudDescriptor cloudDesc = desc.getCloudDescriptor();
@@ -941,7 +941,7 @@ public final class ZkController {
final String shardZkNodeName = getNodeName() + "_" + coreName;
int retryCount = 120;
while (retryCount-- > 0) {
- final String shardId = zkStateReader.getCloudState().getShardId(
+ final String shardId = zkStateReader.getClusterState().getShardId(
shardZkNodeName);
if (shardId != null) {
return shardId;
@@ -1009,7 +1009,7 @@ public final class ZkController {
// this also gets us our assigned shard id if it was not specified
publish(cd, ZkStateReader.DOWN);
String shardZkNodeName = getCoreNodeName(cd);
- if (cd.getCloudDescriptor().getShardId() == null && needsToBeAssignedShardId(cd, zkStateReader.getCloudState(), shardZkNodeName)) {
+ if (cd.getCloudDescriptor().getShardId() == null && needsToBeAssignedShardId(cd, zkStateReader.getClusterState(), shardZkNodeName)) {
String shardId;
shardId = doGetShardIdProcess(cd.getName(), cd.getCloudDescriptor());
cd.getCloudDescriptor().setShardId(shardId);
Modified: lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/handler/admin/CollectionsHandler.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/handler/admin/CollectionsHandler.java?rev=1369398&r1=1369397&r2=1369398&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/handler/admin/CollectionsHandler.java (original)
+++ lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/handler/admin/CollectionsHandler.java Sat Aug 4 18:39:08 2012
@@ -26,7 +26,7 @@ import org.apache.solr.client.solrj.requ
import org.apache.solr.cloud.Overseer;
import org.apache.solr.cloud.OverseerCollectionProcessor;
import org.apache.solr.common.SolrException;
-import org.apache.solr.common.cloud.CloudState;
+import org.apache.solr.common.cloud.ClusterState;
import org.apache.solr.common.cloud.ZkCoreNodeProps;
import org.apache.solr.common.cloud.ZkNodeProps;
import org.apache.solr.common.cloud.ZkStateReader;
@@ -141,9 +141,9 @@ public class CollectionsHandler extends
String collection = req.getParams().required().get("collection");
String shard = req.getParams().required().get("shard");
- CloudState cloudState = coreContainer.getZkController().getCloudState();
+ ClusterState clusterState = coreContainer.getZkController().getClusterState();
- ZkNodeProps leaderProps = cloudState.getLeader(collection, shard);
+ ZkNodeProps leaderProps = clusterState.getLeader(collection, shard);
ZkCoreNodeProps nodeProps = new ZkCoreNodeProps(leaderProps);
HttpSolrServer server = new HttpSolrServer(nodeProps.getBaseUrl());
Modified: lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/handler/admin/CoreAdminHandler.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/handler/admin/CoreAdminHandler.java?rev=1369398&r1=1369397&r2=1369398&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/handler/admin/CoreAdminHandler.java (original)
+++ lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/handler/admin/CoreAdminHandler.java Sat Aug 4 18:39:08 2012
@@ -35,7 +35,7 @@ import org.apache.solr.cloud.SyncStrateg
import org.apache.solr.cloud.ZkController;
import org.apache.solr.common.SolrException;
import org.apache.solr.common.SolrException.ErrorCode;
-import org.apache.solr.common.cloud.CloudState;
+import org.apache.solr.common.cloud.ClusterState;
import org.apache.solr.common.cloud.Slice;
import org.apache.solr.common.cloud.ZkNodeProps;
import org.apache.solr.common.cloud.ZkStateReader;
@@ -768,16 +768,16 @@ public class CoreAdminHandler extends Re
// to accept updates
CloudDescriptor cloudDescriptor = core.getCoreDescriptor()
.getCloudDescriptor();
- CloudState cloudState = coreContainer.getZkController()
- .getCloudState();
+ ClusterState clusterState = coreContainer.getZkController()
+ .getClusterState();
String collection = cloudDescriptor.getCollectionName();
- Slice slice = cloudState.getSlice(collection,
+ Slice slice = clusterState.getSlice(collection,
cloudDescriptor.getShardId());
if (slice != null) {
ZkNodeProps nodeProps = slice.getShards().get(coreNodeName);
if (nodeProps != null) {
state = nodeProps.get(ZkStateReader.STATE_PROP);
- live = cloudState.liveNodesContain(nodeName);
+ live = clusterState.liveNodesContain(nodeName);
if (nodeProps != null && state.equals(waitForState)) {
if (checkLive == null) {
break;
Modified: lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/handler/component/HttpShardHandler.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/handler/component/HttpShardHandler.java?rev=1369398&r1=1369397&r2=1369398&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/handler/component/HttpShardHandler.java (original)
+++ lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/handler/component/HttpShardHandler.java Sat Aug 4 18:39:08 2012
@@ -41,7 +41,7 @@ import org.apache.solr.cloud.CloudDescri
import org.apache.solr.cloud.ZkController;
import org.apache.solr.common.SolrException;
import org.apache.solr.common.SolrException.ErrorCode;
-import org.apache.solr.common.cloud.CloudState;
+import org.apache.solr.common.cloud.ClusterState;
import org.apache.solr.common.cloud.Slice;
import org.apache.solr.common.cloud.ZkCoreNodeProps;
import org.apache.solr.common.cloud.ZkNodeProps;
@@ -255,7 +255,7 @@ public class HttpShardHandler extends Sh
if (rb.isDistrib) {
// since the cost of grabbing cloud state is still up in the air, we grab it only
// if we need it.
- CloudState cloudState = null;
+ ClusterState clusterState = null;
Map<String,Slice> slices = null;
CoreDescriptor coreDescriptor = req.getCore().getCoreDescriptor();
CloudDescriptor cloudDescriptor = coreDescriptor.getCloudDescriptor();
@@ -280,7 +280,7 @@ public class HttpShardHandler extends Sh
} else if (zkController != null) {
// we weren't provided with a list of slices to query, so find the list that will cover the complete index
- cloudState = zkController.getCloudState();
+ clusterState = zkController.getClusterState();
// This can be more efficient... we only record the name, even though we
// have the shard info we need in the next step of mapping slice->shards
@@ -301,12 +301,12 @@ public class HttpShardHandler extends Sh
// cloud state and add them to the Map 'slices'.
for (int i = 0; i < collectionList.size(); i++) {
String collection = collectionList.get(i);
- ClientUtils.appendMap(collection, slices, cloudState.getSlices(collection));
+ ClientUtils.appendMap(collection, slices, clusterState.getSlices(collection));
}
} else {
// If no collections were specified, default to the collection for
// this core.
- slices = cloudState.getSlices(cloudDescriptor.getCollectionName());
+ slices = clusterState.getSlices(cloudDescriptor.getCollectionName());
if (slices == null) {
throw new SolrException(ErrorCode.BAD_REQUEST,
"Could not find collection:"
@@ -334,9 +334,9 @@ public class HttpShardHandler extends Sh
if (zkController != null) {
for (int i=0; i<rb.shards.length; i++) {
if (rb.shards[i] == null) {
- if (cloudState == null) {
- cloudState = zkController.getCloudState();
- slices = cloudState.getSlices(cloudDescriptor.getCollectionName());
+ if (clusterState == null) {
+ clusterState = zkController.getClusterState();
+ slices = clusterState.getSlices(cloudDescriptor.getCollectionName());
}
String sliceName = rb.slices[i];
@@ -353,7 +353,7 @@ public class HttpShardHandler extends Sh
Map<String, ZkNodeProps> sliceShards = slice.getShards();
// For now, recreate the | delimited list of equivalent servers
- Set<String> liveNodes = cloudState.getLiveNodes();
+ Set<String> liveNodes = clusterState.getLiveNodes();
StringBuilder sliceShardsStr = new StringBuilder();
boolean first = true;
for (ZkNodeProps nodeProps : sliceShards.values()) {
Modified: lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/handler/component/RealTimeGetComponent.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/handler/component/RealTimeGetComponent.java?rev=1369398&r1=1369397&r2=1369398&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/handler/component/RealTimeGetComponent.java (original)
+++ lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/handler/component/RealTimeGetComponent.java Sat Aug 4 18:39:08 2012
@@ -352,14 +352,14 @@ public class RealTimeGetComponent extend
String collection = cloudDescriptor.getCollectionName();
- CloudState cloudState = zkController.getCloudState();
+ ClusterState clusterState = zkController.getClusterState();
Map<String, List<String>> shardToId = new HashMap<String, List<String>>();
for (String id : allIds) {
BytesRef br = new BytesRef();
sf.getType().readableToIndexed(id, br);
int hash = Hash.murmurhash3_x86_32(br.bytes, br.offset, br.length, 0);
- String shard = cloudState.getShard(hash, collection);
+ String shard = clusterState.getShard(hash, collection);
List<String> idsForShard = shardToId.get(shard);
if (idsForShard == null) {
Modified: lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/servlet/SolrDispatchFilter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/servlet/SolrDispatchFilter.java?rev=1369398&r1=1369397&r2=1369398&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/servlet/SolrDispatchFilter.java (original)
+++ lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/servlet/SolrDispatchFilter.java Sat Aug 4 18:39:08 2012
@@ -39,7 +39,7 @@ import javax.servlet.http.HttpServletReq
import javax.servlet.http.HttpServletResponse;
import org.apache.solr.common.SolrException;
-import org.apache.solr.common.cloud.CloudState;
+import org.apache.solr.common.cloud.ClusterState;
import org.apache.solr.common.cloud.Slice;
import org.apache.solr.common.cloud.ZkNodeProps;
import org.apache.solr.common.cloud.ZkStateReader;
@@ -315,8 +315,8 @@ public class SolrDispatchFilter implemen
String collection = corename;
ZkStateReader zkStateReader = cores.getZkController().getZkStateReader();
- CloudState cloudState = zkStateReader.getCloudState();
- Map<String,Slice> slices = cloudState.getSlices(collection);
+ ClusterState clusterState = zkStateReader.getClusterState();
+ Map<String,Slice> slices = clusterState.getSlices(collection);
if (slices == null) {
return null;
}
@@ -326,7 +326,7 @@ public class SolrDispatchFilter implemen
done:
for (Entry<String,Slice> entry : entries) {
// first see if we have the leader
- ZkNodeProps leaderProps = cloudState.getLeader(collection, entry.getKey());
+ ZkNodeProps leaderProps = clusterState.getLeader(collection, entry.getKey());
if (leaderProps != null) {
core = checkProps(cores, path, leaderProps);
}
Modified: lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/update/processor/DistributedUpdateProcessor.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/update/processor/DistributedUpdateProcessor.java?rev=1369398&r1=1369397&r2=1369398&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/update/processor/DistributedUpdateProcessor.java (original)
+++ lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/update/processor/DistributedUpdateProcessor.java Sat Aug 4 18:39:08 2012
@@ -36,7 +36,7 @@ import org.apache.solr.common.SolrExcept
import org.apache.solr.common.SolrException.ErrorCode;
import org.apache.solr.common.SolrInputDocument;
import org.apache.solr.common.SolrInputField;
-import org.apache.solr.common.cloud.CloudState;
+import org.apache.solr.common.cloud.ClusterState;
import org.apache.solr.common.cloud.Slice;
import org.apache.solr.common.cloud.ZkCoreNodeProps;
import org.apache.solr.common.cloud.ZkNodeProps;
@@ -160,7 +160,7 @@ public class DistributedUpdateProcessor
this.zkEnabled = coreDesc.getCoreContainer().isZooKeeperAware();
zkController = req.getCore().getCoreDescriptor().getCoreContainer().getZkController();
if (zkEnabled) {
- numNodes = zkController.getZkStateReader().getCloudState().getLiveNodes().size();
+ numNodes = zkController.getZkStateReader().getClusterState().getLiveNodes().size();
}
//this.rsp = reqInfo != null ? reqInfo.getRsp() : null;
@@ -181,13 +181,13 @@ public class DistributedUpdateProcessor
// if we are in zk mode...
if (zkEnabled) {
// set num nodes
- numNodes = zkController.getCloudState().getLiveNodes().size();
+ numNodes = zkController.getClusterState().getLiveNodes().size();
// the leader is...
// TODO: if there is no leader, wait and look again
// TODO: we are reading the leader from zk every time - we should cache
// this and watch for changes?? Just pull it from ZkController cluster state probably?
- String shardId = getShard(hash, collection, zkController.getCloudState()); // get the right shard based on the hash...
+ String shardId = getShard(hash, collection, zkController.getClusterState()); // get the right shard based on the hash...
try {
// TODO: if we find out we cannot talk to zk anymore, we should probably realize we are not
@@ -252,11 +252,11 @@ public class DistributedUpdateProcessor
}
- private String getShard(int hash, String collection, CloudState cloudState) {
+ private String getShard(int hash, String collection, ClusterState clusterState) {
// ranges should be part of the cloud state and eventually gotten from zk
// get the shard names
- return cloudState.getShard(hash, collection);
+ return clusterState.getShard(hash, collection);
}
// used for deleteByQuery to get the list of nodes this leader should forward to
@@ -698,11 +698,11 @@ public class DistributedUpdateProcessor
if (zkEnabled && DistribPhase.NONE == phase) {
boolean leaderForAnyShard = false; // start off by assuming we are not a leader for any shard
- Map<String,Slice> slices = zkController.getCloudState().getSlices(collection);
+ Map<String,Slice> slices = zkController.getClusterState().getSlices(collection);
if (slices == null) {
throw new SolrException(ErrorCode.BAD_REQUEST,
"Cannot find collection:" + collection + " in "
- + zkController.getCloudState().getCollections());
+ + zkController.getClusterState().getCollections());
}
ModifiableSolrParams params = new ModifiableSolrParams(req.getParams());
@@ -997,13 +997,13 @@ public class DistributedUpdateProcessor
private List<Node> getCollectionUrls(SolrQueryRequest req, String collection, String shardZkNodeName) {
- CloudState cloudState = req.getCore().getCoreDescriptor()
- .getCoreContainer().getZkController().getCloudState();
+ ClusterState clusterState = req.getCore().getCoreDescriptor()
+ .getCoreContainer().getZkController().getClusterState();
List<Node> urls = new ArrayList<Node>();
- Map<String,Slice> slices = cloudState.getSlices(collection);
+ Map<String,Slice> slices = clusterState.getSlices(collection);
if (slices == null) {
throw new ZooKeeperException(ErrorCode.BAD_REQUEST,
- "Could not find collection in zk: " + cloudState);
+ "Could not find collection in zk: " + clusterState);
}
for (Map.Entry<String,Slice> sliceEntry : slices.entrySet()) {
Slice replicas = slices.get(sliceEntry.getKey());
@@ -1012,7 +1012,7 @@ public class DistributedUpdateProcessor
for (Entry<String,ZkNodeProps> entry : shardMap.entrySet()) {
ZkCoreNodeProps nodeProps = new ZkCoreNodeProps(entry.getValue());
- if (cloudState.liveNodesContain(nodeProps.getNodeName()) && !entry.getKey().equals(shardZkNodeName)) {
+ if (clusterState.liveNodesContain(nodeProps.getNodeName()) && !entry.getKey().equals(shardZkNodeName)) {
urls.add(new StdNode(nodeProps));
}
}
Modified: lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/cloud/AbstractDistributedZkTestCase.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/cloud/AbstractDistributedZkTestCase.java?rev=1369398&r1=1369397&r2=1369398&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/cloud/AbstractDistributedZkTestCase.java (original)
+++ lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/cloud/AbstractDistributedZkTestCase.java Sat Aug 4 18:39:08 2012
@@ -24,7 +24,7 @@ import java.util.concurrent.atomic.Atomi
import org.apache.commons.io.FileUtils;
import org.apache.solr.BaseDistributedSearchTestCase;
import org.apache.solr.client.solrj.embedded.JettySolrRunner;
-import org.apache.solr.common.cloud.CloudState;
+import org.apache.solr.common.cloud.ClusterState;
import org.apache.solr.common.cloud.Slice;
import org.apache.solr.common.cloud.SolrZkClient;
import org.apache.solr.common.cloud.ZkNodeProps;
@@ -125,21 +125,21 @@ public abstract class AbstractDistribute
while (cont) {
if (verbose) System.out.println("-");
boolean sawLiveRecovering = false;
- zkStateReader.updateCloudState(true);
- CloudState cloudState = zkStateReader.getCloudState();
- Map<String,Slice> slices = cloudState.getSlices(collection);
+ zkStateReader.updateClusterState(true);
+ ClusterState clusterState = zkStateReader.getClusterState();
+ Map<String,Slice> slices = clusterState.getSlices(collection);
for (Map.Entry<String,Slice> entry : slices.entrySet()) {
Map<String,ZkNodeProps> shards = entry.getValue().getShards();
for (Map.Entry<String,ZkNodeProps> shard : shards.entrySet()) {
if (verbose) System.out.println("rstate:"
+ shard.getValue().get(ZkStateReader.STATE_PROP)
+ " live:"
- + cloudState.liveNodesContain(shard.getValue().get(
+ + clusterState.liveNodesContain(shard.getValue().get(
ZkStateReader.NODE_NAME_PROP)));
String state = shard.getValue().get(ZkStateReader.STATE_PROP);
if ((state.equals(ZkStateReader.RECOVERING) || state
.equals(ZkStateReader.SYNC) || state.equals(ZkStateReader.DOWN))
- && cloudState.liveNodesContain(shard.getValue().get(
+ && clusterState.liveNodesContain(shard.getValue().get(
ZkStateReader.NODE_NAME_PROP))) {
sawLiveRecovering = true;
}
@@ -168,9 +168,9 @@ public abstract class AbstractDistribute
protected void assertAllActive(String collection,ZkStateReader zkStateReader)
throws KeeperException, InterruptedException {
- zkStateReader.updateCloudState(true);
- CloudState cloudState = zkStateReader.getCloudState();
- Map<String,Slice> slices = cloudState.getSlices(collection);
+ zkStateReader.updateClusterState(true);
+ ClusterState clusterState = zkStateReader.getClusterState();
+ Map<String,Slice> slices = clusterState.getSlices(collection);
if (slices == null) {
throw new IllegalArgumentException("Cannot find collection:" + collection);
}
Modified: lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/cloud/BasicDistributedZkTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/cloud/BasicDistributedZkTest.java?rev=1369398&r1=1369397&r2=1369398&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/cloud/BasicDistributedZkTest.java (original)
+++ lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/cloud/BasicDistributedZkTest.java Sat Aug 4 18:39:08 2012
@@ -57,7 +57,7 @@ import org.apache.solr.common.SolrDocume
import org.apache.solr.common.SolrException;
import org.apache.solr.common.SolrException.ErrorCode;
import org.apache.solr.common.SolrInputDocument;
-import org.apache.solr.common.cloud.CloudState;
+import org.apache.solr.common.cloud.ClusterState;
import org.apache.solr.common.cloud.Slice;
import org.apache.solr.common.cloud.ZkCoreNodeProps;
import org.apache.solr.common.cloud.ZkNodeProps;
@@ -451,7 +451,7 @@ public class BasicDistributedZkTest exte
private void collectStartTimes(String collectionName,
Map<String,Long> urlToTime) throws SolrServerException, IOException {
Map<String,Map<String,Slice>> collections = solrj.getZkStateReader()
- .getCloudState().getCollectionStates();
+ .getClusterState().getCollectionStates();
if (collections.containsKey(collectionName)) {
Map<String,Slice> slices = collections.get(collectionName);
@@ -478,8 +478,8 @@ public class BasicDistributedZkTest exte
}
private String getUrlFromZk(String collection) {
- CloudState cloudState = solrj.getZkStateReader().getCloudState();
- Map<String,Slice> slices = cloudState.getCollectionStates().get(collection);
+ ClusterState clusterState = solrj.getZkStateReader().getClusterState();
+ Map<String,Slice> slices = clusterState.getCollectionStates().get(collection);
if (slices == null) {
throw new SolrException(ErrorCode.BAD_REQUEST, "Could not find collection:" + collection);
@@ -491,7 +491,7 @@ public class BasicDistributedZkTest exte
Set<Map.Entry<String,ZkNodeProps>> shardEntries = shards.entrySet();
for (Map.Entry<String,ZkNodeProps> shardEntry : shardEntries) {
final ZkNodeProps node = shardEntry.getValue();
- if (cloudState.liveNodesContain(node.get(ZkStateReader.NODE_NAME_PROP))) {
+ if (clusterState.liveNodesContain(node.get(ZkStateReader.NODE_NAME_PROP))) {
return new ZkCoreNodeProps(node).getCoreUrl();
}
}
@@ -533,9 +533,9 @@ public class BasicDistributedZkTest exte
boolean found = false;
boolean sliceMatch = false;
while (System.currentTimeMillis() < timeoutAt) {
- solrj.getZkStateReader().updateCloudState(true);
- CloudState cloudState = solrj.getZkStateReader().getCloudState();
- Map<String,Map<String,Slice>> collections = cloudState
+ solrj.getZkStateReader().updateClusterState(true);
+ ClusterState clusterState = solrj.getZkStateReader().getClusterState();
+ Map<String,Map<String,Slice>> collections = clusterState
.getCollectionStates();
if (collections.containsKey(collectionName)) {
Map<String,Slice> slices = collections.get(collectionName);
@@ -581,9 +581,9 @@ public class BasicDistributedZkTest exte
long timeoutAt = System.currentTimeMillis() + 15000;
boolean found = true;
while (System.currentTimeMillis() < timeoutAt) {
- solrj.getZkStateReader().updateCloudState(true);
- CloudState cloudState = solrj.getZkStateReader().getCloudState();
- Map<String,Map<String,Slice>> collections = cloudState
+ solrj.getZkStateReader().updateClusterState(true);
+ ClusterState clusterState = solrj.getZkStateReader().getClusterState();
+ Map<String,Map<String,Slice>> collections = clusterState
.getCollectionStates();
if (!collections.containsKey(collectionName)) {
found = false;
@@ -773,8 +773,8 @@ public class BasicDistributedZkTest exte
// we added a role of none on these creates - check for it
ZkStateReader zkStateReader = solrj.getZkStateReader();
- zkStateReader.updateCloudState(true);
- Map<String,Slice> slices = zkStateReader.getCloudState().getSlices(oneInstanceCollection2);
+ zkStateReader.updateClusterState(true);
+ Map<String,Slice> slices = zkStateReader.getClusterState().getSlices(oneInstanceCollection2);
assertNotNull(slices);
String roles = slices.get("slice1").getShards().values().iterator().next().get(ZkStateReader.ROLES_PROP);
assertEquals("none", roles);
Modified: lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/cloud/BasicZkTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/cloud/BasicZkTest.java?rev=1369398&r1=1369397&r2=1369398&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/cloud/BasicZkTest.java (original)
+++ lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/cloud/BasicZkTest.java Sat Aug 4 18:39:08 2012
@@ -126,8 +126,8 @@ public class BasicZkTest extends Abstrac
// ensure zk still thinks node is up
assertTrue(
- zkController.getCloudState().getLiveNodes().toString(),
- zkController.getCloudState().liveNodesContain(
+ zkController.getClusterState().getLiveNodes().toString(),
+ zkController.getClusterState().liveNodesContain(
zkController.getNodeName()));
// test maxint
Modified: lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/cloud/ChaosMonkey.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/cloud/ChaosMonkey.java?rev=1369398&r1=1369397&r2=1369398&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/cloud/ChaosMonkey.java (original)
+++ lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/cloud/ChaosMonkey.java Sat Aug 4 18:39:08 2012
@@ -232,7 +232,7 @@ public class ChaosMonkey {
}
private String getRandomSlice() {
- Map<String,Slice> slices = zkStateReader.getCloudState().getSlices(collection);
+ Map<String,Slice> slices = zkStateReader.getClusterState().getSlices(collection);
List<String> sliceKeyList = new ArrayList<String>(slices.size());
sliceKeyList.addAll(slices.keySet());
@@ -259,9 +259,9 @@ public class ChaosMonkey {
boolean running = true;
// get latest cloud state
- zkStateReader.updateCloudState(true);
+ zkStateReader.updateClusterState(true);
- Slice theShards = zkStateReader.getCloudState().getSlices(collection)
+ Slice theShards = zkStateReader.getClusterState().getSlices(collection)
.get(slice);
ZkNodeProps props = theShards.getShards().get(cloudJetty.coreNodeName);
@@ -275,19 +275,19 @@ public class ChaosMonkey {
if (!cloudJetty.jetty.isRunning()
|| !state.equals(ZkStateReader.ACTIVE)
- || !zkStateReader.getCloudState().liveNodesContain(nodeName)) {
+ || !zkStateReader.getClusterState().liveNodesContain(nodeName)) {
running = false;
}
if (cloudJetty.jetty.isRunning()
&& state.equals(ZkStateReader.RECOVERING)
- && zkStateReader.getCloudState().liveNodesContain(nodeName)) {
+ && zkStateReader.getClusterState().liveNodesContain(nodeName)) {
numRecovering++;
}
if (cloudJetty.jetty.isRunning()
&& state.equals(ZkStateReader.ACTIVE)
- && zkStateReader.getCloudState().liveNodesContain(nodeName)) {
+ && zkStateReader.getClusterState().liveNodesContain(nodeName)) {
numActive++;
}
@@ -336,7 +336,7 @@ public class ChaosMonkey {
public SolrServer getRandomClient(String slice) throws KeeperException, InterruptedException {
// get latest cloud state
- zkStateReader.updateCloudState(true);
+ zkStateReader.updateClusterState(true);
// get random shard
List<SolrServer> clients = shardToClient.get(slice);
Modified: lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/cloud/ChaosMonkeyNothingIsSafeTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/cloud/ChaosMonkeyNothingIsSafeTest.java?rev=1369398&r1=1369397&r2=1369398&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/cloud/ChaosMonkeyNothingIsSafeTest.java (original)
+++ lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/cloud/ChaosMonkeyNothingIsSafeTest.java Sat Aug 4 18:39:08 2012
@@ -148,8 +148,8 @@ public class ChaosMonkeyNothingIsSafeTes
// TODO: assert we didnt kill everyone
- zkStateReader.updateCloudState(true);
- assertTrue(zkStateReader.getCloudState().getLiveNodes().size() > 0);
+ zkStateReader.updateClusterState(true);
+ assertTrue(zkStateReader.getClusterState().getLiveNodes().size() > 0);
checkShardConsistency(false, true);
Modified: lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/cloud/FullSolrCloudTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/cloud/FullSolrCloudTest.java?rev=1369398&r1=1369397&r2=1369398&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/cloud/FullSolrCloudTest.java (original)
+++ lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/cloud/FullSolrCloudTest.java Sat Aug 4 18:39:08 2012
@@ -44,7 +44,7 @@ import org.apache.solr.common.SolrDocume
import org.apache.solr.common.SolrDocumentList;
import org.apache.solr.common.SolrException;
import org.apache.solr.common.SolrInputDocument;
-import org.apache.solr.common.cloud.CloudState;
+import org.apache.solr.common.cloud.ClusterState;
import org.apache.solr.common.cloud.Slice;
import org.apache.solr.common.cloud.ZkCoreNodeProps;
import org.apache.solr.common.cloud.ZkNodeProps;
@@ -214,11 +214,11 @@ public class FullSolrCloudTest extends A
}
// wait until shards have started registering...
- while (!zkStateReader.getCloudState().getCollections()
+ while (!zkStateReader.getClusterState().getCollections()
.contains(DEFAULT_COLLECTION)) {
Thread.sleep(500);
}
- while (zkStateReader.getCloudState().getSlices(DEFAULT_COLLECTION).size() != sliceCount) {
+ while (zkStateReader.getClusterState().getSlices(DEFAULT_COLLECTION).size() != sliceCount) {
Thread.sleep(500);
}
@@ -331,7 +331,7 @@ public class FullSolrCloudTest extends A
}
private int getNumShards(String defaultCollection) {
- Map<String,Slice> slices = this.zkStateReader.getCloudState().getSlices(defaultCollection);
+ Map<String,Slice> slices = this.zkStateReader.getClusterState().getSlices(defaultCollection);
int cnt = 0;
for (Map.Entry<String,Slice> entry : slices.entrySet()) {
cnt += entry.getValue().getShards().size();
@@ -354,16 +354,16 @@ public class FullSolrCloudTest extends A
protected void updateMappingsFromZk(List<JettySolrRunner> jettys,
List<SolrServer> clients) throws Exception {
- zkStateReader.updateCloudState(true);
+ zkStateReader.updateClusterState(true);
cloudJettys.clear();
shardToJetty.clear();
- CloudState cloudState = zkStateReader.getCloudState();
- Map<String,Slice> slices = cloudState.getSlices(DEFAULT_COLLECTION);
+ ClusterState clusterState = zkStateReader.getClusterState();
+ Map<String,Slice> slices = clusterState.getSlices(DEFAULT_COLLECTION);
if (slices == null) {
throw new RuntimeException("No slices found for collection "
- + DEFAULT_COLLECTION + " in " + cloudState.getCollections());
+ + DEFAULT_COLLECTION + " in " + clusterState.getCollections());
}
List<CloudSolrServerClient> theClients = new ArrayList<CloudSolrServerClient>();
@@ -1053,7 +1053,7 @@ public class FullSolrCloudTest extends A
assertEquals(
"The client count does not match up with the shard count for slice:"
+ shard,
- zkStateReader.getCloudState().getSlice(DEFAULT_COLLECTION, shard)
+ zkStateReader.getClusterState().getSlice(DEFAULT_COLLECTION, shard)
.getShards().size(), solrJetties.size());
SolrServer lastClient = null;
@@ -1078,7 +1078,7 @@ public class FullSolrCloudTest extends A
boolean live = false;
String nodeName = props.get(ZkStateReader.NODE_NAME_PROP);
- if (zkStateReader.getCloudState().liveNodesContain(nodeName)) {
+ if (zkStateReader.getClusterState().liveNodesContain(nodeName)) {
live = true;
}
if (verbose) System.err.println(" live:" + live);
@@ -1233,18 +1233,18 @@ public class FullSolrCloudTest extends A
ZkStateReader zk = new ZkStateReader(zkServer.getZkAddress(), 10000,
AbstractZkTestCase.TIMEOUT);
Map<String,Slice> slices = null;
- CloudState cloudState;
+ ClusterState clusterState;
try {
zk.createClusterStateWatchersAndUpdate();
- cloudState = zk.getCloudState();
- slices = cloudState.getSlices(DEFAULT_COLLECTION);
+ clusterState = zk.getClusterState();
+ slices = clusterState.getSlices(DEFAULT_COLLECTION);
} finally {
zk.close();
}
if (slices == null) {
throw new RuntimeException("Could not find collection "
- + DEFAULT_COLLECTION + " in " + cloudState.getCollections());
+ + DEFAULT_COLLECTION + " in " + clusterState.getCollections());
}
for (CloudJettyRunner cjetty : cloudJettys) {
@@ -1266,7 +1266,7 @@ public class FullSolrCloudTest extends A
String currentState = cjetty.info.get(ZkStateReader.STATE_PROP);
if (currentState != null
&& currentState.equals(ZkStateReader.ACTIVE)
- && zkStateReader.getCloudState().liveNodesContain(
+ && zkStateReader.getClusterState().liveNodesContain(
cjetty.info.get(ZkStateReader.NODE_NAME_PROP))) {
SolrQuery query = new SolrQuery("*:*");
query.set("distrib", false);
@@ -1509,7 +1509,7 @@ public class FullSolrCloudTest extends A
protected void waitToSeeNotLive(ZkStateReader zkStateReader,
CloudJettyRunner cjetty) throws InterruptedException {
int tries = 0;
- while (zkStateReader.getCloudState()
+ while (zkStateReader.getClusterState()
.liveNodesContain(cjetty.info.get(ZkStateReader.NODE_NAME_PROP))) {
if (tries++ == 120) {
fail("Shard still reported as live in zk");
Modified: lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/cloud/OverseerTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/cloud/OverseerTest.java?rev=1369398&r1=1369397&r2=1369398&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/cloud/OverseerTest.java (original)
+++ lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/cloud/OverseerTest.java Sat Aug 4 18:39:08 2012
@@ -36,7 +36,7 @@ import javax.xml.parsers.ParserConfigura
import org.apache.lucene.util.LuceneTestCase.Slow;
import org.apache.solr.SolrTestCaseJ4;
-import org.apache.solr.common.cloud.CloudState;
+import org.apache.solr.common.cloud.ClusterState;
import org.apache.solr.common.cloud.Slice;
import org.apache.solr.common.cloud.SolrZkClient;
import org.apache.solr.common.cloud.ZkNodeProps;
@@ -153,7 +153,7 @@ public class OverseerTest extends SolrTe
}
private String getShardId(final String coreName) {
- Map<String,Slice> slices = zkStateReader.getCloudState().getSlices(
+ Map<String,Slice> slices = zkStateReader.getClusterState().getSlices(
collection);
if (slices != null) {
for (Slice slice : slices.values()) {
@@ -340,8 +340,8 @@ public class OverseerTest extends SolrTe
// make sure all cores have been assigned a id in cloudstate
for (int i = 0; i < 40; i++) {
- reader.updateCloudState(true);
- CloudState state = reader.getCloudState();
+ reader.updateClusterState(true);
+ ClusterState state = reader.getClusterState();
Map<String,Slice> slices = state.getSlices("collection1");
int count = 0;
for (String name : slices.keySet()) {
@@ -419,8 +419,8 @@ public class OverseerTest extends SolrTe
private void waitForCollections(ZkStateReader stateReader, String... collections) throws InterruptedException, KeeperException {
int maxIterations = 100;
while (0 < maxIterations--) {
- stateReader.updateCloudState(true);
- final CloudState state = stateReader.getCloudState();
+ stateReader.updateClusterState(true);
+ final ClusterState state = stateReader.getClusterState();
Set<String> availableCollections = state.getCollections();
int availableCount = 0;
for(String requiredCollection: collections) {
@@ -431,7 +431,7 @@ public class OverseerTest extends SolrTe
Thread.sleep(50);
}
}
- log.warn("Timeout waiting for collections: " + Arrays.asList(collections) + " state:" + stateReader.getCloudState());
+ log.warn("Timeout waiting for collections: " + Arrays.asList(collections) + " state:" + stateReader.getClusterState());
}
@Test
@@ -472,8 +472,8 @@ public class OverseerTest extends SolrTe
waitForCollections(reader, "collection1");
- assertEquals(reader.getCloudState().toString(), ZkStateReader.RECOVERING,
- reader.getCloudState().getSlice("collection1", "shard1").getShards()
+ assertEquals(reader.getClusterState().toString(), ZkStateReader.RECOVERING,
+ reader.getClusterState().getSlice("collection1", "shard1").getShards()
.get("node1_core1").get(ZkStateReader.STATE_PROP));
//publish node state (active)
@@ -503,7 +503,7 @@ public class OverseerTest extends SolrTe
int maxIterations = 100;
String coreState = null;
while(maxIterations-->0) {
- Slice slice = reader.getCloudState().getSlice("collection1", "shard1");
+ Slice slice = reader.getClusterState().getSlice("collection1", "shard1");
if(slice!=null) {
coreState = slice.getShards().get("node1_core1").get(ZkStateReader.STATE_PROP);
if(coreState.equals(expectedState)) {
@@ -512,14 +512,14 @@ public class OverseerTest extends SolrTe
}
Thread.sleep(50);
}
- fail("Illegal state, was:" + coreState + " expected:" + expectedState + "cloudState:" + reader.getCloudState());
+ fail("Illegal state, was:" + coreState + " expected:" + expectedState + "clusterState:" + reader.getClusterState());
}
private void verifyShardLeader(ZkStateReader reader, String collection, String shard, String expectedCore) throws InterruptedException, KeeperException {
int maxIterations = 100;
while(maxIterations-->0) {
- reader.updateCloudState(true); // poll state
- ZkNodeProps props = reader.getCloudState().getLeader(collection, shard);
+ reader.updateClusterState(true); // poll state
+ ZkNodeProps props = reader.getClusterState().getLeader(collection, shard);
if(props!=null) {
if(expectedCore.equals(props.get(ZkStateReader.CORE_NAME_PROP))) {
return;
@@ -528,7 +528,7 @@ public class OverseerTest extends SolrTe
Thread.sleep(100);
}
- assertEquals("Unexpected shard leader coll:" + collection + " shard:" + shard, expectedCore, (reader.getCloudState().getLeader(collection, shard)!=null)?reader.getCloudState().getLeader(collection, shard).get(ZkStateReader.CORE_NAME_PROP):null);
+ assertEquals("Unexpected shard leader coll:" + collection + " shard:" + shard, expectedCore, (reader.getClusterState().getLeader(collection, shard)!=null)?reader.getClusterState().getLeader(collection, shard).get(ZkStateReader.CORE_NAME_PROP):null);
}
@Test
@@ -562,35 +562,35 @@ public class OverseerTest extends SolrTe
waitForCollections(reader, "collection1");
verifyStatus(reader, ZkStateReader.RECOVERING);
- int version = getCloudStateVersion(controllerClient);
+ int version = getClusterStateVersion(controllerClient);
mockController.publishState("core1", ZkStateReader.ACTIVE, 1);
- while(version == getCloudStateVersion(controllerClient));
+ while(version == getClusterStateVersion(controllerClient));
verifyStatus(reader, ZkStateReader.ACTIVE);
- version = getCloudStateVersion(controllerClient);
+ version = getClusterStateVersion(controllerClient);
overseerClient.close();
Thread.sleep(1000); //wait for overseer to get killed
mockController.publishState("core1", ZkStateReader.RECOVERING, 1);
- version = getCloudStateVersion(controllerClient);
+ version = getClusterStateVersion(controllerClient);
overseerClient = electNewOverseer(server.getZkAddress());
- while(version == getCloudStateVersion(controllerClient));
+ while(version == getClusterStateVersion(controllerClient));
verifyStatus(reader, ZkStateReader.RECOVERING);
- assertEquals("Live nodes count does not match", 1, reader.getCloudState()
+ assertEquals("Live nodes count does not match", 1, reader.getClusterState()
.getLiveNodes().size());
- assertEquals("Shard count does not match", 1, reader.getCloudState()
+ assertEquals("Shard count does not match", 1, reader.getClusterState()
.getSlice("collection1", "shard1").getShards().size());
- version = getCloudStateVersion(controllerClient);
+ version = getClusterStateVersion(controllerClient);
mockController.publishState("core1", null,1);
- while(version == getCloudStateVersion(controllerClient));
+ while(version == getClusterStateVersion(controllerClient));
Thread.sleep(500);
- assertFalse("collection1 should be gone after publishing the null state", reader.getCloudState().getCollections().contains("collection1"));
+ assertFalse("collection1 should be gone after publishing the null state", reader.getClusterState().getCollections().contains("collection1"));
} finally {
close(mockController);
@@ -740,15 +740,15 @@ public class OverseerTest extends SolrTe
mockController.close();
- int version = getCloudStateVersion(controllerClient);
+ int version = getClusterStateVersion(controllerClient);
mockController = new MockZKController(server.getZkAddress(), "node1", "collection1");
mockController.publishState("core1", ZkStateReader.RECOVERING, 1);
- while (version == getCloudStateVersion(controllerClient));
+ while (version == getClusterStateVersion(controllerClient));
- reader.updateCloudState(true);
- CloudState state = reader.getCloudState();
+ reader.updateClusterState(true);
+ ClusterState state = reader.getClusterState();
int numFound = 0;
for (Map<String,Slice> collection : state.getCollectionStates().values()) {
@@ -758,7 +758,7 @@ public class OverseerTest extends SolrTe
}
}
}
- assertEquals("Shard was found in more than 1 times in CloudState", 1,
+ assertEquals("Shard was found more than once in ClusterState", 1,
numFound);
} finally {
close(overseerClient);
@@ -800,7 +800,7 @@ public class OverseerTest extends SolrTe
waitForCollections(reader, "collection1");
- assertEquals("Slicecount does not match", 12, reader.getCloudState().getSlices("collection1").size());
+ assertEquals("Slicecount does not match", 12, reader.getClusterState().getSlices("collection1").size());
} finally {
close(overseerClient);
@@ -872,12 +872,12 @@ public class OverseerTest extends SolrTe
queue.offer(ZkStateReader.toJSON(m));
for(int i=0;i<100;i++) {
- Slice s = reader.getCloudState().getSlice("collection1", "s1");
+ Slice s = reader.getClusterState().getSlice("collection1", "s1");
if(s!=null && s.getShards().size()==3) break;
Thread.sleep(100);
}
- assertNotNull(reader.getCloudState().getSlice("collection1", "s1"));
- assertEquals(3, reader.getCloudState().getSlice("collection1", "s1").getShards().size());
+ assertNotNull(reader.getClusterState().getSlice("collection1", "s1"));
+ assertEquals(3, reader.getClusterState().getSlice("collection1", "s1").getShards().size());
} finally {
close(overseerClient);
close(zkClient);
@@ -898,7 +898,7 @@ public class OverseerTest extends SolrTe
}
}
- private int getCloudStateVersion(SolrZkClient controllerClient)
+ private int getClusterStateVersion(SolrZkClient controllerClient)
throws KeeperException, InterruptedException {
return controllerClient.exists(ZkStateReader.CLUSTER_STATE, null, false).getVersion();
}
Modified: lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/cloud/SyncSliceTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/cloud/SyncSliceTest.java?rev=1369398&r1=1369397&r2=1369398&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/cloud/SyncSliceTest.java (original)
+++ lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/cloud/SyncSliceTest.java Sat Aug 4 18:39:08 2012
@@ -157,7 +157,7 @@ public class SyncSliceTest extends FullS
// we are careful to make sure the downed node is no longer in the state,
// because on some systems (especially freebsd w/ blackhole enabled), trying
// to talk to a downed node causes grief
- waitToSeeDownInCloudState(leaderJetty, jetties);
+ waitToSeeDownInClusterState(leaderJetty, jetties);
waitForThingsToLevelOut();
@@ -217,7 +217,7 @@ public class SyncSliceTest extends FullS
// kill the current leader
chaosMonkey.killJetty(leaderJetty);
- waitToSeeDownInCloudState(leaderJetty, jetties);
+ waitToSeeDownInClusterState(leaderJetty, jetties);
Thread.sleep(4000);
@@ -248,7 +248,7 @@ public class SyncSliceTest extends FullS
return skipServers;
}
- private void waitToSeeDownInCloudState(CloudJettyRunner leaderJetty,
+ private void waitToSeeDownInClusterState(CloudJettyRunner leaderJetty,
Set<CloudJettyRunner> jetties) throws InterruptedException {
for (CloudJettyRunner cjetty : jetties) {
Modified: lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/cloud/ZkControllerTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/cloud/ZkControllerTest.java?rev=1369398&r1=1369397&r2=1369398&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/cloud/ZkControllerTest.java (original)
+++ lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/cloud/ZkControllerTest.java Sat Aug 4 18:39:08 2012
@@ -202,7 +202,7 @@ public class ZkControllerTest extends So
assertNotNull(reader.getLeaderUrl("collection1", "shard1", 15000));
- assertEquals("Shard(s) missing from cloudstate", 2, zkController.getZkStateReader().getCloudState().getSlice("collection1", "shard1").getShards().size());
+ assertEquals("Shard(s) missing from cloudstate", 2, zkController.getZkStateReader().getClusterState().getSlice("collection1", "shard1").getShards().size());
// unregister current leader
final ZkNodeProps shard1LeaderProps = reader.getLeaderProps(
@@ -224,10 +224,10 @@ public class ZkControllerTest extends So
reader.getLeaderUrl("collection1", "shard1", 15000));
for(int i=0;i<30;i++) {
- if(zkController.getZkStateReader().getCloudState().getSlice("collection1", "shard1").getShards().size()==1) break;
+ if(zkController.getZkStateReader().getClusterState().getSlice("collection1", "shard1").getShards().size()==1) break;
Thread.sleep(500);
}
- assertEquals("shard was not unregistered", 1, zkController.getZkStateReader().getCloudState().getSlice("collection1", "shard1").getShards().size());
+ assertEquals("shard was not unregistered", 1, zkController.getZkStateReader().getClusterState().getSlice("collection1", "shard1").getShards().size());
} finally {
System.clearProperty("solrcloud.skip.autorecovery");
System.clearProperty(ZkStateReader.NUM_SHARDS_PROP);
Modified: lucene/dev/branches/branch_4x/solr/solrj/src/java/org/apache/solr/client/solrj/impl/CloudSolrServer.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/solrj/src/java/org/apache/solr/client/solrj/impl/CloudSolrServer.java?rev=1369398&r1=1369397&r2=1369398&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/solrj/src/java/org/apache/solr/client/solrj/impl/CloudSolrServer.java (original)
+++ lucene/dev/branches/branch_4x/solr/solrj/src/java/org/apache/solr/client/solrj/impl/CloudSolrServer.java Sat Aug 4 18:39:08 2012
@@ -34,7 +34,7 @@ import org.apache.solr.client.solrj.Solr
import org.apache.solr.client.solrj.SolrServerException;
import org.apache.solr.client.solrj.util.ClientUtils;
import org.apache.solr.common.SolrException;
-import org.apache.solr.common.cloud.CloudState;
+import org.apache.solr.common.cloud.ClusterState;
import org.apache.solr.common.cloud.Slice;
import org.apache.solr.common.cloud.ZkCoreNodeProps;
import org.apache.solr.common.cloud.ZkNodeProps;
@@ -139,7 +139,7 @@ public class CloudSolrServer extends Sol
// TODO: if you can hash here, you could favor the shard leader
- CloudState cloudState = zkStateReader.getCloudState();
+ ClusterState clusterState = zkStateReader.getClusterState();
SolrParams reqParams = request.getParams();
if (reqParams == null) {
@@ -159,12 +159,12 @@ public class CloudSolrServer extends Sol
Map<String,Slice> slices = new HashMap<String,Slice>();
for (int i = 0; i < collectionList.size(); i++) {
String coll= collectionList.get(i);
- ClientUtils.appendMap(coll, slices, cloudState.getSlices(coll));
+ ClientUtils.appendMap(coll, slices, clusterState.getSlices(coll));
}
- Set<String> liveNodes = cloudState.getLiveNodes();
+ Set<String> liveNodes = clusterState.getLiveNodes();
- // IDEA: have versions on various things... like a global cloudState version
+ // IDEA: have versions on various things... like a global clusterState version
// or shardAddressVersion (which only changes when the shards change)
// to allow caching.