ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From atk...@apache.org
Subject ambari git commit: AMBARI-13734 HDFS destination directory is not getting updated with the recommended value. (atkach)
Date Thu, 05 Nov 2015 11:28:31 GMT
Repository: ambari
Updated Branches:
  refs/heads/trunk e24078b2b -> f3f97311b


AMBARI-13734 HDFS destination directory is not getting updated with the recommended value.
(atkach)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/f3f97311
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/f3f97311
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/f3f97311

Branch: refs/heads/trunk
Commit: f3f97311bf06fb7f8bdea72804d3c6b0b588f6bb
Parents: e24078b2
Author: Andrii Tkach <atkach@hortonworks.com>
Authored: Thu Nov 5 13:26:20 2015 +0200
Committer: Andrii Tkach <atkach@hortonworks.com>
Committed: Thu Nov 5 13:26:20 2015 +0200

----------------------------------------------------------------------
 .../app/mixins/common/configs/enhanced_configs.js     | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/f3f97311/ambari-web/app/mixins/common/configs/enhanced_configs.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/mixins/common/configs/enhanced_configs.js b/ambari-web/app/mixins/common/configs/enhanced_configs.js
index 11a3ed0..ae1a147 100644
--- a/ambari-web/app/mixins/common/configs/enhanced_configs.js
+++ b/ambari-web/app/mixins/common/configs/enhanced_configs.js
@@ -183,25 +183,21 @@ App.EnhancedConfigsMixin = Em.Mixin.create({
    * @param {App.ServiceConfig[]} stepConfigs
    */
   clearDependenciesForInstalledServices: function(installedServices, stepConfigs) {
-    var stackConfigsMap = App.StackConfigProperty.find().toArray().toMapByProperty('name');
     var allConfigs = stepConfigs.mapProperty('configs').filterProperty('length').reduce(function(p,
c) {
-      if (p) {
-        return p.concat(c);
-      }
+      return p && p.concat(c);
     });
     var cleanDependencies = this.get('_dependentConfigValues').reject(function(item) {
       if ('hadoop.proxyuser'.contains(Em.get(item, 'name'))) return false;
       if (installedServices.contains(Em.get(item, 'serviceName'))) {
-        var stackProperty = stackConfigsMap[item.propertyName];
+        var stackProperty = App.StackConfigProperty.find(App.config.configId(item.propertyName,
item.fileName));
         var parentConfigs = stackProperty && stackProperty.get('propertyDependsOn');
         if (!parentConfigs || !parentConfigs.length) {
           return true;
-        } else {
-          parentConfigs = parentConfigs.mapProperty('name');
         }
         // check that all parent properties from installed service
-        return !parentConfigs.reject(function(parentConfigName) {
-          var property = allConfigs.findProperty('name', parentConfigName);
+        return !parentConfigs.reject(function(parentConfig) {
+          var property = allConfigs.filterProperty('filename', App.config.getOriginalFileName(parentConfig.type))
+                                   .findProperty('name', parentConfig.name);
           if (!property) {
             return false;
           }


Mime
View raw message