Repository: ambari Updated Branches: refs/heads/branch-2.2 17e641638 -> 42b08a65c
AMBARI-13002. Turning on the Maintenance mode wouldn't let you install the additional components properly (alexantonenko) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/42b08a65 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/42b08a65 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/42b08a65 Branch: refs/heads/branch-2.2 Commit: 42b08a65c4ba90150bb29ce813423128cce43f8b Parents: 17e6416 Author: Alex Antonenko <hiv...@gmail.com> Authored: Thu Feb 25 18:03:02 2016 +0200 Committer: Alex Antonenko <hiv...@gmail.com> Committed: Thu Feb 25 18:08:57 2016 +0200 ---------------------------------------------------------------------- .../controllers/main/admin/highAvailability_controller.js | 9 +++++++++ ambari-web/app/messages.js | 1 + 2 files changed, 10 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/42b08a65/ambari-web/app/controllers/main/admin/highAvailability_controller.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/controllers/main/admin/highAvailability_controller.js b/ambari-web/app/controllers/main/admin/highAvailability_controller.js index 710e4d0..8c3adc9 100644 --- a/ambari-web/app/controllers/main/admin/highAvailability_controller.js +++ b/ambari-web/app/controllers/main/admin/highAvailability_controller.js @@ -40,6 +40,15 @@ App.MainAdminHighAvailabilityController = Em.Controller.extend({ message.push(Em.I18n.t('admin.highAvailability.error.zooKeeperNum')); } + if( + hostComponents.filterProperty('isMaster', true).someProperty('passiveState', "ON") || + hostComponents.filterProperty('isMaster', true).someProperty('passiveState', "IMPLIED_FROM_SERVICE_AND_HOST") || + hostComponents.filterProperty('isMaster', true).someProperty('passiveState', "IMPLIED_FROM_HOST") || + hostComponents.filterProperty('isMaster', true).someProperty('passiveState', "IMPLIED_FROM_SERVICE") + ) { + message.push(Em.I18n.t('admin.highAvailability.error.maintenanceMode')); + } + if (App.router.get('mainHostController.hostsCountMap.TOTAL') < 3) { message.push(Em.I18n.t('admin.highAvailability.error.hostsNum')); } http://git-wip-us.apache.org/repos/asf/ambari/blob/42b08a65/ambari-web/app/messages.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/messages.js b/ambari-web/app/messages.js index e74b662..1c3c208 100644 --- a/ambari-web/app/messages.js +++ b/ambari-web/app/messages.js @@ -1139,6 +1139,7 @@ Em.I18n.translations = { 'admin.highAvailability.confirmManualRollbackBody':'You are in the process of enabling NameNode HA. If you exit now, you must follow manual instructions to revert back to the non-HA setup as documented in the Ambari User Guide\'s <i>Rolling Back NameNode HA</i> section. Are you sure you want to exit the wizard?', 'admin.highAvailability.error.hostsNum':'You must have at least 3 hosts in your cluster to enable NameNode HA.', 'admin.highAvailability.error.namenodeStarted':'NameNode must be running before you enable NameNode HA.', + 'admin.highAvailability.error.maintenanceMode':'In order to enable NameNode HA, all services, and hosts with master components need to be out of Maintenance Mode.', 'admin.highAvailability.error.zooKeeperNum':'You must have at least 3 ZooKeeper Servers in your cluster to enable NameNode HA.', 'admin.rm_highAvailability.error.hostsNum':'You must have at least 3 hosts in your cluster to enable ResourceManager HA.', 'admin.rm_highAvailability.error.zooKeeperNum':'You must have at least 3 ZooKeeper Servers in your cluster to enable ResourceManager HA.',
