lucene-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ans...@apache.org
Subject [3/3] lucene-solr:branch_6_0: SOLR-8790: Add the node name to core responses in calls from the Overseer
Date Tue, 15 Mar 2016 19:51:10 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/b4d52d60
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/b4d52d60
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/b4d52d60

Branch: refs/heads/branch_6_0
Commit: b4d52d60ac4413f7bd0cd83bcc3c94a00c6dcddf
Parents: 2ff013c
Author: anshum <anshum@apache.org>
Authored: Thu Mar 10 12:22:23 2016 -0800
Committer: anshum <anshum@apache.org>
Committed: Tue Mar 15 12:27:51 2016 -0700

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


http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/b4d52d60/solr/CHANGES.txt
----------------------------------------------------------------------
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index 37e2819..f9321d0 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -265,6 +265,9 @@ Bug Fixes
 * SOLR-8835: JSON Facet API: fix faceting exception on multi-valued numeric fields that
   have docValues. (yonik)
 
+* 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

http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/b4d52d60/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 c867b04..7ab51d2 100644
--- a/solr/core/src/java/org/apache/solr/cloud/OverseerCollectionMessageHandler.java
+++ b/solr/core/src/java/org/apache/solr/cloud/OverseerCollectionMessageHandler.java
@@ -1746,6 +1746,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/b4d52d60/solr/core/src/test/org/apache/solr/cloud/CollectionsAPISolrJTest.java
----------------------------------------------------------------------
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 fb7247a..d346faa 100644
--- a/solr/core/src/test/org/apache/solr/cloud/CollectionsAPISolrJTest.java
+++ b/solr/core/src/test/org/apache/solr/cloud/CollectionsAPISolrJTest.java
@@ -78,6 +78,7 @@ public class CollectionsAPISolrJTest extends AbstractFullDistribZkTestBase
{
             .setConfigName("conf1")
             .setRouterField("myOwnField")
             .setStateFormat(1);
+
     CollectionAdminResponse response = createCollectionRequest.process(cloudClient);
 
     assertEquals(0, response.getStatus());


Mime
View raw message