From c7b6dfad629f93174b3be56382324b21550b3390 Mon Sep 17 00:00:00 2001
From: Timothy Potter <thelabdude@apache.org>
Date: Mon, 23 Jun 2014 16:26:08 +0000
Subject: [PATCH] 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
---
 .../solr/cloud/ReplicationFactorTest.java     | 22 ++++++++++++-------
 1 file changed, 14 insertions(+), 8 deletions(-)

diff --git a/solr/core/src/test/org/apache/solr/cloud/ReplicationFactorTest.java b/solr/core/src/test/org/apache/solr/cloud/ReplicationFactorTest.java
index abed059a8b4..86ef1f3d0a8 100644
--- a/solr/core/src/test/org/apache/solr/cloud/ReplicationFactorTest.java
+++ b/solr/core/src/test/org/apache/solr/cloud/ReplicationFactorTest.java
@@ -76,11 +76,8 @@ public class ReplicationFactorTest extends AbstractFullDistribZkTestBase {
   @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 extends AbstractFullDistribZkTestBase {
       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 extends AbstractFullDistribZkTestBase {
     // 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 {