Add enable/disable node disk scheduling

Signed-off-by: andy.lee <andy.lee@suse.com>
harvester · Jul 31, 2024 · 164106a · 164106a
1 parent d1254dc
commit 164106a
Show file tree

Hide file tree

Showing 5 changed files with 62 additions and 9 deletions.
diff --git a/pkg/harvester/detail/harvesterhci.io.host/HarvesterHostDisk.vue b/pkg/harvester/detail/harvesterhci.io.host/HarvesterHostDisk.vue
@@ -4,13 +4,15 @@ import LabelValue from '@shell/components/LabelValue';
 import { BadgeState } from '@components/BadgeState';
 import { Banner } from '@components/Banner';
 import HarvesterDisk from '../../mixins/harvester-disk';
+import { RadioGroup } from '@components/Form/Radio';
 
 export default {
   components: {
     LabelValue,
     BadgeState,
     Banner,
-    Tag
+    Tag,
+    RadioGroup
   },
 
   mixins: [
@@ -37,6 +39,18 @@ export default {
     return {};
   },
   computed: {
+    targetDisk() {
+      return this.disks.find(disk => disk.name === this.value.name);
+    },
+    schedulableTooltipMessage() {
+      const { name, path } = this.value;
+
+      if (this.targetDisk && !this.targetDisk.allowScheduling && name && path) {
+        return this.t('harvester.host.disk.allowScheduling.tooltip', { name, path });
+      } else {
+        return this.schedulableCondition.message;
+      }
+    },
     allowSchedulingOptions() {
       return [{
         label: this.t('generic.enabled'),
@@ -117,6 +131,16 @@ export default {
       </div>
       <div class="row mt-10">
         <div class="col span-12">
+          <div class="pull-left">
+            <RadioGroup
+              v-model="value.allowScheduling"
+              name="diskScheduling"
+              :label="t('harvester.host.disk.allowScheduling.label')"
+              :mode="mode"
+              :options="allowSchedulingOptions"
+              :row="true"
+            />
+          </div>
           <div class="pull-right">
             {{ t('harvester.host.disk.conditions') }}:
             <BadgeState
@@ -127,9 +151,9 @@ export default {
               class="mr-10 ml-10 state"
             />
             <BadgeState
-              v-clean-tooltip="schedulableCondition.message"
-              :color="schedulableCondition.status === 'True' ? 'bg-success' : 'bg-error' "
-              :icon="schedulableCondition.status === 'True' ? 'icon-checkmark' : 'icon-warning' "
+              v-clean-tooltip="schedulableTooltipMessage"
+              :color="schedulableCondition.status === 'True' && targetDisk?.allowScheduling ? 'bg-success' : 'bg-error' "
+              :icon="schedulableCondition.status === 'True' && targetDisk?.allowScheduling ? 'icon-checkmark' : 'icon-warning' "
               label="Schedulable"
               class="mr-10 state"
             />

diff --git a/pkg/harvester/detail/harvesterhci.io.host/index.vue b/pkg/harvester/detail/harvesterhci.io.host/index.vue
@@ -102,6 +102,7 @@ export default {
     }
 
     const blockDevices = this.$store.getters[`${ inStore }/all`](HCI.BLOCK_DEVICE);
+
     const provisionedBlockDevices = blockDevices.filter((d) => {
       const provisioned = d?.spec?.fileSystem?.provisioned;
       const isCurrentNode = d?.spec?.nodeName === this.value.id;
@@ -123,6 +124,10 @@ export default {
 
     const disks = [...this.longhornDisks, ...provisionedBlockDevices];
 
+    // console.log('fetch this.longhornDisks=', this.longhornDisks);
+    // console.log('🚀 ~ fetch ~ provisionedBlockDevices:', provisionedBlockDevices);
+    // console.log('🚀 ~ fetch ~ disks:', disks);
+
     this.disks = disks;
     this.newDisks = clone(disks);
 

diff --git a/pkg/harvester/edit/harvesterhci.io.host/HarvesterDisk.vue b/pkg/harvester/edit/harvesterhci.io.host/HarvesterDisk.vue
@@ -44,6 +44,18 @@ export default {
     return {};
   },
   computed: {
+    targetDisk() {
+      return this.disks.find(disk => disk.name === this.value.name);
+    },
+    schedulableTooltipMessage() {
+      const { name, path } = this.value;
+
+      if (this.targetDisk && !this.targetDisk.allowScheduling && name && path) {
+        return this.t('harvester.host.disk.allowScheduling.tooltip', { name, path });
+      } else {
+        return this.schedulableCondition.message;
+      }
+    },
     allowSchedulingOptions() {
       return [{
         label: this.t('generic.enabled'),
@@ -181,6 +193,16 @@ export default {
       </div>
       <div class="row mt-10">
         <div class="col span-12">
+          <div class="pull-left">
+            <RadioGroup
+              v-model="value.allowScheduling"
+              name="diskScheduling"
+              :label="t('harvester.host.disk.allowScheduling.label')"
+              :mode="mode"
+              :options="allowSchedulingOptions"
+              :row="true"
+            />
+          </div>
           <div class="pull-right">
             {{ t('harvester.host.disk.conditions') }}:
             <BadgeState
@@ -191,9 +213,9 @@ export default {
               class="mr-10 ml-10 state"
             />
             <BadgeState
-              v-clean-tooltip="schedulableCondition.message"
-              :color="schedulableCondition.status === 'True' ? 'bg-success' : 'bg-error' "
-              :icon="schedulableCondition.status === 'True' ? 'icon-checkmark' : 'icon-warning' "
+              v-clean-tooltip="schedulableTooltipMessage"
+              :color="schedulableCondition.status === 'True' && targetDisk?.allowScheduling ? 'bg-success' : 'bg-error' "
+              :icon="schedulableCondition.status === 'True' && targetDisk?.allowScheduling ? 'icon-checkmark' : 'icon-warning' "
               label="Schedulable"
               class="mr-10 state"
             />

diff --git a/pkg/harvester/edit/harvesterhci.io.host/index.vue b/pkg/harvester/edit/harvesterhci.io.host/index.vue
@@ -75,6 +75,7 @@ export default {
     await allHash(hash);
 
     const blockDevices = this.$store.getters[`${ inStore }/all`](HCI.BLOCK_DEVICE);
+
     const provisionedBlockDevices = blockDevices.filter((d) => {
       const provisioned = d?.spec?.fileSystem?.provisioned;
       const isCurrentNode = d?.spec?.nodeName === this.value.id;
@@ -365,7 +366,6 @@ export default {
 
           return blockDevice.save();
         }));
-
         this.$store.dispatch('growl/success', {
           title:   this.t('generic.notification.title.succeed'),
           message: this.t('harvester.host.disk.notification.success', { name: this.value.metadata?.name || '' }),
@@ -478,10 +478,11 @@ export default {
 
       const disks = this.longhornNode?.spec?.disks || {};
 
+      // update each disk tags and scheduling
       this.newDisks.map((disk) => {
         (disks[disk.name] || {}).tags = disk.tags;
+        (disks[disk.name] || {}).allowScheduling = disk.allowScheduling;
       });
-
       let count = 0;
 
       const retrySave = async() => {

diff --git a/pkg/harvester/l10n/en-us.yaml b/pkg/harvester/l10n/en-us.yaml
@@ -400,6 +400,7 @@ harvester:
         label: Storage Reserved
       allowScheduling:
         label: Scheduling
+        tooltip: Disk {name} ({path}) scheduling is disabled
       evictionRequested:
         label: Eviction Requested
       forceFormatted: