You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by no...@apache.org on 2015/05/07 15:56:47 UTC
svn commit: r1678212 - in /lucene/dev/branches/branch_5x: ./ solr/
solr/CHANGES.txt solr/core/
solr/core/src/java/org/apache/solr/util/SolrCLI.java
Author: noble
Date: Thu May 7 13:56:47 2015
New Revision: 1678212
URL: http://svn.apache.org/r1678212
Log:
SOLR-7502: start script should not try to create config set for .system collection
Modified:
lucene/dev/branches/branch_5x/ (props changed)
lucene/dev/branches/branch_5x/solr/ (props changed)
lucene/dev/branches/branch_5x/solr/CHANGES.txt (contents, props changed)
lucene/dev/branches/branch_5x/solr/core/ (props changed)
lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/util/SolrCLI.java
Modified: lucene/dev/branches/branch_5x/solr/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/CHANGES.txt?rev=1678212&r1=1678211&r2=1678212&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/CHANGES.txt (original)
+++ lucene/dev/branches/branch_5x/solr/CHANGES.txt Thu May 7 13:56:47 2015
@@ -185,6 +185,8 @@ Bug Fixes
* SOLR-7494: Facet Module - unique() facet function was wildly inaccurate for high cardinality
fields. (Andy Crossen, yonik)
+* SOLR-7502: start script should not try to create configset for .system collection (Noble Paul)
+
Optimizations
----------------------
Modified: lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/util/SolrCLI.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/util/SolrCLI.java?rev=1678212&r1=1678211&r2=1678212&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/util/SolrCLI.java (original)
+++ lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/util/SolrCLI.java Thu May 7 13:56:47 2015
@@ -1199,7 +1199,9 @@ public class SolrCLI {
boolean configExistsInZk =
cloudSolrClient.getZkStateReader().getZkClient().exists("/configs/"+confname, true);
- if (configExistsInZk) {
+ if (".system".equals(collectionName)) {
+ //do nothing
+ } else if (configExistsInZk) {
System.out.println("Re-using existing configuration directory "+confname);
} else {
String configSet = cli.getOptionValue("confdir", DEFAULT_CONFIG_SET);