percona/percona-toolkit
1
0
Fork 0
mirror of https://github.com/percona/percona-toolkit.git synced 2026-04-06 01:06:43 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merged fix-1156867-pt-stalk-show-function-name

Browse Source
This commit is contained in:
Brian Fraser
2013-04-17 15:12:22 -03:00
parent f0aedf1e5a 59cd002335
commit 53dc083e82
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
bin/pt-stalk
View File

@@ -1255,7 +1255,7 @@ stalk() {
cycles_true=0
fi
local msg="Check results: $OPT_VARIABLE=$value, matched=${matched:-no}, cycles_true=$cycles_true"
local msg="Check results: $OPT_FUNCTION($OPT_VARIABLE)=$value, matched=${matched:-no}, cycles_true=$cycles_true"
if [ "$matched" ]; then
log "$msg"
else

8
t/pt-stalk/pt-stalk.t
View File

@@ -120,7 +120,7 @@ PerconaTest::kill_program(pid_file => $pid_file);
$output = `cat $log_file 2>/dev/null`;
unlike(
$output,
qr/Check results: Threads_running=\d+, matched=no, cycles_true=0/,
qr/Check results: status\(Threads_running\)=\d+, matched=no, cycles_true=0/,
"Non-matching results not logged because --verbose=2"
) or diag(`cat $log_file 2>/dev/null`, `cat $dest/*-output 2>/dev/null`);
@@ -153,7 +153,7 @@ PerconaTest::kill_program(pid_file => $pid_file);
$output = `cat $log_file 2>/dev/null`;
like(
$output,
qr/Check results: Threads_running=\d+, matched=no, cycles_true=0/,
qr/Check results: status\(Threads_running\)=\d+, matched=no, cycles_true=0/,
"Matching results logged with --verbose 3"
) or diag(`cat $dest/*-output 2>/dev/null`);
@@ -201,7 +201,7 @@ PerconaTest::wait_until(sub { !-f $pid_file });
$output = `cat $dest/*-trigger 2>/dev/null`;
like(
$output,
qr/Check results: Uptime=\d+, matched=yes, cycles_true=2/,
qr/Check results: status\(Uptime\)=\d+, matched=yes, cycles_true=2/,
"Collect triggered"
)
or diag(
@@ -304,7 +304,7 @@ is(
$output = `cat $log_file 2>/dev/null`;
like(
$output,
qr/Check results: Aborted_connects=|variable=Aborted_connects/,
qr/Check results: status\(Aborted_connects\)=|variable=Aborted_connects/,
"Read default config file"
);