You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by ja...@apache.org on 2016/06/02 21:15:36 UTC
ambari git commit: AMBARI-16996. Enabling interactive query in
kerberized cluster after re-login results in HS2 interactive installation
failure. (jaimin)
Repository: ambari
Updated Branches:
refs/heads/trunk 61ae693d1 -> 24bd485ab
AMBARI-16996. Enabling interactive query in kerberized cluster after re-login results in HS2 interactive installation failure. (jaimin)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/24bd485a
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/24bd485a
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/24bd485a
Branch: refs/heads/trunk
Commit: 24bd485ab7504739c11558204d8d667ab76c3d09
Parents: 61ae693
Author: Jaimin Jetly <ja...@hortonworks.com>
Authored: Thu Jun 2 14:14:50 2016 -0700
Committer: Jaimin Jetly <ja...@hortonworks.com>
Committed: Thu Jun 2 14:14:50 2016 -0700
----------------------------------------------------------------------
.../wizard/step7/assign_master_controller.js | 41 +++++++++++---------
.../configs/component_actions_by_configs.js | 2 +-
2 files changed, 23 insertions(+), 20 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/24bd485a/ambari-web/app/controllers/wizard/step7/assign_master_controller.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/controllers/wizard/step7/assign_master_controller.js b/ambari-web/app/controllers/wizard/step7/assign_master_controller.js
index cf04bf2..acbb198 100644
--- a/ambari-web/app/controllers/wizard/step7/assign_master_controller.js
+++ b/ambari-web/app/controllers/wizard/step7/assign_master_controller.js
@@ -373,26 +373,29 @@ App.AssignMasterOnStep7Controller = Em.Controller.extend(App.BlueprintMixin, App
* @method submit
*/
submit: function () {
- this.get('popup').hide();
- var context = this.get('configWidgetContext');
- context.toggleProperty('controller.forceUpdateBoundaries');
- var configActionComponent = this.get('configActionComponent');
- var componentHostName = this.getSelectedHostName(configActionComponent.componentName);
- if (this.get('content.controllerName')) {
- this.saveMasterComponentHosts();
- this.saveRecommendationsHostGroups();
- } else {
- this.setGlobalComponentToBeAdded(configActionComponent.componentName, componentHostName);
- this.clearComponentsToBeDeleted(configActionComponent.componentName);
- }
+ var self = this;
+ App.get('router.mainAdminKerberosController').getKDCSessionState(function() {
+ self.get('popup').hide();
+ var context = self.get('configWidgetContext');
+ context.toggleProperty('controller.forceUpdateBoundaries');
+ var configActionComponent = self.get('configActionComponent');
+ var componentHostName = self.getSelectedHostName(configActionComponent.componentName);
+ if (self.get('content.controllerName')) {
+ self.saveMasterComponentHosts();
+ self.saveRecommendationsHostGroups();
+ } else {
+ self.setGlobalComponentToBeAdded(configActionComponent.componentName, componentHostName);
+ self.clearComponentsToBeDeleted(configActionComponent.componentName);
+ }
- var hostComponentConfig = context.get('config.configAction.hostComponentConfig');
- var serviceConfigs = context.get('controller.stepConfigs').findProperty('serviceName', context.get('config.serviceName')).get('configs');
- var config = serviceConfigs.filterProperty('filename', hostComponentConfig.fileName).findProperty('name', hostComponentConfig.configName);
- config.set('value', componentHostName);
- config.set('recommendedValue', componentHostName);
- configActionComponent.hostName = componentHostName;
- this.get('configWidgetContext.config').set('configActionComponent', configActionComponent);
+ var hostComponentConfig = context.get('config.configAction.hostComponentConfig');
+ var serviceConfigs = context.get('controller.stepConfigs').findProperty('serviceName', context.get('config.serviceName')).get('configs');
+ var config = serviceConfigs.filterProperty('filename', hostComponentConfig.fileName).findProperty('name', hostComponentConfig.configName);
+ config.set('value', componentHostName);
+ config.set('recommendedValue', componentHostName);
+ configActionComponent.hostName = componentHostName;
+ self.get('configWidgetContext.config').set('configActionComponent', configActionComponent);
+ });
},
/**
http://git-wip-us.apache.org/repos/asf/ambari/blob/24bd485a/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 d453ded..9271675 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
@@ -155,10 +155,10 @@ App.ComponentActionsByConfigs = Em.Mixin.create({
var displayStr = stringUtils.getFormattedStringFromArray(displayNames);
var context = Em.I18n.t('requestInfo.start').format(displayStr);
var batches =[];
- this.setRefreshYarnQueueRequest(batches);
this.setCreateComponentRequest(batches, hostComponents);
batches.push(this.getCreateHostComponentsRequest(_hostName, hostComponents));
batches.push(this.getInstallHostComponentsRequest(_hostName, hostComponents));
+ this.setRefreshYarnQueueRequest(batches);
batches.push(this.getStartHostComponentsRequest(_hostName, masterHostComponents, context));
this.setOrderIdForBatches(batches);