[ambari] 01/02: AMBARI-24213. Enabling RM HA should not be allowed if YARN is stopped (akovalenko)

[akovalenko]

This is an automated email from the ASF dual-hosted git repository.

akovalenko pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/ambari.git

commit 789e4ec474ef3267f2fc27925b5c44f1cc11f6a0
Author: Aleksandr Kovalenko <akovale...@apache.org>
AuthorDate: Sun Jul 1 17:52:24 2018 +0300

    AMBARI-24213. Enabling RM HA should not be allowed if YARN is stopped 
(akovalenko)
---
 ambari-web/app/controllers/main/admin/highAvailability_controller.js | 4 ++++
 ambari-web/app/messages.js                                           | 1 +
 2 files changed, 5 insertions(+)

diff --git 
a/ambari-web/app/controllers/main/admin/highAvailability_controller.js 
b/ambari-web/app/controllers/main/admin/highAvailability_controller.js
index 5a18e57..0fd4da4 100644
--- a/ambari-web/app/controllers/main/admin/highAvailability_controller.js
+++ b/ambari-web/app/controllers/main/admin/highAvailability_controller.js
@@ -65,6 +65,10 @@ App.MainAdminHighAvailabilityController = 
App.WizardController.extend({
   enableRMHighAvailability: function () {
     //Prerequisite Checks
     var message = [];
+
+    if (hostComponents.findProperty('componentName', 
'RESOURCEMANAGER').get('workStatus') !== 'STARTED') {
+      
message.push(Em.I18n.t('admin.rm_highAvailability.error.resourceManagerStarted'));
+    }
     if (App.HostComponent.find().filterProperty('componentName', 
'ZOOKEEPER_SERVER').length < 3) {
       message.push(Em.I18n.t('admin.rm_highAvailability.error.zooKeeperNum'));
     }
diff --git a/ambari-web/app/messages.js b/ambari-web/app/messages.js
index d908f15..d55a224 100644
--- a/ambari-web/app/messages.js
+++ b/ambari-web/app/messages.js
@@ -1457,6 +1457,7 @@ Em.I18n.translations = {
   '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.',
+  'admin.rm_highAvailability.error.resourceManagerStarted':'ResourceManager 
must be running before you enable ResourceManager HA.',
   'admin.rm_highAvailability.closePopup':'Enable ResourceManager HA Wizard is 
in progress. You must allow the wizard to complete for Ambari to be in usable 
state. If you choose to quit, you must follow manual instructions to complete 
or revert enabling ResourceManager HA as documented in the Ambari User Guide. 
Are you sure you want to exit the wizard?',
 
   'admin.highAvailability.wizard.header':'Enable NameNode HA Wizard',