Skip to content

Generate unique Celery worker name #7827

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.

Sign up for GitHub

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

Merged
merged 9 commits into from
Jun 5, 2025
Merged

Generate unique Celery worker name #7827

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
2d15d92
append task ID
giancarloromeo Jun 5, 2025
dd43f3f
Merge branch 'master' into generate-unique-worker-hostname
giancarloromeo Jun 5, 2025
66530b0
ID is sufficient for uniqueness
giancarloromeo Jun 5, 2025
5b2df4f
use timestamp
giancarloromeo Jun 5, 2025
2ab5a2e
set worker name using env var
giancarloromeo Jun 5, 2025
9c913a0
Merge branch 'master' into generate-unique-worker-hostname
giancarloromeo Jun 5, 2025
c56e159
fix env var
giancarloromeo Jun 5, 2025
8e54028
restore hostname
giancarloromeo Jun 5, 2025
8405ae4
Merge branch 'master' into generate-unique-worker-hostname
giancarloromeo Jun 5, 2025
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
2 changes: 2 additions & 0 deletions services/docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1249,6 +1249,7 @@ services:
hostname: "sto-worker-{{.Node.Hostname}}-{{.Task.Slot}}"
environment:
<<: *storage_environment
STORAGE_WORKER_NAME: "sto-worker-{{.Node.Hostname}}-{{.Task.Slot}}-{{.Task.ID}}"
STORAGE_WORKER_MODE: "true"
CELERY_CONCURRENCY: 100
networks: *storage_networks
Expand All @@ -1259,6 +1260,7 @@ services:
hostname: "sto-worker-cpu-bound-{{.Node.Hostname}}-{{.Task.Slot}}"
environment:
<<: *storage_environment
STORAGE_WORKER_NAME: "sto-worker-cpu-bound-{{.Node.Hostname}}-{{.Task.Slot}}-{{.Task.ID}}"
STORAGE_WORKER_MODE: "true"
CELERY_CONCURRENCY: 1
CELERY_QUEUES: "cpu_bound"
Expand Down
2 changes: 2 additions & 0 deletions services/storage/docker/boot.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,13 +59,15 @@ if [ "${STORAGE_WORKER_MODE}" = "true" ]; then
worker --pool=threads \
--loglevel="${SERVER_LOG_LEVEL}" \
--concurrency="${CELERY_CONCURRENCY}" \
--hostname="${STORAGE_WORKER_NAME}" \
--queues="${CELERY_QUEUES:-default}"
else
exec celery \
--app=simcore_service_storage.modules.celery.worker_main:app \
worker --pool=threads \
--loglevel="${SERVER_LOG_LEVEL}" \
--concurrency="${CELERY_CONCURRENCY}" \
--hostname="${STORAGE_WORKER_NAME}" \
--queues="${CELERY_QUEUES:-default}"
fi
else
Expand Down
4 changes: 2 additions & 2 deletions services/storage/docker/healthcheck.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@


import os
import socket
import subprocess
import sys
from urllib.request import urlopen
Expand All @@ -37,6 +36,7 @@

app_settings = ApplicationSettings.create_from_envs()


def _is_celery_worker_healthy():
assert app_settings.STORAGE_CELERY
broker_url = app_settings.STORAGE_CELERY.CELERY_RABBIT_BROKER.dsn
Expand All @@ -50,7 +50,7 @@ def _is_celery_worker_healthy():
"inspect",
"ping",
"--destination",
"celery@" + socket.gethostname(),
"celery@" + os.getenv("STORAGE_WORKER_NAME", "worker"),
],
capture_output=True,
text=True,
Expand Down
Loading