From 8fe11a06ce9e8bfef99184b1849e459b15691bf2 Mon Sep 17 00:00:00 2001
From: anshum <anshum@apache.org>
Date: Thu, 10 Mar 2016 12:22:23 -0800
Subject: [PATCH] SOLR-8790: Add the node name to core responses in calls from
 the Overseer

---
 solr/CHANGES.txt                                               | 3 +++
 .../apache/solr/cloud/OverseerCollectionMessageHandler.java    | 1 +
 .../test/org/apache/solr/cloud/CollectionsAPISolrJTest.java    | 2 +-
 3 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index a1b14d6afdc..001138e6ab2 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -285,6 +285,9 @@ Bug Fixes
 
 * SOLR-8135: If a core reload is fired after a core close, it is not a non-recoverable error (noble)
 
+* SOLR-8790: Collections API responses contain node name in the core-level responses that are
+  returned. (Anshum Gupta)
+
 Optimizations
 ----------------------
 * SOLR-7876: Speed up queries and operations that use many terms when timeAllowed has not been
diff --git a/solr/core/src/java/org/apache/solr/cloud/OverseerCollectionMessageHandler.java b/solr/core/src/java/org/apache/solr/cloud/OverseerCollectionMessageHandler.java
index d7d894bc69b..78db47332f0 100644
--- a/solr/core/src/java/org/apache/solr/cloud/OverseerCollectionMessageHandler.java
+++ b/solr/core/src/java/org/apache/solr/cloud/OverseerCollectionMessageHandler.java
@@ -1743,6 +1743,7 @@ public class OverseerCollectionMessageHandler implements OverseerMessageHandler
     String replica = zkStateReader.getBaseUrlForNodeName(nodeName);
     sreq.shards = new String[]{replica};
     sreq.actualShards = sreq.shards;
+    sreq.nodeName = nodeName;
     sreq.params = params;
 
     shardHandler.submit(sreq, replica, sreq.params);
diff --git a/solr/core/src/test/org/apache/solr/cloud/CollectionsAPISolrJTest.java b/solr/core/src/test/org/apache/solr/cloud/CollectionsAPISolrJTest.java
index 9f41c0df807..6b0db0f151f 100644
--- a/solr/core/src/test/org/apache/solr/cloud/CollectionsAPISolrJTest.java
+++ b/solr/core/src/test/org/apache/solr/cloud/CollectionsAPISolrJTest.java
@@ -54,7 +54,6 @@ import static org.apache.solr.cloud.ReplicaPropertiesBase.verifyUniqueAcrossColl
 public class CollectionsAPISolrJTest extends AbstractFullDistribZkTestBase {
 
   @Test
-  @Ignore
   public void test() throws Exception {
     testCreateAndDeleteCollection();
     testCreateAndDeleteShard();
@@ -80,6 +79,7 @@ public class CollectionsAPISolrJTest extends AbstractFullDistribZkTestBase {
             .setConfigName("conf1")
             .setRouterField("myOwnField")
             .setStateFormat(1);
+
     CollectionAdminResponse response = createCollectionRequest.process(cloudClient);
 
     assertEquals(0, response.getStatus());