|
 |
2cf6a0 |
From 7d4327035fbda12c66d8fc5eb0ed4dcd8e5f0285 Mon Sep 17 00:00:00 2001
|
|
|
2cf6a0 |
From: Ken McDonell <kenj@kenj.id.au>
|
|
|
2cf6a0 |
Date: Mon, 20 Jul 2020 13:19:52 +1000
|
|
|
2cf6a0 |
Subject: [PATCH] src/pmlogger: remove systemd path services
|
|
|
2cf6a0 |
|
|
|
2cf6a0 |
We're not going to use filesystem watchers for /etc/pcp/pmlogger/control*.
|
|
|
2cf6a0 |
---
|
|
|
2cf6a0 |
src/pmlogger/GNUmakefile | 8 +-------
|
|
|
2cf6a0 |
src/pmlogger/pmlogger_check.path.in | 6 ------
|
|
|
2cf6a0 |
2 files changed, 1 insertion(+), 13 deletions(-)
|
|
|
2cf6a0 |
delete mode 100644 src/pmlogger/pmlogger_check.path.in
|
|
|
2cf6a0 |
|
|
|
2cf6a0 |
diff --git a/src/pmlogger/GNUmakefile b/src/pmlogger/GNUmakefile
|
|
|
2cf6a0 |
index 4503993de..959141eb3 100644
|
|
|
2cf6a0 |
--- a/src/pmlogger/GNUmakefile
|
|
|
2cf6a0 |
+++ b/src/pmlogger/GNUmakefile
|
|
|
2cf6a0 |
@@ -23,7 +23,7 @@ OTHERS = pmnewlog.sh control rc_pmlogger \
|
|
|
2cf6a0 |
LDIRT = crontab crontab.docker crontab.daily_report pmlogger.service \
|
|
|
2cf6a0 |
pmlogger_daily.service pmlogger_daily-poll.service \
|
|
|
2cf6a0 |
pmlogger_daily_report.service pmlogger_daily_report-poll.service \
|
|
|
2cf6a0 |
- pmlogger_check.service pmlogger_check.path
|
|
|
2cf6a0 |
+ pmlogger_check.service
|
|
|
2cf6a0 |
|
|
|
2cf6a0 |
ifeq ($(TARGET_OS),linux)
|
|
|
2cf6a0 |
CRONTAB_USER = $(PCP_USER)
|
|
|
2cf6a0 |
@@ -64,7 +64,6 @@ ifeq ($(ENABLE_SYSTEMD),true)
|
|
|
2cf6a0 |
$(INSTALL) -m 644 pmlogger_daily.service $(PCP_SYSTEMDUNIT_DIR)/pmlogger_daily.service
|
|
|
2cf6a0 |
$(INSTALL) -m 644 pmlogger_daily-poll.timer $(PCP_SYSTEMDUNIT_DIR)/pmlogger_daily-poll.timer
|
|
|
2cf6a0 |
$(INSTALL) -m 644 pmlogger_daily-poll.service $(PCP_SYSTEMDUNIT_DIR)/pmlogger_daily-poll.service
|
|
|
2cf6a0 |
- $(INSTALL) -m 644 pmlogger_check.path $(PCP_SYSTEMDUNIT_DIR)/pmlogger_check.path
|
|
|
2cf6a0 |
$(INSTALL) -m 644 pmlogger_check.timer $(PCP_SYSTEMDUNIT_DIR)/pmlogger_check.timer
|
|
|
2cf6a0 |
$(INSTALL) -m 644 pmlogger_check.service $(PCP_SYSTEMDUNIT_DIR)/pmlogger_check.service
|
|
|
2cf6a0 |
$(INSTALL) -m 644 pmlogger_daily_report.timer $(PCP_SYSTEMDUNIT_DIR)/pmlogger_daily_report.timer
|
|
|
2cf6a0 |
@@ -130,11 +129,6 @@ pmlogger_check.service : pmlogger_check.service.in
|
|
|
2cf6a0 |
-e 's;@PCP_USER@;'$(PCP_USER)';' \
|
|
|
2cf6a0 |
# END
|
|
|
2cf6a0 |
|
|
|
2cf6a0 |
-pmlogger_check.path : pmlogger_check.path.in
|
|
|
2cf6a0 |
- $(SED) <$< >$@ \
|
|
|
2cf6a0 |
- -e 's;@PCP_PMLOGGERCONTROL_PATH@;'$(PCP_PMLOGGERCONTROL_PATH)';' \
|
|
|
2cf6a0 |
- # END
|
|
|
2cf6a0 |
-
|
|
|
2cf6a0 |
pmlogger_daily_report.service : pmlogger_daily_report.service.in
|
|
|
2cf6a0 |
$(SED) <$< >$@ \
|
|
|
2cf6a0 |
-e 's;@CRONTAB_DAILY_REPORT_PATH@;'$(CRONTAB_DAILY_REPORT_PATH)';' \
|
|
|
2cf6a0 |
diff --git a/src/pmlogger/pmlogger_check.path.in b/src/pmlogger/pmlogger_check.path.in
|
|
|
2cf6a0 |
deleted file mode 100644
|
|
|
2cf6a0 |
index 7575e046a..000000000
|
|
|
2cf6a0 |
--- a/src/pmlogger/pmlogger_check.path.in
|
|
|
2cf6a0 |
+++ /dev/null
|
|
|
2cf6a0 |
@@ -1,6 +0,0 @@
|
|
|
2cf6a0 |
-[Path]
|
|
|
2cf6a0 |
-PathChanged=@PCP_PMLOGGERCONTROL_PATH@
|
|
|
2cf6a0 |
-PathChanged=@PCP_PMLOGGERCONTROL_PATH@.d
|
|
|
2cf6a0 |
-
|
|
|
2cf6a0 |
-[Install]
|
|
|
2cf6a0 |
-RequiredBy=pmlogger.service
|
|
|
2cf6a0 |
--
|
|
|
2cf6a0 |
2.29.2
|
|
|
2cf6a0 |
|
|
|
2cf6a0 |
From 35c9843d2f27b8d1cdf62c00d68ce67fda4913e1 Mon Sep 17 00:00:00 2001
|
|
|
2cf6a0 |
From: Ken McDonell <kenj@kenj.id.au>
|
|
|
2cf6a0 |
Date: Mon, 20 Jul 2020 13:22:51 +1000
|
|
|
2cf6a0 |
Subject: [PATCH] src/pmie: remove systemd path services
|
|
|
2cf6a0 |
|
|
|
2cf6a0 |
We're not going to use filesystem watchers for /etc/pcp/pmie/control*
|
|
|
2cf6a0 |
---
|
|
|
2cf6a0 |
src/pmie/GNUmakefile | 10 ++--------
|
|
|
2cf6a0 |
src/pmie/pmie_check.path.in | 6 ------
|
|
|
2cf6a0 |
2 files changed, 2 insertions(+), 14 deletions(-)
|
|
|
2cf6a0 |
delete mode 100644 src/pmie/pmie_check.path.in
|
|
|
2cf6a0 |
|
|
|
2cf6a0 |
diff --git a/src/pmie/GNUmakefile b/src/pmie/GNUmakefile
|
|
|
2cf6a0 |
index fb600b38b..58dd3959a 100644
|
|
|
2cf6a0 |
--- a/src/pmie/GNUmakefile
|
|
|
2cf6a0 |
+++ b/src/pmie/GNUmakefile
|
|
|
2cf6a0 |
@@ -19,7 +19,7 @@ include $(TOPDIR)/src/include/builddefs
|
|
|
2cf6a0 |
SUBDIRS = src examples
|
|
|
2cf6a0 |
OTHERS = control stomp rc_pmie pmie2col.sh pmie_check.sh pmie_daily.sh
|
|
|
2cf6a0 |
LDIRT = crontab crontab.docker pmie.service pmie_daily.service \
|
|
|
2cf6a0 |
- pmie_check.service pmie_check.path
|
|
|
2cf6a0 |
+ pmie_check.service
|
|
|
2cf6a0 |
|
|
|
2cf6a0 |
ifeq ($(TARGET_OS),linux)
|
|
|
2cf6a0 |
CRONTAB_USER = $(PCP_USER)
|
|
|
2cf6a0 |
@@ -30,7 +30,7 @@ CRONTAB_PATH = $(PCP_SYSCONF_DIR)/pmie/crontab
|
|
|
2cf6a0 |
endif
|
|
|
2cf6a0 |
|
|
|
2cf6a0 |
default:: crontab crontab.docker pmie.service pmie_daily.service \
|
|
|
2cf6a0 |
- pmie_check.service pmie_check.path
|
|
|
2cf6a0 |
+ pmie_check.service
|
|
|
2cf6a0 |
|
|
|
2cf6a0 |
default:: $(SUBDIRS)
|
|
|
2cf6a0 |
$(SUBDIRS_MAKERULE)
|
|
|
2cf6a0 |
@@ -54,7 +54,6 @@ ifeq ($(ENABLE_SYSTEMD),true)
|
|
|
2cf6a0 |
$(INSTALL) -m 644 pmie.service $(PCP_SYSTEMDUNIT_DIR)/pmie.service
|
|
|
2cf6a0 |
$(INSTALL) -m 644 pmie_daily.timer $(PCP_SYSTEMDUNIT_DIR)/pmie_daily.timer
|
|
|
2cf6a0 |
$(INSTALL) -m 644 pmie_daily.service $(PCP_SYSTEMDUNIT_DIR)/pmie_daily.service
|
|
|
2cf6a0 |
- $(INSTALL) -m 644 pmie_check.path $(PCP_SYSTEMDUNIT_DIR)/pmie_check.path
|
|
|
2cf6a0 |
$(INSTALL) -m 644 pmie_check.timer $(PCP_SYSTEMDUNIT_DIR)/pmie_check.timer
|
|
|
2cf6a0 |
$(INSTALL) -m 644 pmie_check.service $(PCP_SYSTEMDUNIT_DIR)/pmie_check.service
|
|
|
2cf6a0 |
$(INSTALL) -m 644 pmie_timers.sysconfig $(PCP_SYSCONFIG_DIR)/pmie_timers
|
|
|
2cf6a0 |
@@ -92,11 +91,6 @@ pmie_check.service : pmie_check.service.in
|
|
|
2cf6a0 |
-e 's;@PCP_USER@;'$(PCP_USER)';' \
|
|
|
2cf6a0 |
# END
|
|
|
2cf6a0 |
|
|
|
2cf6a0 |
-pmie_check.path : pmie_check.path.in
|
|
|
2cf6a0 |
- $(SED) <$< >$@ \
|
|
|
2cf6a0 |
- -e 's;@PCP_PMIECONTROL_PATH@;'$(PCP_PMIECONTROL_PATH)';' \
|
|
|
2cf6a0 |
- # END
|
|
|
2cf6a0 |
-
|
|
|
2cf6a0 |
pmie_daily.service : pmie_daily.service.in
|
|
|
2cf6a0 |
$(SED) <$< >$@ \
|
|
|
2cf6a0 |
-e 's;@CRONTAB_PATH@;'$(CRONTAB_PATH)';' \
|
|
|
2cf6a0 |
diff --git a/src/pmie/pmie_check.path.in b/src/pmie/pmie_check.path.in
|
|
|
2cf6a0 |
deleted file mode 100644
|
|
|
2cf6a0 |
index 42d8ab18e..000000000
|
|
|
2cf6a0 |
--- a/src/pmie/pmie_check.path.in
|
|
|
2cf6a0 |
+++ /dev/null
|
|
|
2cf6a0 |
@@ -1,6 +0,0 @@
|
|
|
2cf6a0 |
-[Path]
|
|
|
2cf6a0 |
-PathChanged=@PCP_PMIECONTROL_PATH@
|
|
|
2cf6a0 |
-PathChanged=@PCP_PMIECONTROL_PATH@.d
|
|
|
2cf6a0 |
-
|
|
|
2cf6a0 |
-[Install]
|
|
|
2cf6a0 |
-RequiredBy=pmie.service
|
|
|
2cf6a0 |
--
|
|
|
2cf6a0 |
2.29.2
|
|
|
2cf6a0 |
|
|
|
2cf6a0 |
From c12c82b49aec852acd18d8c02386e25847d62fb1 Mon Sep 17 00:00:00 2001
|
|
|
2cf6a0 |
From: Ken McDonell <kenj@kenj.id.au>
|
|
|
2cf6a0 |
Date: Mon, 20 Jul 2020 13:37:23 +1000
|
|
|
2cf6a0 |
Subject: [PATCH] src/pmfind: remove systemd path services
|
|
|
2cf6a0 |
|
|
|
2cf6a0 |
We're not going to use filesystem watchers for /etc/pcp/pmfind
|
|
|
2cf6a0 |
---
|
|
|
2cf6a0 |
src/pmfind/GNUmakefile | 8 +-------
|
|
|
2cf6a0 |
src/pmfind/pmfind.path.in | 5 -----
|
|
|
2cf6a0 |
2 files changed, 1 insertion(+), 12 deletions(-)
|
|
|
2cf6a0 |
delete mode 100644 src/pmfind/pmfind.path.in
|
|
|
2cf6a0 |
|
|
|
2cf6a0 |
diff --git a/src/pmfind/GNUmakefile b/src/pmfind/GNUmakefile
|
|
|
2cf6a0 |
index a061366f2..7271b4869 100644
|
|
|
2cf6a0 |
--- a/src/pmfind/GNUmakefile
|
|
|
2cf6a0 |
+++ b/src/pmfind/GNUmakefile
|
|
|
2cf6a0 |
@@ -36,7 +36,7 @@ CRONTAB_USER =
|
|
|
2cf6a0 |
CRONTAB_PATH = $(PCP_SYSCONF_DIR)/pmfind/crontab
|
|
|
2cf6a0 |
endif
|
|
|
2cf6a0 |
|
|
|
2cf6a0 |
-default : $(CMDTARGET) crontab pmfind.path pmfind.service
|
|
|
2cf6a0 |
+default : $(CMDTARGET) crontab pmfind.service
|
|
|
2cf6a0 |
|
|
|
2cf6a0 |
include $(BUILDRULES)
|
|
|
2cf6a0 |
|
|
|
2cf6a0 |
@@ -49,7 +49,6 @@ install : default
|
|
|
2cf6a0 |
ifeq ($(ENABLE_SYSTEMD),true)
|
|
|
2cf6a0 |
$(INSTALL) -m 644 pmfind.service $(PCP_SYSTEMDUNIT_DIR)/pmfind.service
|
|
|
2cf6a0 |
$(INSTALL) -m 644 pmfind.timer $(PCP_SYSTEMDUNIT_DIR)/pmfind.timer
|
|
|
2cf6a0 |
- $(INSTALL) -m 644 pmfind.path $(PCP_SYSTEMDUNIT_DIR)/pmfind.path
|
|
|
2cf6a0 |
else
|
|
|
2cf6a0 |
$(INSTALL) -m 755 -d `dirname $(CRONTAB_PATH)`
|
|
|
2cf6a0 |
$(INSTALL) -m 644 crontab $(CRONTAB_PATH)
|
|
|
2cf6a0 |
@@ -68,11 +67,6 @@ pmfind.service : pmfind.service.in
|
|
|
2cf6a0 |
-e 's;@PCP_VAR_DIR@;'$(PCP_VAR_DIR)';' \
|
|
|
2cf6a0 |
# END
|
|
|
2cf6a0 |
|
|
|
2cf6a0 |
-pmfind.path : pmfind.path.in
|
|
|
2cf6a0 |
- $(SED) <$< >$@ \
|
|
|
2cf6a0 |
- -e 's;@PCP_SYSCONF_DIR@;'$(PCP_SYSCONF_DIR)';' \
|
|
|
2cf6a0 |
- # END
|
|
|
2cf6a0 |
-
|
|
|
2cf6a0 |
crontab: crontab.in
|
|
|
2cf6a0 |
$(SED) -e 's;@user@;'$(CRONTAB_USER)';' -e 's;@path@;'$(PCP_BINADM_DIR)';g' $< > $@
|
|
|
2cf6a0 |
|
|
|
2cf6a0 |
diff --git a/src/pmfind/pmfind.path.in b/src/pmfind/pmfind.path.in
|
|
|
2cf6a0 |
deleted file mode 100644
|
|
|
2cf6a0 |
index bd49398fb..000000000
|
|
|
2cf6a0 |
--- a/src/pmfind/pmfind.path.in
|
|
|
2cf6a0 |
+++ /dev/null
|
|
|
2cf6a0 |
@@ -1,5 +0,0 @@
|
|
|
2cf6a0 |
-[Path]
|
|
|
2cf6a0 |
-PathChanged=@PCP_SYSCONF_DIR@/pmfind
|
|
|
2cf6a0 |
-
|
|
|
2cf6a0 |
-[Install]
|
|
|
2cf6a0 |
-RequiredBy=pmfind.service
|
|
|
2cf6a0 |
--
|
|
|
2cf6a0 |
2.29.2
|
|
|
2cf6a0 |
|
|
|
2cf6a0 |
From 58eea08fb41ab91a71851fe0f38fc690fa7554a2 Mon Sep 17 00:00:00 2001
|
|
|
2cf6a0 |
From: Ken McDonell <kenj@kenj.id.au>
|
|
|
2cf6a0 |
Date: Mon, 20 Jul 2020 14:04:54 +1000
|
|
|
2cf6a0 |
Subject: [PATCH] src/{pmie,pmlogger,pmfind}: need to remove "path" from
|
|
|
2cf6a0 |
associated service files as well
|
|
|
2cf6a0 |
|
|
|
2cf6a0 |
---
|
|
|
2cf6a0 |
src/pmfind/pmfind.service.in | 2 +-
|
|
|
2cf6a0 |
src/pmie/pmie.service.in | 4 ++--
|
|
|
2cf6a0 |
src/pmlogger/pmlogger.service.in | 4 ++--
|
|
|
2cf6a0 |
3 files changed, 5 insertions(+), 5 deletions(-)
|
|
|
2cf6a0 |
|
|
|
2cf6a0 |
diff --git a/src/pmfind/pmfind.service.in b/src/pmfind/pmfind.service.in
|
|
|
2cf6a0 |
index f6ee963b7..6e4b6b6d2 100644
|
|
|
2cf6a0 |
--- a/src/pmfind/pmfind.service.in
|
|
|
2cf6a0 |
+++ b/src/pmfind/pmfind.service.in
|
|
|
2cf6a0 |
@@ -3,7 +3,7 @@ Description=Discover remote PCP services for analysis
|
|
|
2cf6a0 |
Documentation=man:pmfind(1)
|
|
|
2cf6a0 |
After=network-online.target pmcd.service
|
|
|
2cf6a0 |
After=pmie_check.timer pmlogger_check.timer
|
|
|
2cf6a0 |
-BindsTo=pmfind.timer pmfind.path
|
|
|
2cf6a0 |
+BindsTo=pmfind.timer
|
|
|
2cf6a0 |
|
|
|
2cf6a0 |
[Service]
|
|
|
2cf6a0 |
Type=oneshot
|
|
|
2cf6a0 |
diff --git a/src/pmie/pmie.service.in b/src/pmie/pmie.service.in
|
|
|
2cf6a0 |
index 54523bfec..020408fae 100644
|
|
|
2cf6a0 |
--- a/src/pmie/pmie.service.in
|
|
|
2cf6a0 |
+++ b/src/pmie/pmie.service.in
|
|
|
2cf6a0 |
@@ -2,8 +2,8 @@
|
|
|
2cf6a0 |
Description=Performance Metrics Inference Engine
|
|
|
2cf6a0 |
Documentation=man:pmie(1)
|
|
|
2cf6a0 |
After=network-online.target pmcd.service
|
|
|
2cf6a0 |
-After=pmie_check.timer pmie_check.path pmie_daily.timer
|
|
|
2cf6a0 |
-BindsTo=pmie_check.timer pmie_check.path pmie_daily.timer
|
|
|
2cf6a0 |
+After=pmie_check.timer pmie_daily.timer
|
|
|
2cf6a0 |
+BindsTo=pmie_check.timer pmie_daily.timer
|
|
|
2cf6a0 |
Wants=pmcd.service
|
|
|
2cf6a0 |
|
|
|
2cf6a0 |
[Service]
|
|
|
2cf6a0 |
diff --git a/src/pmlogger/pmlogger.service.in b/src/pmlogger/pmlogger.service.in
|
|
|
2cf6a0 |
index 2467e9933..9dad692d6 100644
|
|
|
2cf6a0 |
--- a/src/pmlogger/pmlogger.service.in
|
|
|
2cf6a0 |
+++ b/src/pmlogger/pmlogger.service.in
|
|
|
2cf6a0 |
@@ -2,8 +2,8 @@
|
|
|
2cf6a0 |
Description=Performance Metrics Archive Logger
|
|
|
2cf6a0 |
Documentation=man:pmlogger(1)
|
|
|
2cf6a0 |
After=network-online.target pmcd.service
|
|
|
2cf6a0 |
-Before=pmlogger_check.timer pmlogger_check.path pmlogger_daily.timer pmlogger_daily-poll.timer
|
|
|
2cf6a0 |
-BindsTo=pmlogger_check.timer pmlogger_check.path pmlogger_daily.timer pmlogger_daily-poll.timer
|
|
|
2cf6a0 |
+Before=pmlogger_check.timer pmlogger_daily.timer pmlogger_daily-poll.timer
|
|
|
2cf6a0 |
+BindsTo=pmlogger_check.timer pmlogger_daily.timer pmlogger_daily-poll.timer
|
|
|
2cf6a0 |
Wants=pmcd.service
|
|
|
2cf6a0 |
|
|
|
2cf6a0 |
[Service]
|
|
|
2cf6a0 |
--
|
|
|
2cf6a0 |
2.29.2
|
|
|
2cf6a0 |
|
|
|
2cf6a0 |
From 739395724c29115e6bf6eb511e48086da48338ab Mon Sep 17 00:00:00 2001
|
|
|
2cf6a0 |
From: Nathan Scott <nathans@redhat.com>
|
|
|
2cf6a0 |
Date: Wed, 29 Jul 2020 18:32:04 +1000
|
|
|
2cf6a0 |
Subject: [PATCH] qa: drop systemd .path files from common remove_job_scheduler
|
|
|
2cf6a0 |
|
|
|
2cf6a0 |
---
|
|
|
2cf6a0 |
qa/common.check | 3 +--
|
|
|
2cf6a0 |
1 file changed, 1 insertion(+), 2 deletions(-)
|
|
|
2cf6a0 |
|
|
|
2cf6a0 |
diff --git a/qa/common.check b/qa/common.check
|
|
|
2cf6a0 |
index e17dc1352..de8a9149f 100644
|
|
|
2cf6a0 |
--- a/qa/common.check
|
|
|
2cf6a0 |
+++ b/qa/common.check
|
|
|
2cf6a0 |
@@ -1616,9 +1616,8 @@ _remove_job_scheduler()
|
|
|
2cf6a0 |
|
|
|
2cf6a0 |
if systemctl cat pmie_daily.timer >/dev/null 2>&1; then
|
|
|
2cf6a0 |
for i in pmie_daily.timer pmie_check.timer pmlogger_daily.timer \
|
|
|
2cf6a0 |
- pmlogger_daily-poll.timer pmlogger_check.timer \
|
|
|
2cf6a0 |
pmlogger_daily_report.timer pmlogger_daily_report-poll.timer \
|
|
|
2cf6a0 |
- pmlogger_check.path pmie_check.path ; do
|
|
|
2cf6a0 |
+ pmlogger_daily-poll.timer pmlogger_check.timer ; do
|
|
|
2cf6a0 |
$rc_sudo systemctl is-active "$i" > /dev/null || continue
|
|
|
2cf6a0 |
$rc_sudo systemctl stop $i >/dev/null
|
|
|
2cf6a0 |
echo "$i" >> $rc_systemd_state
|
|
|
2cf6a0 |
--
|
|
|
2cf6a0 |
2.29.2
|
|
|
2cf6a0 |
|