!81 同步22.03-LTS补丁修复pcp-mpstat命令报错问题

From: @wk333 
Reviewed-by: @caodongxia 
Signed-off-by: @caodongxia
This commit is contained in:
openeuler-ci-bot 2023-02-13 03:46:13 +00:00 committed by Gitee
commit 12676f678f
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
2 changed files with 32 additions and 1 deletions

View 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

View File

@ -55,10 +55,12 @@
Name: pcp
Version: 5.3.7
Summary: System-level performance monitoring and performance management
Release: 2
Release: 3
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/%{version}.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
@ -1930,6 +1932,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 Nov 17 2022 caodongxia <caodongxia@h-partners.com> - 5.3.7-2
- Replace openEuler with vendor macro