You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by sh...@apache.org on 2015/05/28 16:58:47 UTC
svn commit: r1682258 - in /lucene/dev/trunk/solr:
core/src/test/org/apache/solr/cloud/
test-framework/src/java/org/apache/solr/cloud/
Author: shalin
Date: Thu May 28 14:58:47 2015
New Revision: 1682258
URL: http://svn.apache.org/r1682258
Log:
SOLR-7599: More clean up of duplicate methods, renamed some methods and variable names
Modified:
lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/BasicDistributedZkTest.java
lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/CollectionStateFormat2Test.java
lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/CollectionsAPIDistributedZkTest.java
lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/CustomCollectionTest.java
lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/MigrateRouteKeyTest.java
lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/ShardSplitTest.java
lucene/dev/trunk/solr/test-framework/src/java/org/apache/solr/cloud/AbstractFullDistribZkTestBase.java
Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/BasicDistributedZkTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/BasicDistributedZkTest.java?rev=1682258&r1=1682257&r2=1682258&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/BasicDistributedZkTest.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/BasicDistributedZkTest.java Thu May 28 14:58:47 2015
@@ -1104,21 +1104,6 @@ public class BasicDistributedZkTest exte
}
}
- volatile CloudSolrClient commondCloudSolrClient;
- protected CloudSolrClient getCommonCloudSolrClient() {
- if (commondCloudSolrClient == null) {
- synchronized(this) {
- commondCloudSolrClient = new CloudSolrClient(zkServer.getZkAddress(), random().nextBoolean());
- commondCloudSolrClient.setParallelUpdates(random().nextBoolean());
- commondCloudSolrClient.setDefaultCollection(DEFAULT_COLLECTION);
- commondCloudSolrClient.getLbClient().setConnectionTimeout(15000);
- commondCloudSolrClient.getLbClient().setSoTimeout(30000);
- commondCloudSolrClient.connect();
- }
- }
- return commondCloudSolrClient;
- }
-
@Override
protected QueryResponse queryServer(ModifiableSolrParams params) throws SolrServerException, IOException {
@@ -1135,9 +1120,6 @@ public class BasicDistributedZkTest exte
@Override
public void distribTearDown() throws Exception {
super.distribTearDown();
- if (commondCloudSolrClient != null) {
- commondCloudSolrClient.close();
- }
if (otherCollectionClients != null) {
for (List<SolrClient> clientList : otherCollectionClients.values()) {
IOUtils.close(clientList);
Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/CollectionStateFormat2Test.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/CollectionStateFormat2Test.java?rev=1682258&r1=1682257&r2=1682258&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/CollectionStateFormat2Test.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/CollectionStateFormat2Test.java Thu May 28 14:58:47 2015
@@ -83,7 +83,7 @@ public class CollectionStateFormat2Test
client.request(request);
- checkForMissingCollection(collectionName);
+ assertCollectionNotExists(collectionName, 45);
assertFalse("collection state should not exist externally", cloudClient.getZkStateReader().getZkClient().exists(ZkStateReader.getCollectionPath(collectionName), true));
}
Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/CollectionsAPIDistributedZkTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/CollectionsAPIDistributedZkTest.java?rev=1682258&r1=1682257&r2=1682258&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/CollectionsAPIDistributedZkTest.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/CollectionsAPIDistributedZkTest.java Thu May 28 14:58:47 2015
@@ -208,7 +208,7 @@ public class CollectionsAPIDistributedZk
}
- checkForMissingCollection(collectionName);
+ assertCollectionNotExists(collectionName, 45);
assertFalse(cloudClient.getZkStateReader().getZkClient().exists(ZkStateReader.COLLECTIONS_ZKNODE + "/" + collectionName, true));
@@ -236,8 +236,8 @@ public class CollectionsAPIDistributedZk
request.setPath("/admin/collections");
makeRequest(baseUrl, request);
-
- checkForMissingCollection(collectionName);
+
+ assertCollectionNotExists(collectionName, 45);
// now creating that collection should work
params = new ModifiableSolrParams();
@@ -734,7 +734,7 @@ public class CollectionsAPIDistributedZk
makeRequest(baseUrl, request);
// ensure its out of the state
- checkForMissingCollection(collectionName);
+ assertCollectionNotExists(collectionName, 45);
//collectionNameList.remove(collectionName);
Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/CustomCollectionTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/CustomCollectionTest.java?rev=1682258&r1=1682257&r2=1682258&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/CustomCollectionTest.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/CustomCollectionTest.java Thu May 28 14:58:47 2015
@@ -72,7 +72,6 @@ import static org.apache.solr.common.par
@SuppressSSL(bugUrl = "https://issues.apache.org/jira/browse/SOLR-5776")
public class CustomCollectionTest extends AbstractFullDistribZkTestBase {
- private static final String DEFAULT_COLLECTION = "collection1";
private static final boolean DEBUG = false;
protected String getSolrXml() {
Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/MigrateRouteKeyTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/MigrateRouteKeyTest.java?rev=1682258&r1=1682257&r2=1682258&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/MigrateRouteKeyTest.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/MigrateRouteKeyTest.java Thu May 28 14:58:47 2015
@@ -153,7 +153,7 @@ public class MigrateRouteKeyTest extends
Indexer indexer = new Indexer(cloudClient, splitKey, 1, 30);
indexer.start();
- String url = CustomCollectionTest.getUrlFromZk(getCommonCloudSolrClient().getZkStateReader().getClusterState(), targetCollection);
+ String url = getUrlFromZk(getCommonCloudSolrClient().getZkStateReader().getClusterState(), targetCollection);
try (HttpSolrClient collectionClient = new HttpSolrClient(url)) {
Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/ShardSplitTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/ShardSplitTest.java?rev=1682258&r1=1682257&r2=1682258&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/ShardSplitTest.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/ShardSplitTest.java Thu May 28 14:58:47 2015
@@ -241,7 +241,7 @@ public class ShardSplitTest extends Basi
waitForRecoveriesToFinish(false);
- String url = CustomCollectionTest.getUrlFromZk(getCommonCloudSolrClient().getZkStateReader().getClusterState(), collectionName);
+ String url = getUrlFromZk(getCommonCloudSolrClient().getZkStateReader().getClusterState(), collectionName);
try (HttpSolrClient collectionClient = new HttpSolrClient(url)) {
@@ -315,7 +315,7 @@ public class ShardSplitTest extends Basi
waitForRecoveriesToFinish(false);
- String url = CustomCollectionTest.getUrlFromZk(getCommonCloudSolrClient().getZkStateReader().getClusterState(), collectionName);
+ String url = getUrlFromZk(getCommonCloudSolrClient().getZkStateReader().getClusterState(), collectionName);
try (HttpSolrClient collectionClient = new HttpSolrClient(url)) {
Modified: lucene/dev/trunk/solr/test-framework/src/java/org/apache/solr/cloud/AbstractFullDistribZkTestBase.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/test-framework/src/java/org/apache/solr/cloud/AbstractFullDistribZkTestBase.java?rev=1682258&r1=1682257&r2=1682258&view=diff
==============================================================================
--- lucene/dev/trunk/solr/test-framework/src/java/org/apache/solr/cloud/AbstractFullDistribZkTestBase.java (original)
+++ lucene/dev/trunk/solr/test-framework/src/java/org/apache/solr/cloud/AbstractFullDistribZkTestBase.java Thu May 28 14:58:47 2015
@@ -16,10 +16,6 @@ package org.apache.solr.cloud;
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-import static org.apache.solr.cloud.OverseerCollectionProcessor.CREATE_NODE_SET;
-import static org.apache.solr.cloud.OverseerCollectionProcessor.NUM_SLICES;
-import static org.apache.solr.cloud.OverseerCollectionProcessor.SHARDS_PROP;
-import static org.apache.solr.common.cloud.ZkNodeProps.makeMap;
import java.io.File;
import java.io.IOException;
@@ -83,6 +79,11 @@ import org.noggit.JSONWriter;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import static org.apache.solr.cloud.OverseerCollectionProcessor.CREATE_NODE_SET;
+import static org.apache.solr.cloud.OverseerCollectionProcessor.NUM_SLICES;
+import static org.apache.solr.cloud.OverseerCollectionProcessor.SHARDS_PROP;
+import static org.apache.solr.common.cloud.ZkNodeProps.makeMap;
+
/**
* TODO: we should still test this works as a custom update chain as well as
* what we test now - the default update chain
@@ -250,10 +251,8 @@ public abstract class AbstractFullDistri
CloudSolrClient client = new CloudSolrClient(zkServer.getZkAddress(), random().nextBoolean());
client.setParallelUpdates(random().nextBoolean());
if (defaultCollection != null) client.setDefaultCollection(defaultCollection);
- client.getLbClient().getHttpClient().getParams()
- .setParameter(CoreConnectionPNames.CONNECTION_TIMEOUT, 30000);
- client.getLbClient().getHttpClient().getParams()
- .setParameter(CoreConnectionPNames.SO_TIMEOUT, 60000);
+ client.getLbClient().setConnectionTimeout(30000);
+ client.getLbClient().setSoTimeout(60000);
return client;
}
@@ -304,7 +303,7 @@ public abstract class AbstractFullDistri
initCloud();
- createJettys(numServers).size();
+ createJettys(numServers);
int cnt = getTotalReplicas(DEFAULT_COLLECTION);
if (cnt > 0) {
@@ -1507,8 +1506,8 @@ public abstract class AbstractFullDistri
if (VERBOSE || printLayoutOnTearDown) {
super.printLayout();
}
- if (commondCloudSolrClient != null) {
- commondCloudSolrClient.close();
+ if (commonCloudSolrClient != null) {
+ commonCloudSolrClient.close();
}
if (controlClient != null) {
controlClient.close();
@@ -1733,20 +1732,24 @@ public abstract class AbstractFullDistri
}
}
- private CloudSolrClient commondCloudSolrClient;
+ private CloudSolrClient commonCloudSolrClient;
protected CloudSolrClient getCommonCloudSolrClient() {
synchronized (this) {
- if (commondCloudSolrClient == null) {
- commondCloudSolrClient = new CloudSolrClient(zkServer.getZkAddress(),
- random().nextBoolean());
- commondCloudSolrClient.getLbClient().setConnectionTimeout(30000);
- commondCloudSolrClient.setParallelUpdates(random().nextBoolean());
- commondCloudSolrClient.setDefaultCollection(DEFAULT_COLLECTION);
- commondCloudSolrClient.connect();
+ if (commonCloudSolrClient == null) {
+ boolean updatesToLeaders = random().nextBoolean();
+ boolean parallelUpdates = random().nextBoolean();
+ commonCloudSolrClient = new CloudSolrClient(zkServer.getZkAddress(),
+ updatesToLeaders);
+ commonCloudSolrClient.getLbClient().setConnectionTimeout(5000);
+ commonCloudSolrClient.getLbClient().setSoTimeout(120000);
+ commonCloudSolrClient.setParallelUpdates(parallelUpdates);
+ commonCloudSolrClient.setDefaultCollection(DEFAULT_COLLECTION);
+ commonCloudSolrClient.connect();
+ log.info("Created commonCloudSolrClient with updatesToLeaders={} and parallelUpdates={}", updatesToLeaders, parallelUpdates);
}
}
- return commondCloudSolrClient;
+ return commonCloudSolrClient;
}
public static String getUrlFromZk(ClusterState clusterState, String collection) {
@@ -1797,25 +1800,11 @@ public abstract class AbstractFullDistri
fail("Could not find the new collection - " + exp.code() + " : " + collectionClient.getBaseURL());
}
- protected void checkForMissingCollection(String collectionName)
- throws Exception {
- // check for a collection - we poll the state
- long timeoutAt = System.currentTimeMillis() + 45000;
- boolean found = true;
- while (System.currentTimeMillis() < timeoutAt) {
- getCommonCloudSolrClient().getZkStateReader().updateClusterState(true);
- ClusterState clusterState = getCommonCloudSolrClient().getZkStateReader().getClusterState();
- if (!clusterState.hasCollection(collectionName)) {
- found = false;
- break;
- }
- Thread.sleep(100);
- }
- if (found) {
- fail("Found collection that should be gone " + collectionName);
- }
+ protected void assertCollectionNotExists(String collectionName, int timeoutSeconds) throws Exception {
+ waitForCollectionToDisappear(collectionName, getCommonCloudSolrClient().getZkStateReader(), false, true, timeoutSeconds);
}
+
protected NamedList<Object> invokeCollectionApi(String... args) throws SolrServerException, IOException {
ModifiableSolrParams params = new ModifiableSolrParams();
SolrRequest request = new QueryRequest(params);