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

tests: add timeouts for http clients 

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1441946 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Mark Robert Miller 2013-02-03 18:23:40 +00:00
parent 3105772ed7
commit edf7b89e70
1 changed files with 19 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -509,6 +509,8 @@ public class BasicDistributedZkTest extends AbstractFullDistribZkTestBase {
// unload the leader // unload the leader
collectionClient = new HttpSolrServer(leaderProps.getBaseUrl()); collectionClient = new HttpSolrServer(leaderProps.getBaseUrl());
collectionClient.setConnectionTimeout(15000);
collectionClient.setSoTimeout(30000);
Unload unloadCmd = new Unload(false); Unload unloadCmd = new Unload(false);
unloadCmd.setCoreName(leaderProps.getCoreName()); unloadCmd.setCoreName(leaderProps.getCoreName());
@ -531,6 +533,9 @@ public class BasicDistributedZkTest extends AbstractFullDistribZkTestBase {
zkStateReader.getLeaderRetry("unloadcollection", "shard1", 15000); zkStateReader.getLeaderRetry("unloadcollection", "shard1", 15000);
addClient = new HttpSolrServer(url2 + "/unloadcollection2"); addClient = new HttpSolrServer(url2 + "/unloadcollection2");
addClient.setConnectionTimeout(15000);
addClient.setSoTimeout(30000);
// add a few docs while the leader is down // add a few docs while the leader is down
for (int x = 101; x < 200; x++) { for (int x = 101; x < 200; x++) {
SolrInputDocument doc1 = getDoc(id, x, i1, -600, tlong, 600, t1, SolrInputDocument doc1 = getDoc(id, x, i1, -600, tlong, 600, t1,
@ -543,6 +548,8 @@ public class BasicDistributedZkTest extends AbstractFullDistribZkTestBase {
client = clients.get(3); client = clients.get(3);
String url4 = getBaseUrl(client); String url4 = getBaseUrl(client);
server = new HttpSolrServer(url4); server = new HttpSolrServer(url4);
server.setConnectionTimeout(15000);
server.setSoTimeout(30000);
createCmd = new Create(); createCmd = new Create();
createCmd.setCoreName("unloadcollection4"); createCmd.setCoreName("unloadcollection4");
@ -556,6 +563,8 @@ public class BasicDistributedZkTest extends AbstractFullDistribZkTestBase {
// unload the leader again // unload the leader again
leaderProps = getLeaderUrlFromZk("unloadcollection", "shard1"); leaderProps = getLeaderUrlFromZk("unloadcollection", "shard1");
collectionClient = new HttpSolrServer(leaderProps.getBaseUrl()); collectionClient = new HttpSolrServer(leaderProps.getBaseUrl());
collectionClient.setConnectionTimeout(15000);
collectionClient.setSoTimeout(30000);
unloadCmd = new Unload(false); unloadCmd = new Unload(false);
unloadCmd.setCoreName(leaderProps.getCoreName()); unloadCmd.setCoreName(leaderProps.getCoreName());
@ -578,6 +587,8 @@ public class BasicDistributedZkTest extends AbstractFullDistribZkTestBase {
// bring the downed leader back as replica // bring the downed leader back as replica
server = new HttpSolrServer(leaderProps.getBaseUrl()); server = new HttpSolrServer(leaderProps.getBaseUrl());
server.setConnectionTimeout(15000);
server.setSoTimeout(30000);
createCmd = new Create(); createCmd = new Create();
createCmd.setCoreName(leaderProps.getCoreName()); createCmd.setCoreName(leaderProps.getCoreName());
@ -587,20 +598,23 @@ public class BasicDistributedZkTest extends AbstractFullDistribZkTestBase {
waitForRecoveriesToFinish("unloadcollection", zkStateReader, false); waitForRecoveriesToFinish("unloadcollection", zkStateReader, false);
server = new HttpSolrServer(url1 + "/unloadcollection");
// System.out.println(server.query(new SolrQuery("*:*")).getResults().getNumFound());
server = new HttpSolrServer(url2 + "/unloadcollection"); server = new HttpSolrServer(url2 + "/unloadcollection");
server.setConnectionTimeout(15000);
server.setSoTimeout(30000);
server.commit(); server.commit();
SolrQuery q = new SolrQuery("*:*"); SolrQuery q = new SolrQuery("*:*");
q.set("distrib", false); q.set("distrib", false);
long found1 = server.query(q).getResults().getNumFound(); long found1 = server.query(q).getResults().getNumFound();
server = new HttpSolrServer(url3 + "/unloadcollection"); server = new HttpSolrServer(url3 + "/unloadcollection");
server.setConnectionTimeout(15000);
server.setSoTimeout(30000);
server.commit(); server.commit();
q = new SolrQuery("*:*"); q = new SolrQuery("*:*");
q.set("distrib", false); q.set("distrib", false);
long found3 = server.query(q).getResults().getNumFound(); long found3 = server.query(q).getResults().getNumFound();
server = new HttpSolrServer(url4 + "/unloadcollection"); server = new HttpSolrServer(url4 + "/unloadcollection");
server.setConnectionTimeout(15000);
server.setSoTimeout(30000);
server.commit(); server.commit();
q = new SolrQuery("*:*"); q = new SolrQuery("*:*");
q.set("distrib", false); q.set("distrib", false);
@ -1047,6 +1061,8 @@ public class BasicDistributedZkTest extends AbstractFullDistribZkTestBase {
// now test that unloading a core gets us a new leader // now test that unloading a core gets us a new leader
HttpSolrServer server = new HttpSolrServer(baseUrl); HttpSolrServer server = new HttpSolrServer(baseUrl);
server.setConnectionTimeout(15000);
server.setSoTimeout(30000);
Unload unloadCmd = new Unload(true); Unload unloadCmd = new Unload(true);
unloadCmd.setCoreName(props.getCoreName()); unloadCmd.setCoreName(props.getCoreName());