workers: Pass down if they are running multi-threaded.

This allows them to decide for themselves if they should enable
timeouts.

zerver/management/commands/process_queue.py

@@ -107,7 +107,6 @@ class Command(BaseCommand):
                     signal.signal(signal.SIGTERM, signal_handler)
                     signal.signal(signal.SIGINT, signal_handler)
                     signal.signal(signal.SIGUSR1, signal_handler)
-                    worker.ENABLE_TIMEOUTS = True
                     worker.start()
 
 
@@ -118,7 +117,7 @@ class ThreadedWorker(threading.Thread):
         self.queue_name = queue_name
 
         with log_and_exit_if_exception(logger, queue_name, threaded=True):
-            self.worker = get_worker(queue_name)
+            self.worker = get_worker(queue_name, threaded=True)
 
     def run(self) -> None:
         with configure_scope() as scope, log_and_exit_if_exception(

zerver/tests/test_queue_worker.py

@@ -717,7 +717,6 @@ class WorkerTest(ZulipTestCase):
         with simulated_queue_client(fake_client):
             worker = TimeoutWorker()
             worker.setup()
-            worker.ENABLE_TIMEOUTS = True
             with self.assertLogs(level="ERROR") as m:
                 worker.start()
                 self.assertEqual(
@@ -757,7 +756,6 @@ class WorkerTest(ZulipTestCase):
         with simulated_queue_client(fake_client):
             worker = TimeoutWorker()
             worker.setup()
-            worker.ENABLE_TIMEOUTS = True
             with self.assertLogs(level="WARNING") as m:
                 worker.start()
                 self.assertEqual(

zerver/worker/queue_processors.py

@@ -161,8 +161,8 @@ def register_worker(
         test_queues.add(queue_name)
 
 
-def get_worker(queue_name: str) -> "QueueProcessingWorker":
+def get_worker(queue_name: str, threaded: bool = False) -> "QueueProcessingWorker":
-    return worker_classes[queue_name]()
+    return worker_classes[queue_name](threaded=threaded)
 
 
 def get_active_worker_queues(only_test_queues: bool = False) -> List[str]:
@@ -213,9 +213,6 @@ def retry_send_email_failures(
 class QueueProcessingWorker(ABC):
     queue_name: str
     MAX_CONSUME_SECONDS: Optional[int] = 30
-    # The MAX_CONSUME_SECONDS timeout is only enabled when handling a
-    # single queue at once, with no threads.
-    ENABLE_TIMEOUTS = False
     CONSUME_ITERATIONS_BEFORE_UPDATE_STATS_NUM = 50
     MAX_SECONDS_BEFORE_UPDATE_STATS = 30
 
@@ -225,8 +222,9 @@ class QueueProcessingWorker(ABC):
     # startup and steady-state memory.
     PREFETCH = 100
 
-    def __init__(self) -> None:
+    def __init__(self, threaded: bool = False) -> None:
         self.q: Optional[SimpleQueueClient] = None
+        self.threaded = threaded
         if not hasattr(self, "queue_name"):
             raise WorkerDeclarationError("Queue worker declared without queue_name")
 
@@ -304,7 +302,7 @@ class QueueProcessingWorker(ABC):
                 self.update_statistics()
 
             time_start = time.time()
-            if self.MAX_CONSUME_SECONDS and self.ENABLE_TIMEOUTS:
+            if self.MAX_CONSUME_SECONDS and not self.threaded:
                 try:
                     signal.signal(
                         signal.SIGALRM,
@@ -765,8 +763,8 @@ class MissedMessageWorker(QueueProcessingWorker):
 
 @assign_queue("email_senders")
 class EmailSendingWorker(LoopQueueProcessingWorker):
-    def __init__(self) -> None:
+    def __init__(self, threaded: bool = False) -> None:
-        super().__init__()
+        super().__init__(threaded)
         self.connection: BaseEmailBackend = initialize_connection(None)
 
     @retry_send_email_failures
@@ -1167,7 +1165,10 @@ class TestWorker(QueueProcessingWorker):
 class NoopWorker(QueueProcessingWorker):
     """Used to profile the queue processing framework, in zilencer's queue_rate."""
 
-    def __init__(self, max_consume: int = 1000, slow_queries: Sequence[int] = []) -> None:
+    def __init__(
+        self, threaded: bool = False, max_consume: int = 1000, slow_queries: Sequence[int] = []
+    ) -> None:
+        super().__init__(threaded)
         self.consumed = 0
         self.max_consume = max_consume
         self.slow_queries: Set[int] = set(slow_queries)
@@ -1188,7 +1189,10 @@ class BatchNoopWorker(LoopQueueProcessingWorker):
 
     batch_size = 100
 
-    def __init__(self, max_consume: int = 1000, slow_queries: Sequence[int] = []) -> None:
+    def __init__(
+        self, threaded: bool = False, max_consume: int = 1000, slow_queries: Sequence[int] = []
+    ) -> None:
+        super().__init__(threaded)
         self.consumed = 0
         self.max_consume = max_consume
         self.slow_queries: Set[int] = set(slow_queries)

zilencer/management/commands/queue_rate.py

@@ -57,7 +57,6 @@ class Command(BaseCommand):
                             f"    Skipping, as prefetch {prefetch} is less than batch size {worker.batch_size}"
                         )
                         continue
-                worker.ENABLE_TIMEOUTS = True
                 worker.setup()
 
                 assert worker.q is not None