Rename command to clear_schedules

oonipipeline/src/oonipipeline/cli/commands.py

@@ -9,7 +9,7 @@
     run_backfill,
     run_create_schedules,
     run_status,
-    run_reschedule,
+    run_clear_schedules,
 )
 from oonipipeline.temporal.workers import start_workers
 
@@ -196,7 +196,7 @@ def schedule(
 @cli.command()
 @probe_cc_option
 @test_name_option
-def reschedule(
+def clear_schedules(
     probe_cc: List[str],
     test_name: List[str],
 ):
@@ -210,11 +210,9 @@ def reschedule(
         temporal_tls_client_key_path=config.temporal_tls_client_key_path,
     )
 
-    run_reschedule(
+    run_clear_schedules(
         probe_cc=probe_cc,
         test_name=test_name,
-        clickhouse_url=config.clickhouse_url,
-        data_dir=config.data_dir,
         temporal_config=temporal_config,
     )
 

oonipipeline/src/oonipipeline/temporal/client_operations.py

@@ -8,7 +8,7 @@
     ScheduleIdMap,
     schedule_all,
     schedule_backfill,
-    reschedule_all,
+    clear_schedules,
 )
 
 from opentelemetry.exporter.otlp.proto.grpc.trace_exporter import OTLPSpanExporter
@@ -154,23 +154,19 @@ async def create_schedules(
     )
 
 
-async def reschedule(
+async def execute_clear_schedules(
     probe_cc: List[str],
     test_name: List[str],
-    clickhouse_url: str,
-    data_dir: str,
     temporal_config: TemporalConfig,
-) -> ScheduleIdMap:
+) -> List[str]:
     log.info(f"rescheduling everything")
 
     client = await temporal_connect(temporal_config=temporal_config)
 
-    return await reschedule_all(
+    return await clear_schedules(
         client=client,
         probe_cc=probe_cc,
         test_name=test_name,
-        clickhouse_url=clickhouse_url,
-        data_dir=data_dir,
     )
 
 
@@ -255,20 +251,16 @@ def run_create_schedules(
         print("shutting down")
 
 
-def run_reschedule(
+def run_clear_schedules(
     probe_cc: List[str],
     test_name: List[str],
-    clickhouse_url: str,
-    data_dir: str,
     temporal_config: TemporalConfig,
 ):
     try:
         asyncio.run(
-            reschedule(
+            execute_clear_schedules(
                 probe_cc=probe_cc,
                 test_name=test_name,
-                clickhouse_url=clickhouse_url,
-                data_dir=data_dir,
                 temporal_config=temporal_config,
             )
         )

oonipipeline/src/oonipipeline/temporal/schedules.py

@@ -189,26 +189,19 @@ async def schedule_all(
     return schedule_id_map
 
 
-async def reschedule_all(
+async def clear_schedules(
     client: TemporalClient,
     probe_cc: List[str],
     test_name: List[str],
-    clickhouse_url: str,
-    data_dir: str,
-) -> ScheduleIdMap:
+) -> List[str]:
+    schedule_ids = []
     existing_schedules = await list_existing_schedules(
         client=client, probe_cc=probe_cc, test_name=test_name
     )
-    for schedule_id in existing_schedules.observations + existing_schedules.analysis:
-        await client.get_schedule_handle(schedule_id).delete()
-
-    return await schedule_all(
-        client=client,
-        probe_cc=probe_cc,
-        test_name=test_name,
-        clickhouse_url=clickhouse_url,
-        data_dir=data_dir,
-    )
+    for sid in existing_schedules.observations + existing_schedules.analysis:
+        log.info(f"deleting schedule {sid}")
+        schedule_ids.append(await client.get_schedule_handle(sid).delete())
+    return schedule_ids
 
 
 async def schedule_backfill(