wbrawner/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

When not using file_per_task, make sure we don't prematurely close the perf files (#56477)

Browse source 
* When not using file_per_task, make sure we don't prematurely close the perf files

* add changelog fragment
This commit is contained in:
Matt Martz 2019-05-16 15:38:36 -05:00 committed by GitHub
parent 98246f6032
commit 867e357eb1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
changelogs/fragments/cgroup-perf-recap-fix-open-files.yaml Normal file
View file

@ -0,0 +1,2 @@
bugfixes:
- cgroup_perf_recap - When not using file_per_task, make sure we don't prematurely close the perf files

17
lib/ansible/plugins/callback/cgroup_perf_recap.py
View file

@ -394,13 +394,14 @@ class CallbackModule(CallbackBase):
def _profile(self, obj=None):
prev_task = None
results = dict.fromkeys(self._features)
for dummy, f in self._files.items():
if f is None:
continue
try:
f.close()
except Exception:
pass
if not obj or self._file_per_task:
for dummy, f in self._files.items():
if f is None:
continue
try:
f.close()
except Exception:
pass
try:
for name, prof in self._profilers.items():
@ -420,7 +421,7 @@ class CallbackModule(CallbackBase):
pass
if obj is not None:
if self._file_per_task:
if self._file_per_task or self._counter == 0:
self._open_files(task_uuid=obj._uuid)
for feature in self._features: