trim down act.py

WIPACrepo · Dec 19, 2023 · bed6399 · bed6399
1 parent 2557bb8
commit bed6399
Showing 1 changed file with 57 additions and 68 deletions.
diff --git a/ewms_sidecar/condor/act.py b/ewms_sidecar/condor/act.py
@@ -7,7 +7,7 @@
 
 from .. import utils
 from ..config import ENV, LOGGER
-from . import condor_tools, starter, stopper, watcher
+from . import condor_tools, starter, watcher
 
 
 def act(args: argparse.Namespace) -> None:
@@ -26,70 +26,59 @@ def act(args: argparse.Namespace) -> None:
 
 
 def _act(args: argparse.Namespace, schedd_obj: htcondor.Schedd) -> None:
-    match args.action:
-        case "start":
-            LOGGER.info(
-                f"Starting {args.n_workers} Skymap Scanner client workers on {args.collector} / {args.schedd}"
-            )
-            # make connections -- do now so we don't have any surprises downstream
-            skydriver_rc = utils.connect_to_skydriver()
-            # start
-            submit_dict = starter.prep(
-                spool=args.spool,
-                # starter CL args -- worker
-                worker_memory_bytes=args.worker_memory_bytes,
-                worker_disk_bytes=args.worker_disk_bytes,
-                n_cores=args.n_cores,
-                max_worker_runtime=args.max_worker_runtime,
-                priority=args.priority,
-                # starter CL args -- client
-                client_args=args.client_args,
-                client_startup_json_s3=utils.s3ify(args.client_startup_json),
-                image=args.image,
-            )
-            # final checks
-            if args.dryrun:
-                LOGGER.critical("Script Aborted: dryrun enabled")
-                return
-            if utils.skydriver_aborted_scan(skydriver_rc):
-                LOGGER.critical("Script Aborted: SkyDriver aborted scan")
-                return
-            # start
-            submit_result_obj = starter.start(
-                schedd_obj=schedd_obj,
-                n_workers=args.n_workers,
-                submit_dict=submit_dict,
-                spool=args.spool,
-            )
-            # report to SkyDriver
-            skydriver_cluster_obj = dict(
-                orchestrator="condor",
-                location={
-                    "collector": args.collector,
-                    "schedd": args.schedd,
-                },
-                uuid=args.uuid,
-                cluster_id=submit_result_obj.cluster(),
-                n_workers=submit_result_obj.num_procs(),
-                starter_info=submit_dict,
-            )
-            utils.update_skydriver(skydriver_rc, **skydriver_cluster_obj)
-            LOGGER.info("Sent cluster info to SkyDriver")
-            watcher.watch(
-                args.collector,
-                args.schedd,
-                submit_result_obj.cluster(),
-                schedd_obj,
-                submit_result_obj.num_procs(),
-                skydriver_rc,
-                skydriver_cluster_obj,
-            )
-        case "stop":
-            stopper.stop(
-                args.collector,
-                args.schedd,
-                args.cluster_id,
-                schedd_obj,
-            )
-        case _:
-            raise RuntimeError(f"Unknown action: {args.action}")
+    LOGGER.info(
+        f"Starting {args.n_workers} Skymap Scanner client workers on {args.collector} / {args.schedd}"
+    )
+    # make connections -- do now so we don't have any surprises downstream
+    skydriver_rc = utils.connect_to_skydriver()
+    # start
+    submit_dict = starter.prep(
+        spool=args.spool,
+        # starter CL args -- worker
+        worker_memory_bytes=args.worker_memory_bytes,
+        worker_disk_bytes=args.worker_disk_bytes,
+        n_cores=args.n_cores,
+        max_worker_runtime=args.max_worker_runtime,
+        priority=args.priority,
+        # starter CL args -- client
+        client_args=args.client_args,
+        client_startup_json_s3=utils.s3ify(args.client_startup_json),
+        image=args.image,
+    )
+    # final checks
+    if args.dryrun:
+        LOGGER.critical("Script Aborted: dryrun enabled")
+        return
+    if utils.skydriver_aborted_scan(skydriver_rc):
+        LOGGER.critical("Script Aborted: SkyDriver aborted scan")
+        return
+    # start
+    submit_result_obj = starter.start(
+        schedd_obj=schedd_obj,
+        n_workers=args.n_workers,
+        submit_dict=submit_dict,
+        spool=args.spool,
+    )
+    # report to SkyDriver
+    skydriver_cluster_obj = dict(
+        orchestrator="condor",
+        location={
+            "collector": args.collector,
+            "schedd": args.schedd,
+        },
+        uuid=args.uuid,
+        cluster_id=submit_result_obj.cluster(),
+        n_workers=submit_result_obj.num_procs(),
+        starter_info=submit_dict,
+    )
+    utils.update_skydriver(skydriver_rc, **skydriver_cluster_obj)
+    LOGGER.info("Sent cluster info to SkyDriver")
+    watcher.watch(
+        args.collector,
+        args.schedd,
+        submit_result_obj.cluster(),
+        schedd_obj,
+        submit_result_obj.num_procs(),
+        skydriver_rc,
+        skydriver_cluster_obj,
+    )