Skip to content

Commit

Permalink
chore(slurmctld, slurm): clean up relation data
Browse files Browse the repository at this point in the history
These changes remove the unused "cluster_name" from the relation
data sent to slurmd on the slurmd relation. Additionally, make the
"cluster_name" property private.
  • Loading branch information
jamesbeedy authored and NucciTheBoss committed Nov 25, 2024
1 parent 84615ce commit 7e2e7a4
Show file tree
Hide file tree
Showing 5 changed files with 6 additions and 11 deletions.
2 changes: 1 addition & 1 deletion charms/slurmctld/charmcraft.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ config:
options:
cluster-name:
type: string
default: osd-cluster
default: "osd-cluster"
description: |
Name to be recorded in database for jobs from this cluster.
Expand Down
4 changes: 2 additions & 2 deletions charms/slurmctld/src/charm.py
Original file line number Diff line number Diff line change
Expand Up @@ -302,7 +302,7 @@ def _assemble_slurmctld_parameters() -> dict[str, Any]:
}

slurm_conf = SlurmConfig(
ClusterName=self.cluster_name,
ClusterName=self._cluster_name,
SlurmctldAddr=self._slurmd_ingress_address,
SlurmctldHost=[self._slurmctld.hostname],
SlurmctldParameters=_assemble_slurmctld_parameters(),
Expand Down Expand Up @@ -377,7 +377,7 @@ def _resume_nodes(self, nodelist: List[str]) -> None:
self._slurmctld.scontrol(update_cmd)

@property
def cluster_name(self) -> str:
def _cluster_name(self) -> str:
"""Return the cluster name."""
cluster_name = "charmedhpc"
if cluster_name_from_config := self.config.get("cluster-name"):
Expand Down
1 change: 0 additions & 1 deletion charms/slurmctld/src/interface_slurmd.py
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,6 @@ def _on_relation_created(self, event: RelationCreatedEvent) -> None:
{
"munge_key": self._charm.get_munge_key(),
"slurmctld_host": self._charm.hostname,
"cluster_name": self._charm.cluster_name,
"nhc_params": health_check_params,
}
)
Expand Down
6 changes: 3 additions & 3 deletions charms/slurmctld/tests/unit/test_charm.py
Original file line number Diff line number Diff line change
Expand Up @@ -34,12 +34,12 @@ def setUp(self):
self.harness.begin()

def test_cluster_name(self) -> None:
"""Test that the cluster_name property works."""
self.assertEqual(self.harness.charm.cluster_name, "osd-cluster")
"""Test that the _cluster_name property works."""
self.assertEqual(self.harness.charm._cluster_name, "osd-cluster")

def test_cluster_info(self) -> None:
"""Test the cluster_info property works."""
self.assertEqual(type(self.harness.charm.cluster_name), str)
self.assertEqual(type(self.harness.charm._cluster_name), str)

def test_is_slurm_installed(self) -> None:
"""Test that the is_slurm_installed method works."""
Expand Down
4 changes: 0 additions & 4 deletions charms/slurmd/src/interface_slurmctld.py
Original file line number Diff line number Diff line change
Expand Up @@ -24,30 +24,26 @@ class SlurmctldAvailableEvent(EventBase):
def __init__(
self,
handle,
cluster_name,
munge_key,
nhc_params,
slurmctld_host,
):
super().__init__(handle)

self.cluster_name = cluster_name
self.munge_key = munge_key
self.nhc_params = nhc_params
self.slurmctld_host = slurmctld_host

def snapshot(self):
"""Snapshot the event data."""
return {
"cluster_name": self.cluster_name,
"munge_key": self.munge_key,
"nhc_params": self.nhc_params,
"slurmctld_host": self.slurmctld_host,
}

def restore(self, snapshot):
"""Restore the snapshot of the event data."""
self.cluster_name = snapshot.get("cluster_name")
self.munge_key = snapshot.get("munge_key")
self.nhc_params = snapshot.get("nhc_params")
self.slurmctld_host = snapshot.get("slurmctld_host")
Expand Down

0 comments on commit 7e2e7a4

Please sign in to comment.