You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by bb...@apache.org on 2021/02/24 20:37:33 UTC
[geode-native] branch develop updated: GEODE-8967: Moved SNI test
ports to 20220 and 20221 for locator and server (#751)
This is an automated email from the ASF dual-hosted git repository.
bbender pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/geode-native.git
The following commit(s) were added to refs/heads/develop by this push:
new 0f1526f GEODE-8967: Moved SNI test ports to 20220 and 20221 for locator and server (#751)
0f1526f is described below
commit 0f1526fd86192d633c40900490fd5a6eadf7f650
Author: Matthew Reddington <mr...@pivotal.io>
AuthorDate: Wed Feb 24 12:37:23 2021 -0800
GEODE-8967: Moved SNI test ports to 20220 and 20221 for locator and server (#751)
---
cppcache/acceptance-test/SNITest.cpp | 6 +++---
sni-test-config/docker-compose.yml | 4 ++--
sni-test-config/haproxy.cfg | 6 +++---
sni-test-config/scripts/geode-starter.gfsh | 6 +++---
4 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/cppcache/acceptance-test/SNITest.cpp b/cppcache/acceptance-test/SNITest.cpp
index 5656f03..268e0c2 100644
--- a/cppcache/acceptance-test/SNITest.cpp
+++ b/cppcache/acceptance-test/SNITest.cpp
@@ -124,7 +124,7 @@ TEST_F(SNITest, connectViaProxy) {
cache.getPoolManager()
.createFactory()
.setSniProxy("localhost", portNumber)
- .addLocator("locator-maeve", 10334)
+ .addLocator("locator-maeve", 20220)
.create("pool");
auto region = cache.createRegionFactory(RegionShortcut::PROXY)
@@ -151,7 +151,7 @@ TEST_F(SNITest, connectWithoutProxyFails) {
cache.getPoolManager()
.createFactory()
.setSniProxy("badProxyName", 40000)
- .addLocator("locator-maeve", 10334)
+ .addLocator("locator-maeve", 20220)
.create("pool");
auto region = cache.createRegionFactory(RegionShortcut::PROXY)
@@ -180,7 +180,7 @@ TEST_F(SNITest, dropSNIProxy) {
cache.getPoolManager()
.createFactory()
.setSniProxy("localhost", proxyPort)
- .addLocator("locator-maeve", 10334)
+ .addLocator("locator-maeve", 20220)
.create("pool");
auto region = cache.createRegionFactory(RegionShortcut::PROXY)
diff --git a/sni-test-config/docker-compose.yml b/sni-test-config/docker-compose.yml
index b0a6100..0ccf7f9 100644
--- a/sni-test-config/docker-compose.yml
+++ b/sni-test-config/docker-compose.yml
@@ -20,8 +20,8 @@ services:
container_name: 'geode'
image: 'apachegeode/geode'
expose:
- - '10334'
- - '40404'
+ - '20220'
+ - '20221'
entrypoint: 'sh'
command: ["-c", "while true; do sleep 600; done"]
networks:
diff --git a/sni-test-config/haproxy.cfg b/sni-test-config/haproxy.cfg
index c451ef6..32b3a38 100644
--- a/sni-test-config/haproxy.cfg
+++ b/sni-test-config/haproxy.cfg
@@ -33,12 +33,12 @@ frontend sniproxy
backend locators-maeve
mode tcp
- server locator1 geode:10334
+ server locator1 geode:20220
backend servers-dolores
mode tcp
- server server1 geode:40404
+ server server1 geode:20221
backend servers-clementine
mode tcp
- server server1 geode:40405
+ server server1 geode:20222
diff --git a/sni-test-config/scripts/geode-starter.gfsh b/sni-test-config/scripts/geode-starter.gfsh
index 9ceecad..b1be771 100644
--- a/sni-test-config/scripts/geode-starter.gfsh
+++ b/sni-test-config/scripts/geode-starter.gfsh
@@ -15,8 +15,8 @@
# limitations under the License.
#
-start locator --name=locator-maeve --hostname-for-clients=locator-maeve --properties-file=/geode/config/gemfire.properties --security-properties-file=/geode/config/gfsecurity.properties --J=-Dgemfire.ssl-keystore=/geode/config/locator-maeve-keystore.jks
-start server --name=server-dolores --max-heap=256m --hostname-for-clients=server-dolores --locators=localhost[10334] --properties-file=/geode/config/gemfire.properties --security-properties-file=/geode/config/gfsecurity.properties --J=-Dgemfire.ssl-keystore=/geode/config/server-dolores-keystore.jks
-connect --locator=localhost[10334] --use-ssl=true --security-properties-file=/geode/config/gfsecurity.properties
+start locator --port=20220 --name=locator-maeve --hostname-for-clients=locator-maeve --properties-file=/geode/config/gemfire.properties --security-properties-file=/geode/config/gfsecurity.properties --J=-Dgemfire.ssl-keystore=/geode/config/locator-maeve-keystore.jks
+start server --server-port=20221 --name=server-dolores --max-heap=256m --hostname-for-clients=server-dolores --locators=localhost[20220] --properties-file=/geode/config/gemfire.properties --security-properties-file=/geode/config/gfsecurity.properties --J=-Dgemfire.ssl-keystore=/geode/config/server-dolores-keystore.jks
+connect --locator=localhost[20220] --use-ssl=true --security-properties-file=/geode/config/gfsecurity.properties
create region --name=jellyfish --type=REPLICATE