Mirror
/
zulip
mirror of https://github.com/zulip/zulip.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

queue_processors: Don't run test queues with run-dev.py.

This commit is contained in:
Mateusz Mandera 2020-10-18 13:22:28 +02:00 committed by Tim Abbott
parent 269faa342a
commit 716df658fa
4 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tools/ci/production-verify
View File

@ -67,9 +67,7 @@ echo "Now confirming all the RabbitMQ queue processors are correctly registered!
echo echo
# These hacky shell scripts just extract the sorted list of queue processors, running and expected # These hacky shell scripts just extract the sorted list of queue processors, running and expected
supervisorctl status | cut -f1 -dR | cut -f2- -d: | grep events | cut -f1 -d" " | cut -f3- -d_ | cut -f1 -d- | sort -u >/tmp/running_queue_processors.txt supervisorctl status | cut -f1 -dR | cut -f2- -d: | grep events | cut -f1 -d" " | cut -f3- -d_ | cut -f1 -d- | sort -u >/tmp/running_queue_processors.txt
su zulip -c /home/zulip/deployments/current/scripts/lib/queue_workers.py | sort -u >/tmp/all_queue_processors.txt su zulip -c /home/zulip/deployments/current/scripts/lib/queue_workers.py | sort -u >/tmp/expected_queue_processors.txt
su zulip -c "/home/zulip/deployments/current/scripts/lib/queue_workers.py --queue-type test" | sort -u >/tmp/expected_test_queues.txt
grep -v -x -f /tmp/expected_test_queues.txt /tmp/all_queue_processors.txt >/tmp/expected_queue_processors.txt
if ! diff /tmp/expected_queue_processors.txt /tmp/running_queue_processors.txt >/dev/null; then if ! diff /tmp/expected_queue_processors.txt /tmp/running_queue_processors.txt >/dev/null; then
set +x set +x
echo "FAILURE: Runnable queue processors declared in zerver/worker/queue_processors.py " echo "FAILURE: Runnable queue processors declared in zerver/worker/queue_processors.py "

2
tools/test-queue-worker-reload
View File

@ -13,7 +13,7 @@ sanity_check.check_venv(__file__)
# TODO: Convert this to use scripts/lib/queue_workers.py # TODO: Convert this to use scripts/lib/queue_workers.py
TOOLS_DIR = os.path.dirname(os.path.abspath(__file__)) TOOLS_DIR = os.path.dirname(os.path.abspath(__file__))
successful_worker_launch = '[process_queue] 18 queue worker threads were launched\n' successful_worker_launch = '[process_queue] 15 queue worker threads were launched\n'
def check_worker_launch(run_dev: "subprocess.Popen[str]") -> bool: def check_worker_launch(run_dev: "subprocess.Popen[str]") -> bool:
failed = False failed = False

3
zerver/tests/test_queue_worker.py
View File

@ -647,4 +647,5 @@ class WorkerTest(ZulipTestCase):
worker_queue_count = (len(QueueProcessingWorker.__subclasses__()) + worker_queue_count = (len(QueueProcessingWorker.__subclasses__()) +
len(EmailSendingWorker.__subclasses__()) + len(EmailSendingWorker.__subclasses__()) +
len(LoopQueueProcessingWorker.__subclasses__()) - 1) len(LoopQueueProcessingWorker.__subclasses__()) - 1)
self.assertEqual(worker_queue_count, len(get_active_worker_queues())) self.assertEqual(worker_queue_count, len(get_active_worker_queues(include_test_queues=True)))
self.assertEqual(worker_queue_count - 3, len(get_active_worker_queues()))

5
zerver/worker/queue_processors.py
View File

@ -138,10 +138,11 @@ def register_worker(queue_name: str, clazz: Type['QueueProcessingWorker'], queue
def get_worker(queue_name: str) -> 'QueueProcessingWorker': def get_worker(queue_name: str) -> 'QueueProcessingWorker':
return worker_classes[queue_name]() return worker_classes[queue_name]()
def get_active_worker_queues(queue_type: Optional[str]=None) -> List[str]: def get_active_worker_queues(queue_type: Optional[str]=None, include_test_queues: bool=False) -> List[str]:
"""Returns all the non-test worker queues.""" """Returns all the non-test worker queues."""
if queue_type is None: if queue_type is None:
return list(worker_classes.keys()) return [queue_name for queue_name in worker_classes.keys()
if include_test_queues or queue_name not in queues["test"]]
return list(queues[queue_type].keys()) return list(queues[queue_type].keys())
def check_and_send_restart_signal() -> None: def check_and_send_restart_signal() -> None: