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

Check state when processing receptorctl advertisements

Browse Source 
Nodes that show up and were in one of the unready states need to be
transitioned to ready, even if the logic in Instance.is_lost was not
met.
This commit is contained in:
Jeff Bradberry
2022-07-29 10:54:30 -04:00
parent 03c70077f9
commit bc6b8fc4ae
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
awx/main/tasks/system.py
View File

@@ -435,6 +435,7 @@ def inspect_execution_nodes(instance_list):
nowtime = now() nowtime = now()
workers = mesh_status['Advertisements'] workers = mesh_status['Advertisements']
for ad in workers: for ad in workers:
hostname = ad['NodeID'] hostname = ad['NodeID']
@@ -448,9 +449,7 @@ def inspect_execution_nodes(instance_list):
if instance.node_type in ('control', 'hybrid'): if instance.node_type in ('control', 'hybrid'):
continue continue
was_lost = instance.is_lost(ref_time=nowtime)
last_seen = parse_date(ad['Time']) last_seen = parse_date(ad['Time'])
if instance.last_seen and instance.last_seen >= last_seen: if instance.last_seen and instance.last_seen >= last_seen:
continue continue
instance.last_seen = last_seen instance.last_seen = last_seen
@@ -458,12 +457,12 @@ def inspect_execution_nodes(instance_list):
# Only execution nodes should be dealt with by execution_node_health_check # Only execution nodes should be dealt with by execution_node_health_check
if instance.node_type == 'hop': if instance.node_type == 'hop':
if was_lost: if instance.node_state in (Instance.States.UNAVAILABLE, Instance.States.INSTALLED):
logger.warning(f'Hop node {hostname}, has rejoined the receptor mesh') logger.warning(f'Hop node {hostname}, has rejoined the receptor mesh')
instance.save_health_data(errors='') instance.save_health_data(errors='')
continue continue
if was_lost: if instance.node_state in (Instance.States.UNAVAILABLE, Instance.States.INSTALLED):
# if the instance *was* lost, but has appeared again, # if the instance *was* lost, but has appeared again,
# attempt to re-establish the initial capacity and version # attempt to re-establish the initial capacity and version
# check # check