Michael Blow has submitted this change and it was merged. Change subject: [asterix] -> [app] for NCService configs ......................................................................
[asterix] -> [app] for NCService configs Change-Id: Ie7bcc249b117bffb5671d087cd1760ef6a85110a Reviewed-on: https://asterix-gerrit.ics.uci.edu/1246 Sonar-Qube: Jenkins <[email protected]> Tested-by: Jenkins <[email protected]> Integration-Tests: Jenkins <[email protected]> Reviewed-by: Till Westmann <[email protected]> --- M asterixdb/asterix-common/src/main/java/org/apache/asterix/common/config/AsterixPropertiesAccessor.java M asterixdb/asterix-server/src/main/samples/local/conf/cc.conf M asterixdb/asterix-server/src/test/resources/NCServiceExecutionIT/cc.conf 3 files changed, 10 insertions(+), 3 deletions(-) Approvals: Till Westmann: Looks good to me, approved Jenkins: Verified; No violations found; Verified diff --git a/asterixdb/asterix-common/src/main/java/org/apache/asterix/common/config/AsterixPropertiesAccessor.java b/asterixdb/asterix-common/src/main/java/org/apache/asterix/common/config/AsterixPropertiesAccessor.java index ea1ee31..61cb618 100644 --- a/asterixdb/asterix-common/src/main/java/org/apache/asterix/common/config/AsterixPropertiesAccessor.java +++ b/asterixdb/asterix-common/src/main/java/org/apache/asterix/common/config/AsterixPropertiesAccessor.java @@ -286,7 +286,14 @@ p = asterixConfigurationParams.get(property); value = (p == null) ? null : p.getValue(); } else { - value = cfg.getString("asterix", property); + value = cfg.getString("app", property); + if (value == null) { + value = cfg.getString("asterix", property); + if (value != null) { + LOGGER.warn("[asterix] config section deprecated and will be removed in a future release;" + + " please update to [app] (found: " + property + ')'); + } + } } if (value == null) { return defaultValue; diff --git a/asterixdb/asterix-server/src/main/samples/local/conf/cc.conf b/asterixdb/asterix-server/src/main/samples/local/conf/cc.conf index 5ef1cbf..b5f05d3 100644 --- a/asterixdb/asterix-server/src/main/samples/local/conf/cc.conf +++ b/asterixdb/asterix-server/src/main/samples/local/conf/cc.conf @@ -17,5 +17,5 @@ [cc] cluster.address = 127.0.0.1 -[asterix] +[app] log.level=INFO diff --git a/asterixdb/asterix-server/src/test/resources/NCServiceExecutionIT/cc.conf b/asterixdb/asterix-server/src/test/resources/NCServiceExecutionIT/cc.conf index c4c76e6..c69873c 100644 --- a/asterixdb/asterix-server/src/test/resources/NCServiceExecutionIT/cc.conf +++ b/asterixdb/asterix-server/src/test/resources/NCServiceExecutionIT/cc.conf @@ -20,6 +20,6 @@ cluster.address = 127.0.0.1 app.class=org.apache.asterix.hyracks.bootstrap.CCApplicationEntryPoint -[asterix] +[app] storage.memorycomponent.globalbudget = 1073741824 -- To view, visit https://asterix-gerrit.ics.uci.edu/1246 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ie7bcc249b117bffb5671d087cd1760ef6a85110a Gerrit-PatchSet: 3 Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Owner: Michael Blow <[email protected]> Gerrit-Reviewer: Jenkins <[email protected]> Gerrit-Reviewer: Michael Blow <[email protected]> Gerrit-Reviewer: Till Westmann <[email protected]>
