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 01:58:08 UTC
svn commit: r1230342 - in /lucene/dev/branches/solrcloud/solr:
core/src/java/org/apache/solr/cloud/ core/src/java/org/apache/solr/core/
core/src/java/org/apache/solr/handler/component/
core/src/test/org/apache/solr/cloud/ solrj/src/java/org/apache/solr...
Author: markrmiller
Date: Thu Jan 12 00:58:07 2012
New Revision: 1230342
URL: http://svn.apache.org/viewvc?rev=1230342&view=rev
Log:
default distrib = true on requests when in solrcloud mode - and other little fixes that came up along the way
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/core/SolrCore.java
lucene/dev/branches/solrcloud/solr/core/src/java/org/apache/solr/handler/component/HttpShardHandler.java
lucene/dev/branches/solrcloud/solr/core/src/java/org/apache/solr/handler/component/QueryComponent.java
lucene/dev/branches/solrcloud/solr/core/src/java/org/apache/solr/handler/component/SearchHandler.java
lucene/dev/branches/solrcloud/solr/core/src/test/org/apache/solr/cloud/BasicDistributedZkTest.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/BasicZkTest.java
lucene/dev/branches/solrcloud/solr/core/src/test/org/apache/solr/cloud/FullSolrCloudTest.java
lucene/dev/branches/solrcloud/solr/core/src/test/org/apache/solr/cloud/OverseerTest.java
lucene/dev/branches/solrcloud/solr/core/src/test/org/apache/solr/cloud/RecoveryZkTest.java
lucene/dev/branches/solrcloud/solr/core/src/test/org/apache/solr/cloud/ZkControllerTest.java
lucene/dev/branches/solrcloud/solr/solrj/src/java/org/apache/solr/common/cloud/ZkStateReader.java
lucene/dev/branches/solrcloud/solr/test-framework/src/java/org/apache/solr/BaseDistributedSearchTestCase.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=1230342&r1=1230341&r2=1230342&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 00:58:07 2012
@@ -147,6 +147,11 @@ public final class ZkController {
String localHostContext, final CurrentCoreDescriptorProvider registerOnReconnect) throws InterruptedException,
TimeoutException, IOException {
+ if (localHostContext.contains("/")) {
+ throw new IllegalArgumentException("localHostContext ("
+ + localHostContext + ") should not contain a /");
+ }
+
this.zkServerAddress = zkServerAddress;
this.localHostPort = locaHostPort;
this.localHostContext = localHostContext;
@@ -445,6 +450,7 @@ public final class ZkController {
log.info("Attempting to update " + ZkStateReader.CLUSTER_STATE + " version "
+ null);
CloudState state = CloudState.load(zkClient, zkStateReader.getCloudState().getLiveNodes());
+
final String shardZkNodeName = getNodeName() + "_" + coreName;
// checkRecovery will have updated the shardId if it already exists...
Modified: lucene/dev/branches/solrcloud/solr/core/src/java/org/apache/solr/core/SolrCore.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solrcloud/solr/core/src/java/org/apache/solr/core/SolrCore.java?rev=1230342&r1=1230341&r2=1230342&view=diff
==============================================================================
--- lucene/dev/branches/solrcloud/solr/core/src/java/org/apache/solr/core/SolrCore.java (original)
+++ lucene/dev/branches/solrcloud/solr/core/src/java/org/apache/solr/core/SolrCore.java Thu Jan 12 00:58:07 2012
@@ -475,20 +475,6 @@ public final class SolrCore implements S
}
/**
- *
- * @param dataDir
- * @param schema
- * @throws SAXException
- * @throws IOException
- * @throws ParserConfigurationException
- *
- * @since solr 1.0
- */
- public SolrCore(String dataDir, IndexSchema schema) throws ParserConfigurationException, IOException, SAXException {
- this(null, dataDir, new SolrConfig(), schema, null);
- }
-
- /**
* Creates a new core and register it in the list of cores.
* If a core with the same name already exists, it will be stopped and replaced by this one.
*
Modified: lucene/dev/branches/solrcloud/solr/core/src/java/org/apache/solr/handler/component/HttpShardHandler.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solrcloud/solr/core/src/java/org/apache/solr/handler/component/HttpShardHandler.java?rev=1230342&r1=1230341&r2=1230342&view=diff
==============================================================================
--- lucene/dev/branches/solrcloud/solr/core/src/java/org/apache/solr/handler/component/HttpShardHandler.java (original)
+++ lucene/dev/branches/solrcloud/solr/core/src/java/org/apache/solr/handler/component/HttpShardHandler.java Thu Jan 12 00:58:07 2012
@@ -235,7 +235,8 @@ public class HttpShardHandler extends Sh
SolrQueryRequest req = rb.req;
SolrParams params = req.getParams();
- rb.isDistrib = params.getBool("distrib",false);
+ rb.isDistrib = params.getBool("distrib", req.getCore().getCoreDescriptor()
+ .getCoreContainer().isZooKeeperAware());
String shards = params.get(ShardParams.SHARDS);
// for back compat, a shards param with URLs like localhost:8983/solr will mean that this
Modified: lucene/dev/branches/solrcloud/solr/core/src/java/org/apache/solr/handler/component/QueryComponent.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solrcloud/solr/core/src/java/org/apache/solr/handler/component/QueryComponent.java?rev=1230342&r1=1230341&r2=1230342&view=diff
==============================================================================
--- lucene/dev/branches/solrcloud/solr/core/src/java/org/apache/solr/handler/component/QueryComponent.java (original)
+++ lucene/dev/branches/solrcloud/solr/core/src/java/org/apache/solr/handler/component/QueryComponent.java Thu Jan 12 00:58:07 2012
@@ -207,7 +207,8 @@ public class QueryComponent extends Sear
SolrQueryRequest req = rb.req;
SolrParams params = req.getParams();
- rb.isDistrib = params.getBool("distrib",false);
+ rb.isDistrib = params.getBool("distrib", req.getCore().getCoreDescriptor()
+ .getCoreContainer().isZooKeeperAware());
String shards = params.get(ShardParams.SHARDS);
// for back compat, a shards param with URLs like localhost:8983/solr will mean that this
Modified: lucene/dev/branches/solrcloud/solr/core/src/java/org/apache/solr/handler/component/SearchHandler.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solrcloud/solr/core/src/java/org/apache/solr/handler/component/SearchHandler.java?rev=1230342&r1=1230341&r2=1230342&view=diff
==============================================================================
--- lucene/dev/branches/solrcloud/solr/core/src/java/org/apache/solr/handler/component/SearchHandler.java (original)
+++ lucene/dev/branches/solrcloud/solr/core/src/java/org/apache/solr/handler/component/SearchHandler.java Thu Jan 12 00:58:07 2012
@@ -246,7 +246,7 @@ public class SearchHandler extends Reque
for (String shard : sreq.actualShards) {
ModifiableSolrParams params = new ModifiableSolrParams(sreq.params);
params.remove(ShardParams.SHARDS); // not a top-level request
- params.remove("distrib"); // not a top-level request
+ params.set("distrib", "false"); // not a top-level request
params.remove("indent");
params.remove(CommonParams.HEADER_ECHO_PARAMS);
params.set(ShardParams.IS_SHARD, true); // a sub (shard) request
Modified: lucene/dev/branches/solrcloud/solr/core/src/test/org/apache/solr/cloud/BasicDistributedZkTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solrcloud/solr/core/src/test/org/apache/solr/cloud/BasicDistributedZkTest.java?rev=1230342&r1=1230341&r2=1230342&view=diff
==============================================================================
--- lucene/dev/branches/solrcloud/solr/core/src/test/org/apache/solr/cloud/BasicDistributedZkTest.java (original)
+++ lucene/dev/branches/solrcloud/solr/core/src/test/org/apache/solr/cloud/BasicDistributedZkTest.java Thu Jan 12 00:58:07 2012
@@ -58,7 +58,6 @@ public class BasicDistributedZkTest exte
if (r.nextBoolean()) {
// don't set shards, let that be figured out from the cloud state
- params.set("distrib", "true");
} else {
// use shard ids rather than physical locations
StringBuilder sb = new StringBuilder();
@@ -68,7 +67,6 @@ public class BasicDistributedZkTest exte
sb.append("shard" + (i + 3));
}
params.set("shards", sb.toString());
- params.set("distrib", "true");
}
}
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=1230342&r1=1230341&r2=1230342&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 Thu Jan 12 00:58:07 2012
@@ -199,7 +199,6 @@ public class BasicSolrCloudTest extends
commit();
ModifiableSolrParams params = new ModifiableSolrParams();
- params.add("distrib", "true");
params.add("q", t1 + ":originalcontent");
QueryResponse results = clients.get(0).query(params);
assertEquals(1, results.getResults().getNumFound());
@@ -281,13 +280,11 @@ public class BasicSolrCloudTest extends
commit();
ModifiableSolrParams params = new ModifiableSolrParams();
- params.add("distrib", "true");
params.add("q", t1 + ":thenewupdatestuff");
QueryResponse res = clients.get(0).query(params);
assertEquals(0, res.getResults().getNumFound());
params = new ModifiableSolrParams();
- params.add("distrib", "true");
params.add("q", t1 + ":theupdatestuff");
res = clients.get(0).query(params);
assertEquals(1, res.getResults().getNumFound());
@@ -295,7 +292,6 @@ public class BasicSolrCloudTest extends
private QueryResponse query(SolrServer server) throws SolrServerException {
SolrQuery query = new SolrQuery("*:*");
- query.setParam("distrib", true);
return server.query(query);
}
Modified: lucene/dev/branches/solrcloud/solr/core/src/test/org/apache/solr/cloud/BasicZkTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solrcloud/solr/core/src/test/org/apache/solr/cloud/BasicZkTest.java?rev=1230342&r1=1230341&r2=1230342&view=diff
==============================================================================
--- lucene/dev/branches/solrcloud/solr/core/src/test/org/apache/solr/cloud/BasicZkTest.java (original)
+++ lucene/dev/branches/solrcloud/solr/core/src/test/org/apache/solr/cloud/BasicZkTest.java Thu Jan 12 00:58:07 2012
@@ -21,7 +21,10 @@ import org.apache.lucene.index.IndexWrit
import org.apache.lucene.index.LogMergePolicy;
import org.apache.solr.SolrTestCaseJ4;
import org.apache.solr.common.params.CommonParams;
+import org.apache.solr.common.params.ModifiableSolrParams;
import org.apache.solr.core.SolrCore;
+import org.apache.solr.request.LocalSolrQueryRequest;
+import org.apache.solr.request.SolrQueryRequest;
import org.apache.solr.update.DirectUpdateHandler2;
import org.junit.AfterClass;
import org.junit.BeforeClass;
@@ -56,7 +59,7 @@ public class BasicZkTest extends Abstrac
assertEquals("Mergefactor was not picked up", ((LogMergePolicy)writer.getConfig().getMergePolicy()).getMergeFactor(), 8);
lrf.args.put(CommonParams.VERSION, "2.2");
- assertQ("test query on empty index", req("qlkciyopsbgzyvkylsjhchghjrdf"),
+ assertQ("test query on empty index", request("qlkciyopsbgzyvkylsjhchghjrdf"),
"//result[@numFound='0']");
// test escaping of ";"
@@ -64,29 +67,29 @@ public class BasicZkTest extends Abstrac
assertU("adding doc#42", adoc("id", "42", "val_s", "aa;bb"));
assertU("does commit work?", commit());
- assertQ("backslash escaping semicolon", req("id:42 AND val_s:aa\\;bb"),
+ assertQ("backslash escaping semicolon", request("id:42 AND val_s:aa\\;bb"),
"//*[@numFound='1']", "//int[@name='id'][.='42']");
- assertQ("quote escaping semicolon", req("id:42 AND val_s:\"aa;bb\""),
+ assertQ("quote escaping semicolon", request("id:42 AND val_s:\"aa;bb\""),
"//*[@numFound='1']", "//int[@name='id'][.='42']");
- assertQ("no escaping semicolon", req("id:42 AND val_s:aa"),
+ assertQ("no escaping semicolon", request("id:42 AND val_s:aa"),
"//*[@numFound='0']");
assertU(delI("42"));
assertU(commit());
- assertQ(req("id:42"), "//*[@numFound='0']");
+ assertQ(request("id:42"), "//*[@numFound='0']");
// test overwrite default of true
assertU(adoc("id", "42", "val_s", "AAA"));
assertU(adoc("id", "42", "val_s", "BBB"));
assertU(commit());
- assertQ(req("id:42"), "//*[@numFound='1']", "//str[.='BBB']");
+ assertQ(request("id:42"), "//*[@numFound='1']", "//str[.='BBB']");
assertU(adoc("id", "42", "val_s", "CCC"));
assertU(adoc("id", "42", "val_s", "DDD"));
assertU(commit());
- assertQ(req("id:42"), "//*[@numFound='1']", "//str[.='DDD']");
+ assertQ(request("id:42"), "//*[@numFound='1']", "//str[.='DDD']");
// test deletes
String[] adds = new String[] { add(doc("id", "101"), "overwrite", "true"),
@@ -118,23 +121,23 @@ public class BasicZkTest extends Abstrac
zkController.getNodeName()));
// test maxint
- assertQ(req("q", "id:[100 TO 110]", "rows", "2147483647"),
+ assertQ(request("q", "id:[100 TO 110]", "rows", "2147483647"),
"//*[@numFound='4']");
// test big limit
- assertQ(req("q", "id:[100 TO 111]", "rows", "1147483647"),
+ assertQ(request("q", "id:[100 TO 111]", "rows", "1147483647"),
"//*[@numFound='4']");
- assertQ(req("id:[100 TO 110]"), "//*[@numFound='4']");
+ assertQ(request("id:[100 TO 110]"), "//*[@numFound='4']");
assertU(delI("102"));
assertU(commit());
- assertQ(req("id:[100 TO 110]"), "//*[@numFound='3']");
+ assertQ(request("id:[100 TO 110]"), "//*[@numFound='3']");
assertU(delI("105"));
assertU(commit());
- assertQ(req("id:[100 TO 110]"), "//*[@numFound='2']");
+ assertQ(request("id:[100 TO 110]"), "//*[@numFound='2']");
assertU(delQ("id:[100 TO 110]"));
assertU(commit());
- assertQ(req("id:[100 TO 110]"), "//*[@numFound='0']");
+ assertQ(request("id:[100 TO 110]"), "//*[@numFound='0']");
@@ -153,6 +156,15 @@ public class BasicZkTest extends Abstrac
}
+ public SolrQueryRequest request(String... q) {
+ LocalSolrQueryRequest req = lrf.makeRequest(q);
+ ModifiableSolrParams params = new ModifiableSolrParams();
+ params.add(req.getParams());
+ params.set("distrib", false);
+ req.setParams(params);
+ return req;
+ }
+
@AfterClass
public static void afterClass() {
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=1230342&r1=1230341&r2=1230342&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 Thu Jan 12 00:58:07 2012
@@ -340,7 +340,6 @@ public class FullSolrCloudTest extends A
if (r.nextBoolean()) {
// don't set shards, let that be figured out from the cloud state
- params.set("distrib", "true");
} else {
// use shard ids rather than physical locations
StringBuilder sb = new StringBuilder();
@@ -350,7 +349,6 @@ public class FullSolrCloudTest extends A
sb.append("shard" + (i+1));
}
params.set("shards", sb.toString());
- params.set("distrib", "true");
}
}
@@ -496,7 +494,6 @@ public class FullSolrCloudTest extends A
commit();
ModifiableSolrParams params = new ModifiableSolrParams();
- params.add("distrib", "true");
params.add("q", t1 + ":originalcontent");
QueryResponse results = clients.get(0).query(params);
assertEquals(1, results.getResults().getNumFound());
@@ -611,7 +608,6 @@ public class FullSolrCloudTest extends A
// try adding a doc with CloudSolrServer
cloudClient.setDefaultCollection(DEFAULT_COLLECTION);
SolrQuery query = new SolrQuery("*:*");
- query.add("distrib", "true");
long numFound1 = cloudClient.query(query).getResults().getNumFound();
SolrInputDocument doc = new SolrInputDocument();
@@ -844,9 +840,10 @@ public class FullSolrCloudTest extends A
live = true;
}
if (verbose) System.out.println(" live:" + live);
- boolean active = props.get(ZkStateReader.STATE_PROP).equals(ZkStateReader.ACTIVE);
- if (verbose) System.out.println(" num:" + num + "\n" + (active ? "recovering" : ""));
+
+ if (verbose) System.out.println(" num:" + num + "\n");
+ boolean active = props.get(ZkStateReader.STATE_PROP).equals(ZkStateReader.ACTIVE);
if (active && live) {
if (lastNum > -1 && lastNum != num && failMessage == null) {
failMessage = shard + " is not consistent, expected:" + lastNum
@@ -891,7 +888,9 @@ public class FullSolrCloudTest extends A
ZkNodeProps props = clientToInfo.get(new CloudSolrServerClient(client));
boolean active = props.get(ZkStateReader.STATE_PROP).equals(ZkStateReader.ACTIVE);
if (active) {
- cnt += client.query(new SolrQuery("*:*")).getResults()
+ SolrQuery query = new SolrQuery("*:*");
+ query.set("distrib", false);
+ cnt += client.query(query).getResults()
.getNumFound();
break;
}
@@ -904,7 +903,6 @@ public class FullSolrCloudTest extends A
}
}
SolrQuery q = new SolrQuery("*:*");
- q.set("distrib", true);
long cloudClientDocs = cloudClient.query(q).getResults().getNumFound();
assertEquals(
"adding up the # of docs on each shard does not match the control - cloud client returns:"
@@ -965,7 +963,6 @@ public class FullSolrCloudTest extends A
}
if (verbose) System.out.println("control docs:" + controlClient.query(new SolrQuery("*:*")).getResults().getNumFound() + "\n\n");
SolrQuery query = new SolrQuery("*:*");
- query.add("distrib", "true");
assertEquals("Doc Counts do not add up", controlCount, cloudClient.query(query).getResults().getNumFound());
}
Modified: lucene/dev/branches/solrcloud/solr/core/src/test/org/apache/solr/cloud/OverseerTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solrcloud/solr/core/src/test/org/apache/solr/cloud/OverseerTest.java?rev=1230342&r1=1230341&r2=1230342&view=diff
==============================================================================
--- lucene/dev/branches/solrcloud/solr/core/src/test/org/apache/solr/cloud/OverseerTest.java (original)
+++ lucene/dev/branches/solrcloud/solr/core/src/test/org/apache/solr/cloud/OverseerTest.java Thu Jan 12 00:58:07 2012
@@ -506,7 +506,7 @@ public class OverseerTest extends SolrTe
SolrZkClient zkClient = new SolrZkClient(address, TIMEOUT);
ZkStateReader reader = new ZkStateReader(zkClient);
LeaderElector overseerElector = new LeaderElector(zkClient);
- ElectionContext ec = new OverseerElectionContext(address, zkClient, reader);
+ ElectionContext ec = new OverseerElectionContext(address.replaceAll("/", "_"), zkClient, reader);
overseerElector.setup(ec);
overseerElector.joinElection(ec);
return zkClient;
Modified: lucene/dev/branches/solrcloud/solr/core/src/test/org/apache/solr/cloud/RecoveryZkTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solrcloud/solr/core/src/test/org/apache/solr/cloud/RecoveryZkTest.java?rev=1230342&r1=1230341&r2=1230342&view=diff
==============================================================================
--- lucene/dev/branches/solrcloud/solr/core/src/test/org/apache/solr/cloud/RecoveryZkTest.java (original)
+++ lucene/dev/branches/solrcloud/solr/core/src/test/org/apache/solr/cloud/RecoveryZkTest.java Thu Jan 12 00:58:07 2012
@@ -99,7 +99,7 @@ public class RecoveryZkTest extends Full
assertEquals(client1Docs, client2Docs);
// won't always pass yet...
- //query("q", "*:*", "distrib", true, "sort", "id desc");
+ //query("q", "*:*", "sort", "id desc");
}
protected void indexDoc(SolrInputDocument doc) throws IOException,
Modified: lucene/dev/branches/solrcloud/solr/core/src/test/org/apache/solr/cloud/ZkControllerTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solrcloud/solr/core/src/test/org/apache/solr/cloud/ZkControllerTest.java?rev=1230342&r1=1230341&r2=1230342&view=diff
==============================================================================
--- lucene/dev/branches/solrcloud/solr/core/src/test/org/apache/solr/cloud/ZkControllerTest.java (original)
+++ lucene/dev/branches/solrcloud/solr/core/src/test/org/apache/solr/cloud/ZkControllerTest.java Thu Jan 12 00:58:07 2012
@@ -74,7 +74,7 @@ public class ZkControllerTest extends So
}
zkClient.close();
ZkController zkController = new ZkController(server.getZkAddress(), TIMEOUT, 10000,
- "localhost", "8983", "/solr", new CurrentCoreDescriptorProvider() {
+ "localhost", "8983", "solr", new CurrentCoreDescriptorProvider() {
@Override
public List<CoreDescriptor> getCurrentDescriptors() {
@@ -108,7 +108,7 @@ public class ZkControllerTest extends So
AbstractZkTestCase.makeSolrZkNode(server.getZkHost());
zkController = new ZkController(server.getZkAddress(),
- TIMEOUT, 10000, "localhost", "8983", "/solr", new CurrentCoreDescriptorProvider() {
+ TIMEOUT, 10000, "localhost", "8983", "solr", new CurrentCoreDescriptorProvider() {
@Override
public List<CoreDescriptor> getCurrentDescriptors() {
Modified: lucene/dev/branches/solrcloud/solr/solrj/src/java/org/apache/solr/common/cloud/ZkStateReader.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solrcloud/solr/solrj/src/java/org/apache/solr/common/cloud/ZkStateReader.java?rev=1230342&r1=1230341&r2=1230342&view=diff
==============================================================================
--- lucene/dev/branches/solrcloud/solr/solrj/src/java/org/apache/solr/common/cloud/ZkStateReader.java (original)
+++ lucene/dev/branches/solrcloud/solr/solrj/src/java/org/apache/solr/common/cloud/ZkStateReader.java Thu Jan 12 00:58:07 2012
@@ -376,9 +376,10 @@ public class ZkStateReader {
return getLeaderUrl(collection, shard, 1000);
}
- public String getLeaderUrl(String collection, String shard, int timeout) throws InterruptedException, KeeperException {
- ZkCoreNodeProps props = new ZkCoreNodeProps(getLeaderProps(collection,shard));
-
+ public String getLeaderUrl(String collection, String shard, int timeout)
+ throws InterruptedException, KeeperException {
+ ZkCoreNodeProps props = new ZkCoreNodeProps(getLeaderProps(collection,
+ shard, timeout));
return props.getCoreUrl();
}
Modified: lucene/dev/branches/solrcloud/solr/test-framework/src/java/org/apache/solr/BaseDistributedSearchTestCase.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solrcloud/solr/test-framework/src/java/org/apache/solr/BaseDistributedSearchTestCase.java?rev=1230342&r1=1230341&r2=1230342&view=diff
==============================================================================
--- lucene/dev/branches/solrcloud/solr/test-framework/src/java/org/apache/solr/BaseDistributedSearchTestCase.java (original)
+++ lucene/dev/branches/solrcloud/solr/test-framework/src/java/org/apache/solr/BaseDistributedSearchTestCase.java Thu Jan 12 00:58:07 2012
@@ -351,8 +351,11 @@ public abstract class BaseDistributedSea
for (int i = 0; i < q.length; i += 2) {
params.add(q[i].toString(), q[i + 1].toString());
}
+ // nocommit: look into why passing true causes fails
+ params.set("distrib", "false");
final QueryResponse controlRsp = controlClient.query(params);
+ params.remove("distrib");
setDistributedParams(params);
QueryResponse rsp = queryServer(params);