You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by sh...@apache.org on 2015/07/29 10:57:15 UTC
svn commit: r1693219 - in /lucene/dev/branches/branch_5x: ./ solr/
solr/CHANGES.txt solr/core/
solr/core/src/java/org/apache/solr/cloud/ZkController.java
Author: shalin
Date: Wed Jul 29 08:57:15 2015
New Revision: 1693219
URL: http://svn.apache.org/r1693219
Log:
SOLR-7842: ZK connection loss or session expiry events should not fire config directory listeners
Modified:
lucene/dev/branches/branch_5x/ (props changed)
lucene/dev/branches/branch_5x/solr/ (props changed)
lucene/dev/branches/branch_5x/solr/CHANGES.txt (contents, props changed)
lucene/dev/branches/branch_5x/solr/core/ (props changed)
lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/cloud/ZkController.java
Modified: lucene/dev/branches/branch_5x/solr/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/CHANGES.txt?rev=1693219&r1=1693218&r2=1693219&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/CHANGES.txt (original)
+++ lucene/dev/branches/branch_5x/solr/CHANGES.txt Wed Jul 29 08:57:15 2015
@@ -187,6 +187,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/branches/branch_5x/solr/core/src/java/org/apache/solr/cloud/ZkController.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/cloud/ZkController.java?rev=1693219&r1=1693218&r2=1693219&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/cloud/ZkController.java (original)
+++ lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/cloud/ZkController.java Wed Jul 29 08:57:15 2015
@@ -2333,6 +2333,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);