You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by is...@apache.org on 2019/12/18 00:23:46 UTC
[lucene-solr] branch jira/solr14089 updated: Cutting over
CollectionPropsTest and CollectionsAPISolrJTest to externalState=true
This is an automated email from the ASF dual-hosted git repository.
ishan pushed a commit to branch jira/solr14089
in repository https://gitbox.apache.org/repos/asf/lucene-solr.git
The following commit(s) were added to refs/heads/jira/solr14089 by this push:
new 2724d9f Cutting over CollectionPropsTest and CollectionsAPISolrJTest to externalState=true
2724d9f is described below
commit 2724d9fb375d0e767695ca0ecef3c289e04dbbdf
Author: Ishan Chattopadhyaya <is...@apache.org>
AuthorDate: Wed Dec 18 05:52:55 2019 +0530
Cutting over CollectionPropsTest and CollectionsAPISolrJTest to externalState=true
---
.../org/apache/solr/cloud/CollectionPropsTest.java | 2 +-
.../apache/solr/cloud/CollectionsAPISolrJTest.java | 30 +++++++++++++++++-----
2 files changed, 24 insertions(+), 8 deletions(-)
diff --git a/solr/core/src/test/org/apache/solr/cloud/CollectionPropsTest.java b/solr/core/src/test/org/apache/solr/cloud/CollectionPropsTest.java
index 3892bc6..0716223 100644
--- a/solr/core/src/test/org/apache/solr/cloud/CollectionPropsTest.java
+++ b/solr/core/src/test/org/apache/solr/cloud/CollectionPropsTest.java
@@ -66,7 +66,7 @@ public class CollectionPropsTest extends SolrCloudTestCase {
collectionName = "CollectionPropsTest" + System.nanoTime();
- CollectionAdminRequest.Create request = CollectionAdminRequest.createCollection(collectionName, "conf", 2, 2);
+ CollectionAdminRequest.Create request = CollectionAdminRequest.createCollection(collectionName, "conf", 2, 2).setExternalState(true);
CollectionAdminResponse response = request.process(cluster.getSolrClient());
assertTrue("Unable to create collection: " + response.toString(), response.isSuccess());
}
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 1f0b9dd..178297e 100644
--- a/solr/core/src/test/org/apache/solr/cloud/CollectionsAPISolrJTest.java
+++ b/solr/core/src/test/org/apache/solr/cloud/CollectionsAPISolrJTest.java
@@ -111,6 +111,7 @@ public class CollectionsAPISolrJTest extends SolrCloudTestCase {
public void testCreateWithDefaultConfigSet() throws Exception {
String collectionName = "solrj_default_configset";
CollectionAdminResponse response = CollectionAdminRequest.createCollection(collectionName, 2, 2)
+ .setExternalState(true)
.process(cluster.getSolrClient());
cluster.waitForActiveCollection(collectionName, 2, 4);
@@ -157,6 +158,7 @@ public class CollectionsAPISolrJTest extends SolrCloudTestCase {
assertEquals("2", String.valueOf(clusterProperty));
CollectionAdminResponse response = CollectionAdminRequest
.createCollection(COLL_NAME, "conf", null, null, null, null)
+ .setExternalState(true)
.process(cluster.getSolrClient());
assertEquals(0, response.getStatus());
assertTrue(response.isSuccess());
@@ -241,6 +243,7 @@ public class CollectionsAPISolrJTest extends SolrCloudTestCase {
assertEquals("2", String.valueOf(clusterProperty));
CollectionAdminResponse response = CollectionAdminRequest
.createCollection(COLL_NAME, "conf", null, null, null, null)
+ .setExternalState(true)
.process(cluster.getSolrClient());
assertEquals(0, response.getStatus());
assertTrue(response.isSuccess());
@@ -305,6 +308,7 @@ public class CollectionsAPISolrJTest extends SolrCloudTestCase {
public void testCreateAndDeleteCollection() throws Exception {
String collectionName = "solrj_test";
CollectionAdminResponse response = CollectionAdminRequest.createCollection(collectionName, "conf", 2, 2)
+ .setExternalState(true)
.setStateFormat(1)
.process(cluster.getSolrClient());
@@ -331,6 +335,7 @@ public class CollectionsAPISolrJTest extends SolrCloudTestCase {
collectionName = "solrj_newstateformat";
response = CollectionAdminRequest.createCollection(collectionName, "conf", 2, 2)
+ .setExternalState(true)
.setStateFormat(2)
.process(cluster.getSolrClient());
assertEquals(0, response.getStatus());
@@ -344,6 +349,7 @@ public class CollectionsAPISolrJTest extends SolrCloudTestCase {
public void testCloudInfoInCoreStatus() throws IOException, SolrServerException {
String collectionName = "corestatus_test";
CollectionAdminResponse response = CollectionAdminRequest.createCollection(collectionName, "conf", 2, 2)
+ .setExternalState(true)
.setStateFormat(1)
.process(cluster.getSolrClient());
@@ -416,7 +422,7 @@ public class CollectionsAPISolrJTest extends SolrCloudTestCase {
public void testCreateAndDeleteAlias() throws IOException, SolrServerException {
final String collection = "aliasedCollection";
- CollectionAdminRequest.createCollection(collection, "conf", 1, 1).process(cluster.getSolrClient());
+ CollectionAdminRequest.createCollection(collection, "conf", 1, 1) .setExternalState(true).process(cluster.getSolrClient());
CollectionAdminResponse response
= CollectionAdminRequest.createAlias("solrj_alias", collection).process(cluster.getSolrClient());
@@ -431,6 +437,7 @@ public class CollectionsAPISolrJTest extends SolrCloudTestCase {
final String collectionName = "solrj_test_splitshard";
CollectionAdminRequest.createCollection(collectionName, "conf", 2, 1)
+ .setExternalState(true)
.process(cluster.getSolrClient());
cluster.waitForActiveCollection(collectionName, 2, 2);
@@ -484,6 +491,7 @@ public class CollectionsAPISolrJTest extends SolrCloudTestCase {
Path ulogDir = tmpDir.resolve("ulogDir-" + TestUtil.randomSimpleString(random(), 1, 5));
CollectionAdminResponse response = CollectionAdminRequest.createCollection(collectionName, "conf", 1, 1)
+ .setExternalState(true)
.withProperty(CoreAdminParams.DATA_DIR, dataDir.toString())
.withProperty(CoreAdminParams.ULOG_DIR, ulogDir.toString())
.process(cluster.getSolrClient());
@@ -510,6 +518,7 @@ public class CollectionsAPISolrJTest extends SolrCloudTestCase {
final String collectionName = "solrj_replicatests";
CollectionAdminRequest.createCollection(collectionName, "conf", 1, 2)
+ .setExternalState(true)
.process(cluster.getSolrClient());
cluster.waitForActiveCollection(collectionName, 1, 2);
@@ -580,6 +589,7 @@ public class CollectionsAPISolrJTest extends SolrCloudTestCase {
final String propName = "testProperty";
CollectionAdminRequest.createCollection(collectionName, "conf", 2, 2)
+ .setExternalState(true)
.process(cluster.getSolrClient());
cluster.waitForActiveCollection(collectionName, 2, 4);
@@ -611,6 +621,7 @@ public class CollectionsAPISolrJTest extends SolrCloudTestCase {
public void testColStatus() throws Exception {
final String collectionName = "collectionStatusTest";
CollectionAdminRequest.createCollection(collectionName, "conf2", 2, 2)
+ .setExternalState(true)
.process(cluster.getSolrClient());
cluster.waitForActiveCollection(collectionName, 2, 4);
@@ -681,6 +692,7 @@ public class CollectionsAPISolrJTest extends SolrCloudTestCase {
CloudSolrClient solrClient = cluster.getSolrClient();
CollectionAdminRequest.createCollection(collectionName, "conf", 2, 2)
+ .setExternalState(true)
.process(solrClient);
solrClient.setDefaultCollection(collectionName);
@@ -823,8 +835,8 @@ public class CollectionsAPISolrJTest extends SolrCloudTestCase {
private void doTestRenameCollection(boolean followAliases) throws Exception {
String collectionName1 = "testRename1_" + followAliases;
String collectionName2 = "testRename2_" + followAliases;
- CollectionAdminRequest.createCollection(collectionName1, "conf", 1, 1).setAlias("col1").process(cluster.getSolrClient());
- CollectionAdminRequest.createCollection(collectionName2, "conf", 1, 1).setAlias("col2").process(cluster.getSolrClient());
+ CollectionAdminRequest.createCollection(collectionName1, "conf", 1, 1).setExternalState(true).setAlias("col1").process(cluster.getSolrClient());
+ CollectionAdminRequest.createCollection(collectionName2, "conf", 1, 1).setExternalState(true).setAlias("col2").process(cluster.getSolrClient());
cluster.waitForActiveCollection(collectionName1, 1, 1);
cluster.waitForActiveCollection(collectionName2, 1, 1);
@@ -835,7 +847,7 @@ public class CollectionsAPISolrJTest extends SolrCloudTestCase {
CollectionAdminRequest.createAlias("compoundAlias", "col1,col2").process(cluster.getSolrClient());
CollectionAdminRequest.createAlias("simpleAlias", "col1").process(cluster.getSolrClient());
CollectionAdminRequest.createCategoryRoutedAlias("catAlias", "field1", 100,
- CollectionAdminRequest.createCollection("_unused_", "conf", 1, 1)).process(cluster.getSolrClient());
+ CollectionAdminRequest.createCollection("_unused_", "conf", 1, 1).setExternalState(true)).process(cluster.getSolrClient());
CollectionAdminRequest.Rename rename = CollectionAdminRequest.renameCollection("col1", "foo");
rename.setFollowAliases(followAliases);
@@ -906,8 +918,8 @@ public class CollectionsAPISolrJTest extends SolrCloudTestCase {
CloudSolrClient solrClient = cluster.getSolrClient();
String collectionName1 = "aliasedCollection1";
String collectionName2 = "aliasedCollection2";
- CollectionAdminRequest.createCollection(collectionName1, "conf", 1, 1).process(solrClient);
- CollectionAdminRequest.createCollection(collectionName2, "conf", 1, 1).process(solrClient);
+ CollectionAdminRequest.createCollection(collectionName1, "conf", 1, 1) .setExternalState(true).process(solrClient);
+ CollectionAdminRequest.createCollection(collectionName2, "conf", 1, 1) .setExternalState(true).process(solrClient);
cluster.waitForActiveCollection(collectionName1, 1, 1);
cluster.waitForActiveCollection(collectionName2, 1, 1);
@@ -1009,11 +1021,13 @@ public class CollectionsAPISolrJTest extends SolrCloudTestCase {
final String collection = "replicaProperties";
CollectionAdminRequest.createCollection(collection, "conf", 2, 2)
+ .setExternalState(true)
.process(cluster.getSolrClient());
cluster.waitForActiveCollection(collection, 2, 4);
- final Replica replica = getCollectionState(collection).getLeader("shard1");
+ final Slice shard1 = getCollectionState(collection).getSlice("shard1");
+ final Replica replica = cluster.getSolrClient().getZkStateReader().getShardStateProvider(collection).getLeader(shard1);
CollectionAdminResponse response
= CollectionAdminRequest.addReplicaProperty(collection, "shard1", replica.getName(), "preferredleader", "true")
.process(cluster.getSolrClient());
@@ -1037,6 +1051,7 @@ public class CollectionsAPISolrJTest extends SolrCloudTestCase {
final String collection = "balancedProperties";
CollectionAdminRequest.createCollection(collection, "conf", 2, 2)
+ .setExternalState(true)
.process(cluster.getSolrClient());
cluster.waitForActiveCollection(collection, 2, 4);
@@ -1064,6 +1079,7 @@ public class CollectionsAPISolrJTest extends SolrCloudTestCase {
public void testModifyCollectionAttribute() throws IOException, SolrServerException {
final String collection = "testAddAndDeleteCollectionAttribute";
CollectionAdminRequest.createCollection(collection, "conf", 1, 1)
+ .setExternalState(true)
.process(cluster.getSolrClient());
cluster.waitForActiveCollection(collection, 1, 1);