Improve RAID logic

`raid_parameters` is splitted into `raid_shared_dir` and `raid_type`
Remove reliance on NONE. Now, an empty string means no storage.

This change will make it easier if we want to support multiple RAIDs in the future

Signed-off-by: Hanwen <[email protected]>

Author: hanwen-cluster

attributes/default.rb

@@ -477,7 +477,7 @@
 default['cluster']['node_type'] = nil
 default['cluster']['cluster_user'] = 'ec2-user'
 default['cluster']['head_node_private_ip'] = nil
-default['cluster']['volume'] = nil
+default['cluster']['volume'] = ""
 
 # ParallelCluster internal variables to configure active directory service
 default['cluster']["directory_service"]["enabled"] = 'false'
@@ -510,8 +510,9 @@
 default['cluster']['fsx_mount_names'] = ''
 default['cluster']['custom_node_package'] = nil
 default['cluster']['custom_awsbatchcli_package'] = nil
-default['cluster']['raid_parameters'] = 'NONE'
-default['cluster']['raid_vol_ids'] = nil
+default['cluster']['raid_shared_dir'] = ''
+default['cluster']['raid_type'] = ''
+default['cluster']['raid_vol_ids'] = ''
 default['cluster']['dns_domain'] = nil
 default['cluster']['use_private_hostname'] = 'false'
 default['cluster']['add_node_hostnames_in_hosts_file'] = node['cluster']['use_private_hostname']

cookbooks/aws-parallelcluster-config/recipes/compute_base.rb

@@ -16,9 +16,9 @@
 # limitations under the License.
 
 # Parse and get RAID shared directory info and turn into an array
-raid_shared_dir = node['cluster']['raid_parameters'].split(',')[0]
+raid_shared_dir = node['cluster']['raid_shared_dir']
 
-if raid_shared_dir != "NONE"
+unless raid_shared_dir.empty?
   # Path needs to be fully qualified, for example "shared/temp" becomes "/shared/temp"
   raid_shared_dir = "/#{raid_shared_dir}" unless raid_shared_dir.start_with?('/')
 
@@ -67,8 +67,6 @@
 shared_dir_array.each do |dir|
   dirname = dir.strip
 
-  next if dirname == "NONE"
-
   dirname = "/#{dirname}" unless dirname.start_with?('/')
 
   # Created shared mount point

cookbooks/aws-parallelcluster-config/recipes/head_node_base.rb

@@ -33,9 +33,6 @@
 dev_uuids = [] # device uuids
 
 vol_array.each_with_index do |volumeid, index|
-  # Skips volume if shared_dir is /NONE
-  next if shared_dir_array[index] == "/NONE"
-
   dev_path[index] = "/dev/disk/by-ebs-volumeid/#{volumeid}"
 
   # Attach EBS volume

cookbooks/aws-parallelcluster-config/recipes/head_node_raid.rb

@@ -17,14 +17,14 @@
 
 # RAID RELATED
 # Parse and get RAID shared directory info and turn into an array
-raid_shared_dir = node['cluster']['raid_parameters'].split(',')[0]
+raid_shared_dir = node['cluster']['raid_shared_dir']
 
-if raid_shared_dir != "NONE"
+unless raid_shared_dir.empty?
   # Path needs to be fully qualified, for example "shared/temp" becomes "/shared/temp"
   raid_shared_dir = "/#{raid_shared_dir}" unless raid_shared_dir.start_with?('/')
 
   # Parse and determine RAID type (cast into integer)
-  raid_type = node['cluster']['raid_parameters'].split(',')[1].strip.to_i
+  raid_type = node['cluster']['raid_type'].strip.to_i
 
   # Parse volume info into an array
   raid_vol_array = node['cluster']['raid_vol_ids'].split(',')

system_tests/dna.json

@@ -1,8 +1,8 @@
 {
   "cluster": {
     "stack_name": "pc3cluster",
-    "raid_vol_ids": "NONE",
-    "raid_parameters": "NONE,NONE,NONE,NONE,NONE,NONE,NONE,NONE,NONE",
+    "raid_vol_ids": "",
+    "raid_shared_dir": "",
     "disable_hyperthreading_manually": "false",
     "base_os": "ubuntu2004",
     "preinstall": "NONE",
@@ -16,10 +16,10 @@
     "fsx_mount_names": "",
     "fsx_dns_names": "",
     "fsx_shared_dirs": "",
-    "volume": "NONE",
+    "volume": "",
     "scheduler": "slurm",
     "ephemeral_dir": "/scratch",
-    "ebs_shared_dirs": "NONE,NONE,NONE,NONE,NONE",
+    "ebs_shared_dirs": "",
     "proxy": "NONE",
     "dns_domain": "pc3cluster.pcluster.",
     "hosted_zone": "Z0000000000000000000",