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:48 UTC
[1/5] asterixdb git commit: [NO ISSUE] Don't attempt to log FDs on
Windows
Repository: asterixdb
Updated Branches:
refs/heads/master f1076cb0c -> 9da43ce39
[NO ISSUE] Don't attempt to log FDs on Windows
Hyracks collects FD info from the UnixOperatingSystemMXBean; this is not
available on Windows. Avoid trying to use these methods and logging a
NoSuchMethodError when running on Windows.
Change-Id: I7613af4599639d4a5337bb2a45e359660a3faeec
Reviewed-on: https://asterix-gerrit.ics.uci.edu/2692
Sonar-Qube: Jenkins <je...@fulliautomatix.ics.uci.edu>
Tested-by: Jenkins <je...@fulliautomatix.ics.uci.edu>
Integration-Tests: Jenkins <je...@fulliautomatix.ics.uci.edu>
Reviewed-by: abdullah alamoudi <ba...@gmail.com>
Project: http://git-wip-us.apache.org/repos/asf/asterixdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/asterixdb/commit/6f523994
Tree: http://git-wip-us.apache.org/repos/asf/asterixdb/tree/6f523994
Diff: http://git-wip-us.apache.org/repos/asf/asterixdb/diff/6f523994
Branch: refs/heads/master
Commit: 6f523994284914143052a1abbfc5785f38f581f1
Parents: 2a182c4
Author: Michael Blow <mb...@apache.org>
Authored: Thu Jun 7 14:40:09 2018 -0400
Committer: Michael Blow <mb...@apache.org>
Committed: Fri Jun 8 09:58:03 2018 -0700
----------------------------------------------------------------------
.../java/org/apache/hyracks/util/MXHelper.java | 26 ++++++++++++--------
1 file changed, 16 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/6f523994/hyracks-fullstack/hyracks/hyracks-util/src/main/java/org/apache/hyracks/util/MXHelper.java
----------------------------------------------------------------------
diff --git a/hyracks-fullstack/hyracks/hyracks-util/src/main/java/org/apache/hyracks/util/MXHelper.java b/hyracks-fullstack/hyracks/hyracks-util/src/main/java/org/apache/hyracks/util/MXHelper.java
index ce20d37..4c6ff57 100644
--- a/hyracks-fullstack/hyracks/hyracks-util/src/main/java/org/apache/hyracks/util/MXHelper.java
+++ b/hyracks-fullstack/hyracks/hyracks-util/src/main/java/org/apache/hyracks/util/MXHelper.java
@@ -28,6 +28,7 @@ import java.lang.reflect.Method;
import java.util.Collections;
import java.util.List;
+import org.apache.commons.lang3.SystemUtils;
import org.apache.logging.log4j.Level;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
@@ -44,16 +45,21 @@ public class MXHelper {
private static Method getMaxFileDescriptorCount;
static {
- try {
- getOpenFileDescriptorCount = osMXBean.getClass().getMethod("getOpenFileDescriptorCount");
- getMaxFileDescriptorCount = osMXBean.getClass().getDeclaredMethod("getMaxFileDescriptorCount");
- getOpenFileDescriptorCount.setAccessible(true);
- getMaxFileDescriptorCount.setAccessible(true);
- } catch (Throwable th) { // NOSONAR: diagnostic code shouldn't cause server failure
- getOpenFileDescriptorCount = null;
- getMaxFileDescriptorCount = null;
- LOGGER.log(Level.WARN, "Failed setting up the methods to get the number of file descriptors through {}",
- osMXBean.getClass().getName(), th);
+ if (SystemUtils.IS_OS_WINDOWS) {
+ LOGGER.info("Access to file descriptors (FDs) is not available on Windows; FD info will not be logged");
+ } else {
+ Class<? extends OperatingSystemMXBean> osMXBeanClass = osMXBean.getClass();
+ try {
+ getOpenFileDescriptorCount = osMXBeanClass.getMethod("getOpenFileDescriptorCount");
+ getMaxFileDescriptorCount = osMXBeanClass.getDeclaredMethod("getMaxFileDescriptorCount");
+ getOpenFileDescriptorCount.setAccessible(true);
+ getMaxFileDescriptorCount.setAccessible(true);
+ } catch (Throwable th) { // NOSONAR: diagnostic code shouldn't cause server failure
+ getOpenFileDescriptorCount = null;
+ getMaxFileDescriptorCount = null;
+ LOGGER.warn("Failed setting up the methods to get the number of file descriptors through {}",
+ osMXBeanClass.getName(), th);
+ }
}
}
[3/5] asterixdb git commit: [NO ISSUE] Use public address/port for
client advertisement
Posted by mb...@apache.org.
[NO ISSUE] Use public address/port for client advertisement
Change-Id: Ia88912f144fa3b0e4b79341c245bd45ae0453f80
Reviewed-on: https://asterix-gerrit.ics.uci.edu/2706
Reviewed-by: Murtadha Hubail <mh...@apache.org>
Sonar-Qube: Jenkins <je...@fulliautomatix.ics.uci.edu>
Tested-by: 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/6a4c4d9e
Tree: http://git-wip-us.apache.org/repos/asf/asterixdb/tree/6a4c4d9e
Diff: http://git-wip-us.apache.org/repos/asf/asterixdb/diff/6a4c4d9e
Branch: refs/heads/master
Commit: 6a4c4d9ecd0fd49b938d65ac909f7b47804d49d9
Parents: 4e2ebaa
Author: Michael Blow <mb...@apache.org>
Authored: Tue Jun 12 12:10:17 2018 -0400
Committer: Michael Blow <mb...@apache.org>
Committed: Tue Jun 12 10:13:58 2018 -0700
----------------------------------------------------------------------
.../org/apache/hyracks/control/cc/ClusterControllerService.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/6a4c4d9e/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/ClusterControllerService.java
----------------------------------------------------------------------
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 8953bec..153a32d 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
@@ -409,7 +409,7 @@ public class ClusterControllerService implements IControllerService {
}
public NetworkAddress getDatasetDirectoryServiceInfo() {
- return new NetworkAddress(ccConfig.getClientListenAddress(), ccConfig.getClientListenPort());
+ return new NetworkAddress(ccConfig.getClientPublicAddress(), ccConfig.getClientPublicPort());
}
public JobIdFactory getJobIdFactory() {
[4/5] asterixdb git commit: [NO ISSUE][*DB] Default public
replication port to listen port
Posted by mb...@apache.org.
[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,
[5/5] asterixdb git commit: Merge branch 'release-0.9.4-pre-rc' into
master
Posted by mb...@apache.org.
Merge branch 'release-0.9.4-pre-rc' into master
Change-Id: I5c0f14671f13c4415d1377f5044925032dd77cd1
Project: http://git-wip-us.apache.org/repos/asf/asterixdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/asterixdb/commit/9da43ce3
Tree: http://git-wip-us.apache.org/repos/asf/asterixdb/tree/9da43ce3
Diff: http://git-wip-us.apache.org/repos/asf/asterixdb/diff/9da43ce3
Branch: refs/heads/master
Commit: 9da43ce398ef6494522bb67948a510103656887a
Parents: f1076cb 9353f35
Author: Michael Blow <mb...@apache.org>
Authored: Thu Jun 14 11:37:15 2018 -0400
Committer: Michael Blow <mb...@apache.org>
Committed: Thu Jun 14 11:37:15 2018 -0400
----------------------------------------------------------------------
.../control/cc/ClusterControllerService.java | 6 +--
.../control/common/controllers/CCConfig.java | 43 +++++++++++++++++++-
.../control/common/controllers/NCConfig.java | 6 +--
.../java/org/apache/hyracks/util/MXHelper.java | 26 +++++++-----
4 files changed, 63 insertions(+), 18 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/9da43ce3/hyracks-fullstack/hyracks/hyracks-util/src/main/java/org/apache/hyracks/util/MXHelper.java
----------------------------------------------------------------------
[2/5] asterixdb git commit: [NO ISSUE] Expose public address / ports
for CC services
Posted by mb...@apache.org.
[NO ISSUE] Expose public address / ports for CC services
Change-Id: I61f8988b32f13a1eba029fa7120d6e753aacc151
Reviewed-on: https://asterix-gerrit.ics.uci.edu/2704
Sonar-Qube: Jenkins <je...@fulliautomatix.ics.uci.edu>
Tested-by: Jenkins <je...@fulliautomatix.ics.uci.edu>
Reviewed-by: Till Westmann <ti...@apache.org>
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/4e2ebaac
Tree: http://git-wip-us.apache.org/repos/asf/asterixdb/tree/4e2ebaac
Diff: http://git-wip-us.apache.org/repos/asf/asterixdb/diff/4e2ebaac
Branch: refs/heads/master
Commit: 4e2ebaacaa1efa6512ab539671ada9b842062197
Parents: 6f52399
Author: Michael Blow <mb...@apache.org>
Authored: Tue Jun 12 00:01:04 2018 -0400
Committer: Michael Blow <mb...@apache.org>
Committed: Mon Jun 11 23:42:23 2018 -0700
----------------------------------------------------------------------
.../control/cc/ClusterControllerService.java | 4 +-
.../control/common/controllers/CCConfig.java | 43 +++++++++++++++++++-
2 files changed, 44 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/4e2ebaac/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/ClusterControllerService.java
----------------------------------------------------------------------
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 6faa8dd..8953bec 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
@@ -215,8 +215,8 @@ public class ClusterControllerService implements IControllerService {
clusterIPC.start();
clientIPC.start();
webServer.start();
- info = new ClusterControllerInfo(ccId, ccConfig.getClientListenAddress(), ccConfig.getClientListenPort(),
- webServer.getListeningPort());
+ info = new ClusterControllerInfo(ccId, ccConfig.getClientPublicAddress(), ccConfig.getClientPublicPort(),
+ ccConfig.getConsolePublicPort());
timer.schedule(sweeper, 0, ccConfig.getHeartbeatPeriodMillis());
jobLog.open();
startApplication();
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/4e2ebaac/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-common/src/main/java/org/apache/hyracks/control/common/controllers/CCConfig.java
----------------------------------------------------------------------
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 889e140..f83df6e 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
@@ -45,14 +45,19 @@ public class CCConfig extends ControllerConfig {
public enum Option implements IOption {
APP_CLASS(STRING, (String) null),
ADDRESS(STRING, InetAddress.getLoopbackAddress().getHostAddress()),
+ PUBLIC_ADDRESS(STRING, ADDRESS),
CLUSTER_LISTEN_ADDRESS(STRING, ADDRESS),
CLUSTER_LISTEN_PORT(INTEGER, 1099),
- CLUSTER_PUBLIC_ADDRESS(STRING, CLUSTER_LISTEN_ADDRESS),
+ CLUSTER_PUBLIC_ADDRESS(STRING, PUBLIC_ADDRESS),
CLUSTER_PUBLIC_PORT(INTEGER, CLUSTER_LISTEN_PORT),
CLIENT_LISTEN_ADDRESS(STRING, ADDRESS),
CLIENT_LISTEN_PORT(INTEGER, 1098),
+ CLIENT_PUBLIC_ADDRESS(STRING, PUBLIC_ADDRESS),
+ CLIENT_PUBLIC_PORT(INTEGER, CLIENT_LISTEN_PORT),
CONSOLE_LISTEN_ADDRESS(STRING, ADDRESS),
CONSOLE_LISTEN_PORT(INTEGER, 16001),
+ CONSOLE_PUBLIC_ADDRESS(STRING, PUBLIC_ADDRESS),
+ CONSOLE_PUBLIC_PORT(INTEGER, CONSOLE_LISTEN_PORT),
HEARTBEAT_PERIOD(LONG, 10000L), // TODO (mblow): add time unit
HEARTBEAT_MAX_MISSES(INTEGER, 5),
PROFILE_DUMP_PERIOD(INTEGER, 0),
@@ -118,6 +123,10 @@ public class CCConfig extends ControllerConfig {
return "Application CC main class";
case ADDRESS:
return "Default bind address for all services on this cluster controller";
+ case PUBLIC_ADDRESS:
+ return "Default public address that other processes should use to contact this cluster controller. "
+ + "All services will advertise this address unless a service-specific public address is "
+ + "supplied.";
case CLUSTER_LISTEN_ADDRESS:
return "Sets the IP Address to listen for connections from NCs";
case CLUSTER_LISTEN_PORT:
@@ -130,10 +139,18 @@ public class CCConfig extends ControllerConfig {
return "Sets the IP Address to listen for connections from clients";
case CLIENT_LISTEN_PORT:
return "Sets the port to listen for connections from clients";
+ case CLIENT_PUBLIC_ADDRESS:
+ return "The IP Address which clients should use to connect";
+ case CLIENT_PUBLIC_PORT:
+ return "The port which clients should use to connect";
case CONSOLE_LISTEN_ADDRESS:
return "Sets the listen address for the Cluster Controller";
case CONSOLE_LISTEN_PORT:
return "Sets the http port for the Cluster Controller)";
+ case CONSOLE_PUBLIC_ADDRESS:
+ return "Sets the address on which to contact the http console for the Cluster Controller";
+ case CONSOLE_PUBLIC_PORT:
+ return "Sets the port on which to contact the http console for the Cluster Controller)";
case HEARTBEAT_PERIOD:
return "Sets the time duration between two heartbeats from each node controller in milliseconds";
case HEARTBEAT_MAX_MISSES:
@@ -261,6 +278,22 @@ public class CCConfig extends ControllerConfig {
configManager.set(Option.CLIENT_LISTEN_PORT, clientListenPort);
}
+ public String getClientPublicAddress() {
+ return getAppConfig().getString(Option.CLIENT_PUBLIC_ADDRESS);
+ }
+
+ public void setClientPublicAddress(String clientPublicAddress) {
+ configManager.set(Option.CLIENT_PUBLIC_ADDRESS, clientPublicAddress);
+ }
+
+ public int getClientPublicPort() {
+ return getAppConfig().getInt(Option.CLIENT_PUBLIC_PORT);
+ }
+
+ public void setClientPublicPort(int clientPublicPort) {
+ configManager.set(Option.CLIENT_PUBLIC_PORT, clientPublicPort);
+ }
+
public int getConsoleListenPort() {
return getAppConfig().getInt(Option.CONSOLE_LISTEN_PORT);
}
@@ -269,6 +302,14 @@ public class CCConfig extends ControllerConfig {
configManager.set(Option.CONSOLE_LISTEN_PORT, consoleListenPort);
}
+ public int getConsolePublicPort() {
+ return getAppConfig().getInt(Option.CONSOLE_PUBLIC_PORT);
+ }
+
+ public void setConsolePublicPort(int consolePublicPort) {
+ configManager.set(Option.CONSOLE_PUBLIC_PORT, consolePublicPort);
+ }
+
public long getHeartbeatPeriodMillis() {
return getAppConfig().getLong(Option.HEARTBEAT_PERIOD);
}