Repository: phoenix
Updated Branches:
  refs/heads/master 2aa2d1f5b -> ad07077c7


PHOENIX-3308 Shutdown minicluster after parallel tests complete


Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo
Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/ad07077c
Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/ad07077c
Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/ad07077c

Branch: refs/heads/master
Commit: ad07077c7271398a17d14dc4cd11b8bee3b7d4d9
Parents: 2aa2d1f
Author: James Taylor <jamestay...@apache.org>
Authored: Wed Sep 21 22:17:20 2016 -0700
Committer: James Taylor <jamestay...@apache.org>
Committed: Wed Sep 21 22:20:01 2016 -0700

----------------------------------------------------------------------
 ...ritesAndUncompressedWALInHBase_094_9_IT.java | 45 ---------------
 .../phoenix/end2end/ParallelRunListener.java    | 14 ++++-
 .../phoenix/end2end/index/ImmutableIndexIT.java |  9 +--
 .../java/org/apache/phoenix/query/BaseTest.java | 60 ++++++++++++--------
 .../org/apache/phoenix/flume/PhoenixSinkIT.java | 27 +++++----
 .../phoenix/flume/RegexEventSerializerIT.java   |  4 +-
 .../apache/phoenix/pherf/ResultBaseTestIT.java  | 12 ++--
 .../apache/phoenix/pherf/SchemaReaderIT.java    |  4 +-
 .../java/org/apache/phoenix/pig/BasePigIT.java  |  6 +-
 .../phoenix/end2end/QueryServerBasicsIT.java    |  2 +-
 pom.xml                                         | 24 ++++----
 11 files changed, 93 insertions(+), 114 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/phoenix/blob/ad07077c/phoenix-core/src/it/java/org/apache/hadoop/hbase/regionserver/wal/WALReplayWithIndexWritesAndUncompressedWALInHBase_094_9_IT.java
----------------------------------------------------------------------
diff --git 
a/phoenix-core/src/it/java/org/apache/hadoop/hbase/regionserver/wal/WALReplayWithIndexWritesAndUncompressedWALInHBase_094_9_IT.java
 
b/phoenix-core/src/it/java/org/apache/hadoop/hbase/regionserver/wal/WALReplayWithIndexWritesAndUncompressedWALInHBase_094_9_IT.java
deleted file mode 100644
index 5edbdee..0000000
--- 
a/phoenix-core/src/it/java/org/apache/hadoop/hbase/regionserver/wal/WALReplayWithIndexWritesAndUncompressedWALInHBase_094_9_IT.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.hadoop.hbase.regionserver.wal;
-
-import org.apache.hadoop.conf.Configuration;
-import org.apache.hadoop.hbase.HConstants;
-
-import org.apache.phoenix.hbase.index.util.IndexManagementUtil;
-import org.apache.phoenix.util.ConfigUtil;
-
-/**
- * Do the WAL Replay test but with the WALEditCodec, rather than an {@link 
IndexedHLogReader}, but
- * still with compression
- */
-public class WALReplayWithIndexWritesAndUncompressedWALInHBase_094_9_IT 
extends WALReplayWithIndexWritesAndCompressedWALIT {
-
-  @Override
-  protected void configureCluster() throws Exception {
-    Configuration conf = UTIL.getConfiguration();
-    setDefaults(conf);
-    LOG.info("Setting HLog impl to indexed log reader");
-    conf.set(IndexManagementUtil.HLOG_READER_IMPL_KEY, 
IndexedHLogReader.class.getName());
-
-    // disable WAL compression
-    conf.setBoolean(HConstants.ENABLE_WAL_COMPRESSION, false);
-    // set replication required parameter
-    ConfigUtil.setReplicationConfigIfAbsent(conf);
-  }
-}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/phoenix/blob/ad07077c/phoenix-core/src/it/java/org/apache/phoenix/end2end/ParallelRunListener.java
----------------------------------------------------------------------
diff --git 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/ParallelRunListener.java 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/ParallelRunListener.java
index 7da6ec5..6c3a7f5 100644
--- 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/ParallelRunListener.java
+++ 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/ParallelRunListener.java
@@ -22,9 +22,21 @@ import org.junit.runner.Result;
 import org.junit.runner.notification.RunListener;
 
 public class ParallelRunListener extends RunListener {
+    // This causes output to go to the console when run through maven
+    // private static final Log LOG = 
LogFactory.getLog(ParallelRunListener.class);
+    private static final int TEAR_DOWN_THRESHOLD = 200;
+    
+    private int testRuns = 0;
+
     @Override
     public void testRunFinished(Result result) throws Exception {
-        BaseTest.tearDownMiniCluster();
+        testRuns += result.getRunCount();
+        if (testRuns > TEAR_DOWN_THRESHOLD) {
+            // LOG.info("Tearing down mini cluster after " + testRuns + " test 
runs");
+            testRuns = 0;
+            BaseTest.tearDownMiniCluster();
+        }
+
         super.testRunFinished(result);
     }
 }

http://git-wip-us.apache.org/repos/asf/phoenix/blob/ad07077c/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/ImmutableIndexIT.java
----------------------------------------------------------------------
diff --git 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/ImmutableIndexIT.java
 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/ImmutableIndexIT.java
index 3e413e2..40faaf4 100644
--- 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/ImmutableIndexIT.java
+++ 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/ImmutableIndexIT.java
@@ -48,8 +48,7 @@ import 
org.apache.hadoop.hbase.coprocessor.RegionCoprocessorEnvironment;
 import org.apache.hadoop.hbase.coprocessor.SimpleRegionObserver;
 import org.apache.hadoop.hbase.regionserver.wal.WALEdit;
 import org.apache.hadoop.hbase.util.Bytes;
-import org.apache.phoenix.end2end.ParallelStatsDisabledIT;
-import org.apache.phoenix.end2end.Shadower;
+import org.apache.phoenix.end2end.BaseOwnClusterIT;
 import org.apache.phoenix.exception.SQLExceptionCode;
 import org.apache.phoenix.query.BaseTest;
 import org.apache.phoenix.query.QueryServices;
@@ -58,7 +57,6 @@ import org.apache.phoenix.util.ReadOnlyProps;
 import org.apache.phoenix.util.SchemaUtil;
 import org.apache.phoenix.util.TestUtil;
 import org.junit.BeforeClass;
-import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
@@ -69,7 +67,7 @@ import com.google.common.collect.Maps;
 
 
 @RunWith(Parameterized.class)
-public class ImmutableIndexIT extends ParallelStatsDisabledIT {
+public class ImmutableIndexIT extends BaseOwnClusterIT {
 
     private final boolean localIndex;
     private final String tableDDLOptions;
@@ -91,7 +89,6 @@ public class ImmutableIndexIT extends ParallelStatsDisabledIT 
{
     }
 
     @BeforeClass
-    @Shadower(classBeingShadowed = ParallelStatsDisabledIT.class)
     public static void doSetup() throws Exception {
         Map<String, String> serverProps = Maps.newHashMapWithExpectedSize(1);
         serverProps.put("hbase.coprocessor.region.classes", 
CreateIndexRegionObserver.class.getName());
@@ -109,7 +106,6 @@ public class ImmutableIndexIT extends 
ParallelStatsDisabledIT {
     }
 
     @Test
-    @Ignore
     public void testDropIfImmutableKeyValueColumn() throws Exception {
         Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES);
         String tableName = "TBL_" + generateRandomString();
@@ -158,7 +154,6 @@ public class ImmutableIndexIT extends 
ParallelStatsDisabledIT {
         String tableName = "TBL_" + generateRandomString();
         String indexName = "IND_" + generateRandomString();
         String fullTableName = 
SchemaUtil.getTableName(TestUtil.DEFAULT_SCHEMA_NAME, tableName);
-        String fullIndexName = 
SchemaUtil.getTableName(TestUtil.DEFAULT_SCHEMA_NAME, indexName);
         TABLE_NAME = fullTableName;
         String ddl ="CREATE TABLE " + TABLE_NAME + BaseTest.TEST_TABLE_SCHEMA 
+ tableDDLOptions;
         INDEX_DDL = "CREATE " + (localIndex ? "LOCAL" : "") + " INDEX IF NOT 
EXISTS " + indexName + " ON " + TABLE_NAME

http://git-wip-us.apache.org/repos/asf/phoenix/blob/ad07077c/phoenix-core/src/test/java/org/apache/phoenix/query/BaseTest.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/test/java/org/apache/phoenix/query/BaseTest.java 
b/phoenix-core/src/test/java/org/apache/phoenix/query/BaseTest.java
index 331f977..7d7abef 100644
--- a/phoenix-core/src/test/java/org/apache/phoenix/query/BaseTest.java
+++ b/phoenix-core/src/test/java/org/apache/phoenix/query/BaseTest.java
@@ -497,7 +497,7 @@ public abstract class BaseTest {
         return url;
     }
     
-    private static void teardownTxManager() throws SQLException {
+    private static void tearDownTxManager() throws SQLException {
         try {
             if (txService != null) txService.stopAndWait();
         } finally {
@@ -506,6 +506,7 @@ public abstract class BaseTest {
             } finally {
                 txService = null;
                 zkClient = null;
+                txManager = null;
             }
         }
         
@@ -539,14 +540,29 @@ public abstract class BaseTest {
         txService.startAndWait();
     }
 
-    protected static String checkClusterInitialized(ReadOnlyProps 
overrideProps) throws Exception {
+    private static String checkClusterInitialized(ReadOnlyProps serverProps) 
throws Exception {
         if (!clusterInitialized) {
-            url = setUpTestCluster(config, overrideProps);
+            url = setUpTestCluster(config, serverProps);
             clusterInitialized = true;
+            Runtime.getRuntime().addShutdownHook(new Thread() {
+                @Override
+                public void run() {
+                    logger.info("SHUTDOWN: halting JVM now");
+                    Runtime.getRuntime().halt(0);
+                }
+            });
         }
         return url;
     }
     
+    private static void checkTxManagerInitialized(ReadOnlyProps clientProps) 
throws SQLException, IOException {
+        if (txService == null
+                && clientProps.getBoolean(QueryServices.TRANSACTIONS_ENABLED,
+                        QueryServicesOptions.DEFAULT_TRANSACTIONS_ENABLED)) {
+            setupTxManager();
+        }
+    }
+
     /**
      * Set up the test hbase cluster.
      * @return url to be used by clients to connect to the cluster.
@@ -561,16 +577,12 @@ public abstract class BaseTest {
     }
     
     protected static void destroyDriver() throws Exception {
-        try {
-            if (driver != null) {
-                try {
-                    assertTrue(destroyDriver(driver));
-                } finally {
-                    driver = null;
-                }
+        if (driver != null) {
+            try {
+                assertTrue(destroyDriver(driver));
+            } finally {
+                driver = null;
             }
-        } finally {
-            teardownTxManager();
         }
     }
     
@@ -587,16 +599,20 @@ public abstract class BaseTest {
             destroyDriver();
         } finally {
             try {
-                if (utility != null) {
-                    try {
-                        utility.shutdownMiniMapReduceCluster();
-                    } finally {
-                        utility.shutdownMiniCluster();
+                tearDownTxManager();
+            } finally {
+                try {
+                    if (utility != null) {
+                        try {
+                            utility.shutdownMiniMapReduceCluster();
+                        } finally {
+                            utility.shutdownMiniCluster();
+                        }
                     }
+                } finally {
+                    utility = null;
+                    clusterInitialized = false;
                 }
-            } finally {
-                utility = null;
-                clusterInitialized = false;
             }
         }
     }
@@ -607,11 +623,9 @@ public abstract class BaseTest {
     
     protected static void setUpTestDriver(ReadOnlyProps serverProps, 
ReadOnlyProps clientProps) throws Exception {
         String url = checkClusterInitialized(serverProps);
+        checkTxManagerInitialized(clientProps);
         if (driver == null) {
             driver = initAndRegisterTestDriver(url, clientProps);
-            if (clientProps.getBoolean(QueryServices.TRANSACTIONS_ENABLED, 
QueryServicesOptions.DEFAULT_TRANSACTIONS_ENABLED)) {
-                setupTxManager();
-            }
         }
     }
     

http://git-wip-us.apache.org/repos/asf/phoenix/blob/ad07077c/phoenix-flume/src/it/java/org/apache/phoenix/flume/PhoenixSinkIT.java
----------------------------------------------------------------------
diff --git 
a/phoenix-flume/src/it/java/org/apache/phoenix/flume/PhoenixSinkIT.java 
b/phoenix-flume/src/it/java/org/apache/phoenix/flume/PhoenixSinkIT.java
index 9b5988c..2d52fc2 100644
--- a/phoenix-flume/src/it/java/org/apache/phoenix/flume/PhoenixSinkIT.java
+++ b/phoenix-flume/src/it/java/org/apache/phoenix/flume/PhoenixSinkIT.java
@@ -20,8 +20,19 @@ package org.apache.phoenix.flume;
 import static org.apache.phoenix.util.TestUtil.TEST_PROPERTIES;
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
 
-import org.apache.flume.*;
+import java.sql.Connection;
+import java.sql.DriverManager;
+import java.sql.ResultSet;
+import java.util.Properties;
+
+import org.apache.flume.Channel;
+import org.apache.flume.Context;
+import org.apache.flume.Sink;
+import org.apache.flume.SinkFactory;
+import org.apache.flume.Transaction;
 import org.apache.flume.channel.MemoryChannel;
 import org.apache.flume.conf.Configurables;
 import org.apache.flume.event.EventBuilder;
@@ -29,9 +40,9 @@ import org.apache.flume.lifecycle.LifecycleState;
 import org.apache.flume.sink.DefaultSinkFactory;
 import org.apache.hadoop.hbase.client.HBaseAdmin;
 import org.apache.hadoop.hbase.util.Bytes;
-import org.apache.phoenix.end2end.ParallelStatsDisabledIT;
-import org.apache.phoenix.flume.serializer.EventSerializers;
+import org.apache.phoenix.end2end.BaseHBaseManagedTimeIT;
 import org.apache.phoenix.flume.serializer.CustomSerializer;
+import org.apache.phoenix.flume.serializer.EventSerializers;
 import org.apache.phoenix.flume.sink.NullPhoenixSink;
 import org.apache.phoenix.flume.sink.PhoenixSink;
 import org.apache.phoenix.util.PropertiesUtil;
@@ -39,16 +50,8 @@ import org.apache.phoenix.util.TestUtil;
 import org.junit.Assert;
 import org.junit.Test;
 
-import java.sql.Connection;
-import java.sql.DriverManager;
-import java.sql.ResultSet;
-import java.util.Properties;
-
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.verify;
-
 
-public class PhoenixSinkIT extends ParallelStatsDisabledIT {
+public class PhoenixSinkIT extends BaseHBaseManagedTimeIT {
 
     private Context sinkContext;
     private PhoenixSink sink;

http://git-wip-us.apache.org/repos/asf/phoenix/blob/ad07077c/phoenix-flume/src/it/java/org/apache/phoenix/flume/RegexEventSerializerIT.java
----------------------------------------------------------------------
diff --git 
a/phoenix-flume/src/it/java/org/apache/phoenix/flume/RegexEventSerializerIT.java
 
b/phoenix-flume/src/it/java/org/apache/phoenix/flume/RegexEventSerializerIT.java
index eb3f9e8..7348a65 100644
--- 
a/phoenix-flume/src/it/java/org/apache/phoenix/flume/RegexEventSerializerIT.java
+++ 
b/phoenix-flume/src/it/java/org/apache/phoenix/flume/RegexEventSerializerIT.java
@@ -40,7 +40,7 @@ import org.apache.flume.conf.Configurables;
 import org.apache.flume.event.EventBuilder;
 import org.apache.flume.lifecycle.LifecycleState;
 import org.apache.hadoop.hbase.util.Bytes;
-import org.apache.phoenix.end2end.ParallelStatsDisabledIT;
+import org.apache.phoenix.end2end.BaseHBaseManagedTimeIT;
 import org.apache.phoenix.flume.serializer.EventSerializers;
 import org.apache.phoenix.flume.sink.PhoenixSink;
 import org.apache.phoenix.util.PropertiesUtil;
@@ -51,7 +51,7 @@ import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
 
 
-public class RegexEventSerializerIT extends ParallelStatsDisabledIT {
+public class RegexEventSerializerIT extends BaseHBaseManagedTimeIT {
 
     private Context sinkContext;
     private PhoenixSink sink;

http://git-wip-us.apache.org/repos/asf/phoenix/blob/ad07077c/phoenix-pherf/src/it/java/org/apache/phoenix/pherf/ResultBaseTestIT.java
----------------------------------------------------------------------
diff --git 
a/phoenix-pherf/src/it/java/org/apache/phoenix/pherf/ResultBaseTestIT.java 
b/phoenix-pherf/src/it/java/org/apache/phoenix/pherf/ResultBaseTestIT.java
index c300701..1e77f48 100644
--- a/phoenix-pherf/src/it/java/org/apache/phoenix/pherf/ResultBaseTestIT.java
+++ b/phoenix-pherf/src/it/java/org/apache/phoenix/pherf/ResultBaseTestIT.java
@@ -18,7 +18,11 @@
 
 package org.apache.phoenix.pherf;
 
-import org.apache.phoenix.end2end.ParallelStatsDisabledIT;
+import java.nio.file.Path;
+import java.util.List;
+import java.util.Properties;
+
+import org.apache.phoenix.end2end.BaseHBaseManagedTimeIT;
 import org.apache.phoenix.pherf.configuration.XMLConfigParser;
 import org.apache.phoenix.pherf.result.ResultUtil;
 import org.apache.phoenix.pherf.schema.SchemaReader;
@@ -26,11 +30,7 @@ import org.apache.phoenix.pherf.util.PhoenixUtil;
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
 
-import java.nio.file.Path;
-import java.util.List;
-import java.util.Properties;
-
-public class ResultBaseTestIT extends ParallelStatsDisabledIT {
+public class ResultBaseTestIT extends BaseHBaseManagedTimeIT {
     protected static final String matcherScenario = ".*scenario/.*test.*xml";
     protected static final String matcherSchema = ".*datamodel/.*test.*sql";
 

http://git-wip-us.apache.org/repos/asf/phoenix/blob/ad07077c/phoenix-pherf/src/it/java/org/apache/phoenix/pherf/SchemaReaderIT.java
----------------------------------------------------------------------
diff --git 
a/phoenix-pherf/src/it/java/org/apache/phoenix/pherf/SchemaReaderIT.java 
b/phoenix-pherf/src/it/java/org/apache/phoenix/pherf/SchemaReaderIT.java
index c2bfdc1..a897a46 100644
--- a/phoenix-pherf/src/it/java/org/apache/phoenix/pherf/SchemaReaderIT.java
+++ b/phoenix-pherf/src/it/java/org/apache/phoenix/pherf/SchemaReaderIT.java
@@ -30,7 +30,7 @@ import java.sql.SQLException;
 import java.util.ArrayList;
 import java.util.List;
 
-import org.apache.phoenix.end2end.ParallelStatsDisabledIT;
+import org.apache.phoenix.end2end.BaseHBaseManagedTimeIT;
 import org.apache.phoenix.pherf.configuration.Column;
 import org.apache.phoenix.pherf.configuration.DataModel;
 import org.apache.phoenix.pherf.configuration.Scenario;
@@ -40,7 +40,7 @@ import org.apache.phoenix.pherf.util.PhoenixUtil;
 import org.junit.Test;
 
 
-public class SchemaReaderIT extends ParallelStatsDisabledIT {
+public class SchemaReaderIT extends BaseHBaseManagedTimeIT {
     protected static PhoenixUtil util = PhoenixUtil.create(true);
 
     @Test 

http://git-wip-us.apache.org/repos/asf/phoenix/blob/ad07077c/phoenix-pig/src/it/java/org/apache/phoenix/pig/BasePigIT.java
----------------------------------------------------------------------
diff --git a/phoenix-pig/src/it/java/org/apache/phoenix/pig/BasePigIT.java 
b/phoenix-pig/src/it/java/org/apache/phoenix/pig/BasePigIT.java
index 2840a62..94ccc25 100644
--- a/phoenix-pig/src/it/java/org/apache/phoenix/pig/BasePigIT.java
+++ b/phoenix-pig/src/it/java/org/apache/phoenix/pig/BasePigIT.java
@@ -27,7 +27,7 @@ import java.util.Map;
 import java.util.Properties;
 
 import org.apache.hadoop.conf.Configuration;
-import org.apache.phoenix.end2end.ParallelStatsDisabledIT;
+import org.apache.phoenix.end2end.BaseHBaseManagedTimeIT;
 import org.apache.phoenix.end2end.Shadower;
 import org.apache.phoenix.query.QueryServices;
 import org.apache.phoenix.query.QueryServicesOptions;
@@ -42,7 +42,7 @@ import org.junit.BeforeClass;
 
 import com.google.common.collect.Maps;
 
-public class BasePigIT extends ParallelStatsDisabledIT {
+public class BasePigIT extends BaseHBaseManagedTimeIT {
     protected TupleFactory tupleFactory;
     protected String zkQuorum;
     protected Connection conn;
@@ -50,7 +50,7 @@ public class BasePigIT extends ParallelStatsDisabledIT {
     protected PigServer pigServer;
 
     @BeforeClass
-    @Shadower(classBeingShadowed = ParallelStatsDisabledIT.class)
+    @Shadower(classBeingShadowed = BaseHBaseManagedTimeIT.class)
     public static void doSetup() throws Exception {
         Map<String,String> props = Maps.newHashMapWithExpectedSize(3);
         props.put(QueryServices.EXTRA_JDBC_ARGUMENTS_ATTRIB, 
QueryServicesOptions.DEFAULT_EXTRA_JDBC_ARGUMENTS);

http://git-wip-us.apache.org/repos/asf/phoenix/blob/ad07077c/phoenix-queryserver/src/it/java/org/apache/phoenix/end2end/QueryServerBasicsIT.java
----------------------------------------------------------------------
diff --git 
a/phoenix-queryserver/src/it/java/org/apache/phoenix/end2end/QueryServerBasicsIT.java
 
b/phoenix-queryserver/src/it/java/org/apache/phoenix/end2end/QueryServerBasicsIT.java
index 967e320..ba49bab 100644
--- 
a/phoenix-queryserver/src/it/java/org/apache/phoenix/end2end/QueryServerBasicsIT.java
+++ 
b/phoenix-queryserver/src/it/java/org/apache/phoenix/end2end/QueryServerBasicsIT.java
@@ -50,7 +50,7 @@ import org.junit.Test;
 /**
  * Smoke test for query server.
  */
-public class QueryServerBasicsIT extends ParallelStatsDisabledIT {
+public class QueryServerBasicsIT extends BaseHBaseManagedTimeIT {
 
   private static final Log LOG = LogFactory.getLog(QueryServerBasicsIT.class);
 

http://git-wip-us.apache.org/repos/asf/phoenix/blob/ad07077c/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index f02eb7b..987b19a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -118,7 +118,7 @@
 
     <!-- Plugin options -->
     <numForkedUT>3</numForkedUT>
-    <numForkedIT>5</numForkedIT>
+    <numForkedIT>6</numForkedIT>
 
     <!-- Set default encoding so multi-byte tests work correctly on the Mac -->
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -316,12 +316,6 @@
                 
<testSourceDirectory>${basedir}/src/it/java</testSourceDirectory>
                 
<groups>org.apache.phoenix.end2end.HBaseManagedTimeTest</groups>
                 <shutdown>kill</shutdown>
-                <properties>
-                  <property>
-                    <name>listener</name>
-                    
<value>org.apache.phoenix.end2end.ParallelRunListener</value>
-                  </property>
-                </properties>
               </configuration>
               <goals>
                 <goal>integration-test</goal>
@@ -329,8 +323,8 @@
               </goals>
             </execution>
            <execution>
-               <id>NeedTheirOwnClusterTests</id>
-                 <configuration>
+              <id>NeedTheirOwnClusterTests</id>
+              <configuration>
                  <encoding>UTF-8</encoding>
                  <forkCount>${numForkedIT}</forkCount>
                  <runOrder>alphabetical</runOrder>
@@ -340,11 +334,17 @@
                  
<testSourceDirectory>${basedir}/src/it/java</testSourceDirectory>
                  
<groups>org.apache.phoenix.end2end.NeedsOwnMiniClusterTest</groups>
                  <shutdown>kill</shutdown>
-               </configuration>
-               <goals>
+                <properties>
+                  <property>
+                    <name>listener</name>
+                    
<value>org.apache.phoenix.end2end.ParallelRunListener</value>
+                  </property>
+                </properties>
+              </configuration>
+              <goals>
                  <goal>integration-test</goal>
                  <goal>verify</goal>
-               </goals>
+              </goals>
             </execution>
           </executions>
         </plugin>

Reply via email to