Merge branch 'main' of ../pcp

performancecopilot · Jul 25, 2024 · d322c74 · d322c74
2 parents ce6df6b + b2d59d1
commit d322c74
Show file tree

Hide file tree

Showing 5 changed files with 25 additions and 7 deletions.
diff --git a/qa/1210 b/qa/1210
@@ -189,7 +189,7 @@ echo $mypid >$tmp.tmp
 $sudo cp $tmp.tmp $PCP_ETC_DIR/pcp/pmlogger/lock
 $sudo touch -t `pmdate -35M %Y%m%d%H%M` $PCP_ETC_DIR/pcp/pmlogger/lock
 $sudo pmlogctl -V -a -c $seq stop 2>$tmp.err | _filter | LC_COLLATE=POSIX sort
-_filter <$tmp.err
+_filter <$tmp.err | LC_COLLATE=POSIX sort
 pmlogctl status | _filter_status
 $sudo rm -f $PCP_ETC_DIR/pcp/pmlogger/lock
 $sudo pmlogctl -V -a -c $seq start 2>&1 | _filter | LC_COLLATE=POSIX sort

diff --git a/qa/1210.out b/qa/1210.out
@@ -63,13 +63,13 @@ localhost <archivename> <seq> <pid> running
 
 === stale mutex
 ------ ... ls output ... PCP_ETC_DIR/pcp/pmlogger/lock
-Warning: removing lock file older than 30 minutes (PID <mypid>)
-Looking for pmlogger using directory PCP_ARCHIVE_DIR/1210-localhost ...
-Found PID <somepid> to stop using signal TERM
+Disable pmlogger for host LOCALHOSTNAME and directory PCP_ARCHIVE_DIR/1210-LOCALHOSTNAME in control file PCP_ETC_DIR/pcp/pmlogger/control.d/1210-LOCALHOSTNAME
 Disable pmlogger for host localhost and directory PCP_ARCHIVE_DIR/1210-localhost in control file PCP_ETC_DIR/pcp/pmlogger/control.d/1210-localhost
-Looking for pmlogger using directory PCP_ARCHIVE_DIR/1210-LOCALHOSTNAME ...
 Found PID <somepid> to stop using signal TERM
-Disable pmlogger for host LOCALHOSTNAME and directory PCP_ARCHIVE_DIR/1210-LOCALHOSTNAME in control file PCP_ETC_DIR/pcp/pmlogger/control.d/1210-LOCALHOSTNAME
+Found PID <somepid> to stop using signal TERM
+Looking for pmlogger using directory PCP_ARCHIVE_DIR/1210-LOCALHOSTNAME ...
+Looking for pmlogger using directory PCP_ARCHIVE_DIR/1210-localhost ...
+Warning: removing lock file older than 30 minutes (PID <mypid>)
 pmcd Host Archive Class PID State 
 LOCALHOSTNAME ? <seq> ? stopped by pmlogctl
 localhost ? <seq> ? stopped by pmlogctl

diff --git a/qa/1483 b/qa/1483
@@ -78,6 +78,8 @@ _filter()
 	    # ... rc[96813]: /etc/pcp/pmie/rc: Warning: Performance Co-Pilot Inference Engine (pmie) not permanently enabled.
 	    # ... rc[96813]:     To enable pmie, run the following as root:
 	    # ... rc[96813]:     # /bin/systemctl enable pmie.service
+	    # and qa/575 seems capable of tripping this one
+	    # ... pmie_farm[3016551]: End:
 	    # and pmie_check will fail during PCP builds
 	    # and this strange one but only on vm03
 	    # ... vm03.localdomain pmiectl[1013253]: mount: write error
@@ -91,6 +93,7 @@ _filter()
 		-e '/rc\[[0-9]*]: .*run the following as root:/d' \
 		-e '/rc\[[0-9]*]: .*systemctl enable pmie\.service/d' \
 		-e '/rc\[[0-9]*]: Terminated$/d' \
+		-e '/pmie_farm\[[0-9]*]: End:/d' \
 		-e '/pmie_check failed - see .*\/pmie_check.log/d' \
 		-e '/pmie_daily failed - see .*\/pmie_daily.log/d' \
 		-e '/pmiectl\[[0-9]*]: .* (localhost) defined multiple times,/d' \

diff --git a/qa/1521 b/qa/1521
@@ -50,7 +50,16 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 
 host=`hostname`
 echo "host=$host" >>$seq.full
-now=`PCP_DERIVED_CONFIG=/dev/null pmprobe -v sample.seconds | cut -d' ' -f3`
+
+# need "now" to be > 20 to avoid ambiguous filtering
+# ... only an issue of the sample PMDA was recently restarted
+#
+for i in 1 2 3 4 5 6 7 8 9 10
+do
+    now=`PCP_DERIVED_CONFIG=/dev/null pmprobe -v sample.seconds | cut -d' ' -f3`
+    [ -n "$now" -a "$now" -gt 20 ] && break
+    sleep 2
+done
 echo "now=$now" >>$seq.full
 
 _filter()

diff --git a/qa/512.out b/qa/512.out
@@ -79,6 +79,7 @@ lock(lock[handle(s) 1])
 lock(lock[handle(s) 2])
 lock(logutil)
 lock(pdubuf)
+lock(pmns_fix)
 lock(result)
 unlock(contexts)
 unlock(ctx 0)
@@ -93,6 +94,7 @@ unlock(lock[handle(s) 1])
 unlock(lock[handle(s) 2])
 unlock(logutil)
 unlock(pdubuf)
+unlock(pmns_fix)
 unlock(result)
 
 == pmlogdump ==
@@ -106,6 +108,7 @@ lock(lock[handle(s) 0])
 lock(logutil)
 lock(pdubuf)
 lock(pmns)
+lock(pmns_fix)
 lock(result)
 unlock(contexts)
 unlock(ctx 0)
@@ -117,6 +120,7 @@ unlock(lock[handle(s) 0])
 unlock(logutil)
 unlock(pdubuf)
 unlock(pmns)
+unlock(pmns_fix)
 unlock(result)
 
 == dbpmda ==
@@ -132,6 +136,7 @@ lock(lock)
 lock(pdu)
 lock(pdubuf)
 lock(pmns)
+lock(pmns_fix)
 lock(result)
 unlock(config)
 unlock(contexts)
@@ -145,4 +150,5 @@ unlock(lock)
 unlock(pdu)
 unlock(pdubuf)
 unlock(pmns)
+unlock(pmns_fix)
 unlock(result)