You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by sa...@apache.org on 2018/05/25 05:04:55 UTC
lucene-solr:master: SOLR-12388: Enable a strict ZooKeeper-connected
search request mode,
in which search requests will fail when the coordinating node cant communicate
with ZooKeeper, by setting the "shards.tolerant" param to "requireZkConnected"
Repository: lucene-solr
Updated Branches:
refs/heads/master ad143a1ce -> 54a63d0d0
SOLR-12388: Enable a strict ZooKeeper-connected search request mode, in which search requests will fail when the coordinating node cant communicate with ZooKeeper, by setting the "shards.tolerant" param to "requireZkConnected"
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/54a63d0d
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/54a63d0d
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/54a63d0d
Branch: refs/heads/master
Commit: 54a63d0d0c250a4aa45a3e3a770efffc106f8ce2
Parents: ad143a1
Author: Steve Rowe <sa...@apache.org>
Authored: Fri May 25 01:03:54 2018 -0400
Committer: Steve Rowe <sa...@apache.org>
Committed: Fri May 25 01:03:54 2018 -0400
----------------------------------------------------------------------
solr/CHANGES.txt | 4 +
.../solr/handler/component/FacetComponent.java | 2 +-
.../handler/component/HttpShardHandler.java | 2 +-
.../solr/handler/component/SearchHandler.java | 21 +--
.../handler/component/SpellCheckComponent.java | 2 +-
.../solr/handler/component/StatsComponent.java | 2 +-
.../SearchGroupShardResponseProcessor.java | 2 +-
.../TopGroupsShardResponseProcessor.java | 2 +-
.../handler/component/SearchHandlerTest.java | 129 +++++++++++++++++++
...rcloud-query-routing-and-read-tolerance.adoc | 10 +-
.../apache/solr/common/params/ShardParams.java | 28 +++-
.../solr/common/params/ShardParamsTest.java | 32 ++++-
12 files changed, 216 insertions(+), 20 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/54a63d0d/solr/CHANGES.txt
----------------------------------------------------------------------
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index cb40f7f..1032723 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -121,6 +121,10 @@ New Features
* SOLR-12378: Support missing versionField on indexed docs in DocBasedVersionConstraintsURP.
(Oliver Bates, Michael Braun via Mark Miller)
+
+* SOLR-12388: Enable a strict ZooKeeper-connected search request mode, in which search
+ requests will fail when the coordinating node can't communicate with ZooKeeper,
+ by setting the "shards.tolerant" param to "requireZkConnected". (Steve Rowe)
Bug Fixes
----------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/54a63d0d/solr/core/src/java/org/apache/solr/handler/component/FacetComponent.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/handler/component/FacetComponent.java b/solr/core/src/java/org/apache/solr/handler/component/FacetComponent.java
index f0f5109..01f8875 100644
--- a/solr/core/src/java/org/apache/solr/handler/component/FacetComponent.java
+++ b/solr/core/src/java/org/apache/solr/handler/component/FacetComponent.java
@@ -713,7 +713,7 @@ public class FacetComponent extends SearchComponent {
try {
facet_counts = (NamedList) srsp.getSolrResponse().getResponse().get("facet_counts");
} catch (Exception ex) {
- if (rb.req.getParams().getBool(ShardParams.SHARDS_TOLERANT, false)) {
+ if (ShardParams.getShardsTolerantAsBool(rb.req.getParams())) {
continue; // looks like a shard did not return anything
}
throw new SolrException(ErrorCode.SERVER_ERROR,
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/54a63d0d/solr/core/src/java/org/apache/solr/handler/component/HttpShardHandler.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/handler/component/HttpShardHandler.java b/solr/core/src/java/org/apache/solr/handler/component/HttpShardHandler.java
index 33b1642..a548031 100644
--- a/solr/core/src/java/org/apache/solr/handler/component/HttpShardHandler.java
+++ b/solr/core/src/java/org/apache/solr/handler/component/HttpShardHandler.java
@@ -430,7 +430,7 @@ public class HttpShardHandler extends ShardHandler {
// And now recreate the | delimited list of equivalent servers
final String sliceShardsStr = createSliceShardsStr(shardUrls);
if (sliceShardsStr.isEmpty()) {
- boolean tolerant = rb.req.getParams().getBool(ShardParams.SHARDS_TOLERANT, false);
+ boolean tolerant = ShardParams.getShardsTolerantAsBool(rb.req.getParams());
if (!tolerant) {
// stop the check when there are no replicas available for a shard
throw new SolrException(SolrException.ErrorCode.SERVICE_UNAVAILABLE,
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/54a63d0d/solr/core/src/java/org/apache/solr/handler/component/SearchHandler.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/handler/component/SearchHandler.java b/solr/core/src/java/org/apache/solr/handler/component/SearchHandler.java
index 8b732da..d4c680c 100644
--- a/solr/core/src/java/org/apache/solr/handler/component/SearchHandler.java
+++ b/solr/core/src/java/org/apache/solr/handler/component/SearchHandler.java
@@ -229,16 +229,19 @@ public class SearchHandler extends RequestHandlerBase implements SolrCoreAware ,
}
}
- if(isZkAware) {
+ if (isZkAware) {
+ String shardsTolerant = req.getParams().get(ShardParams.SHARDS_TOLERANT);
+ boolean requireZkConnected = shardsTolerant != null && shardsTolerant.equals(ShardParams.REQUIRE_ZK_CONNECTED);
ZkController zkController = cc.getZkController();
- NamedList<Object> headers = rb.rsp.getResponseHeader();
- if(headers != null) {
- headers.add("zkConnected",
- zkController != null
- ? !zkController.getZkClient().getConnectionManager().isLikelyExpired()
- : false);
+ boolean zkConnected = zkController != null && ! zkController.getZkClient().getConnectionManager().isLikelyExpired();
+ if (requireZkConnected && false == zkConnected) {
+ throw new SolrException(SolrException.ErrorCode.SERVER_ERROR, "ZooKeeper is not connected");
+ } else {
+ NamedList<Object> headers = rb.rsp.getResponseHeader();
+ if (headers != null) {
+ headers.add("zkConnected", zkConnected);
+ }
}
-
}
return shardHandler;
@@ -392,7 +395,7 @@ public class SearchHandler extends RequestHandlerBase implements SolrCoreAware ,
// now wait for replies, but if anyone puts more requests on
// the outgoing queue, send them out immediately (by exiting
// this loop)
- boolean tolerant = rb.req.getParams().getBool(ShardParams.SHARDS_TOLERANT, false);
+ boolean tolerant = ShardParams.getShardsTolerantAsBool(rb.req.getParams());
while (rb.outgoing.size() == 0) {
ShardResponse srsp = tolerant ?
shardHandler1.takeCompletedIncludingErrors():
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/54a63d0d/solr/core/src/java/org/apache/solr/handler/component/SpellCheckComponent.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/handler/component/SpellCheckComponent.java b/solr/core/src/java/org/apache/solr/handler/component/SpellCheckComponent.java
index fd5c512..b207384 100644
--- a/solr/core/src/java/org/apache/solr/handler/component/SpellCheckComponent.java
+++ b/solr/core/src/java/org/apache/solr/handler/component/SpellCheckComponent.java
@@ -401,7 +401,7 @@ public class SpellCheckComponent extends SearchComponent implements SolrCoreAwar
try {
nl = (NamedList) srsp.getSolrResponse().getResponse().get("spellcheck");
} catch (Exception e) {
- if (rb.req.getParams().getBool(ShardParams.SHARDS_TOLERANT, false)) {
+ if (ShardParams.getShardsTolerantAsBool(rb.req.getParams())) {
continue; // looks like a shard did not return anything
}
throw new SolrException(SolrException.ErrorCode.SERVER_ERROR,
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/54a63d0d/solr/core/src/java/org/apache/solr/handler/component/StatsComponent.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/handler/component/StatsComponent.java b/solr/core/src/java/org/apache/solr/handler/component/StatsComponent.java
index 8ecd51c..fc5c29f 100644
--- a/solr/core/src/java/org/apache/solr/handler/component/StatsComponent.java
+++ b/solr/core/src/java/org/apache/solr/handler/component/StatsComponent.java
@@ -99,7 +99,7 @@ public class StatsComponent extends SearchComponent {
stats = (NamedList<NamedList<NamedList<?>>>)
srsp.getSolrResponse().getResponse().get("stats");
} catch (Exception e) {
- if (rb.req.getParams().getBool(ShardParams.SHARDS_TOLERANT, false)) {
+ if (ShardParams.getShardsTolerantAsBool(rb.req.getParams())) {
continue; // looks like a shard did not return anything
}
throw new SolrException(SolrException.ErrorCode.SERVER_ERROR,
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/54a63d0d/solr/core/src/java/org/apache/solr/search/grouping/distributed/responseprocessor/SearchGroupShardResponseProcessor.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/search/grouping/distributed/responseprocessor/SearchGroupShardResponseProcessor.java b/solr/core/src/java/org/apache/solr/search/grouping/distributed/responseprocessor/SearchGroupShardResponseProcessor.java
index cc1c87d..edad958b 100644
--- a/solr/core/src/java/org/apache/solr/search/grouping/distributed/responseprocessor/SearchGroupShardResponseProcessor.java
+++ b/solr/core/src/java/org/apache/solr/search/grouping/distributed/responseprocessor/SearchGroupShardResponseProcessor.java
@@ -99,7 +99,7 @@ public class SearchGroupShardResponseProcessor implements ShardResponseProcessor
}
shardInfo.add(srsp.getShard(), nl);
}
- if (rb.req.getParams().getBool(ShardParams.SHARDS_TOLERANT, false) && srsp.getException() != null) {
+ if (ShardParams.getShardsTolerantAsBool(rb.req.getParams()) && srsp.getException() != null) {
if(rb.rsp.getResponseHeader().get(SolrQueryResponse.RESPONSE_HEADER_PARTIAL_RESULTS_KEY) == null) {
rb.rsp.getResponseHeader().add(SolrQueryResponse.RESPONSE_HEADER_PARTIAL_RESULTS_KEY, Boolean.TRUE);
}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/54a63d0d/solr/core/src/java/org/apache/solr/search/grouping/distributed/responseprocessor/TopGroupsShardResponseProcessor.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/search/grouping/distributed/responseprocessor/TopGroupsShardResponseProcessor.java b/solr/core/src/java/org/apache/solr/search/grouping/distributed/responseprocessor/TopGroupsShardResponseProcessor.java
index cf02580..d05be0d 100644
--- a/solr/core/src/java/org/apache/solr/search/grouping/distributed/responseprocessor/TopGroupsShardResponseProcessor.java
+++ b/solr/core/src/java/org/apache/solr/search/grouping/distributed/responseprocessor/TopGroupsShardResponseProcessor.java
@@ -110,7 +110,7 @@ public class TopGroupsShardResponseProcessor implements ShardResponseProcessor {
}
shardInfo.add(srsp.getShard(), individualShardInfo);
}
- if (rb.req.getParams().getBool(ShardParams.SHARDS_TOLERANT, false) && srsp.getException() != null) {
+ if (ShardParams.getShardsTolerantAsBool(rb.req.getParams()) && srsp.getException() != null) {
if(rb.rsp.getResponseHeader().get(SolrQueryResponse.RESPONSE_HEADER_PARTIAL_RESULTS_KEY) == null) {
rb.rsp.getResponseHeader().add(SolrQueryResponse.RESPONSE_HEADER_PARTIAL_RESULTS_KEY, Boolean.TRUE);
}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/54a63d0d/solr/core/src/test/org/apache/solr/handler/component/SearchHandlerTest.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/handler/component/SearchHandlerTest.java b/solr/core/src/test/org/apache/solr/handler/component/SearchHandlerTest.java
index 7501651..d8eb6a4 100644
--- a/solr/core/src/test/org/apache/solr/handler/component/SearchHandlerTest.java
+++ b/solr/core/src/test/org/apache/solr/handler/component/SearchHandlerTest.java
@@ -17,15 +17,22 @@
package org.apache.solr.handler.component;
import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Iterator;
import java.util.List;
import org.apache.solr.SolrTestCaseJ4;
import org.apache.solr.client.solrj.embedded.JettySolrRunner;
import org.apache.solr.client.solrj.impl.CloudSolrClient;
+import org.apache.solr.client.solrj.impl.HttpSolrClient;
import org.apache.solr.client.solrj.request.CollectionAdminRequest;
import org.apache.solr.client.solrj.request.QueryRequest;
import org.apache.solr.client.solrj.response.QueryResponse;
import org.apache.solr.cloud.MiniSolrCloudCluster;
+import org.apache.solr.common.cloud.Replica;
+import org.apache.solr.common.cloud.Slice;
+import org.apache.solr.common.params.ModifiableSolrParams;
+import org.apache.solr.common.params.ShardParams;
import org.apache.solr.common.util.NamedList;
import org.apache.solr.core.SolrCore;
import org.junit.BeforeClass;
@@ -131,9 +138,131 @@ public class SearchHandlerTest extends SolrTestCaseJ4
QueryResponse rsp = req.process(cloudSolrClient, collectionName);
assertTrue(rsp.getResponseHeader().getBooleanArg("zkConnected"));
+ Collection<Slice> slices = cloudSolrClient.getZkStateReader().getClusterState().getCollection(collectionName).getSlices();
+ Slice slice = getRandomEntry(slices);
+ Replica replica = getRandomEntry(slice.getReplicas());
+ JettySolrRunner jetty = miniCluster.getReplicaJetty(replica);
+ // Use the replica's core URL to avoid ZK communication
+ try (HttpSolrClient client = new HttpSolrClient.Builder(replica.getCoreUrl()).build()) {
+ jetty.getCoreContainer().getZkController().getZkClient().close();
+ rsp = req.process(client);
+ assertFalse(rsp.getResponseHeader().getBooleanArg("zkConnected"));
+ }
}
finally {
miniCluster.shutdown();
}
}
+
+ @Test
+ public void testRequireZkConnected() throws Exception{
+ MiniSolrCloudCluster miniCluster = new MiniSolrCloudCluster(5, createTempDir(), buildJettyConfig("/solr"));
+
+ final CloudSolrClient cloudSolrClient = miniCluster.getSolrClient();
+
+ try {
+ assertNotNull(miniCluster.getZkServer());
+ List<JettySolrRunner> jettys = miniCluster.getJettySolrRunners();
+ assertEquals(5, jettys.size());
+ for (JettySolrRunner jetty : jettys) {
+ assertTrue(jetty.isRunning());
+ }
+
+ // create collection
+ String collectionName = "testRequireZkConnectedCollection";
+ String configName = collectionName + "Config";
+ miniCluster.uploadConfigSet(SolrTestCaseJ4.TEST_PATH().resolve("collection1/conf"), configName);
+
+ CollectionAdminRequest.createCollection(collectionName, configName, 2, 2)
+ .process(miniCluster.getSolrClient());
+
+ ModifiableSolrParams params = new ModifiableSolrParams();
+ params.set(ShardParams.SHARDS_TOLERANT, "requireZkConnected");
+ QueryRequest req = new QueryRequest(params);
+ QueryResponse rsp = req.process(cloudSolrClient, collectionName);
+ assertTrue(rsp.getResponseHeader().getBooleanArg("zkConnected"));
+
+ Collection<Slice> slices = cloudSolrClient.getZkStateReader().getClusterState().getCollection(collectionName).getSlices();
+ Slice disconnectedSlice = getRandomEntry(slices);
+ Replica disconnectedReplica = getRandomEntry(disconnectedSlice.getReplicas());
+ JettySolrRunner disconnectedJetty = miniCluster.getReplicaJetty(disconnectedReplica);
+ // Use the replica's core URL to avoid ZK communication
+ try (HttpSolrClient httpSolrClient = new HttpSolrClient.Builder(disconnectedReplica.getCoreUrl()).build()) {
+ ignoreException("ZooKeeper is not connected");
+ disconnectedJetty.getCoreContainer().getZkController().getZkClient().close();
+ req.process(httpSolrClient);
+ fail("An exception should be thrown when ZooKeeper is not connected and shards.tolerant=requireZkConnected");
+ } catch (Exception e) {
+ assertTrue(e.getMessage().contains("ZooKeeper is not connected"));
+ }
+ }
+ finally {
+ miniCluster.shutdown();
+ }
+ }
+
+ @Test
+ public void testRequireZkConnectedDistrib() throws Exception{
+ MiniSolrCloudCluster miniCluster = new MiniSolrCloudCluster(2, createTempDir(), buildJettyConfig("/solr"));
+
+ final CloudSolrClient cloudSolrClient = miniCluster.getSolrClient();
+
+ try {
+ assertNotNull(miniCluster.getZkServer());
+ List<JettySolrRunner> jettys = miniCluster.getJettySolrRunners();
+ assertEquals(2, jettys.size());
+ for (JettySolrRunner jetty : jettys) {
+ assertTrue(jetty.isRunning());
+ }
+
+ // create collection
+ String collectionName = "testRequireZkConnectedDistribCollection";
+ String configName = collectionName + "Config";
+ miniCluster.uploadConfigSet(SolrTestCaseJ4.TEST_PATH().resolve("collection1/conf"), configName);
+
+ CollectionAdminRequest.createCollection(collectionName, configName, 2, 1)
+ .process(miniCluster.getSolrClient());
+
+ ModifiableSolrParams params = new ModifiableSolrParams();
+ params.set(ShardParams.SHARDS_TOLERANT, "requireZkConnected");
+ QueryRequest req = new QueryRequest(params);
+ QueryResponse rsp = req.process(cloudSolrClient, collectionName);
+ assertTrue(rsp.getResponseHeader().getBooleanArg("zkConnected"));
+
+ Collection<Slice> slices = cloudSolrClient.getZkStateReader().getClusterState().getCollection(collectionName).getSlices();
+ Slice disconnectedSlice = getRandomEntry(slices);
+ Replica disconnectedReplica = getRandomEntry(disconnectedSlice.getReplicas());
+
+ // Query a coordinating replica that is connected to ZooKeeper
+ Slice connectedSlice = getRandomEntry(slices);
+ while (connectedSlice.getName().equals(disconnectedSlice.getName())) {
+ connectedSlice = getRandomEntry(slices);
+ }
+ Replica connectedReplica = connectedSlice.getReplicas().iterator().next();
+ try (HttpSolrClient httpSolrClient = new HttpSolrClient.Builder(connectedReplica.getCoreUrl()).build()) {
+ ignoreException("ZooKeeper is not connected");
+ JettySolrRunner disconnectedJetty = miniCluster.getReplicaJetty(disconnectedReplica);
+ disconnectedJetty.getCoreContainer().getZkController().getZkClient().close();
+ req.process(httpSolrClient);
+ fail("An exception should be thrown when ZooKeeper is not connected and shards.tolerant=requireZkConnected");
+ } catch (Exception e) {
+ assertTrue(e.getMessage().contains("no servers hosting shard:"));
+ }
+ }
+ finally {
+ miniCluster.shutdown();
+ }
+ }
+
+ private static <T> T getRandomEntry(Collection<T> collection) {
+ if (null == collection || collection.isEmpty())
+ return null;
+
+ Iterator<T> iterator = collection.iterator();
+ T entry = iterator.next();
+ int index = 0, rand = random().nextInt(collection.size());
+ while (index++ < rand)
+ entry = iterator.next();
+ return entry;
+ }
}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/54a63d0d/solr/solr-ref-guide/src/solrcloud-query-routing-and-read-tolerance.adoc
----------------------------------------------------------------------
diff --git a/solr/solr-ref-guide/src/solrcloud-query-routing-and-read-tolerance.adoc b/solr/solr-ref-guide/src/solrcloud-query-routing-and-read-tolerance.adoc
index bcd5b75..0e2f6ac 100644
--- a/solr/solr-ref-guide/src/solrcloud-query-routing-and-read-tolerance.adoc
+++ b/solr/solr-ref-guide/src/solrcloud-query-routing-and-read-tolerance.adoc
@@ -27,11 +27,11 @@ Even if some nodes in the cluster are offline or unreachable, a Solr node will b
=== zkConnected
-A Solr node will return the results of a search request as long as it can communicate with at least one replica of every shard that it knows about, even if it can _not_ communicate with ZooKeeper at the time it receives the request. This is normally the preferred behavior from a fault tolerance standpoint, but may result in stale or incorrect results if there have been major changes to the collection structure that the node has not been informed of via ZooKeeper (i.e., shards may have been added or removed, or split into sub-shards)
+A Solr node will return the results of a search request as long as it can communicate with at least one replica of every shard that it knows about, even if it can _not_ communicate with ZooKeeper at the time it receives the request. This is normally the preferred behavior from a fault tolerance standpoint, but may result in stale or incorrect results if there have been major changes to the collection structure that the node has not been informed of via ZooKeeper (i.e., shards may have been added or removed, or split into sub-shards).
A `zkConnected` header is included in every search response indicating if the node that processed the request was connected with ZooKeeper at the time:
-.Solr Response with partialResults
+.Solr Response with zkConnected
[source,json]
----
{
@@ -51,12 +51,16 @@ A `zkConnected` header is included in every search response indicating if the no
}
----
+To prevent stale or incorrect results in the event that the request-serving node can't communicate with ZooKeeper, set the <<shards-tolerant,`shards.tolerant`>> parameter to `requireZkConnected`. This will cause requests to fail rather than setting a `zkConnected` header to `false`.
+
=== shards.tolerant
-In the event that one or more shards queried are completely unavailable, then Solr's default behavior is to fail the request. However, there are many use-cases where partial results are acceptable and so Solr provides a boolean `shards.tolerant` parameter (default `false`).
+In the event that one or more shards queried are completely unavailable, then Solr's default behavior is to fail the request. However, there are many use-cases where partial results are acceptable and so Solr provides a boolean `shards.tolerant` parameter (default `false`). In addition to `true` and `false`, `shards.tolerant` may also be set to `requireZkConnected` - see below.
If `shards.tolerant=true` then partial results may be returned. If the returned response does not contain results from all the appropriate shards then the response header contains a special flag called `partialResults`.
+If `shards.tolerant=requireZkConnected` and the node serving the search request cannot communicate with ZooKeeper, the request will fail, rather than returning potentially stale or incorrect results. This will also cause requests to fail when one or more queried shards are completely unavailable, just like when `shards.tolerant=false`.
+
The client can specify '<<distributed-search-with-index-sharding.adoc#distributed-search-with-index-sharding,`shards.info`>>' along with the `shards.tolerant` parameter to retrieve more fine-grained details.
Example response with `partialResults` flag set to 'true':
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/54a63d0d/solr/solrj/src/java/org/apache/solr/common/params/ShardParams.java
----------------------------------------------------------------------
diff --git a/solr/solrj/src/java/org/apache/solr/common/params/ShardParams.java b/solr/solrj/src/java/org/apache/solr/common/params/ShardParams.java
index 567e963..262c18a 100644
--- a/solr/solrj/src/java/org/apache/solr/common/params/ShardParams.java
+++ b/solr/solrj/src/java/org/apache/solr/common/params/ShardParams.java
@@ -16,6 +16,8 @@
*/
package org.apache.solr.common.params;
+import org.apache.solr.common.util.StrUtils;
+
/**
* Parameters used for distributed search.
*
@@ -46,7 +48,7 @@ public interface ShardParams {
/** Request detailed match info for each shard (true/false) */
String SHARDS_INFO = "shards.info";
- /** Should things fail if there is an error? (true/false) */
+ /** Should things fail if there is an error? (true/false/{@value #REQUIRE_ZK_CONNECTED}) */
String SHARDS_TOLERANT = "shards.tolerant";
/** query purpose for shard requests */
@@ -68,4 +70,28 @@ public interface ShardParams {
/** Force a single-pass distributed query? (true/false) */
String DISTRIB_SINGLE_PASS = "distrib.singlePass";
+
+ /**
+ * Throw an error from search requests when the {@value #SHARDS_TOLERANT} param
+ * has this value and ZooKeeper is not connected.
+ *
+ * @see #getShardsTolerantAsBool(SolrParams)
+ */
+ String REQUIRE_ZK_CONNECTED = "requireZkConnected";
+
+ /**
+ * Parse the {@value #SHARDS_TOLERANT} param from <code>params</code> as a boolean;
+ * accepts {@value #REQUIRE_ZK_CONNECTED} as a valid value indicating <code>false</code>.
+ *
+ * By default, returns <code>false</code> when {@value #SHARDS_TOLERANT} is not set
+ * in <code>params</code>.
+ */
+ static boolean getShardsTolerantAsBool(SolrParams params) {
+ String shardsTolerantValue = params.get(SHARDS_TOLERANT);
+ if (null == shardsTolerantValue || shardsTolerantValue.equals(REQUIRE_ZK_CONNECTED)) {
+ return false;
+ } else {
+ return StrUtils.parseBool(shardsTolerantValue); // throw an exception if non-boolean
+ }
+ }
}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/54a63d0d/solr/solrj/src/test/org/apache/solr/common/params/ShardParamsTest.java
----------------------------------------------------------------------
diff --git a/solr/solrj/src/test/org/apache/solr/common/params/ShardParamsTest.java b/solr/solrj/src/test/org/apache/solr/common/params/ShardParamsTest.java
index 685fd6a..18b3a1b 100644
--- a/solr/solrj/src/test/org/apache/solr/common/params/ShardParamsTest.java
+++ b/solr/solrj/src/test/org/apache/solr/common/params/ShardParamsTest.java
@@ -17,6 +17,7 @@
package org.apache.solr.common.params;
import org.apache.lucene.util.LuceneTestCase;
+import org.apache.solr.common.SolrException;
/**
* This class tests backwards compatibility of {@link ShardParams} parameter constants.
@@ -40,10 +41,39 @@ public class ShardParamsTest extends LuceneTestCase
public void testShardsInfo() { assertEquals(ShardParams.SHARDS_INFO, "shards.info"); }
public void testShardsTolerant() { assertEquals(ShardParams.SHARDS_TOLERANT, "shards.tolerant"); }
-
+
+ public void testRequireZkConnected() { assertEquals(ShardParams.REQUIRE_ZK_CONNECTED, "requireZkConnected"); }
+
public void testShardsPurpose() { assertEquals(ShardParams.SHARDS_PURPOSE, "shards.purpose"); }
public void testRoute() { assertEquals(ShardParams._ROUTE_, "_route_"); }
public void testDistribSinglePass() { assertEquals(ShardParams.DISTRIB_SINGLE_PASS, "distrib.singlePass"); }
+
+ public void testGetShardsTolerantAsBool() {
+ ModifiableSolrParams params = new ModifiableSolrParams();
+ // shards.tolerant param is not set; default should be false
+ assertFalse(ShardParams.getShardsTolerantAsBool(params));
+
+ // shards.tolerant boolean true param should return true
+ for (String trueValue : new String[] { "true", "yes", "on"}) {
+ params.set(ShardParams.SHARDS_TOLERANT, trueValue);
+ assertTrue(ShardParams.getShardsTolerantAsBool(params));
+ }
+
+ // shards.tolerant boolean false param should return false
+ for (String falseValue : new String[] { "false", "no", "off"}) {
+ params.set(ShardParams.SHARDS_TOLERANT, falseValue);
+ assertFalse(ShardParams.getShardsTolerantAsBool(params));
+ }
+
+ // shards.tolerant=requireZkConnected should return false
+ params.set(ShardParams.SHARDS_TOLERANT, ShardParams.REQUIRE_ZK_CONNECTED);
+ assertFalse(ShardParams.getShardsTolerantAsBool(params));
+
+ // values that aren't "requireZkConnected" or boolean should throw an exception
+ params.set(ShardParams.SHARDS_TOLERANT, "bogusValue");
+ Exception exception = expectThrows(SolrException.class, () -> ShardParams.getShardsTolerantAsBool(params));
+ assertTrue(exception.getMessage().startsWith("invalid boolean value: "));
+ }
}