From bb1c155bc91505f89d7074820424eac7d7072c4d Mon Sep 17 00:00:00 2001 From: jbreitwe-rh <55449231+tuxpreacher@users.noreply.github.com> Date: Wed, 16 Aug 2023 21:05:23 +0200 Subject: [PATCH] Fixed typos (#14347) --- awx/main/dispatch/worker/base.py | 2 +- awx/main/tasks/callback.py | 2 +- awx/main/tasks/jobs.py | 2 +- awx/settings/defaults.py | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/awx/main/dispatch/worker/base.py b/awx/main/dispatch/worker/base.py index 387932bdf4..8a86912f83 100644 --- a/awx/main/dispatch/worker/base.py +++ b/awx/main/dispatch/worker/base.py @@ -161,7 +161,7 @@ class AWXConsumerRedis(AWXConsumerBase): class AWXConsumerPG(AWXConsumerBase): def __init__(self, *args, schedule=None, **kwargs): super().__init__(*args, **kwargs) - self.pg_max_wait = settings.DISPATCHER_DB_DOWNTOWN_TOLLERANCE + self.pg_max_wait = settings.DISPATCHER_DB_DOWNTIME_TOLERANCE # if no successful loops have ran since startup, then we should fail right away self.pg_is_down = True # set so that we fail if we get database errors on startup init_time = time.time() diff --git a/awx/main/tasks/callback.py b/awx/main/tasks/callback.py index 46bed2f3b7..28ca1f2eac 100644 --- a/awx/main/tasks/callback.py +++ b/awx/main/tasks/callback.py @@ -29,7 +29,7 @@ class RunnerCallback: self.safe_env = {} self.event_ct = 0 self.model = model - self.update_attempts = int(settings.DISPATCHER_DB_DOWNTOWN_TOLLERANCE / 5) + self.update_attempts = int(settings.DISPATCHER_DB_DOWNTIME_TOLERANCE / 5) self.wrapup_event_dispatched = False self.artifacts_processed = False self.extra_update_fields = {} diff --git a/awx/main/tasks/jobs.py b/awx/main/tasks/jobs.py index 6109acd142..6e57dfd8e4 100644 --- a/awx/main/tasks/jobs.py +++ b/awx/main/tasks/jobs.py @@ -112,7 +112,7 @@ class BaseTask(object): def __init__(self): self.cleanup_paths = [] - self.update_attempts = int(settings.DISPATCHER_DB_DOWNTOWN_TOLLERANCE / 5) + self.update_attempts = int(settings.DISPATCHER_DB_DOWNTIME_TOLERANCE / 5) self.runner_callback = self.callback_class(model=self.model) def update_model(self, pk, _attempt=0, **updates): diff --git a/awx/settings/defaults.py b/awx/settings/defaults.py index edd63cc8e6..ddeb7308e4 100644 --- a/awx/settings/defaults.py +++ b/awx/settings/defaults.py @@ -453,7 +453,7 @@ RECEPTOR_SERVICE_ADVERTISEMENT_PERIOD = 60 # https://github.com/ansible/recepto EXECUTION_NODE_REMEDIATION_CHECKS = 60 * 30 # once every 30 minutes check if an execution node errors have been resolved # Amount of time dispatcher will try to reconnect to database for jobs and consuming new work -DISPATCHER_DB_DOWNTOWN_TOLLERANCE = 40 +DISPATCHER_DB_DOWNTIME_TOLERANCE = 40 BROKER_URL = 'unix:///var/run/redis/redis.sock' CELERYBEAT_SCHEDULE = {