Repository: incubator-trafodion Updated Branches: refs/heads/master 4e8bc1bb6 -> 0b7112f0e
connection failed with mtdcs on Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/505b97bd Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/505b97bd Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/505b97bd Branch: refs/heads/master Commit: 505b97bd59ac97bf95a7e9e02b9506ca061147b9 Parents: e54c732 Author: Kevin Xu <[email protected]> Authored: Wed Dec 2 15:29:37 2015 +0800 Committer: Kevin Xu <[email protected]> Committed: Wed Dec 2 15:29:37 2015 +0800 ---------------------------------------------------------------------- .../org/trafodion/dcs/servermt/ServerUtils.java | 18 +++++++++--------- .../dcs/servermt/serverHandler/ServerHandler.java | 2 ++ 2 files changed, 11 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/505b97bd/dcs/src/main/java/org/trafodion/dcs/servermt/ServerUtils.java ---------------------------------------------------------------------- diff --git a/dcs/src/main/java/org/trafodion/dcs/servermt/ServerUtils.java b/dcs/src/main/java/org/trafodion/dcs/servermt/ServerUtils.java index 8fc93d0..e52889a 100644 --- a/dcs/src/main/java/org/trafodion/dcs/servermt/ServerUtils.java +++ b/dcs/src/main/java/org/trafodion/dcs/servermt/ServerUtils.java @@ -187,7 +187,7 @@ public final class ServerUtils { 1, //Nid processId(), server.serverName, - server.hostName, + server.extHostAddress, server.fport)); zkc.setData(threadRegisteredPath, threadRegisteredData, -1); zkc.sync(threadRegisteredPath,null,null); @@ -261,7 +261,7 @@ public final class ServerUtils { 1, //Nid processId(), server.serverName, - server.hostName, + server.extHostAddress, server.fport)); stat = zkc.exists(threadRegisteredPath, false); if(stat != null) @@ -304,7 +304,7 @@ public final class ServerUtils { 1, //Nid processId(), server.serverName, - server.hostName, + server.extHostAddress, server.fport)); zkc.setData(threadRegisteredPath, threadRegisteredData, -1); @@ -325,7 +325,7 @@ public final class ServerUtils { 1, //Nid processId(), server.serverName, - server.hostName, + server.extHostAddress, server.fport)); zkc.setData(threadRegisteredPath, threadRegisteredData, -1); @@ -346,7 +346,7 @@ public final class ServerUtils { 1, //Nid processId(), server.serverName, - server.hostName, + server.extHostAddress, server.fport)); zkc.setData(threadRegisteredPath, threadRegisteredData, -1); @@ -367,7 +367,7 @@ public final class ServerUtils { 1, //Nid processId(), server.serverName, - server.hostName, + server.extHostAddress, server.fport)); zkc.setData(threadRegisteredPath, threadRegisteredData, -1); @@ -388,7 +388,7 @@ public final class ServerUtils { 1, //Nid processId(), server.serverName, - server.hostName, + server.extHostAddress, server.fport)); zkc.setData(threadRegisteredPath, threadRegisteredData, -1); @@ -408,7 +408,7 @@ public final class ServerUtils { 1, //Nid processId(), server.serverName, - server.hostName, + server.extHostAddress, server.fport)); zkc.setData(threadRegisteredPath, threadRegisteredData, -1); @@ -425,7 +425,7 @@ public final class ServerUtils { 1, //Nid processId(), server.serverName, - server.hostName, + server.extHostAddress, server.fport)); zkc.setData(threadRegisteredPath, threadRegisteredData, -1); http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/505b97bd/dcs/src/main/java/org/trafodion/dcs/servermt/serverHandler/ServerHandler.java ---------------------------------------------------------------------- diff --git a/dcs/src/main/java/org/trafodion/dcs/servermt/serverHandler/ServerHandler.java b/dcs/src/main/java/org/trafodion/dcs/servermt/serverHandler/ServerHandler.java index 8d9b48b..681e30e 100644 --- a/dcs/src/main/java/org/trafodion/dcs/servermt/serverHandler/ServerHandler.java +++ b/dcs/src/main/java/org/trafodion/dcs/servermt/serverHandler/ServerHandler.java @@ -100,6 +100,7 @@ public final class ServerHandler implements Callable { public int instance; public int serverThread; public String serverName; + public String extHostAddress; public int serverState= ServerConstants.SERVER_STATE_INIT; public byte[] cert; @@ -114,6 +115,7 @@ public final class ServerHandler implements Callable { this.zkc = zkc; this.netConf = netConf; this.hostName = netConf.getHostName(); + this.extHostAddress = netConf.getExtHostAddress(); this.requestTimeout = conf.getInt(Constants.DCS_SERVER_LISTENER_REQUEST_TIMEOUT,Constants.DEFAULT_SERVER_LISTENER_REQUEST_TIMEOUT); this.connectingTimeout = conf.getInt(Constants.DCS_SERVER_USER_PROGRAM_CONNECTING_TIMEOUT,Constants.DEFAULT_DCS_SERVER_USER_PROGRAM_CONNECTING_TIMEOUT) * 1000; this.selectorTimeout = conf.getInt(Constants.DCS_SERVER_LISTENER_SELECTOR_TIMEOUT,Constants.DEFAULT_SERVER_LISTENER_SELECTOR_TIMEOUT);
