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/03 01:01:04 UTC
svn commit: r1226582 - in /lucene/dev/branches/solrcloud/solr:
core/src/java/org/apache/solr/handler/ core/src/test/org/apache/solr/cloud/
solrj/src/java/org/apache/solr/client/solrj/impl/
Author: markrmiller
Date: Tue Jan 3 00:01:03 2012
New Revision: 1226582
URL: http://svn.apache.org/viewvc?rev=1226582&view=rev
Log:
do another nocommit
Modified:
lucene/dev/branches/solrcloud/solr/core/src/java/org/apache/solr/handler/ReplicationHandler.java
lucene/dev/branches/solrcloud/solr/core/src/test/org/apache/solr/cloud/BasicSolrCloudTest.java
lucene/dev/branches/solrcloud/solr/core/src/test/org/apache/solr/cloud/ChaosMonkeySolrCloudTest.java
lucene/dev/branches/solrcloud/solr/core/src/test/org/apache/solr/cloud/FullSolrCloudTest.java
lucene/dev/branches/solrcloud/solr/solrj/src/java/org/apache/solr/client/solrj/impl/CloudSolrServer.java
Modified: lucene/dev/branches/solrcloud/solr/core/src/java/org/apache/solr/handler/ReplicationHandler.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solrcloud/solr/core/src/java/org/apache/solr/handler/ReplicationHandler.java?rev=1226582&r1=1226581&r2=1226582&view=diff
==============================================================================
--- lucene/dev/branches/solrcloud/solr/core/src/java/org/apache/solr/handler/ReplicationHandler.java (original)
+++ lucene/dev/branches/solrcloud/solr/core/src/java/org/apache/solr/handler/ReplicationHandler.java Tue Jan 3 00:01:03 2012
@@ -136,7 +136,6 @@ public class ReplicationHandler extends
// in a catastrophic failure, but will result in the client getting an empty file list for
// the CMD_GET_FILE_LIST command.
//
- System.out.println("sending commit point:" + commitPoint.getVersion());
core.getDeletionPolicy().setReserveDuration(commitPoint.getVersion(), reserveCommitDuration);
rsp.add(CMD_INDEX_VERSION, commitPoint.getVersion());
rsp.add(GENERATION, commitPoint.getGeneration());
Modified: lucene/dev/branches/solrcloud/solr/core/src/test/org/apache/solr/cloud/BasicSolrCloudTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solrcloud/solr/core/src/test/org/apache/solr/cloud/BasicSolrCloudTest.java?rev=1226582&r1=1226581&r2=1226582&view=diff
==============================================================================
--- lucene/dev/branches/solrcloud/solr/core/src/test/org/apache/solr/cloud/BasicSolrCloudTest.java (original)
+++ lucene/dev/branches/solrcloud/solr/core/src/test/org/apache/solr/cloud/BasicSolrCloudTest.java Tue Jan 3 00:01:03 2012
@@ -49,7 +49,7 @@ public class BasicSolrCloudTest extends
handle.put("QTime", SKIPVAL);
handle.put("timestamp", SKIPVAL);
- waitForRecoveriesToFinish();
+ waitForRecoveriesToFinish(VERBOSE);
// add a doc, update it, and delete it
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=1226582&r1=1226581&r2=1226582&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 Tue Jan 3 00:01:03 2012
@@ -75,7 +75,7 @@ public class ChaosMonkeySolrCloudTest ex
Thread.sleep(2000);
// wait until there are no recoveries...
- waitForRecoveriesToFinish();
+ waitForRecoveriesToFinish(VERBOSE);
commit();
Modified: lucene/dev/branches/solrcloud/solr/core/src/test/org/apache/solr/cloud/FullSolrCloudTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solrcloud/solr/core/src/test/org/apache/solr/cloud/FullSolrCloudTest.java?rev=1226582&r1=1226581&r2=1226582&view=diff
==============================================================================
--- lucene/dev/branches/solrcloud/solr/core/src/test/org/apache/solr/cloud/FullSolrCloudTest.java (original)
+++ lucene/dev/branches/solrcloud/solr/core/src/test/org/apache/solr/cloud/FullSolrCloudTest.java Tue Jan 3 00:01:03 2012
@@ -58,7 +58,6 @@ import org.junit.BeforeClass;
*
* TODO: we should still test this works as a custom update chain as well as what we test now - the default update chain
*
- * nocommit: clean up output
*/
public class FullSolrCloudTest extends AbstractDistributedZkTestCase {
@@ -431,7 +430,7 @@ public class FullSolrCloudTest extends A
,"foo_f", 1.414f, "foo_b", "true", "foo_d", 1.414d);
// make sure we are in a steady state...
- waitForRecoveriesToFinish();
+ waitForRecoveriesToFinish(VERBOSE);
commit();
@@ -546,15 +545,13 @@ public class FullSolrCloudTest extends A
assertDocCounts(VERBOSE);
}
- protected void waitForRecoveriesToFinish() throws KeeperException,
+ protected void waitForRecoveriesToFinish(boolean verbose) throws KeeperException,
InterruptedException {
boolean cont = true;
int cnt = 0;
- System.out.println("WAIT FOR RECOVERY");
-
while (cont) {
- System.out.println("-");
+ if (VERBOSE) System.out.println("-");
boolean sawLiveRecovering = false;
zkStateReader.updateCloudState(true);
CloudState cloudState = zkStateReader.getCloudState();
@@ -562,7 +559,7 @@ public class FullSolrCloudTest extends A
for (Map.Entry<String,Slice> entry : slices.entrySet()) {
Map<String,ZkNodeProps> shards = entry.getValue().getShards();
for (Map.Entry<String,ZkNodeProps> shard : shards.entrySet()) {
- System.out.println("rstate:"
+ if (VERBOSE) System.out.println("rstate:"
+ shard.getValue().get(ZkStateReader.STATE_PROP)
+ " live:"
+ cloudState.liveNodesContain(shard.getValue().get(
@@ -577,9 +574,9 @@ public class FullSolrCloudTest extends A
}
if (!sawLiveRecovering || cnt == 90) {
if (!sawLiveRecovering) {
- System.out.println("no one is recoverying");
+ if (VERBOSE) System.out.println("no one is recoverying");
} else {
- System.out.println("gave up waiting for recovery to finish..");
+ if (VERBOSE) System.out.println("gave up waiting for recovery to finish..");
}
cont = false;
} else {
@@ -587,7 +584,6 @@ public class FullSolrCloudTest extends A
}
cnt++;
}
- System.out.println("DONE WAIT FOR RECOVERY");
}
private void brindDownShardIndexSomeDocsAndRecover() throws Exception,
@@ -826,21 +822,21 @@ public class FullSolrCloudTest extends A
long num = -1;
long lastNum = -1;
String failMessage = null;
- System.out.println("check const of " + shard);
+ if (VERBOSE) System.out.println("check const of " + shard);
int cnt = 0;
for (SolrServer client : solrClients) {
try {
num = client.query(new SolrQuery("*:*")).getResults().getNumFound();
} catch (SolrServerException e) {
- System.err.println("error contacting client:" + e.getMessage());
+ if (VERBOSE) System.err.println("error contacting client:" + e.getMessage());
continue;
}
ZkNodeProps props = clientToInfo.get(new CloudSolrServerClient(client));
- System.out.println("client" + cnt++);
- System.out.println("PROPS:" + props);
+ if (VERBOSE) System.out.println("client" + cnt++);
+ if (VERBOSE) System.out.println("PROPS:" + props);
boolean recovering = props.get(ZkStateReader.STATE_PROP).equals(ZkStateReader.RECOVERING);
- System.out.println(" num:" + num + "\n" + (recovering ? "recovering" : ""));
+ if (VERBOSE) System.out.println(" num:" + num + "\n" + (recovering ? "recovering" : ""));
if (!recovering) {
if (lastNum > -1 && lastNum != num && failMessage == null) {
@@ -859,7 +855,7 @@ public class FullSolrCloudTest extends A
protected void checkShardConsistency() throws Exception {
long docs = controlClient.query(new SolrQuery("*:*")).getResults().getNumFound();
- System.out.println("Control Docs:" + docs);
+ if (VERBOSE) System.out.println("Control Docs:" + docs);
updateMappingsFromZk(jettys, clients);
@@ -877,7 +873,7 @@ public class FullSolrCloudTest extends A
try {
SolrServer client = shardToClient.get(s).get(i);
ZkNodeProps props = clientToInfo.get(new CloudSolrServerClient(client));
- System.out.println("PROPS:" + props);
+ if (VERBOSE) System.out.println("PROPS:" + props);
boolean recovering = props.get(ZkStateReader.STATE_PROP).equals(ZkStateReader.RECOVERING);
if (!recovering) {
cnt += client.query(new SolrQuery("*:*")).getResults()
Modified: lucene/dev/branches/solrcloud/solr/solrj/src/java/org/apache/solr/client/solrj/impl/CloudSolrServer.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solrcloud/solr/solrj/src/java/org/apache/solr/client/solrj/impl/CloudSolrServer.java?rev=1226582&r1=1226581&r2=1226582&view=diff
==============================================================================
--- lucene/dev/branches/solrcloud/solr/solrj/src/java/org/apache/solr/client/solrj/impl/CloudSolrServer.java (original)
+++ lucene/dev/branches/solrcloud/solr/solrj/src/java/org/apache/solr/client/solrj/impl/CloudSolrServer.java Tue Jan 3 00:01:03 2012
@@ -63,7 +63,6 @@ public class CloudSolrServer extends Sol
* @param zkHost The address of the zookeeper quorum containing the cloud state
*/
public CloudSolrServer(String zkHost, LBHttpSolrServer lbServer) {
- System.out.println("new cloud server");
this.zkHost = zkHost;
this.lbServer = lbServer;
}