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

add auto-discovered nodes to default IG

Browse Source 
* add advisory_lock to avoid IG update race logic
* update IG by way of policy_instance_list
This commit is contained in:
Jim Ladd
2021-08-24 17:55:09 -07:00
parent 561fc289fb
commit f317fca9e4
1 changed files with 48 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
awx/main/tasks.py
View File

@@ -429,6 +429,7 @@ def execution_node_health_check(node):
def inspect_execution_nodes(instance_list): def inspect_execution_nodes(instance_list):
with advisory_lock('inspect_execution_nodes_lock', wait=True):
node_lookup = {} node_lookup = {}
for inst in instance_list: for inst in instance_list:
if inst.node_type == 'execution': if inst.node_type == 'execution':
@@ -448,6 +449,16 @@ def inspect_execution_nodes(instance_list):
else: else:
defaults = dict(enabled=False) defaults = dict(enabled=False)
(changed, instance) = Instance.objects.register(hostname=hostname, node_type='execution', defaults=defaults) (changed, instance) = Instance.objects.register(hostname=hostname, node_type='execution', defaults=defaults)
logger.warn("Registered execution node '{}' (marked as disabled by default)".format(hostname))
default_ig = InstanceGroup.objects.get(name='default')
if instance.hostname not in default_ig.policy_instance_list:
default_ig.policy_instance_list += [instance.hostname]
default_ig.save()
logger.warn("Updated `default` instance group's policy_instance_list to include execution node '{}'".format(hostname))
else:
logger.warn("`default` instance group's policy_instance_list already listed execution node '{}'".format(hostname))
was_lost = instance.is_lost(ref_time=nowtime) was_lost = instance.is_lost(ref_time=nowtime)
last_seen = parse_date(ad['Time']) last_seen = parse_date(ad['Time'])
@@ -457,7 +468,6 @@ def inspect_execution_nodes(instance_list):
instance.save(update_fields=['last_seen']) instance.save(update_fields=['last_seen'])
if changed: if changed:
logger.warn("Registered execution node '{}'".format(hostname))
execution_node_health_check.apply_async([hostname]) execution_node_health_check.apply_async([hostname])
elif was_lost: elif was_lost:
# if the instance *was* lost, but has appeared again, # if the instance *was* lost, but has appeared again,