HBASE-5051 HBaseTestingUtility#getHBaseAdmin() creates a new HBaseAdmin instance at each call - revert

git-svn-id: https://svn.apache.org/repos/asf/hbase/trunk@1215307 13f79535-47bb-0310-9956-ffa450edef68

src/main/java/org/apache/hadoop/hbase/master/HMaster.java

@@ -1478,12 +1478,10 @@ implements HMasterInterface, HMasterRegionInterface, MasterServices, Server {
         LOG.error("Error call master coprocessor preShutdown()", ioe);
       }
     }
-    if (this.assignmentManager != null) this.assignmentManager.shutdown();
-    if (this.serverManager != null) this.serverManager.shutdownCluster();
+    this.assignmentManager.shutdown();
+    this.serverManager.shutdownCluster();
     try {
-      if (this.clusterStatusTracker != null){
-        this.clusterStatusTracker.setClusterDown();
-      }
+      this.clusterStatusTracker.setClusterDown();
     } catch (KeeperException e) {
       LOG.error("ZooKeeper exception trying to set cluster as down in ZK", e);
     }

src/test/java/org/apache/hadoop/hbase/HBaseTestingUtility.java

@@ -579,9 +579,8 @@ public class HBaseTestingUtility {
     }
     s.close();
     t.close();
-
-    getHBaseAdmin(); // create immediately the hbaseAdmin
     LOG.info("Minicluster is up");
+    //getHBaseAdmin();
     return this.hbaseCluster;
   }
 
@@ -643,10 +642,6 @@ public class HBaseTestingUtility {
    * @throws IOException
    */
   public void shutdownMiniHBaseCluster() throws IOException {
-    if (hbaseAdmin != null) {
-      hbaseAdmin.close();
-      hbaseAdmin = null;
-    }
     if (this.hbaseCluster != null) {
       this.hbaseCluster.shutdown();
       // Wait till hbase is down before going on to shutdown zk.
@@ -728,7 +723,9 @@ public class HBaseTestingUtility {
           HColumnDescriptor.DEFAULT_REPLICATION_SCOPE);
       desc.addFamily(hcd);
     }
-    getHBaseAdmin().createTable(desc, startKey, endKey, numRegions);
+    HBaseAdmin admin = getHBaseAdmin();
+    admin.createTable(desc, startKey, endKey, numRegions);
+    admin.close();
     return new HTable(getConfiguration(), tableName);
   }
 
@@ -747,7 +744,9 @@ public class HBaseTestingUtility {
     for(byte[] family : families) {
       desc.addFamily(new HColumnDescriptor(family));
     }
-    getHBaseAdmin().createTable(desc);
+    HBaseAdmin admin = getHBaseAdmin();
+    admin.createTable(desc);
+    admin.close();
     return new HTable(c, tableName);
   }
 
@@ -774,7 +773,9 @@ public class HBaseTestingUtility {
           HColumnDescriptor.DEFAULT_REPLICATION_SCOPE);
       desc.addFamily(hcd);
     }
-    getHBaseAdmin().createTable(desc);
+    HBaseAdmin admin = getHBaseAdmin();
+    admin.createTable(desc);
+    admin.close();
     return new HTable(c, tableName);
   }
 
@@ -813,7 +814,9 @@ public class HBaseTestingUtility {
           HColumnDescriptor.DEFAULT_REPLICATION_SCOPE);
       desc.addFamily(hcd);
     }
-    getHBaseAdmin().createTable(desc);
+    HBaseAdmin admin = getHBaseAdmin();
+    admin.createTable(desc);
+    admin.close();
     return new HTable(new Configuration(getConfiguration()), tableName);
   }
 
@@ -838,7 +841,9 @@ public class HBaseTestingUtility {
           HColumnDescriptor.DEFAULT_REPLICATION_SCOPE);
       desc.addFamily(hcd);
     }
-    getHBaseAdmin().createTable(desc);
+    HBaseAdmin admin = getHBaseAdmin();
+    admin.createTable(desc);
+    admin.close();
     return new HTable(new Configuration(getConfiguration()), tableName);
   }
 
@@ -866,7 +871,9 @@ public class HBaseTestingUtility {
       desc.addFamily(hcd);
       i++;
     }
-    getHBaseAdmin().createTable(desc);
+    HBaseAdmin admin = getHBaseAdmin();
+    admin.createTable(desc);
+    admin.close();
     return new HTable(new Configuration(getConfiguration()), tableName);
   }
 
@@ -875,8 +882,10 @@ public class HBaseTestingUtility {
    * @param tableName existing table
    */
   public void deleteTable(byte[] tableName) throws IOException {
-    getHBaseAdmin().disableTable(tableName);
-    getHBaseAdmin().deleteTable(tableName);
+    HBaseAdmin admin = new HBaseAdmin(getConfiguration());
+    admin.disableTable(tableName);
+    admin.deleteTable(tableName);
+    admin.close();
   }
 
   /**
@@ -1084,12 +1093,14 @@ public class HBaseTestingUtility {
     HConnection conn = table.getConnection();
     conn.clearRegionCache();
     // assign all the new regions IF table is enabled.
-    if (getHBaseAdmin().isTableEnabled(table.getTableName())) {
+    HBaseAdmin admin = getHBaseAdmin();
+    if (admin.isTableEnabled(table.getTableName())) {
       for(HRegionInfo hri : newRegions) {
         hbaseCluster.getMaster().assignRegion(hri);
       }
     }
 
+    admin.close();
     meta.close();
 
     return count;
@@ -1312,21 +1323,14 @@ public class HBaseTestingUtility {
 
   /**
    * Returns a HBaseAdmin instance.
-   * This instance is shared between HBaseTestingUtility intance users.
-   * Don't close it, it will be closed automatically when the
-   * cluster shutdowns
    *
    * @return The HBaseAdmin instance.
    * @throws IOException
    */
-  public synchronized HBaseAdmin getHBaseAdmin()
+  public HBaseAdmin getHBaseAdmin()
   throws IOException {
-    if (hbaseAdmin == null){
-      hbaseAdmin = new HBaseAdmin(new Configuration(getConfiguration()));
-    }
-    return hbaseAdmin;
+    return new HBaseAdmin(new Configuration(getConfiguration()));
   }
-  private HBaseAdmin hbaseAdmin = null;
 
   /**
    * Closes the named region.
@@ -1345,7 +1349,9 @@ public class HBaseTestingUtility {
    * @throws IOException
    */
   public void closeRegion(byte[] regionName) throws IOException {
-    getHBaseAdmin().closeRegion(regionName, null);
+    HBaseAdmin admin = getHBaseAdmin();
+    admin.closeRegion(regionName, null);
+    admin.close();
   }
 
   /**
@@ -1437,12 +1443,14 @@ public class HBaseTestingUtility {
 
   public void waitTableAvailable(byte[] table, long timeoutMillis)
   throws InterruptedException, IOException {
+    HBaseAdmin admin = getHBaseAdmin();
     long startWait = System.currentTimeMillis();
-    while (!getHBaseAdmin().isTableAvailable(table)) {
+    while (!admin.isTableAvailable(table)) {
       assertTrue("Timed out waiting for table " + Bytes.toStringBinary(table),
           System.currentTimeMillis() - startWait < timeoutMillis);
       Thread.sleep(200);
     }
+    admin.close();
   }
 
   /**
@@ -1852,7 +1860,6 @@ public class HBaseTestingUtility {
           totalNumberOfRegions);
 
       admin.createTable(desc, splits);
-      admin.close();
     } catch (MasterNotRunningException e) {
       LOG.error("Master not running", e);
       throw new IOException(e);
@@ -1866,7 +1873,6 @@ public class HBaseTestingUtility {
   public static int getMetaRSPort(Configuration conf) throws IOException {
     HTable table = new HTable(conf, HConstants.META_TABLE_NAME);
     HRegionLocation hloc = table.getRegionLocation(Bytes.toBytes(""));
-    table.close();
     return hloc.getPort();
   }
 

src/test/java/org/apache/hadoop/hbase/client/TestAdmin.java

@@ -82,11 +82,12 @@ public class TestAdmin {
 
   @Before
   public void setUp() throws Exception {
-    this.admin = TEST_UTIL.getHBaseAdmin();
+    this.admin = new HBaseAdmin(TEST_UTIL.getConfiguration());
   }
 
   @After
   public void tearDown() throws Exception {
+    this.admin.close();
   }
 
   @Test

src/test/java/org/apache/hadoop/hbase/client/TestFromClientSide.java

@@ -197,7 +197,6 @@ public class TestFromClientSide {
      assertArrayEquals(T2, kvs[3].getValue());
      assertArrayEquals(T1, kvs[4].getValue());
      scanner.close();
-     h.close();
    }
 
    /**

src/test/java/org/apache/hadoop/hbase/constraint/TestConstraint.java

@@ -126,7 +126,6 @@ public class TestConstraint {
       Throwable t = causes.get(0);
       assertEquals(ConstraintException.class, t.getClass());
     }
-    table.close();
   }
 
   /**
@@ -231,7 +230,6 @@ public class TestConstraint {
     table.put(put);
     // and we make sure that constraints were not run...
     assertFalse(CheckWasRunConstraint.wasRun);
-    table.close();
   }
 
   @After

src/test/java/org/apache/hadoop/hbase/mapreduce/TestImportExport.java

@@ -186,7 +186,6 @@ public class TestImportExport {
         HColumnDescriptor.DEFAULT_BLOOMFILTER,
         HConstants.REPLICATION_SCOPE_LOCAL));
     UTIL.getHBaseAdmin().createTable(desc);
-    t.close();
     t = new HTable(UTIL.getConfiguration(), IMPORT_TABLE);
     args = new String[] {
         IMPORT_TABLE,
@@ -214,6 +213,5 @@ public class TestImportExport {
     assertEquals(now+2, res[4].getTimestamp());
     assertEquals(now+1, res[5].getTimestamp());
     assertEquals(now, res[6].getTimestamp());
-    t.close();
   }
 }

src/test/java/org/apache/hadoop/hbase/mapreduce/TestLoadIncrementalHFilesSplitRecovery.java

@@ -111,7 +111,8 @@ public class TestLoadIncrementalHFilesSplitRecovery {
         htd.addFamily(new HColumnDescriptor(family(i)));
       }
 
-      util.getHBaseAdmin().createTable(htd);
+      HBaseAdmin admin = util.getHBaseAdmin();
+      admin.createTable(htd);
     } catch (TableExistsException tee) {
       LOG.info("Table " + table + " already exists");
     }

src/test/java/org/apache/hadoop/hbase/master/TestMaster.java

@@ -67,6 +67,7 @@ public class TestMaster {
   public void testMasterOpsWhileSplitting() throws Exception {
     MiniHBaseCluster cluster = TEST_UTIL.getHBaseCluster();
     HMaster m = cluster.getMaster();
+    HBaseAdmin admin = TEST_UTIL.getHBaseAdmin();
 
     HTable ht = TEST_UTIL.createTable(TABLENAME, FAMILYNAME);
     TEST_UTIL.loadTable(ht, FAMILYNAME);
@@ -90,7 +91,7 @@ public class TestMaster {
       registerListener(EventType.RS_ZK_REGION_SPLIT, list);
 
     LOG.info("Splitting table");
-    TEST_UTIL.getHBaseAdmin().split(TABLENAME);
+    admin.split(TABLENAME);
     LOG.info("Waiting for split result to be about to open");
     split.await(60, TimeUnit.SECONDS);
     try {
@@ -112,6 +113,7 @@ public class TestMaster {
     } finally {
       proceed.countDown();
     }
+    admin.close();
   }
 
   static class RegionSplitListener implements EventHandlerListener {

src/test/java/org/apache/hadoop/hbase/regionserver/TestHRegionServerBulkLoad.java

@@ -236,7 +236,8 @@ public class TestHRegionServerBulkLoad {
         htd.addFamily(new HColumnDescriptor(family(i)));
       }
 
-      UTIL.getHBaseAdmin().createTable(htd);
+      HBaseAdmin admin = UTIL.getHBaseAdmin();
+      admin.createTable(htd);
     } catch (TableExistsException tee) {
       LOG.info("Table " + table + " already exists");
     }

src/test/java/org/apache/hadoop/hbase/regionserver/wal/TestLogRollAbort.java

@@ -123,8 +123,7 @@ public class TestLogRollAbort {
     LOG.info("Starting testRSAbortWithUnflushedEdits()");
 
     // When the META table can be opened, the region servers are running
-    new HTable(TEST_UTIL.getConfiguration(),
-      HConstants.META_TABLE_NAME).close();
+    new HTable(TEST_UTIL.getConfiguration(), HConstants.META_TABLE_NAME);
 
     // Create the test table and open it
     String tableName = this.getClass().getSimpleName();

src/test/java/org/apache/hadoop/hbase/rest/TestScannersWithFilters.java

@@ -201,6 +201,7 @@ public class TestScannersWithFilters {
       numRows -= 2;
       table.close();
     }
+    admin.close();
   }
 
   @AfterClass

src/test/java/org/apache/hadoop/hbase/rest/TestTableResource.java

@@ -123,7 +123,6 @@ public class TestTableResource {
     assertEquals(m.size(), 2);
     regionMap = m;
     LOG.info("regions: " + regionMap);
-    table.close();
   }
 
   @AfterClass

src/test/java/org/apache/hadoop/hbase/util/hbck/OfflineMetaRebuildTestCore.java

@@ -233,8 +233,6 @@ public class OfflineMetaRebuildTestCore {
     }
     meta.delete(dels);
     meta.flushCommits();
-    scanner.close();
-    meta.close();
   }
 
   /**