You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by ma...@apache.org on 2013/04/03 15:58:10 UTC
svn commit: r1464020 - in /lucene/dev/trunk/solr: CHANGES.txt
core/src/test/org/apache/solr/cloud/AliasIntegrationTest.java
solrj/src/java/org/apache/solr/common/cloud/ZkStateReader.java
Author: markrmiller
Date: Wed Apr 3 13:58:10 2013
New Revision: 1464020
URL: http://svn.apache.org/r1464020
Log:
SOLR-4664: ZkStateReader should update aliases on construction.
Modified:
lucene/dev/trunk/solr/CHANGES.txt
lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/AliasIntegrationTest.java
lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/common/cloud/ZkStateReader.java
Modified: lucene/dev/trunk/solr/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/CHANGES.txt?rev=1464020&r1=1464019&r2=1464020&view=diff
==============================================================================
--- lucene/dev/trunk/solr/CHANGES.txt (original)
+++ lucene/dev/trunk/solr/CHANGES.txt Wed Apr 3 13:58:10 2013
@@ -150,6 +150,9 @@ Bug Fixes
* SOLR-4652: Fix broken behavior with shared libraries in resource loader for
solr.xml plugins. (Ryan Ernst, Robert Muir, Uwe Schindler)
+* SOLR-4664: ZkStateReader should update aliases on construction.
+ (Mark Miller, Elodie Sannier)
+
Optimizations
----------------------
Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/AliasIntegrationTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/AliasIntegrationTest.java?rev=1464020&r1=1464019&r2=1464020&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/AliasIntegrationTest.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/AliasIntegrationTest.java Wed Apr 3 13:58:10 2013
@@ -25,6 +25,7 @@ import org.apache.lucene.util.LuceneTest
import org.apache.solr.client.solrj.SolrQuery;
import org.apache.solr.client.solrj.SolrServerException;
import org.apache.solr.client.solrj.embedded.JettySolrRunner;
+import org.apache.solr.client.solrj.impl.CloudSolrServer;
import org.apache.solr.client.solrj.impl.HttpSolrServer;
import org.apache.solr.client.solrj.request.QueryRequest;
import org.apache.solr.client.solrj.request.UpdateRequest;
@@ -150,6 +151,14 @@ public class AliasIntegrationTest extend
// create alias, collection2 first because it's not on every node
createAlias("testalias", "collection2,collection1");
+ // search with new cloud client
+ CloudSolrServer cloudSolrServer = new CloudSolrServer(zkServer.getZkAddress());
+ query = new SolrQuery("*:*");
+ query.set("collection", "testalias");
+ res = cloudSolrServer.query(query);
+ cloudSolrServer.shutdown();
+ assertEquals(5, res.getResults().getNumFound());
+
// search for alias with random non cloud client
query = new SolrQuery("*:*");
query.set("collection", "testalias");
Modified: lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/common/cloud/ZkStateReader.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/common/cloud/ZkStateReader.java?rev=1464020&r1=1464019&r2=1464020&view=diff
==============================================================================
--- lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/common/cloud/ZkStateReader.java (original)
+++ lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/common/cloud/ZkStateReader.java Wed Apr 3 13:58:10 2013
@@ -340,6 +340,7 @@ public class ZkStateReader {
}, true);
}
+ updateAliases();
}