You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@asterixdb.apache.org by mb...@apache.org on 2018/06/14 18:14:51 UTC
[4/5] asterixdb git commit: [NO ISSUE][*DB] Default public
replication port to listen port
[NO ISSUE][*DB] Default public replication port to listen port
Change-Id: I17e9b2bc73ed1e0c21c0b5e9ee373b5061782fbc
Reviewed-on: https://asterix-gerrit.ics.uci.edu/2709
Reviewed-by: Murtadha Hubail <mh...@apache.org>
Sonar-Qube: Jenkins <je...@fulliautomatix.ics.uci.edu>
Tested-by: Jenkins <je...@fulliautomatix.ics.uci.edu>
Integration-Tests: Jenkins <je...@fulliautomatix.ics.uci.edu>
Project: http://git-wip-us.apache.org/repos/asf/asterixdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/asterixdb/commit/9353f351
Tree: http://git-wip-us.apache.org/repos/asf/asterixdb/tree/9353f351
Diff: http://git-wip-us.apache.org/repos/asf/asterixdb/diff/9353f351
Branch: refs/heads/master
Commit: 9353f3519b117e69f6d7fb4de84cf75a271d0041
Parents: 6a4c4d9
Author: Michael Blow <mb...@apache.org>
Authored: Wed Jun 13 13:51:13 2018 -0400
Committer: Michael Blow <mb...@apache.org>
Committed: Wed Jun 13 12:24:11 2018 -0700
----------------------------------------------------------------------
.../apache/hyracks/control/common/controllers/NCConfig.java | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/9353f351/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-common/src/main/java/org/apache/hyracks/control/common/controllers/NCConfig.java
----------------------------------------------------------------------
diff --git a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-common/src/main/java/org/apache/hyracks/control/common/controllers/NCConfig.java b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-common/src/main/java/org/apache/hyracks/control/common/controllers/NCConfig.java
index 75c0827..aa3260d 100644
--- a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-common/src/main/java/org/apache/hyracks/control/common/controllers/NCConfig.java
+++ b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-common/src/main/java/org/apache/hyracks/control/common/controllers/NCConfig.java
@@ -21,7 +21,6 @@ package org.apache.hyracks.control.common.controllers;
import static org.apache.hyracks.control.common.config.OptionTypes.INTEGER;
import static org.apache.hyracks.control.common.config.OptionTypes.INTEGER_BYTE_UNIT;
import static org.apache.hyracks.control.common.config.OptionTypes.LONG;
-import static org.apache.hyracks.control.common.config.OptionTypes.SHORT;
import static org.apache.hyracks.control.common.config.OptionTypes.STRING;
import static org.apache.hyracks.control.common.config.OptionTypes.STRING_ARRAY;
@@ -34,7 +33,6 @@ import org.apache.hyracks.api.config.IApplicationConfig;
import org.apache.hyracks.api.config.IOption;
import org.apache.hyracks.api.config.IOptionType;
import org.apache.hyracks.api.config.Section;
-import org.apache.hyracks.api.control.CcId;
import org.apache.hyracks.control.common.config.ConfigManager;
import org.apache.hyracks.util.file.FileUtil;
@@ -65,10 +63,10 @@ public class NCConfig extends ControllerConfig {
MESSAGING_LISTEN_PORT(INTEGER, 0),
MESSAGING_PUBLIC_ADDRESS(STRING, PUBLIC_ADDRESS),
MESSAGING_PUBLIC_PORT(INTEGER, MESSAGING_LISTEN_PORT),
- REPLICATION_PUBLIC_ADDRESS(STRING, PUBLIC_ADDRESS),
- REPLICATION_PUBLIC_PORT(INTEGER, 2000),
REPLICATION_LISTEN_ADDRESS(STRING, ADDRESS),
REPLICATION_LISTEN_PORT(INTEGER, 2000),
+ REPLICATION_PUBLIC_ADDRESS(STRING, PUBLIC_ADDRESS),
+ REPLICATION_PUBLIC_PORT(INTEGER, REPLICATION_LISTEN_PORT),
CLUSTER_CONNECT_RETRIES(INTEGER, 5),
IODEVICES(
STRING_ARRAY,