From 2ab00515510b7711e523d8eb322915a4c7f752a5 Mon Sep 17 00:00:00 2001 From: Shalin Shekhar Mangar Date: Thu, 10 Oct 2013 14:26:29 +0000 Subject: [PATCH] SOLR-5324: Make sub shard replica recovery and shard state switch asynchronous git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1530994 13f79535-47bb-0310-9956-ffa450edef68 --- solr/CHANGES.txt | 3 + .../apache/solr/cloud/CloudDescriptor.java | 11 +++ .../java/org/apache/solr/cloud/Overseer.java | 85 ++++++++++++++++--- .../cloud/OverseerCollectionProcessor.java | 69 +++++++++------ .../org/apache/solr/cloud/ZkController.java | 1 + .../java/org/apache/solr/core/SolrCore.java | 2 +- .../solr/handler/admin/CoreAdminHandler.java | 1 + .../processor/DistributedUpdateProcessor.java | 8 +- .../org/apache/solr/cloud/ShardSplitTest.java | 3 + .../org/apache/solr/common/cloud/Slice.java | 12 +++ .../solr/common/cloud/ZkStateReader.java | 1 + .../solr/common/params/CoreAdminParams.java | 3 + 12 files changed, 157 insertions(+), 42 deletions(-) diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt index 7d6ebf94a14..634f84a87b2 100644 --- a/solr/CHANGES.txt +++ b/solr/CHANGES.txt @@ -92,6 +92,9 @@ New Features * SOLR-5226: Add Lucene index heap usage to the Solr admin UI. (Areek Zillur via Robert Muir) +* SOLR-5324: Make sub shard replica recovery and shard state switch asynchronous. + (Yago Riveiro, shalin) + Bug Fixes ---------------------- * SOLR-4590: Collections API should return a nice error when not in SolrCloud mode. diff --git a/solr/core/src/java/org/apache/solr/cloud/CloudDescriptor.java b/solr/core/src/java/org/apache/solr/cloud/CloudDescriptor.java index 6d69098aef4..fbf02514e6c 100644 --- a/solr/core/src/java/org/apache/solr/cloud/CloudDescriptor.java +++ b/solr/core/src/java/org/apache/solr/cloud/CloudDescriptor.java @@ -38,6 +38,7 @@ public class CloudDescriptor { * Use the values from {@link Slice} instead */ volatile String shardRange = null; volatile String shardState = Slice.ACTIVE; + volatile String shardParent = null; volatile boolean isLeader = false; volatile String lastPublished = ZkStateReader.ACTIVE; @@ -45,6 +46,7 @@ public class CloudDescriptor { public static final String SHARD_STATE = "shardState"; public static final String NUM_SHARDS = "numShards"; public static final String SHARD_RANGE = "shardRange"; + public static final String SHARD_PARENT = "shardParent"; public CloudDescriptor(String coreName, Properties props) { this.shardId = props.getProperty(CoreDescriptor.CORE_SHARD, null); @@ -55,6 +57,7 @@ public class CloudDescriptor { this.shardState = props.getProperty(CloudDescriptor.SHARD_STATE, Slice.ACTIVE); this.numShards = PropertiesUtil.toInteger(props.getProperty(CloudDescriptor.NUM_SHARDS), null); this.shardRange = props.getProperty(CloudDescriptor.SHARD_RANGE, null); + this.shardParent = props.getProperty(CloudDescriptor.SHARD_PARENT, null); } public String getLastPublished() { @@ -134,4 +137,12 @@ public class CloudDescriptor { public void setShardState(String shardState) { this.shardState = shardState; } + + public String getShardParent() { + return shardParent; + } + + public void setShardParent(String shardParent) { + this.shardParent = shardParent; + } } diff --git a/solr/core/src/java/org/apache/solr/cloud/Overseer.java b/solr/core/src/java/org/apache/solr/cloud/Overseer.java index 406f58a25a9..1a9a3ab82c4 100644 --- a/solr/core/src/java/org/apache/solr/cloud/Overseer.java +++ b/solr/core/src/java/org/apache/solr/cloud/Overseer.java @@ -234,7 +234,7 @@ public class Overseer { private ClusterState updateShardState(ClusterState clusterState, ZkNodeProps message) { String collection = message.getStr(ZkStateReader.COLLECTION_PROP); - log.info("Update shard state invoked for collection: " + collection); + log.info("Update shard state invoked for collection: " + collection + " with message: " + message); for (String key : message.keySet()) { if (ZkStateReader.COLLECTION_PROP.equals(key)) continue; if (QUEUE_OPERATION.equals(key)) continue; @@ -245,6 +245,9 @@ public class Overseer { } log.info("Update shard state " + key + " to " + message.getStr(key)); Map props = slice.shallowCopy(); + if (Slice.RECOVERY.equals(props.get(Slice.STATE)) && Slice.ACTIVE.equals(message.getStr(key))) { + props.remove(Slice.PARENT); + } props.put(Slice.STATE, message.getStr(key)); Slice newSlice = new Slice(slice.getName(), slice.getReplicasCopy(), props); clusterState = updateSlice(clusterState, collection, newSlice); @@ -344,14 +347,6 @@ public class Overseer { replicaProps.putAll(message.getProperties()); // System.out.println("########## UPDATE MESSAGE: " + JSONUtil.toJSON(message)); if (slice != null) { - String sliceState = slice.getState(); - - // throw an exception if the slice is not yet active. - - //if(!sliceState.equals(Slice.ACTIVE)) { - // throw new SolrException(ErrorCode.BAD_REQUEST, "Can not assign core to a non-active slice [" + slice.getName() + "]"); - //} - Replica oldReplica = slice.getReplicasMap().get(coreNodeName); if (oldReplica != null && oldReplica.containsKey(ZkStateReader.LEADER_PROP)) { replicaProps.put(ZkStateReader.LEADER_PROP, oldReplica.get(ZkStateReader.LEADER_PROP)); @@ -380,6 +375,7 @@ public class Overseer { // remove shard specific properties String shardRange = (String) replicaProps.remove(ZkStateReader.SHARD_RANGE_PROP); String shardState = (String) replicaProps.remove(ZkStateReader.SHARD_STATE_PROP); + String shardParent = (String) replicaProps.remove(ZkStateReader.SHARD_PARENT_PROP); Replica replica = new Replica(coreNodeName, replicaProps); @@ -390,6 +386,9 @@ public class Overseer { Map replicas; if (slice != null) { + state = checkAndCompleteShardSplit(state, collection, coreNodeName, sliceName, replicaProps); + // get the current slice again because it may have been updated due to checkAndCompleteShardSplit method + slice = state.getSlice(collection, sliceName); sliceProps = slice.getProperties(); replicas = slice.getReplicasCopy(); } else { @@ -397,6 +396,7 @@ public class Overseer { sliceProps = new HashMap(); sliceProps.put(Slice.RANGE, shardRange); sliceProps.put(Slice.STATE, shardState); + sliceProps.put(Slice.PARENT, shardParent); } replicas.put(replica.getName(), replica); @@ -406,7 +406,72 @@ public class Overseer { return newClusterState; } - private ClusterState createCollection(ClusterState state, String collectionName, List shards , ZkNodeProps message) { + private ClusterState checkAndCompleteShardSplit(ClusterState state, String collection, String coreNodeName, String sliceName, Map replicaProps) { + Slice slice = state.getSlice(collection, sliceName); + Map sliceProps = slice.getProperties(); + String sliceState = slice.getState(); + if (Slice.RECOVERY.equals(sliceState)) { + log.info("Shard: {} is in recovery state", sliceName); + // is this replica active? + if (ZkStateReader.ACTIVE.equals(replicaProps.get(ZkStateReader.STATE_PROP))) { + log.info("Shard: {} is in recovery state and coreNodeName: {} is active", sliceName, coreNodeName); + // are all other replicas also active? + boolean allActive = true; + for (Entry entry : slice.getReplicasMap().entrySet()) { + if (coreNodeName.equals(entry.getKey())) continue; + if (!Slice.ACTIVE.equals(entry.getValue().getStr(Slice.STATE))) { + allActive = false; + break; + } + } + if (allActive) { + log.info("Shard: {} - all replicas are active. Finding status of fellow sub-shards", sliceName); + // find out about other sub shards + Map allSlicesCopy = new HashMap(state.getSlicesMap(collection)); + List subShardSlices = new ArrayList(); + outer: + for (Entry entry : allSlicesCopy.entrySet()) { + if (sliceName.equals(entry.getKey())) + continue; + Slice otherSlice = entry.getValue(); + if (Slice.RECOVERY.equals(otherSlice.getState())) { + if (slice.getParent() != null && slice.getParent().equals(otherSlice.getParent())) { + log.info("Shard: {} - Fellow sub-shard: {} found", sliceName, otherSlice.getName()); + // this is a fellow sub shard so check if all replicas are active + for (Entry sliceEntry : otherSlice.getReplicasMap().entrySet()) { + if (!ZkStateReader.ACTIVE.equals(sliceEntry.getValue().getStr(ZkStateReader.STATE_PROP))) { + allActive = false; + break outer; + } + } + log.info("Shard: {} - Fellow sub-shard: {} has all replicas active", sliceName, otherSlice.getName()); + subShardSlices.add(otherSlice); + } + } + } + if (allActive) { + // hurray, all sub shard replicas are active + log.info("Shard: {} - All replicas across all fellow sub-shards are now ACTIVE. Preparing to switch shard states.", sliceName); + String parentSliceName = (String) sliceProps.remove(Slice.PARENT); + + Map propMap = new HashMap(); + propMap.put(Overseer.QUEUE_OPERATION, "updateshardstate"); + propMap.put(parentSliceName, Slice.INACTIVE); + propMap.put(sliceName, Slice.ACTIVE); + for (Slice subShardSlice : subShardSlices) { + propMap.put(subShardSlice.getName(), Slice.ACTIVE); + } + propMap.put(ZkStateReader.COLLECTION_PROP, collection); + ZkNodeProps m = new ZkNodeProps(propMap); + state = updateShardState(state, m); + } + } + } + } + return state; + } + + private ClusterState createCollection(ClusterState state, String collectionName, List shards , ZkNodeProps message) { log.info("Create collection {} with shards {}", collectionName, shards); Map routerSpec = DocRouter.getRouterSpec(message); diff --git a/solr/core/src/java/org/apache/solr/cloud/OverseerCollectionProcessor.java b/solr/core/src/java/org/apache/solr/cloud/OverseerCollectionProcessor.java index bd37bb0bed2..bb2f452cf78 100644 --- a/solr/core/src/java/org/apache/solr/cloud/OverseerCollectionProcessor.java +++ b/solr/core/src/java/org/apache/solr/cloud/OverseerCollectionProcessor.java @@ -524,18 +524,19 @@ public class OverseerCollectionProcessor implements Runnable, ClosableThread { if (oSlice != null) { if (Slice.ACTIVE.equals(oSlice.getState())) { throw new SolrException(ErrorCode.BAD_REQUEST, "Sub-shard: " + subSlice + " exists in active state. Aborting split shard."); - } else if (Slice.CONSTRUCTION.equals(oSlice.getState())) { - for (Replica replica : oSlice.getReplicas()) { - if (clusterState.liveNodesContain(replica.getNodeName())) { - String core = replica.getStr("core"); - log.info("Unloading core: " + core + " from node: " + replica.getNodeName()); - ModifiableSolrParams params = new ModifiableSolrParams(); - params.set(CoreAdminParams.ACTION, CoreAdminAction.UNLOAD.toString()); - params.set(CoreAdminParams.CORE, core); - params.set(CoreAdminParams.DELETE_INDEX, "true"); - sendShardRequest(replica.getNodeName(), params); - } else { - log.warn("Replica {} exists in shard {} but is not live and cannot be unloaded", replica, oSlice); + } else if (Slice.CONSTRUCTION.equals(oSlice.getState()) || Slice.RECOVERY.equals(oSlice.getState())) { + // delete the shards + for (String sub : subSlices) { + log.info("Sub-shard: {} already exists therefore requesting its deletion", sub); + Map propMap = new HashMap(); + propMap.put(Overseer.QUEUE_OPERATION, "deleteshard"); + propMap.put(COLLECTION_PROP, collectionName); + propMap.put(SHARD_ID_PROP, sub); + ZkNodeProps m = new ZkNodeProps(propMap); + try { + deleteShard(clusterState, m, new NamedList()); + } catch (Exception e) { + throw new SolrException(ErrorCode.SERVER_ERROR, "Unable to delete already existing sub shard: " + sub, e); } } } @@ -564,6 +565,7 @@ public class OverseerCollectionProcessor implements Runnable, ClosableThread { params.set(CoreAdminParams.SHARD, subSlice); params.set(CoreAdminParams.SHARD_RANGE, subRange.toString()); params.set(CoreAdminParams.SHARD_STATE, Slice.CONSTRUCTION); + params.set(CoreAdminParams.SHARD_PARENT, parentSlice.getName()); sendShardRequest(nodeName, params); } @@ -689,7 +691,7 @@ public class OverseerCollectionProcessor implements Runnable, ClosableThread { cmd.setCoreName(subShardNames.get(i-1)); cmd.setNodeName(subShardNodeName); cmd.setCoreNodeName(coreNodeName); - cmd.setState(ZkStateReader.ACTIVE); + cmd.setState(ZkStateReader.RECOVERING); cmd.setCheckLive(true); cmd.setOnlyIfLeader(true); sendShardRequest(nodeName, new ModifiableSolrParams(cmd.getParams())); @@ -699,6 +701,8 @@ public class OverseerCollectionProcessor implements Runnable, ClosableThread { collectShardResponses(results, true, "SPLTSHARD failed to create subshard replicas or timed out waiting for them to come up"); + log.info("Successfully created all replica shards for all sub-slices " + subSlices); + log.info("Calling soft commit to make sub shard updates visible"); String coreUrl = new ZkCoreNodeProps(parentShardLeader).getCoreUrl(); // HttpShardHandler is hard coded to send a QueryRequest hence we go direct @@ -712,20 +716,31 @@ public class OverseerCollectionProcessor implements Runnable, ClosableThread { throw new SolrException(ErrorCode.SERVER_ERROR, "Unable to call distrib softCommit on: " + coreUrl, e); } - log.info("Successfully created all replica shards for all sub-slices " - + subSlices); - - log.info("Requesting update shard state"); - DistributedQueue inQueue = Overseer.getInQueue(zkStateReader.getZkClient()); - Map propMap = new HashMap(); - propMap.put(Overseer.QUEUE_OPERATION, "updateshardstate"); - propMap.put(slice, Slice.INACTIVE); - for (String subSlice : subSlices) { - propMap.put(subSlice, Slice.ACTIVE); + if (repFactor == 1) { + // switch sub shard states to 'active' + log.info("Replication factor is 1 so switching shard states"); + DistributedQueue inQueue = Overseer.getInQueue(zkStateReader.getZkClient()); + Map propMap = new HashMap(); + propMap.put(Overseer.QUEUE_OPERATION, "updateshardstate"); + propMap.put(slice, Slice.INACTIVE); + for (String subSlice : subSlices) { + propMap.put(subSlice, Slice.ACTIVE); + } + propMap.put(ZkStateReader.COLLECTION_PROP, collectionName); + ZkNodeProps m = new ZkNodeProps(propMap); + inQueue.offer(ZkStateReader.toJSON(m)); + } else { + log.info("Requesting shard state be set to 'recovery'"); + DistributedQueue inQueue = Overseer.getInQueue(zkStateReader.getZkClient()); + Map propMap = new HashMap(); + propMap.put(Overseer.QUEUE_OPERATION, "updateshardstate"); + for (String subSlice : subSlices) { + propMap.put(subSlice, Slice.RECOVERY); + } + propMap.put(ZkStateReader.COLLECTION_PROP, collectionName); + ZkNodeProps m = new ZkNodeProps(propMap); + inQueue.offer(ZkStateReader.toJSON(m)); } - propMap.put(ZkStateReader.COLLECTION_PROP, collectionName); - ZkNodeProps m = new ZkNodeProps(propMap); - inQueue.offer(ZkStateReader.toJSON(m)); return true; } catch (SolrException e) { @@ -819,7 +834,7 @@ public class OverseerCollectionProcessor implements Runnable, ClosableThread { } // For now, only allow for deletions of Inactive slices or custom hashes (range==null). // TODO: Add check for range gaps on Slice deletion - if (!(slice.getRange() == null || slice.getState().equals(Slice.INACTIVE))) { + if (!(slice.getRange() == null || slice.getState().equals(Slice.INACTIVE) || slice.getState().equals(Slice.RECOVERY))) { throw new SolrException(ErrorCode.BAD_REQUEST, "The slice: " + slice.getName() + " is currently " + slice.getState() + ". Only INACTIVE (or custom-hashed) slices can be deleted."); diff --git a/solr/core/src/java/org/apache/solr/cloud/ZkController.java b/solr/core/src/java/org/apache/solr/cloud/ZkController.java index 4b05167ee3a..f56aa62fe02 100644 --- a/solr/core/src/java/org/apache/solr/cloud/ZkController.java +++ b/solr/core/src/java/org/apache/solr/cloud/ZkController.java @@ -1036,6 +1036,7 @@ public final class ZkController { ZkStateReader.SHARD_ID_PROP, cd.getCloudDescriptor().getShardId(), ZkStateReader.SHARD_RANGE_PROP, cd.getCloudDescriptor().getShardRange(), ZkStateReader.SHARD_STATE_PROP, cd.getCloudDescriptor().getShardState(), + ZkStateReader.SHARD_PARENT_PROP, cd.getCloudDescriptor().getShardParent(), ZkStateReader.COLLECTION_PROP, cd.getCloudDescriptor() .getCollectionName(), ZkStateReader.NUM_SHARDS_PROP, numShards != null ? numShards.toString() diff --git a/solr/core/src/java/org/apache/solr/core/SolrCore.java b/solr/core/src/java/org/apache/solr/core/SolrCore.java index a80dab87e36..ad6c12d735c 100644 --- a/solr/core/src/java/org/apache/solr/core/SolrCore.java +++ b/solr/core/src/java/org/apache/solr/core/SolrCore.java @@ -856,7 +856,7 @@ public final class SolrCore implements SolrInfoMBean { cd.getCloudDescriptor().setShardState(null); cd.getCloudDescriptor().setShardRange(null); - + cd.getCloudDescriptor().setShardParent(null); } // For debugging // numOpens.incrementAndGet(); diff --git a/solr/core/src/java/org/apache/solr/handler/admin/CoreAdminHandler.java b/solr/core/src/java/org/apache/solr/handler/admin/CoreAdminHandler.java index 024f975eec1..ff2f9e45de0 100644 --- a/solr/core/src/java/org/apache/solr/handler/admin/CoreAdminHandler.java +++ b/solr/core/src/java/org/apache/solr/handler/admin/CoreAdminHandler.java @@ -423,6 +423,7 @@ public class CoreAdminHandler extends RequestHandlerBase { .put(CoreAdminParams.CORE_NODE_NAME, CoreDescriptor.CORE_NODE_NAME) .put(CoreAdminParams.SHARD_STATE, CloudDescriptor.SHARD_STATE) .put(CoreAdminParams.SHARD_RANGE, CloudDescriptor.SHARD_RANGE) + .put(CoreAdminParams.SHARD_PARENT, CloudDescriptor.SHARD_PARENT) .put(ZkStateReader.NUM_SHARDS_PROP, CloudDescriptor.NUM_SHARDS) .build(); diff --git a/solr/core/src/java/org/apache/solr/update/processor/DistributedUpdateProcessor.java b/solr/core/src/java/org/apache/solr/update/processor/DistributedUpdateProcessor.java index 796d101e63d..8d9cead1294 100644 --- a/solr/core/src/java/org/apache/solr/update/processor/DistributedUpdateProcessor.java +++ b/solr/core/src/java/org/apache/solr/update/processor/DistributedUpdateProcessor.java @@ -301,7 +301,7 @@ public class DistributedUpdateProcessor extends UpdateRequestProcessor { // Am I the leader of a shard in "construction" state? String myShardId = req.getCore().getCoreDescriptor().getCloudDescriptor().getShardId(); Slice mySlice = coll.getSlice(myShardId); - if (Slice.CONSTRUCTION.equals(mySlice.getState())) { + if (Slice.CONSTRUCTION.equals(mySlice.getState()) || Slice.RECOVERY.equals(mySlice.getState())) { Replica myLeader = zkController.getZkStateReader().getLeaderRetry(collection, myShardId); boolean amILeader = myLeader.getName().equals( req.getCore().getCoreDescriptor().getCloudDescriptor() @@ -326,7 +326,7 @@ public class DistributedUpdateProcessor extends UpdateRequestProcessor { Collection allSlices = coll.getSlices(); List nodes = null; for (Slice aslice : allSlices) { - if (Slice.CONSTRUCTION.equals(aslice.getState())) { + if (Slice.CONSTRUCTION.equals(aslice.getState()) || Slice.RECOVERY.equals(aslice.getState())) { DocRouter.Range myRange = coll.getSlice(shardId).getRange(); if (myRange == null) myRange = new DocRouter.Range(Integer.MIN_VALUE, Integer.MAX_VALUE); boolean isSubset = aslice.getRange() != null && aslice.getRange().isSubsetOf(myRange); @@ -358,9 +358,9 @@ public class DistributedUpdateProcessor extends UpdateRequestProcessor { if (DistribPhase.FROMLEADER == phase && localIsLeader && from != null) { // from will be null on log replay String fromShard = req.getParams().get("distrib.from.parent"); if (fromShard != null) { - if (!Slice.CONSTRUCTION.equals(mySlice.getState())) { + if (Slice.ACTIVE.equals(mySlice.getState())) { throw new SolrException(ErrorCode.SERVICE_UNAVAILABLE, - "Request says it is coming from parent shard leader but we are not in construction state"); + "Request says it is coming from parent shard leader but we are in active state"); } // shard splitting case -- check ranges to see if we are a sub-shard Slice fromSlice = zkController.getClusterState().getCollection(collection).getSlice(fromShard); diff --git a/solr/core/src/test/org/apache/solr/cloud/ShardSplitTest.java b/solr/core/src/test/org/apache/solr/cloud/ShardSplitTest.java index c69b02d2b41..ef0f7ba8d88 100644 --- a/solr/core/src/test/org/apache/solr/cloud/ShardSplitTest.java +++ b/solr/core/src/test/org/apache/solr/cloud/ShardSplitTest.java @@ -198,6 +198,7 @@ public class ShardSplitTest extends BasicDistributedZkTest { } } + waitForRecoveriesToFinish(false); checkDocCountsAndShardStates(docCounts, numReplicas); } @@ -274,6 +275,8 @@ public class ShardSplitTest extends BasicDistributedZkTest { } } + waitForRecoveriesToFinish(collectionName, false); + assertEquals(docCounts[0], collectionClient.query(new SolrQuery("*:*").setParam("shards", "shard1_0")).getResults().getNumFound()); assertEquals(docCounts[1], collectionClient.query(new SolrQuery("*:*").setParam("shards", "shard1_1")).getResults().getNumFound()); } diff --git a/solr/solrj/src/java/org/apache/solr/common/cloud/Slice.java b/solr/solrj/src/java/org/apache/solr/common/cloud/Slice.java index 596a3c8cdcc..da0de340faa 100644 --- a/solr/solrj/src/java/org/apache/solr/common/cloud/Slice.java +++ b/solr/solrj/src/java/org/apache/solr/common/cloud/Slice.java @@ -36,6 +36,8 @@ public class Slice extends ZkNodeProps { public static String ACTIVE = "active"; public static String INACTIVE = "inactive"; public static String CONSTRUCTION = "construction"; + public static String RECOVERY = "recovery"; + public static String PARENT = "parent"; private final String name; private final DocRouter.Range range; @@ -43,6 +45,7 @@ public class Slice extends ZkNodeProps { private final Map replicas; private final Replica leader; private final String state; + private final String parent; /** * @param name The name of the slice @@ -75,6 +78,11 @@ public class Slice extends ZkNodeProps { } **/ + if (propMap.containsKey(PARENT) && propMap.get(PARENT) != null) + this.parent = (String) propMap.get(PARENT); + else + this.parent = null; + replicationFactor = null; // future // add the replicas *after* the other properties (for aesthetics, so it's easy to find slice properties in the JSON output) @@ -150,6 +158,10 @@ public class Slice extends ZkNodeProps { return state; } + public String getParent() { + return parent; + } + @Override public String toString() { return name + ':' + JSONUtil.toJSON(propMap); diff --git a/solr/solrj/src/java/org/apache/solr/common/cloud/ZkStateReader.java b/solr/solrj/src/java/org/apache/solr/common/cloud/ZkStateReader.java index f606599ca50..86483bae821 100644 --- a/solr/solrj/src/java/org/apache/solr/common/cloud/ZkStateReader.java +++ b/solr/solrj/src/java/org/apache/solr/common/cloud/ZkStateReader.java @@ -59,6 +59,7 @@ public class ZkStateReader { public static final String SHARD_ID_PROP = "shard"; public static final String SHARD_RANGE_PROP = "shard_range"; public static final String SHARD_STATE_PROP = "shard_state"; + public static final String SHARD_PARENT_PROP = "shard_parent"; public static final String NUM_SHARDS_PROP = "numShards"; public static final String LEADER_PROP = "leader"; diff --git a/solr/solrj/src/java/org/apache/solr/common/params/CoreAdminParams.java b/solr/solrj/src/java/org/apache/solr/common/params/CoreAdminParams.java index d1ec6865e7e..637785f6b57 100644 --- a/solr/solrj/src/java/org/apache/solr/common/params/CoreAdminParams.java +++ b/solr/solrj/src/java/org/apache/solr/common/params/CoreAdminParams.java @@ -80,6 +80,9 @@ public abstract class CoreAdminParams /** The shard range in solr cloud */ public final static String SHARD_STATE = "shard.state"; + /** The parent shard if applicable */ + public final static String SHARD_PARENT = "shard.parent"; + /** The target core to which a split index should be written to * Multiple targetCores can be specified by multiple targetCore parameters */ public final static String TARGET_CORE = "targetCore";