import pcp-5.1.1-4.el8_3
This commit is contained in:
CentOS Sources
parent
3136427fe1
commit
d2bea6447c
273
SOURCES/redhat-bugzilla-1875659.patch
Normal file
273
SOURCES/redhat-bugzilla-1875659.patch
Normal file
@ -0,0 +1,273 @@
|
||||
From 7d4327035fbda12c66d8fc5eb0ed4dcd8e5f0285 Mon Sep 17 00:00:00 2001
|
||||
From: Ken McDonell <kenj@kenj.id.au>
|
||||
Date: Mon, 20 Jul 2020 13:19:52 +1000
|
||||
Subject: [PATCH] src/pmlogger: remove systemd path services
|
||||
|
||||
We're not going to use filesystem watchers for /etc/pcp/pmlogger/control*.
|
||||
---
|
||||
src/pmlogger/GNUmakefile | 8 +-------
|
||||
src/pmlogger/pmlogger_check.path.in | 6 ------
|
||||
2 files changed, 1 insertion(+), 13 deletions(-)
|
||||
delete mode 100644 src/pmlogger/pmlogger_check.path.in
|
||||
|
||||
diff --git a/src/pmlogger/GNUmakefile b/src/pmlogger/GNUmakefile
|
||||
index 4503993de..959141eb3 100644
|
||||
--- a/src/pmlogger/GNUmakefile
|
||||
+++ b/src/pmlogger/GNUmakefile
|
||||
@@ -23,7 +23,7 @@ OTHERS = pmnewlog.sh control rc_pmlogger \
|
||||
LDIRT = crontab crontab.docker crontab.daily_report pmlogger.service \
|
||||
pmlogger_daily.service pmlogger_daily-poll.service \
|
||||
pmlogger_daily_report.service pmlogger_daily_report-poll.service \
|
||||
- pmlogger_check.service pmlogger_check.path
|
||||
+ pmlogger_check.service
|
||||
|
||||
ifeq ($(TARGET_OS),linux)
|
||||
CRONTAB_USER = $(PCP_USER)
|
||||
@@ -64,7 +64,6 @@ ifeq ($(ENABLE_SYSTEMD),true)
|
||||
$(INSTALL) -m 644 pmlogger_daily.service $(PCP_SYSTEMDUNIT_DIR)/pmlogger_daily.service
|
||||
$(INSTALL) -m 644 pmlogger_daily-poll.timer $(PCP_SYSTEMDUNIT_DIR)/pmlogger_daily-poll.timer
|
||||
$(INSTALL) -m 644 pmlogger_daily-poll.service $(PCP_SYSTEMDUNIT_DIR)/pmlogger_daily-poll.service
|
||||
- $(INSTALL) -m 644 pmlogger_check.path $(PCP_SYSTEMDUNIT_DIR)/pmlogger_check.path
|
||||
$(INSTALL) -m 644 pmlogger_check.timer $(PCP_SYSTEMDUNIT_DIR)/pmlogger_check.timer
|
||||
$(INSTALL) -m 644 pmlogger_check.service $(PCP_SYSTEMDUNIT_DIR)/pmlogger_check.service
|
||||
$(INSTALL) -m 644 pmlogger_daily_report.timer $(PCP_SYSTEMDUNIT_DIR)/pmlogger_daily_report.timer
|
||||
@@ -130,11 +129,6 @@ pmlogger_check.service : pmlogger_check.service.in
|
||||
-e 's;@PCP_USER@;'$(PCP_USER)';' \
|
||||
# END
|
||||
|
||||
-pmlogger_check.path : pmlogger_check.path.in
|
||||
- $(SED) <$< >$@ \
|
||||
- -e 's;@PCP_PMLOGGERCONTROL_PATH@;'$(PCP_PMLOGGERCONTROL_PATH)';' \
|
||||
- # END
|
||||
-
|
||||
pmlogger_daily_report.service : pmlogger_daily_report.service.in
|
||||
$(SED) <$< >$@ \
|
||||
-e 's;@CRONTAB_DAILY_REPORT_PATH@;'$(CRONTAB_DAILY_REPORT_PATH)';' \
|
||||
diff --git a/src/pmlogger/pmlogger_check.path.in b/src/pmlogger/pmlogger_check.path.in
|
||||
deleted file mode 100644
|
||||
index 7575e046a..000000000
|
||||
--- a/src/pmlogger/pmlogger_check.path.in
|
||||
+++ /dev/null
|
||||
@@ -1,6 +0,0 @@
|
||||
-[Path]
|
||||
-PathChanged=@PCP_PMLOGGERCONTROL_PATH@
|
||||
-PathChanged=@PCP_PMLOGGERCONTROL_PATH@.d
|
||||
-
|
||||
-[Install]
|
||||
-RequiredBy=pmlogger.service
|
||||
--
|
||||
2.29.2
|
||||
|
||||
From 35c9843d2f27b8d1cdf62c00d68ce67fda4913e1 Mon Sep 17 00:00:00 2001
|
||||
From: Ken McDonell <kenj@kenj.id.au>
|
||||
Date: Mon, 20 Jul 2020 13:22:51 +1000
|
||||
Subject: [PATCH] src/pmie: remove systemd path services
|
||||
|
||||
We're not going to use filesystem watchers for /etc/pcp/pmie/control*
|
||||
---
|
||||
src/pmie/GNUmakefile | 10 ++--------
|
||||
src/pmie/pmie_check.path.in | 6 ------
|
||||
2 files changed, 2 insertions(+), 14 deletions(-)
|
||||
delete mode 100644 src/pmie/pmie_check.path.in
|
||||
|
||||
diff --git a/src/pmie/GNUmakefile b/src/pmie/GNUmakefile
|
||||
index fb600b38b..58dd3959a 100644
|
||||
--- a/src/pmie/GNUmakefile
|
||||
+++ b/src/pmie/GNUmakefile
|
||||
@@ -19,7 +19,7 @@ include $(TOPDIR)/src/include/builddefs
|
||||
SUBDIRS = src examples
|
||||
OTHERS = control stomp rc_pmie pmie2col.sh pmie_check.sh pmie_daily.sh
|
||||
LDIRT = crontab crontab.docker pmie.service pmie_daily.service \
|
||||
- pmie_check.service pmie_check.path
|
||||
+ pmie_check.service
|
||||
|
||||
ifeq ($(TARGET_OS),linux)
|
||||
CRONTAB_USER = $(PCP_USER)
|
||||
@@ -30,7 +30,7 @@ CRONTAB_PATH = $(PCP_SYSCONF_DIR)/pmie/crontab
|
||||
endif
|
||||
|
||||
default:: crontab crontab.docker pmie.service pmie_daily.service \
|
||||
- pmie_check.service pmie_check.path
|
||||
+ pmie_check.service
|
||||
|
||||
default:: $(SUBDIRS)
|
||||
$(SUBDIRS_MAKERULE)
|
||||
@@ -54,7 +54,6 @@ ifeq ($(ENABLE_SYSTEMD),true)
|
||||
$(INSTALL) -m 644 pmie.service $(PCP_SYSTEMDUNIT_DIR)/pmie.service
|
||||
$(INSTALL) -m 644 pmie_daily.timer $(PCP_SYSTEMDUNIT_DIR)/pmie_daily.timer
|
||||
$(INSTALL) -m 644 pmie_daily.service $(PCP_SYSTEMDUNIT_DIR)/pmie_daily.service
|
||||
- $(INSTALL) -m 644 pmie_check.path $(PCP_SYSTEMDUNIT_DIR)/pmie_check.path
|
||||
$(INSTALL) -m 644 pmie_check.timer $(PCP_SYSTEMDUNIT_DIR)/pmie_check.timer
|
||||
$(INSTALL) -m 644 pmie_check.service $(PCP_SYSTEMDUNIT_DIR)/pmie_check.service
|
||||
$(INSTALL) -m 644 pmie_timers.sysconfig $(PCP_SYSCONFIG_DIR)/pmie_timers
|
||||
@@ -92,11 +91,6 @@ pmie_check.service : pmie_check.service.in
|
||||
-e 's;@PCP_USER@;'$(PCP_USER)';' \
|
||||
# END
|
||||
|
||||
-pmie_check.path : pmie_check.path.in
|
||||
- $(SED) <$< >$@ \
|
||||
- -e 's;@PCP_PMIECONTROL_PATH@;'$(PCP_PMIECONTROL_PATH)';' \
|
||||
- # END
|
||||
-
|
||||
pmie_daily.service : pmie_daily.service.in
|
||||
$(SED) <$< >$@ \
|
||||
-e 's;@CRONTAB_PATH@;'$(CRONTAB_PATH)';' \
|
||||
diff --git a/src/pmie/pmie_check.path.in b/src/pmie/pmie_check.path.in
|
||||
deleted file mode 100644
|
||||
index 42d8ab18e..000000000
|
||||
--- a/src/pmie/pmie_check.path.in
|
||||
+++ /dev/null
|
||||
@@ -1,6 +0,0 @@
|
||||
-[Path]
|
||||
-PathChanged=@PCP_PMIECONTROL_PATH@
|
||||
-PathChanged=@PCP_PMIECONTROL_PATH@.d
|
||||
-
|
||||
-[Install]
|
||||
-RequiredBy=pmie.service
|
||||
--
|
||||
2.29.2
|
||||
|
||||
From c12c82b49aec852acd18d8c02386e25847d62fb1 Mon Sep 17 00:00:00 2001
|
||||
From: Ken McDonell <kenj@kenj.id.au>
|
||||
Date: Mon, 20 Jul 2020 13:37:23 +1000
|
||||
Subject: [PATCH] src/pmfind: remove systemd path services
|
||||
|
||||
We're not going to use filesystem watchers for /etc/pcp/pmfind
|
||||
---
|
||||
src/pmfind/GNUmakefile | 8 +-------
|
||||
src/pmfind/pmfind.path.in | 5 -----
|
||||
2 files changed, 1 insertion(+), 12 deletions(-)
|
||||
delete mode 100644 src/pmfind/pmfind.path.in
|
||||
|
||||
diff --git a/src/pmfind/GNUmakefile b/src/pmfind/GNUmakefile
|
||||
index a061366f2..7271b4869 100644
|
||||
--- a/src/pmfind/GNUmakefile
|
||||
+++ b/src/pmfind/GNUmakefile
|
||||
@@ -36,7 +36,7 @@ CRONTAB_USER =
|
||||
CRONTAB_PATH = $(PCP_SYSCONF_DIR)/pmfind/crontab
|
||||
endif
|
||||
|
||||
-default : $(CMDTARGET) crontab pmfind.path pmfind.service
|
||||
+default : $(CMDTARGET) crontab pmfind.service
|
||||
|
||||
include $(BUILDRULES)
|
||||
|
||||
@@ -49,7 +49,6 @@ install : default
|
||||
ifeq ($(ENABLE_SYSTEMD),true)
|
||||
$(INSTALL) -m 644 pmfind.service $(PCP_SYSTEMDUNIT_DIR)/pmfind.service
|
||||
$(INSTALL) -m 644 pmfind.timer $(PCP_SYSTEMDUNIT_DIR)/pmfind.timer
|
||||
- $(INSTALL) -m 644 pmfind.path $(PCP_SYSTEMDUNIT_DIR)/pmfind.path
|
||||
else
|
||||
$(INSTALL) -m 755 -d `dirname $(CRONTAB_PATH)`
|
||||
$(INSTALL) -m 644 crontab $(CRONTAB_PATH)
|
||||
@@ -68,11 +67,6 @@ pmfind.service : pmfind.service.in
|
||||
-e 's;@PCP_VAR_DIR@;'$(PCP_VAR_DIR)';' \
|
||||
# END
|
||||
|
||||
-pmfind.path : pmfind.path.in
|
||||
- $(SED) <$< >$@ \
|
||||
- -e 's;@PCP_SYSCONF_DIR@;'$(PCP_SYSCONF_DIR)';' \
|
||||
- # END
|
||||
-
|
||||
crontab: crontab.in
|
||||
$(SED) -e 's;@user@;'$(CRONTAB_USER)';' -e 's;@path@;'$(PCP_BINADM_DIR)';g' $< > $@
|
||||
|
||||
diff --git a/src/pmfind/pmfind.path.in b/src/pmfind/pmfind.path.in
|
||||
deleted file mode 100644
|
||||
index bd49398fb..000000000
|
||||
--- a/src/pmfind/pmfind.path.in
|
||||
+++ /dev/null
|
||||
@@ -1,5 +0,0 @@
|
||||
-[Path]
|
||||
-PathChanged=@PCP_SYSCONF_DIR@/pmfind
|
||||
-
|
||||
-[Install]
|
||||
-RequiredBy=pmfind.service
|
||||
--
|
||||
2.29.2
|
||||
|
||||
From 58eea08fb41ab91a71851fe0f38fc690fa7554a2 Mon Sep 17 00:00:00 2001
|
||||
From: Ken McDonell <kenj@kenj.id.au>
|
||||
Date: Mon, 20 Jul 2020 14:04:54 +1000
|
||||
Subject: [PATCH] src/{pmie,pmlogger,pmfind}: need to remove "path" from
|
||||
associated service files as well
|
||||
|
||||
---
|
||||
src/pmfind/pmfind.service.in | 2 +-
|
||||
src/pmie/pmie.service.in | 4 ++--
|
||||
src/pmlogger/pmlogger.service.in | 4 ++--
|
||||
3 files changed, 5 insertions(+), 5 deletions(-)
|
||||
|
||||
diff --git a/src/pmfind/pmfind.service.in b/src/pmfind/pmfind.service.in
|
||||
index f6ee963b7..6e4b6b6d2 100644
|
||||
--- a/src/pmfind/pmfind.service.in
|
||||
+++ b/src/pmfind/pmfind.service.in
|
||||
@@ -3,7 +3,7 @@ Description=Discover remote PCP services for analysis
|
||||
Documentation=man:pmfind(1)
|
||||
After=network-online.target pmcd.service
|
||||
After=pmie_check.timer pmlogger_check.timer
|
||||
-BindsTo=pmfind.timer pmfind.path
|
||||
+BindsTo=pmfind.timer
|
||||
|
||||
[Service]
|
||||
Type=oneshot
|
||||
diff --git a/src/pmie/pmie.service.in b/src/pmie/pmie.service.in
|
||||
index 54523bfec..020408fae 100644
|
||||
--- a/src/pmie/pmie.service.in
|
||||
+++ b/src/pmie/pmie.service.in
|
||||
@@ -2,8 +2,8 @@
|
||||
Description=Performance Metrics Inference Engine
|
||||
Documentation=man:pmie(1)
|
||||
After=network-online.target pmcd.service
|
||||
-After=pmie_check.timer pmie_check.path pmie_daily.timer
|
||||
-BindsTo=pmie_check.timer pmie_check.path pmie_daily.timer
|
||||
+After=pmie_check.timer pmie_daily.timer
|
||||
+BindsTo=pmie_check.timer pmie_daily.timer
|
||||
Wants=pmcd.service
|
||||
|
||||
[Service]
|
||||
diff --git a/src/pmlogger/pmlogger.service.in b/src/pmlogger/pmlogger.service.in
|
||||
index 2467e9933..9dad692d6 100644
|
||||
--- a/src/pmlogger/pmlogger.service.in
|
||||
+++ b/src/pmlogger/pmlogger.service.in
|
||||
@@ -2,8 +2,8 @@
|
||||
Description=Performance Metrics Archive Logger
|
||||
Documentation=man:pmlogger(1)
|
||||
After=network-online.target pmcd.service
|
||||
-Before=pmlogger_check.timer pmlogger_check.path pmlogger_daily.timer pmlogger_daily-poll.timer
|
||||
-BindsTo=pmlogger_check.timer pmlogger_check.path pmlogger_daily.timer pmlogger_daily-poll.timer
|
||||
+Before=pmlogger_check.timer pmlogger_daily.timer pmlogger_daily-poll.timer
|
||||
+BindsTo=pmlogger_check.timer pmlogger_daily.timer pmlogger_daily-poll.timer
|
||||
Wants=pmcd.service
|
||||
|
||||
[Service]
|
||||
--
|
||||
2.29.2
|
||||
|
||||
From 739395724c29115e6bf6eb511e48086da48338ab Mon Sep 17 00:00:00 2001
|
||||
From: Nathan Scott <nathans@redhat.com>
|
||||
Date: Wed, 29 Jul 2020 18:32:04 +1000
|
||||
Subject: [PATCH] qa: drop systemd .path files from common remove_job_scheduler
|
||||
|
||||
---
|
||||
qa/common.check | 3 +--
|
||||
1 file changed, 1 insertion(+), 2 deletions(-)
|
||||
|
||||
diff --git a/qa/common.check b/qa/common.check
|
||||
index e17dc1352..de8a9149f 100644
|
||||
--- a/qa/common.check
|
||||
+++ b/qa/common.check
|
||||
@@ -1616,9 +1616,8 @@ _remove_job_scheduler()
|
||||
|
||||
if systemctl cat pmie_daily.timer >/dev/null 2>&1; then
|
||||
for i in pmie_daily.timer pmie_check.timer pmlogger_daily.timer \
|
||||
- pmlogger_daily-poll.timer pmlogger_check.timer \
|
||||
pmlogger_daily_report.timer pmlogger_daily_report-poll.timer \
|
||||
- pmlogger_check.path pmie_check.path ; do
|
||||
+ pmlogger_daily-poll.timer pmlogger_check.timer ; do
|
||||
$rc_sudo systemctl is-active "$i" > /dev/null || continue
|
||||
$rc_sudo systemctl stop $i >/dev/null
|
||||
echo "$i" >> $rc_systemd_state
|
||||
--
|
||||
2.29.2
|
||||
|
||||
1084
SOURCES/redhat-bugzilla-1913782.patch
Normal file
1084
SOURCES/redhat-bugzilla-1913782.patch
Normal file
File diff suppressed because it is too large
Load Diff
@ -1,6 +1,6 @@
|
||||
Name: pcp
|
||||
Version: 5.1.1
|
||||
Release: 3%{?dist}
|
||||
Release: 4%{?dist}
|
||||
Summary: System-level performance monitoring and performance management
|
||||
License: GPLv2+ and LGPLv2+ and CC-BY
|
||||
URL: https://pcp.io
|
||||
@ -16,6 +16,8 @@ Patch004: redhat-bugzilla-1790452.patch
|
||||
Patch005: redhat-bugzilla-1846705.patch
|
||||
Patch006: redhat-bugzilla-1849511.patch
|
||||
Patch007: redhat-bugzilla-1790433.patch
|
||||
Patch008: redhat-bugzilla-1913782.patch
|
||||
Patch009: redhat-bugzilla-1875659.patch
|
||||
|
||||
%if 0%{?fedora} >= 26 || 0%{?rhel} > 7
|
||||
%global __python2 python2
|
||||
@ -2231,6 +2233,8 @@ updated policy package.
|
||||
%patch005 -p1
|
||||
%patch006 -p1
|
||||
%patch007 -p1
|
||||
%patch008 -p1
|
||||
%patch009 -p1
|
||||
|
||||
%build
|
||||
# fix up build version
|
||||
@ -2929,20 +2933,16 @@ chown -R pcp:pcp %{_logsdir}/pmproxy 2>/dev/null
|
||||
# services and timers replacing the old cron scripts
|
||||
%{_unitdir}/pmlogger_check.service
|
||||
%{_unitdir}/pmlogger_check.timer
|
||||
%{_unitdir}/pmlogger_check.path
|
||||
%{_unitdir}/pmlogger_daily.service
|
||||
%{_unitdir}/pmlogger_daily.timer
|
||||
%{_unitdir}/pmlogger_daily-poll.service
|
||||
%{_unitdir}/pmlogger_daily-poll.timer
|
||||
%{_unitdir}/pmie_check.timer
|
||||
%{_unitdir}/pmie_check.path
|
||||
%{_unitdir}/pmie_check.service
|
||||
%{_unitdir}/pmie_check.timer
|
||||
%{_unitdir}/pmie_check.path
|
||||
%{_unitdir}/pmie_daily.service
|
||||
%{_unitdir}/pmie_daily.timer
|
||||
%{_unitdir}/pmfind.timer
|
||||
%{_unitdir}/pmfind.path
|
||||
%config(noreplace) %{_sysconfdir}/sysconfig/pmie_timers
|
||||
%config(noreplace) %{_sysconfdir}/sysconfig/pmlogger_timers
|
||||
%else
|
||||
@ -3408,6 +3408,10 @@ chown -R pcp:pcp %{_logsdir}/pmproxy 2>/dev/null
|
||||
%endif
|
||||
|
||||
%changelog
|
||||
* Wed Jan 20 2021 Andreas Gerstmayr <agerstmayr@redhat.com> - 5.1.1-4
|
||||
- resolve boot ordering cycle, remove path service units (BZ 1875659)
|
||||
- fix pmlogger, some metrics got logged twice (BZ 1913782)
|
||||
|
||||
* Tue Jun 23 2020 Mark Goodwin <mgoodwin@redhat.com> - 5.1.1-3
|
||||
- fix for missing runtime deps on perl Net::SNMP (BZ 1790433)
|
||||
- resolve covscan and other issues from upstream QA (BZ 1849511)
|
||||
|
||||
Loading…
Reference in New Issue
Block a user