Skip to content

[ENG-8069] configurable rabbit heartbeat #871

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
aaxelb merged 1 commit into from
May 20, 2025
Merged

[ENG-8069] configurable rabbit heartbeat #871

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 1 addition & 0 deletions project/settings.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -329,6 +329,7 @@ def split(string, delim):
RABBITMQ_PORT = os.environ.get('RABBITMQ_PORT', '5672')
RABBITMQ_MGMT_PORT = os.environ.get('RABBITMQ_MGMT_PORT', '15672')
RABBITMQ_VHOST = os.environ.get('RABBITMQ_VHOST', '/')
RABBITMQ_HEARTBEAT_TIMEOUT = int(os.environ.get('RABBITMQ_HEARTBEAT_TIMEOUT', 60))

CELERY_BROKER_URL = os.environ.get('CELERY_BROKER_URL', 'amqp://{}:{}@{}:{}/{}'.format(RABBITMQ_USERNAME, RABBITMQ_PASSWORD, RABBITMQ_HOST, RABBITMQ_PORT, RABBITMQ_VHOST))

Expand Down
3 changes: 1 addition & 2 deletions share/search/daemon.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@
MINIMUM_BACKOFF_FACTOR = 1.6 # unitless ratio
MAXIMUM_BACKOFF_FACTOR = 2.0 # unitless ratio
MAXIMUM_BACKOFF_TIMEOUT = 60 # seconds
CONNECTION_HEARTBEAT = 20 # seconds (see https://www.rabbitmq.com/docs/heartbeats#false-positives )


class TooFastSlowDown(Exception):
Expand All @@ -40,7 +39,7 @@ class IndexerDaemonControl:
def __init__(self, celery_app, *, daemonthread_context=None, stop_event=None):
self.kombu_connection = kombu.Connection(
celery_app.conf.broker_url, # use celery_app.conf for consistent config
heartbeat=CONNECTION_HEARTBEAT,
heartbeat=settings.RABBITMQ_HEARTBEAT_TIMEOUT,
)
self.daemonthread_context = daemonthread_context
self._daemonthreads = []
Expand Down