Improve farm systemd services

(cherry picked from commit f5c40e46d41142e1318dcd4b4faa3b4376761b94)
This commit is contained in:
wk333 2025-03-17 10:41:44 +08:00 committed by openeuler-sync-bot
parent 3f400501c8
commit 0e8fca964d

View File

@ -55,7 +55,7 @@
Name: pcp
Version: 5.3.7
Summary: System-level performance monitoring and performance management
Release: 6
Release: 7
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
@ -1393,10 +1393,8 @@ exit 0
%post devel
chown -R pcpqa:pcpqa %{_testsdir} 2>/dev/null
systemctl restart pmcd >/dev/null 2>&1
systemctl restart pmlogger >/dev/null 2>&1
systemctl enable pmcd >/dev/null 2>&1
systemctl enable pmlogger >/dev/null 2>&1
systemctl restart pmcd pmlogger >/dev/null 2>&1
systemctl enable pmcd pmlogger >/dev/null 2>&1
exit 0
%pre
@ -1625,32 +1623,16 @@ exit 0
%preun zeroconf
if [ "$1" -eq 0 ]
then
%systemd_preun pmlogger_daily_report.timer
%systemd_preun pmlogger_daily_report.service
%systemd_preun pmlogger_daily_report.timer pmlogger_daily_report.service
fi
%preun
if [ "$1" -eq 0 ]
then
%systemd_preun pmlogger.service
%systemd_preun pmlogger_farm.service
%systemd_preun pmie.service
%systemd_preun pmie_farm.service
%systemd_preun pmproxy.service
%systemd_preun pmcd.service
%systemd_preun pmie_daily.timer
%systemd_preun pmlogger_daily.timer
%systemd_preun pmlogger_check.timer
%systemd_preun pmlogger_farm_check.timer
%systemd_preun pmie_farm_check.timer
%systemd_preun pmlogger_check.timer pmlogger_daily.timer pmlogger_farm_check.timer pmlogger_farm_check.service pmlogger_farm.service pmlogger.service pmie_check.timer pmie_daily.timer pmie_farm_check.timer pmie_farm_check.service pmie_farm.service pmie.service pmproxy.service pmfind.service pmcd.service
systemctl stop pmlogger.service pmie.service pmproxy.service pmfind.service pmcd.service >/dev/null 2>&1
systemctl stop pmlogger.service >/dev/null 2>&1
systemctl stop pmlogger_farm.service >/dev/null 2>&1
systemctl stop pmie.service >/dev/null 2>&1
systemctl stop pmie_farm.service >/dev/null 2>&1
systemctl stop pmproxy.service >/dev/null 2>&1
systemctl stop pmcd.service >/dev/null 2>&1
PCP_PMNS_DIR=%{_pmnsdir}
rm -f "$PCP_PMNS_DIR/.NeedRebuild" >/dev/null 2>&1
fi
@ -1666,16 +1648,8 @@ for PMDA in dm nfsclient openmetrics ; do
fi
done
pmieconf -c enable dmthin
systemctl restart pmcd >/dev/null 2>&1
systemctl restart pmlogger >/dev/null 2>&1
systemctl restart pmlogger_farm >/dev/null 2>&1
systemctl restart pmie >/dev/null 2>&1
systemctl restart pmie_farm >/dev/null 2>&1
systemctl enable pmcd >/dev/null 2>&1
systemctl enable pmlogger >/dev/null 2>&1
systemctl enable pmlogger_farm >/dev/null 2>&1
systemctl enable pmie >/dev/null 2>&1
systemctl enable pmie_farm >/dev/null 2>&1
systemctl restart pmcd pmlogger pmie >/dev/null 2>&1
systemctl enable pmcd pmlogger pmie >/dev/null 2>&1
%post selinux
%{selinux_handle_policy "$1" "pcpupstream"}
@ -1693,28 +1667,15 @@ PCP_LOG_DIR=%{_logsdir}
%{install_file "$PCP_LOG_DIR/pmlogger" .NeedRewrite}
rm -f %{_sysconfdir}/systemd/system/pm*.requires/pm*-poll.* >/dev/null 2>&1 || true
if systemctl is-enabled pmlogger.service >/dev/null; then
systemctl enable pmlogger_farm.service pmlogger_farm_check.service
systemctl start pmlogger_farm.service pmlogger_farm_check.service
fi
if systemctl is-enabled pmie.service >/dev/null; then
systemctl enable pmie_farm.service pmie_farm_check.service
systemctl start pmie_farm.service pmie_farm_check.service
fi
%systemd_postun_with_restart pmcd.service
%systemd_post pmcd.service
%systemd_postun_with_restart pmlogger.service
%systemd_post pmlogger.service
%systemd_postun_with_restart pmlogger_farm.service
%systemd_post pmlogger_farm.service
%systemd_post pmlogger_farm_check.service
%systemd_postun_with_restart pmie.service
%systemd_post pmie.service
%systemd_postun_with_restart pmie_farm.service
%systemd_post pmie_farm.service
%systemd_post pmie_farm_check.service
systemctl condrestart pmproxy.service >/dev/null 2>&1
%systemd_postun_with_restart pmproxy.service
%systemd_post pmproxy.service
%systemd_post pmfind.service
%{rebuild_pmns "$PCP_PMNS_DIR" .NeedRebuild}
%ldconfig_scriptlets libs
@ -1938,6 +1899,9 @@ systemctl condrestart pmproxy.service >/dev/null 2>&1
%changelog
* Mon Mar 17 2025 wangkai <13474090681@163.com> - 5.3.7-7
- Improve farm systemd services
* Mon Oct 14 2024 wangkai <13474090681@163.com> - 5.3.7-6
- Fix CVE-2024-45769,CVE-2024-45770
- Fix buffer sizing checks in pmstore PDU handling (RHEL-57805)