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/08/18 07:40:43 UTC
asterixdb git commit: [NO ISSUE] Fix log directory initialization
Repository: asterixdb
Updated Branches:
refs/heads/master 28c078461 -> a4686a9f5
[NO ISSUE] Fix log directory initialization
Change-Id: I1f4e11e030a8ffa387e1fa234ed9ad9e3fe380c5
Reviewed-on: https://asterix-gerrit.ics.uci.edu/2906
Tested-by: Jenkins <je...@fulliautomatix.ics.uci.edu>
Contrib: Jenkins <je...@fulliautomatix.ics.uci.edu>
Integration-Tests: Jenkins <je...@fulliautomatix.ics.uci.edu>
Reviewed-by: Michael Blow <mb...@apache.org>
Contrib: Michael Blow <mb...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/asterixdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/asterixdb/commit/a4686a9f
Tree: http://git-wip-us.apache.org/repos/asf/asterixdb/tree/a4686a9f
Diff: http://git-wip-us.apache.org/repos/asf/asterixdb/diff/a4686a9f
Branch: refs/heads/master
Commit: a4686a9f5f30dd04fcd11dff5c98ee9012c6cbdc
Parents: 28c0784
Author: Ian Maxon <im...@apache.org>
Authored: Thu Aug 16 16:48:27 2018 -0700
Committer: Michael Blow <mb...@apache.org>
Committed: Sat Aug 18 00:27:40 2018 -0700
----------------------------------------------------------------------
.../apache/asterix/api/common/AsterixHyracksIntegrationUtil.java | 1 +
.../src/main/java/org/apache/hyracks/control/cc/CCDriver.java | 1 +
.../org/apache/hyracks/control/cc/ClusterControllerService.java | 1 -
.../src/main/java/org/apache/hyracks/control/nc/NCDriver.java | 1 +
.../java/org/apache/hyracks/control/nc/NodeControllerService.java | 1 -
5 files changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/a4686a9f/asterixdb/asterix-app/src/test/java/org/apache/asterix/api/common/AsterixHyracksIntegrationUtil.java
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/java/org/apache/asterix/api/common/AsterixHyracksIntegrationUtil.java b/asterixdb/asterix-app/src/test/java/org/apache/asterix/api/common/AsterixHyracksIntegrationUtil.java
index ae13e42..1301c01 100644
--- a/asterixdb/asterix-app/src/test/java/org/apache/asterix/api/common/AsterixHyracksIntegrationUtil.java
+++ b/asterixdb/asterix-app/src/test/java/org/apache/asterix/api/common/AsterixHyracksIntegrationUtil.java
@@ -125,6 +125,7 @@ public class AsterixHyracksIntegrationUtil {
}
ccApplication.registerConfig(configManager);
final CCConfig ccConfig = createCCConfig(configManager);
+ configManager.processConfig();
cc = new ClusterControllerService(ccConfig, ccApplication);
nodeNames = ccConfig.getConfigManager().getNodeNames();
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/a4686a9f/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/CCDriver.java
----------------------------------------------------------------------
diff --git a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/CCDriver.java b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/CCDriver.java
index c4ad139..8b58046 100644
--- a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/CCDriver.java
+++ b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/CCDriver.java
@@ -53,6 +53,7 @@ public class CCDriver {
CCLogConfigurationFactory logCfgFactory = new CCLogConfigurationFactory(ccConfig);
ConfigurationFactory.setConfigurationFactory(logCfgFactory);
cfg.removeLogger("Console");
+ configManager.processConfig();
ctx.start(logCfgFactory.getConfiguration(ctx, ConfigurationSource.NULL_SOURCE));
ClusterControllerService ccService = new ClusterControllerService(ccConfig, application);
ccService.start();
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/a4686a9f/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 ae82803..f7067ff 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
@@ -161,7 +161,6 @@ public class ClusterControllerService implements IControllerService {
throw new IllegalArgumentException("ICCApplication cannot be null");
}
this.application = application;
- configManager.processConfig();
File jobLogFolder = new File(ccConfig.getRootDir(), "logs/jobs");
jobLog = new LogFile(jobLogFolder);
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/a4686a9f/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-nc/src/main/java/org/apache/hyracks/control/nc/NCDriver.java
----------------------------------------------------------------------
diff --git a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-nc/src/main/java/org/apache/hyracks/control/nc/NCDriver.java b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-nc/src/main/java/org/apache/hyracks/control/nc/NCDriver.java
index fdd271c..b460735 100644
--- a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-nc/src/main/java/org/apache/hyracks/control/nc/NCDriver.java
+++ b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-nc/src/main/java/org/apache/hyracks/control/nc/NCDriver.java
@@ -52,6 +52,7 @@ public class NCDriver {
Configuration cfg = ctx.getConfiguration();
NCLogConfigurationFactory logCfgFactory = new NCLogConfigurationFactory(ncConfig);
ConfigurationFactory.setConfigurationFactory(logCfgFactory);
+ configManager.processConfig();
cfg.removeLogger("Console");
ctx.start(logCfgFactory.getConfiguration(ctx, ConfigurationSource.NULL_SOURCE));
final NodeControllerService ncService = new NodeControllerService(ncConfig, application);
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/a4686a9f/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-nc/src/main/java/org/apache/hyracks/control/nc/NodeControllerService.java
----------------------------------------------------------------------
diff --git a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-nc/src/main/java/org/apache/hyracks/control/nc/NodeControllerService.java b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-nc/src/main/java/org/apache/hyracks/control/nc/NodeControllerService.java
index 653d6e0..d7da5a4 100644
--- a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-nc/src/main/java/org/apache/hyracks/control/nc/NodeControllerService.java
+++ b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-nc/src/main/java/org/apache/hyracks/control/nc/NodeControllerService.java
@@ -193,7 +193,6 @@ public class NodeControllerService implements IControllerService {
if (application == null) {
throw new IllegalArgumentException("INCApplication cannot be null");
}
- configManager.processConfig();
this.application = application;
id = ncConfig.getNodeId();
if (id == null) {