Parcourir la source

BUG-8208 Warn if the available space is less than 16 GB at the partition where rrd logs are being stored 3

aBabiichuk il y a 11 ans
Parent
commit
533d15cd73
1 fichiers modifiés avec 12 ajouts et 7 suppressions
  1. 12 7
      ambari-web/app/controllers/wizard/step7_controller.js

+ 12 - 7
ambari-web/app/controllers/wizard/step7_controller.js

@@ -205,9 +205,12 @@ App.WizardStep7Controller = Em.Controller.extend({
   },
 
   showRddWarningPopup: function() {
+    var ganglia = this.get('content.masterComponentHosts').findProperty('component','GANGLIA_SERVER');
+    if(!ganglia) return false;
+    var gangliaServerHost = ganglia.hostName;
     App.ModalPopup.show({
-      header: Em.I18n.t('installer.step7.popup.rddWarning.header').format(16),
-      body: Em.I18n.t('installer.step7.popup.rddWarning.body'),
+      header: Em.I18n.t('installer.step7.popup.rddWarning.header').format(gangliaServerHost),
+      body: Em.I18n.t('installer.step7.popup.rddWarning.body').format(this.get('gangliaMoutDir'),gangliaServerHost,numberUtils.bytesToSize(this.get('gangliaAvailableSpace'),1,'parseFloat',1024)),
       onPrimary: function () {
         this.hide();
         App.router.send('next');
@@ -260,24 +263,26 @@ App.WizardStep7Controller = Em.Controller.extend({
   gangliaHostDiskInfo: function(){
     var ganglia = this.get('content.masterComponentHosts').findProperty('component','GANGLIA_SERVER');
     if(!ganglia) return false;
-    var gangliaGarbageHost = ganglia.hostName;
-    var gangliaPartition = this.get('content.hosts')[gangliaGarbageHost].disk_info;
+    var gangliaServerHost = ganglia.hostName;
+    var gangliaPartition = this.get('content.hosts')[gangliaServerHost].disk_info;
     return gangliaPartition;
   }.property('content'),
 
   isGangliaPartitionGood: function() {
     var gangliaDiskInfo = this.get('gangliaHostDiskInfo');
     if(!gangliaDiskInfo) return true;
-    var miscCoinfigs = this.get('stepConfigs').findProperty('serviceName','MISC').get('configs');
-    var rddDir = miscCoinfigs.findProperty('name', 'rrdcached_base_dir').value;
+    var miscConfigs = this.get('stepConfigs').findProperty('serviceName','MISC').get('configs');
+    var rddDir = miscConfigs.findProperty('name', 'rrdcached_base_dir').value;
     var available = 0;
     gangliaDiskInfo.forEach(function(diskInfo) {
       var mount = rddDir.indexOf(diskInfo.mountpoint);
       if(mount==0 && diskInfo.mountpoint!="/") {
         available = diskInfo.available;
+        this.set('gangliaMoutDir',diskInfo.mountpoint);
       }
-    });
+    },this);
     available = (!available) ? gangliaDiskInfo.findProperty("mountpoint","/").available : available;
+    this.set('gangliaAvailableSpace',available);
     return available > (16*1024*1024) ? true : false;
   },