!82 同步22.03-LTS补丁修复pcp-mpstat命令报错问题
From: @wk333 Reviewed-by: @caodongxia Signed-off-by: @caodongxia
This commit is contained in:
commit
49e0af2c2d
26
fix-out-of-range-mpstat.patch
Normal file
26
fix-out-of-range-mpstat.patch
Normal file
@ -0,0 +1,26 @@
|
||||
From 9e7d6b2796f669a5e41f5e4fb5ea349a39d8795b Mon Sep 17 00:00:00 2001
|
||||
From: caodongxia <315816521@qq.com>
|
||||
Date: Thu, 14 Jul 2022 15:16:42 +0800
|
||||
Subject: [PATCH] fix out of range
|
||||
|
||||
---
|
||||
src/pcp/mpstat/pcp-mpstat.py | 3 +++
|
||||
1 file changed, 3 insertions(+)
|
||||
|
||||
diff --git a/src/pcp/mpstat/pcp-mpstat.py b/src/pcp/mpstat/pcp-mpstat.py
|
||||
index fefb6aa..17da944 100755
|
||||
--- a/src/pcp/mpstat/pcp-mpstat.py
|
||||
+++ b/src/pcp/mpstat/pcp-mpstat.py
|
||||
@@ -602,6 +602,9 @@ class MpstatReport(pmcc.MetricGroupPrinter):
|
||||
# need two fetches to report rate converted counter metrics
|
||||
return
|
||||
|
||||
+ if not group['hinv.ncpu'].netValues or not group['kernel.uname.sysname'].netValues:
|
||||
+ return
|
||||
+
|
||||
if self.Machine_info_count == 0:
|
||||
self.print_machine_info(group, manager)
|
||||
self.Machine_info_count = 1
|
||||
--
|
||||
2.23.0
|
||||
|
||||
5
pcp.spec
5
pcp.spec
@ -57,6 +57,8 @@ Release: 2
|
||||
License: GPL-2.0-or-later and LGPL-2.0-or-later and CC-BY-SA-3.0
|
||||
URL: https://pcp.io
|
||||
Source0: https://github.com/performancecopilot/pcp/archive/refs/tags/5.3.7.tar.gz
|
||||
#Refer: https://github.com/performancecopilot/pcp/pull/822
|
||||
Patch0: fix-out-of-range-mpstat.patch
|
||||
BuildRequires: make
|
||||
BuildRequires: gcc gcc-c++
|
||||
BuildRequires: procps autoconf bison flex
|
||||
@ -1928,6 +1930,9 @@ systemctl condrestart pmproxy.service >/dev/null 2>&1
|
||||
|
||||
|
||||
%changelog
|
||||
* Mon Feb 13 2023 wangkai <wangkai385@h-partners.com> - 5.3.7-3
|
||||
- Fix out of range in pcp-mpstat
|
||||
|
||||
* Thu Dec 22 2022 wanglin <wangl29@chinatelecom.cn> - 5.3.7-2
|
||||
- Fix rpm-config hard code problem
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user