You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by jl...@apache.org on 2015/06/23 19:49:20 UTC
ambari git commit: AMBARI-12080: Oozie ELService properties required
for FALCON are removed when saving oozie configs (jluniya)
Repository: ambari
Updated Branches:
refs/heads/trunk d1d980f53 -> 3cd06662c
AMBARI-12080: Oozie ELService properties required for FALCON are removed when saving oozie configs (jluniya)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/3cd06662
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/3cd06662
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/3cd06662
Branch: refs/heads/trunk
Commit: 3cd06662c01e49d41dcbeb979d4f5c92cabc48e9
Parents: d1d980f
Author: Jayush Luniya <jl...@hortonworks.com>
Authored: Tue Jun 23 10:49:15 2015 -0700
Committer: Jayush Luniya <jl...@hortonworks.com>
Committed: Tue Jun 23 10:49:15 2015 -0700
----------------------------------------------------------------------
ambari-web/app/controllers/main/service/info/configs.js | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/3cd06662/ambari-web/app/controllers/main/service/info/configs.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/controllers/main/service/info/configs.js b/ambari-web/app/controllers/main/service/info/configs.js
index d3788a0..cdf9eec 100644
--- a/ambari-web/app/controllers/main/service/info/configs.js
+++ b/ambari-web/app/controllers/main/service/info/configs.js
@@ -542,7 +542,14 @@ App.MainServiceInfoConfigsController = Em.Controller.extend(App.ConfigsLoader, A
onLoadOverrides: function (allConfigs) {
this.get('servicesToLoad').forEach(function(serviceName) {
var configGroups = serviceName == this.get('content.serviceName') ? this.get('configGroups') : this.get('dependentConfigGroups').filterProperty('serviceName', serviceName);
- var configsByService = this.get('allConfigs').filterProperty('serviceName', serviceName);
+ var serviceNames = [ serviceName ]
+ if(serviceName === 'OOZIE') {
+ // For Oozie, also add ELService properties which are marked as FALCON properties.
+ serviceNames.push('FALCON')
+ }
+ var configsByService = this.get('allConfigs').filter(function (c) {
+ return serviceNames.contains(c.get('serviceName'));
+ });
databaseUtils.bootstrapDatabaseProperties(configsByService, serviceName);
var serviceConfig = App.config.createServiceConfig(serviceName, configGroups, configsByService, configsByService.length);
if (serviceConfig.get('serviceName') === 'HDFS') {