Skip to content

Remove unused Events and fix _wait_for_worker_startup behavior #471

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 8 additions & 15 deletions taskiq/cli/worker/process_manager.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,8 @@
import os
import signal
import sys
from contextlib import suppress
from dataclasses import dataclass
from multiprocessing import Event, Process, Queue, current_process
from multiprocessing.synchronize import Event as EventType
from multiprocessing import Process, Queue, current_process
from time import sleep
from typing import Any, Callable, List, Optional

Expand Down Expand Up @@ -78,7 +76,6 @@ def handle(
logger.debug(f"Process {worker.name} is already terminated.")
# Waiting worker shutdown.
worker.join()
event: EventType = Event()
new_process = Process(
target=worker_func,
kwargs={"args": args},
Expand All @@ -88,19 +85,18 @@ def handle(
new_process.start()
logger.info(f"Process {new_process.name} restarted with pid {new_process.pid}")
workers[self.worker_num] = new_process
_wait_for_worker_startup(new_process, event)
_wait_for_worker_startup(new_process)


@dataclass
class ShutdownAction(ProcessActionBase):
"""This action shuts down process manager loop."""


def _wait_for_worker_startup(process: Process, event: EventType) -> None:
while process.is_alive():
with suppress(TimeoutError):
event.wait(0.1)
return
def _wait_for_worker_startup(process: Process) -> None:
while not process.is_alive():
logger.info(f"Waiting for {process.name} to start...")
sleep(0.1)


def schedule_workers_reload(
Expand Down Expand Up @@ -186,9 +182,7 @@ def __init__(

def prepare_workers(self) -> None:
"""Spawn multiple processes."""
events: List[EventType] = []
for process in range(self.args.workers):
event = Event()
work_proc = Process(
target=self.worker_function,
kwargs={"args": self.args},
Expand All @@ -202,11 +196,10 @@ def prepare_workers(self) -> None:
work_proc.pid,
)
self.workers.append(work_proc)
events.append(event)

# Wait for workers startup
for worker, event in zip(self.workers, events):
_wait_for_worker_startup(worker, event)
for worker in self.workers:
_wait_for_worker_startup(worker)

def start(self) -> Optional[int]: # noqa: C901
"""
Expand Down