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/08/09 21:21:04 UTC
svn commit: r1371397 -
/lucene/dev/trunk/solr/test-framework/src/java/org/apache/solr/cloud/AbstractFullDistribZkTestBase.java
Author: markrmiller
Date: Thu Aug 9 19:21:04 2012
New Revision: 1371397
URL: http://svn.apache.org/viewvc?rev=1371397&view=rev
Log:
fix test msg
Modified:
lucene/dev/trunk/solr/test-framework/src/java/org/apache/solr/cloud/AbstractFullDistribZkTestBase.java
Modified: lucene/dev/trunk/solr/test-framework/src/java/org/apache/solr/cloud/AbstractFullDistribZkTestBase.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/test-framework/src/java/org/apache/solr/cloud/AbstractFullDistribZkTestBase.java?rev=1371397&r1=1371396&r2=1371397&view=diff
==============================================================================
--- lucene/dev/trunk/solr/test-framework/src/java/org/apache/solr/cloud/AbstractFullDistribZkTestBase.java (original)
+++ lucene/dev/trunk/solr/test-framework/src/java/org/apache/solr/cloud/AbstractFullDistribZkTestBase.java Thu Aug 9 19:21:04 2012
@@ -757,7 +757,7 @@ public abstract class AbstractFullDistri
zkStateReader.getClusterState().getSlice(DEFAULT_COLLECTION, shard)
.getShards().size(), solrJetties.size());
- SolrServer lastClient = null;
+ CloudJettyRunner lastJetty = null;
for (CloudJettyRunner cjetty : solrJetties) {
ZkNodeProps props = cjetty.info;
if (verbose) System.err.println("client" + cnt++);
@@ -790,7 +790,7 @@ public abstract class AbstractFullDistri
ZkStateReader.ACTIVE);
if (active && live) {
if (lastNum > -1 && lastNum != num && failMessage == null) {
- failMessage = shard + " is not consistent. Got " + lastNum + " from " + lastClient + "lastClient"
+ failMessage = shard + " is not consistent. Got " + lastNum + " from " + lastJetty.url + "lastClient"
+ " and got " + num + " from " + cjetty.url;
if (verbose || true) {
@@ -801,15 +801,15 @@ public abstract class AbstractFullDistri
query.set("rows","1000");
query.set("sort","id asc");
- SolrDocumentList lst1 = lastClient.query(query).getResults();
+ SolrDocumentList lst1 = lastJetty.client.solrClient.query(query).getResults();
SolrDocumentList lst2 = cjetty.client.solrClient.query(query).getResults();
- showDiff(lst1, lst2, lastClient.toString(), cjetty.client.solrClient.toString());
+ showDiff(lst1, lst2, lastJetty.toString(), cjetty.client.solrClient.toString());
}
}
lastNum = num;
- lastClient = cjetty.client.solrClient;
+ lastJetty = cjetty;
}
}
return failMessage;