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

work around a bug where runner doesn't provide atomic event writes

Browse Source
This commit is contained in:
Ryan Petrello
2019-03-29 10:31:12 -04:00
parent 4e01b11577
commit 546281d435
1 changed files with 14 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
awx/main/expect/isolated_manager.py
View File

@@ -198,9 +198,20 @@ class IsolatedManager(object):
for event in set(os.listdir(events_path)) - self.handled_events: for event in set(os.listdir(events_path)) - self.handled_events:
path = os.path.join(events_path, event) path = os.path.join(events_path, event)
if os.path.exists(path): if os.path.exists(path):
event_data = json.load( try:
open(os.path.join(events_path, event), 'r') event_data = json.load(
) open(os.path.join(events_path, event), 'r')
)
except json.decoder.JSONDecodeError:
# This means the event we got back isn't valid JSON
# that can happen if runner is still partially
# writing an event file while it's rsyncing
# these event writes are _supposed_ to be atomic
# but it doesn't look like they actually are in
# practice
# in this scenario, just ignore this event and try it
# again on the next sync
pass
event_data.setdefault(self.event_data_key, self.instance.id) event_data.setdefault(self.event_data_key, self.instance.id)
dispatcher.dispatch(event_data) dispatcher.dispatch(event_data)
self.handled_events.add(event) self.handled_events.add(event)