294 (pcp-6.0.2) | : | 294 (pcp-6.0.3) | ||
---|---|---|---|---|
skipping to change at line 129 | skipping to change at line 129 | |||
_filter_pmproxy() | _filter_pmproxy() | |||
{ | { | |||
sed \ | sed \ | |||
-e '/^__pmSetSocketIPC: fd=/d' \ | -e '/^__pmSetSocketIPC: fd=/d' \ | |||
-e '/^__pmSetDataIPC:/d' \ | -e '/^__pmSetDataIPC:/d' \ | |||
-e '/^__pmDataIPC: /d' \ | -e '/^__pmDataIPC: /d' \ | |||
-e '/^IPC table fd/d' \ | -e '/^IPC table fd/d' \ | |||
-e '/^pmproxy: disabled time series, requires libuv support (missing)/d' \ | -e '/^pmproxy: disabled time series, requires libuv support (missing)/d' \ | |||
# end | # end | |||
} | } | |||
_do() | _do() | |||
{ | { | |||
echo | echo | |||
echo "+++ $* +++" | tee -a $seq.full | _filter_me | echo "+++ $* +++" | tee -a $seq.full | _filter_me | |||
if which $1 >/dev/null 2>&1 | if which $1 >/dev/null 2>&1 | |||
then | then | |||
eval $* 2>&1 | tee -a $seq.full | _filter | eval $* 2>&1 | tee -a $seq.full | _filter | |||
connects=`grep AcceptNewClient $tmp.log | wc -l | sed -e 's/ *//g'` | connects=`grep AcceptNewClient $tmp.log | wc -l | sed -e 's/ *//g'` | |||
skipping to change at line 173 | skipping to change at line 172 | |||
disk.all.blkread | disk.all.blkread | |||
disk.all.blkwrite | disk.all.blkwrite | |||
kernel.all.intr | kernel.all.intr | |||
kernel.all.intr.non_vme | kernel.all.intr.non_vme | |||
kernel.all.pswitch | kernel.all.pswitch | |||
kernel.all.cpu | kernel.all.cpu | |||
} | } | |||
End-of-File | End-of-File | |||
} | } | |||
$PCP_PS_PROG $PCP_PS_ALL_FLAGS | grep -E '[P]PID|[p]mproxy' >>$here/$seq.full | ||||
$sudo netstat -t -l -4 -p | grep '4432[23]' >>$here/$seq.full | ||||
_service pmproxy stop >/dev/null 2>&1 | _service pmproxy stop >/dev/null 2>&1 | |||
$sudo $signal -a pmproxy >/dev/null 2>&1 | $sudo $signal -a pmproxy >/dev/null 2>&1 | |||
$PCP_PS_PROG $PCP_PS_ALL_FLAGS | grep -E '[P]PID|[p]mproxy' >>$here/$seq.full | ||||
# give any running pmproxy a chance to shutdown cleanly | ||||
# | ||||
sleep 2 | ||||
$sudo netstat -t -l -4 -p | grep '4432[23]' >>$here/$seq.full | ||||
mkdir -p $tmp.rundir | mkdir -p $tmp.rundir | |||
export PCP_RUN_DIR=$tmp.rundir | export PCP_RUN_DIR=$tmp.rundir | |||
proxyargs="-Dcontext -U $username" | proxyargs="-Dcontext -U $username" | |||
$PCP_BINADM_DIR/pmproxy $proxyargs -l $tmp.log 2>&1 | _filter_pmproxy | $PCP_BINADM_DIR/pmproxy $proxyargs -l $tmp.log 2>&1 | _filter_pmproxy | |||
_wait_for_pmproxy | _wait_for_pmproxy | |||
$sudo netstat -t -l -4 -p | grep '4432[23]' >>$here/$seq.full | ||||
export PMPROXY_HOST=localhost | export PMPROXY_HOST=localhost | |||
$PCP_BINADM_DIR/pmcd_wait -t 5sec -h localhost@localhost | $PCP_BINADM_DIR/pmcd_wait -t 5sec -h localhost@localhost | |||
$PCP_PS_PROG $PCP_PS_ALL_FLAGS | grep -E '[P]PID|[p]mproxy' >>$here/$seq.full | ||||
cat $tmp.log >> $here/$seq.full | ||||
# real QA test starts here | # real QA test starts here | |||
_do pminfo -h $PMPROXY_HOST -d pmcd.agent | _do pminfo -h $PMPROXY_HOST -d pmcd.agent | |||
_do pminfo -h $PMPROXY_HOST -f sample.hordes | _do pminfo -h $PMPROXY_HOST -f sample.hordes | |||
_do pmprobe -v -h localhost hinv.ncpu | _do pmprobe -v -h localhost hinv.ncpu | |||
_do pmval -h `hostname` -t 0.5 -s 3 sample.bin | _do pmval -h `hostname` -t 0.5 -s 3 sample.bin | |||
echo "kernel.all.load;" >$tmp.in | echo "kernel.all.load;" >$tmp.in | |||
_do pmie -h $PMPROXY_HOST -c $tmp.in -v -t 0.5 -T 1.75 | _do pmie -h $PMPROXY_HOST -c $tmp.in -v -t 0.5 -T 1.75 | |||
echo "kernel.all.cpu.user :localhost;" >$tmp.in | echo "kernel.all.cpu.user :localhost;" >$tmp.in | |||
skipping to change at line 205 | skipping to change at line 214 | |||
_do pmdumptext -h `hostname` -t 0.5 -s 2 sample.string.hullo | _do pmdumptext -h `hostname` -t 0.5 -s 2 sample.string.hullo | |||
_do pmdumptext -t 0.5 -s 2 localhost:sample.string.hullo | _do pmdumptext -t 0.5 -s 2 localhost:sample.string.hullo | |||
_do pmdumptext -t 0.5 -s 2 `hostname`:kernel.all.load | _do pmdumptext -t 0.5 -s 2 `hostname`:kernel.all.load | |||
# Note: there used to be special casing for Darwin/Solaris platforms | # Note: there used to be special casing for Darwin/Solaris platforms | |||
# here. This is wrong, pmstat must still run on these platforms and | # here. This is wrong, pmstat must still run on these platforms and | |||
# produce no values for some columns. | # produce no values for some columns. | |||
_do pmstat -h $PMPROXY_HOST -t 0.5 -s 2 | _do pmstat -h $PMPROXY_HOST -t 0.5 -s 2 | |||
_do_config | _do_config | |||
_do pmlogger -h localhost -c $tmp.config -t 0.5sec -s 3 -l $tmp.logger.log $tmp. | _do pmlogger -h localhost -c $tmp.config -t 0.5sec -s 6 -l $tmp.logger.log $tmp. | |||
arch | arch | |||
_do pmstat -S +0.4sec -t 0.5sec -a $tmp.arch -z | _do pmstat -S +1sec -t 0.5sec -s 1 -a $tmp.arch -z | |||
( echo ""; echo "=== pmproxy.log ===" ) >>$seq.full | ( echo ""; echo "=== pmproxy.log ===" ) >>$seq.full | |||
cat $tmp.log >>$seq.full | cat $tmp.log >>$seq.full | |||
# success, all done | # success, all done | |||
status=0 | status=0 | |||
exit | exit | |||
End of changes. 6 change blocks. | ||||
4 lines changed or deleted | 13 lines changed or added |