PT-2340 - Support MySQL 8.4

- Created pt-replica-restart. pt-slave-restart kept as symbolic link

t/pt-replica-restart/deprecation.t

@@ -0,0 +1,37 @@
+#!/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;
+require "$trunk/bin/pt-replica-restart";
+
+my $output;
+my $cnf = '/tmp/12346/my.sandbox.cnf';
+my $cmd = "$trunk/bin/pt-replica-restart -F $cnf h=127.1";
+my $legacy_cmd = "$trunk/bin/pt-slave-restart -F $cnf h=127.1";
+
+$output = `$cmd --help 2>&1`;
+unlike(
+   $output, 
+   qr/pt-slave-restart is a link to pt-replica-restart/, 
+   'Deprecation warning not printed for pt-replica-restart'
+);
+
+$output = `$legacy_cmd --help 2>&1`;
+like(
+   $output, 
+   qr/pt-slave-restart is a link to pt-replica-restart/, 
+   'Deprecation warning printed for pt-slave-restart'
+);
+
+done_testing();
+exit;

t/pt-replica-restart/gtid.t

@@ -14,7 +14,7 @@ use Data::Dumper;
 
 use PerconaTest;
 use Sandbox;
-require "$trunk/bin/pt-slave-restart";
+require "$trunk/bin/pt-replica-restart";
 
 if ( $sandbox_version lt '5.6' ) {
    plan skip_all => "Requires MySQL 5.6";
@@ -45,7 +45,7 @@ my $replica2_dsn = $sb->dsn_for("replica2");
 
 my $pid_file = "/tmp/pt-replica-restart-test-$PID.pid";
 my $log_file = "/tmp/pt-replica-restart-test-$PID.log";
-my $cmd      = "$trunk/bin/pt-slave-restart --daemonize --run-time 5 --max-sleep 0.25 --pid $pid_file --log $log_file";
+my $cmd      = "$trunk/bin/pt-replica-restart --daemonize --run-time 5 --max-sleep 0.25 --pid $pid_file --log $log_file";
 
 sub start {
    my ( $extra ) = @_;
@@ -56,9 +56,9 @@ sub start {
 
 sub stop() {
    return 1 if !is_running();
-   diag(`$trunk/bin/pt-slave-restart --stop -q >/dev/null 2>&1 &`);
+   diag(`$trunk/bin/pt-replica-restart --stop -q >/dev/null 2>&1 &`);
    wait_until(sub { !-f $pid_file }, 0.3, 2);
-   diag(`rm -f /tmp/pt-slave-restart-sentinel`);
+   diag(`rm -f /tmp/pt-replica-restart-sentinel`);
    return is_running() ? 0 : 1;
 }
 
@@ -112,9 +112,9 @@ wait_repl_broke($replica1_dbh) or die "Failed to break replication";
 my $r = $replica1_dbh->selectrow_hashref("show ${replica_name} status");
 like($r->{last_error}, qr/Table 'test.t' doesn't exist'/, 'replica: Replication broke');
 
-# Start pt-slave-restart and wait up to 5s for it to fix replication
+# Start pt-replica-restart and wait up to 5s for it to fix replication
 # (it should take < 1s but tests can be really slow sometimes).
-start("$replica1_dsn") or die "Failed to start pt-slave-restart";
+start("$replica1_dsn") or die "Failed to start pt-replica-restart";
 wait_repl_ok($replica1_dbh);
 
 # Check if replication is fixed.
@@ -125,8 +125,8 @@ like(
    'Event is skipped',
 ) or BAIL_OUT("Replication is broken");
 
-# Stop pt-slave-restart.
-stop() or die "Failed to stop pt-slave-restart";
+# Stop pt-replica-restart.
+stop() or die "Failed to stop pt-replica-restart";
 
 # #############################################################################
 # Test the replica of the source.
@@ -160,7 +160,7 @@ like(
    'Skips event from source on replica2'
 ) or BAIL_OUT("Replication is broken");
 
-stop() or die "Failed to stop pt-slave-restart";
+stop() or die "Failed to stop pt-replica-restart";
 
 # #############################################################################
 # Test skipping 2 events in a row.
@@ -195,7 +195,7 @@ like(
    'Skips multiple events'
 ) or BAIL_OUT("Replication is broken");
 
-stop() or die "Failed to stop pt-slave-restart";
+stop() or die "Failed to stop pt-replica-restart";
 
 # #############################################################################
 # Done.

t/pt-replica-restart/gtid_parallelreplication.t

@@ -13,7 +13,7 @@ use Test::More;
 
 use PerconaTest;
 use Sandbox;
-require "$trunk/bin/pt-slave-restart";
+require "$trunk/bin/pt-replica-restart";
 
 if ( $sandbox_version lt '5.6' ) {
    plan skip_all => 'MySQL Version ' . $sandbox_version 
@@ -42,15 +42,15 @@ elsif ( !$replica2_dbh ) {
 }
 
 # #############################################################################
-# pt-slave-restart should exit!
+# pt-replica-restart should exit!
 # #############################################################################
 # Start an instance
-my $output=`$trunk/bin/pt-slave-restart --run-time=1s -h 127.0.0.1 -P 12346 -u msandbox -p msandbox 2>&1`;
+my $output=`$trunk/bin/pt-replica-restart --run-time=1s -h 127.0.0.1 -P 12346 -u msandbox -p msandbox 2>&1`;
 
 like(
    $output,
    qr/Cannot skip transactions properly.*${replica_name}_parallel_workers/,
-   "pt-slave-restart exits with multiple replication threads"
+   "pt-replica-restart exits with multiple replication threads"
 ) or diag($output);
 
 # #############################################################################

t/pt-replica-restart/pt-replica-restart.t

@@ -0,0 +1,146 @@
+#!/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-replica-restart";
+
+diag('Restarting the sandbox');
+diag(`SAKILA=0 REPLICATION_THREADS=0 GTID=1 $trunk/sandbox/test-env restart`);
+diag("Sandbox restarted");
+
+my $dp = new DSNParser(opts=>$dsn_opts);
+my $sb = new Sandbox(basedir => '/tmp', DSNParser => $dp);
+my $source_dbh = $sb->get_dbh_for('source');
+my $replica_dbh  = $sb->get_dbh_for('replica1');
+
+if ( !$source_dbh ) {
+   plan skip_all => 'Cannot connect to sandbox source';
+}
+elsif ( !$replica_dbh ) {
+   plan skip_all => 'Cannot connect to sandbox replica';
+}
+
+$source_dbh->do('DROP DATABASE IF EXISTS test');
+$source_dbh->do('CREATE DATABASE test');
+$source_dbh->do('CREATE TABLE test.t (a INT)');
+$sb->wait_for_replicas;
+
+# Bust replication
+$replica_dbh->do('DROP TABLE test.t');
+$source_dbh->do('INSERT INTO test.t SELECT 1');
+wait_until(
+   sub {
+      my $row = $replica_dbh->selectrow_hashref("show ${replica_name} status");
+      return $row->{last_sql_errno};
+   }
+);
+
+my $r = $replica_dbh->selectrow_hashref("show ${replica_name} status");
+like($r->{last_error}, qr/Table 'test.t' doesn't exist'/, 'It is busted');
+
+# Start an instance
+diag(`$trunk/bin/pt-replica-restart --max-sleep 0.25 -h 127.0.0.1 -P 12346 -u msandbox -p msandbox --daemonize --pid /tmp/pt-replica-restart.pid --log /tmp/pt-replica-restart.log`);
+my $output = `ps x | grep 'pt-replica-restart \-\-max\-sleep ' | grep -v grep | grep -v pt-replica-restart.t`;
+like($output, qr/pt-replica-restart --max/, 'It lives');
+
+unlike($output, qr/Table 'test.t' doesn't exist'/, 'It is not busted');
+
+ok(-f '/tmp/pt-replica-restart.pid', 'PID file created');
+ok(-f '/tmp/pt-replica-restart.log', 'Log file created');
+
+my ($pid) = $output =~ /^\s*(\d+)\s+/;
+$output = `cat /tmp/pt-replica-restart.pid`;
+chomp($output);
+is($output, $pid, 'PID file has correct PID');
+
+diag(`$trunk/bin/pt-replica-restart --stop -q`);
+sleep 1;
+$output = `ps -eaf | grep pt-replica-restart | grep -v grep`;
+unlike($output, qr/pt-replica-restart --max/, 'It is dead');
+
+diag(`rm -f /tmp/pt-replica-re*`);
+ok(! -f '/tmp/pt-replica-restart.pid', 'PID file removed');
+
+# #############################################################################
+# Issue 118: pt-replica-restart --error-numbers option is broken
+# #############################################################################
+$output = `$trunk/bin/pt-replica-restart --stop --sentinel /tmp/pt-replica-restartup --error-numbers=1205,1317`;
+like($output, qr{Successfully created file /tmp/pt-replica-restartup}, '--error-numbers works (issue 118)');
+
+diag(`rm -f /tmp/pt-replica-re*`);
+
+# #############################################################################
+# Issue 459: mk-slave-restart --error-text is broken
+# #############################################################################
+# Bust replication again.  At this point, the source has test.t but
+# the replica does not.
+$source_dbh->do('DROP TABLE IF EXISTS test.t');
+$source_dbh->do('CREATE TABLE test.t (a INT)');
+sleep 1;
+$replica_dbh->do('DROP TABLE test.t');
+$source_dbh->do('INSERT INTO test.t SELECT 1');
+$output = `/tmp/12346/use -e "show ${replica_name} status"`;
+like(
+   $output,
+   qr/Table 'test.t' doesn't exist'/,
+   'It is busted again'
+);
+
+# Start an instance
+$output = `$trunk/bin/pt-replica-restart --max-sleep 0.25 -h 127.0.0.1 -P 12346 -u msandbox -p msandbox --error-text "doesn't exist" --run-time 1s 2>&1`;
+unlike(
+   $output,
+   qr/Error does not match/,
+   '--error-text works (issue 459)'
+);
+
+# ###########################################################################
+# Issue 391: Add --pid option to all scripts
+# ###########################################################################
+`touch /tmp/pt-script.pid`;
+$output = `$trunk/bin/pt-replica-restart --max-sleep 0.25 -h 127.0.0.1 -P 12346 -u msandbox -p msandbox --pid /tmp/pt-script.pid 2>&1`;
+like(
+   $output,
+   qr{PID file /tmp/pt-script.pid exists},
+   'Dies if PID file already exists (--pid without --daemonize) (issue 391)'
+);
+`rm -rf /tmp/pt-script.pid`;
+
+# #############################################################################
+# Issue 662: Option maxlength does not exist
+# #############################################################################
+my $ret = system("$trunk/bin/pt-replica-restart -h 127.0.0.1 -P 12346 -u msandbox -p msandbox --monitor --stop --max-sleep 1 --run-time 1 >/dev/null 2>&1");
+is(
+   $ret >> 8,
+   0,
+   "--monitor --stop doesn't cause error"
+);
+
+# #############################################################################
+#  Issue 673: Use of uninitialized value in numeric gt (>)
+# #############################################################################
+$output = `$trunk/bin/pt-replica-restart --monitor  --error-numbers 1205,1317 --quiet -F /tmp/12346/my.sandbox.cnf  --run-time 1 2>&1`;
+is(
+   $output,
+   '',
+   'No error with --quiet (issue 673)'
+);
+
+# #############################################################################
+# Done.
+# #############################################################################
+diag(`rm -f /tmp/pt-replica-re*`);
+diag(`$trunk/sandbox/test-env restart`);
+ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox");
+done_testing;

t/pt-replica-restart/pt-slave-restart.t

@@ -131,6 +131,7 @@ is(
 #  Issue 673: Use of uninitialized value in numeric gt (>)
 # #############################################################################
 $output = `$trunk/bin/pt-slave-restart --monitor  --error-numbers 1205,1317 --quiet -F /tmp/12346/my.sandbox.cnf  --run-time 1 2>&1`;
+$output =~ s/pt-slave-restart is a link to pt-replica-restart.\nThis file name is deprecated and will be removed in future releases. Use pt-replica-restart instead.\n\n//;
 is(
    $output,
    '',