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/25 08:25:35 UTC
[phoenix-omid] branch master updated: OMID-247 Change TSO default port to be outside the ephemeral range
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-omid.git
The following commit(s) were added to refs/heads/master by this push:
new 7d3cf3e8 OMID-247 Change TSO default port to be outside the ephemeral range
7d3cf3e8 is described below
commit 7d3cf3e83586bc523e20277113ecb844172cefc0
Author: Istvan Toth <st...@apache.org>
AuthorDate: Mon Aug 21 06:38:46 2023 +0200
OMID-247 Change TSO default port to be outside the ephemeral range
---
benchmarks/src/main/resources/default-tso-server-benchmark-config.yml | 2 +-
doc/site/markdown/basic-examples.md | 2 +-
doc/site/markdown/quickstart.md | 4 ++--
.../src/main/java/org/apache/omid/examples/ConfigurationExample.java | 2 +-
examples/src/main/resources/hbase-omid-client-config.yml | 2 +-
hbase-client/src/test/resources/test-hbase-omid-client-config.yml | 2 +-
transaction-client/src/main/resources/omid-client-config.yml | 2 +-
transaction-client/src/test/resources/tlstest-omid-client-config.yml | 2 +-
tso-server/src/main/resources/default-omid-server-configuration.yml | 2 +-
tso-server/src/test/resources/test-omid.yml | 2 +-
tso-server/src/test/resources/tlstest-omid-server-config.yml | 2 +-
11 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/benchmarks/src/main/resources/default-tso-server-benchmark-config.yml b/benchmarks/src/main/resources/default-tso-server-benchmark-config.yml
index 101e5f8f..8cd2b1a0 100644
--- a/benchmarks/src/main/resources/default-tso-server-benchmark-config.yml
+++ b/benchmarks/src/main/resources/default-tso-server-benchmark-config.yml
@@ -60,7 +60,7 @@ commitDelayInMs: 0
# ---------------------------------------------------------------------------------------------------------------------
omidClientConfiguration: !!org.apache.omid.tso.client.OmidClientConfiguration
connectionType: !!org.apache.omid.tso.client.OmidClientConfiguration$ConnType DIRECT
- connectionString: "localhost:54758"
+ connectionString: "localhost:24758"
# ---------------------------------------------------------------------------------------------------------------------
# Commit Table storage configuration
diff --git a/doc/site/markdown/basic-examples.md b/doc/site/markdown/basic-examples.md
index 67ef2f7a..4d20af4f 100644
--- a/doc/site/markdown/basic-examples.md
+++ b/doc/site/markdown/basic-examples.md
@@ -95,7 +95,7 @@ of the transaction manager instance:
...
HBaseOmidClientConfiguration omidClientConfiguration = new HBaseOmidClientConfiguration();
omidClientConfiguration.setConnectionType(DIRECT);
- omidClientConfiguration.setConnectionString("my_tso_server_host:54758");
+ omidClientConfiguration.setConnectionString("my_tso_server_host:24758");
omidClientConfiguration.setRetryDelayMs(3000);
TransactionManager tm = HBaseTransactionManager.newInstance(omidClientConfiguration);
diff --git a/doc/site/markdown/quickstart.md b/doc/site/markdown/quickstart.md
index 0268cb87..31b5b994 100644
--- a/doc/site/markdown/quickstart.md
+++ b/doc/site/markdown/quickstart.md
@@ -72,7 +72,7 @@ $ bin/omid.sh tso
```
This starts the TSO server that in turn will connect to HBase to store information in HBase. By default the TSO listens on
-port 54758. If you want to change the TSO configuration, you can modify the contents in the conf/omid.conf file.
+port 24758. If you want to change the TSO configuration, you can modify the contents in the conf/omid.conf file.
## HBase Client Usage
@@ -171,7 +171,7 @@ creation of the transaction manager:
public static void main(String[] args) throws Exception {
HBaseOmidClientConfiguration omidClientConfiguration = new HBaseOmidClientConfiguration();
omidClientConfiguration.setConnectionType(OmidClientConfiguration.ConnType.DIRECT);
- omidClientConfiguration.setConnectionString("my_tso_server_host:54758");
+ omidClientConfiguration.setConnectionString("my_tso_server_host:24758");
omidClientConfiguration.setRetryDelayInMs(3000);
try (TransactionManager tm = HBaseTransactionManager.newInstance(omidClientConfiguration);
diff --git a/examples/src/main/java/org/apache/omid/examples/ConfigurationExample.java b/examples/src/main/java/org/apache/omid/examples/ConfigurationExample.java
index 79744bc1..199df142 100644
--- a/examples/src/main/java/org/apache/omid/examples/ConfigurationExample.java
+++ b/examples/src/main/java/org/apache/omid/examples/ConfigurationExample.java
@@ -85,7 +85,7 @@ public class ConfigurationExample {
HBaseOmidClientConfiguration omidClientConfiguration = new HBaseOmidClientConfiguration();
omidClientConfiguration.setConnectionType(DIRECT);
- omidClientConfiguration.setConnectionString("localhost:54758");
+ omidClientConfiguration.setConnectionString("localhost:24758");
omidClientConfiguration.setRetryDelayInMs(3000);
example.doWork(userTableName, family, omidClientConfiguration);
diff --git a/examples/src/main/resources/hbase-omid-client-config.yml b/examples/src/main/resources/hbase-omid-client-config.yml
index cb1c08b1..7fcf2e65 100644
--- a/examples/src/main/resources/hbase-omid-client-config.yml
+++ b/examples/src/main/resources/hbase-omid-client-config.yml
@@ -4,7 +4,7 @@
# keytab: /path/to/hbase/client/keytab
omidClientConfiguration: !!org.apache.omid.tso.client.OmidClientConfiguration
- connectionString: "localhost:54758"
+ connectionString: "localhost:24758"
metrics: !!org.apache.omid.metrics.CodahaleMetricsProvider [
!!org.apache.omid.metrics.CodahaleMetricsConfig {
diff --git a/hbase-client/src/test/resources/test-hbase-omid-client-config.yml b/hbase-client/src/test/resources/test-hbase-omid-client-config.yml
index 8b434daa..2da860ec 100644
--- a/hbase-client/src/test/resources/test-hbase-omid-client-config.yml
+++ b/hbase-client/src/test/resources/test-hbase-omid-client-config.yml
@@ -4,7 +4,7 @@ commitTableName: OMID_COMMIT_TABLE1
#TSO/HA connection
omidClientConfiguration: !!org.apache.omid.tso.client.OmidClientConfiguration
#TSO/HA connection
- connectionString: "somehost:54758"
+ connectionString: "somehost:24758"
connectionType: !!org.apache.omid.tso.client.OmidClientConfiguration$ConnType HA
zkConnectionTimeoutInSecs: 11
diff --git a/transaction-client/src/main/resources/omid-client-config.yml b/transaction-client/src/main/resources/omid-client-config.yml
index 1cc3ee90..a6f61034 100644
--- a/transaction-client/src/main/resources/omid-client-config.yml
+++ b/transaction-client/src/main/resources/omid-client-config.yml
@@ -8,7 +8,7 @@
# Direct connection to host:port
connectionType: !!org.apache.omid.tso.client.OmidClientConfiguration$ConnType DIRECT
-connectionString: "localhost:54758"
+connectionString: "localhost:24758"
# When Omid is working in High Availability mode, two or more replicas of the TSO server are running in primary/backup
# mode. When a TSO server replica is elected as master, it publishes its address through ZK. In order to configure
diff --git a/transaction-client/src/test/resources/tlstest-omid-client-config.yml b/transaction-client/src/test/resources/tlstest-omid-client-config.yml
index 88ca124f..40a3e382 100644
--- a/transaction-client/src/test/resources/tlstest-omid-client-config.yml
+++ b/transaction-client/src/test/resources/tlstest-omid-client-config.yml
@@ -8,7 +8,7 @@
# Direct connection to host:port
connectionType: !!org.apache.omid.tso.client.OmidClientConfiguration$ConnType DIRECT
-connectionString: "localhost:54758"
+connectionString: "localhost:24758"
# When Omid is working in High Availability mode, two or more replicas of the TSO server are running in primary/backup
# mode. When a TSO server replica is elected as master, it publishes its address through ZK. In order to configure
diff --git a/tso-server/src/main/resources/default-omid-server-configuration.yml b/tso-server/src/main/resources/default-omid-server-configuration.yml
index ca25c9c6..0e065a00 100644
--- a/tso-server/src/main/resources/default-omid-server-configuration.yml
+++ b/tso-server/src/main/resources/default-omid-server-configuration.yml
@@ -26,7 +26,7 @@
# See org.apache.omid.tso.TSOServerConfig.getDefaultNetworkInterface for more information.
# Port reserved by the Status Oracle
-port: 54758
+port: 24758
# Wait strategy for the Disruptor processors in TSO pipeline. Options:
# 1) HIGH_THROUGHPUT - [Default] Use this in production deployments for maximum performance
# 2) LOW_CPU - Use this option when testing or in deployments where saving CPU cycles is more important than throughput
diff --git a/tso-server/src/test/resources/test-omid.yml b/tso-server/src/test/resources/test-omid.yml
index bfc0be4d..06528eca 100644
--- a/tso-server/src/test/resources/test-omid.yml
+++ b/tso-server/src/test/resources/test-omid.yml
@@ -1,6 +1,6 @@
# Non High Availability configuration with HBase for everything
-port: 54758
+port: 24758
conflictMapSize: 100000000
numConcurrentCTWriters: 2
batchSizePerCTWriter: 500
diff --git a/tso-server/src/test/resources/tlstest-omid-server-config.yml b/tso-server/src/test/resources/tlstest-omid-server-config.yml
index accba3a5..acfc06d1 100644
--- a/tso-server/src/test/resources/tlstest-omid-server-config.yml
+++ b/tso-server/src/test/resources/tlstest-omid-server-config.yml
@@ -26,7 +26,7 @@
# See org.apache.omid.tso.TSOServerConfig.getDefaultNetworkInterface for more information.
# Port reserved by the Status Oracle
-port: 54758
+port: 24758
# Wait strategy for the Disruptor processors in TSO pipeline. Options:
# 1) HIGH_THROUGHPUT - [Default] Use this in production deployments for maximum performance
# 2) LOW_CPU - Use this option when testing or in deployments where saving CPU cycles is more important than throughput