This is an automated email from the ASF dual-hosted git repository. stoty pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/phoenix-queryserver.git
The following commit(s) were added to refs/heads/master by this push: new f5f8c40 PHOENIX-5670 Add the neccesary Synchronisation to the tests in the PQS repo f5f8c40 is described below commit f5f8c402b3f1eecdb121b6c95c8dd2eeabca1faf Author: Istvan Toth <st...@apache.org> AuthorDate: Fri Jan 10 15:34:41 2020 +0100 PHOENIX-5670 Add the neccesary Synchronisation to the tests in the PQS repo Closes #15 --- .../src/it/java/org/apache/phoenix/end2end/LoadBalancerEnd2EndIT.java | 4 ++-- .../apache/phoenix/end2end/HttpParamImpersonationQueryServerIT.java | 4 ++-- .../src/it/java/org/apache/phoenix/end2end/QueryServerBasicsIT.java | 4 ++-- .../src/it/java/org/apache/phoenix/end2end/SecureQueryServerIT.java | 4 ++-- .../java/org/apache/phoenix/end2end/SecureQueryServerPhoenixDBIT.java | 4 ++-- .../src/it/java/org/apache/phoenix/end2end/ServerCustomizersIT.java | 4 ++-- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/load-balancer/src/it/java/org/apache/phoenix/end2end/LoadBalancerEnd2EndIT.java b/load-balancer/src/it/java/org/apache/phoenix/end2end/LoadBalancerEnd2EndIT.java index 8aa516b..da454ca 100644 --- a/load-balancer/src/it/java/org/apache/phoenix/end2end/LoadBalancerEnd2EndIT.java +++ b/load-balancer/src/it/java/org/apache/phoenix/end2end/LoadBalancerEnd2EndIT.java @@ -52,7 +52,7 @@ public class LoadBalancerEnd2EndIT { public static Registry registry; @BeforeClass - public static void setup() throws Exception{ + public static synchronized void setup() throws Exception{ registry = new ZookeeperRegistry(); zkConnectString = LOAD_BALANCER_CONFIGURATION.getZkConnectString(); @@ -70,7 +70,7 @@ public class LoadBalancerEnd2EndIT { } @AfterClass - public static void tearDown() throws Exception { + public static synchronized void tearDown() throws Exception { CloseableUtils.closeQuietly(curatorFramework); CloseableUtils.closeQuietly(testingServer); } diff --git a/queryserver/src/it/java/org/apache/phoenix/end2end/HttpParamImpersonationQueryServerIT.java b/queryserver/src/it/java/org/apache/phoenix/end2end/HttpParamImpersonationQueryServerIT.java index 6d160b7..3990e7c 100644 --- a/queryserver/src/it/java/org/apache/phoenix/end2end/HttpParamImpersonationQueryServerIT.java +++ b/queryserver/src/it/java/org/apache/phoenix/end2end/HttpParamImpersonationQueryServerIT.java @@ -68,7 +68,7 @@ public class HttpParamImpersonationQueryServerIT { PhoenixDatabaseMetaData.SYSTEM_STATS_HBASE_TABLE_NAME); @Parameters(name = "tls = {0}") - public static Iterable<Boolean> data() { + public static synchronized Iterable<Boolean> data() { return Arrays.asList(new Boolean[] {false, true}); } @@ -91,7 +91,7 @@ public class HttpParamImpersonationQueryServerIT { } @AfterClass - public static void stopEnvironment() throws Exception { + public static synchronized void stopEnvironment() throws Exception { environment.stop(); } diff --git a/queryserver/src/it/java/org/apache/phoenix/end2end/QueryServerBasicsIT.java b/queryserver/src/it/java/org/apache/phoenix/end2end/QueryServerBasicsIT.java index 4ebec1b..a641c91 100644 --- a/queryserver/src/it/java/org/apache/phoenix/end2end/QueryServerBasicsIT.java +++ b/queryserver/src/it/java/org/apache/phoenix/end2end/QueryServerBasicsIT.java @@ -66,7 +66,7 @@ public class QueryServerBasicsIT extends BaseHBaseManagedTimeIT { public TestName name = new TestName(); @BeforeClass - public static void beforeClass() throws Exception { + public static synchronized void beforeClass() throws Exception { CONF = getTestClusterConfig(); CONF.setInt(QueryServerProperties.QUERY_SERVER_HTTP_PORT_ATTRIB, 0); String url = getUrl(); @@ -81,7 +81,7 @@ public class QueryServerBasicsIT extends BaseHBaseManagedTimeIT { } @AfterClass - public static void afterClass() throws Exception { + public static synchronized void afterClass() throws Exception { if (AVATICA_SERVER != null) { AVATICA_SERVER.join(TimeUnit.MINUTES.toMillis(1)); Throwable t = AVATICA_SERVER.getQueryServer().getThrowable(); diff --git a/queryserver/src/it/java/org/apache/phoenix/end2end/SecureQueryServerIT.java b/queryserver/src/it/java/org/apache/phoenix/end2end/SecureQueryServerIT.java index 5c59b52..515a339 100644 --- a/queryserver/src/it/java/org/apache/phoenix/end2end/SecureQueryServerIT.java +++ b/queryserver/src/it/java/org/apache/phoenix/end2end/SecureQueryServerIT.java @@ -48,7 +48,7 @@ public class SecureQueryServerIT { private static QueryServerEnvironment environment; @Parameters(name = "tls = {0}") - public static Iterable<Boolean> data() { + public static synchronized Iterable<Boolean> data() { return Arrays.asList(new Boolean[] {false, true}); } @@ -66,7 +66,7 @@ public class SecureQueryServerIT { @AfterClass - public static void stopEnvironment() throws Exception { + public static synchronized void stopEnvironment() throws Exception { environment.stop(); } diff --git a/queryserver/src/it/java/org/apache/phoenix/end2end/SecureQueryServerPhoenixDBIT.java b/queryserver/src/it/java/org/apache/phoenix/end2end/SecureQueryServerPhoenixDBIT.java index 05f7f15..19789b8 100644 --- a/queryserver/src/it/java/org/apache/phoenix/end2end/SecureQueryServerPhoenixDBIT.java +++ b/queryserver/src/it/java/org/apache/phoenix/end2end/SecureQueryServerPhoenixDBIT.java @@ -194,7 +194,7 @@ public class SecureQueryServerPhoenixDBIT { * Setup and start kerberos, hbase */ @BeforeClass - public static void setUp() throws Exception { + public static synchronized void setUp() throws Exception { checkForCommandOnPath("python"); checkForCommandOnPath("virtualenv"); checkForCommandOnPath("kinit"); @@ -295,7 +295,7 @@ public class SecureQueryServerPhoenixDBIT { } @AfterClass - public static void stopKdc() throws Exception { + public static synchronized void stopKdc() throws Exception { // Remove our custom ConfigurationFactory for future tests InstanceResolver.clearSingletons(); if (PQS_EXECUTOR != null) { diff --git a/queryserver/src/it/java/org/apache/phoenix/end2end/ServerCustomizersIT.java b/queryserver/src/it/java/org/apache/phoenix/end2end/ServerCustomizersIT.java index 9c85337..a941749 100644 --- a/queryserver/src/it/java/org/apache/phoenix/end2end/ServerCustomizersIT.java +++ b/queryserver/src/it/java/org/apache/phoenix/end2end/ServerCustomizersIT.java @@ -60,7 +60,7 @@ public class ServerCustomizersIT extends BaseHBaseManagedTimeIT { public ExpectedException expected = ExpectedException.none(); @BeforeClass - public static void setup() throws Exception { + public static synchronized void setup() throws Exception { Configuration conf = getTestClusterConfig(); conf.set(QueryServerProperties.QUERY_SERVER_CUSTOMIZERS_ENABLED, "true"); PQS_UTIL = new QueryServerTestUtil(conf); @@ -78,7 +78,7 @@ public class ServerCustomizersIT extends BaseHBaseManagedTimeIT { } @AfterClass - public static void teardown() throws Exception { + public static synchronized void teardown() throws Exception { // Remove custom singletons for future tests InstanceResolver.clearSingletons(); if (PQS_UTIL != null) {