You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@phoenix.apache.org by st...@apache.org on 2023/08/17 04:58:30 UTC
[phoenix] branch master updated: PHOENIX-7019 ParallelPhoenixConnectionTest failures because of misconfigured EnvironmentEdgeManager
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.git
The following commit(s) were added to refs/heads/master by this push:
new 6d7e9cb865 PHOENIX-7019 ParallelPhoenixConnectionTest failures because of misconfigured EnvironmentEdgeManager
6d7e9cb865 is described below
commit 6d7e9cb86570e21444db7b786ccb102b9f09ae2b
Author: Istvan Toth <st...@apache.org>
AuthorDate: Wed Aug 16 14:47:42 2023 +0200
PHOENIX-7019 ParallelPhoenixConnectionTest failures because of misconfigured EnvironmentEdgeManager
---
.../java/org/apache/phoenix/index/VerifySingleIndexRowTest.java | 6 ++++++
.../java/org/apache/phoenix/jdbc/ParallelPhoenixConnectionTest.java | 2 +-
2 files changed, 7 insertions(+), 1 deletion(-)
diff --git a/phoenix-core/src/test/java/org/apache/phoenix/index/VerifySingleIndexRowTest.java b/phoenix-core/src/test/java/org/apache/phoenix/index/VerifySingleIndexRowTest.java
index 2e9baab248..9ee3d18c07 100644
--- a/phoenix-core/src/test/java/org/apache/phoenix/index/VerifySingleIndexRowTest.java
+++ b/phoenix-core/src/test/java/org/apache/phoenix/index/VerifySingleIndexRowTest.java
@@ -41,6 +41,7 @@ import org.apache.phoenix.query.QueryConstants;
import org.apache.phoenix.schema.PTable;
import org.apache.phoenix.schema.PTableKey;
import org.apache.phoenix.util.*;
+import org.junit.After;
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
@@ -147,6 +148,11 @@ public class VerifySingleIndexRowTest extends BaseConnectionlessQueryTest {
initializeGlobalMockitoSetup();
}
+ @After
+ public void reset() {
+ EnvironmentEdgeManager.reset();
+ }
+
public void createDBObject() throws SQLException {
try(Connection conn = DriverManager.getConnection(getUrl(), new Properties())) {
schema = generateUniqueName();
diff --git a/phoenix-core/src/test/java/org/apache/phoenix/jdbc/ParallelPhoenixConnectionTest.java b/phoenix-core/src/test/java/org/apache/phoenix/jdbc/ParallelPhoenixConnectionTest.java
index 6cbff851c9..cdc8c2ddb5 100644
--- a/phoenix-core/src/test/java/org/apache/phoenix/jdbc/ParallelPhoenixConnectionTest.java
+++ b/phoenix-core/src/test/java/org/apache/phoenix/jdbc/ParallelPhoenixConnectionTest.java
@@ -232,7 +232,7 @@ public class ParallelPhoenixConnectionTest {
waitForConnectionClose(connection2);
}
- @Test
+ @Test(timeout = 10000)
public void testOpenBothConnectionDelay() throws SQLException {
Properties properties = new Properties();
properties.setProperty(ParallelPhoenixUtil.PHOENIX_HA_PARALLEL_OPERATION_TIMEOUT_ATTRIB,