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

SOLR-7599: Remove invokeCollectionAPI method from base test class and use solrj classes throughout 

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1683417 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Shalin Shekhar Mangar 2015-06-03 19:22:49 +00:00
parent 994ae6590c
commit 18c72d87b5
3 changed files with 16 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
solr/core/src/test/org/apache/solr/cloud/OverseerStatusTest.java
View File

@ -17,6 +17,7 @@ package org.apache.solr.cloud;
* limitations under the License.
*/
import org.apache.solr.client.solrj.request.CollectionAdminRequest;
import org.apache.solr.client.solrj.response.CollectionAdminResponse;
import org.apache.solr.common.params.CollectionParams;
import org.apache.solr.common.util.NamedList;
@ -38,8 +39,7 @@ public class OverseerStatusTest extends BasicDistributedZkTest {
// find existing command counts because collection may be created by base test class too
int numCollectionCreates = 0, numOverseerCreates = 0;
NamedList<Object> resp = invokeCollectionApi("action",
CollectionParams.CollectionAction.OVERSEERSTATUS.toLower());
NamedList<Object> resp = new CollectionAdminRequest.OverseerStatus().process(cloudClient).getResponse();
if (resp != null) {
NamedList<Object> collection_operations = (NamedList<Object>) resp.get("collection_operations");
if (collection_operations != null) {
@ -59,8 +59,7 @@ public class OverseerStatusTest extends BasicDistributedZkTest {
String collectionName = "overseer_status_test";
CollectionAdminResponse response = createCollection(collectionName, 1, 1, 1);
resp = invokeCollectionApi("action",
CollectionParams.CollectionAction.OVERSEERSTATUS.toLower());
resp = new CollectionAdminRequest.OverseerStatus().process(cloudClient).getResponse();
NamedList<Object> collection_operations = (NamedList<Object>) resp.get("collection_operations");
NamedList<Object> overseer_operations = (NamedList<Object>) resp.get("overseer_operations");
SimpleOrderedMap<Object> createcollection = (SimpleOrderedMap<Object>) collection_operations.get(CollectionParams.CollectionAction.CREATE.toLower());
@ -68,22 +67,25 @@ public class OverseerStatusTest extends BasicDistributedZkTest {
createcollection = (SimpleOrderedMap<Object>) overseer_operations.get(CollectionParams.CollectionAction.CREATE.toLower());
assertEquals("No stats for create in Overseer", numOverseerCreates + 1, createcollection.get("requests"));
invokeCollectionApi("action", CollectionParams.CollectionAction.RELOAD.toLower(), "name", collectionName);
resp = invokeCollectionApi("action",
CollectionParams.CollectionAction.OVERSEERSTATUS.toLower());
// Reload the collection
new CollectionAdminRequest.Reload().setCollectionName(collectionName).process(cloudClient);
resp = new CollectionAdminRequest.OverseerStatus().process(cloudClient).getResponse();
collection_operations = (NamedList<Object>) resp.get("collection_operations");
SimpleOrderedMap<Object> reload = (SimpleOrderedMap<Object>) collection_operations.get(CollectionParams.CollectionAction.RELOAD.toLower());
assertEquals("No stats for reload in OverseerCollectionProcessor", 1, reload.get("requests"));
try {
invokeCollectionApi("action", CollectionParams.CollectionAction.SPLITSHARD.toLower(),
"collection", "non_existent_collection",
"shard", "non_existent_shard");
new CollectionAdminRequest.SplitShard()
.setCollectionName("non_existent_collection")
.setShardName("non_existent_shard")
.process(cloudClient);
fail("Split shard for non existent collection should have failed");
} catch (Exception e) {
// expected because we did not correctly specify required params for split
}
resp = invokeCollectionApi("action",
CollectionParams.CollectionAction.OVERSEERSTATUS.toLower());
resp = new CollectionAdminRequest.OverseerStatus().process(cloudClient).getResponse();
collection_operations = (NamedList<Object>) resp.get("collection_operations");
SimpleOrderedMap<Object> split = (SimpleOrderedMap<Object>) collection_operations.get(CollectionParams.CollectionAction.SPLITSHARD.toLower());
assertEquals("No stats for split in OverseerCollectionProcessor", 1, split.get("errors"));

3
solr/core/src/test/org/apache/solr/cloud/RollingRestartTest.java
View File

@ -18,6 +18,7 @@ package org.apache.solr.cloud;
*/
import org.apache.commons.collections.CollectionUtils;
import org.apache.solr.client.solrj.request.CollectionAdminRequest;
import org.apache.solr.common.cloud.SolrZkClient;
import org.apache.solr.common.params.CollectionParams;
import org.apache.zookeeper.KeeperException;
@ -70,7 +71,7 @@ public class RollingRestartTest extends AbstractFullDistribZkTestBase {
int n = random().nextInt(getShardCount());
String nodeName = cloudJettys.get(n).nodeName;
log.info("Chose {} as overseer designate", nodeName);
invokeCollectionApi(CollectionParams.ACTION, CollectionParams.CollectionAction.ADDROLE.toLower(), "role", "overseer", "node", nodeName);
new CollectionAdminRequest.AddRole().setRole("overseer").setNode(nodeName).process(cloudClient);
designates.add(nodeName);
designateJettys.add(cloudJettys.get(n));
}

19
solr/test-framework/src/java/org/apache/solr/cloud/AbstractFullDistribZkTestBase.java
View File

@ -1769,25 +1769,6 @@ public abstract class AbstractFullDistribZkTestBase extends AbstractDistribZkTes
}
protected NamedList<Object> invokeCollectionApi(String... args) throws SolrServerException, IOException {
ModifiableSolrParams params = new ModifiableSolrParams();
SolrRequest request = new QueryRequest(params);
for (int i = 0; i < args.length - 1; i+=2) {
params.add(args[i], args[i+1]);
}
request.setPath("/admin/collections");
String baseUrl = ((HttpSolrClient) shardToJetty.get(SHARD1).get(0).client.solrClient)
.getBaseURL();
baseUrl = baseUrl.substring(0, baseUrl.length() - "collection1".length());
try (HttpSolrClient baseClient = new HttpSolrClient(baseUrl)) {
baseClient.setConnectionTimeout(15000);
baseClient.setSoTimeout(60000 * 5);
return baseClient.request(request);
}
}
protected void createCollection(String collName,
CloudSolrClient client,
int replicationFactor ,