src/test/org/apache/hadoop/hbase/EvaluationClient.java src/test/org/apache/hadoop/hbase/TestHClient.java @@ -10,3 +10,5 @@ Trunk (unreleased changes) java.util.concurrent.locks.ReentrantLock (Michael Stack) 5. HADOOP-1403. HBase reliability - make master and region server more fault tolerant. + 6. HADOOP-1418. HBase miscellaneous: unit test for HClient, client to do + 'Performance Evaluation', etc. CHANGES.txt @@ -32,9 +32,9 @@ import org.apache.hadoop.io.DataInputBuffer; import org.apache.hadoop.io.Text; import org.apache.hadoop.ipc.RPC; -/******************************************************************************* +/** * HClient manages a connection to a single HRegionServer. - ******************************************************************************/ + */ public class HClient implements HConstants { private final Log LOG = LogFactory.getLog(this.getClass().getName()); @@ -44,7 +44,6 @@ public class HClient implements HConstants { private static final Text EMPTY_START_ROW = new Text(); - private boolean closed; private long clientTimeout; private int numTimeouts; private int numRetries; @@ -82,7 +81,6 @@ public class HClient implements HConstants { /** Creates a new HClient */ public HClient(Configuration conf) { - this.closed = false; this.conf = conf; this.clientTimeout = conf.getLong("hbase.client.timeout.length", 30 * 1000); @@ -102,15 +100,6 @@ public class HClient implements HConstants { } /** - * Check client is open. - */ - private void checkOpen() { - if (this.closed) { - throw new IllegalStateException("client is not open"); - } - } - - /** * Find the address of the master and connect to it */ private void checkMaster() { @@ -119,7 +108,8 @@ public class HClient implements HConstants { } for(int tries = 0; this.master == null && tries < numRetries; tries++) { HServerAddress masterLocation = - new HServerAddress(this.conf.get(MASTER_ADDRESS)); + new HServerAddress(this.conf.get(MASTER_ADDRESS, + DEFAULT_MASTER_ADDRESS)); try { HMasterInterface tryMaster = @@ -159,21 +149,18 @@ public class HClient implements HConstants { throw new IllegalArgumentException(desc.getName().toString() + " is a reserved table name"); } - checkOpen(); checkMaster(); locateRootRegion(); this.master.createTable(desc); } public synchronized void deleteTable(Text tableName) throws IOException { - checkOpen(); checkMaster(); locateRootRegion(); this.master.deleteTable(tableName); } public synchronized void shutdown() throws IOException { - checkOpen(); checkMaster(); this.master.shutdown(); } @@ -182,7 +169,6 @@ public class HClient implements HConstants { if(tableName == null || tableName.getLength() == 0) { throw new IllegalArgumentException("table name cannot be null or zero length"); } - checkOpen(); this.tableServers = tablesToServers.get(tableName); if(this.tableServers == null ) { // We don't know where the table is findTableInMeta(tableName); // Load the information from meta @@ -322,7 +308,6 @@ public class HClient implements HConstants { } if (rootRegionLocation == null) { - this.closed = true; throw new IOException("unable to locate root region server"); } } @@ -455,14 +440,6 @@ public class HClient implements HConstants { return server; } - /** Close the connection */ - public synchronized void close() throws IOException { - if(! this.closed) { - RPC.stopClient(); - this.closed = true; - } - } - /** * List all the userspace tables. In other words, scan the META table. * @@ -927,7 +904,7 @@ public class HClient implements HConstants { " createTable webcrawl contents: anchors: 10"); } - int doCommandLine(final String args[]) { + public int doCommandLine(final String args[]) { // Process command-line args. TODO: Better cmd-line processing // (but hopefully something not as painful as cli options). int errCode = -1; src/java/org/apache/hadoop/hbase/HClient.java @@ -24,11 +24,11 @@ public abstract class HBaseClusterTestCase extends HBaseTestCase { final boolean miniHdfs; protected HBaseClusterTestCase() { - this(false); + this(true); } protected HBaseClusterTestCase(String name) { - this(name, false); + this(name, true); } protected HBaseClusterTestCase(final boolean miniHdfs) { src/test/org/apache/hadoop/hbase/HBaseClusterTestCase.java @@ -58,9 +58,6 @@ public class TestHBaseCluster extends HBaseClusterTestCase { public void tearDown() throws Exception { super.tearDown(); - if(client != null) { - client.close(); - } } private static final int FIRST_ROW = 1; src/test/org/apache/hadoop/hbase/TestHBaseCluster.java src/java/org/apache/hadoop/hbase/HLocking.java eef70687dda6bf67967430b9cf75fc0e91cfdae5 Jim Kellerman jimk@apache.org http://github.com/andrewmccall/hbase/commit/d905549f0fcfc50fdb40fcaf123da5ede8762032 d905549f0fcfc50fdb40fcaf123da5ede8762032 2007-05-22T13:24:22-07:00 2007-05-22T13:24:22-07:00 HADOOP-1418. HBase miscellaneous: unit test for HClient, client to do 'Performance Evaluation', etc. git-svn-id: https://svn.apache.org/repos/asf/lucene/hadoop/trunk/src/contrib/hbase@540737 13f79535-47bb-0310-9956-ffa450edef68 91a1c807d530fb3b5055e9fb1e7fb79a3650b447 Jim Kellerman jimk@apache.org