Configure External Slurmdbd Host and Port in cookbook

Adapt External Slurmdbd configuration on the PC cluster side to the Host and Port subparameter of the ExternalSlurmdbd schema. Adapt unit tests accordingly. Signed-off-by: Jacopo De Amicis <jdamicis@amazon.it>
jdeamicis · Feb 5, 2024 · cdce680 · cdce680
1 parent 9394fab
commit cdce680
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 5 deletions.
diff --git a/...lelcluster-slurm/files/default/head_node_slurm/slurm/templates/slurm_parallelcluster.conf b/...lelcluster-slurm/files/default/head_node_slurm/slurm/templates/slurm_parallelcluster.conf
@@ -17,10 +17,11 @@ SelectTypeParameters=CR_CPU
 {#  #}AccountingStorageType=accounting_storage/slurmdbd
 {#  #}{% if scaling_config.Database.Uri is defined %}
 {#      #}AccountingStorageHost={{ head_node_config.head_node_hostname }}
-{#  #}{% elif scaling_config.ExternalSlurmdbd != None  %}
-{#      #}AccountingStorageHost={{ scaling_config.ExternalSlurmdbd }}
+{#      #}AccountingStoragePort=6819
+{#  #}{% elif scaling_config.ExternalSlurmdbd.Host is defined %}
+{#      #}AccountingStorageHost={{ scaling_config.ExternalSlurmdbd.Host }}
+{#      #}AccountingStoragePort={{ scaling_config.ExternalSlurmdbd.Port }}
 {#  #}{% endif %}
-{#  #}AccountingStoragePort=6819
 {#  #}AccountingStorageUser={{ slurmdbd_user }}
 {#  #}JobAcctGatherType=jobacct_gather/cgroup
 {% endif %}

diff --git a/...urm_config_files_slurm_accounting/expected_outputs/slurm_parallelcluster_externaldbd.conf b/...urm_config_files_slurm_accounting/expected_outputs/slurm_parallelcluster_externaldbd.conf
@@ -9,7 +9,7 @@ ResumeTimeout=1600
 SelectTypeParameters=CR_CPU
 AccountingStorageType=accounting_storage/slurmdbd
 AccountingStorageHost=test.slurmdbd.host
-AccountingStoragePort=6819
+AccountingStoragePort=12345
 AccountingStorageUser=slurm
 JobAcctGatherType=jobacct_gather/cgroup
 

diff --git a/...generator/test_generate_slurm_config_files_slurm_accounting/sample_input_externaldbd.yaml b/...generator/test_generate_slurm_config_files_slurm_accounting/sample_input_externaldbd.yaml
@@ -23,5 +23,7 @@ Scheduling:
     Scheduler: slurm
     SlurmSettings:
         ScaledownIdletime: 10
-        ExternalSlurmdbd: test.slurmdbd.host
+        ExternalSlurmdbd:
+          Host: test.slurmdbd.host
+          Port: 12345
         Database: null