[1/2] phoenix git commit: PHOENIX-5028 Delay acquisition of port and increase Tephra test discovery timeouts
Repository: phoenix
Updated Branches:
refs/heads/master d128553c8 -> 956755fab
PHOENIX-5028 Delay acquisition of port and increase Tephra test discovery
timeouts
Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo
Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/39b5fe99
Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/39b5fe99
Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/39b5fe99
Branch: refs/heads/master
Commit: 39b5fe99fb28add8def94f09dffc1507ff5abce1
Parents: d128553
Author: James Taylor
Authored: Sat Nov 17 15:13:59 2018 -0800
Committer: James Taylor
Committed: Sat Nov 17 15:36:50 2018 -0800
--
.../end2end/ConnectionQueryServicesTestImpl.java | 4 +++-
.../transaction/OmidTransactionProvider.java | 2 +-
.../transaction/PhoenixTransactionProvider.java| 2 +-
.../transaction/TephraTransactionProvider.java | 17 ++---
.../phoenix/query/QueryServicesTestImpl.java | 3 ---
5 files changed, 15 insertions(+), 13 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/phoenix/blob/39b5fe99/phoenix-core/src/it/java/org/apache/phoenix/end2end/ConnectionQueryServicesTestImpl.java
--
diff --git
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/ConnectionQueryServicesTestImpl.java
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/ConnectionQueryServicesTestImpl.java
index 6ebaa65..969e0f4 100644
---
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/ConnectionQueryServicesTestImpl.java
+++
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/ConnectionQueryServicesTestImpl.java
@@ -35,6 +35,7 @@ import
org.apache.phoenix.transaction.PhoenixTransactionService;
import org.apache.phoenix.transaction.TransactionFactory;
import org.apache.phoenix.transaction.TransactionFactory.Provider;
import org.apache.phoenix.util.SQLCloseables;
+import org.apache.phoenix.util.TestUtil;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -102,7 +103,8 @@ public class ConnectionQueryServicesTestImpl extends
ConnectionQueryServicesImpl
public synchronized PhoenixTransactionClient
initTransactionClient(Provider provider) throws SQLException {
PhoenixTransactionService txService = txServices[provider.ordinal()];
if (txService == null) {
-txService = txServices[provider.ordinal()] =
provider.getTransactionProvider().getTransactionService(config, connectionInfo);
+int port = TestUtil.getRandomPort();
+txService = txServices[provider.ordinal()] =
provider.getTransactionProvider().getTransactionService(config, connectionInfo,
port);
}
return super.initTransactionClient(provider);
}
http://git-wip-us.apache.org/repos/asf/phoenix/blob/39b5fe99/phoenix-core/src/main/java/org/apache/phoenix/transaction/OmidTransactionProvider.java
--
diff --git
a/phoenix-core/src/main/java/org/apache/phoenix/transaction/OmidTransactionProvider.java
b/phoenix-core/src/main/java/org/apache/phoenix/transaction/OmidTransactionProvider.java
index c53215c..bace2bc 100644
---
a/phoenix-core/src/main/java/org/apache/phoenix/transaction/OmidTransactionProvider.java
+++
b/phoenix-core/src/main/java/org/apache/phoenix/transaction/OmidTransactionProvider.java
@@ -72,7 +72,7 @@ public class OmidTransactionProvider implements
PhoenixTransactionProvider {
}
@Override
-public PhoenixTransactionService getTransactionService(Configuration
config, ConnectionInfo connectionInfo) throws SQLException{
+public PhoenixTransactionService getTransactionService(Configuration
config, ConnectionInfo connectionInfo, int port) throws SQLException{
return new OmidTransactionService();
}
http://git-wip-us.apache.org/repos/asf/phoenix/blob/39b5fe99/phoenix-core/src/main/java/org/apache/phoenix/transaction/PhoenixTransactionProvider.java
--
diff --git
a/phoenix-core/src/main/java/org/apache/phoenix/transaction/PhoenixTransactionProvider.java
b/phoenix-core/src/main/java/org/apache/phoenix/transaction/PhoenixTransactionProvider.java
index b7f660e..3af554b 100644
---
a/phoenix-core/src/main/java/org/apache/phoenix/transaction/PhoenixTransactionProvider.java
+++
b/phoenix-core/src/main/java/org/apache/phoenix/transaction/PhoenixTransactionProvider.java
@@ -50,7 +50,7 @@ public interface PhoenixTransactionProvider {
public PhoenixTransactionContext getTransactionContext(PhoenixConnection
connection) throws SQLException;
public PhoenixTransactionClient getTransactionClient(Configuration config,
ConnectionInfo connectionInfo) throws SQLException;
-public PhoenixTransactionService
[1/2] phoenix git commit: PHOENIX-5028 Delay acquisition of port and increase Tephra test discovery timeouts
Repository: phoenix
Updated Branches:
refs/heads/4.x-HBase-1.4 9a6abc299 -> c3553d464
PHOENIX-5028 Delay acquisition of port and increase Tephra test discovery
timeouts
Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo
Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/4921b1cd
Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/4921b1cd
Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/4921b1cd
Branch: refs/heads/4.x-HBase-1.4
Commit: 4921b1cddbc497d07390b5d6f7c34f62e2520494
Parents: 9a6abc2
Author: James Taylor
Authored: Sat Nov 17 15:13:59 2018 -0800
Committer: James Taylor
Committed: Sat Nov 17 15:32:09 2018 -0800
--
.../end2end/ConnectionQueryServicesTestImpl.java | 4 +++-
.../transaction/OmidTransactionProvider.java | 2 +-
.../transaction/PhoenixTransactionProvider.java| 2 +-
.../transaction/TephraTransactionProvider.java | 17 ++---
.../phoenix/query/QueryServicesTestImpl.java | 3 ---
5 files changed, 15 insertions(+), 13 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/phoenix/blob/4921b1cd/phoenix-core/src/it/java/org/apache/phoenix/end2end/ConnectionQueryServicesTestImpl.java
--
diff --git
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/ConnectionQueryServicesTestImpl.java
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/ConnectionQueryServicesTestImpl.java
index 6ebaa65..969e0f4 100644
---
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/ConnectionQueryServicesTestImpl.java
+++
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/ConnectionQueryServicesTestImpl.java
@@ -35,6 +35,7 @@ import
org.apache.phoenix.transaction.PhoenixTransactionService;
import org.apache.phoenix.transaction.TransactionFactory;
import org.apache.phoenix.transaction.TransactionFactory.Provider;
import org.apache.phoenix.util.SQLCloseables;
+import org.apache.phoenix.util.TestUtil;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -102,7 +103,8 @@ public class ConnectionQueryServicesTestImpl extends
ConnectionQueryServicesImpl
public synchronized PhoenixTransactionClient
initTransactionClient(Provider provider) throws SQLException {
PhoenixTransactionService txService = txServices[provider.ordinal()];
if (txService == null) {
-txService = txServices[provider.ordinal()] =
provider.getTransactionProvider().getTransactionService(config, connectionInfo);
+int port = TestUtil.getRandomPort();
+txService = txServices[provider.ordinal()] =
provider.getTransactionProvider().getTransactionService(config, connectionInfo,
port);
}
return super.initTransactionClient(provider);
}
http://git-wip-us.apache.org/repos/asf/phoenix/blob/4921b1cd/phoenix-core/src/main/java/org/apache/phoenix/transaction/OmidTransactionProvider.java
--
diff --git
a/phoenix-core/src/main/java/org/apache/phoenix/transaction/OmidTransactionProvider.java
b/phoenix-core/src/main/java/org/apache/phoenix/transaction/OmidTransactionProvider.java
index c53215c..bace2bc 100644
---
a/phoenix-core/src/main/java/org/apache/phoenix/transaction/OmidTransactionProvider.java
+++
b/phoenix-core/src/main/java/org/apache/phoenix/transaction/OmidTransactionProvider.java
@@ -72,7 +72,7 @@ public class OmidTransactionProvider implements
PhoenixTransactionProvider {
}
@Override
-public PhoenixTransactionService getTransactionService(Configuration
config, ConnectionInfo connectionInfo) throws SQLException{
+public PhoenixTransactionService getTransactionService(Configuration
config, ConnectionInfo connectionInfo, int port) throws SQLException{
return new OmidTransactionService();
}
http://git-wip-us.apache.org/repos/asf/phoenix/blob/4921b1cd/phoenix-core/src/main/java/org/apache/phoenix/transaction/PhoenixTransactionProvider.java
--
diff --git
a/phoenix-core/src/main/java/org/apache/phoenix/transaction/PhoenixTransactionProvider.java
b/phoenix-core/src/main/java/org/apache/phoenix/transaction/PhoenixTransactionProvider.java
index b7f660e..3af554b 100644
---
a/phoenix-core/src/main/java/org/apache/phoenix/transaction/PhoenixTransactionProvider.java
+++
b/phoenix-core/src/main/java/org/apache/phoenix/transaction/PhoenixTransactionProvider.java
@@ -50,7 +50,7 @@ public interface PhoenixTransactionProvider {
public PhoenixTransactionContext getTransactionContext(PhoenixConnection
connection) throws SQLException;
public PhoenixTransactionClient getTransactionClient(Configuration config,
ConnectionInfo connectionInfo) throws SQLException;
-public
