Apache Solr open-source search software
SOLR-15157: rename getShardHandler into newShardHandler in CollectionCommandContext (#62)
Ilan Ginzburg51e749d40486
diff --git a/solr/core/src/java/org/apache/solr/cloud/api/collections/AddReplicaCmd.java b/solr/core/src/java/org/apache/solr/cloud/api/collections/AddReplicaCmd.javaindex d2c7261144d..6d4522116a9 100644--- a/solr/core/src/java/org/apache/solr/cloud/api/collections/AddReplicaCmd.java+++ b/solr/core/src/java/org/apache/solr/cloud/api/collections/AddReplicaCmd.java@@ -148,7 +148,7 @@ public class AddReplicaCmd implements CollApiCmds.CollectionApiCommand {.collect(Collectors.toList());- ShardHandler shardHandler = ccc.getShardHandler();+ ShardHandler shardHandler = ccc.newShardHandler();ZkStateReader zkStateReader = ccc.getZkStateReader();final ShardRequestTracker shardRequestTracker = CollectionHandlingUtils.asyncRequestTracker(asyncId, ccc);diff --git a/solr/core/src/java/org/apache/solr/cloud/api/collections/BackupCmd.java b/solr/core/src/java/org/apache/solr/cloud/api/collections/BackupCmd.javaindex 72dfe5d6cad..4db33c340cd 100644--- a/solr/core/src/java/org/apache/solr/cloud/api/collections/BackupCmd.java+++ b/solr/core/src/java/org/apache/solr/cloud/api/collections/BackupCmd.java@@ -210,7 +210,7 @@ public class BackupCmd implements CollApiCmds.CollectionApiCommand {String backupName = request.getStr(NAME);String asyncId = request.getStr(ASYNC);String repoName = request.getStr(CoreAdminParams.BACKUP_REPOSITORY);- ShardHandler shardHandler = ccc.getShardHandler();+ ShardHandler shardHandler = ccc.newShardHandler();log.info("Starting backup of collection={} with backupName={} at location={}", collectionName, backupName,backupUri);@@ -293,7 +293,7 @@ public class BackupCmd implements CollApiCmds.CollectionApiCommand {String backupName = request.getStr(NAME);String asyncId = request.getStr(ASYNC);String repoName = request.getStr(CoreAdminParams.BACKUP_REPOSITORY);- ShardHandler shardHandler = ccc.getShardHandler();+ ShardHandler shardHandler = ccc.newShardHandler();String commitName = request.getStr(CoreAdminParams.COMMIT_NAME);Optional<CollectionSnapshotMetaData> snapshotMeta = Optional.empty();diff --git a/solr/core/src/java/org/apache/solr/cloud/api/collections/CollApiCmds.java b/solr/core/src/java/org/apache/solr/cloud/api/collections/CollApiCmds.javaindex 433e8bb434d..8acb7024c09 100644--- a/solr/core/src/java/org/apache/solr/cloud/api/collections/CollApiCmds.java+++ b/solr/core/src/java/org/apache/solr/cloud/api/collections/CollApiCmds.java@@ -138,7 +138,7 @@ public class CollApiCmds {sreq.shards = new String[]{baseUrl};sreq.actualShards = sreq.shards;sreq.params = params;- ShardHandler shardHandler = ccc.getShardHandler();+ ShardHandler shardHandler = ccc.newShardHandler();shardHandler.submit(sreq, baseUrl, sreq.params);}}diff --git a/solr/core/src/java/org/apache/solr/cloud/api/collections/CollectionCommandContext.java b/solr/core/src/java/org/apache/solr/cloud/api/collections/CollectionCommandContext.javaindex 323f230b531..b9fe9bd34d2 100644--- a/solr/core/src/java/org/apache/solr/cloud/api/collections/CollectionCommandContext.java+++ b/solr/core/src/java/org/apache/solr/cloud/api/collections/CollectionCommandContext.java@@ -37,7 +37,7 @@ import java.util.concurrent.ExecutorService;* distributed way, unrelated to and not depending upon Overseer abstractions (including overseer collection message handling).*/public interface CollectionCommandContext {- ShardHandler getShardHandler();+ ShardHandler newShardHandler();SolrCloudManager getSolrCloudManager();ZkStateReader getZkStateReader();@@ -46,7 +46,7 @@ public interface CollectionCommandContext {CoreContainer getCoreContainer();default ShardRequestTracker asyncRequestTracker(String asyncId) {- return new ShardRequestTracker(asyncId, getAdminPath(), getZkStateReader(), getShardHandler().getShardHandlerFactory());+ return new ShardRequestTracker(asyncId, getAdminPath(), getZkStateReader(), newShardHandler().getShardHandlerFactory());}/**diff --git a/solr/core/src/java/org/apache/solr/cloud/api/collections/CollectionHandlingUtils.java b/solr/core/src/java/org/apache/solr/cloud/api/collections/CollectionHandlingUtils.javaindex a52d9edea58..b3358a4d28a 100644--- a/solr/core/src/java/org/apache/solr/cloud/api/collections/CollectionHandlingUtils.java+++ b/solr/core/src/java/org/apache/solr/cloud/api/collections/CollectionHandlingUtils.java@@ -336,7 +336,7 @@ public class CollectionHandlingUtils {CollectionCommandContext ccc, ClusterState clusterState) {log.info("Executing Collection Cmd={}, asyncId={}", params, asyncId);String collectionName = message.getStr(NAME);- ShardHandler shardHandler = ccc.getShardHandler();+ ShardHandler shardHandler = ccc.newShardHandler();DocCollection coll = clusterState.getCollection(collectionName);List<Replica> notLivesReplicas = new ArrayList<>();final CollectionHandlingUtils.ShardRequestTracker shardRequestTracker = asyncRequestTracker(asyncId, ccc);@@ -463,7 +463,7 @@ public class CollectionHandlingUtils {}public static ShardRequestTracker asyncRequestTracker(String asyncId, CollectionCommandContext ccc) {- return new ShardRequestTracker(asyncId, ccc.getAdminPath(), ccc.getZkStateReader(), ccc.getShardHandler().getShardHandlerFactory());+ return new ShardRequestTracker(asyncId, ccc.getAdminPath(), ccc.getZkStateReader(), ccc.newShardHandler().getShardHandlerFactory());}public static class ShardRequestTracker {diff --git a/solr/core/src/java/org/apache/solr/cloud/api/collections/CreateCollectionCmd.java b/solr/core/src/java/org/apache/solr/cloud/api/collections/CreateCollectionCmd.javaindex a6e3bbde861..f5e8c1e159b 100644--- a/solr/core/src/java/org/apache/solr/cloud/api/collections/CreateCollectionCmd.java+++ b/solr/core/src/java/org/apache/solr/cloud/api/collections/CreateCollectionCmd.java@@ -221,7 +221,7 @@ public class CreateCollectionCmd implements CollApiCmds.CollectionApiCommand {collectionName, shardNames, message));}Map<String,ShardRequest> coresToCreate = new LinkedHashMap<>();- ShardHandler shardHandler = ccc.getShardHandler();+ ShardHandler shardHandler = ccc.newShardHandler();final DistributedClusterStateUpdater.StateChangeRecorder scr;// PRS collections update Zookeeper directly, so even if we run in distributed state update,diff --git a/solr/core/src/java/org/apache/solr/cloud/api/collections/CreateSnapshotCmd.java b/solr/core/src/java/org/apache/solr/cloud/api/collections/CreateSnapshotCmd.javaindex edcce5c8a5e..3c6caa77368 100644--- a/solr/core/src/java/org/apache/solr/cloud/api/collections/CreateSnapshotCmd.java+++ b/solr/core/src/java/org/apache/solr/cloud/api/collections/CreateSnapshotCmd.java@@ -96,7 +96,7 @@ public class CreateSnapshotCmd implements CollApiCmds.CollectionApiCommand {@SuppressWarnings({"rawtypes"})NamedList shardRequestResults = new NamedList();Map<String, Slice> shardByCoreName = new HashMap<>();- ShardHandler shardHandler = ccc.getShardHandler();+ ShardHandler shardHandler = ccc.newShardHandler();final ShardRequestTracker shardRequestTracker = CollectionHandlingUtils.asyncRequestTracker(asyncId, ccc);for (Slice slice : ccc.getZkStateReader().getClusterState().getCollection(collectionName).getSlices()) {diff --git a/solr/core/src/java/org/apache/solr/cloud/api/collections/DeleteReplicaCmd.java b/solr/core/src/java/org/apache/solr/cloud/api/collections/DeleteReplicaCmd.javaindex b2e2cae91e7..4e25dbd6e76 100644--- a/solr/core/src/java/org/apache/solr/cloud/api/collections/DeleteReplicaCmd.java+++ b/solr/core/src/java/org/apache/solr/cloud/api/collections/DeleteReplicaCmd.java@@ -257,7 +257,7 @@ public class DeleteReplicaCmd implements CollectionApiCommand {assignStrategy.verifyDeleteReplicas(ccc.getSolrCloudManager(), coll, shardId, Set.of(replica));}- ShardHandler shardHandler = ccc.getShardHandler();+ ShardHandler shardHandler = ccc.newShardHandler();String core = replica.getStr(ZkStateReader.CORE_NAME_PROP);String asyncId = message.getStr(ASYNC);diff --git a/solr/core/src/java/org/apache/solr/cloud/api/collections/DeleteSnapshotCmd.java b/solr/core/src/java/org/apache/solr/cloud/api/collections/DeleteSnapshotCmd.javaindex ad4bc3a97b8..f0d79e3cb8b 100644--- a/solr/core/src/java/org/apache/solr/cloud/api/collections/DeleteSnapshotCmd.java+++ b/solr/core/src/java/org/apache/solr/cloud/api/collections/DeleteSnapshotCmd.java@@ -77,7 +77,7 @@ public class DeleteSnapshotCmd implements CollApiCmds.CollectionApiCommand {String asyncId = message.getStr(ASYNC);@SuppressWarnings({"rawtypes"})NamedList shardRequestResults = new NamedList();- ShardHandler shardHandler = ccc.getShardHandler();+ ShardHandler shardHandler = ccc.newShardHandler();SolrZkClient zkClient = ccc.getZkStateReader().getZkClient();Optional<CollectionSnapshotMetaData> meta = SolrSnapshotManager.getCollectionLevelSnapshot(zkClient, collectionName, commitName);diff --git a/solr/core/src/java/org/apache/solr/cloud/api/collections/MigrateCmd.java b/solr/core/src/java/org/apache/solr/cloud/api/collections/MigrateCmd.javaindex 0b832ca11d7..80818a8cf49 100644--- a/solr/core/src/java/org/apache/solr/cloud/api/collections/MigrateCmd.java+++ b/solr/core/src/java/org/apache/solr/cloud/api/collections/MigrateCmd.java@@ -156,7 +156,7 @@ public class MigrateCmd implements CollApiCmds.CollectionApiCommand {CompositeIdRouter sourceRouter = (CompositeIdRouter) sourceCollection.getRouter();DocRouter.Range keyHashRange = sourceRouter.keyHashRange(splitKey);- ShardHandler shardHandler = ccc.getShardHandler();+ ShardHandler shardHandler = ccc.newShardHandler();log.info("Hash range for split.key: {} is: {}", splitKey, keyHashRange);// intersect source range, keyHashRange and target rangediff --git a/solr/core/src/java/org/apache/solr/cloud/api/collections/OcmhCollectionCommandContext.java b/solr/core/src/java/org/apache/solr/cloud/api/collections/OcmhCollectionCommandContext.javaindex 83e0abe32fe..582c4738c8a 100644--- a/solr/core/src/java/org/apache/solr/cloud/api/collections/OcmhCollectionCommandContext.java+++ b/solr/core/src/java/org/apache/solr/cloud/api/collections/OcmhCollectionCommandContext.java@@ -40,7 +40,7 @@ public class OcmhCollectionCommandContext implements CollectionCommandContext {}@Override- public ShardHandler getShardHandler() {+ public ShardHandler newShardHandler() {return ocmh.shardHandlerFactory.getShardHandler();}diff --git a/solr/core/src/java/org/apache/solr/cloud/api/collections/RestoreCmd.java b/solr/core/src/java/org/apache/solr/cloud/api/collections/RestoreCmd.javaindex d8c1dcb3a6f..1ee8c180097 100644--- a/solr/core/src/java/org/apache/solr/cloud/api/collections/RestoreCmd.java+++ b/solr/core/src/java/org/apache/solr/cloud/api/collections/RestoreCmd.java@@ -181,7 +181,7 @@ public class RestoreCmd implements CollApiCmds.CollectionApiCommand {this.restoreConfigName = message.getStr(CollectionAdminParams.COLL_CONF, this.backupProperties.getConfigName());this.backupCollectionState = this.backupManager.readCollectionState(this.backupCollection);- this.shardHandler = ccc.getShardHandler();+ this.shardHandler = ccc.newShardHandler();this.nodeList = Assign.getLiveOrLiveAndCreateNodeSetList(zkStateReader.getClusterState().getLiveNodes(), message, CollectionHandlingUtils.RANDOM);}diff --git a/solr/core/src/java/org/apache/solr/cloud/api/collections/SplitShardCmd.java b/solr/core/src/java/org/apache/solr/cloud/api/collections/SplitShardCmd.javaindex 1922843934b..dcdb5ec9e5e 100644--- a/solr/core/src/java/org/apache/solr/cloud/api/collections/SplitShardCmd.java+++ b/solr/core/src/java/org/apache/solr/cloud/api/collections/SplitShardCmd.java@@ -189,7 +189,7 @@ public class SplitShardCmd implements CollApiCmds.CollectionApiCommand {List<Map<String, Object>> replicas = new ArrayList<>((repFactor - 1) * 2);@SuppressWarnings("deprecation")- ShardHandler shardHandler = ccc.getShardHandler();+ ShardHandler shardHandler = ccc.newShardHandler();if (message.getBool(CommonAdminParams.SPLIT_BY_PREFIX, false)) {