You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by ak...@apache.org on 2018/07/01 17:18:30 UTC
[ambari] branch trunk updated (fb6bde2 -> dfbf724)
This is an automated email from the ASF dual-hosted git repository.
akovalenko pushed a change to branch trunk
in repository https://gitbox.apache.org/repos/asf/ambari.git.
from fb6bde2 [AMBARI-24228] Agent-side command-*.json files should optionally be deleted when no longer needed by the command
new 789e4ec AMBARI-24213. Enabling RM HA should not be allowed if YARN is stopped (akovalenko)
new dfbf724 AMBARI-24213. Enabling RM HA should not be allowed if YARN is stopped (akovalenko)
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
ambari-web/app/controllers/main/admin/highAvailability_controller.js | 4 ++++
ambari-web/app/messages.js | 1 +
2 files changed, 5 insertions(+)
[ambari] 01/02: AMBARI-24213. Enabling RM HA should not be allowed
if YARN is stopped (akovalenko)
Posted by ak...@apache.org.
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 <ak...@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',
[ambari] 02/02: AMBARI-24213. Enabling RM HA should not be allowed
if YARN is stopped (akovalenko)
Posted by ak...@apache.org.
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 dfbf724865216f5de40a618f1c725e9d64003c97
Author: Aleksandr Kovalenko <ak...@apache.org>
AuthorDate: Sun Jul 1 18:34:55 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 | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/ambari-web/app/controllers/main/admin/highAvailability_controller.js b/ambari-web/app/controllers/main/admin/highAvailability_controller.js
index 0fd4da4..3ac7214 100644
--- a/ambari-web/app/controllers/main/admin/highAvailability_controller.js
+++ b/ambari-web/app/controllers/main/admin/highAvailability_controller.js
@@ -66,7 +66,7 @@ App.MainAdminHighAvailabilityController = App.WizardController.extend({
//Prerequisite Checks
var message = [];
- if (hostComponents.findProperty('componentName', 'RESOURCEMANAGER').get('workStatus') !== 'STARTED') {
+ if (App.HostComponent.find().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) {