You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by kl...@apache.org on 2016/04/19 20:19:30 UTC
[04/13] incubator-geode git commit: GEODE-1243: add TODO comments for
supporting locator port zero wild card
GEODE-1243: add TODO comments for supporting locator port zero wild card
Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/4a54aa76
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/4a54aa76
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/4a54aa76
Branch: refs/heads/feature/GEODE-1233
Commit: 4a54aa7674fa5051cbc7f9fc9540a1b172d42bab
Parents: 20c202d
Author: Kirk Lund <kl...@apache.org>
Authored: Fri Apr 15 15:47:49 2016 -0700
Committer: Kirk Lund <kl...@apache.org>
Committed: Mon Apr 18 10:15:57 2016 -0700
----------------------------------------------------------------------
.../gemstone/gemfire/distributed/internal/InternalLocator.java | 5 +++--
.../gemfire/distributed/internal/tcpserver/TcpServer.java | 4 +++-
2 files changed, 6 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/4a54aa76/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/InternalLocator.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/InternalLocator.java b/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/InternalLocator.java
index 28428bb..2aae84a 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/InternalLocator.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/InternalLocator.java
@@ -386,7 +386,8 @@ public class InternalLocator extends Locator implements ConnectListener {
slocator = createLocator(port, logFile, stateFile, logger, securityLogger, bindAddress, hostnameForClients, dsProperties, startDistributedSystem);
-
+ // TODO:GEODE-1243: this.server is now a TcpServer and it should store or return its non-zero port in a variable to use here
+
if (enableServerLocator) {
slocator.handler.willHaveServerLocator = true;
}
@@ -397,7 +398,7 @@ public class InternalLocator extends Locator implements ConnectListener {
if (startDistributedSystem) {
try {
- slocator.startDistributedSystem();
+ slocator.startDistributedSystem(); // TODO:GEODE-1243: throws Exception if TcpServer still has zero for its locator port
} catch (RuntimeException e) {
slocator.stop();
throw e;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/4a54aa76/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/tcpserver/TcpServer.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/tcpserver/TcpServer.java b/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/tcpserver/TcpServer.java
index 8f1d26d..c8c6f50 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/tcpserver/TcpServer.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/tcpserver/TcpServer.java
@@ -70,7 +70,6 @@ import com.gemstone.gemfire.internal.logging.LogService;
* share the same gossip server port.
*
* @since 5.7
- *
*/
public class TcpServer {
/**
@@ -197,6 +196,9 @@ public class TcpServer {
} else
srv_sock = SocketCreator.getDefaultInstance().createServerSocket(port,
BACKLOG, bind_address);
+
+ // TODO:GEODE-1243: srv_Sock now has a real port even though this.port is still zero -- update it or use a second var
+
// srv_sock=new ServerSocket(port, 20, bind_address); // backlog of 20
// connections
{