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

PMM-1455 Tests added

Browse Source
This commit is contained in:
Carlos Salguero
2018-02-08 13:07:13 -03:00
parent 56f97843f1
commit 943cb68ee0
5 changed files with 28 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
bin/pt-online-schema-change
View File

@@ -4281,7 +4281,8 @@ sub recurse_to_slaves {
PTDEBUG && _d('Connected to', $dp->as_string($slave_dsn));
};
if ( $EVAL_ERROR ) {
print STDERR "Cannot connect to ", $dp->as_string($slave_dsn), "\n"
#TODO REMOVE DEBUG
print STDERR "1> Cannot connect to ", $dp->as_string($slave_dsn), "\n"
or die "Cannot print: $OS_ERROR";
return;
}
@@ -8693,7 +8694,8 @@ sub main {
# to stop lagging. If any replica is stopped, the tool
# waits forever until the replica is started."
# https://bugs.launchpad.net/percona-toolkit/+bug/1402051
PTDEBUG && _d('Cannot connect to', $cxn->name(), ':',
#TODO REMOVE DEBUG
PTDEBUG && _d('2> Cannot connect to', $cxn->name(), ':',
$EVAL_ERROR);
# Make ReplicaLagWaiter::wait() report slave is stopped.
return undef;
@@ -9134,7 +9136,8 @@ sub main {
}
};
if ( $slaves && scalar @$slaves ) {
my $table_is_replicated;
if ( $slaves && scalar @$slaves && $table_is_replicated) {
foreach my $slave (@$slaves) {
my ($pr, $pr_first_report);
if ( $o->get('progress') ) {
@@ -12843,7 +12846,7 @@ Default character set.
=item * D
dsn: database; copy: yes
dsn: database; copy: no
Database for the old and new table.

29
t/pt-online-schema-change/pt-1455.t
View File

@@ -41,20 +41,15 @@ my @args = (qw(--set-vars innodb_lock_wait_timeout=3));
my $output;
my $exit_status;
# $sb->load_file('master3', "t/pt-online-schema-change/samples/pt-244.sql");
$slave1_dbh->do("STOP SLAVE");
$slave1_dbh->do("CHANGE REPLICATION FILTER REPLICATE_IGNORE_DB = (ignored_db)");
$slave1_dbh->do("START SLAVE");
$master_dbh->do("DROP DATABASE IF EXISTS ignored_db");
$master_dbh->do("CREATE DATABASE ignored_db");
$master_dbh->do("CREATE TABLE ignored_db.t1 (id int, f2 int) ENGINE=InnoDB");
$sb->load_file('slave1', "t/pt-online-schema-change/samples/pt-1455_slave.sql");
$sb->load_file('slave2', "t/pt-online-schema-change/samples/pt-1455_slave.sql");
$sb->load_file('master', "t/pt-online-schema-change/samples/pt-1455_master.sql");
my $num_rows = 1000;
my $master_port = $Sandbox::port_for{master};
diag("Loading $num_rows into the table. This might take some time.");
diag(`util/mysql_random_data_load_linux_amd64 --host=127.1 --port=$master_port --user=msandbox --password=msandbox test t3 $num_rows`);
diag(`util/mysql_random_data_load_linux_amd64 --host=127.1 --port=$master_port --user=msandbox --password=msandbox ignored_db t1 $num_rows`);
diag("$num_rows rows loaded. Starting tests.");
$master_dbh->do("FLUSH TABLES");
@@ -63,28 +58,25 @@ my $new_dir='/tmp/tdir';
diag(`rm -rf $new_dir`);
diag(`mkdir $new_dir`);
diag("2");
($output, $exit_status) = full_output(
sub { pt_online_schema_change::main(@args, "$master_dsn,D=test,t=t3",
sub { pt_online_schema_change::main(@args, "$master_dsn,D=ignored_db,t=t1",
'--execute',
'--alter', "engine=innodb",
'--data-dir', $new_dir,
),
},
stderr => 1,
);
diag("3");
is(
$exit_status,
0,
"PT-244 Successfully altered. Exit status = 0",
"PT-1455 Successfully altered. Exit status = 0",
);
like(
$output,
qr/Successfully altered/s,
"PT-244 Got successfully altered message.",
"PT-1455 Got successfully altered message.",
);
@@ -96,15 +88,14 @@ closedir $dh;
is(
scalar @files,
4,
"PT-224 Number of files is correct",
"PT-1455 Number of files is correct",
);
$dbh3->do("DROP DATABASE IF EXISTS test");
$master_dbh->do("DROP DATABASE IF EXISTS ignored_db");
# #############################################################################
# Done.
# #############################################################################
$sb->wipe_clean($dbh3);
diag(`$trunk/sandbox/stop-sandbox $master3_port >/dev/null`);
$sb->wipe_clean($master_dbh);
ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox");
done_testing;

6
t/pt-online-schema-change/samples/pt-1455_master.sql Normal file
View File

@@ -0,0 +1,6 @@
DROP DATABASE IF EXISTS employees;
CREATE DATABASE employees;
CREATE TABLE employees.t1 (
id INT AUTO_INCREMENT PRIMARY KEY,
f2 INT
) ENGINE=InnoDB;

4
t/pt-online-schema-change/samples/pt-1455_slave.sql Normal file
View File

@@ -0,0 +1,4 @@
STOP SLAVE;
CHANGE REPLICATION FILTER REPLICATE_WILD_IGNORE_TABLE = ('employees.%');
RESET SLAVE;
START SLAVE;

2
util/check-load-data
View File

@@ -44,7 +44,7 @@ $dbh->do("CREATE TABLE IF NOT EXISTS percona_test.load_data (i int)");
`echo 1 > /tmp/load_data_test.$$`;
eval {
$dbh->do("LOAD DATA LOCAL INFILE '/tmp/load_data_test.$$' INTO TABLE percona_test.load_data");
$dbh->do("LOAD DATA INFILE '/tmp/load_data_test.$$' INTO TABLE percona_test.load_data");
};
if ( $EVAL_ERROR ) {