lucene-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ans...@apache.org
Subject lucene-solr git commit: SOLR-8790: Add the node name to core responses in calls from the Overseer
Date Fri, 11 Mar 2016 01:05:08 GMT
Repository: lucene-solr
Updated Branches:
  refs/heads/branch_6x 77d233bc0 -> 8fe11a06c


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/8fe11a06
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/8fe11a06
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/8fe11a06

Branch: refs/heads/branch_6x
Commit: 8fe11a06ce9e8bfef99184b1849e459b15691bf2
Parents: 77d233b
Author: anshum <anshum@apache.org>
Authored: Thu Mar 10 12:22:23 2016 -0800
Committer: Anshum Gupta <anshum@apache.org>
Committed: Thu Mar 10 16:46:04 2016 -0800

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


http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/8fe11a06/solr/CHANGES.txt
----------------------------------------------------------------------
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index a1b14d6..001138e 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

http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/8fe11a06/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 d7d894b..78db473 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);

http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/8fe11a06/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 9f41c0d..6b0db0f 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());


Mime
View raw message