percona/percona-toolkit
1
0
Fork 0
mirror of https://github.com/percona/percona-toolkit.git synced 2025-09-28 17:15:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

PT-2340 - Support MySQL 8.4

Browse Source 
- Updated modules and tests for pt-query-digest, pt-show-grants, pt-slave-delay, pt-slave-find, pt-slave-restart, pt-stalk, pt-summary, pt-table-checksum
This commit is contained in:
Sveta Smirnova
2024-07-30 18:35:36 +03:00
parent 76c1202cb5
commit d02355f89b
94 changed files with 2930 additions and 2306 deletions
Download Patch File Download Diff File Expand all files Collapse all files

62
t/pt-table-checksum/privs.t
View File

@@ -12,8 +12,8 @@ use English qw(-no_match_vars);
use Test::More;
# Hostnames make testing less accurate. Tests need to see
# that such-and-such happened on specific slave hosts, but
# the sandbox servers are all on one host so all slaves have
# that such-and-such happened on specific replica hosts, but
# the sandbox servers are all on one host so all replicas have
# the same hostname.
$ENV{PERCONA_TOOLKIT_TEST_USE_DSN_NAMES} = 1;
@@ -26,23 +26,23 @@ require "$trunk/bin/pt-table-checksum";
my $dp = new DSNParser(opts=>$dsn_opts);
my $sb = new Sandbox(basedir => '/tmp', DSNParser => $dp);
my $master_dbh = $sb->get_dbh_for('master');
my $slave1_dbh = $sb->get_dbh_for('slave1');
my $slave2_dbh = $sb->get_dbh_for('slave2');
my $source_dbh = $sb->get_dbh_for('source');
my $replica1_dbh = $sb->get_dbh_for('replica1');
my $replica2_dbh = $sb->get_dbh_for('replica2');
if ( !$master_dbh ) {
plan skip_all => 'Cannot connect to sandbox master';
if ( !$source_dbh ) {
plan skip_all => 'Cannot connect to sandbox source';
}
elsif ( !$slave1_dbh ) {
plan skip_all => 'Cannot connect to sandbox slave1';
elsif ( !$replica1_dbh ) {
plan skip_all => 'Cannot connect to sandbox replica1';
}
elsif ( !@{$master_dbh->selectall_arrayref("show databases like 'sakila'")} ) {
elsif ( !@{$source_dbh->selectall_arrayref("show databases like 'sakila'")} ) {
plan skip_all => 'sakila database is not loaded';
}
# The sandbox servers run with lock_wait_timeout=3 and it's not dynamic
# so we need to specify --set-vars innodb_lock_wait_timeout=3 else the tool will die.
my $master_dsn = 'h=127.1,P=12345';
my $source_dsn = 'h=127.1,P=12345,s=1';
my @args = (qw(--set-vars innodb_lock_wait_timeout=3));
my $row;
my $output;
@@ -54,13 +54,13 @@ my $sample = "t/pt-table-checksum/samples/";
# https://bugs.launchpad.net/percona-toolkit/+bug/950294
# ############################################################################
$master_dbh->do("DROP DATABASE IF EXISTS percona");
$source_dbh->do("DROP DATABASE IF EXISTS percona");
diag(`/tmp/12345/use -u root < $trunk/t/lib/samples/ro-checksum-user.sql 2>/dev/null`);
PerconaTest::wait_for_table($slave2_dbh, "mysql.user", "user='ro_checksum_user'");
PerconaTest::wait_for_table($replica2_dbh, "mysql.user", "user='ro_checksum_user'");
$output = output(
sub { $exit_status = pt_table_checksum::main(@args,
"$master_dsn,u=ro_checksum_user,p=msandbox",
"$source_dsn,u=ro_checksum_user,p=msandbox",
qw(--recursion-method none)
) },
stderr => 1,
@@ -74,7 +74,7 @@ like(
$output = output(
sub { pt_table_checksum::main(@args,
"$master_dsn,u=ro_checksum_user,p=msandbox",
"$source_dsn,u=ro_checksum_user,p=msandbox",
qw(--recursion-method none --no-create-replicate-table)
) },
stderr => 1,
@@ -89,29 +89,29 @@ like(
diag(`/tmp/12345/use -u root -e "drop user 'ro_checksum_user'\@'%'"`);
wait_until(
sub {
my $rows=$slave2_dbh->selectall_arrayref("SELECT user FROM mysql.user");
my $rows=$replica2_dbh->selectall_arrayref("SELECT user FROM mysql.user");
return !grep { ($_->[0] || '') eq 'ro_checksum_user' } @$rows;
}
);
# ############################################################################
# --recursion-method=none to avoid SHOW SLAVE HOSTS
# --recursion-method=none to avoid SHOW REPLICA HOSTS
# https://bugs.launchpad.net/percona-toolkit/+bug/987694
# ############################################################################
# Create percona.checksums because ro_checksum_user doesn't have the privs.
pt_table_checksum::main(@args,
"$master_dsn,u=msandbox,p=msandbox",
"$source_dsn,u=msandbox,p=msandbox",
qw(-t sakila.country --quiet --quiet));
diag(`/tmp/12345/use -u root < $trunk/t/lib/samples/ro-checksum-user.sql 2>/dev/null`);
PerconaTest::wait_for_table($slave1_dbh, "mysql.tables_priv", "user='ro_checksum_user'");
PerconaTest::wait_for_table($replica1_dbh, "mysql.tables_priv", "user='ro_checksum_user'");
$output = output(
sub { $exit_status = pt_table_checksum::main(@args,
"$master_dsn,u=ro_checksum_user,p=msandbox",
"$source_dsn,u=ro_checksum_user,p=msandbox",
# Comment out this line and the tests fail because ro_checksum_user
# doesn't have privs to SHOW SLAVE HOSTS. This proves that
# doesn't have privs to SHOW REPLICA HOSTS. This proves that
# --recursion-method none is working.
qw(--recursion-method none --no-create-replicate-table)
) },
@@ -132,7 +132,7 @@ like(
($output, $exit_status) = full_output(
sub { pt_table_checksum::main(@args,
"$master_dsn,u=ro_checksum_user,p=msandbox",
"$source_dsn,u=ro_checksum_user,p=msandbox",
qw(--recursion-method none)
) }
);
@@ -140,14 +140,14 @@ like(
is(
$exit_status,
0,
"No error if db exists on the master, can't CREATE DATABASE, --no-create-replicate-table was not specified, but the database does exist in all slaves"
"No error if db exists on the source, can't CREATE DATABASE, --no-create-replicate-table was not specified, but the database does exist in all replicas"
);
diag(qx{/tmp/12345/use -u root -e 'DROP TABLE `percona`.`checksums`'});
($output, $exit_status) = full_output(
sub { pt_table_checksum::main(@args,
"$master_dsn,u=ro_checksum_user,p=msandbox",
"$source_dsn,u=ro_checksum_user,p=msandbox",
qw(--recursion-method none --no-create-replicate-table)
) },
);
@@ -160,7 +160,7 @@ like($output,
diag(`/tmp/12345/use -u root -e "drop user 'ro_checksum_user'\@'%'"`);
wait_until(
sub {
my $rows=$slave2_dbh->selectall_arrayref("SELECT user FROM mysql.user");
my $rows=$replica2_dbh->selectall_arrayref("SELECT user FROM mysql.user");
return !grep { ($_->[0] || '') eq 'ro_checksum_user' } @$rows;
}
);
@@ -172,9 +172,15 @@ diag(`/tmp/12345/use -u root < $trunk/t/pt-table-checksum/samples/privs-bug-9161
$output = output(
sub { $exit_status = pt_table_checksum::main(@args,
"$master_dsn,u=test_user,p=foo", qw(-t sakila.country)) },
"$source_dsn,u=test_user,p=foo", qw(-t sakila.country)) },
);
is(
$exit_status,
0,
"test_user privs work (bug 916168) returned no error"
) or diag($exit_status);
is(
PerconaTest::count_checksum_results($output, 'rows'),
109,
@@ -184,7 +190,7 @@ is(
diag(`/tmp/12345/use -u root -e "drop user 'test_user'\@'%'"`);
wait_until(
sub {
my $rows=$slave2_dbh->selectall_arrayref("SELECT user FROM mysql.user");
my $rows=$replica2_dbh->selectall_arrayref("SELECT user FROM mysql.user");
return !grep { ($_->[0] || '') eq 'test_user' } @$rows;
}
);
@@ -192,7 +198,7 @@ wait_until(
# #############################################################################
# Done.
# #############################################################################
$sb->wipe_clean($master_dbh);
$sb->wipe_clean($source_dbh);
ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox");
done_testing;
exit;