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 2016/10/04 18:58:01 UTC
asterixdb git commit: [asterix] -> [app] for NCService configs
Repository: asterixdb
Updated Branches:
refs/heads/master 6adeec2d1 -> 972fed1d7
[asterix] -> [app] for NCService configs
Change-Id: Ie7bcc249b117bffb5671d087cd1760ef6a85110a
Reviewed-on: https://asterix-gerrit.ics.uci.edu/1246
Sonar-Qube: Jenkins <je...@fulliautomatix.ics.uci.edu>
Tested-by: Jenkins <je...@fulliautomatix.ics.uci.edu>
Integration-Tests: Jenkins <je...@fulliautomatix.ics.uci.edu>
Reviewed-by: Till Westmann <ti...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/asterixdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/asterixdb/commit/972fed1d
Tree: http://git-wip-us.apache.org/repos/asf/asterixdb/tree/972fed1d
Diff: http://git-wip-us.apache.org/repos/asf/asterixdb/diff/972fed1d
Branch: refs/heads/master
Commit: 972fed1d7e4d7743c55d3550b34e8224e6a7121e
Parents: 6adeec2
Author: Michael Blow <mb...@apache.org>
Authored: Mon Oct 3 22:58:29 2016 -0400
Committer: Michael Blow <mb...@apache.org>
Committed: Tue Oct 4 11:57:19 2016 -0700
----------------------------------------------------------------------
.../asterix/common/config/AsterixPropertiesAccessor.java | 9 ++++++++-
.../asterix-server/src/main/samples/local/conf/cc.conf | 2 +-
.../src/test/resources/NCServiceExecutionIT/cc.conf | 2 +-
3 files changed, 10 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/972fed1d/asterixdb/asterix-common/src/main/java/org/apache/asterix/common/config/AsterixPropertiesAccessor.java
----------------------------------------------------------------------
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 @@ public class AsterixPropertiesAccessor {
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;
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/972fed1d/asterixdb/asterix-server/src/main/samples/local/conf/cc.conf
----------------------------------------------------------------------
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 @@ command=${NC_COMMAND}
[cc]
cluster.address = 127.0.0.1
-[asterix]
+[app]
log.level=INFO
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/972fed1d/asterixdb/asterix-server/src/test/resources/NCServiceExecutionIT/cc.conf
----------------------------------------------------------------------
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 @@ storagedir=test_storage
cluster.address = 127.0.0.1
app.class=org.apache.asterix.hyracks.bootstrap.CCApplicationEntryPoint
-[asterix]
+[app]
storage.memorycomponent.globalbudget = 1073741824