From b7a0aff01f1fd3d06fd38efafdd102d4c29a3c23 Mon Sep 17 00:00:00 2001 From: Jose Castillo Date: Mon, 23 Oct 2023 21:29:33 +0100 Subject: [PATCH] [kernelrt] Update options format for tuna In newer versions of tuna, the option -P has been substituted for 'show_threads'. Test if the new option is present in 'tuna --help' and if so, use it. Closes: RH SUPDEV-150 Signed-off-by: Jose Castillo --- sos/report/plugins/kernelrt.py | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/sos/report/plugins/kernelrt.py b/sos/report/plugins/kernelrt.py index ee66697830..6d14507c98 100644 --- a/sos/report/plugins/kernelrt.py +++ b/sos/report/plugins/kernelrt.py @@ -9,7 +9,7 @@ # # See the LICENSE file in the source distribution for further information. -from sos.report.plugins import Plugin, RedHatPlugin +from sos.report.plugins import Plugin, RedHatPlugin, SoSPredicate class KernelRT(Plugin, RedHatPlugin): @@ -36,6 +36,12 @@ def setup(self): # note: rhbz#1059685 'tuna - NameError: global name 'cgroups' is not # defined this command throws an exception on versions prior to # 0.10.4-5. - self.add_cmd_output('tuna -CP') + co = {'cmd': 'tuna --help', 'output': '-P'} + option_present = self.test_predicate( + self, pred=SoSPredicate(self, cmd_outputs=co) + ) + self.add_cmd_output( + f"tuna {'-CP' if option_present else 'show_threads -C'}" + ) # vim: set et ts=4 sw=4 :