You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by ho...@apache.org on 2016/03/12 01:27:19 UTC
[38/50] [abbrv] lucene-solr git commit: SOLR-8790: Add the node name
to core responses in calls from the Overseer
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/209f5c29
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/209f5c29
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/209f5c29
Branch: refs/heads/jira/SOLR-445
Commit: 209f5c2946c8816a7ab175dc5e886ea661d154a5
Parents: 937a414
Author: anshum <an...@apache.org>
Authored: Thu Mar 10 12:22:23 2016 -0800
Committer: anshum <an...@apache.org>
Committed: Thu Mar 10 16:20:44 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/209f5c29/solr/CHANGES.txt
----------------------------------------------------------------------
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index 2d4ddff..4e969bf 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -286,6 +286,9 @@ Bug Fixes
other than count, resulted in incorrect results. This has been fixed, and facet.prefix
support for facet.method=uif has been enabled. (Mikhail Khludnev, 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/209f5c29/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/209f5c29/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());