This is an automated email from the ASF dual-hosted git repository. mblow pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/asterixdb.git
commit 749974f5323e380e0db8e62227b67fc119ac7726 Author: Michael Blow <[email protected]> AuthorDate: Sat Feb 15 10:21:36 2020 -0500 [NO ISSUE][NET] Honor configured cluster listen address Change-Id: I032f31b71e10a6be81787884e04bbdcf0fe690dc Reviewed-on: https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/5083 Integration-Tests: Jenkins <[email protected]> Tested-by: Jenkins <[email protected]> Reviewed-by: Michael Blow <[email protected]> Reviewed-by: Till Westmann <[email protected]> --- .../java/org/apache/hyracks/control/cc/ClusterControllerService.java | 3 ++- .../java/org/apache/hyracks/control/common/controllers/CCConfig.java | 3 --- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/ClusterControllerService.java b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/ClusterControllerService.java index 15fab85..f11e7ff 100644 --- a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/ClusterControllerService.java +++ b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/ClusterControllerService.java @@ -218,7 +218,8 @@ public class ClusterControllerService implements IControllerService { LOGGER.log(Level.INFO, "Starting ClusterControllerService: " + this); serverCtx = new ServerContext(ServerContext.ServerType.CLUSTER_CONTROLLER, new File(ccConfig.getRootDir())); IIPCI ccIPCI = new ClusterControllerIPCI(this); - clusterIPC = new IPCSystem(new InetSocketAddress(ccConfig.getClusterListenPort()), + clusterIPC = new IPCSystem( + new InetSocketAddress(ccConfig.getClusterListenAddress(), ccConfig.getClusterListenPort()), networkSecurityManager.getSocketChannelFactory(), ccIPCI, new CCNCFunctions.SerializerDeserializer()); IIPCI ciIPCI = new ClientInterfaceIPCI(this, jobIdFactory); clientIPC = diff --git a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-common/src/main/java/org/apache/hyracks/control/common/controllers/CCConfig.java b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-common/src/main/java/org/apache/hyracks/control/common/controllers/CCConfig.java index 4f35aca..0de75d9 100644 --- a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-common/src/main/java/org/apache/hyracks/control/common/controllers/CCConfig.java +++ b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-common/src/main/java/org/apache/hyracks/control/common/controllers/CCConfig.java @@ -247,9 +247,6 @@ public class CCConfig extends ControllerConfig { return configManager.toIni(false); } - // QQQ Note that clusterListenAddress is *not directly used* yet. Both - // the cluster listener and the web server listen on "all interfaces". - // This IP address is only used to instruct the NC on which IP to call in. public String getClusterListenAddress() { return getAppConfig().getString(Option.CLUSTER_LISTEN_ADDRESS); }
