ambari git commit: AMBARI-15846. capacity-scheduler config blob is not a part of recommendation API when Hive Interactive query is turned ON. (jaimin)

[jaimin]

Repository: ambari
Updated Branches:
  refs/heads/trunk fe9375abd -> e517a8860


AMBARI-15846. capacity-scheduler config blob is not a part of recommendation 
API when Hive Interactive query is turned ON. (jaimin)


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

Branch: refs/heads/trunk
Commit: e517a886084b72d9a6f1ea91511b727cade97468
Parents: fe9375a
Author: Jaimin Jetly <jai...@hortonworks.com>
Authored: Tue Apr 12 11:35:57 2016 -0700
Committer: Jaimin Jetly <jai...@hortonworks.com>
Committed: Tue Apr 12 11:36:23 2016 -0700

----------------------------------------------------------------------
 ambari-web/app/controllers/main/service/info/configs.js        | 3 ++-
 .../main/service/configs/component_actions_by_configs.js       | 6 +++---
 2 files changed, 5 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/e517a886/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 1e996d9..6437bf8 100644
--- a/ambari-web/app/controllers/main/service/info/configs.js
+++ b/ambari-web/app/controllers/main/service/info/configs.js
@@ -347,8 +347,9 @@ App.MainServiceInfoConfigsController = 
Em.Controller.extend(App.ConfigsLoader, A
      */
     configs = this.mergeWithStackProperties(configs);
 
+    var filenames = configs.mapProperty('fileName').uniq();
     //put properties from capacity-scheduler.xml into one config with textarea 
view
-    if (this.get('content.serviceName') === 'YARN') {
+    if (filenames.contains('capacity-scheduler.xml')) {
       configs = App.config.addYarnCapacityScheduler(configs);
     }
 

http://git-wip-us.apache.org/repos/asf/ambari/blob/e517a886/ambari-web/app/mixins/main/service/configs/component_actions_by_configs.js
----------------------------------------------------------------------
diff --git 
a/ambari-web/app/mixins/main/service/configs/component_actions_by_configs.js 
b/ambari-web/app/mixins/main/service/configs/component_actions_by_configs.js
index 9909fd4..080fff1 100644
--- a/ambari-web/app/mixins/main/service/configs/component_actions_by_configs.js
+++ b/ambari-web/app/mixins/main/service/configs/component_actions_by_configs.js
@@ -58,7 +58,7 @@ App.ComponentActionsByConfigs = Em.Mixin.create({
         var displayName = 
App.StackServiceComponent.find().findProperty('componentName',  
_componentToDelete.componentName).get('displayName');
         var context = Em.I18n.t('requestInfo.stop').format(displayName);
         self.refreshYarnQueues().done(function(data) {
-          self.isRequestCompleted(data).done(function() {
+          self.isRequestCompleted(data).always(function() {
             self.installHostComponents( _componentToDelete.hostName, 
_componentToDelete.componentName, context).done(function(data){
               self.isRequestCompleted(data).done(function() {
                 self.deleteHostComponent(_componentToDelete.hostName, 
_componentToDelete.componentName);
@@ -107,7 +107,7 @@ App.ComponentActionsByConfigs = Em.Mixin.create({
         var hostComponents = allComponentsToAdd.filterProperty('hostName', 
_hostName).mapProperty('componentName').uniq();
         var masterHostComponents =  
allComponentsToAdd.filterProperty('hostName', 
_hostName).filterProperty('isClient', 
false).mapProperty('componentName').uniq();
         self.refreshYarnQueues().done(function(data) {
-          self.isRequestCompleted(data).done(function() {
+          self.isRequestCompleted(data).always(function() {
             self.createHostComponents(_hostName, 
hostComponents).done(function() {
               self.installHostComponents(_hostName, 
hostComponents).done(function(data){
                 self.isRequestCompleted(data).done(function() {
@@ -306,7 +306,7 @@ App.ComponentActionsByConfigs = Em.Mixin.create({
       } else if (data.Requests.request_status === 'COMPLETED') {
         requestCompletedDfd.resolve();
       } else {
-        requestCompletedDfd.fail();
+        requestCompletedDfd.reject();
       }
     };