PHOENIX-7964: Wait for Phoenix system tables to initialize before sta… (#14)

Author: jinggou

phoenix-ddb-rest/src/test/java/org/apache/phoenix/ddb/AccessKeyAuthFilterIT.java

@@ -48,6 +48,7 @@
 import org.apache.phoenix.ddb.rest.util.Constants;
 import org.apache.phoenix.end2end.ServerMetadataCacheTestImpl;
 import org.apache.phoenix.jdbc.PhoenixDriver;
+import org.apache.phoenix.util.PhoenixRuntime;
 import org.apache.phoenix.util.ServerUtil;
 
 import static org.apache.phoenix.query.BaseTest.setUpConfigForMiniCluster;
@@ -89,9 +90,13 @@ public static void setUpBeforeClass() throws Exception {
         utility = new HBaseTestingUtility(conf);
         setUpConfigForMiniCluster(conf);
         utility.startMiniCluster();
-        
+        String zkQuorum = "localhost:" + utility.getZkCluster().getClientPort();
+        String url = PhoenixRuntime.JDBC_PROTOCOL + PhoenixRuntime.JDBC_PROTOCOL_SEPARATOR + zkQuorum;
+
         conf.set(Constants.AUTH_CREDENTIAL_STORE_CLASS, TestCredentialStore.class.getName());
 
+        TestUtils.awaitPhoenixReady(url);
+
         restServer = new RESTServer(conf);
         restServer.run();
         serverAddress = restServer.getServerAddress();

phoenix-ddb-rest/src/test/java/org/apache/phoenix/ddb/BaseSegmentScanIT.java

@@ -92,6 +92,8 @@ public static void initialize() throws Exception {
         url = PhoenixRuntime.JDBC_PROTOCOL + PhoenixRuntime.JDBC_PROTOCOL_SEPARATOR + zkQuorum;
         DriverManager.registerDriver(new PhoenixTestDriver());
 
+        TestUtils.awaitPhoenixReady(url);
+
         restServer = new RESTServer(utility.getConfiguration());
         restServer.run();
 

phoenix-ddb-rest/src/test/java/org/apache/phoenix/ddb/BatchGetItem2IT.java

@@ -116,6 +116,8 @@ public static void initialize() throws Exception {
         String zkQuorum = "localhost:" + utility.getZkCluster().getClientPort();
         url = PhoenixRuntime.JDBC_PROTOCOL + PhoenixRuntime.JDBC_PROTOCOL_SEPARATOR + zkQuorum;
 
+        TestUtils.awaitPhoenixReady(url);
+
         restServer = new RESTServer(utility.getConfiguration());
         restServer.run();
 

phoenix-ddb-rest/src/test/java/org/apache/phoenix/ddb/BatchGetItemIT.java

@@ -81,6 +81,8 @@ public static void initialize() throws Exception {
         String zkQuorum = "localhost:" + utility.getZkCluster().getClientPort();
         url = PhoenixRuntime.JDBC_PROTOCOL + PhoenixRuntime.JDBC_PROTOCOL_SEPARATOR + zkQuorum;
 
+        TestUtils.awaitPhoenixReady(url);
+
         restServer = new RESTServer(utility.getConfiguration());
         restServer.run();
 

phoenix-ddb-rest/src/test/java/org/apache/phoenix/ddb/BatchWriteItem2IT.java

@@ -105,6 +105,8 @@ public static void initialize() throws Exception {
         String zkQuorum = "localhost:" + utility.getZkCluster().getClientPort();
         url = PhoenixRuntime.JDBC_PROTOCOL + PhoenixRuntime.JDBC_PROTOCOL_SEPARATOR + zkQuorum;
 
+        TestUtils.awaitPhoenixReady(url);
+
         restServer = new RESTServer(utility.getConfiguration());
         restServer.run();
 

phoenix-ddb-rest/src/test/java/org/apache/phoenix/ddb/BatchWriteItemIT.java

@@ -83,6 +83,8 @@ public static void initialize() throws Exception {
         String zkQuorum = "localhost:" + utility.getZkCluster().getClientPort();
         url = PhoenixRuntime.JDBC_PROTOCOL + PhoenixRuntime.JDBC_PROTOCOL_SEPARATOR + zkQuorum;
 
+        TestUtils.awaitPhoenixReady(url);
+
         restServer = new RESTServer(utility.getConfiguration());
         restServer.run();
 

phoenix-ddb-rest/src/test/java/org/apache/phoenix/ddb/BinaryEndToEndIT.java

@@ -130,6 +130,8 @@ public static void initialize() throws Exception {
         url = PhoenixRuntime.JDBC_PROTOCOL + PhoenixRuntime.JDBC_PROTOCOL_SEPARATOR + zkQuorum;
         DriverManager.registerDriver(new PhoenixTestDriver());
 
+        TestUtils.awaitPhoenixReady(url);
+
         restServer = new RESTServer(utility.getConfiguration());
         restServer.run();
 

phoenix-ddb-rest/src/test/java/org/apache/phoenix/ddb/BinaryStreamsIT.java

@@ -78,6 +78,8 @@ public static void initialize() throws Exception {
         String zkQuorum = "localhost:" + utility.getZkCluster().getClientPort();
         url = PhoenixRuntime.JDBC_PROTOCOL + PhoenixRuntime.JDBC_PROTOCOL_SEPARATOR + zkQuorum;
         DriverManager.registerDriver(new PhoenixTestDriver());
+        TestUtils.awaitPhoenixReady(url);
+
         restServer = new RESTServer(utility.getConfiguration());
         restServer.run();
         phoenixDBClientV2 = LocalDynamoDB.createV2Client("http://" + restServer.getServerAddress());

phoenix-ddb-rest/src/test/java/org/apache/phoenix/ddb/ConditionalPutItem2IT.java

@@ -80,6 +80,8 @@ public static void initialize() throws Exception {
         String zkQuorum = "localhost:" + utility.getZkCluster().getClientPort();
         url = PhoenixRuntime.JDBC_PROTOCOL + PhoenixRuntime.JDBC_PROTOCOL_SEPARATOR + zkQuorum;
 
+        TestUtils.awaitPhoenixReady(url);
+
         restServer = new RESTServer(utility.getConfiguration());
         restServer.run();
 

phoenix-ddb-rest/src/test/java/org/apache/phoenix/ddb/ConditionalPutItemIT.java

@@ -91,6 +91,8 @@ public static void initialize() throws Exception {
         String zkQuorum = "localhost:" + utility.getZkCluster().getClientPort();
         url = PhoenixRuntime.JDBC_PROTOCOL + PhoenixRuntime.JDBC_PROTOCOL_SEPARATOR + zkQuorum;
 
+        TestUtils.awaitPhoenixReady(url);
+
         restServer = new RESTServer(utility.getConfiguration());
         restServer.run();