Michael Blow has uploaded a new change for review.
https://asterix-gerrit.ics.uci.edu/1246
Change subject: [asterix] -> [app] for NCService configs
......................................................................
[asterix] -> [app] for NCService configs
Change-Id: Ie7bcc249b117bffb5671d087cd1760ef6a85110a
---
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(-)
git pull ssh://asterix-gerrit.ics.uci.edu:29418/asterixdb
refs/changes/46/1246/1
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: newchange
Gerrit-Change-Id: Ie7bcc249b117bffb5671d087cd1760ef6a85110a
Gerrit-PatchSet: 1
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: Michael Blow <[email protected]>
