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

SOLR-5853: Return status for AbstractFullDistribZkTestBase#createCollection() and friends 

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1577156 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Jan Høydahl 2014-03-13 13:38:20 +00:00
parent e659fc8930
commit 44bec7cfe4
4 changed files with 38 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
solr/CHANGES.txt
View File

@ -214,6 +214,9 @@ Other Changes
and SolrInputField for testing purposes. (Varun Thacker, Noble Paul, and SolrInputField for testing purposes. (Varun Thacker, Noble Paul,
Mark Miller) Mark Miller)
* SOLR-5853: The createCollection methods in the test framework now reports
result of operation in the returned CollectionAdminResponse (janhoy)
================== 4.7.0 ================== ================== 4.7.0 ==================
Versions of Major Components Versions of Major Components

14
solr/core/src/test/org/apache/solr/cloud/BasicDistributedZkTest.java
View File

@ -51,6 +51,7 @@ import org.apache.solr.client.solrj.request.ContentStreamUpdateRequest;
import org.apache.solr.client.solrj.request.CoreAdminRequest.Create; import org.apache.solr.client.solrj.request.CoreAdminRequest.Create;
import org.apache.solr.client.solrj.request.CoreAdminRequest.Unload; import org.apache.solr.client.solrj.request.CoreAdminRequest.Unload;
import org.apache.solr.client.solrj.request.QueryRequest; import org.apache.solr.client.solrj.request.QueryRequest;
import org.apache.solr.client.solrj.response.CollectionAdminResponse;
import org.apache.solr.client.solrj.response.QueryResponse; import org.apache.solr.client.solrj.response.QueryResponse;
import org.apache.solr.client.solrj.response.UpdateResponse; import org.apache.solr.client.solrj.response.UpdateResponse;
import org.apache.solr.common.SolrDocument; import org.apache.solr.common.SolrDocument;
@ -593,8 +594,9 @@ public class BasicDistributedZkTest extends AbstractFullDistribZkTestBase {
return url2; return url2;
} }
protected void createCollection(Map<String,List<Integer>> collectionInfos, protected CollectionAdminResponse createCollection(Map<String, List<Integer>> collectionInfos,
String collectionName, int numShards, int numReplicas, int maxShardsPerNode, SolrServer client, String createNodeSetStr) throws SolrServerException, IOException { String collectionName, int numShards, int numReplicas, int maxShardsPerNode, SolrServer client, String createNodeSetStr) throws SolrServerException, IOException {
// TODO: Use CollectionAdminRequest for this test
ModifiableSolrParams params = new ModifiableSolrParams(); ModifiableSolrParams params = new ModifiableSolrParams();
params.set("action", CollectionAction.CREATE.toString()); params.set("action", CollectionAction.CREATE.toString());
@ -613,7 +615,8 @@ public class BasicDistributedZkTest extends AbstractFullDistribZkTestBase {
params.set("name", collectionName); params.set("name", collectionName);
SolrRequest request = new QueryRequest(params); SolrRequest request = new QueryRequest(params);
request.setPath("/admin/collections"); request.setPath("/admin/collections");
CollectionAdminResponse res = new CollectionAdminResponse();
if (client == null) { if (client == null) {
final String baseUrl = ((HttpSolrServer) clients.get(clientIndex)).getBaseURL().substring( final String baseUrl = ((HttpSolrServer) clients.get(clientIndex)).getBaseURL().substring(
0, 0,
@ -621,11 +624,12 @@ public class BasicDistributedZkTest extends AbstractFullDistribZkTestBase {
- DEFAULT_COLLECTION.length() - 1); - DEFAULT_COLLECTION.length() - 1);
SolrServer aClient = createNewSolrServer("", baseUrl); SolrServer aClient = createNewSolrServer("", baseUrl);
aClient.request(request); res.setResponse(aClient.request(request));
aClient.shutdown(); aClient.shutdown();
} else { } else {
client.request(request); res.setResponse(client.request(request));
} }
return res;
} }
protected ZkCoreNodeProps getLeaderUrlFromZk(String collection, String slice) { protected ZkCoreNodeProps getLeaderUrlFromZk(String collection, String slice) {

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

@ -940,7 +940,8 @@ public class CollectionsAPIDistributedZkTest extends AbstractFullDistribZkTestBa
collectionInfos = new HashMap<>(); collectionInfos = new HashMap<>();
client = createCloudClient("awholynewcollection_" + (cnt+1)); client = createCloudClient("awholynewcollection_" + (cnt+1));
try { try {
createCollection(collectionInfos, "awholynewcollection_" + (cnt+1), numShards, replicationFactor, maxShardsPerNode, client, StrUtils.join(createNodeList, ','), "conf1"); CollectionAdminResponse res = createCollection(collectionInfos, "awholynewcollection_" + (cnt+1), numShards, replicationFactor, maxShardsPerNode, client, StrUtils.join(createNodeList, ','), "conf1");
assertTrue(res.isSuccess());
} finally { } finally {
client.shutdown(); client.shutdown();
} }

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

@ -50,6 +50,7 @@ import org.apache.solr.client.solrj.impl.CloudSolrServer;
import org.apache.solr.client.solrj.impl.HttpSolrServer; import org.apache.solr.client.solrj.impl.HttpSolrServer;
import org.apache.solr.client.solrj.request.QueryRequest; import org.apache.solr.client.solrj.request.QueryRequest;
import org.apache.solr.client.solrj.request.UpdateRequest; import org.apache.solr.client.solrj.request.UpdateRequest;
import org.apache.solr.client.solrj.response.CollectionAdminResponse;
import org.apache.solr.client.solrj.response.QueryResponse; import org.apache.solr.client.solrj.response.QueryResponse;
import org.apache.solr.common.SolrDocument; import org.apache.solr.common.SolrDocument;
import org.apache.solr.common.SolrDocumentList; import org.apache.solr.common.SolrDocumentList;
@ -1562,14 +1563,16 @@ public abstract class AbstractFullDistribZkTestBase extends AbstractDistribZkTes
jettys.clear(); jettys.clear();
} }
protected void createCollection(String collectionName, int numShards, int numReplicas, int maxShardsPerNode) throws SolrServerException, IOException { protected CollectionAdminResponse createCollection(String collectionName, int numShards, int replicationFactor, int maxShardsPerNode) throws SolrServerException, IOException {
createCollection(null, collectionName, numShards, numReplicas, maxShardsPerNode, null, null); return createCollection(null, collectionName, numShards, replicationFactor, maxShardsPerNode, null, null);
} }
protected void createCollection(Map<String,List<Integer>> collectionInfos, String collectionName, Map<String,Object> collectionProps, SolrServer client) throws SolrServerException, IOException{ protected CollectionAdminResponse createCollection(Map<String,List<Integer>> collectionInfos, String collectionName, Map<String,Object> collectionProps, SolrServer client) throws SolrServerException, IOException{
createCollection(collectionInfos, collectionName, collectionProps, client, null); return createCollection(collectionInfos, collectionName, collectionProps, client, null);
} }
protected void createCollection(Map<String,List<Integer>> collectionInfos, String collectionName, Map<String,Object> collectionProps, SolrServer client, String confSetName) throws SolrServerException, IOException{
// TODO: Use CollectionAdminRequest#createCollection() instead of a raw request
protected CollectionAdminResponse createCollection(Map<String, List<Integer>> collectionInfos, String collectionName, Map<String, Object> collectionProps, SolrServer client, String confSetName) throws SolrServerException, IOException{
ModifiableSolrParams params = new ModifiableSolrParams(); ModifiableSolrParams params = new ModifiableSolrParams();
params.set("action", CollectionAction.CREATE.toString()); params.set("action", CollectionAction.CREATE.toString());
for (Map.Entry<String, Object> entry : collectionProps.entrySet()) { for (Map.Entry<String, Object> entry : collectionProps.entrySet()) {
@ -1580,19 +1583,19 @@ public abstract class AbstractFullDistribZkTestBase extends AbstractDistribZkTes
String shardNames = (String) collectionProps.get(SHARDS_PROP); String shardNames = (String) collectionProps.get(SHARDS_PROP);
numShards = StrUtils.splitSmart(shardNames,',').size(); numShards = StrUtils.splitSmart(shardNames,',').size();
} }
Integer numReplicas = (Integer) collectionProps.get(REPLICATION_FACTOR); Integer replicationFactor = (Integer) collectionProps.get(REPLICATION_FACTOR);
if(numShards==null){ if(numShards==null){
numShards = (Integer) OverseerCollectionProcessor.COLL_PROPS.get(REPLICATION_FACTOR); numShards = (Integer) OverseerCollectionProcessor.COLL_PROPS.get(REPLICATION_FACTOR);
} }
if (confSetName != null) { if (confSetName != null) {
params.set("collection.configName", confSetName); params.set("collection.configName", confSetName);
} }
int clientIndex = random().nextInt(2); int clientIndex = random().nextInt(2);
List<Integer> list = new ArrayList<>(); List<Integer> list = new ArrayList<>();
list.add(numShards); list.add(numShards);
list.add(numReplicas); list.add(replicationFactor);
if (collectionInfos != null) { if (collectionInfos != null) {
collectionInfos.put(collectionName, list); collectionInfos.put(collectionName, list);
} }
@ -1600,14 +1603,15 @@ public abstract class AbstractFullDistribZkTestBase extends AbstractDistribZkTes
SolrRequest request = new QueryRequest(params); SolrRequest request = new QueryRequest(params);
request.setPath("/admin/collections"); request.setPath("/admin/collections");
CollectionAdminResponse res = new CollectionAdminResponse();
if (client == null) { if (client == null) {
final String baseUrl = getBaseUrl((HttpSolrServer) clients.get(clientIndex)); final String baseUrl = getBaseUrl((HttpSolrServer) clients.get(clientIndex));
createNewSolrServer("", baseUrl).request(request); res.setResponse(createNewSolrServer("", baseUrl).request(request));
} else { } else {
client.request(request); res.setResponse(client.request(request));
} }
return res;
} }
protected void runCollectionAdminCommand(ModifiableSolrParams params){ protected void runCollectionAdminCommand(ModifiableSolrParams params){
@ -1616,25 +1620,25 @@ public abstract class AbstractFullDistribZkTestBase extends AbstractDistribZkTes
} }
protected void createCollection(Map<String,List<Integer>> collectionInfos, protected CollectionAdminResponse createCollection(Map<String,List<Integer>> collectionInfos,
String collectionName, int numShards, int numReplicas, int maxShardsPerNode, SolrServer client, String createNodeSetStr) throws SolrServerException, IOException { String collectionName, int numShards, int replicationFactor, int maxShardsPerNode, SolrServer client, String createNodeSetStr) throws SolrServerException, IOException {
createCollection(collectionInfos, collectionName, return createCollection(collectionInfos, collectionName,
ZkNodeProps.makeMap( ZkNodeProps.makeMap(
NUM_SLICES, numShards, NUM_SLICES, numShards,
REPLICATION_FACTOR, numReplicas, REPLICATION_FACTOR, replicationFactor,
CREATE_NODE_SET, createNodeSetStr, CREATE_NODE_SET, createNodeSetStr,
MAX_SHARDS_PER_NODE, maxShardsPerNode), MAX_SHARDS_PER_NODE, maxShardsPerNode),
client); client);
} }
protected void createCollection(Map<String,List<Integer>> collectionInfos, protected CollectionAdminResponse createCollection(Map<String, List<Integer>> collectionInfos,
String collectionName, int numShards, int numReplicas, int maxShardsPerNode, SolrServer client, String createNodeSetStr, String configName) throws SolrServerException, IOException { String collectionName, int numShards, int replicationFactor, int maxShardsPerNode, SolrServer client, String createNodeSetStr, String configName) throws SolrServerException, IOException {
createCollection(collectionInfos, collectionName, return createCollection(collectionInfos, collectionName,
ZkNodeProps.makeMap( ZkNodeProps.makeMap(
NUM_SLICES, numShards, NUM_SLICES, numShards,
REPLICATION_FACTOR, numReplicas, REPLICATION_FACTOR, replicationFactor,
CREATE_NODE_SET, createNodeSetStr, CREATE_NODE_SET, createNodeSetStr,
MAX_SHARDS_PER_NODE, maxShardsPerNode), MAX_SHARDS_PER_NODE, maxShardsPerNode),
client, configName); client, configName);