Change in asterixdb[master]: [NO ISSUE][HYR][CONF] Fix default/description for DEFAULT_DIR

2018-11-21 Thread Till Westmann (Code Review) 
Till Westmann has submitted this change and it was merged.

Change subject: [NO ISSUE][HYR][CONF] Fix default/description for DEFAULT_DIR
..


[NO ISSUE][HYR][CONF] Fix default/description for DEFAULT_DIR

- user model changes: no
- storage format changes: no
- interface changes: no

Details:
- Flip description and default value for
  ControllerConfig.Option.DEFAULT_DIR
- use FileUtil.joinPath to join paths

Change-Id: I055a4d8188ee5b553aecb11c16d0b150d9797353
Reviewed-on: https://asterix-gerrit.ics.uci.edu/3035
Sonar-Qube: Jenkins 
Tested-by: Jenkins 
Integration-Tests: Jenkins 
Contrib: Jenkins 
Reviewed-by: Michael Blow 
---
M 
hyracks-fullstack/hyracks/hyracks-control/hyracks-control-common/src/main/java/org/apache/hyracks/control/common/controllers/ControllerConfig.java
M 
hyracks-fullstack/hyracks/hyracks-control/hyracks-control-nc/src/main/java/org/apache/hyracks/control/nc/NCLogConfigurationFactory.java
2 files changed, 13 insertions(+), 12 deletions(-)

Approvals:
  Anon. E. Moose #1000171: 
  Jenkins: Verified; No violations found; ; Verified
  Michael Blow: Looks good to me, approved



diff --git 
a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-common/src/main/java/org/apache/hyracks/control/common/controllers/ControllerConfig.java
 
b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-common/src/main/java/org/apache/hyracks/control/common/controllers/ControllerConfig.java
index 07e61ba..a800ac4 100644
--- 
a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-common/src/main/java/org/apache/hyracks/control/common/controllers/ControllerConfig.java
+++ 
b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-common/src/main/java/org/apache/hyracks/control/common/controllers/ControllerConfig.java
@@ -40,8 +40,8 @@
 CONFIG_FILE_URL(OptionTypes.URL, (URL) null, "Specify URL to master 
configuration file"),
 DEFAULT_DIR(
 OptionTypes.STRING,
-"Directory where files are written to by default",
-
FileUtil.joinPath(System.getProperty(ConfigurationUtil.JAVA_IO_TMPDIR), 
"hyracks")),
+
FileUtil.joinPath(System.getProperty(ConfigurationUtil.JAVA_IO_TMPDIR), 
"hyracks"),
+"Directory where files are written to by default"),
 LOG_DIR(
 OptionTypes.STRING,
 (Function) appConfig -> FileUtil
diff --git 
a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-nc/src/main/java/org/apache/hyracks/control/nc/NCLogConfigurationFactory.java
 
b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-nc/src/main/java/org/apache/hyracks/control/nc/NCLogConfigurationFactory.java
index f4d10cb..41f8e7b 100644
--- 
a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-nc/src/main/java/org/apache/hyracks/control/nc/NCLogConfigurationFactory.java
+++ 
b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-nc/src/main/java/org/apache/hyracks/control/nc/NCLogConfigurationFactory.java
@@ -18,10 +18,10 @@
  */
 package org.apache.hyracks.control.nc;
 
-import java.io.File;
 import java.net.URI;
 
 import org.apache.hyracks.control.common.controllers.NCConfig;
+import org.apache.hyracks.util.file.FileUtil;
 import org.apache.logging.log4j.Level;
 import org.apache.logging.log4j.core.LoggerContext;
 import org.apache.logging.log4j.core.config.Configuration;
@@ -43,7 +43,6 @@
 public Configuration 
createConfiguration(ConfigurationBuilder builder) {
 String nodeId = config.getNodeId();
 String logDir = config.getLogDir();
-logDir = logDir.endsWith(File.separator) ? logDir : logDir + 
File.separator;
 builder.setStatusLevel(Level.WARN);
 builder.setConfigurationName("RollingBuilder");
 // create a rolling file appender
@@ -52,20 +51,22 @@
 ComponentBuilder triggeringPolicy = builder.newComponent("Policies")
 
.addComponent(builder.newComponent("CronTriggeringPolicy").addAttribute("schedule",
 "0 0 0 * * ?"))
 
.addComponent(builder.newComponent("SizeBasedTriggeringPolicy").addAttribute("size",
 "50M"));
-AppenderComponentBuilder defaultRoll =
-builder.newAppender("default", 
"RollingFile").addAttribute("fileName", logDir + "nc-" + nodeId + ".log")
-.addAttribute("filePattern", logDir + "nc-" + nodeId + 
"-%d{MM-dd-yy}.log.gz")
-.add(defaultLayout).addComponent(triggeringPolicy);
+AppenderComponentBuilder defaultRoll = builder.newAppender("default", 
"RollingFile")
+.addAttribute("fileName", FileUtil.joinPath(logDir, "nc-" + 
nodeId + ".log"))
+.addAttribute("filePattern", FileUtil.joinPath(logDir, "nc-" + 
nodeId + "-%d{MM-dd-yy}.log.gz"))
+.add(defaultLayout).addComponent(triggeringPolicy);
 builder.add(defaultRoll);
 
 // create the new logger

Change in asterixdb[master]: [NO ISSUE][HYR][CONF] Fix default/description for DEFAULT_DIR

2018-11-21 Thread Michael Blow (Code Review) 
Michael Blow has posted comments on this change.

Change subject: [NO ISSUE][HYR][CONF] Fix default/description for DEFAULT_DIR
..


Patch Set 2: Code-Review+2

-- 
To view, visit https://asterix-gerrit.ics.uci.edu/3035
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: I055a4d8188ee5b553aecb11c16d0b150d9797353
Gerrit-PatchSet: 2
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: Till Westmann 
Gerrit-Reviewer: Anon. E. Moose #1000171
Gerrit-Reviewer: Jenkins 
Gerrit-Reviewer: Michael Blow 
Gerrit-HasComments: No

Change in asterixdb[master]: [NO ISSUE][HYR][CONF] Fix default/description for DEFAULT_DIR

2018-11-18 Thread Anon. E. Moose (Code Review) 
Anon. E. Moose #1000171 has posted comments on this change.

Change subject: [NO ISSUE][HYR][CONF] Fix default/description for DEFAULT_DIR
..


Patch Set 2: Contrib+1

Analytics Compatibility Tests Successful
https://goo.gl/pL2wHx : SUCCESS

-- 
To view, visit https://asterix-gerrit.ics.uci.edu/3035
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: I055a4d8188ee5b553aecb11c16d0b150d9797353
Gerrit-PatchSet: 2
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: Till Westmann 
Gerrit-Reviewer: Anon. E. Moose #1000171
Gerrit-Reviewer: Jenkins 
Gerrit-Reviewer: Michael Blow 
Gerrit-HasComments: No

Change in asterixdb[master]: [NO ISSUE][HYR][CONF] Fix default/description for DEFAULT_DIR

2018-11-17 Thread Jenkins (Code Review) 
Jenkins has posted comments on this change.

Change subject: [NO ISSUE][HYR][CONF] Fix default/description for DEFAULT_DIR
..


Patch Set 2: Contrib+1

BAD Compatibility Tests Successful

https://asterix-jenkins.ics.uci.edu/job/asterixbad-compat/3803/ : SUCCESS

-- 
To view, visit https://asterix-gerrit.ics.uci.edu/3035
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: I055a4d8188ee5b553aecb11c16d0b150d9797353
Gerrit-PatchSet: 2
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: Till Westmann 
Gerrit-Reviewer: Anon. E. Moose #1000171
Gerrit-Reviewer: Jenkins 
Gerrit-HasComments: No

Change in asterixdb[master]: [NO ISSUE][HYR][CONF] Fix default/description for DEFAULT_DIR

2018-11-17 Thread Jenkins (Code Review) 
Jenkins has posted comments on this change.

Change subject: [NO ISSUE][HYR][CONF] Fix default/description for DEFAULT_DIR
..


Patch Set 2: Integration-Tests+1

Integration Tests Successful

https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-integration-tests/7576/ 
: SUCCESS

-- 
To view, visit https://asterix-gerrit.ics.uci.edu/3035
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: I055a4d8188ee5b553aecb11c16d0b150d9797353
Gerrit-PatchSet: 2
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: Till Westmann 
Gerrit-Reviewer: Anon. E. Moose #1000171
Gerrit-Reviewer: Jenkins 
Gerrit-HasComments: No

Change in asterixdb[master]: [NO ISSUE][HYR][CONF] Fix default/description for DEFAULT_DIR

2018-11-17 Thread Jenkins (Code Review) 
Jenkins has posted comments on this change.

Change subject: [NO ISSUE][HYR][CONF] Fix default/description for DEFAULT_DIR
..


Patch Set 2:

BAD Compatibility Tests Started 
https://asterix-jenkins.ics.uci.edu/job/asterixbad-compat/3803/

-- 
To view, visit https://asterix-gerrit.ics.uci.edu/3035
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: I055a4d8188ee5b553aecb11c16d0b150d9797353
Gerrit-PatchSet: 2
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: Till Westmann 
Gerrit-Reviewer: Anon. E. Moose #1000171
Gerrit-Reviewer: Jenkins 
Gerrit-HasComments: No

Change in asterixdb[master]: [NO ISSUE][HYR][CONF] Fix default/description for DEFAULT_DIR

2018-11-17 Thread Anon. E. Moose (Code Review) 
Anon. E. Moose #1000171 has posted comments on this change.

Change subject: [NO ISSUE][HYR][CONF] Fix default/description for DEFAULT_DIR
..


Patch Set 2:

Analytics Compatibility Compilation Successful
https://goo.gl/TcuAQX : SUCCESS

-- 
To view, visit https://asterix-gerrit.ics.uci.edu/3035
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: I055a4d8188ee5b553aecb11c16d0b150d9797353
Gerrit-PatchSet: 2
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: Till Westmann 
Gerrit-Reviewer: Anon. E. Moose #1000171
Gerrit-Reviewer: Jenkins 
Gerrit-HasComments: No

Change in asterixdb[master]: [NO ISSUE][HYR][CONF] Fix default/description for DEFAULT_DIR

2018-11-17 Thread Jenkins (Code Review) 
Jenkins has posted comments on this change.

Change subject: [NO ISSUE][HYR][CONF] Fix default/description for DEFAULT_DIR
..


Patch Set 2:

Build Started 
https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-source-assemblies/4971/ 
(10/13)

-- 
To view, visit https://asterix-gerrit.ics.uci.edu/3035
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: I055a4d8188ee5b553aecb11c16d0b150d9797353
Gerrit-PatchSet: 2
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: Till Westmann 
Gerrit-Reviewer: Anon. E. Moose #1000171
Gerrit-Reviewer: Jenkins 
Gerrit-HasComments: No

Change in asterixdb[master]: [NO ISSUE][HYR][CONF] Fix default/description for DEFAULT_DIR

2018-11-17 Thread Jenkins (Code Review) 
Jenkins has posted comments on this change.

Change subject: [NO ISSUE][HYR][CONF] Fix default/description for DEFAULT_DIR
..


Patch Set 2:

Build Started 
https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-verify-asterix-app/5136/ 
(7/13)

-- 
To view, visit https://asterix-gerrit.ics.uci.edu/3035
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: I055a4d8188ee5b553aecb11c16d0b150d9797353
Gerrit-PatchSet: 2
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: Till Westmann 
Gerrit-Reviewer: Anon. E. Moose #1000171
Gerrit-Reviewer: Jenkins 
Gerrit-HasComments: No

Change in asterixdb[master]: [NO ISSUE][HYR][CONF] Fix default/description for DEFAULT_DIR

2018-11-17 Thread Jenkins (Code Review) 
Jenkins has posted comments on this change.

Change subject: [NO ISSUE][HYR][CONF] Fix default/description for DEFAULT_DIR
..


Patch Set 2:

Build Started 
https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-sonar/8698/ (4/13)

-- 
To view, visit https://asterix-gerrit.ics.uci.edu/3035
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: I055a4d8188ee5b553aecb11c16d0b150d9797353
Gerrit-PatchSet: 2
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: Till Westmann 
Gerrit-Reviewer: Anon. E. Moose #1000171
Gerrit-Reviewer: Jenkins 
Gerrit-HasComments: No

Change in asterixdb[master]: [NO ISSUE][HYR][CONF] Fix default/description for DEFAULT_DIR

2018-11-17 Thread Jenkins (Code Review) 
Jenkins has posted comments on this change.

Change subject: [NO ISSUE][HYR][CONF] Fix default/description for DEFAULT_DIR
..


Patch Set 2:

Integration Tests Started 
https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-integration-tests/7576/

-- 
To view, visit https://asterix-gerrit.ics.uci.edu/3035
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: I055a4d8188ee5b553aecb11c16d0b150d9797353
Gerrit-PatchSet: 2
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: Till Westmann 
Gerrit-Reviewer: Anon. E. Moose #1000171
Gerrit-Reviewer: Jenkins 
Gerrit-HasComments: No

Change in asterixdb[master]: [NO ISSUE][HYR][CONF] Fix default/description for DEFAULT_DIR

2018-11-17 Thread Jenkins (Code Review) 
Jenkins has posted comments on this change.

Change subject: [NO ISSUE][HYR][CONF] Fix default/description for DEFAULT_DIR
..


Patch Set 2:

Build Started 
https://asterix-jenkins.ics.uci.edu/job/asterix-stabilization-f69489-compat/179/
 (12/13)

-- 
To view, visit https://asterix-gerrit.ics.uci.edu/3035
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: I055a4d8188ee5b553aecb11c16d0b150d9797353
Gerrit-PatchSet: 2
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: Till Westmann 
Gerrit-Reviewer: Anon. E. Moose #1000171
Gerrit-Reviewer: Jenkins 
Gerrit-HasComments: No

Change in asterixdb[master]: [NO ISSUE][HYR][CONF] Fix default/description for DEFAULT_DIR

2018-11-17 Thread Jenkins (Code Review) 
Jenkins has posted comments on this change.

Change subject: [NO ISSUE][HYR][CONF] Fix default/description for DEFAULT_DIR
..


Patch Set 2:

Build Started https://asterix-jenkins.ics.uci.edu/job/hyracks-gerrit/4661/ 
(6/13)

-- 
To view, visit https://asterix-gerrit.ics.uci.edu/3035
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: I055a4d8188ee5b553aecb11c16d0b150d9797353
Gerrit-PatchSet: 2
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: Till Westmann 
Gerrit-Reviewer: Anon. E. Moose #1000171
Gerrit-Reviewer: Jenkins 
Gerrit-HasComments: No

Change in asterixdb[master]: [NO ISSUE][HYR][CONF] Fix default/description for DEFAULT_DIR

2018-11-17 Thread Jenkins (Code Review) 
Jenkins has posted comments on this change.

Change subject: [NO ISSUE][HYR][CONF] Fix default/description for DEFAULT_DIR
..


Patch Set 2:

Build Started 
https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-verify-no-installer-app/5090/
 (2/13)

-- 
To view, visit https://asterix-gerrit.ics.uci.edu/3035
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: I055a4d8188ee5b553aecb11c16d0b150d9797353
Gerrit-PatchSet: 2
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: Till Westmann 
Gerrit-Reviewer: Anon. E. Moose #1000171
Gerrit-Reviewer: Jenkins 
Gerrit-HasComments: No

Change in asterixdb[master]: [NO ISSUE][HYR][CONF] Fix default/description for DEFAULT_DIR

2018-11-17 Thread Jenkins (Code Review) 
Jenkins has posted comments on this change.

Change subject: [NO ISSUE][HYR][CONF] Fix default/description for DEFAULT_DIR
..


Patch Set 2:

Build Started 
https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-ensure-ancestor/2760/ 
(11/13)

-- 
To view, visit https://asterix-gerrit.ics.uci.edu/3035
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: I055a4d8188ee5b553aecb11c16d0b150d9797353
Gerrit-PatchSet: 2
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: Till Westmann 
Gerrit-Reviewer: Anon. E. Moose #1000171
Gerrit-Reviewer: Jenkins 
Gerrit-HasComments: No

Change in asterixdb[master]: [NO ISSUE][HYR][CONF] Fix default/description for DEFAULT_DIR

2018-11-17 Thread Till Westmann (Code Review) 
Till Westmann has uploaded a new patch set (#2).

Change subject: [NO ISSUE][HYR][CONF] Fix default/description for DEFAULT_DIR
..

[NO ISSUE][HYR][CONF] Fix default/description for DEFAULT_DIR

- user model changes: no
- storage format changes: no
- interface changes: no

Details:
- Flip description and default value for
  ControllerConfig.Option.DEFAULT_DIR
- use FileUtil.joinPath to join paths

Change-Id: I055a4d8188ee5b553aecb11c16d0b150d9797353
---
M 
hyracks-fullstack/hyracks/hyracks-control/hyracks-control-common/src/main/java/org/apache/hyracks/control/common/controllers/ControllerConfig.java
M 
hyracks-fullstack/hyracks/hyracks-control/hyracks-control-nc/src/main/java/org/apache/hyracks/control/nc/NCLogConfigurationFactory.java
2 files changed, 13 insertions(+), 12 deletions(-)


  git pull ssh://asterix-gerrit.ics.uci.edu:29418/asterixdb 
refs/changes/35/3035/2
-- 
To view, visit https://asterix-gerrit.ics.uci.edu/3035
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings

Gerrit-MessageType: newpatchset
Gerrit-Change-Id: I055a4d8188ee5b553aecb11c16d0b150d9797353
Gerrit-PatchSet: 2
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: Till Westmann 
Gerrit-Reviewer: Anon. E. Moose #1000171
Gerrit-Reviewer: Jenkins

Change in asterixdb[master]: [NO ISSUE][HYR][CONF] Fix default/description for DEFAULT_DIR

2018-11-17 Thread Jenkins (Code Review) 
Jenkins has posted comments on this change.

Change subject: [NO ISSUE][HYR][CONF] Fix default/description for DEFAULT_DIR
..


Patch Set 2:

Build Started 
https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-source-format/4716/ 
(8/13)

-- 
To view, visit https://asterix-gerrit.ics.uci.edu/3035
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: I055a4d8188ee5b553aecb11c16d0b150d9797353
Gerrit-PatchSet: 2
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: Till Westmann 
Gerrit-Reviewer: Anon. E. Moose #1000171
Gerrit-Reviewer: Jenkins 
Gerrit-HasComments: No

Change in asterixdb[master]: [NO ISSUE][HYR][CONF] Fix default/description for DEFAULT_DIR

2018-11-17 Thread Jenkins (Code Review) 
Jenkins has posted comments on this change.

Change subject: [NO ISSUE][HYR][CONF] Fix default/description for DEFAULT_DIR
..


Patch Set 2:

Build Started 
https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-notopic/10231/ (1/13)

-- 
To view, visit https://asterix-gerrit.ics.uci.edu/3035
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: I055a4d8188ee5b553aecb11c16d0b150d9797353
Gerrit-PatchSet: 2
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: Till Westmann 
Gerrit-Reviewer: Anon. E. Moose #1000171
Gerrit-Reviewer: Jenkins 
Gerrit-HasComments: No

Change in asterixdb[master]: [NO ISSUE][HYR][CONF] Fix default/description for DEFAULT_DIR

2018-11-17 Thread Jenkins (Code Review) 
Jenkins has posted comments on this change.

Change subject: [NO ISSUE][HYR][CONF] Fix default/description for DEFAULT_DIR
..


Patch Set 2:

Build Started 
https://asterix-jenkins.ics.uci.edu/job/asterix-verify-storage/5320/ (3/13)

-- 
To view, visit https://asterix-gerrit.ics.uci.edu/3035
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: I055a4d8188ee5b553aecb11c16d0b150d9797353
Gerrit-PatchSet: 2
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: Till Westmann 
Gerrit-Reviewer: Anon. E. Moose #1000171
Gerrit-Reviewer: Jenkins 
Gerrit-HasComments: No

Change in asterixdb[master]: [NO ISSUE][HYR][CONF] Fix default/description for DEFAULT_DIR

2018-11-17 Thread Jenkins (Code Review) 
Jenkins has posted comments on this change.

Change subject: [NO ISSUE][HYR][CONF] Fix default/description for DEFAULT_DIR
..


Patch Set 2:

Build Started 
https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-cancellation-test/4750/ 
(5/13)

-- 
To view, visit https://asterix-gerrit.ics.uci.edu/3035
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: I055a4d8188ee5b553aecb11c16d0b150d9797353
Gerrit-PatchSet: 2
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: Till Westmann 
Gerrit-Reviewer: Anon. E. Moose #1000171
Gerrit-Reviewer: Jenkins 
Gerrit-HasComments: No

Change in asterixdb[master]: [NO ISSUE][HYR][CONF] Fix default/description for DEFAULT_DIR

2018-11-17 Thread Jenkins (Code Review) 
Jenkins has posted comments on this change.

Change subject: [NO ISSUE][HYR][CONF] Fix default/description for DEFAULT_DIR
..


Patch Set 2:

Build Started 
https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-asterix-app-sql-execution/4752/
 (9/13)

-- 
To view, visit https://asterix-gerrit.ics.uci.edu/3035
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: I055a4d8188ee5b553aecb11c16d0b150d9797353
Gerrit-PatchSet: 2
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: Till Westmann 
Gerrit-Reviewer: Anon. E. Moose #1000171
Gerrit-Reviewer: Jenkins 
Gerrit-HasComments: No

Change in asterixdb[master]: [NO ISSUE][HYR][CONF] Fix default/description for DEFAULT_DIR

2018-11-17 Thread Jenkins (Code Review) 
Jenkins has posted comments on this change.

Change subject: [NO ISSUE][HYR][CONF] Fix default/description for DEFAULT_DIR
..


Patch Set 1:

Build Started 
https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-asterix-app-openjdk11/179/
 (13/13)

-- 
To view, visit https://asterix-gerrit.ics.uci.edu/3035
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: I055a4d8188ee5b553aecb11c16d0b150d9797353
Gerrit-PatchSet: 1
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: Till Westmann 
Gerrit-Reviewer: Anon. E. Moose #1000171
Gerrit-Reviewer: Jenkins 
Gerrit-HasComments: No

Change in asterixdb[master]: [NO ISSUE][HYR][CONF] Fix default/description for DEFAULT_DIR

2018-11-17 Thread Jenkins (Code Review) 
Jenkins has posted comments on this change.

Change subject: [NO ISSUE][HYR][CONF] Fix default/description for DEFAULT_DIR
..


Patch Set 1:

Build Started 
https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-source-assemblies/4970/ 
(4/13)

-- 
To view, visit https://asterix-gerrit.ics.uci.edu/3035
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: I055a4d8188ee5b553aecb11c16d0b150d9797353
Gerrit-PatchSet: 1
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: Till Westmann 
Gerrit-Reviewer: Jenkins 
Gerrit-HasComments: No

Change in asterixdb[master]: [NO ISSUE][HYR][CONF] Fix default/description for DEFAULT_DIR

2018-11-17 Thread Jenkins (Code Review) 
Jenkins has posted comments on this change.

Change subject: [NO ISSUE][HYR][CONF] Fix default/description for DEFAULT_DIR
..


Patch Set 1:

Build Started 
https://asterix-jenkins.ics.uci.edu/job/asterix-verify-storage/5319/ (8/13)

-- 
To view, visit https://asterix-gerrit.ics.uci.edu/3035
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: I055a4d8188ee5b553aecb11c16d0b150d9797353
Gerrit-PatchSet: 1
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: Till Westmann 
Gerrit-Reviewer: Jenkins 
Gerrit-HasComments: No

Change in asterixdb[master]: [NO ISSUE][HYR][CONF] Fix default/description for DEFAULT_DIR

2018-11-17 Thread Anon. E. Moose (Code Review) 
Anon. E. Moose #1000171 has posted comments on this change.

Change subject: [NO ISSUE][HYR][CONF] Fix default/description for DEFAULT_DIR
..


Patch Set 1:

Analytics Compatibility Compilation Successful
https://goo.gl/stEuWy : SUCCESS

-- 
To view, visit https://asterix-gerrit.ics.uci.edu/3035
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: I055a4d8188ee5b553aecb11c16d0b150d9797353
Gerrit-PatchSet: 1
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: Till Westmann 
Gerrit-Reviewer: Anon. E. Moose #1000171
Gerrit-Reviewer: Jenkins 
Gerrit-HasComments: No

Change in asterixdb[master]: [NO ISSUE][HYR][CONF] Fix default/description for DEFAULT_DIR

2018-11-17 Thread Jenkins (Code Review) 
Jenkins has posted comments on this change.

Change subject: [NO ISSUE][HYR][CONF] Fix default/description for DEFAULT_DIR
..


Patch Set 1:

Build Started 
https://asterix-jenkins.ics.uci.edu/job/asterix-stabilization-f69489-compat/178/
 (12/13)

-- 
To view, visit https://asterix-gerrit.ics.uci.edu/3035
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: I055a4d8188ee5b553aecb11c16d0b150d9797353
Gerrit-PatchSet: 1
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: Till Westmann 
Gerrit-Reviewer: Jenkins 
Gerrit-HasComments: No

Change in asterixdb[master]: [NO ISSUE][HYR][CONF] Fix default/description for DEFAULT_DIR

2018-11-17 Thread Jenkins (Code Review) 
Jenkins has posted comments on this change.

Change subject: [NO ISSUE][HYR][CONF] Fix default/description for DEFAULT_DIR
..


Patch Set 1:

Integration Tests Started 
https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-integration-tests/7575/

-- 
To view, visit https://asterix-gerrit.ics.uci.edu/3035
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: I055a4d8188ee5b553aecb11c16d0b150d9797353
Gerrit-PatchSet: 1
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: Till Westmann 
Gerrit-Reviewer: Jenkins 
Gerrit-HasComments: No

Change in asterixdb[master]: [NO ISSUE][HYR][CONF] Fix default/description for DEFAULT_DIR

2018-11-17 Thread Jenkins (Code Review) 
Jenkins has posted comments on this change.

Change subject: [NO ISSUE][HYR][CONF] Fix default/description for DEFAULT_DIR
..


Patch Set 1:

Build Started 
https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-verify-no-installer-app/5089/
 (1/13)

-- 
To view, visit https://asterix-gerrit.ics.uci.edu/3035
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: I055a4d8188ee5b553aecb11c16d0b150d9797353
Gerrit-PatchSet: 1
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: Till Westmann 
Gerrit-Reviewer: Jenkins 
Gerrit-HasComments: No

Change in asterixdb[master]: [NO ISSUE][HYR][CONF] Fix default/description for DEFAULT_DIR

2018-11-17 Thread Jenkins (Code Review) 
Jenkins has posted comments on this change.

Change subject: [NO ISSUE][HYR][CONF] Fix default/description for DEFAULT_DIR
..


Patch Set 1:

Build Started 
https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-verify-asterix-app/5135/ 
(10/13)

-- 
To view, visit https://asterix-gerrit.ics.uci.edu/3035
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: I055a4d8188ee5b553aecb11c16d0b150d9797353
Gerrit-PatchSet: 1
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: Till Westmann 
Gerrit-Reviewer: Jenkins 
Gerrit-HasComments: No

Change in asterixdb[master]: [NO ISSUE][HYR][CONF] Fix default/description for DEFAULT_DIR

2018-11-17 Thread Jenkins (Code Review) 
Jenkins has posted comments on this change.

Change subject: [NO ISSUE][HYR][CONF] Fix default/description for DEFAULT_DIR
..


Patch Set 1:

Build Started 
https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-sonar/8697/ (3/13)

-- 
To view, visit https://asterix-gerrit.ics.uci.edu/3035
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: I055a4d8188ee5b553aecb11c16d0b150d9797353
Gerrit-PatchSet: 1
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: Till Westmann 
Gerrit-Reviewer: Jenkins 
Gerrit-HasComments: No

Change in asterixdb[master]: [NO ISSUE][HYR][CONF] Fix default/description for DEFAULT_DIR

2018-11-17 Thread Till Westmann (Code Review) 
Till Westmann has uploaded a new change for review.

  https://asterix-gerrit.ics.uci.edu/3035

Change subject: [NO ISSUE][HYR][CONF] Fix default/description for DEFAULT_DIR
..

[NO ISSUE][HYR][CONF] Fix default/description for DEFAULT_DIR

- user model changes: no
- storage format changes: no
- interface changes: no

Details:
- Flip description and default value for
  ControllerConfig.Option.DEFAULT_DIR
- use FileUtil.joinPath to join paths

Change-Id: I055a4d8188ee5b553aecb11c16d0b150d9797353
---
M 
hyracks-fullstack/hyracks/hyracks-control/hyracks-control-common/src/main/java/org/apache/hyracks/control/common/controllers/ControllerConfig.java
M 
hyracks-fullstack/hyracks/hyracks-control/hyracks-control-nc/src/main/java/org/apache/hyracks/control/nc/NCLogConfigurationFactory.java
2 files changed, 10 insertions(+), 11 deletions(-)


  git pull ssh://asterix-gerrit.ics.uci.edu:29418/asterixdb 
refs/changes/35/3035/1

diff --git 
a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-common/src/main/java/org/apache/hyracks/control/common/controllers/ControllerConfig.java
 
b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-common/src/main/java/org/apache/hyracks/control/common/controllers/ControllerConfig.java
index 07e61ba..a800ac4 100644
--- 
a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-common/src/main/java/org/apache/hyracks/control/common/controllers/ControllerConfig.java
+++ 
b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-common/src/main/java/org/apache/hyracks/control/common/controllers/ControllerConfig.java
@@ -40,8 +40,8 @@
 CONFIG_FILE_URL(OptionTypes.URL, (URL) null, "Specify URL to master 
configuration file"),
 DEFAULT_DIR(
 OptionTypes.STRING,
-"Directory where files are written to by default",
-
FileUtil.joinPath(System.getProperty(ConfigurationUtil.JAVA_IO_TMPDIR), 
"hyracks")),
+
FileUtil.joinPath(System.getProperty(ConfigurationUtil.JAVA_IO_TMPDIR), 
"hyracks"),
+"Directory where files are written to by default"),
 LOG_DIR(
 OptionTypes.STRING,
 (Function) appConfig -> FileUtil
diff --git 
a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-nc/src/main/java/org/apache/hyracks/control/nc/NCLogConfigurationFactory.java
 
b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-nc/src/main/java/org/apache/hyracks/control/nc/NCLogConfigurationFactory.java
index f4d10cb..c0abb93 100644
--- 
a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-nc/src/main/java/org/apache/hyracks/control/nc/NCLogConfigurationFactory.java
+++ 
b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-nc/src/main/java/org/apache/hyracks/control/nc/NCLogConfigurationFactory.java
@@ -18,10 +18,10 @@
  */
 package org.apache.hyracks.control.nc;
 
-import java.io.File;
 import java.net.URI;
 
 import org.apache.hyracks.control.common.controllers.NCConfig;
+import org.apache.hyracks.util.file.FileUtil;
 import org.apache.logging.log4j.Level;
 import org.apache.logging.log4j.core.LoggerContext;
 import org.apache.logging.log4j.core.config.Configuration;
@@ -43,7 +43,6 @@
 public Configuration 
createConfiguration(ConfigurationBuilder builder) {
 String nodeId = config.getNodeId();
 String logDir = config.getLogDir();
-logDir = logDir.endsWith(File.separator) ? logDir : logDir + 
File.separator;
 builder.setStatusLevel(Level.WARN);
 builder.setConfigurationName("RollingBuilder");
 // create a rolling file appender
@@ -52,10 +51,10 @@
 ComponentBuilder triggeringPolicy = builder.newComponent("Policies")
 
.addComponent(builder.newComponent("CronTriggeringPolicy").addAttribute("schedule",
 "0 0 0 * * ?"))
 
.addComponent(builder.newComponent("SizeBasedTriggeringPolicy").addAttribute("size",
 "50M"));
-AppenderComponentBuilder defaultRoll =
-builder.newAppender("default", 
"RollingFile").addAttribute("fileName", logDir + "nc-" + nodeId + ".log")
-.addAttribute("filePattern", logDir + "nc-" + nodeId + 
"-%d{MM-dd-yy}.log.gz")
-.add(defaultLayout).addComponent(triggeringPolicy);
+AppenderComponentBuilder defaultRoll = builder.newAppender("default", 
"RollingFile")
+.addAttribute("fileName", FileUtil.joinPath(logDir, "nc-" + 
nodeId + ".log"))
+.addAttribute("filePattern", FileUtil.joinPath(logDir, "nc-" + 
nodeId + "-%d{MM-dd-yy}.log.gz"))
+.add(defaultLayout).addComponent(triggeringPolicy);
 builder.add(defaultRoll);
 
 // create the new logger
@@ -63,9 +62,9 @@
 
 LayoutComponentBuilder accessLayout = 
builder.newLayout("PatternLayout").addAttribute("pattern", "%m%n");
 AppenderComponentBuilder accessRoll =

Change in asterixdb[master]: [NO ISSUE][HYR][CONF] Fix default/description for DEFAULT_DIR

2018-11-17 Thread Jenkins (Code Review) 
Jenkins has posted comments on this change.

Change subject: [NO ISSUE][HYR][CONF] Fix default/description for DEFAULT_DIR
..


Patch Set 1:

Build Started 
https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-asterix-app-sql-execution/4751/
 (9/13)

-- 
To view, visit https://asterix-gerrit.ics.uci.edu/3035
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: I055a4d8188ee5b553aecb11c16d0b150d9797353
Gerrit-PatchSet: 1
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: Till Westmann 
Gerrit-Reviewer: Jenkins 
Gerrit-HasComments: No

Change in asterixdb[master]: [NO ISSUE][HYR][CONF] Fix default/description for DEFAULT_DIR

2018-11-17 Thread Jenkins (Code Review) 
Jenkins has posted comments on this change.

Change subject: [NO ISSUE][HYR][CONF] Fix default/description for DEFAULT_DIR
..


Patch Set 1:

Build Started 
https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-notopic/10230/ (7/13)

-- 
To view, visit https://asterix-gerrit.ics.uci.edu/3035
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: I055a4d8188ee5b553aecb11c16d0b150d9797353
Gerrit-PatchSet: 1
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: Till Westmann 
Gerrit-Reviewer: Jenkins 
Gerrit-HasComments: No

Change in asterixdb[master]: [NO ISSUE][HYR][CONF] Fix default/description for DEFAULT_DIR

2018-11-17 Thread Jenkins (Code Review) 
Jenkins has posted comments on this change.

Change subject: [NO ISSUE][HYR][CONF] Fix default/description for DEFAULT_DIR
..


Patch Set 1:

Build Started 
https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-cancellation-test/4749/ 
(6/13)

-- 
To view, visit https://asterix-gerrit.ics.uci.edu/3035
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: I055a4d8188ee5b553aecb11c16d0b150d9797353
Gerrit-PatchSet: 1
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: Till Westmann 
Gerrit-Reviewer: Jenkins 
Gerrit-HasComments: No

Change in asterixdb[master]: [NO ISSUE][HYR][CONF] Fix default/description for DEFAULT_DIR

2018-11-17 Thread Jenkins (Code Review) 
Jenkins has posted comments on this change.

Change subject: [NO ISSUE][HYR][CONF] Fix default/description for DEFAULT_DIR
..


Patch Set 1:

Build Started 
https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-ensure-ancestor/2759/ 
(2/13)

-- 
To view, visit https://asterix-gerrit.ics.uci.edu/3035
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: I055a4d8188ee5b553aecb11c16d0b150d9797353
Gerrit-PatchSet: 1
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: Till Westmann 
Gerrit-Reviewer: Jenkins 
Gerrit-HasComments: No

Change in asterixdb[master]: [NO ISSUE][HYR][CONF] Fix default/description for DEFAULT_DIR

2018-11-17 Thread Jenkins (Code Review) 
Jenkins has posted comments on this change.

Change subject: [NO ISSUE][HYR][CONF] Fix default/description for DEFAULT_DIR
..


Patch Set 1:

Build Started https://asterix-jenkins.ics.uci.edu/job/hyracks-gerrit/4660/ 
(11/13)

-- 
To view, visit https://asterix-gerrit.ics.uci.edu/3035
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: I055a4d8188ee5b553aecb11c16d0b150d9797353
Gerrit-PatchSet: 1
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: Till Westmann 
Gerrit-Reviewer: Jenkins 
Gerrit-HasComments: No

Change in asterixdb[master]: [NO ISSUE][HYR][CONF] Fix default/description for DEFAULT_DIR

2018-11-17 Thread Jenkins (Code Review) 
Jenkins has posted comments on this change.

Change subject: [NO ISSUE][HYR][CONF] Fix default/description for DEFAULT_DIR
..


Patch Set 1:

Build Started 
https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-source-format/4715/ 
(5/13)

-- 
To view, visit https://asterix-gerrit.ics.uci.edu/3035
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: I055a4d8188ee5b553aecb11c16d0b150d9797353
Gerrit-PatchSet: 1
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: Till Westmann 
Gerrit-Reviewer: Jenkins 
Gerrit-HasComments: No