You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by zh...@apache.org on 2016/04/23 00:16:06 UTC
ambari git commit: AMBARI-15519 Add Service Wizard with nodes in the
maintenance mode. Additional fix. (zhewang)
Repository: ambari
Updated Branches:
refs/heads/trunk 108a1209b -> 9906c393a
AMBARI-15519 Add Service Wizard with nodes in the maintenance mode. Additional fix. (zhewang)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/9906c393
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/9906c393
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/9906c393
Branch: refs/heads/trunk
Commit: 9906c393aaa2be37c2ef815d90ed7eaccac59b45
Parents: 108a120
Author: Zhe (Joe) Wang <zh...@apache.org>
Authored: Fri Apr 22 15:12:19 2016 -0700
Committer: Zhe (Joe) Wang <zh...@apache.org>
Committed: Fri Apr 22 15:12:19 2016 -0700
----------------------------------------------------------------------
ambari-web/app/controllers/wizard.js | 3 ++-
ambari-web/app/mixins/wizard/assign_master_components.js | 2 +-
2 files changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/9906c393/ambari-web/app/controllers/wizard.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/controllers/wizard.js b/ambari-web/app/controllers/wizard.js
index 52fb241..f242523 100644
--- a/ambari-web/app/controllers/wizard.js
+++ b/ambari-web/app/controllers/wizard.js
@@ -745,7 +745,8 @@ App.WizardController = Em.Controller.extend(App.LocalStorage, App.ThemesMappingM
ip: _host.ip,
bootStatus: _host.bootStatus,
isInstalled: false,
- id: indx++
+ id: indx++,
+ maintenance_state: "OFF"
};
}
});
http://git-wip-us.apache.org/repos/asf/ambari/blob/9906c393/ambari-web/app/mixins/wizard/assign_master_components.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/mixins/wizard/assign_master_components.js b/ambari-web/app/mixins/wizard/assign_master_components.js
index e4c5295..bcb628d 100644
--- a/ambari-web/app/mixins/wizard/assign_master_components.js
+++ b/ambari-web/app/mixins/wizard/assign_master_components.js
@@ -966,6 +966,7 @@ App.AssignMasterComponents = Em.Mixin.create({
* <ul>
* <li>host name shouldn't be empty</li>
* <li>host should exist</li>
+ * <li>host shouldn't be in maintainenance mode. If it's in Installer we set it to 'OFF'</li>
* <li>host should have only one component with <code>componentName</code></li>
* </ul>
* @param {string} componentName
@@ -975,7 +976,6 @@ App.AssignMasterComponents = Em.Mixin.create({
*/
isHostNameValid: function (componentName, selectedHost) {
return (selectedHost.trim() !== '') &&
- this.get('hosts').mapProperty('host_name').contains(selectedHost) &&
(this.get('hosts').filterProperty('host_name', selectedHost).filterProperty('maintenance_state', 'OFF').length > 0) &&
(this.get('selectedServicesMasters').
filterProperty('component_name', componentName).