mirror of
https://github.com/percona/percona-toolkit.git
synced 2025-09-09 18:30:16 +00:00

* PT-2140 - Update modules in the main branch Updated modules for: - pt-align - pt-archiver - pt-config-diff - pt-deadlock-logger - pt-diskstats - pt-duplicate-key-checker - pt-fifo-split - pt-find - pt-fingerprint - pt-fk-error-logger - pt-heartbeat - pt-index-usage - pt-ioprofile - pt-kill - pt-mext - pt-mysql-summary - pt-online-schema-change - pt-pmp - pt-query-digest - pt-show-grants - pt-sift - pt-slave-delay - pt-slave-find - pt-slave-restart - pt-summary - pt-table-sync - pt-upgrade - pt-variable-advisor Added execute bit for pt-query-digest * PT-2140 Update modules in the main branch Fixed Daemon.pm plugin usage Updated all tests, related to the Daemon plugin. I intentionally did not fix failing tests, not related to Daemon plugin, to avoid making this PR too big. - bin/pt-archiver - PT-2141 - Fixed usage of Daemon.pm - PT-2141 - Updated t/pt-archiver/standard_options.t - bin/pt-deadlock-logger - PT-2143 - Fixed usage of Daemon.pm - PT-2143 - Updated t/pt-deadlock-logger/standard_options.t - bin/pt-fifo-split - PT-2144 - Fixed usage of Daemon.pm - PT-2144 - Updated t/pt-fifo-split/pt-fifo-split.t - bin/pt-find - PT-2145 - Fixed usage of Daemon.pm - PT-2145 - Updated t/pt-find/pt-find.t - bin/pt-fk-error-logger - PT-2146 - Fixed usage of Daemon.pm - PT-2146 - Updated t/pt-fk-error-logger/basics.t - bin/pt-heartbeat - PT-2147 - Fixed usage of Daemon.pm - PT-2147 - Updated t/pt-heartbeat/standard_options.t, t/pt-heartbeat/basics.t - bin/pt-kill - PT-2148 - Fixed usage of Daemon.pm - PT-2148 - Updated t/pt-kill/standard_options.t - bin/pt-show-grants - PT-2152 - Fixed usage of Daemon.pm - PT-2152 - Updated t/pt-show-grants/standard_options.t - bin/pt-slave-delay - Fixed usage of Daemon.pm - Updated t/pt-slave-delay/standard_options.t - bin/pt-slave-find - PT-2153 - Fixed usage of Daemon.pm - PT-2153 -Updated t/pt-slave-find/pt-slave-find.t - bin/pt-slave-restart - Fixed usage of Daemon.pm - Updated t/pt-slave-restart/pt-slave-restart.t - bin/pt-table-sync - PT-2154 - Fixed usage of Daemon.pm - PT-2154 -Updated t/pt-table-sync/standard_options.t
154 lines
3.7 KiB
Perl
154 lines
3.7 KiB
Perl
#!/usr/bin/env perl
|
|
|
|
BEGIN {
|
|
die "The PERCONA_TOOLKIT_BRANCH environment variable is not set.\n"
|
|
unless $ENV{PERCONA_TOOLKIT_BRANCH} && -d $ENV{PERCONA_TOOLKIT_BRANCH};
|
|
unshift @INC, "$ENV{PERCONA_TOOLKIT_BRANCH}/lib";
|
|
};
|
|
|
|
use strict;
|
|
use warnings FATAL => 'all';
|
|
use English qw(-no_match_vars);
|
|
use Test::More;
|
|
|
|
use PerconaTest;
|
|
use Sandbox;
|
|
require "$trunk/bin/pt-deadlock-logger";
|
|
|
|
my $dp = new DSNParser(opts=>$dsn_opts);
|
|
my $sb = new Sandbox(basedir => '/tmp', DSNParser => $dp);
|
|
my $dbh = $sb->get_dbh_for('master');
|
|
|
|
if ( !$dbh ) {
|
|
plan skip_all => 'Cannot connect to sandbox master';
|
|
}
|
|
|
|
my $output;
|
|
my $dsn = $sb->dsn_for('master');
|
|
my @args = ($dsn, qw(--iterations 1));
|
|
|
|
$sb->wipe_clean($dbh);
|
|
$sb->create_dbs($dbh, ['test']);
|
|
|
|
# #############################################################################
|
|
# Issue 248: Add --user, --pass, --host, etc to all tools
|
|
# #############################################################################
|
|
|
|
# Test that source DSN inherits from --user, etc.
|
|
$output = output(
|
|
sub {
|
|
pt_deadlock_logger::main(
|
|
"h=127.1,D=test,u=msandbox,p=msandbox",
|
|
qw(--clear-deadlocks test.make_deadlock --port 12345),
|
|
qw(--iterations 1)
|
|
)
|
|
}
|
|
);
|
|
|
|
unlike(
|
|
$output,
|
|
qr/failed/,
|
|
'Source DSN inherits from standard connection options (issue 248)'
|
|
);
|
|
|
|
# #############################################################################
|
|
# Issue 391: Add --pid option to all scripts
|
|
# #############################################################################
|
|
|
|
my $pid_file = "/tmp/pt-deadlock-logger-test.pid.$PID";
|
|
diag(`touch $pid_file`);
|
|
|
|
$output = output(
|
|
sub {
|
|
pt_deadlock_logger::main(@args, '--pid', $pid_file)
|
|
},
|
|
stderr => 1,
|
|
);
|
|
|
|
like(
|
|
$output,
|
|
qr{PID file $pid_file exists},
|
|
'Dies if PID file already exists (--pid without --daemonize) (issue 391)'
|
|
);
|
|
|
|
unlink $pid_file if -f $pid_file;
|
|
|
|
# #############################################################################
|
|
# Check daemonization
|
|
# #############################################################################
|
|
$dbh->do('USE test');
|
|
$dbh->do('DROP TABLE IF EXISTS deadlocks');
|
|
$sb->load_file('master', 't/pt-deadlock-logger/samples/deadlocks_tbl.sql', 'test');
|
|
|
|
$output = `$trunk/bin/pt-deadlock-logger $dsn --dest D=test,t=deadlocks --daemonize --run-time 10 --interval 1 --pid $pid_file 1>/dev/null 2>/dev/null`;
|
|
|
|
#REMOVEME
|
|
`echo "test 3" >>/tmp/REMOVEME`;
|
|
PerconaTest::wait_for_files($pid_file);
|
|
|
|
$output = `ps x | grep 'pt-deadlock-logger $dsn' | grep -v grep`;
|
|
like(
|
|
$output,
|
|
qr/\Qpt-deadlock-logger $dsn/,
|
|
'It lives daemonized'
|
|
) or diag($output);
|
|
|
|
#REMOVEME
|
|
`echo "test 4" >>/tmp/REMOVEME`;
|
|
my ($pid) = $output =~ /(\d+)/;
|
|
|
|
ok(
|
|
-f $pid_file,
|
|
'PID file created'
|
|
) or diag($output);
|
|
|
|
chomp($output = slurp_file($pid_file));
|
|
is(
|
|
$output,
|
|
$pid,
|
|
'PID file has correct PID'
|
|
);
|
|
|
|
# Kill it
|
|
kill 2, $pid;
|
|
PerconaTest::wait_until(sub { !kill 0, $pid });
|
|
ok(! -f $pid_file, 'PID file removed');
|
|
|
|
# Check that it won't run if the PID file already exists (issue 383).
|
|
diag(`touch $pid_file`);
|
|
ok(
|
|
-f $pid_file,
|
|
'PID file already exists'
|
|
);
|
|
|
|
$output = output(
|
|
sub {
|
|
pt_deadlock_logger::main(@args, '--pid', $pid_file,
|
|
qw(--daemonize))
|
|
},
|
|
stderr => 1,
|
|
);
|
|
|
|
like(
|
|
$output,
|
|
qr/PID file $pid_file exists/,
|
|
'Does not run if PID file already exists'
|
|
);
|
|
|
|
$output = `ps x | grep 'pt-deadlock-logger $dsn' | grep -v grep`;
|
|
|
|
is(
|
|
$output,
|
|
"",
|
|
'It does not lived daemonized'
|
|
);
|
|
|
|
unlink $pid_file;
|
|
|
|
# #############################################################################
|
|
# Done.
|
|
# #############################################################################
|
|
$sb->wipe_clean($dbh);
|
|
ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox");
|
|
done_testing;
|