[phoenix] 01/01: Revert "PHOENIX-6302 : De-flake ConcurrentUpsertsWithoutIndexedColsIT"

[yanxinyi]

This is an automated email from the ASF dual-hosted git repository.

yanxinyi pushed a commit to branch revert-1067-PHOENIX-6302-master
in repository https://gitbox.apache.org/repos/asf/phoenix.git

commit 78ed2304158ea45e78fc9a7cc23fe3daeff4044b
Author: Xinyi Yan <yanxi...@gmail.com>
AuthorDate: Wed Jan 6 09:27:22 2021 -0800

    Revert "PHOENIX-6302 : De-flake ConcurrentUpsertsWithoutIndexedColsIT"
---
 .../ConcurrentUpsertsWithoutIndexedColsIT.java      | 21 +++------------------
 1 file changed, 3 insertions(+), 18 deletions(-)

diff --git 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/ConcurrentUpsertsWithoutIndexedColsIT.java
 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/ConcurrentUpsertsWithoutIndexedColsIT.java
index d728b29..bec7e28 100644
--- 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/ConcurrentUpsertsWithoutIndexedColsIT.java
+++ 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/ConcurrentUpsertsWithoutIndexedColsIT.java
@@ -19,14 +19,10 @@
 package org.apache.phoenix.end2end;
 
 import 
org.apache.hbase.thirdparty.com.google.common.util.concurrent.ThreadFactoryBuilder;
-import 
org.apache.phoenix.compat.hbase.coprocessor.CompatBaseScannerRegionObserver;
-import org.apache.phoenix.query.QueryServices;
-import org.apache.phoenix.thirdparty.com.google.common.collect.ImmutableMap;
-import org.apache.phoenix.util.ReadOnlyProps;
 import org.apache.phoenix.util.RunUntilFailure;
 import org.apache.phoenix.util.TestUtil;
-import org.junit.BeforeClass;
 import org.junit.Test;
+import org.junit.experimental.categories.Category;
 import org.junit.runner.RunWith;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -34,7 +30,6 @@ import org.slf4j.LoggerFactory;
 import java.sql.Connection;
 import java.sql.DriverManager;
 import java.sql.SQLException;
-import java.util.Map;
 import java.util.Random;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.ExecutorService;
@@ -47,24 +42,14 @@ import static org.junit.Assert.assertTrue;
 
 
 @RunWith(RunUntilFailure.class)
+@Category(NeedsOwnMiniClusterTest.class)
 public class ConcurrentUpsertsWithoutIndexedColsIT
-        extends BaseUniqueNamesOwnClusterIT {
+        extends ParallelStatsDisabledIT {
 
     private static final Random RANDOM = new Random(5);
     private static final Logger LOGGER =
         LoggerFactory.getLogger(ConcurrentUpsertsWithoutIndexedColsIT.class);
 
-    private static final Map<String, String> PROPS = ImmutableMap.of(
-        QueryServices.GLOBAL_INDEX_ROW_AGE_THRESHOLD_TO_DELETE_MS_ATTRIB,
-        Long.toString(0),
-        CompatBaseScannerRegionObserver.PHOENIX_MAX_LOOKBACK_AGE_CONF_KEY,
-        Integer.toString(1000000));
-
-    @BeforeClass
-    public static synchronized void doSetup() throws Exception {
-        setUpTestDriver(new ReadOnlyProps(PROPS.entrySet().iterator()));
-    }
-
     @Test
     public void testConcurrentUpsertsWithoutIndexedColumns() throws Exception {
         int nThreads = 4;