Repository: ambari Updated Branches: refs/heads/trunk fbcad4fb4 -> 688224127
AMBARI-19409. Auto refresh yarn queues when capacity scheduler config is changed from hive configs page.(Vivek Subramanian via xiwang ) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/68822412 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/68822412 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/68822412 Branch: refs/heads/trunk Commit: 688224127de729640904648907788b9f31c60a5c Parents: fbcad4f Author: Xi Wang <[email protected]> Authored: Fri Jan 6 17:03:48 2017 -0800 Committer: Xi Wang <[email protected]> Committed: Fri Jan 6 17:05:13 2017 -0800 ---------------------------------------------------------------------- .../main/service/configs/component_actions_by_configs.js | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/68822412/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 347bdde..8b014c2 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 @@ -61,10 +61,15 @@ App.ComponentActionsByConfigs = Em.Mixin.create({ if (configs.length) { if(config_action.get('fileName') === 'capacity-scheduler.xml' && !self.isYarnQueueRefreshed) { - self.configAction = config_action; - App.showConfirmationPopup(function () { + if(self.get('content.serviceName') === 'HIVE') { + // Auto refresh yarn capacity scheduler if capacity-scheduler configs are changed from Hive configs page self.popupPrimaryButtonCallback(config_action); - }, config_action.get('popupProperties').body, null, Em.I18n.t('popup.confirmation.commonHeader'), config_action.get('popupProperties').primaryButton.label, false, 'refresh_yarn_queues') + } else { + self.configAction = config_action; + App.showConfirmationPopup(function () { + self.popupPrimaryButtonCallback(config_action); + }, config_action.get('popupProperties').body, null, Em.I18n.t('popup.confirmation.commonHeader'), config_action.get('popupProperties').primaryButton.label, false, 'refresh_yarn_queues') + } } } });
