SOLR-18081: ShardRequestTracker should use a unique key for requests (#4068)

Author: HoustonPutman

changelog/unreleased/solr-18081-shard-request-tracker-replica-name.yml

@@ -0,0 +1,9 @@
+# See https://github.com/apache/solr/blob/main/dev-docs/changelog.adoc
+title: ShardRequestTracker now indexes Admin API results by node and replica rather than just node. This fixes situations where multiple sub-requests are sent to a single node.
+type: fixed # added, changed, fixed, deprecated, removed, dependency_update, security, other
+authors:
+  - name: Houston Putman
+    nick: HoustonPutman
+links:
+  - name: SOLR-18081
+    url: https://issues.apache.org/jira/browse/SOLR-18081

solr/core/src/java/org/apache/solr/cloud/api/collections/AddReplicaCmd.java

@@ -175,7 +175,8 @@ List<ZkNodeProps> addReplica(
       ModifiableSolrParams params =
           getReplicaParams(
               message, collectionName, coll, skipCreateReplicaInClusterState, createReplica);
-      shardRequestTracker.sendShardRequest(createReplica.node, params, shardHandler);
+      shardRequestTracker.sendShardRequest(
+          createReplica.node, createReplica.coreNodeName, params, shardHandler);
     }
 
     Runnable runnable =

solr/core/src/java/org/apache/solr/cloud/api/collections/BackupCmd.java

@@ -350,7 +350,7 @@ private void incrementalCopyIndexFiles(
               slice.getName(), backupManager.getBackupId().getId());
       params.set(CoreAdminParams.SHARD_BACKUP_ID, shardBackupId.getIdAsString());
 
-      shardRequestTracker.sendShardRequest(replica.getNodeName(), params, shardHandler);
+      shardRequestTracker.sendShardRequest(replica, params, shardHandler);
       log.debug("Sent backup request to core={} for backupName={}", coreName, backupName);
     }
     log.debug("Sent backup requests to all shard leaders for backupName={}", backupName);
@@ -532,7 +532,7 @@ private void copyIndexFiles(
         params.set(CoreAdminParams.COMMIT_NAME, snapshotMeta.get().getName());
       }
 
-      shardRequestTracker.sendShardRequest(replica.getNodeName(), params, shardHandler);
+      shardRequestTracker.sendShardRequest(replica, params, shardHandler);
       log.debug("Sent backup request to core={} for backupName={}", coreName, backupName);
     }
     log.debug("Sent backup requests to all shard leaders for backupName={}", backupName);

solr/core/src/java/org/apache/solr/cloud/api/collections/CollApiCmds.java

@@ -314,7 +314,8 @@ public void call(AdminCmdContext clusterState, ZkNodeProps message, NamedList<Ob
 
       String baseUrl = ccc.getZkStateReader().getBaseUrlForNodeName(message.getStr(NODE_NAME_PROP));
       ShardRequest sreq = new ShardRequest();
-      sreq.nodeName = message.getStr(ZkStateReader.CORE_NAME_PROP);
+      sreq.nodeName = message.getStr(NODE_NAME_PROP);
+      sreq.coreNodeName = message.getStr(CORE_NODE_NAME_PROP);
       // yes, they must use same admin handler path everywhere...
       params.set("qt", ccc.getAdminPath());
       sreq.purpose = ShardRequest.PURPOSE_PRIVATE;