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

SOLR-6157: Hang occurred again, somewhere in tearDown ... changing the code to close the socket proxies after super.tearDown, if that doesn't work, I'll add the AwaitsFix back to the code to ignore this test. 

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1604868 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Timothy Potter 2014-06-23 16:26:08 +00:00
parent f220845368
commit c7b6dfad62
1 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -76,11 +76,8 @@ public class ReplicationFactorTest extends AbstractFullDistribZkTestBase {
@Override @Override
@After @After
public void tearDown() throws Exception { public void tearDown() throws Exception {
if (!proxies.isEmpty()) {
for (SocketProxy proxy : proxies.values()) { log.info("tearing down replicationFactorTest!");
proxy.close();
}
}
System.clearProperty("numShards"); System.clearProperty("numShards");
@ -88,7 +85,14 @@ public class ReplicationFactorTest extends AbstractFullDistribZkTestBase {
super.tearDown(); super.tearDown();
} catch (Exception exc) {} } catch (Exception exc) {}
resetExceptionIgnores(); resetExceptionIgnores();
log.info("super.tearDown complete, closing all socket proxies");
if (!proxies.isEmpty()) {
for (SocketProxy proxy : proxies.values()) {
proxy.close();
}
}
} }
/** /**
@ -142,8 +146,10 @@ public class ReplicationFactorTest extends AbstractFullDistribZkTestBase {
// test handling when not using direct updates // test handling when not using direct updates
log.info("Now testing replication factor handling for repfacttest_c8n_2x2"); log.info("Now testing replication factor handling for repfacttest_c8n_2x2");
testRf2NotUsingDirectUpdates(); testRf2NotUsingDirectUpdates();
log.info("replication factor testing complete"); waitForThingsToLevelOut(30000);
log.info("replication factor testing complete! final clusterState is: "+
cloudClient.getZkStateReader().getClusterState());
} }
protected void testRf2NotUsingDirectUpdates() throws Exception { protected void testRf2NotUsingDirectUpdates() throws Exception {