| commit | 972fed1d7e4d7743c55d3550b34e8224e6a7121e | [log] [tgz] |
|---|---|---|
| author | Michael Blow <mblow@apache.org> | Mon Oct 03 22:58:29 2016 -0400 |
| committer | Michael Blow <mblow@apache.org> | Tue Oct 04 11:57:19 2016 -0700 |
| tree | a33c50f1095ab9003bdea7f2d2663c5c57a8b1ef | |
| parent | 6adeec2d19f0051d5696f9453e52b86e7a02461d [diff] |
[asterix] -> [app] for NCService configs Change-Id: Ie7bcc249b117bffb5671d087cd1760ef6a85110a Reviewed-on: https://asterix-gerrit.ics.uci.edu/1246 Sonar-Qube: Jenkins <jenkins@fulliautomatix.ics.uci.edu> Tested-by: Jenkins <jenkins@fulliautomatix.ics.uci.edu> Integration-Tests: Jenkins <jenkins@fulliautomatix.ics.uci.edu> Reviewed-by: Till Westmann <tillw@apache.org>
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