percona/percona-toolkit
1
0
Fork 0
mirror of https://github.com/percona/percona-toolkit.git synced 2025-09-19 18:34:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge from upstream

Browse Source
This commit is contained in:
Daniël van Eeden
2013-04-24 17:19:40 +02:00
parent 42902f23cf 53dc083e82
commit f5b8460a76
3 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
bin/pt-align
View File

@@ -1213,6 +1213,9 @@ is easier to read.
=head1 OPTIONS =head1 OPTIONS
This tool accepts additional command-line arguments. Refer to the
L<"SYNOPSIS"> and usage information for details.
=over =over
=item --help =item --help

6
bin/pt-stalk
View File

@@ -1255,7 +1255,7 @@ stalk() {
cycles_true=0 cycles_true=0
fi 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 if [ "$matched" ]; then
log "$msg" log "$msg"
else else
@@ -1936,6 +1936,10 @@ Plugins can stop the tool by setting the global variable C<OKTORUN>
to C<1>. In this case, the global variable C<EXIT_REASON> should also to C<1>. In this case, the global variable C<EXIT_REASON> should also
be set to indicate why the tool was stopped. be set to indicate why the tool was stopped.
Plugin writers should keep in mind that the file destination prefix currently
in use should be accessed through the C<$prefix> variable, rather than
C<$OPT_PREFIX>.
=item --port =item --port
short form: -P; type: int short form: -P; type: int

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`; $output = `cat $log_file 2>/dev/null`;
unlike( unlike(
$output, $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" "Non-matching results not logged because --verbose=2"
) or diag(`cat $log_file 2>/dev/null`, `cat $dest/*-output 2>/dev/null`); ) 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`; $output = `cat $log_file 2>/dev/null`;
like( like(
$output, $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" "Matching results logged with --verbose 3"
) or diag(`cat $dest/*-output 2>/dev/null`); ) 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`; $output = `cat $dest/*-trigger 2>/dev/null`;
like( like(
$output, $output,
qr/Check results: Uptime=\d+, matched=yes, cycles_true=2/, qr/Check results: status\(Uptime\)=\d+, matched=yes, cycles_true=2/,
"Collect triggered" "Collect triggered"
) )
or diag( or diag(
@@ -304,7 +304,7 @@ is(
$output = `cat $log_file 2>/dev/null`; $output = `cat $log_file 2>/dev/null`;
like( like(
$output, $output,
qr/Check results: Aborted_connects=|variable=Aborted_connects/, qr/Check results: status\(Aborted_connects\)=|variable=Aborted_connects/,
"Read default config file" "Read default config file"
); );