lucene-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From markrmil...@apache.org
Subject svn commit: r1226347 - in /lucene/dev/branches/solrcloud/solr/core/src/java/org/apache/solr/cloud: NodeStateWatcher.java Overseer.java
Date Mon, 02 Jan 2012 05:06:51 GMT
Author: markrmiller
Date: Mon Jan  2 05:06:50 2012
New Revision: 1226347

URL: http://svn.apache.org/viewvc?rev=1226347&view=rev
Log:
remove another nocommit

Modified:
    lucene/dev/branches/solrcloud/solr/core/src/java/org/apache/solr/cloud/NodeStateWatcher.java
    lucene/dev/branches/solrcloud/solr/core/src/java/org/apache/solr/cloud/Overseer.java

Modified: lucene/dev/branches/solrcloud/solr/core/src/java/org/apache/solr/cloud/NodeStateWatcher.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solrcloud/solr/core/src/java/org/apache/solr/cloud/NodeStateWatcher.java?rev=1226347&r1=1226346&r2=1226347&view=diff
==============================================================================
--- lucene/dev/branches/solrcloud/solr/core/src/java/org/apache/solr/cloud/NodeStateWatcher.java
(original)
+++ lucene/dev/branches/solrcloud/solr/core/src/java/org/apache/solr/cloud/NodeStateWatcher.java
Mon Jan  2 05:06:50 2012
@@ -45,7 +45,6 @@ public class NodeStateWatcher implements
   }
 
   private final SolrZkClient zkClient;
-  private boolean stop = false;
   private final String path;
   private volatile Set<CoreState> currentState = new HashSet<CoreState>();
   private final NodeStateChangeListener listener;
@@ -65,20 +64,12 @@ public class NodeStateWatcher implements
     processStateChange();
   }
 
-  public void close() {
-    stop = true;
-  }
-
   @Override
   public void process(WatchedEvent event) {
-    if (stop)
-      return;
     try {
       processStateChange();
     } catch (KeeperException e) {
-      // nocommit: stop working on any keeper error
-      log.warn("Could not talk to ZK", e);
-//      stop = true;
+      log.warn("Error processing state change", e);
     } catch (InterruptedException e) {
       // Restore the interrupted status
       Thread.currentThread().interrupt();

Modified: lucene/dev/branches/solrcloud/solr/core/src/java/org/apache/solr/cloud/Overseer.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solrcloud/solr/core/src/java/org/apache/solr/cloud/Overseer.java?rev=1226347&r1=1226346&r2=1226347&view=diff
==============================================================================
--- lucene/dev/branches/solrcloud/solr/core/src/java/org/apache/solr/cloud/Overseer.java (original)
+++ lucene/dev/branches/solrcloud/solr/core/src/java/org/apache/solr/cloud/Overseer.java Mon
Jan  2 05:06:50 2012
@@ -261,9 +261,6 @@ public class Overseer implements NodeSta
     Set<String> downNodes = complement(oldLiveNodes, liveNodes);
     for(String node: downNodes) {
       NodeStateWatcher watcher = nodeStateWatches.remove(node);
-      if (watcher != null) {
-        watcher.close();
-      }
     }
   }
   



Mime
View raw message