Apache
/
lucene
mirror of https://github.com/apache/lucene.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

SOLR-8489: TestMiniSolrCloudCluster.createCollection to support extra & alternative collectionProperties 

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1723162 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Christine Poerschke 2016-01-05 20:52:35 +00:00
parent bcf325868a
commit 32330252b9
2 changed files with 19 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
solr/CHANGES.txt
View File

@ -431,6 +431,9 @@ Other Changes
* SOLR-8483: relocate 'IMPORTANT NOTE' in open-exchange-rates.json test-file to avoid * SOLR-8483: relocate 'IMPORTANT NOTE' in open-exchange-rates.json test-file to avoid
OpenExchangeRatesOrgProvider.java warnings (Christine Poerschke) OpenExchangeRatesOrgProvider.java warnings (Christine Poerschke)
* SOLR-8489: TestMiniSolrCloudCluster.createCollection to support extra & alternative collectionProperties
(Christine Poerschke)
================== 5.4.0 ================== ================== 5.4.0 ==================
Consult the LUCENE_CHANGES.txt file for additional, low level, changes in this release Consult the LUCENE_CHANGES.txt file for additional, low level, changes in this release

28
solr/core/src/test/org/apache/solr/cloud/TestMiniSolrCloudCluster.java
View File

@ -90,19 +90,23 @@ public class TestMiniSolrCloudCluster extends LuceneTestCase {
return new MiniSolrCloudCluster(NUM_SERVERS, createTempDir(), jettyConfig.build()); return new MiniSolrCloudCluster(NUM_SERVERS, createTempDir(), jettyConfig.build());
} }
private void createCollection(MiniSolrCloudCluster miniCluster, String collectionName, String createNodeSet, String asyncId, boolean persistIndex) throws Exception { private void createCollection(MiniSolrCloudCluster miniCluster, String collectionName, String createNodeSet, String asyncId,
Boolean indexToPersist, Map<String,String> collectionProperties) throws Exception {
String configName = "solrCloudCollectionConfig"; String configName = "solrCloudCollectionConfig";
File configDir = new File(SolrTestCaseJ4.TEST_HOME() + File.separator + "collection1" + File.separator + "conf"); File configDir = new File(SolrTestCaseJ4.TEST_HOME() + File.separator + "collection1" + File.separator + "conf");
miniCluster.uploadConfigDir(configDir, configName); miniCluster.uploadConfigDir(configDir, configName);
Map<String, String> collectionProperties = new HashMap<>(); final boolean persistIndex = (indexToPersist != null ? indexToPersist.booleanValue() : random().nextBoolean());
collectionProperties.put(CoreDescriptor.CORE_CONFIG, "solrconfig-tlog.xml"); if (collectionProperties == null) {
collectionProperties.put("solr.tests.maxBufferedDocs", "100000"); collectionProperties = new HashMap<>();
collectionProperties.put("solr.tests.ramBufferSizeMB", "100"); }
collectionProperties.putIfAbsent(CoreDescriptor.CORE_CONFIG, "solrconfig-tlog.xml");
collectionProperties.putIfAbsent("solr.tests.maxBufferedDocs", "100000");
collectionProperties.putIfAbsent("solr.tests.ramBufferSizeMB", "100");
// use non-test classes so RandomizedRunner isn't necessary // use non-test classes so RandomizedRunner isn't necessary
collectionProperties.put("solr.tests.mergePolicy", "org.apache.lucene.index.TieredMergePolicy"); collectionProperties.putIfAbsent("solr.tests.mergePolicy", "org.apache.lucene.index.TieredMergePolicy");
collectionProperties.put("solr.tests.mergeScheduler", "org.apache.lucene.index.ConcurrentMergeScheduler"); collectionProperties.putIfAbsent("solr.tests.mergeScheduler", "org.apache.lucene.index.ConcurrentMergeScheduler");
collectionProperties.put("solr.directoryFactory", (persistIndex ? "solr.StandardDirectoryFactory" : "solr.RAMDirectoryFactory")); collectionProperties.putIfAbsent("solr.directoryFactory", (persistIndex ? "solr.StandardDirectoryFactory" : "solr.RAMDirectoryFactory"));
miniCluster.createCollection(collectionName, NUM_SHARDS, REPLICATION_FACTOR, configName, createNodeSet, asyncId, collectionProperties); miniCluster.createCollection(collectionName, NUM_SHARDS, REPLICATION_FACTOR, configName, createNodeSet, asyncId, collectionProperties);
} }
@ -138,7 +142,7 @@ public class TestMiniSolrCloudCluster extends LuceneTestCase {
// create collection // create collection
log.info("#### Creating a collection"); log.info("#### Creating a collection");
final String asyncId = (random().nextBoolean() ? null : "asyncId("+collectionName+".create)="+random().nextInt()); final String asyncId = (random().nextBoolean() ? null : "asyncId("+collectionName+".create)="+random().nextInt());
createCollection(miniCluster, collectionName, null, asyncId, random().nextBoolean()); createCollection(miniCluster, collectionName, null, asyncId, null, null);
if (asyncId != null) { if (asyncId != null) {
assertEquals("did not see async createCollection completion", "completed", AbstractFullDistribZkTestBase.getRequestStateAfterCompletion(asyncId, 330, cloudSolrClient)); assertEquals("did not see async createCollection completion", "completed", AbstractFullDistribZkTestBase.getRequestStateAfterCompletion(asyncId, 330, cloudSolrClient));
} }
@ -198,7 +202,7 @@ public class TestMiniSolrCloudCluster extends LuceneTestCase {
// create it again // create it again
String asyncId2 = (random().nextBoolean() ? null : "asyncId("+collectionName+".create)="+random().nextInt()); String asyncId2 = (random().nextBoolean() ? null : "asyncId("+collectionName+".create)="+random().nextInt());
createCollection(miniCluster, collectionName, null, asyncId2, random().nextBoolean()); createCollection(miniCluster, collectionName, null, asyncId2, null, null);
if (asyncId2 != null) { if (asyncId2 != null) {
assertEquals("did not see async createCollection completion", "completed", AbstractFullDistribZkTestBase.getRequestStateAfterCompletion(asyncId2, 330, cloudSolrClient)); assertEquals("did not see async createCollection completion", "completed", AbstractFullDistribZkTestBase.getRequestStateAfterCompletion(asyncId2, 330, cloudSolrClient));
} }
@ -293,7 +297,7 @@ public class TestMiniSolrCloudCluster extends LuceneTestCase {
// create collection // create collection
final String asyncId = (random().nextBoolean() ? null : "asyncId("+collectionName+".create)="+random().nextInt()); final String asyncId = (random().nextBoolean() ? null : "asyncId("+collectionName+".create)="+random().nextInt());
createCollection(miniCluster, collectionName, OverseerCollectionMessageHandler.CREATE_NODE_SET_EMPTY, asyncId, random().nextBoolean()); createCollection(miniCluster, collectionName, OverseerCollectionMessageHandler.CREATE_NODE_SET_EMPTY, asyncId, null, null);
if (asyncId != null) { if (asyncId != null) {
assertEquals("did not see async createCollection completion", "completed", AbstractFullDistribZkTestBase.getRequestStateAfterCompletion(asyncId, 330, cloudSolrClient)); assertEquals("did not see async createCollection completion", "completed", AbstractFullDistribZkTestBase.getRequestStateAfterCompletion(asyncId, 330, cloudSolrClient));
} }
@ -339,7 +343,7 @@ public class TestMiniSolrCloudCluster extends LuceneTestCase {
assertTrue(jetty.isRunning()); assertTrue(jetty.isRunning());
} }
createCollection(miniCluster, collectionName, null, null, true); createCollection(miniCluster, collectionName, null, null, Boolean.TRUE, null);
final CloudSolrClient cloudSolrClient = miniCluster.getSolrClient(); final CloudSolrClient cloudSolrClient = miniCluster.getSolrClient();
cloudSolrClient.setDefaultCollection(collectionName); cloudSolrClient.setDefaultCollection(collectionName);
final SolrQuery query = new SolrQuery("*:*"); final SolrQuery query = new SolrQuery("*:*");