Issue #1219 Mark some more cleaner related locations/files to remove

refs: #632 #863 #1123 #1165 #1219

Author: soxofaan

openeogeotrellis/backend.py

@@ -3279,7 +3279,7 @@ def delete_jobs_before(
         include_done: bool = True,
         user_limit: Optional[int] = 1000,
     ) -> None:
-        # TODO #632 #863 #1123 #1165 remove this dead code path?
+        # TODO #632 #863 #1123 #1165 #1219 remove this dead code path
         with self._double_job_registry as registry, TimingLogger(
             title=f"Collecting jobs to delete: {upper=} {user_ids=} {include_ongoing=} {include_done=}",
             logger=logger,

openeogeotrellis/cleaner.py

@@ -1,3 +1,5 @@
+# TODO #1219 remove this now-defunct cleaner workflow
+
 import argparse
 import logging
 from datetime import datetime, timedelta
@@ -28,7 +30,7 @@ def remove_batch_jobs_before(
     include_done: bool = True,
     user_limit: Optional[int] = 1000,
 ) -> None:
-    # TODO #632 #863 #1123 #1165 remove this dead code path?
+    # TODO #632 #863 #1123 #1165 #1219 remove this dead code path
     with TimingLogger(title=f"Removing batch jobs before {upper}", logger=_log):
         # TODO: how to cope with unneeded arguments?
         batch_jobs = GpsBatchJobs(

openeogeotrellis/job_registry.py

@@ -314,6 +314,7 @@ def get_all_jobs_before(
         per_user_limit: Optional[int] = 1000,
         field_whitelist: Optional[List[str]] = None,
     ) -> List[Dict]:
+        # TODO #632 #863 #1123 #1165 #1219 remove this dead code path
         def get_jobs_in(
             get_path: Callable[[Union[str, None], Union[str, None]], str],
             user_ids: Optional[List[str]] = None,
@@ -1001,7 +1002,7 @@ def get_all_jobs_before(
         include_done: bool = True,
         user_limit: Optional[int] = 1000,
     ) -> List[dict]:
-        # TODO #632 #863 #1123 #1165 remove this dead code path?
+        # TODO #632 #863 #1123 #1165 #1219 remove this dead code path
         if not self.zk_job_registry:
             raise NotImplementedError("only necessary for ZK cleaner script")
 

openeogeotrellis/zktool.py

@@ -3,7 +3,7 @@
 These are just ad-hoc, short-term stop-gap measures to implement some quick wins
 trying to fight the ZooKeeper load issue.
 
-TODO #236/#498/#632 remove when not necessary anymore (ZkJobRegistry is gone).
+TODO #632 #863 #1123 #1165 #1219 remove this dead code
 
 
 Usage instructions:
@@ -54,6 +54,7 @@ def stats(zk_job_registry: ZkJobRegistry):
     """
     Collect ZkJobRegistry stats: count users and jobs under "ongoing" and "done" paths.
     """
+    # TODO #632 #863 #1123 #1165 remove this dead code?
     with StatsReporter(report=_log.info) as stats, zk_job_registry:
         for mode, path_builder in [
             ("ongoing", zk_job_registry._ongoing),
@@ -82,7 +83,7 @@ def prune(
     include_done: bool = True,
     include_ongoing: bool = False,
 ):
-    # TODO #632 #863 #1123 #1165 remove this dead code path?
+    # TODO #632 #863 #1123 #1165 #1219 remove this dead code?
     with StatsReporter(report=_log.info) as stats, zk_job_registry:
         with TimingLogger(title="Collect jobs", logger=_log):
             jobs = zk_job_registry.get_all_jobs_before(

scripts/cleaner-entrypoint.sh

@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
-# TODO #632 #863 #1123 #1165 remove this dead code path?
+# TODO #632 #863 #1123 #1165 #1219 remove this now-defunct cleaner workflow
 
 set -eo pipefail
 

scripts/kleaner-entrypoint.sh

@@ -2,6 +2,8 @@
 
 # Nightly cleaner script for deployments in k8s.
 
+# TODO #632 #863 #1123 #1165 #1219 remove this now-defunct cleaner workflow
+
 set -eo pipefail
 
 fail_if_not_set () {

setup.py

@@ -52,7 +52,7 @@
             "scripts/submit_batch_job_log4j.properties",
             "scripts/submit_batch_job_log4j2.xml",
             "scripts/batch_job_log4j2.xml",
-            "scripts/cleaner-entrypoint.sh",  # TODO #632 #863 #1123 #1165 remove this dead code path?
+            "scripts/cleaner-entrypoint.sh",  # TODO #632 #863 #1123 #1165 #1219 remove this now-defunct cleaner workflow
             "scripts/job_tracker-entrypoint.sh",
             "scripts/async_task-entrypoint.sh",
             "scripts/async_task_log4j2.xml",