lucene-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From markrmil...@apache.org
Subject svn commit: r1210761 - in /lucene/dev/branches/solrcloud/solr/solrj/src/java/org/apache/solr: client/solrj/impl/CloudSolrServer.java common/cloud/ZkStateReader.java
Date Tue, 06 Dec 2011 03:08:51 GMT
Author: markrmiller
Date: Tue Dec  6 03:08:51 2011
New Revision: 1210761

URL: http://svn.apache.org/viewvc?rev=1210761&view=rev
Log:
remove debug code used to help track down solrzkclient bug

Modified:
    lucene/dev/branches/solrcloud/solr/solrj/src/java/org/apache/solr/client/solrj/impl/CloudSolrServer.java
    lucene/dev/branches/solrcloud/solr/solrj/src/java/org/apache/solr/common/cloud/ZkStateReader.java

Modified: lucene/dev/branches/solrcloud/solr/solrj/src/java/org/apache/solr/client/solrj/impl/CloudSolrServer.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solrcloud/solr/solrj/src/java/org/apache/solr/client/solrj/impl/CloudSolrServer.java?rev=1210761&r1=1210760&r2=1210761&view=diff
==============================================================================
--- lucene/dev/branches/solrcloud/solr/solrj/src/java/org/apache/solr/client/solrj/impl/CloudSolrServer.java
(original)
+++ lucene/dev/branches/solrcloud/solr/solrj/src/java/org/apache/solr/client/solrj/impl/CloudSolrServer.java
Tue Dec  6 03:08:51 2011
@@ -95,7 +95,7 @@ public class CloudSolrServer extends Sol
         if (zkStateReader == null) {
           try {
             ZkStateReader zk = new ZkStateReader(zkHost, zkConnectTimeout,
-                zkClientTimeout, true);
+                zkClientTimeout);
             zk.createClusterStateWatchersAndUpdate();
             zkStateReader = zk;
           } catch (InterruptedException e) {

Modified: lucene/dev/branches/solrcloud/solr/solrj/src/java/org/apache/solr/common/cloud/ZkStateReader.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solrcloud/solr/solrj/src/java/org/apache/solr/common/cloud/ZkStateReader.java?rev=1210761&r1=1210760&r2=1210761&view=diff
==============================================================================
--- lucene/dev/branches/solrcloud/solr/solrj/src/java/org/apache/solr/common/cloud/ZkStateReader.java
(original)
+++ lucene/dev/branches/solrcloud/solr/solrj/src/java/org/apache/solr/common/cloud/ZkStateReader.java
Tue Dec  6 03:08:51 2011
@@ -74,20 +74,12 @@ public class ZkStateReader {
   private SolrZkClient zkClient;
   
   private boolean closeClient = false;
-
-  private boolean debugLog;
   
   public ZkStateReader(SolrZkClient zkClient) {
     this.zkClient = zkClient;
   }
   
   public ZkStateReader(String zkServerAddress, int zkClientTimeout, int zkClientConnectTimeout)
throws InterruptedException, TimeoutException, IOException {
-    this(zkServerAddress, zkClientTimeout, zkClientConnectTimeout, false);
-  }
-  
-  public ZkStateReader(String zkServerAddress, int zkClientTimeout, int zkClientConnectTimeout,
boolean debugLog) throws InterruptedException, TimeoutException, IOException {
-    this.debugLog = debugLog;
-    if (debugLog) System.out.println("NEW ZKREADER");
     closeClient = true;
     zkClient = new SolrZkClient(zkServerAddress, zkClientTimeout, zkClientConnectTimeout,
         // on reconnect, reload cloud info
@@ -149,7 +141,6 @@ public class ZkStateReader {
       
       @Override
       public void process(WatchedEvent event) {
-        if (debugLog) System.out.println("cluster change triggered");
         log.info("A cluster state change has occurred");
         try {
           
@@ -160,7 +151,6 @@ public class ZkStateReader {
             byte[] data = zkClient.getData(CLUSTER_STATE, this, null);
             CloudState clusterState = CloudState.load(data,
                 ZkStateReader.this.cloudState.getLiveNodes());
-            if (debugLog) System.out.println("update cluster:" + clusterState.getCollections());
             // update volatile
             cloudState = clusterState;
           }
@@ -226,7 +216,6 @@ public class ZkStateReader {
       Set<String> liveNodeSet = new HashSet<String>();
       liveNodeSet.addAll(liveNodes);
       CloudState clusterState = CloudState.load(zkClient, liveNodeSet);
-      if (debugLog) System.out.println("make cluster:" + clusterState.getCollections());
       this.cloudState = clusterState;
     }
   }



Mime
View raw message