Skip to content

Commit 501c724

Browse files
kmcdonellkmcdonell
committed
Merge branch 'main' of ../pcp
2 parents 0e580be + e7b891f commit 501c724

26 files changed

Lines changed: 497 additions & 116 deletions

‎qa/1068‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ echo "== Zabbix Archive ==="
7373
pcp2zabbix -r -t 2 -s 3 $log -c $tmp.config sample >$tmp.pcp2zabbix.out 2>$tmp.pcp2zabbix.err & # will error out after socket cat dies
7474
pmpid=$!
7575
sleep 2
76-
$signal $pmpid 2>/dev/null
76+
$signal $pmpid >>$seq_full 2>&1
7777
_seq_store
7878

7979
echo "== Zabbix server input ==="

‎qa/1076‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ _filter()
2727
-e '/^addindom(/d' \
2828
-e '/^addlabel(/d' \
2929
-e '/^addtext(/d' \
30+
-e '/^logFree/d' \
3031
# end
3132
}
3233

‎qa/1111‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ sleep 2
5050
$pcp2influxdb -x roar -t 1 hinv.ncpu sample.control >$tmp.p2i.out 2>$tmp.p2i.err &
5151
p2ipid=$!
5252
sleep 3
53-
$signal $pid $p2ipid 2>/dev/null
53+
$signal $pid $p2ipid >>$seq_full 2>&1
5454
wait
5555
grep -E -q "^POST /write\?db=roar" $tmp.socat.out
5656
[ $? -eq 0 ] && echo "Found POST URL in noauth output"
@@ -68,7 +68,7 @@ $pcp2influxdb -x roar -X host=me.example.com -t 1 hinv.ncpu \
6868
>$tmp.p2i.out 2>$tmp.p2i.err &
6969
p2ipid=$!
7070
sleep 3
71-
$signal $pid $p2ipid 2>/dev/null
71+
$signal $pid $p2ipid >>$seq_full 2>&1
7272
wait
7373
grep -E -q "^POST /write\?db=roar" $tmp.socat.out
7474
[ $? -eq 0 ] && echo "Found POST URL in noauth output"
@@ -85,7 +85,7 @@ $pcp2influxdb -x roar --db-user pcp --db-pass hey \
8585
>$tmp.p2i.out 2>$tmp.p2i.err &
8686
p2ipid=$!
8787
sleep 3
88-
$signal $pid $p2ipid 2>/dev/null
88+
$signal $pid $p2ipid >>$seq_full 2>&1
8989
wait
9090
grep -E -q "^POST /write\?db=roar" $tmp.socat.out
9191
[ $? -eq 0 ] && echo "Found POST URL in output"
@@ -103,7 +103,7 @@ sleep 2
103103
$pcp2influxdb -t 2 -I sample.aggregate.null sample.string.hullo sample.bad >$tmp.p2i.out 2>$tmp.p2i.err &
104104
p2ipid=$!
105105
sleep 8 # enough for at least 2 messages
106-
$signal $pid $p2ipid 2>/dev/null
106+
$signal $pid $p2ipid >>$seq_full 2>&1
107107
wait
108108
grep 'Excluding' $tmp.p2i.err
109109
_full_stash

‎qa/1204‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -89,59 +89,59 @@ pmlogctl --help 2>&1 | _filter \
8989
# end
9090

9191
echo
92-
echo '== -N -V create' | tee -a $seq_full
93-
pmlogctl -N -V create localhost 2>&1 | _filter
92+
echo '== -N -V create -c default' | tee -a $seq_full
93+
pmlogctl -N -V create -c default localhost 2>&1 | _filter
9494

9595
echo | tee -a $seq_full
96-
echo '== create' | tee -a $seq_full
97-
$sudo pmlogctl create localhost | _filter
96+
echo '== create -c default' | tee -a $seq_full
97+
$sudo pmlogctl create -c default localhost | _filter
9898
echo '== status' | tee -a $seq_full
9999
pmlogctl status | _filter_status
100100
echo '== status localhost' | tee -a $seq_full
101101
pmlogctl status localhost | _filter_status
102102

103103
echo | tee -a $seq_full
104-
echo '== stop' | tee -a $seq_full
105-
$sudo pmlogctl stop localhost | _filter
104+
echo '== stop -c default' | tee -a $seq_full
105+
$sudo pmlogctl stop -c default localhost | _filter
106106
echo '== status' | tee -a $seq_full
107107
pmlogctl status | _filter_status
108108
echo '== status localhost' | tee -a $seq_full
109109
pmlogctl status localhost | _filter_status
110110

111111
echo | tee -a $seq_full
112-
echo '== start' | tee -a $seq_full
113-
$sudo pmlogctl start localhost | _filter
112+
echo '== start -c default' | tee -a $seq_full
113+
$sudo pmlogctl start -c default localhost | _filter
114114
echo '== status' | tee -a $seq_full
115115
pmlogctl status | _filter_status
116116
echo '== status localhost' | tee -a $seq_full
117117
pmlogctl status localhost | _filter_status
118118

119119
echo | tee -a $seq_full
120-
echo '== restart' | tee -a $seq_full
121-
$sudo pmlogctl restart localhost | _filter
120+
echo '== restart -c default' | tee -a $seq_full
121+
$sudo pmlogctl restart -c default localhost | _filter
122122
echo '== status' | tee -a $seq_full
123123
pmlogctl status | _filter_status
124124
echo '== status localhost' | tee -a $seq_full
125125
pmlogctl status localhost | _filter_status
126126

127127
echo | tee -a $seq_full
128-
echo '== destroy' | tee -a $seq_full
129-
$sudo pmlogctl destroy localhost | _filter
128+
echo '== destroy -c default' | tee -a $seq_full
129+
$sudo pmlogctl destroy -c default localhost | _filter
130130
echo '== status' | tee -a $seq_full
131131
pmlogctl status | _filter_status
132132
echo '== status localhost' | tee -a $seq_full
133133
pmlogctl status localhost | _filter_status
134134

135135
echo | tee -a $seq_full
136-
echo '== cond-create' | tee -a $seq_full
137-
$sudo pmlogctl cond-create localhost | _filter
136+
echo '== cond-create -c pmfind' | tee -a $seq_full
137+
$sudo pmlogctl cond-create -c pmfind localhost | _filter
138138
echo '== status' | tee -a $seq_full
139139
pmlogctl status | _filter_status
140140
$sudo pmlogctl -c pmfind destroy localhost | _filter
141141

142142
echo | tee -a $seq_full
143-
echo "== cond-create -i $seq-foo" | tee -a $seq_full
144-
$sudo pmlogctl -i $seq-foo cond-create localhost | _filter
143+
echo "== cond-create -c pmfind -i $seq-foo" | tee -a $seq_full
144+
$sudo pmlogctl -i $seq-foo cond-create -c pmfind localhost | _filter
145145
echo '== status' | tee -a $seq_full
146146
pmlogctl -V status 2>&1 | _filter_status
147147

‎qa/1204.out‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -19,15 +19,15 @@ Options:
1919
-V, --verbose increase verbosity
2020
-?, --help show this usage message and exit
2121

22-
Avaliable commands:
22+
Available commands:
2323
[-c classname] create host ...
2424
{-c classname|-i ident} cond-create host ...
2525
[-c classname] {start|stop|restart|destroy|check|status} [host ...]
2626

2727
and host may be a valid hostname or an egrep(1) pattern that matches
2828
the start of a hostname
2929

30-
== -N -V create
30+
== -N -V create -c default
3131
--- start control file ---
3232
# created by pmlogctl on DATE
3333
$class=default
@@ -39,51 +39,51 @@ Installing control file: PCP_ETC_DIR/pcp/pmlogger/control.d/localhost
3939
+ cp PCP_TMPFILE_DIR/pmlogctl.XXXXX/control PCP_ETC_DIR/pcp/pmlogger/control.d/localhost
4040
+ PCP_BINADM_DIR/runaspcp PCP_BINADM_DIR/pmlogger_check -c "PCP_ETC_DIR/pcp/pmlogger/control.d/localhost"
4141

42-
== create
42+
== create -c default
4343
== status
4444
pmcd Host Archive Class PID State
4545
localhost <archivename> default <pid> running
4646
== status localhost
4747
pmcd Host Archive Class PID State
4848
localhost <archivename> default <pid> running
4949

50-
== stop
50+
== stop -c default
5151
== status
5252
pmcd Host Archive Class PID State
5353
localhost ? default ? stopped by pmlogctl
5454
== status localhost
5555
pmcd Host Archive Class PID State
5656
localhost ? default ? stopped by pmlogctl
5757

58-
== start
58+
== start -c default
5959
== status
6060
pmcd Host Archive Class PID State
6161
localhost <archivename> default <pid> running
6262
== status localhost
6363
pmcd Host Archive Class PID State
6464
localhost <archivename> default <pid> running
6565

66-
== restart
66+
== restart -c default
6767
== status
6868
pmcd Host Archive Class PID State
6969
localhost <archivename> default <pid> running
7070
== status localhost
7171
pmcd Host Archive Class PID State
7272
localhost <archivename> default <pid> running
7373

74-
== destroy
74+
== destroy -c default
7575
== status
7676
pmcd Host Archive Class PID State
7777
== status localhost
7878
Warning: host localhost not defined in any pmlogger control file
7979
pmcd Host Archive Class PID State
8080

81-
== cond-create
81+
== cond-create -c pmfind
8282
== status
8383
pmcd Host Archive Class PID State
8484
localhost <archivename> pmfind <pid> running
8585

86-
== cond-create -i 1204-foo
86+
== cond-create -c pmfind -i 1204-foo
8787
== status
8888
pmcd Host Archive Class PID State Instance Id
8989
localhost <archivename> pmfind <pid> running 1204-foo

‎qa/1210.out‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -67,15 +67,15 @@ Disable pmlogger for host LOCALHOSTNAME and directory PCP_ARCHIVE_DIR/1210-LOCAL
6767
Disable pmlogger for host localhost and directory PCP_ARCHIVE_DIR/1210-localhost in control file PCP_ETC_DIR/pcp/pmlogger/control.d/1210-localhost
6868
Found PID <somepid> to stop using signal TERM
6969
Found PID <somepid> to stop using signal TERM
70-
Looking for pmlogger using directory PCP_ARCHIVE_DIR/1210-LOCALHOSTNAME ...
71-
Looking for pmlogger using directory PCP_ARCHIVE_DIR/1210-localhost ...
70+
Looking for pmlogger using directory PCP_ARCHIVE_DIR/1210-LOCALHOSTNAME and args -c TMP.config ...
71+
Looking for pmlogger using directory PCP_ARCHIVE_DIR/1210-localhost and args -c TMP.config ...
7272
Warning: removing lock file older than 30 minutes (PID <mypid> QA 1210 stale lock)
7373
pmcd Host Archive Class PID State
7474
LOCALHOSTNAME ? <seq> ? stopped by pmlogctl
7575
localhost ? <seq> ? stopped by pmlogctl
7676
Enable pmlogger for host LOCALHOSTNAME and directory PCP_ARCHIVE_DIR/1210-LOCALHOSTNAME in control file PCP_ETC_DIR/pcp/pmlogger/control.d/1210-LOCALHOSTNAME
7777
Enable pmlogger for host localhost and directory PCP_ARCHIVE_DIR/1210-localhost in control file PCP_ETC_DIR/pcp/pmlogger/control.d/1210-localhost
78-
Looking for pmlogger using directory PCP_ARCHIVE_DIR/1210-LOCALHOSTNAME ...
79-
Looking for pmlogger using directory PCP_ARCHIVE_DIR/1210-localhost ...
78+
Looking for pmlogger using directory PCP_ARCHIVE_DIR/1210-LOCALHOSTNAME and args -c TMP.config ...
79+
Looking for pmlogger using directory PCP_ARCHIVE_DIR/1210-localhost and args -c TMP.config ...
8080
Not found, launching new pmlogger
8181
Not found, launching new pmlogger

‎qa/1215.out‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,15 +14,15 @@ pmcd Host Archive Class PID State
1414
localhost <archivename> <seq> <pid> running
1515

1616
=== pmlogger won't stop ... stop case
17-
Looking for pmlogger using directory PCP_ARCHIVE_DIR/1215-localhost ...
17+
Looking for pmlogger using directory PCP_ARCHIVE_DIR/1215-localhost and args -c TMP.config ...
1818
Found PID <somepid> to stop using signal HUP
1919
Warning: pmlogger failed to stop for host localhost and directory PCP_ARCHIVE_DIR/1215-localhost (PID=<somepid>)
2020
Error: could not complete stop operation
2121
pmcd Host Archive Class PID State
2222
localhost <archivename> <seq> <pid> running
2323

2424
=== pmlogger won't stop ... restart case
25-
Looking for pmlogger using directory PCP_ARCHIVE_DIR/1215-localhost ...
25+
Looking for pmlogger using directory PCP_ARCHIVE_DIR/1215-localhost and args -c TMP.config ...
2626
Found PID <somepid> to stop using signal HUP
2727
Warning: pmlogger failed to stop for host localhost and directory PCP_ARCHIVE_DIR/1215-localhost (PID=<somepid>)
2828
Error: restart failed to stop host localhost in class 1215

‎qa/1216.out‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -42,34 +42,34 @@ localhost <archivename> <seq> <pid> running
4242
=== restart cases
4343
-- localhost
4444
Found PID <somepid> to stop using signal TERM
45-
Looking for pmlogger using directory PCP_ARCHIVE_DIR/1216-localhost ...
46-
Looking for pmlogger using directory PCP_ARCHIVE_DIR/1216-localhost ...
45+
Looking for pmlogger using directory PCP_ARCHIVE_DIR/1216-localhost and args -c TMP.config ...
46+
Looking for pmlogger using directory PCP_ARCHIVE_DIR/1216-localhost and args -c TMP.config ...
4747
Not found as expected, launching new pmlogger
4848
-- LOCALHOSTNAME
4949
Found PID <somepid> to stop using signal TERM
50-
Looking for pmlogger using directory PCP_ARCHIVE_DIR/1216-LOCALHOSTNAME ...
51-
Looking for pmlogger using directory PCP_ARCHIVE_DIR/1216-LOCALHOSTNAME ...
50+
Looking for pmlogger using directory PCP_ARCHIVE_DIR/1216-LOCALHOSTNAME and args -c TMP.config ...
51+
Looking for pmlogger using directory PCP_ARCHIVE_DIR/1216-LOCALHOSTNAME and args -c TMP.config ...
5252
Not found as expected, launching new pmlogger
5353
-- local:
5454
Found PID <somepid> to stop using signal TERM
55-
Looking for pmlogger using directory PCP_ARCHIVE_DIR/1216-local: ...
56-
Looking for pmlogger using directory PCP_ARCHIVE_DIR/1216-local: ...
55+
Looking for pmlogger using directory PCP_ARCHIVE_DIR/1216-local: and args -c TMP.config ...
56+
Looking for pmlogger using directory PCP_ARCHIVE_DIR/1216-local: and args -c TMP.config ...
5757
Not found as expected, launching new pmlogger
5858
-- local.*
5959
Found PID <somepid> to stop using signal TERM
6060
Found PID <somepid> to stop using signal TERM
61-
Looking for pmlogger using directory PCP_ARCHIVE_DIR/1216-local: ...
62-
Looking for pmlogger using directory PCP_ARCHIVE_DIR/1216-local: ...
63-
Looking for pmlogger using directory PCP_ARCHIVE_DIR/1216-localhost ...
64-
Looking for pmlogger using directory PCP_ARCHIVE_DIR/1216-localhost ...
61+
Looking for pmlogger using directory PCP_ARCHIVE_DIR/1216-local: and args -c TMP.config ...
62+
Looking for pmlogger using directory PCP_ARCHIVE_DIR/1216-local: and args -c TMP.config ...
63+
Looking for pmlogger using directory PCP_ARCHIVE_DIR/1216-localhost and args -c TMP.config ...
64+
Looking for pmlogger using directory PCP_ARCHIVE_DIR/1216-localhost and args -c TMP.config ...
6565
Not found as expected, launching new pmlogger
6666
Not found as expected, launching new pmlogger
6767
-- .*[hH][oO][sS][tT]
6868
Found PID <somepid> to stop using signal TERM
6969
Found PID <somepid> to stop using signal TERM
70-
Looking for pmlogger using directory PCP_ARCHIVE_DIR/1216-LOCALHOSTNAME ...
71-
Looking for pmlogger using directory PCP_ARCHIVE_DIR/1216-LOCALHOSTNAME ...
72-
Looking for pmlogger using directory PCP_ARCHIVE_DIR/1216-localhost ...
73-
Looking for pmlogger using directory PCP_ARCHIVE_DIR/1216-localhost ...
70+
Looking for pmlogger using directory PCP_ARCHIVE_DIR/1216-LOCALHOSTNAME and args -c TMP.config ...
71+
Looking for pmlogger using directory PCP_ARCHIVE_DIR/1216-LOCALHOSTNAME and args -c TMP.config ...
72+
Looking for pmlogger using directory PCP_ARCHIVE_DIR/1216-localhost and args -c TMP.config ...
73+
Looking for pmlogger using directory PCP_ARCHIVE_DIR/1216-localhost and args -c TMP.config ...
7474
Not found as expected, launching new pmlogger
7575
Not found as expected, launching new pmlogger

‎qa/1226.out‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ Options:
1919
-V, --verbose increase verbosity
2020
-?, --help show this usage message and exit
2121

22-
Avaliable commands:
22+
Available commands:
2323
[-c classname] create host ...
2424
{-c classname|-i ident} cond-create host ...
2525
[-c classname] {start|stop|restart|destroy|check|status} [host ...]

‎qa/1248‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ _cleanup()
2626
cd $here
2727
$sudo pmlogctl -af -c pmfind destroy localhost >>$seq_full 2>&1
2828
$sudo rm -rf $PCP_ETC_DIR/pcp/pmlogger/class.d/$seq.?
29+
_restore_config $PCP_ETC_DIR/pcp/pmlogger/class.d
2930
$sudo rm -rf $tmp $tmp.*
3031
for dir in $seq $seq-a $seq-b $seq-c
3132
do
@@ -38,6 +39,19 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
3839

3940
localhost=`hostname`
4041

42+
# this test requires only the pmfind policy class is in place
43+
#
44+
_save_config $PCP_ETC_DIR/pcp/pmlogger/class.d
45+
for policy in $PCP_ETC_DIR/pcp/pmlogger/class.d/*
46+
do
47+
case "$policy"
48+
in
49+
*/pmfind) ;;
50+
*) $sudo rm -f "$policy"
51+
;;
52+
esac
53+
done
54+
4155
_filter()
4256
{
4357
tee -a $seq_full \

0 commit comments

Comments
 (0)