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 2012/01/12 19:33:42 UTC
svn commit: r1230687 - in /lucene/dev/branches/solrcloud/solr:
core/src/java/org/apache/solr/cloud/ core/src/java/org/apache/solr/update/
core/src/test/org/apache/solr/cloud/
solrj/src/java/org/apache/solr/common/cloud/
Author: markrmiller
Date: Thu Jan 12 18:33:42 2012
New Revision: 1230687
URL: http://svn.apache.org/viewvc?rev=1230687&view=rev
Log:
sync around recover from expiration and make sure we get back into the overseer election
Modified:
lucene/dev/branches/solrcloud/solr/core/src/java/org/apache/solr/cloud/ZkController.java
lucene/dev/branches/solrcloud/solr/core/src/java/org/apache/solr/update/SolrCmdDistributor.java
lucene/dev/branches/solrcloud/solr/core/src/test/org/apache/solr/cloud/ChaosMonkeySolrCloudTest.java
lucene/dev/branches/solrcloud/solr/solrj/src/java/org/apache/solr/common/cloud/ConnectionManager.java
Modified: lucene/dev/branches/solrcloud/solr/core/src/java/org/apache/solr/cloud/ZkController.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solrcloud/solr/core/src/java/org/apache/solr/cloud/ZkController.java?rev=1230687&r1=1230686&r2=1230687&view=diff
==============================================================================
--- lucene/dev/branches/solrcloud/solr/core/src/java/org/apache/solr/cloud/ZkController.java (original)
+++ lucene/dev/branches/solrcloud/solr/core/src/java/org/apache/solr/cloud/ZkController.java Thu Jan 12 18:33:42 2012
@@ -164,6 +164,10 @@ public final class ZkController {
public void command() {
try {
// we need to create all of our lost watches
+ Overseer.createClientNodes(zkClient, getNodeName());
+
+ ElectionContext context = new OverseerElectionContext(getNodeName(), zkClient, zkStateReader);
+ overseerElector.joinElection(context);
zkStateReader.createClusterStateWatchersAndUpdate();
// re register all descriptors
Modified: lucene/dev/branches/solrcloud/solr/core/src/java/org/apache/solr/update/SolrCmdDistributor.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solrcloud/solr/core/src/java/org/apache/solr/update/SolrCmdDistributor.java?rev=1230687&r1=1230686&r2=1230687&view=diff
==============================================================================
--- lucene/dev/branches/solrcloud/solr/core/src/java/org/apache/solr/update/SolrCmdDistributor.java (original)
+++ lucene/dev/branches/solrcloud/solr/core/src/java/org/apache/solr/update/SolrCmdDistributor.java Thu Jan 12 18:33:42 2012
@@ -363,7 +363,7 @@ public class SolrCmdDistributor {
error.node = sreq.node;
response.errors.add(error);
response.sreq = sreq;
- SolrException.logOnce(SolrCore.log, "shard update error "
+ SolrException.log(SolrCore.log, "shard update error "
+ sreq.node, sreq.exception);
}
}
Modified: lucene/dev/branches/solrcloud/solr/core/src/test/org/apache/solr/cloud/ChaosMonkeySolrCloudTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solrcloud/solr/core/src/test/org/apache/solr/cloud/ChaosMonkeySolrCloudTest.java?rev=1230687&r1=1230686&r2=1230687&view=diff
==============================================================================
--- lucene/dev/branches/solrcloud/solr/core/src/test/org/apache/solr/cloud/ChaosMonkeySolrCloudTest.java (original)
+++ lucene/dev/branches/solrcloud/solr/core/src/test/org/apache/solr/cloud/ChaosMonkeySolrCloudTest.java Thu Jan 12 18:33:42 2012
@@ -109,6 +109,9 @@ public class ChaosMonkeySolrCloudTest ex
indexThread.join();
}
+ // nocommit
+ printLayout();
+
for (StopableIndexingThread indexThread : threads) {
assertEquals(0, indexThread.getFails());
}
Modified: lucene/dev/branches/solrcloud/solr/solrj/src/java/org/apache/solr/common/cloud/ConnectionManager.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solrcloud/solr/solrj/src/java/org/apache/solr/common/cloud/ConnectionManager.java?rev=1230687&r1=1230686&r2=1230687&view=diff
==============================================================================
--- lucene/dev/branches/solrcloud/solr/solrj/src/java/org/apache/solr/common/cloud/ConnectionManager.java (original)
+++ lucene/dev/branches/solrcloud/solr/solrj/src/java/org/apache/solr/common/cloud/ConnectionManager.java Thu Jan 12 18:33:42 2012
@@ -37,7 +37,7 @@ class ConnectionManager implements Watch
private KeeperState state;
private boolean connected;
- private ZkClientConnectionStrategy connectionStrategy;
+ private final ZkClientConnectionStrategy connectionStrategy;
private String zkServerAddress;
@@ -78,17 +78,24 @@ class ConnectionManager implements Watch
log.info("Attempting to reconnect to recover relationship with ZooKeeper...");
try {
- connectionStrategy.reconnect(zkServerAddress, zkClientTimeout, this, new ZkClientConnectionStrategy.ZkUpdate() {
- @Override
- public void update(SolrZooKeeper keeper) throws InterruptedException, TimeoutException, IOException {
- waitForConnected(SolrZkClient.DEFAULT_CLIENT_CONNECT_TIMEOUT);
- client.updateKeeper(keeper);
- if(onReconnect != null) {
- onReconnect.command();
- }
- ConnectionManager.this.connected = true;
- }
- });
+ connectionStrategy.reconnect(zkServerAddress, zkClientTimeout, this,
+ new ZkClientConnectionStrategy.ZkUpdate() {
+ @Override
+ public void update(SolrZooKeeper keeper)
+ throws InterruptedException, TimeoutException, IOException {
+ synchronized (connectionStrategy) {
+ waitForConnected(SolrZkClient.DEFAULT_CLIENT_CONNECT_TIMEOUT);
+ client.updateKeeper(keeper);
+ if (onReconnect != null) {
+ onReconnect.command();
+ }
+ synchronized (ConnectionManager.this) {
+ ConnectionManager.this.connected = true;
+ }
+ }
+
+ }
+ });
} catch (Exception e) {
log.error("", e);
}