chore: Add more logging to cleanup command (#68915)

The process is still dying in a hard to understand position.

Author: markstory

src/sentry/runner/commands/cleanup.py

@@ -42,6 +42,12 @@ def get_project(value: str) -> int | None:
 API_TOKEN_TTL_IN_DAYS = 30
 
 
+def debug_output(msg: str) -> None:
+    if os.environ.get("SENTRY_CLEANUP_SILENT", None):
+        return
+    click.echo(msg)
+
+
 def multiprocess_worker(task_queue: _WorkQueue) -> None:
     # Configure within each Process
     import logging
@@ -70,12 +76,15 @@ def multiprocess_worker(task_queue: _WorkQueue) -> None:
     while True:
         j = task_queue.get()
         if j == _STOP_WORKER:
+            debug_output("Received STOP_WORKER task")
             task_queue.task_done()
+
             return
 
-        model, chunk = j
-        model = import_string(model)
+        model_name, chunk = j
+        debug_output(f"Starting deletion work for {model_name}:{chunk}")
 
+        model = import_string(model_name)
         try:
             task = deletions.get(
                 model=model,
@@ -85,11 +94,13 @@ def multiprocess_worker(task_queue: _WorkQueue) -> None:
             )
 
             while True:
+                debug_output(f"Running chunk for {model_name}")
                 if not task.chunk():
                     break
         except Exception as e:
             logger.exception(e)
         finally:
+            debug_output(f"Completed deletion work for {model_name}:{chunk}")
             task_queue.task_done()
 
 
@@ -138,11 +149,8 @@ def cleanup(
         raise click.Abort()
 
     os.environ["_SENTRY_CLEANUP"] = "1"
-
-    def debug_output(msg: str) -> None:
-        if silent:
-            return
-        click.echo(msg)
+    if silent:
+        os.environ["SENTRY_CLEANUP_SILENT"] = "1"
 
     # Make sure we fork off multiprocessing pool
     # before we import or configure the app
@@ -368,6 +376,7 @@ def is_filtered(model: type[Model]) -> bool:
                     for chunk in q.iterator(chunk_size=100):
                         task_queue.put((imp, chunk))
 
+        debug_output("Waiting for task_queue to drain")
         task_queue.join()
 
         # Clean up FileBlob instances which are no longer used and aren't super