lucene-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ans...@apache.org
Subject [5/8] lucene-solr:branch_5x: SOLR-8790: Add the node name to core responses in calls from the Overseer
Date Sat, 23 Apr 2016 01:51:42 GMT
SOLR-8790: Add the node name to core responses in calls from the Overseer


Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/cbb29d2a
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/cbb29d2a
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/cbb29d2a

Branch: refs/heads/branch_5x
Commit: cbb29d2a5ae4ab8741aab6c9f0806d4236c0cad0
Parents: 5f471fb
Author: anshum <anshum@apache.org>
Authored: Thu Mar 10 12:22:23 2016 -0800
Committer: anshum <anshum@apache.org>
Committed: Fri Apr 22 18:50:49 2016 -0700

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


http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/cbb29d2a/solr/CHANGES.txt
----------------------------------------------------------------------
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index 37558c2..e2ca3a7 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -125,6 +125,9 @@ Bug Fixes
 * SOLR-8449: Fix the core restore functionality to allow restoring multiple times on the
same core
   (Johannes Brucher, Varun Thacker)
 
+* SOLR-8790: Collections API responses contain node name in the core-level responses that
are
+  returned. (Anshum Gupta)
+
 Other Changes
 ----------------------
 

http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/cbb29d2a/solr/core/src/java/org/apache/solr/cloud/OverseerCollectionMessageHandler.java
----------------------------------------------------------------------
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 7adf25f..10c2bb6 100644
--- a/solr/core/src/java/org/apache/solr/cloud/OverseerCollectionMessageHandler.java
+++ b/solr/core/src/java/org/apache/solr/cloud/OverseerCollectionMessageHandler.java
@@ -1847,6 +1847,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);

http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/cbb29d2a/solr/core/src/test/org/apache/solr/cloud/CollectionsAPISolrJTests.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/cloud/CollectionsAPISolrJTests.java b/solr/core/src/test/org/apache/solr/cloud/CollectionsAPISolrJTests.java
index 557d878..55c45f0 100644
--- a/solr/core/src/test/org/apache/solr/cloud/CollectionsAPISolrJTests.java
+++ b/solr/core/src/test/org/apache/solr/cloud/CollectionsAPISolrJTests.java
@@ -78,6 +78,7 @@ public class CollectionsAPISolrJTests extends AbstractFullDistribZkTestBase
{
             .setConfigName("conf1")
             .setRouterField("myOwnField")
             .setStateFormat(1);
+
     CollectionAdminResponse response = createCollectionRequest.process(cloudClient);
 
     assertEquals(0, response.getStatus());


Mime
View raw message