svn commit: r1228721 - in /lucene/dev/branches/solrcloud/solr: core/src/java/org/apache/solr/cloud/ core/src/java/org/apache/solr/update/processor/ solrj/src/java/org/apache/solr/common/cloud/

[ma...@apache.org]

Author: markrmiller
Date: Sat Jan  7 20:47:29 2012
New Revision: 1228721

URL: http://svn.apache.org/viewvc?rev=1228721&view=rev
Log:
fix bug in checking if we should try and do recovery - was always doing it

Modified:
    lucene/dev/branches/solrcloud/solr/core/src/java/org/apache/solr/cloud/ZkController.java
    lucene/dev/branches/solrcloud/solr/core/src/java/org/apache/solr/update/processor/DistributedUpdateProcessor.java
    lucene/dev/branches/solrcloud/solr/solrj/src/java/org/apache/solr/common/cloud/ZkCoreNodeProps.java

Modified: lucene/dev/branches/solrcloud/solr/core/src/java/org/apache/solr/cloud/ZkController.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solrcloud/solr/core/src/java/org/apache/solr/cloud/ZkController.java?rev=1228721&r1=1228720&r2=1228721&view=diff
==============================================================================
--- lucene/dev/branches/solrcloud/solr/core/src/java/org/apache/solr/cloud/ZkController.java (original)
+++ lucene/dev/branches/solrcloud/solr/core/src/java/org/apache/solr/cloud/ZkController.java Sat Jan  7 20:47:29 2012
@@ -38,6 +38,7 @@ import org.apache.solr.common.cloud.Core
 import org.apache.solr.common.cloud.OnReconnect;
 import org.apache.solr.common.cloud.SolrZkClient;
 import org.apache.solr.common.cloud.ZkCmdExecutor;
+import org.apache.solr.common.cloud.ZkCoreNodeProps;
 import org.apache.solr.common.cloud.ZkNodeProps;
 import org.apache.solr.common.cloud.ZkOperation;
 import org.apache.solr.common.cloud.ZkStateReader;
@@ -488,7 +489,7 @@ public final class ZkController {
     SolrCore core = null;
     try {
       boolean doRecovery = true;
-      if (leaderUrl.equals(baseUrl)) {
+      if (leaderUrl.equals(ZkCoreNodeProps.getCoreUrl(baseUrl, coreName))) {
         doRecovery = false;
 
         // recover from local transaction log and wait for it to complete before
@@ -536,6 +537,7 @@ public final class ZkController {
       }
       
       if (doRecovery && !SKIP_AUTO_RECOVERY) {
+        log.info("Core needs to recover:" + core.getName());
         recoveryStrat.recover(core);
       }
     } finally {

Modified: lucene/dev/branches/solrcloud/solr/core/src/java/org/apache/solr/update/processor/DistributedUpdateProcessor.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solrcloud/solr/core/src/java/org/apache/solr/update/processor/DistributedUpdateProcessor.java?rev=1228721&r1=1228720&r2=1228721&view=diff
==============================================================================
--- lucene/dev/branches/solrcloud/solr/core/src/java/org/apache/solr/update/processor/DistributedUpdateProcessor.java (original)
+++ lucene/dev/branches/solrcloud/solr/core/src/java/org/apache/solr/update/processor/DistributedUpdateProcessor.java Sat Jan  7 20:47:29 2012
@@ -273,9 +273,11 @@ public class DistributedUpdateProcessor 
       // TODO: do retries??
       // TODO: what if its is already recovering? Right now recoveries queue up -
       // should they?
+      String recoveryUrl = error.node.getBaseUrl();
       CommonsHttpSolrServer server;
+      log.info("try and ask " + recoveryUrl + " to recover");
       try {
-        server = new CommonsHttpSolrServer(error.node.getBaseUrl());
+        server = new CommonsHttpSolrServer(recoveryUrl);
         server.setSoTimeout(5000);
         server.setConnectionTimeout(5000);
         

Modified: lucene/dev/branches/solrcloud/solr/solrj/src/java/org/apache/solr/common/cloud/ZkCoreNodeProps.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solrcloud/solr/solrj/src/java/org/apache/solr/common/cloud/ZkCoreNodeProps.java?rev=1228721&r1=1228720&r2=1228721&view=diff
==============================================================================
--- lucene/dev/branches/solrcloud/solr/solrj/src/java/org/apache/solr/common/cloud/ZkCoreNodeProps.java (original)
+++ lucene/dev/branches/solrcloud/solr/solrj/src/java/org/apache/solr/common/cloud/ZkCoreNodeProps.java Sat Jan  7 20:47:29 2012
@@ -57,5 +57,10 @@ public class ZkCoreNodeProps {
     return sb.toString();
   }
 
+  @Override
+  public String toString() {
+    return nodeProps.toString();
+  }
+
 
 }