lucene-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From markrmil...@apache.org
Subject svn commit: r1557160 - in /lucene/dev/branches/lucene_solr_4_6: ./ solr/ solr/CHANGES.txt solr/solrj/ solr/solrj/src/java/org/apache/solr/common/cloud/ConnectionManager.java
Date Fri, 10 Jan 2014 15:45:28 GMT
Author: markrmiller
Date: Fri Jan 10 15:45:28 2014
New Revision: 1557160

URL: http://svn.apache.org/r1557160
Log:
SOLR-5577: don't start timer thread on expiration

Modified:
    lucene/dev/branches/lucene_solr_4_6/   (props changed)
    lucene/dev/branches/lucene_solr_4_6/solr/   (props changed)
    lucene/dev/branches/lucene_solr_4_6/solr/CHANGES.txt
    lucene/dev/branches/lucene_solr_4_6/solr/solrj/   (props changed)
    lucene/dev/branches/lucene_solr_4_6/solr/solrj/src/java/org/apache/solr/common/cloud/ConnectionManager.java

Modified: lucene/dev/branches/lucene_solr_4_6/solr/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene_solr_4_6/solr/CHANGES.txt?rev=1557160&r1=1557159&r2=1557160&view=diff
==============================================================================
--- lucene/dev/branches/lucene_solr_4_6/solr/CHANGES.txt (original)
+++ lucene/dev/branches/lucene_solr_4_6/solr/CHANGES.txt Fri Jan 10 15:45:28 2014
@@ -60,7 +60,7 @@ Bug Fixes
 
 * SOLR-5577: Likely ZooKeeper expiration should not slow down updates a given
   amount, but instead cut off updates after a given time. 
-  (Mark Miller, Christine Poerschke)
+  (Mark Miller, Christine Poerschke, Ramkumar Aiyengar)
   
 * SOLR-5580: NPE when creating a core with both explicit shard and coreNodeName.
   (YouPeng Yang, Mark Miller)

Modified: lucene/dev/branches/lucene_solr_4_6/solr/solrj/src/java/org/apache/solr/common/cloud/ConnectionManager.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene_solr_4_6/solr/solrj/src/java/org/apache/solr/common/cloud/ConnectionManager.java?rev=1557160&r1=1557159&r2=1557160&view=diff
==============================================================================
--- lucene/dev/branches/lucene_solr_4_6/solr/solrj/src/java/org/apache/solr/common/cloud/ConnectionManager.java
(original)
+++ lucene/dev/branches/lucene_solr_4_6/solr/solrj/src/java/org/apache/solr/common/cloud/ConnectionManager.java
Fri Jan 10 15:45:28 2014
@@ -108,7 +108,13 @@ public class ConnectionManager implement
       clientConnected.countDown();
       connectionStrategy.connected();
     } else if (state == KeeperState.Expired) {
-      disconnected();
+      if (disconnectedTimer != null) {
+        disconnectedTimer.cancel();
+        disconnectedTimer = null;
+      }
+      
+      connected = false;
+      likelyExpired = true;
       log.info("Our previous ZooKeeper session was expired. Attempting to reconnect to recover
relationship with ZooKeeper...");
       
       try {



Mime
View raw message