You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by er...@apache.org on 2016/07/07 04:01:10 UTC
lucene-solr:master: SOLR-9277: Clean up some more remnants of
supporting old and new style solr.xml in tests
Repository: lucene-solr
Updated Branches:
refs/heads/master 2bd6c4ecd -> 7743718d2
SOLR-9277: Clean up some more remnants of supporting old and new style solr.xml in tests
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/7743718d
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/7743718d
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/7743718d
Branch: refs/heads/master
Commit: 7743718d2982c7360911dddb2b4723cb52b58925
Parents: 2bd6c4e
Author: Erick <er...@apache.org>
Authored: Wed Jul 6 19:51:06 2016 -0700
Committer: Erick <er...@apache.org>
Committed: Wed Jul 6 19:51:06 2016 -0700
----------------------------------------------------------------------
solr/CHANGES.txt | 2 +
solr/core/src/test-files/solr/solr-no-core.xml | 45 --------------------
solr/core/src/test-files/solr/solr.xml | 3 ++
.../solr/cloud/CollectionStateFormat2Test.java | 2 +-
.../cloud/CollectionsAPIDistributedZkTest.java | 2 +-
.../apache/solr/cloud/CustomCollectionTest.java | 2 +-
.../DeleteLastCustomShardedReplicaTest.java | 2 +-
.../apache/solr/cloud/DeleteReplicaTest.java | 2 +-
.../apache/solr/cloud/OverseerRolesTest.java | 2 +-
.../cloud/SharedFSAutoReplicaFailoverTest.java | 4 +-
.../solr/cloud/TestMiniSolrCloudCluster.java | 2 +-
.../solr/cloud/UnloadDistributedZkTest.java | 2 +-
.../solr/cloud/hdfs/HdfsNNFailoverTest.java | 2 +-
.../HdfsWriteToMultipleCollectionsTest.java | 2 +-
.../apache/solr/cloud/hdfs/StressHdfsTest.java | 2 +-
.../handler/admin/CoreAdminHandlerTest.java | 2 +-
.../java/org/apache/solr/SolrTestCaseJ4.java | 13 ++----
17 files changed, 22 insertions(+), 69 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/7743718d/solr/CHANGES.txt
----------------------------------------------------------------------
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index 20f0919..97bf7f5 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -154,6 +154,8 @@ Other Changes
* SOLR-7930: Comment out trappy references to example docs in elevate.xml files (Erick Erickson)
+* SOLR-9277: Clean up some more remnants of supporting old and new style solr.xml in tests (Erick Erickson)
+
================== 6.1.0 ==================
Consult the LUCENE_CHANGES.txt file for additional, low level, changes in this release.
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/7743718d/solr/core/src/test-files/solr/solr-no-core.xml
----------------------------------------------------------------------
diff --git a/solr/core/src/test-files/solr/solr-no-core.xml b/solr/core/src/test-files/solr/solr-no-core.xml
deleted file mode 100644
index 52d3e76..0000000
--- a/solr/core/src/test-files/solr/solr-no-core.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-
-<solr>
-
- <str name="shareSchema">${shareSchema:false}</str>
- <str name="configSetBaseDir">${configSetBaseDir:configsets}</str>
- <str name="coreRootDirectory">${coreRootDirectory:.}</str>
-
- <solrcloud>
- <str name="host">127.0.0.1</str>
- <str name="hostContext">${hostContext:solr}</str>
- <int name="hostPort">${hostPort:8983}</int>
- <int name="zkClientTimeout">${solr.zkclienttimeout:30000}</int>
- <bool name="genericCoreNodeNames">${genericCoreNodeNames:true}</bool>
- <int name="distribUpdateConnTimeout">${distribUpdateConnTimeout:45000}</int>
- <int name="distribUpdateSoTimeout">${distribUpdateSoTimeout:340000}</int>
- <int name="autoReplicaFailoverWaitAfterExpiration">${autoReplicaFailoverWaitAfterExpiration:10000}</int>
- <int name="autoReplicaFailoverWorkLoopDelay">${autoReplicaFailoverWorkLoopDelay:10000}</int>
- <int name="autoReplicaFailoverBadNodeExpiration">${autoReplicaFailoverBadNodeExpiration:60000}</int>
- </solrcloud>
-
- <shardHandlerFactory name="shardHandlerFactory"
- class="HttpShardHandlerFactory">
- <str name="urlScheme">${urlScheme:}</str>
- <int name="socketTimeout">${socketTimeout:90000}</int>
- <int name="connTimeout">${connTimeout:15000}</int>
- </shardHandlerFactory>
-
-</solr>
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/7743718d/solr/core/src/test-files/solr/solr.xml
----------------------------------------------------------------------
diff --git a/solr/core/src/test-files/solr/solr.xml b/solr/core/src/test-files/solr/solr.xml
index 379eff9..f381475 100644
--- a/solr/core/src/test-files/solr/solr.xml
+++ b/solr/core/src/test-files/solr/solr.xml
@@ -40,6 +40,9 @@
<int name="leaderVoteWait">${leaderVoteWait:10000}</int>
<int name="distribUpdateConnTimeout">${distribUpdateConnTimeout:45000}</int>
<int name="distribUpdateSoTimeout">${distribUpdateSoTimeout:340000}</int>
+ <int name="autoReplicaFailoverWaitAfterExpiration">${autoReplicaFailoverWaitAfterExpiration:10000}</int>
+ <int name="autoReplicaFailoverWorkLoopDelay">${autoReplicaFailoverWorkLoopDelay:10000}</int>
+ <int name="autoReplicaFailoverBadNodeExpiration">${autoReplicaFailoverBadNodeExpiration:60000}</int>
</solrcloud>
</solr>
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/7743718d/solr/core/src/test/org/apache/solr/cloud/CollectionStateFormat2Test.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/cloud/CollectionStateFormat2Test.java b/solr/core/src/test/org/apache/solr/cloud/CollectionStateFormat2Test.java
index 3a83e47..9b22365 100644
--- a/solr/core/src/test/org/apache/solr/cloud/CollectionStateFormat2Test.java
+++ b/solr/core/src/test/org/apache/solr/cloud/CollectionStateFormat2Test.java
@@ -29,7 +29,7 @@ import org.junit.Test;
public class CollectionStateFormat2Test extends AbstractFullDistribZkTestBase {
protected String getSolrXml() {
- return "solr-no-core.xml";
+ return "solr.xml";
}
@Test
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/7743718d/solr/core/src/test/org/apache/solr/cloud/CollectionsAPIDistributedZkTest.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/cloud/CollectionsAPIDistributedZkTest.java b/solr/core/src/test/org/apache/solr/cloud/CollectionsAPIDistributedZkTest.java
index f77829d1..826a8e5 100644
--- a/solr/core/src/test/org/apache/solr/cloud/CollectionsAPIDistributedZkTest.java
+++ b/solr/core/src/test/org/apache/solr/cloud/CollectionsAPIDistributedZkTest.java
@@ -144,7 +144,7 @@ public class CollectionsAPIDistributedZkTest extends AbstractFullDistribZkTestBa
}
protected String getSolrXml() {
- return "solr-no-core.xml";
+ return "solr.xml";
}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/7743718d/solr/core/src/test/org/apache/solr/cloud/CustomCollectionTest.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/cloud/CustomCollectionTest.java b/solr/core/src/test/org/apache/solr/cloud/CustomCollectionTest.java
index 0873fa3..7b9e9e4 100644
--- a/solr/core/src/test/org/apache/solr/cloud/CustomCollectionTest.java
+++ b/solr/core/src/test/org/apache/solr/cloud/CustomCollectionTest.java
@@ -68,7 +68,7 @@ public class CustomCollectionTest extends AbstractFullDistribZkTestBase {
private static final boolean DEBUG = false;
protected String getSolrXml() {
- return "solr-no-core.xml";
+ return "solr.xml";
}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/7743718d/solr/core/src/test/org/apache/solr/cloud/DeleteLastCustomShardedReplicaTest.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/cloud/DeleteLastCustomShardedReplicaTest.java b/solr/core/src/test/org/apache/solr/cloud/DeleteLastCustomShardedReplicaTest.java
index 8be64a4..dcc99a4 100644
--- a/solr/core/src/test/org/apache/solr/cloud/DeleteLastCustomShardedReplicaTest.java
+++ b/solr/core/src/test/org/apache/solr/cloud/DeleteLastCustomShardedReplicaTest.java
@@ -50,7 +50,7 @@ public class DeleteLastCustomShardedReplicaTest extends AbstractFullDistribZkTes
private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
protected String getSolrXml() {
- return "solr-no-core.xml";
+ return "solr.xml";
}
public DeleteLastCustomShardedReplicaTest() {
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/7743718d/solr/core/src/test/org/apache/solr/cloud/DeleteReplicaTest.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/cloud/DeleteReplicaTest.java b/solr/core/src/test/org/apache/solr/cloud/DeleteReplicaTest.java
index bb8d3be..403f14b 100644
--- a/solr/core/src/test/org/apache/solr/cloud/DeleteReplicaTest.java
+++ b/solr/core/src/test/org/apache/solr/cloud/DeleteReplicaTest.java
@@ -57,7 +57,7 @@ public class DeleteReplicaTest extends AbstractFullDistribZkTestBase {
private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
protected String getSolrXml() {
- return "solr-no-core.xml";
+ return "solr.xml";
}
public DeleteReplicaTest() {
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/7743718d/solr/core/src/test/org/apache/solr/cloud/OverseerRolesTest.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/cloud/OverseerRolesTest.java b/solr/core/src/test/org/apache/solr/cloud/OverseerRolesTest.java
index 8e2cafe..dec54d9 100644
--- a/solr/core/src/test/org/apache/solr/cloud/OverseerRolesTest.java
+++ b/solr/core/src/test/org/apache/solr/cloud/OverseerRolesTest.java
@@ -58,7 +58,7 @@ public class OverseerRolesTest extends AbstractFullDistribZkTestBase{
private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
protected String getSolrXml() {
- return "solr-no-core.xml";
+ return "solr.xml";
}
public OverseerRolesTest() {
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/7743718d/solr/core/src/test/org/apache/solr/cloud/SharedFSAutoReplicaFailoverTest.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/cloud/SharedFSAutoReplicaFailoverTest.java b/solr/core/src/test/org/apache/solr/cloud/SharedFSAutoReplicaFailoverTest.java
index 6fbb58b..79fc89c 100644
--- a/solr/core/src/test/org/apache/solr/cloud/SharedFSAutoReplicaFailoverTest.java
+++ b/solr/core/src/test/org/apache/solr/cloud/SharedFSAutoReplicaFailoverTest.java
@@ -90,7 +90,7 @@ public class SharedFSAutoReplicaFailoverTest extends AbstractFullDistribZkTestBa
}
protected String getSolrXml() {
- return "solr-no-core.xml";
+ return "solr.xml";
}
@@ -219,7 +219,7 @@ public class SharedFSAutoReplicaFailoverTest extends AbstractFullDistribZkTestBa
ChaosMonkey.stop(jettys.get(3));
- //solr-no-core.xml has defined workLoopDelay=10s and waitAfterExpiration=10s
+ //solr.xml has defined workLoopDelay=10s and waitAfterExpiration=10s
//Hence waiting for 30 seconds to be on the safe side.
Thread.sleep(30000);
//Ensures that autoAddReplicas has not kicked in.
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/7743718d/solr/core/src/test/org/apache/solr/cloud/TestMiniSolrCloudCluster.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/cloud/TestMiniSolrCloudCluster.java b/solr/core/src/test/org/apache/solr/cloud/TestMiniSolrCloudCluster.java
index 880051b..00dbfd0 100644
--- a/solr/core/src/test/org/apache/solr/cloud/TestMiniSolrCloudCluster.java
+++ b/solr/core/src/test/org/apache/solr/cloud/TestMiniSolrCloudCluster.java
@@ -471,7 +471,7 @@ public class TestMiniSolrCloudCluster extends LuceneTestCase {
final SegmentTerminateEarlyTestState tstes = new SegmentTerminateEarlyTestState();
- File solrXml = new File(SolrTestCaseJ4.TEST_HOME(), "solr-no-core.xml");
+ File solrXml = new File(SolrTestCaseJ4.TEST_HOME(), "solr.xml");
Builder jettyConfig = JettyConfig.builder();
jettyConfig.waitForLoadingCoresToFinish(null);
final MiniSolrCloudCluster miniCluster = createMiniSolrCloudCluster();
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/7743718d/solr/core/src/test/org/apache/solr/cloud/UnloadDistributedZkTest.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/cloud/UnloadDistributedZkTest.java b/solr/core/src/test/org/apache/solr/cloud/UnloadDistributedZkTest.java
index 616cd37..ccdd958 100644
--- a/solr/core/src/test/org/apache/solr/cloud/UnloadDistributedZkTest.java
+++ b/solr/core/src/test/org/apache/solr/cloud/UnloadDistributedZkTest.java
@@ -54,7 +54,7 @@ import java.util.concurrent.TimeUnit;
public class UnloadDistributedZkTest extends BasicDistributedZkTest {
protected String getSolrXml() {
- return "solr-no-core.xml";
+ return "solr.xml";
}
public UnloadDistributedZkTest() {
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/7743718d/solr/core/src/test/org/apache/solr/cloud/hdfs/HdfsNNFailoverTest.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/cloud/hdfs/HdfsNNFailoverTest.java b/solr/core/src/test/org/apache/solr/cloud/hdfs/HdfsNNFailoverTest.java
index 6e510de..349db11 100644
--- a/solr/core/src/test/org/apache/solr/cloud/hdfs/HdfsNNFailoverTest.java
+++ b/solr/core/src/test/org/apache/solr/cloud/hdfs/HdfsNNFailoverTest.java
@@ -61,7 +61,7 @@ public class HdfsNNFailoverTest extends BasicDistributedZkTest {
}
protected String getSolrXml() {
- return "solr-no-core.xml";
+ return "solr.xml";
}
@Test
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/7743718d/solr/core/src/test/org/apache/solr/cloud/hdfs/HdfsWriteToMultipleCollectionsTest.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/cloud/hdfs/HdfsWriteToMultipleCollectionsTest.java b/solr/core/src/test/org/apache/solr/cloud/hdfs/HdfsWriteToMultipleCollectionsTest.java
index 043cdec..2005978 100644
--- a/solr/core/src/test/org/apache/solr/cloud/hdfs/HdfsWriteToMultipleCollectionsTest.java
+++ b/solr/core/src/test/org/apache/solr/cloud/hdfs/HdfsWriteToMultipleCollectionsTest.java
@@ -86,7 +86,7 @@ public class HdfsWriteToMultipleCollectionsTest extends BasicDistributedZkTest {
}
protected String getSolrXml() {
- return "solr-no-core.xml";
+ return "solr.xml";
}
@Test
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/7743718d/solr/core/src/test/org/apache/solr/cloud/hdfs/StressHdfsTest.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/cloud/hdfs/StressHdfsTest.java b/solr/core/src/test/org/apache/solr/cloud/hdfs/StressHdfsTest.java
index b2dba10..58ee708 100644
--- a/solr/core/src/test/org/apache/solr/cloud/hdfs/StressHdfsTest.java
+++ b/solr/core/src/test/org/apache/solr/cloud/hdfs/StressHdfsTest.java
@@ -91,7 +91,7 @@ public class StressHdfsTest extends BasicDistributedZkTest {
}
protected String getSolrXml() {
- return "solr-no-core.xml";
+ return "solr.xml";
}
@Test
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/7743718d/solr/core/src/test/org/apache/solr/handler/admin/CoreAdminHandlerTest.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/handler/admin/CoreAdminHandlerTest.java b/solr/core/src/test/org/apache/solr/handler/admin/CoreAdminHandlerTest.java
index 3d4a51d..af5bbc9 100644
--- a/solr/core/src/test/org/apache/solr/handler/admin/CoreAdminHandlerTest.java
+++ b/solr/core/src/test/org/apache/solr/handler/admin/CoreAdminHandlerTest.java
@@ -248,7 +248,7 @@ public class CoreAdminHandlerTest extends SolrTestCaseJ4 {
File solrHomeDirectory = new File(initCoreDataDir, getClass().getName() + "-corex-"
+ System.nanoTime());
solrHomeDirectory.mkdirs();
- copySolrHomeToTemp(solrHomeDirectory, "corex", true);
+ copySolrHomeToTemp(solrHomeDirectory, "corex");
File corex = new File(solrHomeDirectory, "corex");
FileUtils.write(new File(corex, "core.properties"), "", Charsets.UTF_8.toString());
JettySolrRunner runner = new JettySolrRunner(solrHomeDirectory.getAbsolutePath(), buildJettyConfig("/solr"));
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/7743718d/solr/test-framework/src/java/org/apache/solr/SolrTestCaseJ4.java
----------------------------------------------------------------------
diff --git a/solr/test-framework/src/java/org/apache/solr/SolrTestCaseJ4.java b/solr/test-framework/src/java/org/apache/solr/SolrTestCaseJ4.java
index d57029c..7a41454 100644
--- a/solr/test-framework/src/java/org/apache/solr/SolrTestCaseJ4.java
+++ b/solr/test-framework/src/java/org/apache/solr/SolrTestCaseJ4.java
@@ -1855,21 +1855,14 @@ public abstract class SolrTestCaseJ4 extends LuceneTestCase {
}
// Creates a consistent configuration, _including_ solr.xml at dstRoot. Creates collection1/conf and copies
- // the stock files in there. Seems to be indicated for some tests when we remove the default, hard-coded
- // solr.xml from being automatically synthesized from SolrConfigXmlOld.DEFAULT_SOLR_XML.
+ // the stock files in there.
+
public static void copySolrHomeToTemp(File dstRoot, String collection) throws IOException {
- copySolrHomeToTemp(dstRoot, collection, false);
- }
- public static void copySolrHomeToTemp(File dstRoot, String collection, boolean newStyle) throws IOException {
if (!dstRoot.exists()) {
assertTrue("Failed to make subdirectory ", dstRoot.mkdirs());
}
- if (newStyle) {
- FileUtils.copyFile(new File(SolrTestCaseJ4.TEST_HOME(), "solr-no-core.xml"), new File(dstRoot, "solr.xml"));
- } else {
- FileUtils.copyFile(new File(SolrTestCaseJ4.TEST_HOME(), "solr.xml"), new File(dstRoot, "solr.xml"));
- }
+ FileUtils.copyFile(new File(SolrTestCaseJ4.TEST_HOME(), "solr.xml"), new File(dstRoot, "solr.xml"));
File subHome = new File(dstRoot, collection + File.separator + "conf");
String top = SolrTestCaseJ4.TEST_HOME() + "/collection1/conf";