[SQS] Improve shutdown capabilities of SqsProvider (#12252)

gregfurman · web-flow · commit 25d4d82fcc1b · 2025-02-12T21:43:09.000+02:00
diff --git a/localstack-core/localstack/services/sqs/provider.py b/localstack-core/localstack/services/sqs/provider.py
@@ -193,9 +193,11 @@ def __init__(self, num_thread: int = 3):
         self.executor = ThreadPoolExecutor(
             num_thread, thread_name_prefix="sqs-metrics-cloudwatch-dispatcher"
         )
+        self.running = True
 
     def shutdown(self):
         self.executor.shutdown(wait=False, cancel_futures=True)
+        self.running = False
 
     def dispatch_sqs_metric(
         self,
@@ -215,6 +217,9 @@ def dispatch_sqs_metric(
         :param value The value for that metric, default 1
         :param unit The unit for the value, default "Count"
         """
+        if not self.running:
+            return
+
         self.executor.submit(
             publish_sqs_metric,
             account_id=account_id,
@@ -1060,6 +1065,8 @@ def delete_queue(self, context: RequestContext, queue_url: String, **kwargs) ->
                 queue.region,
                 queue.account_id,
             )
+            # Trigger a shutdown prior to removing the queue resource
+            store.queues[queue.name].shutdown()
             del store.queues[queue.name]
             store.deleted[queue.name] = time.time()
 
