PT-2340 - Support MySQL 8.4

- Updated modules and tests for pt-table-sync, pt-table-usage, pt-upgrade, pt-variable-advisor
This commit is contained in:
Sveta Smirnova
2024-08-03 17:03:48 +03:00
parent 56599f01ad
commit a38bee6d60
69 changed files with 1442 additions and 1304 deletions

View File

@@ -21,40 +21,40 @@ my $sb = new Sandbox(basedir => '/tmp', DSNParser => $dp);
plan tests => 4;
# #############################################################################
# Ensure that syncing master-master works OK
# Ensure that syncing source-source works OK
# #############################################################################
# Start up 12348 <-> 12349
diag('Starting master-master servers...');
#diag(`$trunk/sandbox/start-sandbox master-master 12348 12349 >/dev/null`);
diag(`$trunk/sandbox/start-sandbox master-master 12348 12349`);
my $master1_dbh = $sb->get_dbh_for('master1');
my $master2_dbh = $sb->get_dbh_for('master2');
diag('Starting source-source servers...');
#diag(`$trunk/sandbox/start-sandbox source-source 12348 12349 >/dev/null`);
diag(`$trunk/sandbox/start-sandbox source-source 12348 12349`);
my $source1_dbh = $sb->get_dbh_for('source1');
my $source2_dbh = $sb->get_dbh_for('source2');
# Load some tables and data (on both, since they're master-master).
$master1_dbh->do("CREATE DATABASE test");
$sb->load_file("master1", "t/pt-table-sync/samples/before.sql");
$sb->wait_for_slaves();
$sb->wait_for_slaves(
master => 'master1',
slave => 'master2',
# Load some tables and data (on both, since they're source-source).
$source1_dbh->do("CREATE DATABASE test");
$sb->load_file("source1", "t/pt-table-sync/samples/before.sql");
$sb->wait_for_replicas();
$sb->wait_for_replicas(
source => 'source1',
replica => 'source2',
);
# Make master2 different from master1. So master2 has the _correct_ data,
# and the sync below will make master1 have that data too.
$master2_dbh->do("set sql_log_bin=0");
$master2_dbh->do("update test.test1 set b='mm' where a=1");
$master2_dbh->do("set sql_log_bin=1");
# Make source2 different from source1. So source2 has the _correct_ data,
# and the sync below will make source1 have that data too.
$source2_dbh->do("set sql_log_bin=0");
$source2_dbh->do("update test.test1 set b='mm' where a=1");
$source2_dbh->do("set sql_log_bin=1");
# This will make master1's data match the changed, correcct data on master2
# (that is _not_ a typo). The sync direction is therefore master2 -> master1
# because, given the command below, the given host master1 and with
# --sync-to-master that makes master2 "the" master with the correct data.
# This will make source1's data match the changed, correcct data on source2
# (that is _not_ a typo). The sync direction is therefore source2 -> source1
# because, given the command below, the given host source1 and with
# --sync-to-source that makes source2 "the" source with the correct data.
my $exit_status = 0;
my $output = output(
sub {
$exit_status = pt_table_sync::main(
qw(--no-check-slave --sync-to-master --print --execute),
qw(--no-check-replica --sync-to-source --print --execute),
"h=127.0.0.1,P=12348,u=msandbox,p=msandbox,D=test,t=test1")
},
);
@@ -75,15 +75,15 @@ like(
);
PerconaTest::wait_for_table($master1_dbh, "test.test1", "a=1 and b='mm'");
my $rows = $master1_dbh->selectall_arrayref("SELECT * FROM test.test1");
PerconaTest::wait_for_table($source1_dbh, "test.test1", "a=1 and b='mm'");
my $rows = $source1_dbh->selectall_arrayref("SELECT * FROM test.test1");
is_deeply(
$rows,
[ [1, 'mm'], [2, 'ca'] ],
"Diff row synced on master1"
"Diff row synced on source1"
);
diag('Stopping master-master servers...');
diag('Stopping source-source servers...');
diag(`$trunk/sandbox/stop-sandbox 12348 12349 >/dev/null`);
# #############################################################################