[phoenix] branch 4.x updated: PHOENIX-6302 : De-flake ConcurrentUpsertsWithoutIndexedColsIT

[yanxinyi]

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

yanxinyi pushed a commit to branch 4.x
in repository https://gitbox.apache.org/repos/asf/phoenix.git


The following commit(s) were added to refs/heads/4.x by this push:
     new 5ae554a  PHOENIX-6302 : De-flake ConcurrentUpsertsWithoutIndexedColsIT
     new 573e4df  Merge pull request #1068 from virajjasani/PHOENIX-6302-4.x
5ae554a is described below

commit 5ae554ae0fbd978a630b2cb209eb71c11f06d482
Author: Viraj Jasani <vjas...@apache.org>
AuthorDate: Wed Jan 6 15:53:49 2021 +0530

    PHOENIX-6302 : De-flake ConcurrentUpsertsWithoutIndexedColsIT
---
 .../ConcurrentUpsertsWithoutIndexedColsIT.java      | 21 ++++++++++++++++++---
 1 file changed, 18 insertions(+), 3 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 43f7388..6e5d247 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,10 +19,14 @@
 package org.apache.phoenix.end2end;
 
 import com.google.common.util.concurrent.ThreadFactoryBuilder;
+import org.apache.hadoop.hbase.regionserver.ScanInfoUtil;
+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;
@@ -30,6 +34,7 @@ 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;
@@ -42,14 +47,24 @@ import static org.junit.Assert.assertTrue;
 
 
 @RunWith(RunUntilFailure.class)
-@Category(NeedsOwnMiniClusterTest.class)
 public class ConcurrentUpsertsWithoutIndexedColsIT
-        extends ParallelStatsDisabledIT {
+        extends BaseUniqueNamesOwnClusterIT {
 
     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),
+        ScanInfoUtil.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;