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/01/13 20:29:52 UTC
svn commit: r1231263 -
/lucene/dev/branches/solrcloud/solr/core/src/java/org/apache/solr/handler/admin/CoreAdminHandler.java
Author: markrmiller
Date: Fri Jan 13 19:29:51 2012
New Revision: 1231263
URL: http://svn.apache.org/viewvc?rev=1231263&view=rev
Log:
also show live state in log
Modified:
lucene/dev/branches/solrcloud/solr/core/src/java/org/apache/solr/handler/admin/CoreAdminHandler.java
Modified: lucene/dev/branches/solrcloud/solr/core/src/java/org/apache/solr/handler/admin/CoreAdminHandler.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solrcloud/solr/core/src/java/org/apache/solr/handler/admin/CoreAdminHandler.java?rev=1231263&r1=1231262&r2=1231263&view=diff
==============================================================================
--- lucene/dev/branches/solrcloud/solr/core/src/java/org/apache/solr/handler/admin/CoreAdminHandler.java (original)
+++ lucene/dev/branches/solrcloud/solr/core/src/java/org/apache/solr/handler/admin/CoreAdminHandler.java Fri Jan 13 19:29:51 2012
@@ -623,15 +623,16 @@ public class CoreAdminHandler extends Re
cloudState.getSlice(cloudDescriptor.getCollectionName(),
cloudDescriptor.getShardId()).getShards().get(coreNodeName);
state = nodeProps.get(ZkStateReader.STATE_PROP);
+ boolean live = cloudState.liveNodesContain(nodeName);
if (nodeProps != null && state.equals(ZkStateReader.RECOVERING)
- && cloudState.liveNodesContain(nodeName)) {
+ && live) {
break;
}
if (retry++ == 30) {
throw new SolrException(ErrorCode.BAD_REQUEST,
"I was asked to prep for recovery for " + nodeName
- + " but she is not live or not in a recovery state - state: " + state);
+ + " but she is not live or not in a recovery state - state: " + state + " live:" + live);
}
Thread.sleep(1000);