External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-03-26 21:35:01 -02:30
Code Issues Packages Projects Releases Wiki Activity

fix restarts in dev, allow shutdown traceback

Browse Source
This commit is contained in:
AlanCoding
2017-07-31 23:33:21 -04:00
parent 2f07c0a2e5
commit b01732bcb3
2 changed files with 18 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
awx/main/tasks.py
View File

@@ -135,7 +135,7 @@ def handle_setting_changes(self, setting_keys):
cache.delete_many(cache_keys) cache.delete_many(cache_keys)
for key in cache_keys: for key in cache_keys:
if key.startswith('LOG_AGGREGATOR_'): if key.startswith('LOG_AGGREGATOR_'):
restart_local_services(['uwsgi', 'celery', 'beat', 'callback', 'fact']) restart_local_services(['uwsgi', 'celery', 'beat', 'callback'])
break break
@@ -236,9 +236,7 @@ def cluster_node_heartbeat(self):
this_inst.version)) this_inst.version))
# Shutdown signal will set the capacity to zero to ensure no Jobs get added to this instance. # Shutdown signal will set the capacity to zero to ensure no Jobs get added to this instance.
# The heartbeat task will reset the capacity to the system capacity after upgrade. # The heartbeat task will reset the capacity to the system capacity after upgrade.
stop_local_services(['uwsgi', 'celery', 'beat', 'callback', 'fact']) stop_local_services(['uwsgi', 'celery', 'beat', 'callback'], communicate=False)
# We wait for the Popen call inside stop_local_services above
# so the line below will rarely if ever be executed.
raise RuntimeError("Shutting down.") raise RuntimeError("Shutting down.")
for other_inst in lost_instances: for other_inst in lost_instances:
if other_inst.capacity == 0: if other_inst.capacity == 0:

26
awx/main/utils/reload.py
View File

@@ -29,7 +29,7 @@ def _reset_celery_thread_pool():
destination=['celery@{}'.format(settings.CLUSTER_HOST_ID)], reply=False) destination=['celery@{}'.format(settings.CLUSTER_HOST_ID)], reply=False)
def _supervisor_service_command(service_internal_names, command): def _supervisor_service_command(service_internal_names, command, communicate=True):
''' '''
Service internal name options: Service internal name options:
- beat - celery - callback - channels - uwsgi - daphne - beat - celery - callback - channels - uwsgi - daphne
@@ -38,6 +38,8 @@ def _supervisor_service_command(service_internal_names, command):
# supervisorctl restart tower-processes:receiver tower-processes:factcacher # supervisorctl restart tower-processes:receiver tower-processes:factcacher
''' '''
group_name = 'tower-processes' group_name = 'tower-processes'
if settings.DEBUG:
group_name = 'awx-processes'
args = ['supervisorctl'] args = ['supervisorctl']
if settings.DEBUG: if settings.DEBUG:
args.extend(['-c', '/supervisor.conf']) args.extend(['-c', '/supervisor.conf'])
@@ -48,16 +50,20 @@ def _supervisor_service_command(service_internal_names, command):
programs.append('{}:{}'.format(group_name, name_translation_dict[n])) programs.append('{}:{}'.format(group_name, name_translation_dict[n]))
args.extend([command]) args.extend([command])
args.extend(programs) args.extend(programs)
logger.debug('Issuing command to restart services, args={}'.format(args)) logger.debug('Issuing command to {} services, args={}'.format(command, args))
supervisor_process = subprocess.Popen(args, stdin=subprocess.PIPE, supervisor_process = subprocess.Popen(args, stdin=subprocess.PIPE,
stdout=subprocess.PIPE, stderr=subprocess.PIPE) stdout=subprocess.PIPE, stderr=subprocess.PIPE)
restart_stdout, restart_err = supervisor_process.communicate() if communicate:
restart_code = supervisor_process.returncode restart_stdout, restart_err = supervisor_process.communicate()
if restart_code or restart_err: restart_code = supervisor_process.returncode
logger.error('supervisorctl restart errored with exit code `{}`, stdout:\n{}stderr:\n{}'.format( if restart_code or restart_err:
restart_code, restart_stdout.strip(), restart_err.strip())) logger.error('supervisorctl {} errored with exit code `{}`, stdout:\n{}stderr:\n{}'.format(
command, restart_code, restart_stdout.strip(), restart_err.strip()))
else:
logger.info('supervisorctl {} finished, stdout:\n{}'.format(
command, restart_stdout.strip()))
else: else:
logger.info('supervisorctl restart finished, stdout:\n{}'.format(restart_stdout.strip())) logger.info('Submitted supervisorctl {} command, not waiting for result'.format(command))
def restart_local_services(service_internal_names): def restart_local_services(service_internal_names):
@@ -75,6 +81,6 @@ def restart_local_services(service_internal_names):
_reset_celery_thread_pool() _reset_celery_thread_pool()
def stop_local_services(service_internal_names): def stop_local_services(service_internal_names, communicate=True):
logger.warn('Stopping services {} on this node in response to user action'.format(service_internal_names)) logger.warn('Stopping services {} on this node in response to user action'.format(service_internal_names))
_supervisor_service_command(service_internal_names, command='stop') _supervisor_service_command(service_internal_names, command='stop', communicate=communicate)