You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@phoenix.apache.org by ja...@apache.org on 2018/11/06 20:21:43 UTC
phoenix git commit: PHOENIX-5004 Fix
org.jboss.netty.channel.ChannelException: Failed to bind to: flapper
Repository: phoenix
Updated Branches:
refs/heads/omid2 5728e183f -> e13de05a2
PHOENIX-5004 Fix org.jboss.netty.channel.ChannelException: Failed to bind to: flapper
Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo
Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/e13de05a
Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/e13de05a
Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/e13de05a
Branch: refs/heads/omid2
Commit: e13de05a252a8aaaaeb56e1292225199cdefb81c
Parents: 5728e18
Author: James Taylor <ja...@apache.org>
Authored: Tue Nov 6 12:21:32 2018 -0800
Committer: James Taylor <ja...@apache.org>
Committed: Tue Nov 6 12:21:32 2018 -0800
----------------------------------------------------------------------
.../org/apache/phoenix/end2end/IndexToolIT.java | 8 ++++---
.../transaction/OmidTransactionProvider.java | 25 +++++++++++++++++---
.../phoenix/query/QueryServicesTestImpl.java | 4 +---
3 files changed, 28 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/phoenix/blob/e13de05a/phoenix-core/src/it/java/org/apache/phoenix/end2end/IndexToolIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/IndexToolIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/IndexToolIT.java
index c99f145..e096bb5 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/IndexToolIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/IndexToolIT.java
@@ -58,7 +58,6 @@ import org.apache.phoenix.util.SchemaUtil;
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.junit.runners.Parameterized;
import org.junit.runners.Parameterized.Parameters;
@@ -67,8 +66,7 @@ import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
@RunWith(Parameterized.class)
-@Category(NeedsOwnMiniClusterTest.class)
-public class IndexToolIT extends ParallelStatsEnabledIT {
+public class IndexToolIT extends BaseUniqueNamesOwnClusterIT {
private final boolean localIndex;
private final boolean transactional;
@@ -99,9 +97,13 @@ public class IndexToolIT extends ParallelStatsEnabledIT {
@BeforeClass
public static void setup() throws Exception {
Map<String, String> serverProps = Maps.newHashMapWithExpectedSize(2);
+ serverProps.put(QueryServices.STATS_GUIDEPOST_WIDTH_BYTES_ATTRIB, Long.toString(20));
+ serverProps.put(QueryServices.MAX_SERVER_METADATA_CACHE_TIME_TO_LIVE_MS_ATTRIB, Long.toString(5));
serverProps.put(QueryServices.EXTRA_JDBC_ARGUMENTS_ATTRIB,
QueryServicesOptions.DEFAULT_EXTRA_JDBC_ARGUMENTS);
Map<String, String> clientProps = Maps.newHashMapWithExpectedSize(2);
+ clientProps.put(QueryServices.USE_STATS_FOR_PARALLELIZATION, Boolean.toString(true));
+ clientProps.put(QueryServices.STATS_UPDATE_FREQ_MS_ATTRIB, Long.toString(5));
clientProps.put(QueryServices.TRANSACTIONS_ENABLED, Boolean.TRUE.toString());
clientProps.put(QueryServices.FORCE_ROW_KEY_ORDER_ATTRIB, Boolean.TRUE.toString());
setUpTestDriver(new ReadOnlyProps(serverProps.entrySet().iterator()),
http://git-wip-us.apache.org/repos/asf/phoenix/blob/e13de05a/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 610a5d1..98b56ad 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
@@ -18,6 +18,7 @@
package org.apache.phoenix.transaction;
import java.io.IOException;
+import java.net.ServerSocket;
import java.sql.SQLException;
import java.util.Arrays;
@@ -41,11 +42,14 @@ import org.apache.phoenix.exception.SQLExceptionInfo;
import org.apache.phoenix.jdbc.PhoenixConnection;
import org.apache.phoenix.jdbc.PhoenixEmbeddedDriver.ConnectionInfo;
import org.apache.phoenix.transaction.TransactionFactory.Provider;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import com.google.inject.Guice;
import com.google.inject.Injector;
public class OmidTransactionProvider implements PhoenixTransactionProvider {
+ private static final Logger logger = LoggerFactory.getLogger(OmidTransactionProvider.class);
private static final OmidTransactionProvider INSTANCE = new OmidTransactionProvider();
public static final String OMID_TSO_PORT = "phoenix.omid.tso.port";
public static final String OMID_TSO_CONFLICT_MAP_SIZE = "phoenix.omid.tso.conflict.map.size";
@@ -118,16 +122,31 @@ public class OmidTransactionProvider implements PhoenixTransactionProvider {
return commitTableClient;
}
+ /**
+ * Find a random free port in localhost for binding.
+ * @return A port number or -1 for failure.
+ */
+ private static int getRandomPort() {
+ try (ServerSocket socket = new ServerSocket(0)) {
+ return socket.getLocalPort();
+ } catch (IOException e) {
+ return -1;
+ }
+ }
+
@Override
public PhoenixTransactionService getTransactionService(Configuration config, ConnectionInfo connectionInfo) throws SQLException{
TSOServerConfig tsoConfig = new TSOServerConfig();
TSOServer tso;
+ int port;
String portStr = config.get(OMID_TSO_PORT);
- if (portStr == null) {
- throw new IllegalArgumentException(OMID_TSO_PORT + " config parameter must be bound");
+ if (portStr == null) { // For testing, we generate a random port.
+ port = getRandomPort();
+ logger.warn("Using random port for " + OMID_TSO_PORT + " of " + port);
+ } else {
+ port = Integer.parseInt(portStr);
}
- int port = Integer.parseInt(portStr);
tsoConfig.setPort(port);
tsoConfig.setConflictMapSize(config.getInt(OMID_TSO_CONFLICT_MAP_SIZE, DEFAULT_OMID_TSO_CONFLICT_MAP_SIZE));
http://git-wip-us.apache.org/repos/asf/phoenix/blob/e13de05a/phoenix-core/src/test/java/org/apache/phoenix/query/QueryServicesTestImpl.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/test/java/org/apache/phoenix/query/QueryServicesTestImpl.java b/phoenix-core/src/test/java/org/apache/phoenix/query/QueryServicesTestImpl.java
index 841abb6..ab45633 100644
--- a/phoenix-core/src/test/java/org/apache/phoenix/query/QueryServicesTestImpl.java
+++ b/phoenix-core/src/test/java/org/apache/phoenix/query/QueryServicesTestImpl.java
@@ -22,7 +22,6 @@ import static org.apache.phoenix.query.QueryServicesOptions.withDefaults;
import org.apache.curator.shaded.com.google.common.io.Files;
import org.apache.hadoop.hbase.regionserver.wal.IndexedWALEditCodec;
-import org.apache.phoenix.transaction.OmidTransactionProvider;
import org.apache.phoenix.util.PhoenixRuntime;
import org.apache.phoenix.util.ReadOnlyProps;
import org.apache.tephra.TxConstants;
@@ -130,11 +129,10 @@ public final class QueryServicesTestImpl extends BaseQueryServicesImpl {
.set(TxConstants.Service.CFG_DATA_TX_CLIENT_RETRY_STRATEGY, "n-times")
.set(TxConstants.Service.CFG_DATA_TX_CLIENT_ATTEMPTS, 1)
.set(TxConstants.Service.CFG_DATA_TX_BIND_PORT, Networks.getRandomPort())
+ .set(TxConstants.Service.CFG_DATA_TX_CLIENT_DISCOVERY_TIMEOUT_SEC, 60)
.set(TxConstants.Manager.CFG_TX_SNAPSHOT_DIR, Files.createTempDir().getAbsolutePath())
.set(TxConstants.Manager.CFG_TX_TIMEOUT, DEFAULT_TXN_TIMEOUT_SECONDS)
.set(TxConstants.Manager.CFG_TX_SNAPSHOT_INTERVAL, 5L)
- // setup default test configs for Omid
- .set(OmidTransactionProvider.OMID_TSO_PORT, Networks.getRandomPort())
;
}