Преглед изворни кода

AMBARI-6729. RM HA wizard is experimental but shouldn't be. (akovalenko)

Aleksandr Kovalenko пре 10 година
родитељ
комит
f4f17ffe29

+ 1 - 1
ambari-web/app/config.js

@@ -71,7 +71,7 @@ App.supports = {
   ldapGroupMapping: false,
   localRepositories: true,
   highAvailability: true,
-  resourceManagerHighAvailability: false,
+  resourceManagerHighAvailability: true,
   deleteHost: true,
   autoRollbackHA: false,
   appTimelineServer: true,

+ 1 - 1
ambari-web/app/templates/main/admin/highAvailability.hbs

@@ -39,7 +39,7 @@
       <div class="spinner"></div>
     {{/if}}
   {{/if}}
-  {{#if App.supports.resourceManagerHighAvailability}}
+  {{#if view.supportRMHA}}
     {{#if App.isRMHaEnabled}}
     <div class="rm-ha">
         <p class="text-success">

+ 4 - 0
ambari-web/app/views/main/admin/highAvailability_view.js

@@ -23,5 +23,9 @@ App.MainAdminHighAvailabilityView = Em.View.extend({
 
   didInsertElement: function () {
     this.get('controller').setSecurityStatus();
+  },
+
+  supportRMHA: function () {
+    return App.get('isHadoop21Stack') && App.get('supports.resourceManagerHighAvailability');
   }
 });

+ 1 - 1
ambari-web/app/views/main/service/item.js

@@ -84,7 +84,7 @@ App.MainServiceItemView = Em.View.extend({
         action: 'enableRMHighAvailability',
         label: Em.I18n.t('admin.rm_highAvailability.button.enable'),
         cssClass: 'icon-arrow-up',
-        isHidden: !App.get('supports.resourceManagerHighAvailability') || App.get('isRMHaEnabled')
+        isHidden: !App.get('supports.resourceManagerHighAvailability') || App.get('isRMHaEnabled') || !App.get('isHadoop21Stack')
       },
       MOVE_COMPONENT: {
         action: 'reassignMaster',