Apache
/
hbase
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

git-svn-id: https://svn.apache.org/repos/asf/hbase/trunk@1220864 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Michael Stack 2011-12-19 17:24:33 +00:00
parent 4e09ea6be8
commit 1f8021eca9
14 changed files with 52 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/java/org/apache/hadoop/hbase/master/HMaster.java
View File

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

62
src/test/java/org/apache/hadoop/hbase/HBaseTestingUtility.java
View File

@ -579,8 +579,9 @@ public class HBaseTestingUtility {
}
s.close();
t.close();
getHBaseAdmin(); // create immediately the hbaseAdmin
LOG.info("Minicluster is up");
//getHBaseAdmin();
return this.hbaseCluster;
}
@ -642,6 +643,10 @@ 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.
@ -723,9 +728,7 @@ public class HBaseTestingUtility {
HColumnDescriptor.DEFAULT_REPLICATION_SCOPE);
desc.addFamily(hcd);
}
HBaseAdmin admin = getHBaseAdmin();
admin.createTable(desc, startKey, endKey, numRegions);
admin.close();
getHBaseAdmin().createTable(desc, startKey, endKey, numRegions);
return new HTable(getConfiguration(), tableName);
}
@ -744,9 +747,7 @@ public class HBaseTestingUtility {
for(byte[] family : families) {
desc.addFamily(new HColumnDescriptor(family));
}
HBaseAdmin admin = getHBaseAdmin();
admin.createTable(desc);
admin.close();
getHBaseAdmin().createTable(desc);
return new HTable(c, tableName);
}
@ -773,9 +774,7 @@ public class HBaseTestingUtility {
HColumnDescriptor.DEFAULT_REPLICATION_SCOPE);
desc.addFamily(hcd);
}
HBaseAdmin admin = getHBaseAdmin();
admin.createTable(desc);
admin.close();
getHBaseAdmin().createTable(desc);
return new HTable(c, tableName);
}
@ -814,9 +813,7 @@ public class HBaseTestingUtility {
HColumnDescriptor.DEFAULT_REPLICATION_SCOPE);
desc.addFamily(hcd);
}
HBaseAdmin admin = getHBaseAdmin();
admin.createTable(desc);
admin.close();
getHBaseAdmin().createTable(desc);
return new HTable(new Configuration(getConfiguration()), tableName);
}
@ -841,9 +838,7 @@ public class HBaseTestingUtility {
HColumnDescriptor.DEFAULT_REPLICATION_SCOPE);
desc.addFamily(hcd);
}
HBaseAdmin admin = getHBaseAdmin();
admin.createTable(desc);
admin.close();
getHBaseAdmin().createTable(desc);
return new HTable(new Configuration(getConfiguration()), tableName);
}
@ -871,9 +866,7 @@ public class HBaseTestingUtility {
desc.addFamily(hcd);
i++;
}
HBaseAdmin admin = getHBaseAdmin();
admin.createTable(desc);
admin.close();
getHBaseAdmin().createTable(desc);
return new HTable(new Configuration(getConfiguration()), tableName);
}
@ -882,10 +875,8 @@ public class HBaseTestingUtility {
* @param tableName existing table
*/
public void deleteTable(byte[] tableName) throws IOException {
HBaseAdmin admin = new HBaseAdmin(getConfiguration());
admin.disableTable(tableName);
admin.deleteTable(tableName);
admin.close();
getHBaseAdmin().disableTable(tableName);
getHBaseAdmin().deleteTable(tableName);
}
/**
@ -1093,14 +1084,12 @@ public class HBaseTestingUtility {
HConnection conn = table.getConnection();
conn.clearRegionCache();
// assign all the new regions IF table is enabled.
HBaseAdmin admin = getHBaseAdmin();
if (admin.isTableEnabled(table.getTableName())) {
if (getHBaseAdmin().isTableEnabled(table.getTableName())) {
for(HRegionInfo hri : newRegions) {
hbaseCluster.getMaster().assignRegion(hri);
}
}
admin.close();
meta.close();
return count;
@ -1323,14 +1312,21 @@ 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 HBaseAdmin getHBaseAdmin()
public synchronized HBaseAdmin getHBaseAdmin()
throws IOException {
return new HBaseAdmin(new Configuration(getConfiguration()));
if (hbaseAdmin == null){
hbaseAdmin = new HBaseAdmin(new Configuration(getConfiguration()));
}
return hbaseAdmin;
}
private HBaseAdmin hbaseAdmin = null;
/**
* Closes the named region.
@ -1349,9 +1345,7 @@ public class HBaseTestingUtility {
* @throws IOException
*/
public void closeRegion(byte[] regionName) throws IOException {
HBaseAdmin admin = getHBaseAdmin();
admin.closeRegion(regionName, null);
admin.close();
getHBaseAdmin().closeRegion(regionName, null);
}
/**
@ -1443,14 +1437,12 @@ public class HBaseTestingUtility {
public void waitTableAvailable(byte[] table, long timeoutMillis)
throws InterruptedException, IOException {
HBaseAdmin admin = getHBaseAdmin();
long startWait = System.currentTimeMillis();
while (!admin.isTableAvailable(table)) {
while (!getHBaseAdmin().isTableAvailable(table)) {
assertTrue("Timed out waiting for table " + Bytes.toStringBinary(table),
System.currentTimeMillis() - startWait < timeoutMillis);
Thread.sleep(200);
}
admin.close();
}
/**
@ -1860,6 +1852,7 @@ public class HBaseTestingUtility {
totalNumberOfRegions);
admin.createTable(desc, splits);
admin.close();
} catch (MasterNotRunningException e) {
LOG.error("Master not running", e);
throw new IOException(e);
@ -1873,6 +1866,7 @@ 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();
}

3
src/test/java/org/apache/hadoop/hbase/client/TestAdmin.java
View File

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

1
src/test/java/org/apache/hadoop/hbase/client/TestFromClientSide.java
View File

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

2
src/test/java/org/apache/hadoop/hbase/constraint/TestConstraint.java
View File

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

2
src/test/java/org/apache/hadoop/hbase/mapreduce/TestImportExport.java
View File

@ -186,6 +186,7 @@ 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,
@ -213,5 +214,6 @@ public class TestImportExport {
assertEquals(now+2, res[4].getTimestamp());
assertEquals(now+1, res[5].getTimestamp());
assertEquals(now, res[6].getTimestamp());
t.close();
}
}

3
src/test/java/org/apache/hadoop/hbase/mapreduce/TestLoadIncrementalHFilesSplitRecovery.java
View File

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

4
src/test/java/org/apache/hadoop/hbase/master/TestMaster.java
View File

@ -67,7 +67,6 @@ 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);
@ -91,7 +90,7 @@ public class TestMaster {
registerListener(EventType.RS_ZK_REGION_SPLIT, list);
LOG.info("Splitting table");
admin.split(TABLENAME);
TEST_UTIL.getHBaseAdmin().split(TABLENAME);
LOG.info("Waiting for split result to be about to open");
split.await(60, TimeUnit.SECONDS);
try {
@ -113,7 +112,6 @@ public class TestMaster {
} finally {
proceed.countDown();
}
admin.close();
}
static class RegionSplitListener implements EventHandlerListener {

6
src/test/java/org/apache/hadoop/hbase/master/TestMasterRestartAfterDisablingTable.java
View File

@ -30,6 +30,7 @@ import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.hbase.*;
import org.apache.hadoop.hbase.client.HBaseAdmin;
import org.apache.hadoop.hbase.client.HTable;
import org.apache.hadoop.hbase.util.Bytes;
import org.apache.hadoop.hbase.util.JVMClusterUtil.MasterThread;
@ -96,7 +97,10 @@ public class TestMasterRestartAfterDisablingTable {
cluster.waitForActiveAndReadyMaster();
log("Enabling table\n");
TEST_UTIL.getHBaseAdmin().enableTable(table);
// Need a new Admin, the previous one is on the old master
HBaseAdmin admin = new HBaseAdmin(TEST_UTIL.getConfiguration());
admin.enableTable(table);
admin.close();
log("Waiting for no more RIT\n");
blockUntilNoRIT(zkw, master);
log("Verifying there are " + numRegions + " assigned on cluster\n");

3
src/test/java/org/apache/hadoop/hbase/regionserver/TestHRegionServerBulkLoad.java
View File

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

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

@ -123,7 +123,8 @@ 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);
new HTable(TEST_UTIL.getConfiguration(),
HConstants.META_TABLE_NAME).close();
// Create the test table and open it
String tableName = this.getClass().getSimpleName();

1
src/test/java/org/apache/hadoop/hbase/rest/TestScannersWithFilters.java
View File

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

1
src/test/java/org/apache/hadoop/hbase/rest/TestTableResource.java
View File

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

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

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