lucene-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From thelabd...@apache.org
Subject svn commit: r1604868 - /lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/ReplicationFactorTest.java
Date Mon, 23 Jun 2014 16:26:09 GMT
Author: thelabdude
Date: Mon Jun 23 16:26:08 2014
New Revision: 1604868

URL: http://svn.apache.org/r1604868
Log:
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.

Modified:
    lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/ReplicationFactorTest.java

Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/ReplicationFactorTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/ReplicationFactorTest.java?rev=1604868&r1=1604867&r2=1604868&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/ReplicationFactorTest.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/ReplicationFactorTest.java Mon
Jun 23 16:26:08 2014
@@ -76,11 +76,8 @@ public class ReplicationFactorTest exten
   @Override
   @After
   public void tearDown() throws Exception {
-    if (!proxies.isEmpty()) {
-      for (SocketProxy proxy : proxies.values()) {
-        proxy.close();
-      }
-    }
+    
+    log.info("tearing down replicationFactorTest!");
     
     System.clearProperty("numShards");
     
@@ -88,7 +85,14 @@ public class ReplicationFactorTest exten
       super.tearDown();
     } 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 exten
     // test handling when not using direct updates
     log.info("Now testing replication factor handling for repfacttest_c8n_2x2");
     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 {



Mime
View raw message