You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by ma...@apache.org on 2014/11/19 15:52:56 UTC
svn commit: r1640566 - in /lucene/dev/trunk/solr: CHANGES.txt
solrj/src/java/org/apache/solr/common/cloud/ConnectionManager.java
solrj/src/java/org/apache/solr/common/cloud/SolrZkClient.java
Author: markrmiller
Date: Wed Nov 19 14:52:56 2014
New Revision: 1640566
URL: http://svn.apache.org/r1640566
Log:
SOLR-6570: Run SolrZkClient session watch asynchronously.
Modified:
lucene/dev/trunk/solr/CHANGES.txt
lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/common/cloud/ConnectionManager.java
lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/common/cloud/SolrZkClient.java
Modified: lucene/dev/trunk/solr/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/CHANGES.txt?rev=1640566&r1=1640565&r2=1640566&view=diff
==============================================================================
--- lucene/dev/trunk/solr/CHANGES.txt (original)
+++ lucene/dev/trunk/solr/CHANGES.txt Wed Nov 19 14:52:56 2014
@@ -397,6 +397,9 @@ Other Changes
* SOLR-6740: Admin UI - improve Files View (steffkes)
+* SOLR-6570: Run SolrZkClient session watch asynchronously.
+ (Ramkumar Aiyengar via Mark Miller)
+
================== 4.10.3 ==================
Bug Fixes
Modified: lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/common/cloud/ConnectionManager.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/common/cloud/ConnectionManager.java?rev=1640566&r1=1640565&r2=1640566&view=diff
==============================================================================
--- lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/common/cloud/ConnectionManager.java (original)
+++ lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/common/cloud/ConnectionManager.java Wed Nov 19 14:52:56 2014
@@ -140,7 +140,7 @@ public class ConnectionManager implement
closeKeeper(keeper);
throw new RuntimeException(e1);
}
-
+
log.info("Connection with ZooKeeper reestablished.");
try {
client.updateKeeper(keeper);
@@ -154,24 +154,9 @@ public class ConnectionManager implement
throw new RuntimeException(t);
}
- // The new event thread will call connected
- // we just start the reconnect thread and
- // do nothing else
-
if (onReconnect != null) {
- Thread thread = new Thread() {
- @Override
- public void run() {
- try {
- onReconnect.command();
- } catch (Exception e) {
- log.warn("Exception running onReconnect command", e);
- }
- }
- };
- thread.start();
+ onReconnect.command();
}
-
}
});
} catch (Exception e) {
Modified: lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/common/cloud/SolrZkClient.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/common/cloud/SolrZkClient.java?rev=1640566&r1=1640565&r2=1640566&view=diff
==============================================================================
--- lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/common/cloud/SolrZkClient.java (original)
+++ lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/common/cloud/SolrZkClient.java Wed Nov 19 14:52:56 2014
@@ -144,7 +144,7 @@ public class SolrZkClient implements Clo
+ zkServerAddress, this, zkServerAddress, strat, onReconnect, beforeReconnect);
try {
- strat.connect(zkServerAddress, zkClientTimeout, connManager,
+ strat.connect(zkServerAddress, zkClientTimeout, wrapWatcher(connManager),
new ZkUpdate() {
@Override
public void update(SolrZooKeeper zooKeeper) {