Merge pull request #128 from julien6387/dev-0.18.5

fix process CPU in SOLARIS mode

Author: julien6387

CHANGES.md

@@ -1,5 +1,11 @@
 # Change Log
 
+## 0.18.5 (2024-08-19)
+
+* Fix process CPU statistics when using SOLARIS mode.
+  Issue introduced in **Supvisors** 0.18 with statistics refactoring.
+
+
 ## 0.18.4 (2024-07-13)
 
 * Fix `supervisord` uptime in the **Supvisors** Web UI.

supvisors/tests/test_viewhandler.py

@@ -1046,24 +1046,32 @@ def test_write_detailed_process_cpu(mocker, supvisors, handler):
     supvisors.options.stats_irix_mode = True
     # test call with no stats
     assert not handler.write_detailed_process_cpu(stats_elt, None, 4)
+    assert proc_stats.cpu == [10, 16, 13]
+    assert proc_stats.times == [1, 2, 3]
     # test call with empty stats
     for mode in [True, False]:
         supvisors.options.stats_irix_mode = mode
         assert handler.write_detailed_process_cpu(stats_elt, Mock(cpu=[], times=[]), 4)
+        assert proc_stats.cpu == [10, 16, 13]
+        assert proc_stats.times == [1, 2, 3]
         assert mocked_common.call_args_list == [call(stats_elt, [], [],
                                                      'pcpuval_td_mid', 'pcpuavg_td_mid',
                                                      'pcpuslope_td_mid', 'pcpudev_td_mid')]
         mocked_common.reset_mock()
     # test call with irix mode
     supvisors.options.stats_irix_mode = True
     assert handler.write_detailed_process_cpu(stats_elt, proc_stats, 4)
+    assert proc_stats.cpu == [10, 16, 13]
+    assert proc_stats.times == [1, 2, 3]
     assert mocked_common.call_args_list == [call(stats_elt, [10, 16, 13], [1, 2, 3],
                                                  'pcpuval_td_mid', 'pcpuavg_td_mid',
                                                  'pcpuslope_td_mid', 'pcpudev_td_mid')]
     mocked_common.reset_mock()
     # test call with solaris mode
     supvisors.options.stats_irix_mode = False
     assert handler.write_detailed_process_cpu(stats_elt, proc_stats, 4)
+    assert proc_stats.cpu == [10, 16, 13]
+    assert proc_stats.times == [1, 2, 3]
     assert mocked_common.call_args_list == [call(stats_elt, [2.5, 4, 3.25], [1, 2, 3],
                                                  'pcpuval_td_mid', 'pcpuavg_td_mid',
                                                  'pcpuslope_td_mid', 'pcpudev_td_mid')]

supvisors/version.txt

@@ -1 +1 @@
-version=0.18.4
+version=0.18.5

supvisors/web/viewhandler.py

@@ -506,11 +506,13 @@ def write_detailed_process_cpu(self, stats_elt, proc_stats: Optional[ProcStatist
         :return: True if process CPU statistics are valid.
         """
         if proc_stats:
-            # if SOLARIS mode configured, update the CPU data
-            # this will be applicable to the CPU plot
-            if not self.supvisors.options.stats_irix_mode:
-                proc_stats.cpu = [x / nb_cores for x in proc_stats.cpu]
-            self._write_common_detailed_statistics(stats_elt, proc_stats.cpu, proc_stats.times,
+            if self.supvisors.options.stats_irix_mode:
+                cpu = proc_stats.cpu
+            else:
+                # if SOLARIS mode configured, update the CPU data
+                # this will be applicable to the CPU plot
+                cpu = [x / nb_cores for x in proc_stats.cpu]
+            self._write_common_detailed_statistics(stats_elt, cpu, proc_stats.times,
                                                    'pcpuval_td_mid', 'pcpuavg_td_mid',
                                                    'pcpuslope_td_mid', 'pcpudev_td_mid')
             return True