delete accounts

Author: s-sajid-ali

coldfront/plugins/slurmrest/management/commands/slurmrest_check.py

@@ -139,6 +139,7 @@ def check_consistency(self, slurm_cluster, coldfront_resource):
                             continue
 
             else:
+                # Allocation has been removed in Coldfront!
                 for association in account.associations:
                     # Only SLURM devs know whey some associations are two way (account, cluster)
                     # when most others are 4-way (user, account, cluster, partition)
@@ -150,10 +151,19 @@ def check_consistency(self, slurm_cluster, coldfront_resource):
                         logger.debug(f"Ignoring user: {username} in account: {account.name}")
                         continue
 
-                    logger.warning(
-                        f"SLURM account: {account.name} with user: {username} not found in ColdFront. Removing association.",
+                    logger.info(
+                        f"Deleted SLURM account: {account.name} has user: {username}. Removing association.",
                     )
 
+                    try:
+                        slurm_cluster.delete_association_user_account(username, account.name, self.noop)
+                    except RuntimeError:
+                        logging.warning(
+                            f"Could not delete association for user: {username} and account: {account.name}"
+                        )
+                        continue
+                # Once the SLURM account has no users associated, remove the slurm account as well
+
     def handle(self, *args, **options):
 
         verbosity: int = options["verbosity"]

coldfront/plugins/slurmrest/utils.py

@@ -8,6 +8,7 @@
 from slurm_rest_api_client import Client
 from slurm_rest_api_client.api.slurm import slurm_v0043_delete_jobs
 from slurm_rest_api_client.api.slurmdb import (
+    slurmdb_v0043_delete_account,
     slurmdb_v0043_delete_association,
     slurmdb_v0043_get_accounts,
     slurmdb_v0043_get_associations,
@@ -169,3 +170,24 @@ def delete_association_user_account(self, username: str, account: str, noop: boo
             raise RuntimeError(f"Could not delete association for user: {username} and account: {account}")
 
         return
+
+    @retry(
+        wait=wait_exponential(multiplier=2, min=2, max=10),
+        stop=stop_after_attempt(3),
+        retry=retry_if_not_exception_type(ConnectionError),
+        before_sleep=before_sleep_log(logging.getLogger(__name__), logging.WARNING),
+    )
+    def delete_slurm_account(self, account: str, noop: bool = False) -> None:
+        if noop:
+            logging.info(f"noop enabled: skip deleting acconut: {account}")
+            return
+
+        account_delete_resp = slurmdb_v0043_delete_account.sync(client=self.root_client, account_name=account)
+
+        if not account_delete_resp:
+            raise ConnectionError(f"Could not delete account: {account}")
+        if account_delete_resp.errors:
+            raise RuntimeError(f"Could not delete account: {account}")
+        for account_removed in account_delete_resp.removed_accounts:
+            logging.info(f"Removed SLURM account: {account_removed}")
+        return