This is an automated email from the ASF dual-hosted git repository.
imaxon pushed a commit to branch release-0.9.4.1
in repository https://gitbox.apache.org/repos/asf/asterixdb.git
commit 297abe4a93ee0c386e75791e77b38c6df0ada709
Author: Ian Maxon <ima...@apache.org>
AuthorDate: Wed Feb 6 16:57:45 2019 -0800
[NO ISSUE] Fix log directory initialization
Change-Id: I357805659be133929ab1beea33bc0dcdf4dc896c
Reviewed-on: https://asterix-gerrit.ics.uci.edu/3154
Sonar-Qube: Jenkins <jenk...@fulliautomatix.ics.uci.edu>
Tested-by: Jenkins <jenk...@fulliautomatix.ics.uci.edu>
Integration-Tests: Jenkins <jenk...@fulliautomatix.ics.uci.edu>
Reviewed-by: Michael Blow <mb...@apache.org>
---
.../org/apache/asterix/api/common/AsterixHyracksIntegrationUtil.java | 1 +
.../src/main/java/org/apache/hyracks/control/cc/CCDriver.java | 1 +
.../java/org/apache/hyracks/control/cc/ClusterControllerService.java | 1 -
.../src/main/java/org/apache/hyracks/control/nc/NCDriver.java | 1 +
.../main/java/org/apache/hyracks/control/nc/NodeControllerService.java | 1 -
5 files changed, 3 insertions(+), 2 deletions(-)
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();
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();
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 b5dacfb..b2e4a5e 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);
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);
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) {
