Explorar o código

Revert "AMBARI-3052. After NameNode HA is enabled, hide the button to enable it in Admin > High Availability. (akovalenko via yusaku)"

This reverts commit 43283406cb228970e7da0d2a67155ab5afe4415b.
Yusaku Sako %!s(int64=11) %!d(string=hai) anos
pai
achega
c25d5ad3a1

+ 1 - 5
ambari-web/app/controllers/wizard/step7_controller.js

@@ -17,7 +17,7 @@
  */
 
 var App = require('app');
-var numberUtils = require('utils/number_utils');
+
 /**
  * By Step 7, we have the following information stored in App.db and set on this
  * controller by the router.
@@ -42,10 +42,6 @@ App.WizardStep7Controller = Em.Controller.extend({
 
   miscModalVisible: false, //If miscConfigChange Modal is shown
 
-  gangliaAvailableSpace: null,
-
-  gangliaMoutDir:'/',
-
   isSubmitDisabled: function () {
     return (!this.stepConfigs.filterProperty('showConfig', true).everyProperty('errorCount', 0) || this.get("miscModalVisible"));
   }.property('stepConfigs.@each.errorCount', 'miscModalVisible'),

+ 1 - 1
ambari-web/app/data/HDP2/global_properties.js

@@ -2330,7 +2330,7 @@ module.exports =
     {
       "id": "puppet var",
       "name": "rrdcached_base_dir",
-      "displayName": "Ganglia rrdcached base directory",
+      "displayName": "Ganglia rrd cached base directory",
       "description": "Default directory for saving the rrd files on ganglia server",
       "defaultValue": "/var/lib/ganglia/rrds",
       "displayType": "directory",

+ 1 - 1
ambari-web/app/data/global_properties.js

@@ -2784,7 +2784,7 @@ module.exports =
     {
       "id": "puppet var",
       "name": "rrdcached_base_dir",
-      "displayName": "Ganglia rrdcached base directory",
+      "displayName": "Ganglia rrd cached base directory",
       "description": "Default directory for saving the rrd files on ganglia server",
       "defaultValue": "/var/lib/ganglia/rrds",
       "displayType": "directory",

+ 0 - 2
ambari-web/app/messages.js

@@ -438,8 +438,6 @@ Em.I18n.translations = {
   'installer.step7.ConfigErrMsg.message':'Error in custom configuration. Some properties entered in the box are already exposed on this page',
   'installer.step7.popup.currentValue':'Current Value',
   'installer.step7.popup.adjustedValue':'Adjusted Value',
-  'installer.step7.popup.rddWarning.header':'Warning: disk space low on {0}',
-  'installer.step7.popup.rddWarning.body':'A minimum of 16GB is recommended for the Ganglia Server logs but the disk mount "{0}" on {1} does not have enough space ({2} free). Go to the Misc tab and change Ganglia rrdcached base directory with more than 16GB of disk space. If you proceed without changing it, {1} will likely run out of disk space and become inoperable.',
 
   'installer.step8.header':'Review',
   'installer.step8.body':'Please review the configuration before installation',

+ 1 - 3
ambari-web/app/views/main/admin/highAvailability_view.js

@@ -25,8 +25,6 @@ App.MainAdminHighAvailabilityView = Em.View.extend({
     this.get('controller').setSecurityStatus();
   },
 
-  isHighAvailabilityEnabled: function () {
-    return !App.HostComponent.find().someProperty('componentName', 'SECONDARY_NAMENODE');
-  }.property()
+  isHighAvailabilityEnabled: false //todo: real check
 
 });