From 098b7f639d87698bb4fe80994051a513abb8538b Mon Sep 17 00:00:00 2001
From: n313893254 <n313893254@126.com>
Date: Wed, 13 Oct 2021 15:58:11 +0800
Subject: [PATCH] HARVESTER:Fix storage used

---
 components/formatter/HarvesterStorageUsed.vue | 31 +++++++++++++------
 .../HarvesterHostBasic.vue                    | 12 +++++--
 list/harvesterhci.io.dashboard/index.vue      | 16 +++++++---
 list/harvesterhci.io.host/index.vue           |  9 ++++--
 4 files changed, 49 insertions(+), 19 deletions(-)

diff --git a/components/formatter/HarvesterStorageUsed.vue b/components/formatter/HarvesterStorageUsed.vue
index 33a7f4a20d..0e5084161f 100644
--- a/components/formatter/HarvesterStorageUsed.vue
+++ b/components/formatter/HarvesterStorageUsed.vue
@@ -1,6 +1,6 @@
 <script>
 import ConsumptionGauge from '@/components/ConsumptionGauge';
-import { METRIC } from '@/config/types';
+import { METRIC, LONGHORN } from '@/config/types';
 import { formatSi, exponentNeeded, UNITS } from '@/utils/units';
 
 export default {
@@ -29,21 +29,33 @@ export default {
     },
 
     storageUsage() {
+      const inStore = this.$store.getters['currentProduct'].inStore;
+      const longhornNode = this.$store.getters[`${ inStore }/byId`](LONGHORN.NODES, `longhorn-system/${ this.row.id }`);
       let out = 0;
 
-      if (this.metrics) {
-        out = this.metrics.storageUsage;
-      }
+      const diskStatus = longhornNode?.status?.diskStatus || {};
+
+      Object.values(diskStatus).map((disk) => {
+        if (disk?.storageAvailable && disk?.storageMaximum) {
+          out += disk.storageMaximum - disk.storageAvailable;
+        }
+      });
 
       return out;
     },
 
     storageTotal() {
+      const inStore = this.$store.getters['currentProduct'].inStore;
+      const longhornNode = this.$store.getters[`${ inStore }/byId`](LONGHORN.NODES, `longhorn-system/${ this.row.id }`);
       let out = 0;
 
-      if (this.metrics) {
-        out = this.metrics.storageTotal;
-      }
+      const diskStatus = longhornNode?.status?.diskStatus || {};
+
+      Object.values(diskStatus).map((disk) => {
+        if (disk?.storageMaximum) {
+          out += disk.storageMaximum;
+        }
+      });
 
       return out;
     },
@@ -56,11 +68,12 @@ export default {
   },
 
   methods: {
-    memoryFormatter(value, exponent) {
+    memoryFormatter(value) {
+      const minExponent = exponentNeeded(this.storageTotal, 1024);
       const formatOptions = {
         addSuffix:   false,
         increment:   1024,
-        minExponent: exponent
+        minExponent,
       };
 
       return formatSi(value, formatOptions);
diff --git a/detail/harvesterhci.io.host/HarvesterHostBasic.vue b/detail/harvesterhci.io.host/HarvesterHostBasic.vue
index 27ab6b9516..1d8658752c 100644
--- a/detail/harvesterhci.io.host/HarvesterHostBasic.vue
+++ b/detail/harvesterhci.io.host/HarvesterHostBasic.vue
@@ -127,11 +127,17 @@ export default {
     },
 
     storageTotal() {
+      const inStore = this.$store.getters['currentProduct'].inStore;
+      const longhornNode = this.$store.getters[`${ inStore }/byId`](LONGHORN.NODES, `longhorn-system/${ this.row.id }`);
       let out = 0;
 
-      if (this.metrics) {
-        out = this.metrics.storageTotal;
-      }
+      const diskStatus = longhornNode?.status?.diskStatus || {};
+
+      Object.values(diskStatus).map((disk) => {
+        if (disk?.storageMaximum) {
+          out += disk.storageMaximum;
+        }
+      });
 
       return out;
     },
diff --git a/list/harvesterhci.io.dashboard/index.vue b/list/harvesterhci.io.dashboard/index.vue
index f1a18fb675..6b6260d3fa 100644
--- a/list/harvesterhci.io.dashboard/index.vue
+++ b/list/harvesterhci.io.dashboard/index.vue
@@ -255,12 +255,12 @@ export default {
     storageUsage() {
       let out = 0;
 
-      this.longhornNode.filter(n => n.spec.allowScheduling).forEach((node) => {
+      this.longhornNode.forEach((node) => {
         const diskStatus = node?.status?.diskStatus || {};
 
         Object.values(diskStatus).map((disk) => {
-          if (disk?.storageAvailable && disk?.storageMaximum) {
-            out += disk.storageMaximum - disk.storageAvailable;
+          if (disk?.conditions?.Schedulable?.status === 'True' && disk?.storageAvailable && disk?.storageMaximum) {
+            out += (disk.storageMaximum - disk.storageAvailable);
           }
         });
       });
@@ -271,8 +271,14 @@ export default {
     storageTotal() {
       let out = 0;
 
-      this.metricNodes.forEach((node) => {
-        out += node.storageTotal;
+      this.longhornNode.forEach((node) => {
+        const diskStatus = node?.status?.diskStatus || {};
+
+        Object.values(diskStatus).map((disk) => {
+          if (disk?.storageMaximum) {
+            out += disk.storageMaximum;
+          }
+        });
       });
 
       return out;
diff --git a/list/harvesterhci.io.host/index.vue b/list/harvesterhci.io.host/index.vue
index 029cb0c6f8..1191ae8303 100644
--- a/list/harvesterhci.io.host/index.vue
+++ b/list/harvesterhci.io.host/index.vue
@@ -2,7 +2,9 @@
 import ResourceTable from '@/components/ResourceTable';
 import Loading from '@/components/Loading';
 import { STATE, NAME, AGE } from '@/config/table-headers';
-import { METRIC, NODE, SCHEMA, HCI } from '@/config/types';
+import {
+  METRIC, NODE, SCHEMA, HCI, LONGHORN
+} from '@/config/types';
 import { allHash } from '@/utils/promise';
 import metricPoller from '@/mixins/metric-poller';
 import CopyToClipboard from '@/components/CopyToClipboard';
@@ -25,7 +27,10 @@ export default {
   mixins: [metricPoller],
 
   async fetch() {
-    const _hash = { nodes: this.$store.dispatch('harvester/findAll', { type: NODE }) };
+    const _hash = {
+      nodes:         this.$store.dispatch('harvester/findAll', { type: NODE }),
+      longhornNodes: this.$store.dispatch('harvester/findAll', { type: LONGHORN.NODES }),
+    };
 
     if (this.$store.getters['harvester/schemaFor'](METRIC.NODE)) {
       _hash.metric = this.$store.dispatch('harvester/findAll', { type: METRIC.NODE });