Update local ssd examples to use local ssd startup solution

GoogleCloudPlatform · Aug 5, 2024 · d8107d7 · d8107d7
1 parent 1d7dc33
commit d8107d7
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 59 deletions.
diff --git a/community/examples/hpc-slurm-local-ssd-v5-legacy.yaml b/community/examples/hpc-slurm-local-ssd-v5-legacy.yaml
@@ -37,6 +37,14 @@ deployment_groups:
     settings:
       local_mount: /home
 
+  - id: startup
+    source: ./modules/scripts/startup-script
+    settings:
+      local_ssd_filesystem:
+        fs_type: "ext4"
+        mountpoint: "/mnt/localssd"
+        permissions: "0755"
+
   - id: compute_node_group
     source: community/modules/compute/schedmd-slurm-gcp-v5-node-group
     settings:
@@ -66,39 +74,11 @@ deployment_groups:
     - network1
     - homefs
     - compute_node_group
+    - startup
     settings:
       is_default: true
       partition_name: ssdcomp
       region: us-central1
-      startup_script: |
-        #!/bin/bash
-        set -e -o pipefail
-
-        # this script assumes it is running on a RedHat-derivative OS
-        yum install -y mdadm
-
-        RAID_DEVICE=/dev/md0
-        DST_MNT=/mnt/localssd
-        DISK_LABEL=LOCALSSD
-        OPTIONS=discard,defaults
-
-        # if mount is successful, do nothing
-        if mount --source LABEL="$DISK_LABEL" --target="$DST_MNT" -o "$OPTIONS"; then
-                exit 0
-        fi
-
-        # Create new RAID, format ext4 and mount
-        # TODO: handle case of zero or 1 local SSD disk
-        # TODO: handle case when /dev/md0 exists but was not mountable
-        DEVICES=`nvme list | grep nvme_ | grep -v nvme_card-pd | awk '{print $1}' | paste -sd ' '`
-        NB_DEVICES=`nvme list | grep nvme_ | grep -v nvme_card-pd | awk '{print $1}' | wc -l`
-        mdadm --create "$RAID_DEVICE" --level=0 --raid-devices=$NB_DEVICES $DEVICES
-        mkfs.ext4 -F "$RAID_DEVICE"
-        tune2fs "$RAID_DEVICE" -r 131072
-        e2label "$RAID_DEVICE" "$DISK_LABEL"
-        mkdir -p "$DST_MNT"
-        mount --source LABEL="$DISK_LABEL" --target="$DST_MNT" -o "$OPTIONS"
-        chmod 1777 "$DST_MNT"
 
   - id: slurm_controller
     source: community/modules/scheduler/schedmd-slurm-gcp-v5-controller

diff --git a/community/examples/hpc-slurm-local-ssd.yaml b/community/examples/hpc-slurm-local-ssd.yaml
@@ -37,9 +37,17 @@ deployment_groups:
     settings:
       local_mount: /home
 
+  - id: startup
+    source: ./modules/scripts/startup-script
+    settings:
+      local_ssd_filesystem:
+        fs_type: "ext4"
+        mountpoint: "/mnt/localssd"
+        permissions: "0755"
+
   - id: nodeset
     source: community/modules/compute/schedmd-slurm-gcp-v6-nodeset
-    use: [network]
+    use: [network, startup]
     settings:
       additional_disks:
       - device_name: test-disk-1
@@ -60,35 +68,6 @@ deployment_groups:
       machine_type: c2-standard-4
       node_count_dynamic_max: 5
       node_count_static: 0
-      startup_script: |
-        #!/bin/bash
-        set -e -o pipefail
-
-        # this script assumes it is running on a RedHat-derivative OS
-        yum install -y mdadm
-
-        RAID_DEVICE=/dev/md0
-        DST_MNT=/mnt/localssd
-        DISK_LABEL=LOCALSSD
-        OPTIONS=discard,defaults
-
-        # if mount is successful, do nothing
-        if mount --source LABEL="$DISK_LABEL" --target="$DST_MNT" -o "$OPTIONS"; then
-                exit 0
-        fi
-
-        # Create new RAID, format ext4 and mount
-        # TODO: handle case of zero or 1 local SSD disk
-        # TODO: handle case when /dev/md0 exists but was not mountable
-        DEVICES=`nvme list | grep nvme_ | grep -v nvme_card-pd | awk '{print $1}' | paste -sd ' '`
-        NB_DEVICES=`nvme list | grep nvme_ | grep -v nvme_card-pd | awk '{print $1}' | wc -l`
-        mdadm --create "$RAID_DEVICE" --level=0 --raid-devices=$NB_DEVICES $DEVICES
-        mkfs.ext4 -F "$RAID_DEVICE"
-        tune2fs "$RAID_DEVICE" -r 131072
-        e2label "$RAID_DEVICE" "$DISK_LABEL"
-        mkdir -p "$DST_MNT"
-        mount --source LABEL="$DISK_LABEL" --target="$DST_MNT" -o "$OPTIONS"
-        chmod 1777 "$DST_MNT"
 
   - id: partition
     source: community/modules/compute/schedmd-slurm-gcp-v6-partition

diff --git a/tools/cloud-build/daily-tests/builds/slurm-gcp-v6-ssd.yaml b/tools/cloud-build/daily-tests/builds/slurm-gcp-v6-ssd.yaml
@@ -19,6 +19,7 @@ tags:
 - m.schedmd-slurm-gcp-v6-login
 - m.schedmd-slurm-gcp-v6-nodeset
 - m.schedmd-slurm-gcp-v6-partition
+- m.startup-script
 - m.vpc
 - slurm6