External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-05-19 14:57:39 -02:30
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6093 from ryanpetrello/remove-beat-thread

Browse Source 
switch the periodic scheduler to a background process (instead of a thread) to avoid a cpython bug

Reviewed-by: https://github.com/apps/softwarefactory-project-zuul
This commit is contained in:
softwarefactory-project-zuul[bot]
2020-03-02 15:46:27 +00:00
committed by GitHub
parent 99cd2e601d 5364e78397
commit 5a164cae15
2 changed files with 28 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
awx/main/dispatch/periodic.py
View File

@@ -1,6 +1,7 @@
import logging import logging
import threading import os
import time import time
from multiprocessing import Process
from django.conf import settings from django.conf import settings
from django.db import connections from django.db import connections
@@ -14,16 +15,21 @@ logger = logging.getLogger('awx.main.dispatch.periodic')
class Scheduler(Scheduler): class Scheduler(Scheduler):
def run_continuously(self): def run_continuously(self):
cease_continuous_run = threading.Event()
idle_seconds = max( idle_seconds = max(
1, 1,
min(self.jobs).period.total_seconds() / 2 min(self.jobs).period.total_seconds() / 2
) )
class ScheduleThread(threading.Thread): def run():
@classmethod ppid = os.getppid()
def run(cls): logger.warn(f'periodic beat started')
while not cease_continuous_run.is_set(): while True:
if os.getppid() != ppid:
# if the parent PID changes, this process has been orphaned
# via e.g., segfault or sigkill, we should exit too
pid = os.getpid()
logger.warn(f'periodic beat exiting gracefully pid:{pid}')
raise SystemExit()
try: try:
for conn in connections.all(): for conn in connections.all():
# If the database connection has a hiccup, re-establish a new # If the database connection has a hiccup, re-establish a new
@@ -35,12 +41,10 @@ class Scheduler(Scheduler):
'encountered an error while scheduling periodic tasks' 'encountered an error while scheduling periodic tasks'
) )
time.sleep(idle_seconds) time.sleep(idle_seconds)
logger.debug('periodic thread exiting...')
thread = ScheduleThread() process = Process(target=run)
thread.daemon = True process.daemon = True
thread.start() process.start()
return cease_continuous_run
def run_continuously(): def run_continuously():
@@ -49,4 +53,4 @@ def run_continuously():
apply_async = TaskWorker.resolve_callable(task['task']).apply_async apply_async = TaskWorker.resolve_callable(task['task']).apply_async
total_seconds = task['schedule'].total_seconds() total_seconds = task['schedule'].total_seconds()
scheduler.every(total_seconds).seconds.do(apply_async) scheduler.every(total_seconds).seconds.do(apply_async)
return scheduler.run_continuously() scheduler.run_continuously()

3
awx/main/management/commands/run_dispatcher.py
View File

@@ -53,7 +53,7 @@ class Command(BaseCommand):
# spawn a daemon thread to periodically enqueues scheduled tasks # spawn a daemon thread to periodically enqueues scheduled tasks
# (like the node heartbeat) # (like the node heartbeat)
cease_continuous_run = periodic.run_continuously() periodic.run_continuously()
reaper.reap() reaper.reap()
consumer = None consumer = None
@@ -87,7 +87,6 @@ class Command(BaseCommand):
) )
consumer.run() consumer.run()
except KeyboardInterrupt: except KeyboardInterrupt:
cease_continuous_run.set()
logger.debug('Terminating Task Dispatcher') logger.debug('Terminating Task Dispatcher')
if consumer: if consumer:
consumer.stop() consumer.stop()