lucene-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sha...@apache.org
Subject svn commit: r1693218 - in /lucene/dev/trunk/solr: CHANGES.txt core/src/java/org/apache/solr/cloud/ZkController.java
Date Wed, 29 Jul 2015 08:56:28 GMT
Author: shalin
Date: Wed Jul 29 08:56:28 2015
New Revision: 1693218

URL: http://svn.apache.org/r1693218
Log:
SOLR-7842: ZK connection loss or session expiry events should not fire config directory listeners

Modified:
    lucene/dev/trunk/solr/CHANGES.txt
    lucene/dev/trunk/solr/core/src/java/org/apache/solr/cloud/ZkController.java

Modified: lucene/dev/trunk/solr/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/CHANGES.txt?rev=1693218&r1=1693217&r2=1693218&view=diff
==============================================================================
--- lucene/dev/trunk/solr/CHANGES.txt (original)
+++ lucene/dev/trunk/solr/CHANGES.txt Wed Jul 29 08:56:28 2015
@@ -250,6 +250,9 @@ Bug Fixes
 * SOLR-7829: Fixed a bug in distributed pivot faceting that could result in a facet.missing=true
count
   which was lower then the correct count if facet.sort=index and facet.pivot.mincount >
1 (hossman)
 
+* SOLR-7842: ZK connection loss or session expiry events should not fire config directory
listeners.
+  (noble, shalin)
+
 Optimizations
 ----------------------
 

Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/cloud/ZkController.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/cloud/ZkController.java?rev=1693218&r1=1693217&r2=1693218&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/cloud/ZkController.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/cloud/ZkController.java Wed Jul 29
08:56:28 2015
@@ -2330,6 +2330,10 @@ public final class ZkController {
 
     @Override
     public void process(WatchedEvent event) {
+      if (event.getState() == Event.KeeperState.Disconnected || event.getState() == Event.KeeperState.Expired)
 {
+        return;
+      }
+
       Stat stat = null;
       try {
         stat = zkClient.exists(zkDir, null, true);



Mime
View raw message