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/05 23:38:24 UTC
svn commit: r1227878 - in /lucene/dev/branches/solrcloud/solr:
core/src/java/org/apache/solr/cloud/
core/src/java/org/apache/solr/update/processor/
core/src/test/org/apache/solr/cloud/ solrj/src/java/org/apache/zookeeper/
Author: markrmiller
Date: Thu Jan 5 22:38:23 2012
New Revision: 1227878
URL: http://svn.apache.org/viewvc?rev=1227878&view=rev
Log:
cleanup
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/processor/DistributedUpdateProcessor.java
lucene/dev/branches/solrcloud/solr/core/src/test/org/apache/solr/cloud/ChaosMonkey.java
lucene/dev/branches/solrcloud/solr/solrj/src/java/org/apache/zookeeper/SolrZooKeeper.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=1227878&r1=1227877&r2=1227878&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 5 22:38:23 2012
@@ -158,7 +158,7 @@ public final class ZkController {
.getCurrentDescriptors();
if (descriptors != null) {
for (CoreDescriptor descriptor : descriptors) {
- // nocommit: we need to think carefully about what happens when it was
+ // TODO: we need to think carefully about what happens when it was
// a leader that was expired - as well as what to do about leaders/overseers
// with connection loss
register(descriptor.getName(), descriptor, true);
Modified: lucene/dev/branches/solrcloud/solr/core/src/java/org/apache/solr/update/processor/DistributedUpdateProcessor.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solrcloud/solr/core/src/java/org/apache/solr/update/processor/DistributedUpdateProcessor.java?rev=1227878&r1=1227877&r2=1227878&view=diff
==============================================================================
--- lucene/dev/branches/solrcloud/solr/core/src/java/org/apache/solr/update/processor/DistributedUpdateProcessor.java (original)
+++ lucene/dev/branches/solrcloud/solr/core/src/java/org/apache/solr/update/processor/DistributedUpdateProcessor.java Thu Jan 5 22:38:23 2012
@@ -247,7 +247,7 @@ public class DistributedUpdateProcessor
cmdDistrib.finish();
Response response = cmdDistrib.getResponse();
- // nocommit - we may need to tell about more than one error...
+ // TODO - we may need to tell about more than one error...
// if its a forward, any fail is a problem -
// otherwise we assume things are fine if we got it locally
@@ -264,12 +264,14 @@ public class DistributedUpdateProcessor
for (SolrCmdDistributor.Error error : response.errors) {
if (error.node instanceof RetryNode) {
+ // we don't try to force a leader to recover
+ // when we cannot forward to it
continue;
}
// TODO: we should force their state to recovering ??
// TODO: do retries??
- // TODO: what if its is already recovering? Right now they line up -
+ // TODO: what if its is already recovering? Right now recoveries queue up -
// should they?
CommonsHttpSolrServer server;
try {
Modified: lucene/dev/branches/solrcloud/solr/core/src/test/org/apache/solr/cloud/ChaosMonkey.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solrcloud/solr/core/src/test/org/apache/solr/cloud/ChaosMonkey.java?rev=1227878&r1=1227877&r2=1227878&view=diff
==============================================================================
--- lucene/dev/branches/solrcloud/solr/core/src/test/org/apache/solr/cloud/ChaosMonkey.java (original)
+++ lucene/dev/branches/solrcloud/solr/core/src/test/org/apache/solr/cloud/ChaosMonkey.java Thu Jan 5 22:38:23 2012
@@ -102,7 +102,6 @@ public class ChaosMonkey {
JettySolrRunner jetty = getRandomJetty(sliceName, DONTKILLLEADER);
if (jetty != null) {
- System.out.println("cause connection loss");
causeConnectionLoss(jetty);
connloss.incrementAndGet();
}
@@ -114,28 +113,9 @@ public class ChaosMonkey {
if (solrDispatchFilter != null) {
CoreContainer cores = solrDispatchFilter.getCores();
if (cores != null) {
- ZkController zkController = cores.getZkController();
SolrZkClient zkClient = cores.getZkController().getZkClient();
-
- // nocommit: two ways to try to force connectionloss...
// must be at least double tick time...
zkClient.getSolrZooKeeper().pauseCnxn(ZkTestServer.TICK_TIME * 2);
-
- // open a new zk with same id and close it - should cause connection loss
-// ZooKeeper zoo2;
-// try {
-// zoo2 = new ZooKeeper(zkController.getZkServerAddress(), zkClient.getSolrZooKeeper().getSessionTimeout(),
-// null,
-// zkClient.getSolrZooKeeper().getSessionId(), null);
-// zoo2.close();
-// } catch (IOException e1) {
-// // TODO Auto-generated catch block
-// e1.printStackTrace();
-// } catch (InterruptedException e) {
-// // TODO Auto-generated catch block
-// e.printStackTrace();
-// }
-
}
}
}
@@ -351,7 +331,6 @@ public class ChaosMonkey {
if (random.nextBoolean()) {
if (!deadPool.isEmpty()) {
- //System.out.println("start jetty");
JettySolrRunner jetty = deadPool.remove(random.nextInt(deadPool.size()));
if (jetty.isRunning()) {
@@ -381,7 +360,7 @@ public class ChaosMonkey {
}
int rnd = random.nextInt(10);
- // nocommit: we dont randomly expire yet
+
if (expireSessions && rnd < 8) {
expireRandomSession();
}
@@ -398,7 +377,7 @@ public class ChaosMonkey {
jetty = killRandomShard();
}
if (jetty == null) {
- // System.out.println("we cannot kill");
+ // we cannot kill
} else {
deadPool.add(jetty);
}
Modified: lucene/dev/branches/solrcloud/solr/solrj/src/java/org/apache/zookeeper/SolrZooKeeper.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solrcloud/solr/solrj/src/java/org/apache/zookeeper/SolrZooKeeper.java?rev=1227878&r1=1227877&r2=1227878&view=diff
==============================================================================
--- lucene/dev/branches/solrcloud/solr/solrj/src/java/org/apache/zookeeper/SolrZooKeeper.java (original)
+++ lucene/dev/branches/solrcloud/solr/solrj/src/java/org/apache/zookeeper/SolrZooKeeper.java Thu Jan 5 22:38:23 2012
@@ -3,7 +3,7 @@ package org.apache.zookeeper;
import java.io.IOException;
import java.nio.channels.SocketChannel;
-// nocommit - we use this class to expose nasty stuff for tests
+// we use this class to expose nasty stuff for tests
public class SolrZooKeeper extends ZooKeeper {
public SolrZooKeeper(String connectString, int sessionTimeout,