diff options
| author | Abhijeet Kasurde <akasurde@redhat.com> | 2020-09-28 09:51:22 +0530 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-09-27 23:21:22 -0500 |
| commit | f6ac5f1ce0d6adb8c3d434753feaa12d7e94ae17 (patch) | |
| tree | 79f12aba5576ecfcc14d6bacc6e8e246684676b0 | |
| parent | d2b499eab10513afa4a0efc8abc4e41e3b6578a3 (diff) | |
| download | ansible-f6ac5f1ce0d6adb8c3d434753feaa12d7e94ae17.tar.gz | |
[2.9] cgroup_perf_recap: Check if user wants to write to files or not (#71527)
if user sets 'write_files' to False or does not set value, then
handle file write related operations.
Fixes: #64936
Signed-off-by: Abhijeet Kasurde <akasurde@redhat.com>
(cherry picked from commit e82b28a92012863f34c407e5df8f24dbc73f630c)
| -rw-r--r-- | changelogs/fragments/cgroup_fix_write.yml | 2 | ||||
| -rw-r--r-- | lib/ansible/plugins/callback/cgroup_perf_recap.py | 18 |
2 files changed, 12 insertions, 8 deletions
diff --git a/changelogs/fragments/cgroup_fix_write.yml b/changelogs/fragments/cgroup_fix_write.yml new file mode 100644 index 0000000000..2461b17c3a --- /dev/null +++ b/changelogs/fragments/cgroup_fix_write.yml @@ -0,0 +1,2 @@ +bugfixes: +- Handle write_files option in cgroup_perf_recap callback plugin (https://github.com/ansible/ansible/issues/64936). diff --git a/lib/ansible/plugins/callback/cgroup_perf_recap.py b/lib/ansible/plugins/callback/cgroup_perf_recap.py index c21d3e2f81..678503dc66 100644 --- a/lib/ansible/plugins/callback/cgroup_perf_recap.py +++ b/lib/ansible/plugins/callback/cgroup_perf_recap.py @@ -277,6 +277,7 @@ class CallbackModule(CallbackBase): self._file_per_task = False self._counter = 0 + self.write_files = False def _open_files(self, task_uuid=None): output_format = self._output_format @@ -296,13 +297,14 @@ class CallbackModule(CallbackBase): except Exception: pass - filename = self._file_name_format % data + if self.write_files: + filename = self._file_name_format % data - self._files[feature] = open(os.path.join(output_dir, filename), 'w+') - if output_format == b'csv': - self._writers[feature] = partial(csv_writer, csv.writer(self._files[feature])) - elif output_format == b'json': - self._writers[feature] = partial(json_writer, self._files[feature]) + self._files[feature] = open(os.path.join(output_dir, filename), 'w+') + if output_format == b'csv': + self._writers[feature] = partial(csv_writer, csv.writer(self._files[feature])) + elif output_format == b'json': + self._writers[feature] = partial(json_writer, self._files[feature]) def set_options(self, task_keys=None, var_options=None, direct=None): super(CallbackModule, self).set_options(task_keys=task_keys, var_options=var_options, direct=direct) @@ -355,7 +357,7 @@ class CallbackModule(CallbackBase): 'pids': partial(PidsProf, pid_current_file, poll_interval=pid_poll_interval), } - write_files = self.get_option('write_files') + self.write_files = self.get_option('write_files') file_per_task = self.get_option('file_per_task') self._output_format = to_bytes(self.get_option('output_format')) output_dir = to_bytes(self.get_option('output_dir'), errors='surrogate_or_strict') @@ -368,7 +370,7 @@ class CallbackModule(CallbackBase): file_name_format = to_bytes(self.get_option('file_name_format')) - if write_files: + if self.write_files: if file_per_task: self._file_per_task = True if file_name_format == b'%(feature)s.%(ext)s': |