You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by ma...@apache.org on 2015/06/24 03:40:27 UTC
[1/4] incubator-geode git commit: Adding .idea to .gitignore
Repository: incubator-geode
Updated Branches:
refs/heads/develop 0ff569309 -> dbab0cef4
Adding .idea to .gitignore
Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/c70f8fa8
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/c70f8fa8
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/c70f8fa8
Branch: refs/heads/develop
Commit: c70f8fa8f9b03fad6138e6eb8ac27340032c7a35
Parents: 0ff5693
Author: William Markito <wm...@pivotal.io>
Authored: Thu Jun 11 16:36:24 2015 -0700
Committer: William Markito <wm...@pivotal.io>
Committed: Tue Jun 23 18:28:24 2015 -0700
----------------------------------------------------------------------
.gitignore | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c70f8fa8/.gitignore
----------------------------------------------------------------------
diff --git a/.gitignore b/.gitignore
index 22de774..345a55a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,6 +9,7 @@ build/
.classpath
.project
.settings/
+.idea/
build-eclipse/
/tags
[4/4] incubator-geode git commit: Merge branch 'feature/GEODE-51'
into develop
Posted by ma...@apache.org.
Merge branch 'feature/GEODE-51' into develop
Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/dbab0cef
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/dbab0cef
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/dbab0cef
Branch: refs/heads/develop
Commit: dbab0cef48995417d39bba452f930154e0097383
Parents: c70f8fa 552477e
Author: William Markito <wm...@pivotal.io>
Authored: Tue Jun 23 18:39:04 2015 -0700
Committer: William Markito <wm...@pivotal.io>
Committed: Tue Jun 23 18:39:04 2015 -0700
----------------------------------------------------------------------
.../gemstone/gemfire/distributed/ServerLauncher.java | 15 +++++++++++++--
.../gemfire/internal/i18n/LocalizedStrings.java | 1 +
.../cli/commands/LauncherLifecycleCommands.java | 6 ++++++
.../gemfire/distributed/ServerLauncherJUnitTest.java | 14 +++++++++++++-
4 files changed, 33 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
[2/4] incubator-geode git commit: [GEODE-51] - Including
hostname-for-client parameters for server startup in order allow external
clients connect to a distributed system from a different network. Needed for
VMs or Docker deployments
Posted by ma...@apache.org.
[GEODE-51] - Including hostname-for-client parameters for server startup in order allow external clients connect to a distributed system from a different network. Needed for VMs or Docker deployments
Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/3c952ac5
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/3c952ac5
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/3c952ac5
Branch: refs/heads/develop
Commit: 3c952ac5e5c948e09c7475170496a46da61ec190
Parents: c70f8fa
Author: William Markito <wm...@pivotal.io>
Authored: Tue Jun 16 16:11:38 2015 -0700
Committer: William Markito <wm...@pivotal.io>
Committed: Tue Jun 23 18:29:29 2015 -0700
----------------------------------------------------------------------
.../gemstone/gemfire/distributed/ServerLauncher.java | 14 ++++++++++++--
.../cli/commands/LauncherLifecycleCommands.java | 6 ++++++
.../gemfire/distributed/ServerLauncherJUnitTest.java | 14 +++++++++++++-
3 files changed, 31 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3c952ac5/gemfire-core/src/main/java/com/gemstone/gemfire/distributed/ServerLauncher.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/main/java/com/gemstone/gemfire/distributed/ServerLauncher.java b/gemfire-core/src/main/java/com/gemstone/gemfire/distributed/ServerLauncher.java
index d5db59d..8018433 100644
--- a/gemfire-core/src/main/java/com/gemstone/gemfire/distributed/ServerLauncher.java
+++ b/gemfire-core/src/main/java/com/gemstone/gemfire/distributed/ServerLauncher.java
@@ -912,7 +912,11 @@ public final class ServerLauncher extends AbstractLauncher<String> {
if (getSocketBufferSize() != null) {
cacheServer.setSocketBufferSize(getSocketBufferSize());
}
-
+
+ if (getHostNameForClients() != null) {
+ cacheServer.setHostnameForClients(getHostNameForClients());
+ }
+
cacheServer.start();
}
}
@@ -1434,6 +1438,7 @@ public final class ServerLauncher extends AbstractLauncher<String> {
parser.accepts(CliStrings.START_SERVER__MAX__THREADS).withRequiredArg().ofType(Integer.class);
parser.accepts(CliStrings.START_SERVER__MESSAGE__TIME__TO__LIVE).withRequiredArg().ofType(Integer.class);
parser.accepts(CliStrings.START_SERVER__SOCKET__BUFFER__SIZE).withRequiredArg().ofType(Integer.class);
+ parser.accepts(CliStrings.START_SERVER__HOSTNAME__FOR__CLIENTS).withRequiredArg().ofType(String.class);
return parser;
}
@@ -1518,7 +1523,12 @@ public final class ServerLauncher extends AbstractLauncher<String> {
if (options.hasArgument(CliStrings.START_SERVER__SOCKET__BUFFER__SIZE)) {
setSocketBufferSize(Integer.parseInt(ObjectUtils.toString(options.valueOf(
CliStrings.START_SERVER__SOCKET__BUFFER__SIZE))));
- }
+ }
+
+ if (options.hasArgument(CliStrings.START_SERVER__HOSTNAME__FOR__CLIENTS)) {
+ setHostNameForClients(ObjectUtils.toString(options.valueOf(CliStrings.START_SERVER__HOSTNAME__FOR__CLIENTS)));
+ }
+
}
catch (OptionException e) {
throw new IllegalArgumentException(LocalizedStrings.Launcher_Builder_PARSE_COMMAND_LINE_ARGUMENT_ERROR_MESSAGE
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3c952ac5/gemfire-core/src/main/java/com/gemstone/gemfire/management/internal/cli/commands/LauncherLifecycleCommands.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/main/java/com/gemstone/gemfire/management/internal/cli/commands/LauncherLifecycleCommands.java b/gemfire-core/src/main/java/com/gemstone/gemfire/management/internal/cli/commands/LauncherLifecycleCommands.java
index 68b2483..170f330 100755
--- a/gemfire-core/src/main/java/com/gemstone/gemfire/management/internal/cli/commands/LauncherLifecycleCommands.java
+++ b/gemfire-core/src/main/java/com/gemstone/gemfire/management/internal/cli/commands/LauncherLifecycleCommands.java
@@ -1519,6 +1519,7 @@ public class LauncherLifecycleCommands extends AbstractCommandsSupport {
help = CliStrings.START_SERVER__SOCKET__BUFFER__SIZE__HELP)
final Integer socketBufferSize)
{
+
try {
if (workingDirectory == null) {
// attempt to use or make sub-directory using memberName...
@@ -1591,6 +1592,7 @@ public class LauncherLifecycleCommands extends AbstractCommandsSupport {
.setMaxThreads(maxThreads)
.setMessageTimeToLive(messageTimeToLive)
.setSocketBufferSize(socketBufferSize)
+ .setHostNameForClients(hostNameForClients)
.build();
String[] serverCommandLine = createStartServerCommandLine(serverLauncher, gemfirePropertiesPathname,
@@ -1813,6 +1815,10 @@ public class LauncherLifecycleCommands extends AbstractCommandsSupport {
commandLine.add("--" + CliStrings.START_SERVER__MAX__THREADS + "=" + launcher.getMaxThreads());
}
+ if (launcher.getHostNameForClients() != null) {
+ commandLine.add("--" + CliStrings.START_SERVER__HOSTNAME__FOR__CLIENTS + "=" + launcher.getHostNameForClients());
+ }
+
return commandLine.toArray(new String[commandLine.size()]);
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3c952ac5/gemfire-core/src/test/java/com/gemstone/gemfire/distributed/ServerLauncherJUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/distributed/ServerLauncherJUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/distributed/ServerLauncherJUnitTest.java
index 5af33e1..88876e7 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/distributed/ServerLauncherJUnitTest.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/distributed/ServerLauncherJUnitTest.java
@@ -110,10 +110,11 @@ public class ServerLauncherJUnitTest extends CommonLauncherTestSuite {
builder.parseArguments("start", "serverOne", "--assign-buckets", "--disable-default-server", "--debug", "--force",
"--rebalance", "--redirect-output", "--dir=" + ServerLauncher.DEFAULT_WORKING_DIRECTORY, "--pid=1234",
- "--server-bind-address=" + InetAddress.getLocalHost().getHostAddress(), "--server-port=11235");
+ "--server-bind-address=" + InetAddress.getLocalHost().getHostAddress(), "--server-port=11235", "--hostname-for-clients=192.168.99.100");
assertEquals(Command.START, builder.getCommand());
assertEquals("serverOne", builder.getMemberName());
+ assertEquals("192.168.99.100", builder.getHostNameForClients());
assertTrue(builder.getAssignBuckets());
assertTrue(builder.getDisableDefaultServer());
assertTrue(builder.getDebug());
@@ -288,6 +289,17 @@ public class ServerLauncherJUnitTest extends CommonLauncherTestSuite {
}
@Test
+ public void testSetAndGetHostnameForClients() {
+ final Builder builder = new Builder();
+
+ assertNull(builder.getHostNameForClients());
+ assertSame(builder, builder.setHostNameForClients("Pegasus"));
+ assertEquals("Pegasus", builder.getHostNameForClients());
+ assertSame(builder, builder.setHostNameForClients(null));
+ assertNull(builder.getHostNameForClients());
+ }
+
+ @Test
public void testSetAndGetServerPort() {
Builder builder = new Builder();
[3/4] incubator-geode git commit: [GEODE-51] - Adding help string
information Reviewed by RB #35542
Posted by ma...@apache.org.
[GEODE-51] - Adding help string information
Reviewed by RB #35542
Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/552477eb
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/552477eb
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/552477eb
Branch: refs/heads/develop
Commit: 552477eb8b63281eb097af7ed37c44498526bbcf
Parents: 3c952ac
Author: William Markito <wm...@pivotal.io>
Authored: Fri Jun 19 23:01:15 2015 -0700
Committer: William Markito <wm...@pivotal.io>
Committed: Tue Jun 23 18:36:01 2015 -0700
----------------------------------------------------------------------
.../main/java/com/gemstone/gemfire/distributed/ServerLauncher.java | 1 +
.../java/com/gemstone/gemfire/internal/i18n/LocalizedStrings.java | 1 +
2 files changed, 2 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/552477eb/gemfire-core/src/main/java/com/gemstone/gemfire/distributed/ServerLauncher.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/main/java/com/gemstone/gemfire/distributed/ServerLauncher.java b/gemfire-core/src/main/java/com/gemstone/gemfire/distributed/ServerLauncher.java
index 8018433..3a49467 100644
--- a/gemfire-core/src/main/java/com/gemstone/gemfire/distributed/ServerLauncher.java
+++ b/gemfire-core/src/main/java/com/gemstone/gemfire/distributed/ServerLauncher.java
@@ -111,6 +111,7 @@ public final class ServerLauncher extends AbstractLauncher<String> {
helpMap.put("rebalance", LocalizedStrings.ServerLauncher_SERVER_REBALANCE_HELP.toLocalizedString());
helpMap.put("redirect-output", LocalizedStrings.ServerLauncher_SERVER_REDIRECT_OUTPUT_HELP.toLocalizedString());
helpMap.put("server-bind-address", LocalizedStrings.ServerLauncher_SERVER_BIND_ADDRESS_HELP.toLocalizedString());
+ helpMap.put("hostname-for-clients", LocalizedStrings.ServerLauncher_SERVER_HOSTNAME_FOR_CLIENT_HELP.toLocalizedString());
helpMap.put("server-port", LocalizedStrings.ServerLauncher_SERVER_PORT_HELP.toLocalizedString(String.valueOf(getDefaultServerPort())));
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/552477eb/gemfire-core/src/main/java/com/gemstone/gemfire/internal/i18n/LocalizedStrings.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/main/java/com/gemstone/gemfire/internal/i18n/LocalizedStrings.java b/gemfire-core/src/main/java/com/gemstone/gemfire/internal/i18n/LocalizedStrings.java
index d5ea8ab..d5a1f20 100644
--- a/gemfire-core/src/main/java/com/gemstone/gemfire/internal/i18n/LocalizedStrings.java
+++ b/gemfire-core/src/main/java/com/gemstone/gemfire/internal/i18n/LocalizedStrings.java
@@ -1862,6 +1862,7 @@ public class LocalizedStrings extends ParentLocalizedStrings {
public static final StringId ServerLauncher_SERVER_PORT_HELP = new StringIdImpl(5293, "Specifies the port on which the Server is listening for client requests. Defaults to {0}.");
public static final StringId ServerLauncher_SERVER_REBALANCE_HELP = new StringIdImpl(5294, "An option to cause the GemFire cache''s partitioned regions to be rebalanced on start.");
public static final StringId ServerLauncher_SERVER_REDIRECT_OUTPUT_HELP = new StringIdImpl(5295, "An option to cause the Server to redirect standard out and standard error to the GemFire log file.");
+ public static final StringId ServerLauncher_SERVER_HOSTNAME_FOR_CLIENT_HELP = new StringIdImpl(5296, "An option to specify the hostname or IP address to send to clients so they can connect to this Server. The default is to use the IP address to which the Server is bound.");
public static final StringId PoolFactoryImpl_HOSTNAME_UNKNOWN = new StringIdImpl(5300, "Hostname is unknown: {0}");
public static final StringId GatewaySenderEventRemoteDispatcher_GATEWAY_SENDER_0_RECEIVED_ACK_FOR_BATCH_ID_1_OF_2_EVENTS = new StringIdImpl(5301, "Gateway Sender {0} : Received ack for batch id {1} of {2} events.");