ソースを参照

AMBARI-6798. HDFS rebalance UI cleanup.(xiwang)

Xi Wang 11 年 前
コミット
48f43e2801
2 ファイル変更18 行追加15 行削除
  1. 14 11
      ambari-web/app/controllers/main/service/item.js
  2. 4 4
      ambari-web/app/messages.js

+ 14 - 11
ambari-web/app/controllers/main/service/item.js

@@ -266,7 +266,7 @@ App.MainServiceItemController = Em.Controller.extend({
     App.showAlertPopup(Em.I18n.t('services.service.actions.run.yarnRefreshQueues.error'), error);
     console.warn('Error during refreshYarnQueues:'+error);
   },
- /**
+  /**
    * On click handler for rebalance Hdfs command from items menu
    */
   rebalanceHdfsNodes: function () {
@@ -276,7 +276,7 @@ App.MainServiceItemController = Em.Controller.extend({
       header: Em.I18n.t('services.service.actions.run.rebalanceHdfsNodes.context'),
       primary: Em.I18n.t('common.start'),
       secondary: Em.I18n.t('common.cancel'),
-      inputValue: 0,
+      inputValue: 10,
       errorMessage: Em.I18n.t('services.service.actions.run.rebalanceHdfsNodes.promptError'),
       isInvalid: function () {
         var intValue = Number(this.get('inputValue'));
@@ -285,22 +285,25 @@ App.MainServiceItemController = Em.Controller.extend({
         }
         return false;
       }.property('inputValue'),
+      disablePrimary : function() {
+        return this.get('isInvalid');
+      }.property('isInvalid'),
       onPrimary: function () {
         if (this.get('isInvalid')) {
           return;
         }
-    App.ajax.send({
-      name : 'service.item.rebalanceHdfsNodes',
+        App.ajax.send({
+          name : 'service.item.rebalanceHdfsNodes',
           sender: controller,
-      data : {
-        hosts : App.Service.find('HDFS').get('hostComponents').findProperty('componentName', 'NAMENODE').get('hostName'),
+          data : {
+            hosts : App.Service.find('HDFS').get('hostComponents').findProperty('componentName', 'NAMENODE').get('hostName'),
             threshold: this.get('inputValue')
-      },
-      success : 'rebalanceHdfsNodesSuccessCallback',
-      error : 'rebalanceHdfsNodesErrorCallback'
-    });
+          },
+          success : 'rebalanceHdfsNodesSuccessCallback',
+          error : 'rebalanceHdfsNodesErrorCallback'
+        });
         this.hide();
-  },
+      },
       bodyClass: Ember.View.extend({
         templateName: require('templates/common/prompt_popup'),
         text: Em.I18n.t('services.service.actions.run.rebalanceHdfsNodes.prompt'),

+ 4 - 4
ambari-web/app/messages.js

@@ -1181,12 +1181,12 @@ Em.I18n.translations = {
   'services.service.actions.downloadClientConfigs':'Download Client Configs',
   'services.service.actions.downloadClientConfigs.fail.popup.body':'Generation of {0} configurations file has failed. Do you want to try again?',
   'services.service.actions.run.rebalancer':'Run Rebalancer',
-  'services.service.actions.run.rebalanceHdfsNodes':'Run Rebalance HDFS nodes',
+  'services.service.actions.run.rebalanceHdfsNodes':'Rebalance HDFS',
   'services.service.actions.run.rebalanceHdfsNodes.title':'HDFS Rebalance NameNode',
-  'services.service.actions.run.rebalanceHdfsNodes.prompt':'Please enter Balancer treshold:',
+  'services.service.actions.run.rebalanceHdfsNodes.prompt':'Balancer threshold (percentage of disk capacity):',
   'services.service.actions.run.rebalanceHdfsNodes.promptTooltip':'Percentage of disk capacity. This overwrites the default threshold',
-  'services.service.actions.run.rebalanceHdfsNodes.promptError':'Value should be integer between 0 and 100',
-  'services.service.actions.run.rebalanceHdfsNodes.context':'Rebalance HDFS nodes',
+  'services.service.actions.run.rebalanceHdfsNodes.promptError':'Value should be number between 0 and 100',
+  'services.service.actions.run.rebalanceHdfsNodes.context':'Rebalance HDFS',
   'services.service.actions.run.rebalanceHdfsNodes.error':'Error during remote command: ',
   'services.service.actions.run.yarnRefreshQueues.menu':'Refresh YARN Capacity Scheduler',
   'services.service.actions.run.yarnRefreshQueues.context':'Refresh YARN Capacity Scheduler',