You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by ji...@apache.org on 2019/02/26 19:08:23 UTC
[geode] branch develop updated: GEODE-6372: use random port when
starting server to avoid port conflict (#3237)
This is an automated email from the ASF dual-hosted git repository.
jinmeiliao pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/geode.git
The following commit(s) were added to refs/heads/develop by this push:
new 53f5538 GEODE-6372: use random port when starting server to avoid port conflict (#3237)
53f5538 is described below
commit 53f55380a8872e75494ffe5d3fe396882c5a6434
Author: jinmeiliao <ji...@pivotal.io>
AuthorDate: Tue Feb 26 11:08:06 2019 -0800
GEODE-6372: use random port when starting server to avoid port conflict (#3237)
---
.../management/internal/cli/commands/DeployWithLargeJarTest.java | 2 +-
.../management/internal/cli/commands/DestroyIndexIfExistsTest.java | 2 +-
.../management/internal/cli/commands/ImportClusterConfigTest.java | 3 ++-
.../management/internal/cli/commands/StopServerAcceptanceTest.java | 2 +-
.../internal/cli/commands/StopServerWithSecurityAcceptanceTest.java | 1 +
.../internal/cli/shell/StatusServerExitCodeAcceptanceTest.java | 4 +++-
6 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/geode-assembly/src/acceptanceTest/java/org/apache/geode/management/internal/cli/commands/DeployWithLargeJarTest.java b/geode-assembly/src/acceptanceTest/java/org/apache/geode/management/internal/cli/commands/DeployWithLargeJarTest.java
index 2cf835d..d121950 100644
--- a/geode-assembly/src/acceptanceTest/java/org/apache/geode/management/internal/cli/commands/DeployWithLargeJarTest.java
+++ b/geode-assembly/src/acceptanceTest/java/org/apache/geode/management/internal/cli/commands/DeployWithLargeJarTest.java
@@ -37,7 +37,7 @@ public class DeployWithLargeJarTest {
String commonLibs = Arrays.stream(libDir.listFiles(x -> x.getName().startsWith("commons")))
.map(File::getAbsolutePath).collect(Collectors.joining(","));
GfshExecution execution = GfshScript.of("start locator --name=locator --max-heap=128m",
- "start server --name=server --max-heap=128m", "sleep --time=1",
+ "start server --name=server --max-heap=128m --server-port=0", "sleep --time=1",
"deploy --jars=" + commonLibs).execute(gfsh);
}
diff --git a/geode-assembly/src/acceptanceTest/java/org/apache/geode/management/internal/cli/commands/DestroyIndexIfExistsTest.java b/geode-assembly/src/acceptanceTest/java/org/apache/geode/management/internal/cli/commands/DestroyIndexIfExistsTest.java
index 12e47af..d0aadf3 100644
--- a/geode-assembly/src/acceptanceTest/java/org/apache/geode/management/internal/cli/commands/DestroyIndexIfExistsTest.java
+++ b/geode-assembly/src/acceptanceTest/java/org/apache/geode/management/internal/cli/commands/DestroyIndexIfExistsTest.java
@@ -33,7 +33,7 @@ public class DestroyIndexIfExistsTest {
@Test
public void destroyIndexIfExists() throws Exception {
GfshExecution execution =
- GfshScript.of("start locator --name=locator", "start server --name=server",
+ GfshScript.of("start locator --name=locator", "start server --name=server --server-port=0",
"sleep --time=1", "destroy index --name=i1 --if-exists=true").execute(gfsh);
assertThat(execution.getOutputText()).contains("IGNORED", "Index named \"i1\" not found");
diff --git a/geode-assembly/src/acceptanceTest/java/org/apache/geode/management/internal/cli/commands/ImportClusterConfigTest.java b/geode-assembly/src/acceptanceTest/java/org/apache/geode/management/internal/cli/commands/ImportClusterConfigTest.java
index b4e55bc..dcc24b3 100644
--- a/geode-assembly/src/acceptanceTest/java/org/apache/geode/management/internal/cli/commands/ImportClusterConfigTest.java
+++ b/geode-assembly/src/acceptanceTest/java/org/apache/geode/management/internal/cli/commands/ImportClusterConfigTest.java
@@ -37,7 +37,8 @@ public class ImportClusterConfigTest extends ClusterConfigTestBase {
@Test
public void importWouldNotShutDownServer() {
GfshExecution startCluster = GfshScript
- .of("start locator --name=" + locatorName, "start server --name=" + serverNotShutDownName)
+ .of("start locator --name=" + locatorName,
+ "start server --name=" + serverNotShutDownName + " --server-port=0")
.withName("startCluster").execute(gfsh);
assertThat(startCluster.getOutputText()).contains(locatorName + " is currently online")
.contains(serverNotShutDownName + " is currently online");
diff --git a/geode-assembly/src/acceptanceTest/java/org/apache/geode/management/internal/cli/commands/StopServerAcceptanceTest.java b/geode-assembly/src/acceptanceTest/java/org/apache/geode/management/internal/cli/commands/StopServerAcceptanceTest.java
index 3ccf59d..c7568b1 100644
--- a/geode-assembly/src/acceptanceTest/java/org/apache/geode/management/internal/cli/commands/StopServerAcceptanceTest.java
+++ b/geode-assembly/src/acceptanceTest/java/org/apache/geode/management/internal/cli/commands/StopServerAcceptanceTest.java
@@ -29,7 +29,7 @@ public class StopServerAcceptanceTest {
@Before
public void startCluster() {
- gfshRule.execute("start locator --name=locator", "start server --name=server");
+ gfshRule.execute("start locator --name=locator", "start server --name=server --server-port=0");
}
@Test
diff --git a/geode-assembly/src/acceptanceTest/java/org/apache/geode/management/internal/cli/commands/StopServerWithSecurityAcceptanceTest.java b/geode-assembly/src/acceptanceTest/java/org/apache/geode/management/internal/cli/commands/StopServerWithSecurityAcceptanceTest.java
index b58e1f2..99a2c00 100644
--- a/geode-assembly/src/acceptanceTest/java/org/apache/geode/management/internal/cli/commands/StopServerWithSecurityAcceptanceTest.java
+++ b/geode-assembly/src/acceptanceTest/java/org/apache/geode/management/internal/cli/commands/StopServerWithSecurityAcceptanceTest.java
@@ -105,6 +105,7 @@ public class StopServerWithSecurityAcceptanceTest {
.addOption("security-properties-file", securityPropertiesFile.getAbsolutePath()).toString();
String startServer = new CommandStringBuilder("start server").addOption("name", "server")
+ .addOption("server-port", "0")
.addOption("security-properties-file", securityPropertiesFile.getAbsolutePath()).toString();
return GfshScript.of(startLocator, startServer).withName("cluster-setup").execute(gfshRule);
diff --git a/geode-assembly/src/acceptanceTest/java/org/apache/geode/management/internal/cli/shell/StatusServerExitCodeAcceptanceTest.java b/geode-assembly/src/acceptanceTest/java/org/apache/geode/management/internal/cli/shell/StatusServerExitCodeAcceptanceTest.java
index f5550a4..40394a3 100755
--- a/geode-assembly/src/acceptanceTest/java/org/apache/geode/management/internal/cli/shell/StatusServerExitCodeAcceptanceTest.java
+++ b/geode-assembly/src/acceptanceTest/java/org/apache/geode/management/internal/cli/shell/StatusServerExitCodeAcceptanceTest.java
@@ -145,7 +145,9 @@ public class StatusServerExitCodeAcceptanceTest {
}
private static String startServerCommand() {
- return new CommandStringBuilder("start server").addOption("name", serverName).toString();
+ return new CommandStringBuilder("start server")
+ .addOption("server-port", "0")
+ .addOption("name", serverName).toString();
}
private String statusServerCommandByName() {