You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by nk...@apache.org on 2012/08/29 15:55:19 UTC
svn commit: r1378559 - in
/hbase/trunk/hbase-server/src/test/java/org/apache/hadoop/hbase/thrift:
TestThriftServer.java TestThriftServerCmdLine.java
Author: nkeywal
Date: Wed Aug 29 13:55:19 2012
New Revision: 1378559
URL: http://svn.apache.org/viewvc?rev=1378559&view=rev
Log:
HBASE-6655 thrift.TestThriftServerCmdLine takes too much time: 733.972 sec
Modified:
hbase/trunk/hbase-server/src/test/java/org/apache/hadoop/hbase/thrift/TestThriftServer.java
hbase/trunk/hbase-server/src/test/java/org/apache/hadoop/hbase/thrift/TestThriftServerCmdLine.java
Modified: hbase/trunk/hbase-server/src/test/java/org/apache/hadoop/hbase/thrift/TestThriftServer.java
URL: http://svn.apache.org/viewvc/hbase/trunk/hbase-server/src/test/java/org/apache/hadoop/hbase/thrift/TestThriftServer.java?rev=1378559&r1=1378558&r2=1378559&view=diff
==============================================================================
--- hbase/trunk/hbase-server/src/test/java/org/apache/hadoop/hbase/thrift/TestThriftServer.java (original)
+++ hbase/trunk/hbase-server/src/test/java/org/apache/hadoop/hbase/thrift/TestThriftServer.java Wed Aug 29 13:55:19 2012
@@ -205,6 +205,10 @@ public class TestThriftServer {
assertEquals(handler.getTableNames().size(), 2);
}
+ public static void checkTableList(Hbase.Iface handler) throws Exception {
+ assertTrue(handler.getTableNames().contains(tableAname));
+ }
+
public static void dropTestTables(Hbase.Iface handler) throws Exception {
handler.disableTable(tableBname);
assertFalse(handler.isTableEnabled(tableBname));
Modified: hbase/trunk/hbase-server/src/test/java/org/apache/hadoop/hbase/thrift/TestThriftServerCmdLine.java
URL: http://svn.apache.org/viewvc/hbase/trunk/hbase-server/src/test/java/org/apache/hadoop/hbase/thrift/TestThriftServerCmdLine.java?rev=1378559&r1=1378558&r2=1378559&view=diff
==============================================================================
--- hbase/trunk/hbase-server/src/test/java/org/apache/hadoop/hbase/thrift/TestThriftServerCmdLine.java (original)
+++ hbase/trunk/hbase-server/src/test/java/org/apache/hadoop/hbase/thrift/TestThriftServerCmdLine.java Wed Aug 29 13:55:19 2012
@@ -87,8 +87,8 @@ public class TestThriftServerCmdLine {
continue;
}
for (boolean specifyCompact : new boolean[] {false, true}) {
- parameters.add(new Object[]{implType, new Boolean(specifyFramed),
- new Boolean(specifyBindIP), new Boolean(specifyCompact)});
+ parameters.add(new Object[]{implType, specifyFramed,
+ specifyBindIP, specifyCompact});
}
}
}
@@ -167,7 +167,10 @@ public class TestThriftServerCmdLine {
thriftServer = new ThriftServer(TEST_UTIL.getConfiguration());
startCmdLineThread(args.toArray(new String[0]));
- Threads.sleepWithoutInterrupt(2000);
+
+ while ( thriftServer.serverRunner == null || thriftServer.serverRunner.tserver == null ){
+ Thread.sleep(1);
+ }
Class<? extends TServer> expectedClass = implType != null ?
implType.serverClass : TBoundedThreadPoolServer.class;
@@ -189,6 +192,8 @@ public class TestThriftServerCmdLine {
}
}
+ private static volatile boolean tableCreated = false;
+
private void talkToThriftServer() throws Exception {
TSocket sock = new TSocket(InetAddress.getLocalHost().getHostName(),
port);
@@ -206,10 +211,12 @@ public class TestThriftServerCmdLine {
prot = new TBinaryProtocol(transport);
}
Hbase.Client client = new Hbase.Client(prot);
- TestThriftServer.doTestTableCreateDrop(client);
- TestThriftServer.doTestGetRegionInfo(client);
- TestThriftServer.doTestGetTableRegions(client);
- TestThriftServer.doTestTableMutations(client);
+ if (!tableCreated){
+ TestThriftServer.createTestTables(client);
+ tableCreated = true;
+ }
+ TestThriftServer.checkTableList(client);
+
} finally {
sock.close();
}