You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@hbase.apache.org by je...@apache.org on 2014/02/22 01:46:29 UTC

svn commit: r1570770 - /hbase/branches/0.98/hbase-it/src/test/java/org/apache/hadoop/hbase/IntegrationTestingUtility.java

Author: jeffreyz
Date: Sat Feb 22 00:46:29 2014
New Revision: 1570770

URL: http://svn.apache.org/r1570770
Log:
HBASE-10580: IntegrationTestingUtility#restoreCluster leak resource when running in a mini cluster mode

Modified:
    hbase/branches/0.98/hbase-it/src/test/java/org/apache/hadoop/hbase/IntegrationTestingUtility.java

Modified: hbase/branches/0.98/hbase-it/src/test/java/org/apache/hadoop/hbase/IntegrationTestingUtility.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.98/hbase-it/src/test/java/org/apache/hadoop/hbase/IntegrationTestingUtility.java?rev=1570770&r1=1570769&r2=1570770&view=diff
==============================================================================
--- hbase/branches/0.98/hbase-it/src/test/java/org/apache/hadoop/hbase/IntegrationTestingUtility.java (original)
+++ hbase/branches/0.98/hbase-it/src/test/java/org/apache/hadoop/hbase/IntegrationTestingUtility.java Sat Feb 22 00:46:29 2014
@@ -98,7 +98,12 @@ public class IntegrationTestingUtility e
     if (isDistributedCluster()) {
       getHBaseClusterInterface().restoreInitialStatus();
     } else {
-      getMiniHBaseCluster().shutdown();
+      try {
+        shutdownMiniCluster();
+      } catch (Exception e) {
+        // re-wrap into IOException
+        throw new IOException(e);
+      }
     }
   }