From 4612cb2b97810248110d3ef93756302c1bddd677 Mon Sep 17 00:00:00 2001
From: Sveta Smirnova <sveta.smirnova@percona.com>
Date: Mon, 22 Jul 2024 18:05:14 +0300
Subject: [PATCH 01/31] PT-2340 - Support MySQL 8.4

- Adjusted sandbox scripts, so they can start MySQL 8.4
- Added MySQL 8.4 configuration file
- Removed empty file sandbox/5.6
- Removed unused files sandbox/set-mysql, sandbox/slave_channels_t.sql, sandbox/jenkins-test
- Removed offensive terminology from the sandbox scripts wherever it is possible
---
 sandbox/5.6                                   |   0
 sandbox/gtid_on.sql                           |   4 +-
 sandbox/jenkins-test                          | 147 ------------------
 ...annels.sql => replica_channels-legacy.sql} |   8 +-
 sandbox/servers/8.4/my.sandbox.cnf            |  41 +++++
 sandbox/set-mysql                             |  23 ---
 sandbox/slave_channels_t.sql                  |  15 --
 sandbox/start-sandbox                         |  73 +++++----
 sandbox/test-env                              |  84 ++++++----
 t/lib/MasterSlave.t                           |   8 +-
 t/pt-archiver/archive_using_channels.t        |   4 +-
 t/pt-table-sync/sync_using_channels.t         |   2 +-
 12 files changed, 143 insertions(+), 266 deletions(-)
 delete mode 100644 sandbox/5.6
 delete mode 100755 sandbox/jenkins-test
 rename sandbox/{slave_channels.sql => replica_channels-legacy.sql} (78%)
 create mode 100644 sandbox/servers/8.4/my.sandbox.cnf
 delete mode 100755 sandbox/set-mysql
 delete mode 100644 sandbox/slave_channels_t.sql

diff --git a/sandbox/5.6 b/sandbox/5.6
deleted file mode 100644
index e69de29bb..000000000
diff --git a/sandbox/gtid_on.sql b/sandbox/gtid_on.sql
index f436d19e7..473e59dd1 100644
--- a/sandbox/gtid_on.sql
+++ b/sandbox/gtid_on.sql
@@ -1,6 +1,4 @@
-STOP SLAVE FOR CHANNEL '';
-SET GLOBAL master_info_repository = 'TABLE';
-SET @@GLOBAL.relay_log_info_repository = 'TABLE';
+STOP REPLICA FOR CHANNEL '';
 SET @@GLOBAL.ENFORCE_GTID_CONSISTENCY=ON;
 SET @@GLOBAL.GTID_MODE = OFF_PERMISSIVE;
 SET @@GLOBAL.GTID_MODE = ON_PERMISSIVE;
diff --git a/sandbox/jenkins-test b/sandbox/jenkins-test
deleted file mode 100755
index 0ea75d64e..000000000
--- a/sandbox/jenkins-test
+++ /dev/null
@@ -1,147 +0,0 @@
-#!/bin/sh
-
-# This script is used to do a test run on a Jenkins node.  Jenkins jobs
-# set env vars based on job params (like MYSQL and TEST_CMD) then execute
-# this script which does the rest.  When this script exists, the Jenkins
-# job exists, so if some commands (like check-dev-env) fail, then the
-# Jenkins job will fail too.
-
-##############
-# Set modes. #
-##############
-set +u
-set -e
-set -x
-
-##################################
-# Check for needed Perl modules. #
-##################################
-util/check-dev-env
-
-#########################
-# Check the system env. #
-#########################
-env
-df -h
-w
-whoami
-id
-if [ "$(id -u)" = "0" ]; then
-   echo "Cannot run as root" >&2
-   exit 1
-fi
-
-#####################################
-# Install barebones MySQL binaries. #
-#####################################
-
-if uname -a | grep x86_64 >/dev/null 2>&1; then
-   ARCH="64"
-else
-   ARCH="32"
-fi
-
-APP="${FORK:-"mysql"}"
-
-MYSQL_BIN_DIR="$HOME/mysql-bin"
-[ -d "$MYSQL_BIN_DIR" ] || mkdir "$MYSQL_BIN_DIR"
-
-find_mysql_base_dir() {
-   find "$MYSQL_BIN_DIR" -name "$APP-$1*" -type d | tail -n 1
-}
-
-MYSQL_BASE_DIR="$(find_mysql_base_dir $MYSQL)"
-
-REFETCH_MYSQL="${REFETCH_MYSQL:-""}"
-if [ "$MYSQL_BASE_DIR" -a "$REFETCH_MYSQL" ]; then
-   rm -rf "$MYSQL_BASE_DIR"
-   MYSQL_BASE_DIR=""
-fi
-
-if [ -z "$MYSQL_BASE_DIR" ]; then
-   (
-      cd $MYSQL_BIN_DIR
-      wget -q -O mysql.tar.gz http://10.10.7.145:8000/barebones/$APP/$MYSQL/$ARCH \
-         || exit 1
-	   tar xvfz mysql.tar.gz
-      rm mysql.tar.gz
-   )
-   MYSQL_BASE_DIR="$(find_mysql_base_dir $MYSQL)"
-fi
-
-if [ $APP = "mysql" ]; then
-   mysqld_check="$("$MYSQL_BASE_DIR/bin/mysqld" -V)"
-elif [ $APP = "pxc" ]; then
-   ip="$(perl -MNet::Address::IP::Local -le 'print Net::Address::IP::Local->public')"
-   mysqld_check="$("$MYSQL_BASE_DIR/bin/mysqld" -V --bind-address $ip)"
-else
-   echo "Invalid FORK=$APP" >&2
-   exit 1
-fi
-
-if [ -z "$mysqld_check" ]; then
-   echo "$MYSQL_BASE_DIR/bin/mysqld does not execute" >&2
-   exit 1
-fi
-
-##########################
-# Set required env vars. #
-##########################
-export PERCONA_TOOLKIT_BRANCH="$PWD"
-export PERCONA_TOOLKIT_SANDBOX="$MYSQL_BASE_DIR"
-export PATH="$PATH:/usr/sbin:/usr/local/bin:$MYSQL_BASE_DIR/bin"
-export LANG="en_US.UTF-8"
-export USER="${USER:-"jenkins"}"
-
-# ######################################### #
-# Remove conf files that's shouldn't exist. #
-# ######################################### #
-rm -rf /tmp/pt-*     || true
-rm -rf /tmp/pt_*     || true
-rm -rf /tmp/percona* || true
-rm ~/.pt-*conf*      || true
-rm ~/.my*            || true
-
-#############################
-# Check and start test env. #
-#############################
-sandbox/test-env checkconfig || exit 1
-sandbox/test-env stop        || exit 1
-sandbox/test-env kill        || exit 1
-if [ $APP = "mysql" ]; then
-   sandbox/test-env start || exit 1
-elif [ $APP = "pxc" ]; then
-   sandbox/test-env start cluster || exit 1
-else
-   echo "Invalid FORK=$app" >&2
-   exit 1
-fi
-
-#######################
-# Set debug env vars. #
-#######################
-if [ "$DEBUG_CODE" = "true" ]; then
-   export PTDEBUG=1
-fi
-
-if [ "$DEBUG_TEST" = "true" ]; then
-   export PTDEVDEBUG=1
-fi
-
-##################
-# Run the tests. #
-##################
-EXIT_STATUS=0
-TEST_CMD="${TEST_CMD:-"prove -r t/"}"
-
-(
-   eval $TEST_CMD
-)
-EXIT_STATUS=$(($? | 0))
-
-#############
-# Clean up. #
-#############
-sandbox/test-env stop
-
-exit $EXIT_STATUS
diff --git a/sandbox/slave_channels.sql b/sandbox/replica_channels-legacy.sql
similarity index 78%
rename from sandbox/slave_channels.sql
rename to sandbox/replica_channels-legacy.sql
index 674653f8a..10cd3f634 100644
--- a/sandbox/slave_channels.sql
+++ b/sandbox/replica_channels-legacy.sql
@@ -6,10 +6,10 @@ SET @@GLOBAL.GTID_MODE = OFF_PERMISSIVE;
 SET @@GLOBAL.GTID_MODE = ON_PERMISSIVE;
 SET @@GLOBAL.GTID_MODE = ON;
 
-CHANGE MASTER TO master_host='127.0.0.1', master_port=12345, master_user='msandbox', master_password='msandbox', master_auto_position=1 FOR CHANNEL 'masterchan1';
+CHANGE MASTER TO master_host='127.0.0.1', master_port=12345, master_user='msandbox', master_password='msandbox', master_auto_position=1 FOR CHANNEL 'sourcechan1';
 
-CHANGE MASTER TO master_host='127.0.0.1', master_port=12346, master_user='msandbox', master_password='msandbox', master_auto_position=1 FOR CHANNEL 'masterchan2';
+CHANGE MASTER TO master_host='127.0.0.1', master_port=12346, master_user='msandbox', master_password='msandbox', master_auto_position=1 FOR CHANNEL 'sourcechan2';
 
-START SLAVE for channel 'masterchan1';
-START SLAVE for channel 'masterchan2';
+START SLAVE for channel 'sourcechan1';
+START SLAVE for channel 'sourcechan2';
 
diff --git a/sandbox/servers/8.4/my.sandbox.cnf b/sandbox/servers/8.4/my.sandbox.cnf
new file mode 100644
index 000000000..b8705e035
--- /dev/null
+++ b/sandbox/servers/8.4/my.sandbox.cnf
@@ -0,0 +1,41 @@
+[client]
+user     = msandbox
+password = msandbox
+port     = PORT
+socket   = /tmp/PORT/mysql_sandboxPORT.sock
+
+[mysqld]
+port                       = PORT
+socket                     = /tmp/PORT/mysql_sandboxPORT.sock
+pid-file                   = /tmp/PORT/data/mysql_sandboxPORT.pid
+basedir                    = PERCONA_TOOLKIT_SANDBOX
+datadir                    = /tmp/PORT/data
+general_log
+general_log_file           = genlog
+innodb_buffer_pool_size    = 16M
+innodb_data_file_path      = ibdata1:10M:autoextend
+innodb_data_home_dir       = /tmp/PORT/data
+innodb_lock_wait_timeout   = 3
+innodb_log_file_size       = 5M
+innodb_log_group_home_dir  = /tmp/PORT/data
+key_buffer_size            = 5M
+local-infile               = 1
+log-bin                    = mysql-bin
+log-error                  = /tmp/PORT/data/mysqld.log
+log_replica_updates
+lower_case_table_names     = 0
+relay_log                  = mysql-relay-bin
+report-host                = 127.0.0.1
+report-port                = PORT
+server-id                  = PORT
+slow-query-log             = 1
+slow-query-log-file        = /tmp/PORT/data/slow.log
+log_slow_admin_statements  = 1
+long_query_time            = 0
+
+# fkc test
+binlog_format              = STATEMENT
+#performance_schema         = ON
+#performance-schema-instrument='wait/lock/metadata/sql/mdl=ON'
+#performance-schema-instrument='transaction=ON'
+secure-file-priv           =
diff --git a/sandbox/set-mysql b/sandbox/set-mysql
deleted file mode 100755
index e808aa41b..000000000
--- a/sandbox/set-mysql
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/bin/bash
-
-if [ ! -d "$HOME/mysql-bin" ]; then
-   echo "$HOME/mysql-bin does not exist." >&2
-   exit 1
-fi
-
-VER=$1
-if [ "$VER" ]; then
-   if [ "$VER" != "4.1" -a "$VER" != "5.0" -a "$VER" != "5.1" -a "$VER" != "5.5" -a "$VER" != "5.6" ]; then
-      echo "VERSION must be 4.1, 5.0, 5.1, 5.5, or 5.6.  Or, do not specify a version to select all available versions." >&2
-      exit 1
-   fi
-else
-   VER='';
-fi
-
-select choice in $(ls -d $HOME/mysql-bin/mysql-$VER* | sort -r); do
-   echo "export PERCONA_TOOLKIT_SANDBOX=$choice"
-   break
-done
-
-exit
diff --git a/sandbox/slave_channels_t.sql b/sandbox/slave_channels_t.sql
deleted file mode 100644
index 6354ceba8..000000000
--- a/sandbox/slave_channels_t.sql
+++ /dev/null
@@ -1,15 +0,0 @@
-STOP SLAVE FOR CHANNEL '';
-SET GLOBAL master_info_repository = 'TABLE';
-SET @@GLOBAL.relay_log_info_repository = 'TABLE';
-SET @@GLOBAL.ENFORCE_GTID_CONSISTENCY=ON;
-SET @@GLOBAL.GTID_MODE = OFF_PERMISSIVE;
-SET @@GLOBAL.GTID_MODE = ON_PERMISSIVE;
-SET @@GLOBAL.GTID_MODE = ON;
-
-CHANGE MASTER TO master_host='127.0.0.1', master_port=2900, master_user='msandbox', master_password='msandbox', master_auto_position=1 FOR CHANNEL 'masterchan1';
-
-CHANGE MASTER TO master_host='127.0.0.1', master_port=2901, master_user='msandbox', master_password='msandbox', master_auto_position=1 FOR CHANNEL 'masterchan2';
-
-START SLAVE for channel 'masterchan1';
-START SLAVE for channel 'masterchan2';
-
diff --git a/sandbox/start-sandbox b/sandbox/start-sandbox
index 01ab07de4..9c231997d 100755
--- a/sandbox/start-sandbox
+++ b/sandbox/start-sandbox
@@ -62,13 +62,13 @@ make_sandbox() {
         local cluster_address="gcomm://"
         local listen_port=$(($port + 10))
         local receive_port=$(($port + 20))
-        if [ -n "${master_port}" ]; then
-            local master_listen_port=$(($master_port + 10))
-            cluster_address="gcomm://$ip:$master_listen_port"
+        if [ -n "${source_port}" ]; then
+            local source_listen_port=$(($source_port + 10))
+            cluster_address="gcomm://$ip:$source_listen_port"
 
             local this_listen_port=$(($port + 10))
             local this_cluster_address="gcomm://$ip:$this_listen_port"
-            sed -e "s!gcomm://\$!$this_cluster_address!g" -i.bak "${TMP_DIR}/$master_port/my.sandbox.cnf"
+            sed -e "s!gcomm://\$!$this_cluster_address!g" -i.bak "${TMP_DIR}/$source_port/my.sandbox.cnf"
         fi
 
         sed -e "s/ADDR/$ip/g" -i.bak "${TMP_DIR}/$port/my.sandbox.cnf"
@@ -91,8 +91,8 @@ make_sandbox() {
     if [ -n "$BINLOG_FORMAT" ]; then
         echo "binlog-format=$BINLOG_FORMAT" >> ${TMP_DIR}/$port/my.sandbox.cnf
     fi
-    if [ -n "$SLAVE_EXEC_MODE" ]; then
-        echo "slave_exec_mode=$SLAVE_EXEC_MODE" >> ${TMP_DIR}/$port/my.sandbox.cnf
+    if [ -n "$REPLICA_EXEC_MODE" ]; then
+      echo "${REPLICA_NAME}_exec_mode=$REPLICA_EXEC_MODE" >> ${TMP_DIR}/$port/my.sandbox.cnf
     fi
     if [ -n "$SQL_MODE" ]; then
         echo "sql-mode=$SQL_MODE" >> ${TMP_DIR}/$port/my.sandbox.cnf
@@ -131,7 +131,7 @@ make_sandbox() {
         echo "enforce_gtid_consistency" >> ${TMP_DIR}/$port/my.sandbox.cnf
     fi
     if [ -n "$REPLICATION_THREADS" ]; then
-        echo "slave_parallel_workers=$REPLICATION_THREADS" >> ${TMP_DIR}/$port/my.sandbox.cnf
+        echo "${REPLICA_NAME}_parallel_workers=$REPLICATION_THREADS" >> ${TMP_DIR}/$port/my.sandbox.cnf
     fi
 
     if [ -n "$EXTRA_DEFAULTS_FILE" ]; then
@@ -139,8 +139,8 @@ make_sandbox() {
     fi
 
     if [ $generating_database -eq 0 ]; then
-        # If the sandbox is a slave, set it read_only.
-        if [ "$type" = "slave" ]; then
+        # If the sandbox is a replica, set it read_only.
+        if [ "$type" = "replica" ]; then
             echo "read_only" >> ${TMP_DIR}/$port/my.sandbox.cnf
         fi
     fi
@@ -180,7 +180,7 @@ make_sandbox() {
             echo "FLUSH PRIVILEGES;" >> $init_file
         fi
 
-        if [ "$type" = "slave" ]; then
+        if [ "$type" = "replica" ]; then
             echo "FLUSH TABLES WITH READ LOCK;" >> $init_file
             echo "SET GLOBAL read_only = ON;" >> $init_file
             echo "UNLOCK TABLES;" >> $init_file
@@ -224,11 +224,10 @@ make_sandbox() {
         mysql_upgrade_on ${TMP_DIR}/$port/my.sandbox.cnf
     fi
 
-    # If the sandbox is a slave, start the slave.
-    if [ "$type" = "slave" ]; then
-        #${TMP_DIR}/$port/use -e "change master to master_host='127.0.0.1', master_user='msandbox', master_password='msandbox', master_port=$master_port"
-        ${TMP_DIR}/$port/use -e "change master to master_host='127.0.0.1', master_user='msandbox', master_password='msandbox', master_port=$master_port"
-        ${TMP_DIR}/$port/use -e "start slave"
+    # If the sandbox is a replica, start the replica.
+    if [ "$type" = "replica" ]; then
+        ${TMP_DIR}/$port/use -e "change ${CHANGE_SOURCE_NAME} to ${SOURCE_NAME}_host='127.0.0.1', ${SOURCE_NAME}_user='msandbox', ${SOURCE_NAME}_password='msandbox', ${SOURCE_NAME}_port=$source_port, ${SOURCE_NAME}_SSL=1"
+        ${TMP_DIR}/$port/use -e "start ${REPLICA_NAME}"
     fi
 
     if [ -x "$PERCONA_TOOLKIT_SANDBOX/bin/ps-admin" ]; then
@@ -248,31 +247,31 @@ make_sandbox() {
 # Sanity check the cmd line options.
 # ###########################################################################
 if [ $# -lt 2 ]; then
-    die "Usage: start-sandbox master|slave|master-master port [master port]"
+    die "Usage: start-sandbox source|replica|source-source port [source port]"
 fi
 
-type=$1         # master, slave or master-master
+type=$1         # source, replica or source-source
 port=$2         # sandbox port number, e.g. 12345
-master_port=$3  # master port if slave or master-master
+source_port=$3  # source port if replica or source-source
 enable_tokudb=''
 
 
-if [ "$type" != "master" ] && [ "$type" != "slave" ] && [ "$type" != "master-master" ] && [ "$type" != "cluster" ] && [ "$type" != "channels" ]; then
-    die "Invalid sandbox type: $type.  Valid types are master, slave, master-master, cluster, and channels."
+if [ "$type" != "source" ] && [ "$type" != "replica" ] && [ "$type" != "source-source" ] && [ "$type" != "cluster" ] && [ "$type" != "channels" ]; then
+    die "Invalid sandbox type: $type.  Valid types are source, replica, source-source, cluster, and channels."
 fi
 
 if [ $port -le 1024 ]; then
     die "Invalid port: $port.  Ports must be > 1024."
 fi
 
-if [ "$type" = "slave" -o "$type" = "master-master" ] && [ -z "$master_port" ]; then
-    die "No master port given for the $type."
+if [ "$type" = "replica" -o "$type" = "source-source" ] && [ -z "$source_port" ]; then
+    die "No source port given for the $type."
 fi
 
-# If creating a slave, the master must exist first.  Not true for creating
-# a master-master though.
-if [ "$type" = "slave" ] && [ ! -d "${TMP_DIR}/$master_port" ]; then
-    die "Master sandbox does not exist: ${TMP_DIR}/$master_port"
+# If creating a replica, the source must exist first.  Not true for creating
+# a source-source though.
+if [ "$type" = "replica" ] && [ ! -d "${TMP_DIR}/$source_port" ]; then
+    die "Source sandbox does not exist: ${TMP_DIR}/$source_port"
 fi
 
 # ###########################################################################
@@ -340,23 +339,23 @@ if [ -f $PIDFILE ]; then
     echo "Sandbox $port already started (found pid file $PIDFILE)"
 else
     make_sandbox
-    # make_sandbox has started slave and set read_only if necessary.
+    # make_sandbox has started replica and set read_only if necessary.
 
-    # If the sandbox is a master-master, start the second master and slave the
+    # If the sandbox is a source-source, start the second source and replica the
     # two together.
-    if [ "$type" = "master-master" ]; then
+    if [ "$type" = "source-source" ]; then
         mm1_port=$port
-        mm2_port=$master_port
-        port=$master_port  # make_sandbox uses $port
+        mm2_port=$source_port
+        port=$source_port  # make_sandbox uses $port
         make_sandbox
 
-        # Slave mm2 -> mm1
-        ${TMP_DIR}/$mm2_port/use -e "change master to master_host='127.0.0.1', master_log_file='mysql-bin.000001', master_user='msandbox', master_password='msandbox', master_port=$mm1_port"
-        ${TMP_DIR}/$mm2_port/use -e "start slave"
+        # Replica mm2 -> mm1
+        ${TMP_DIR}/$mm2_port/use -e "change ${CHANGE_SOURCE_NAME} to ${SOURCE_NAME}_host='127.0.0.1', ${SOURCE_NAME}_log_file='mysql-bin.000001', ${SOURCE_NAME}_user='msandbox', ${SOURCE_NAME}_password='msandbox', ${SOURCE_NAME}_port=$mm1_port, ${SOURCE_NAME}_SSL=1"
+        ${TMP_DIR}/$mm2_port/use -e "start ${REPLICA_NAME}"
 
-        # Slave mm1 -> mm2
-        ${TMP_DIR}/$mm1_port/use -e "change master to master_host='127.0.0.1', master_log_file='mysql-bin.000001', master_user='msandbox', master_password='msandbox', master_port=$mm2_port"
-        ${TMP_DIR}/$mm1_port/use -e "start slave"
+        # Replica mm1 -> mm2
+        ${TMP_DIR}/$mm1_port/use -e "change ${CHANGE_SOURCE_NAME} to ${SOURCE_NAME}_host='127.0.0.1', ${SOURCE_NAME}_log_file='mysql-bin.000001', ${SOURCE_NAME}_user='msandbox', ${SOURCE_NAME}_password='msandbox', ${SOURCE_NAME}_port=$mm2_port, ${SOURCE_NAME}_SSL=1"
+        ${TMP_DIR}/$mm1_port/use -e "start ${REPLICA_NAME}"
     fi
 fi
 
diff --git a/sandbox/test-env b/sandbox/test-env
index f07c75416..cbcf4844e 100755
--- a/sandbox/test-env
+++ b/sandbox/test-env
@@ -3,7 +3,7 @@
 TMP_DIR=${TMP_DIR:-/tmp}
 
 # This script controls the Percona Toolkit test environment.  The basic
-# environment is a master on port 12345 in ${TMP_DIR}/12345 and a slave on port
+# environment is a source on port 12345 in ${TMP_DIR}/12345 and a replica on port
 # 12346 in ${TMP_DIR}/12346.  This script attempts to ensure that all environment
 # vars like PERCONA_TOOLKIT_BRANCH and PERCONA_TOOLKIT_SANDBOX are correct.
 # Exist 0 on success/no errors, or 1 on any warnings or errors.
@@ -115,7 +115,7 @@ checkconfig() {
 sandbox_status() {
     local type=$1
     local port=$2
-    local master_port=$3
+    local source_port=$3
     local status=0  # sandbox is ok, no problems
 
     echo "MySQL $type test server on port $port:"
@@ -160,23 +160,23 @@ sandbox_status() {
             fi
         fi
 
-        if [ "$type" = "slave" ]; then
-            echo -n "  slave is running - "
-            # Slave status should show:
-            #   Slave_IO_Running: Yes
-            #   Slave_SQL_Running: Yes
-            local slave_running=`${TMP_DIR}/$port/use -e 'show slave status\G' 2>/dev/null | grep Running | grep -c Yes`
-            if [ $slave_running -eq 2 ]; then
+        if [ "$type" = "replica" ]; then
+            echo -n "  replica is running - "
+            # Replica status should show:
+            #   Replica_IO_Running: Yes
+            #   Replica_SQL_Running: Yes
+            local replica_running=`${TMP_DIR}/$port/use -e "show ${REPLICA_NAME} status\G" 2>/dev/null | grep Running | grep -c Yes`
+            if [ $replica_running -eq 2 ]; then
                 echo "yes"
             else
                 echo "NO"
                 status=1
             fi
 
-            if [ -n "$master_port" ]; then
-                echo -n "  slave to master $master_port - "
-                local mp=`${TMP_DIR}/$port/use -e 'show slave status\G' 2>/dev/null | grep Master_Port | awk '{print $2}'`
-                if [ "$mp" = "$master_port" ]; then
+            if [ -n "$source_port" ]; then
+                echo -n "  replica to source $source_port - "
+                local mp=`${TMP_DIR}/$port/use -e "show ${REPLICA_NAME} status\G" 2>/dev/null | grep ${SOURCE_NAME^}_Port | awk '{print $2}'`
+                if [ "$mp" = "$source_port" ]; then
                     echo "yes"
                 else
                     echo "NO"
@@ -248,6 +248,20 @@ set_mysql_version() {
     fi
 }
 
+SOURCE_NAME="master"
+CHANGE_SOURCE_NAME="master"
+REPLICA_NAME="slave"
+set_source_replica_names() {
+   if [ "$MYSQL_VERSION" '>' "8.1" ] && [ "$APP" '!=' "mariadb" ]; then
+      SOURCE_NAME="source"
+      CHANGE_SOURCE_NAME="replication source"
+      REPLICA_NAME="replica"
+   fi
+   export SOURCE_NAME
+   export CHANGE_SOURCE_NAME
+   export REPLICA_NAME
+}
+
 _seq() {
     local i="$1"
     awk "BEGIN { for(i=1; i<=$i; i++) print i; }"
@@ -295,26 +309,36 @@ fi
 case $opt in
     start)
         cd $PERCONA_TOOLKIT_BRANCH/sandbox
-        echo "${2:-"master"}" 12345
-        ./start-sandbox "${2:-"master"}" 12345
+        echo "${2:-"source"}" 12345
+        ./start-sandbox "${2:-"source"}" 12345
         exit_status=$((exit_status | $?))
         set_mysql_version
+        set_source_replica_names
         if [ $exit_status -eq 0 ]; then
             if [ "${2:-""}" = "channels" ] && [ "$MYSQL_VERSION" '>' "5.6" ]; then
-                ./start-sandbox master 12346
+                ./start-sandbox source 12346
                 exit_status=$((exit_status | $?))
-                ./start-sandbox master 12347
+                ./start-sandbox source 12347
                 exit_status=$((exit_status | $?))
-                ${TMP_DIR}/12345/use < $PERCONA_TOOLKIT_BRANCH/sandbox/gtid_on.sql
-                exit_status=$?
-                ${TMP_DIR}/12346/use < $PERCONA_TOOLKIT_BRANCH/sandbox/gtid_on.sql
-                exit_status=$?
-                ${TMP_DIR}/12347/use < $PERCONA_TOOLKIT_BRANCH/sandbox/slave_channels.sql
-                exit_status=$?
+                if [ "$MYSQL_VERSION" '>' "8.1" ] && [ "$APP" '!=' "mariadb" ]; then
+                  ${TMP_DIR}/12345/use < $PERCONA_TOOLKIT_BRANCH/sandbox/gtid_on.sql
+                  exit_status=$?
+                  ${TMP_DIR}/12346/use < $PERCONA_TOOLKIT_BRANCH/sandbox/gtid_on.sql
+                  exit_status=$?
+                  ${TMP_DIR}/12347/use < $PERCONA_TOOLKIT_BRANCH/sandbox/replica_channels.sql
+                  exit_status=$?
+               else
+                  ${TMP_DIR}/12345/use < $PERCONA_TOOLKIT_BRANCH/sandbox/gtid_on-legacy.sql
+                  exit_status=$?
+                  ${TMP_DIR}/12346/use < $PERCONA_TOOLKIT_BRANCH/sandbox/gtid_on-legacy.sql
+                  exit_status=$?
+                  ${TMP_DIR}/12347/use < $PERCONA_TOOLKIT_BRANCH/sandbox/replica_channels-legacy.sql
+                  exit_status=$?
+               fi
             else
-                ./start-sandbox "${2:-"slave"}" 12346 12345
+                ./start-sandbox "${2:-"replica"}" 12346 12345
                 exit_status=$((exit_status | $?))
-                ./start-sandbox "${2:-"slave"}" 12347 12346
+                ./start-sandbox "${2:-"replica"}" 12347 12346
                 exit_status=$((exit_status | $?))
             fi
 
@@ -407,12 +431,12 @@ case $opt in
         $0 start "$@"
         ;;
     status)
-        sandbox_status 'master' '12345'
-        master_status=$?
-        sandbox_status 'slave' '12346' '12345'
-        slave_status=$?
+        sandbox_status 'source' '12345'
+        source_status=$?
+        sandbox_status 'replica' '12346' '12345'
+        replica_status=$?
         echo -n "Percona Test test environment is "
-        if [ $master_status -eq 0 ] && [ $slave_status -eq 0 ]; then
+        if [ $source_status -eq 0 ] && [ $replica_status -eq 0 ]; then
             echo "ok!"
         else
             echo "invalid."
diff --git a/t/lib/MasterSlave.t b/t/lib/MasterSlave.t
index a3af2bc66..420784257 100644
--- a/t/lib/MasterSlave.t
+++ b/t/lib/MasterSlave.t
@@ -839,7 +839,7 @@ SKIP: {
    # After stopping one of the replication channels, show slave status returns only one slave
    # but it has a channel name and we didn't specified a channels name in the command line.
    # It should return undef
-   $slave1_dbh->do("STOP SLAVE for channel 'masterchan2'");
+   $slave1_dbh->do("STOP SLAVE for channel 'sourcechan2'");
 
    eval {
        $css = $ms->get_slave_status($slave1_dbh);
@@ -850,14 +850,14 @@ SKIP: {
        'Cannot determine slave in a multi source config without --channel param (only one server)'
    );
 
-   $slave1_dbh->do("START SLAVE for channel 'masterchan2'");
+   $slave1_dbh->do("START SLAVE for channel 'sourcechan2'");
 
    # Now try specifying a channel name 
-   $ms->{channel} = 'masterchan1';
+   $ms->{channel} = 'sourcechan1';
    $css = $ms->get_slave_status($slave1_dbh);
    is (
        $css->{channel_name},
-       'masterchan1',
+       'sourcechan1',
        'Returned the correct slave',
    );
 
diff --git a/t/pt-archiver/archive_using_channels.t b/t/pt-archiver/archive_using_channels.t
index bde849fce..778fc24c8 100644
--- a/t/pt-archiver/archive_using_channels.t
+++ b/t/pt-archiver/archive_using_channels.t
@@ -91,10 +91,10 @@ like (
     'Message saying channel name must be specified'
 );
 
-push @args, ('--channel', 'masterchan1');
+push @args, ('--channel', 'sourcechan1');
 
 output(
-   sub { $exit_status = pt_archiver::main(@args, '--channel', 'masterchan1') },
+   sub { $exit_status = pt_archiver::main(@args, '--channel', 'sourcechan1') },
    stderr => 1,
 );
 
diff --git a/t/pt-table-sync/sync_using_channels.t b/t/pt-table-sync/sync_using_channels.t
index 66399ba4a..5c4a1d91f 100644
--- a/t/pt-table-sync/sync_using_channels.t
+++ b/t/pt-table-sync/sync_using_channels.t
@@ -49,7 +49,7 @@ $sb->load_file('chan_master1', "sandbox/gtid_on.sql", undef, no_wait => 1);
 $sb->load_file('chan_master2', "sandbox/gtid_on.sql", undef, no_wait => 1);
 $sb->load_file('chan_slave1', "sandbox/slave_channels.sql", undef, no_wait => 1);
                                                           
-my @args = qw(--execute --no-foreign-key-checks --verbose --databases=sakila --tables=actor --sync-to-master --channel=masterchan1);
+my @args = qw(--execute --no-foreign-key-checks --verbose --databases=sakila --tables=actor --sync-to-master --channel=sourcechan1);
 my $exit_status;
 
 my $output = output(

From a530c6f84c7a7dfa8d95e1a4540e352d40d7f847 Mon Sep 17 00:00:00 2001
From: Sveta Smirnova <sveta.smirnova@percona.com>
Date: Tue, 23 Jul 2024 16:38:45 +0300
Subject: [PATCH 02/31] PT-2340 - Support MySQL 8.4

- Fixed status check for 8.4 sandbox
- Removed option "reset" from the usage output, because option itself was removed by 92a36715c44663db82e2cf5e78b98b622e905727
- Fixed sandbox/start-sandbox script, so it can start custom setups with 8.4
---
 sandbox/start-sandbox | 11 ++++++++++-
 sandbox/test-env      |  8 +++-----
 2 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/sandbox/start-sandbox b/sandbox/start-sandbox
index 9c231997d..f93cd7a28 100755
--- a/sandbox/start-sandbox
+++ b/sandbox/start-sandbox
@@ -247,7 +247,7 @@ make_sandbox() {
 # Sanity check the cmd line options.
 # ###########################################################################
 if [ $# -lt 2 ]; then
-    die "Usage: start-sandbox source|replica|source-source port [source port]"
+    die "Usage: start-sandbox source|replica|source-source|cluster|channels port [source port]"
 fi
 
 type=$1         # source, replica or source-source
@@ -326,6 +326,15 @@ else
     minor_version=`$PERCONA_TOOLKIT_SANDBOX/$mysqld -V 2>/dev/null | awk '{print $3}' | cut -d. -f 1,2,3 | cut -d- -f1`;
 fi
 
+SOURCE_NAME="master"
+CHANGE_SOURCE_NAME="master"
+REPLICA_NAME="slave"
+if [ "$version" '>' "8.1" ] && [ "$APP" '!=' "mariadb" ]; then
+   SOURCE_NAME="source"
+   CHANGE_SOURCE_NAME="replication source"
+   REPLICA_NAME="replica"
+fi
+
 if [ ! -d "$PERCONA_TOOLKIT_BRANCH/sandbox/servers/${APP#mysql}/$version" ]; then
     die "$PERCONA_TOOLKIT_BRANCH/sandbox/servers/${APP#mysql}/$version does not exist."
 fi
diff --git a/sandbox/test-env b/sandbox/test-env
index cbcf4844e..58bb99ff7 100755
--- a/sandbox/test-env
+++ b/sandbox/test-env
@@ -35,7 +35,7 @@ err() {
 }
 
 usage() {
-    err "Usage: test-env start|stop|restart|status|checkconfig|reset|kill" \
+    err "Usage: test-env start|stop|restart|status|checkconfig|kill" \
         ""                                                          \
         "  start       Start test servers in ${TMP_DIR}/PORT"             \
         "  stop        Stop test servers and remove all ${TMP_DIR}/PORT"  \
@@ -43,7 +43,6 @@ usage() {
         "  restart     Stop and start test servers"                 \
         "  status      Print status of test servers"                \
         "  checkconfig Check test env and test servers"             \
-        "  reset       Reset test server binary logs"               \
         "  version     Print MySQL version of running test servers" \
         ""
 }
@@ -148,6 +147,8 @@ sandbox_status() {
     $PERCONA_TOOLKIT_SANDBOX/bin/mysqladmin --defaults-file="${TMP_DIR}/$port/my.sandbox.cnf" ping >/dev/null 2>&1
     if [ $? -eq 0 ]; then
         echo "yes"
+        set_mysql_version
+        set_source_replica_names
 
         if [ "$MYSQL_VERSION" '>' "4.1" ]; then
             echo -n "  sakila db is loaded - "
@@ -257,9 +258,6 @@ set_source_replica_names() {
       CHANGE_SOURCE_NAME="replication source"
       REPLICA_NAME="replica"
    fi
-   export SOURCE_NAME
-   export CHANGE_SOURCE_NAME
-   export REPLICA_NAME
 }
 
 _seq() {

From e2207ea2323bca568757de6ee7c60b7ddda75e5b Mon Sep 17 00:00:00 2001
From: Sveta Smirnova <sveta.smirnova@percona.com>
Date: Tue, 23 Jul 2024 22:28:05 +0300
Subject: [PATCH 03/31] PT-2340 - Support MySQL 8.4

- Removed offensive terminology from library files and their tests
- Removed unused sandbox/prove2junit.pl
- Added option mysql_ssl to DSN and possibility to have DSN of multiple letters
---
 lib/DSNParser.pm                              |   5 +-
 lib/MasterSlave.pm                            | 248 ++++---
 lib/PerconaTest.pm                            |  18 +
 lib/Sandbox.pm                                | 120 ++--
 lib/TableSyncer.pm                            |   4 +-
 sandbox/gtid_on-legacy.sql                    |   8 +
 sandbox/prove2junit.pl                        |  56 --
 sandbox/replica_channels.sql                  |  13 +
 sandbox/servers/8.4/my.sandbox.cnf            |   1 +
 t/lib/ChangeHandler.t                         |  12 +-
 t/lib/CompareQueryTimes.t                     |   2 +-
 t/lib/CompareResults.t                        |   8 +-
 t/lib/CompareWarnings.t                       |   2 +-
 t/lib/CopyRowsInsertSelect.t                  |   4 +-
 t/lib/Cxn.t                                   |  19 +-
 t/lib/DSNParser.t                             |   6 +-
 t/lib/ExplainAnalyzer.t                       |   2 +-
 t/lib/IndexLength.pm                          |   4 +-
 t/lib/IndexUsage.t                            |   2 +-
 t/lib/KeySize.t                               |  10 +-
 t/lib/MasterSlave.t                           | 107 +--
 t/lib/MockSyncStream.t                        |   2 +-
 t/lib/MySQLConfig.t                           |   2 +-
 t/lib/NibbleIterator.t                        |   8 +-
 t/lib/OobNibbleIterator.t                     |   6 +-
 t/lib/Outfile.t                               |   2 +-
 t/lib/Percona/XtraDB/Cluster-no-PXC.t         |   8 +-
 t/lib/Percona/XtraDB/Cluster.t                |  12 +-
 t/lib/QueryHistory.t                          |   4 +-
 t/lib/QueryReportFormatter.t                  |   4 +-
 t/lib/QueryReview.t                           |   4 +-
 t/lib/Quoter.t                                |   4 +-
 t/lib/RowChecksum.t                           |   4 +-
 t/lib/RowDiff-custom.t                        |   4 +-
 t/lib/RowDiff.t                               |   6 +-
 t/lib/SchemaIterator.t                        |  12 +-
 t/lib/SqlModes.t                              |   2 +-
 t/lib/TableChecksum.t                         |   4 +-
 t/lib/TableChunker.t                          |  24 +-
 t/lib/TableParser.t                           |   8 +-
 t/lib/TableSyncChunk.t                        |   4 +-
 t/lib/TableSyncNibble.t                       |  10 +-
 t/lib/TableSyncer.t                           |  63 +-
 t/lib/TableUsage.t                            |   2 +-
 t/lib/Transformers.t                          |   2 +-
 t/lib/VersionCheck.t                          |   4 +-
 t/lib/VersionParser.t                         |   2 +-
 .../SchemaIterator/all-dbs-tbls-8.4.txt       | 611 ++++++++++++++++++
 .../SchemaIterator/mysql-user-ddl-8.4.txt     |  56 ++
 49 files changed, 1129 insertions(+), 396 deletions(-)
 create mode 100644 sandbox/gtid_on-legacy.sql
 delete mode 100755 sandbox/prove2junit.pl
 create mode 100644 sandbox/replica_channels.sql
 create mode 100644 t/lib/samples/SchemaIterator/all-dbs-tbls-8.4.txt
 create mode 100644 t/lib/samples/SchemaIterator/mysql-user-ddl-8.4.txt

diff --git a/lib/DSNParser.pm b/lib/DSNParser.pm
index 6ab57c83b..71c16b16d 100644
--- a/lib/DSNParser.pm
+++ b/lib/DSNParser.pm
@@ -132,7 +132,7 @@ sub parse {
    # Parse given props
    foreach my $dsn_part ( split($dsn_sep, $dsn) ) {
       $dsn_part =~ s/\\,/,/g;
-      if ( my ($prop_key, $prop_val) = $dsn_part =~  m/^(.)=(.*)$/ ) {
+      if ( my ($prop_key, $prop_val) = $dsn_part =~  m/^(.*?)=(.*)$/ ) {
          # Handle the typical DSN parts like h=host, P=3306, etc.
          $given_props{$prop_key} = $prop_val;
       }
@@ -243,8 +243,9 @@ sub get_cxn_params {
       $dsn = 'DBI:mysql:' . ( $info->{D} || '' ) . ';'
          . join(';', map  { "$opts{$_}->{dsn}=$info->{$_}" }
                      grep { defined $info->{$_} }
-                     qw(F h P S A))
+                     qw(F h P S A mysql_ssl))
          . ';mysql_read_default_group=client'
+         #. ($info->{s} ? ';mysql_ssl=1' : '')
          . ($info->{L} ? ';mysql_local_infile=1' : '');
    }
    PTDEBUG && _d($dsn);
diff --git a/lib/MasterSlave.pm b/lib/MasterSlave.pm
index 135411dc5..67bad3a01 100644
--- a/lib/MasterSlave.pm
+++ b/lib/MasterSlave.pm
@@ -19,7 +19,7 @@
 # ###########################################################################
 {
 # Package: MasterSlave
-# MasterSlave handles common tasks related to master-slave setups.
+# MasterSlave handles common tasks related to source-slave setups.
 package MasterSlave;
 
 use strict;
@@ -238,12 +238,12 @@ sub recurse_to_slaves {
       }
    } until (defined $id);
    PTDEBUG && _d('Working on server ID', $id);
-   my $master_thinks_i_am = $dsn->{server_id};
+   my $source_thinks_i_am = $dsn->{server_id};
    if ( !defined $id
-       || ( defined $master_thinks_i_am && $master_thinks_i_am != $id )
+       || ( defined $source_thinks_i_am && $source_thinks_i_am != $id )
        || $args->{server_ids_seen}->{$id}++
    ) {
-      PTDEBUG && _d('Server ID seen, or not what master said');
+      PTDEBUG && _d('Server ID seen, or not what source said');
       if ( $args->{skip_callback} ) {
          $args->{skip_callback}->($dsn, $dbh, $level, $args->{parent});
       }
@@ -255,7 +255,7 @@ sub recurse_to_slaves {
    if ( !defined $recurse || $level < $recurse ) {
 
       my @slaves =
-         grep { !$_->{master_id} || $_->{master_id} == $id } # Only my slaves.
+         grep { !$_->{source_id} || $_->{source_id} == $id } # Only my slaves.
          $self->find_slave_hosts($dp, $dbh, $dsn, $methods);
 
       foreach my $slave ( @slaves ) {
@@ -274,7 +274,7 @@ sub recurse_to_slaves {
 # from SHOW SLAVE HOSTS may be important.  Then only the hosts methods is used.
 #
 # Returns a list of DSN hashes.  Optional extra keys in the DSN hash are
-# master_id and server_id.  Also, the 'source' key is either 'processlist' or
+# source_id and server_id.  Also, the 'source' key is either 'processlist' or
 # 'hosts'.
 #
 # If a method is given, it becomes the preferred (first tried) method.
@@ -330,13 +330,17 @@ sub _process_slaves_list {
 # SHOW SLAVE HOSTS is significantly less reliable.
 # Machines tend to share the host list around with every machine in the
 # replication hierarchy, but they don't update each other when machines
-# disconnect or change to use a different master or something.  So there is
+# disconnect or change to use a different source or something.  So there is
 # lots of cruft in SHOW SLAVE HOSTS.
 sub _find_slaves_by_hosts {
    my ( $self, $dsn_parser, $dbh, $dsn ) = @_;
 
    my @slaves;
-   my $sql = 'SHOW SLAVE HOSTS';
+   my $server_version = VersionParser->new($dbh);
+   my $sql = 'SHOW REPLICAS';
+   if ( $server_version < '8.1' || $server_version->flavor() =~ m/maria/ ) {
+      $sql = 'SHOW SLAVE HOSTS';
+   }
    PTDEBUG && _d($dbh, $sql);
    @slaves = @{$dbh->selectall_arrayref($sql, { Slice => {} })};
 
@@ -351,7 +355,7 @@ sub _find_slaves_by_hosts {
             . ( $hash{password} ? ",p=$hash{password}" : '');
          my $dsn           = $dsn_parser->parse($spec, $dsn);
          $dsn->{server_id} = $hash{server_id};
-         $dsn->{master_id} = $hash{master_id};
+         $dsn->{source_id} = $hash{source_id};
          $dsn->{source}    = 'hosts';
          $dsn;
       } @slaves;
@@ -413,62 +417,80 @@ sub get_connected_slaves {
    @{$dbh->selectall_arrayref($sql, { Slice => {} })};
 }
 
-# Verifies that $master is really the master of $slave.  This is not an exact
+# Verifies that $source is really the source of $slave.  This is not an exact
 # science, but there is a decent chance of catching some obvious cases when it
-# is not the master.  If not the master, it dies; otherwise returns true.
-sub is_master_of {
-   my ( $self, $master, $slave ) = @_;
-   my $master_status = $self->get_master_status($master)
-      or die "The server specified as a master is not a master";
+# is not the source.  If not the source, it dies; otherwise returns true.
+sub is_source_of {
+   my ( $self, $source, $slave ) = @_;
+
+   my $replica_version = VersionParser->new($slave);
+   my $source_name = 'source';
+   my $source_port = 'source_port';
+   if ( $replica_version < '8.1' || $replica_version->flavor() =~ m/maria/ ) {
+      $source_name = 'master';
+      $source_port = 'master_port';
+   }
+
+   my $source_status = $self->get_source_status($source)
+      or die "The server specified as a source is not a source";
    my $slave_status  = $self->get_slave_status($slave)
       or die "The server specified as a slave is not a slave";
-   my @connected     = $self->get_connected_slaves($master)
-      or die "The server specified as a master has no connected slaves";
-   my (undef, $port) = $master->selectrow_array("SHOW VARIABLES LIKE 'port'");
+   my @connected     = $self->get_connected_slaves($source)
+      or die "The server specified as a source has no connected slaves";
+   my (undef, $port) = $source->selectrow_array("SHOW VARIABLES LIKE 'port'");
 
-   if ( $port != $slave_status->{master_port} ) {
-      die "The slave is connected to $slave_status->{master_port} "
-         . "but the master's port is $port";
+   if ( $port != $slave_status->{$source_port} ) {
+      die "The slave is connected to $slave_status->{$source_port} "
+         . "but the source's port is $port";
    }
 
-   if ( !grep { $slave_status->{master_user} eq $_->{user} } @connected ) {
+   if ( !grep { $slave_status->{source_user} eq $_->{user} } @connected ) {
       die "I don't see any slave I/O thread connected with user "
-         . $slave_status->{master_user};
+         . $slave_status->{source_user};
    }
 
    if ( ($slave_status->{slave_io_state} || '')
-      eq 'Waiting for master to send event' )
+      eq 'Waiting for ${source_name} to send event' )
    {
-      # The slave thinks its I/O thread is caught up to the master.  Let's
-      # compare and make sure the master and slave are reasonably close to each
+      # The slave thinks its I/O thread is caught up to the source.  Let's
+      # compare and make sure the source and slave are reasonably close to each
       # other.  Note that this is one of the few places where I check the I/O
       # thread positions instead of the SQL thread positions!
       # Master_Log_File/Read_Master_Log_Pos is the I/O thread's position on the
-      # master.
-      my ( $master_log_name, $master_log_num )
-         = $master_status->{file} =~ m/^(.*?)\.0*([1-9][0-9]*)$/;
+      # source.
+      my ( $source_log_name, $source_log_num )
+         = $source_status->{file} =~ m/^(.*?)\.0*([1-9][0-9]*)$/;
       my ( $slave_log_name, $slave_log_num )
-         = $slave_status->{master_log_file} =~ m/^(.*?)\.0*([1-9][0-9]*)$/;
-      if ( $master_log_name ne $slave_log_name
-         || abs($master_log_num - $slave_log_num) > 1 )
+         = $slave_status->{source_log_file} =~ m/^(.*?)\.0*([1-9][0-9]*)$/;
+      if ( $source_log_name ne $slave_log_name
+         || abs($source_log_num - $slave_log_num) > 1 )
       {
          die "The slave thinks it is reading from "
-            . "$slave_status->{master_log_file},  but the "
-            . "master is writing to $master_status->{file}";
+            . "$slave_status->{source_log_file},  but the "
+            . "source is writing to $source_status->{file}";
       }
    }
    return 1;
 }
 
-# Figures out how to connect to the master, by examining SHOW SLAVE STATUS.  But
+# Figures out how to connect to the source, by examining SHOW SLAVE STATUS.  But
 # does NOT use the value from Master_User for the username, because typically we
 # want to perform operations as the username that was specified (usually to the
 # program's --user option, or in a DSN), rather than as the replication user,
 # which is often restricted.
-sub get_master_dsn {
+sub get_source_dsn {
    my ( $self, $dbh, $dsn, $dsn_parser ) = @_;
-   my $master = $self->get_slave_status($dbh) or return undef;
-   my $spec   = "h=$master->{master_host},P=$master->{master_port}";
+
+   my $vp = VersionParser->new($dbh);
+   my $source_host = 'source_host';
+   my $source_port = 'source_port';
+   if ( $vp < '8.1' || $vp->flavor() =~ m/maria/ ) {
+      $source_host = 'master_host';
+      $source_port = 'master_port';
+   }
+
+   my $source = $self->get_slave_status($dbh) or return undef;
+   my $spec   = "h=$source->{${source_host}},P=$source->{${source_port}}";
    return       $dsn_parser->parse($spec, $dsn);
 }
 
@@ -476,17 +498,23 @@ sub get_master_dsn {
 sub get_slave_status {
    my ( $self, $dbh ) = @_;
 
+   my $server_version = VersionParser->new($dbh);
+   my $replica_name = 'replica';
+   if ( $server_version < '8.1' || $server_version->flavor() =~ m/maria/ ) {
+      $replica_name = 'slave';
+   }
+
    if ( !$self->{not_a_slave}->{$dbh} ) {
       my $sth = $self->{sths}->{$dbh}->{SLAVE_STATUS}
-            ||= $dbh->prepare('SHOW SLAVE STATUS');
-      PTDEBUG && _d($dbh, 'SHOW SLAVE STATUS');
+            ||= $dbh->prepare("SHOW ${replica_name} STATUS");
+      PTDEBUG && _d($dbh, "SHOW ${replica_name} STATUS");
       $sth->execute();
       my ($sss_rows) = $sth->fetchall_arrayref({}); # Show Slave Status rows
 
       # If SHOW SLAVE STATUS returns more than one row it means that this slave is connected to more
-      # than one master using replication channels.
+      # than one source using replication channels.
       # If we have a channel name as a parameter, we need to select the correct row and return it.
-      # If we don't have a channel name as a parameter, there is no way to know what the correct master is so,
+      # If we don't have a channel name as a parameter, there is no way to know what the correct source is so,
       # return an error.
       my $ss;
       if ( $sss_rows && @$sss_rows ) {
@@ -531,23 +559,29 @@ sub get_slave_status {
 }
 
 # Gets SHOW MASTER STATUS, with column names all lowercased, as a hashref.
-sub get_master_status {
+sub get_source_status {
    my ( $self, $dbh ) = @_;
 
-   if ( $self->{not_a_master}->{$dbh} ) {
-      PTDEBUG && _d('Server on dbh', $dbh, 'is not a master');
+   if ( $self->{not_a_source}->{$dbh} ) {
+      PTDEBUG && _d('Server on dbh', $dbh, 'is not a source');
       return;
    }
 
+   my $vp = VersionParser->new($dbh);
+   my $source_name = 'binary log';
+   if ( $vp < '8.1' || $vp->flavor() =~ m/maria/ ) {
+      $source_name = 'master';
+   }
+
    my $sth;
    if ( $self->{sths}->{$dbh} && $dbh && $self->{sths}->{$dbh} == $dbh ) {
       $sth = $self->{sths}->{$dbh}->{MASTER_STATUS}
-         ||= $dbh->prepare('SHOW MASTER STATUS');
+         ||= $dbh->prepare("SHOW ${source_name} STATUS");
    }
    else {
-      $sth = $dbh->prepare('SHOW MASTER STATUS');
+      $sth = $dbh->prepare("SHOW ${source_name} STATUS");
    }
-   PTDEBUG && _d($dbh, 'SHOW MASTER STATUS');
+   PTDEBUG && _d($dbh, "SHOW ${source_name} STATUS");
    $sth->execute();
    my ($ms) = @{$sth->fetchall_arrayref({})};
    PTDEBUG && _d(
@@ -555,21 +589,21 @@ sub get_master_status {
           : '');
 
    if ( !$ms || scalar keys %$ms < 2 ) {
-      PTDEBUG && _d('Server on dbh', $dbh, 'does not seem to be a master');
-      $self->{not_a_master}->{$dbh}++;
+      PTDEBUG && _d('Server on dbh', $dbh, 'does not seem to be a source');
+      $self->{not_a_source}->{$dbh}++;
    }
 
   return { map { lc($_) => $ms->{$_} } keys %$ms }; # lowercase the keys
 }
 
-# Sub: wait_for_master
-#   Execute MASTER_POS_WAIT() to make slave wait for its master.
+# Sub: wait_for_source
+#   Execute MASTER_POS_WAIT() to make slave wait for its source.
 #
 # Parameters:
 #   %args - Arguments
 #
 # Required Arguments:
-#   * master_status - Hashref returned by <get_master_status()>
+#   * source_status - Hashref returned by <get_source_status()>
 #   * slave_dbh     - dbh for slave host
 #
 # Optional Arguments:
@@ -583,18 +617,18 @@ sub get_master_status {
 #     waited => the number of seconds waited, might be zero
 #   }
 #   (end code)
-sub wait_for_master {
+sub wait_for_source {
    my ( $self, %args ) = @_;
-   my @required_args = qw(master_status slave_dbh);
+   my @required_args = qw(source_status slave_dbh);
    foreach my $arg ( @required_args ) {
       die "I need a $arg argument" unless $args{$arg};
    }
-   my ($master_status, $slave_dbh) = @args{@required_args};
+   my ($source_status, $slave_dbh) = @args{@required_args};
    my $timeout       = $args{timeout} || 60;
 
    my $result;
    my $waited;
-   if ( $master_status ) {
+   if ( $source_status ) {
       my $slave_status;
       eval {
           $slave_status = $self->get_slave_status($slave_dbh);
@@ -603,12 +637,16 @@ sub wait_for_master {
           return {
               result => undef,
               waited => 0,
-              error  =>'Wait for master: this is a multi-master slave but "channel" was not specified on the command line',
+              error  =>'Wait for source: this is a multi-source slave but "channel" was not specified on the command line',
           };
       }
-      my $server_version = VersionParser->new($slave_dbh);
-      my $channel_sql = $server_version > '5.6' && $self->{channel} ? ", '$self->{channel}'" : '';
-      my $sql = "SELECT MASTER_POS_WAIT('$master_status->{file}', $master_status->{position}, $timeout $channel_sql)";
+      my $vp = VersionParser->new($slave_dbh);
+      my $source_name = 'source';
+      if ( $vp < '8.1' || $vp->flavor() =~ m/maria/ ) {
+         $source_name = 'master';
+      }
+      my $channel_sql = $vp > '5.6' && $self->{channel} ? ", '$self->{channel}'" : '';
+      my $sql = "SELECT ${source_name}_POS_WAIT('$source_status->{file}', $source_status->{position}, $timeout $channel_sql)";
       PTDEBUG && _d($slave_dbh, $sql);
       my $start = time;
       ($result) = $slave_dbh->selectrow_array($sql);
@@ -623,7 +661,7 @@ sub wait_for_master {
       PTDEBUG && _d("Waited", $waited, "seconds");
    }
    else {
-      PTDEBUG && _d('Not waiting: this server is not a master');
+      PTDEBUG && _d('Not waiting: this server is not a source');
    }
 
    return {
@@ -635,8 +673,13 @@ sub wait_for_master {
 # Executes STOP SLAVE.
 sub stop_slave {
    my ( $self, $dbh ) = @_;
+   my $vp = VersionParser->new($dbh);
+   my $replica_name = 'replica';
+   if ( $vp < '8.1' || $vp->flavor() =~ m/maria/ ) {
+      $replica_name = 'slave';
+   }
    my $sth = $self->{sths}->{$dbh}->{STOP_SLAVE}
-         ||= $dbh->prepare('STOP SLAVE');
+         ||= $dbh->prepare("STOP ${replica_name}");
    PTDEBUG && _d($dbh, $sth->{Statement});
    $sth->execute();
 }
@@ -644,50 +687,57 @@ sub stop_slave {
 # Executes START SLAVE, optionally with UNTIL.
 sub start_slave {
    my ( $self, $dbh, $pos ) = @_;
+   my $vp = VersionParser->new($dbh);
+   my $source_name = 'source';
+   my $replica_name = 'replica';
+   if ( $vp < '8.1' || $vp->flavor() =~ m/maria/ ) {
+      $source_name = 'master';
+      $replica_name = 'slave';
+   }
    if ( $pos ) {
       # Just like with CHANGE MASTER TO, you can't quote the position.
-      my $sql = "START SLAVE UNTIL MASTER_LOG_FILE='$pos->{file}', "
-              . "MASTER_LOG_POS=$pos->{position}";
+      my $sql = "START ${replica_name} UNTIL ${source_name}_LOG_FILE='$pos->{file}', "
+              . "${source_name}_LOG_POS=$pos->{position}";
       PTDEBUG && _d($dbh, $sql);
       $dbh->do($sql);
    }
    else {
       my $sth = $self->{sths}->{$dbh}->{START_SLAVE}
-            ||= $dbh->prepare('START SLAVE');
+            ||= $dbh->prepare("START ${replica_name}");
       PTDEBUG && _d($dbh, $sth->{Statement});
       $sth->execute();
    }
 }
 
-# Waits for the slave to catch up to its master, using START SLAVE UNTIL.  When
-# complete, the slave is caught up to the master, and the slave process is
+# Waits for the slave to catch up to its source, using START SLAVE UNTIL.  When
+# complete, the slave is caught up to the source, and the slave process is
 # stopped on both servers.
-sub catchup_to_master {
-   my ( $self, $slave, $master, $timeout ) = @_;
-   $self->stop_slave($master);
+sub catchup_to_source {
+   my ( $self, $slave, $source, $timeout ) = @_;
+   $self->stop_slave($source);
    $self->stop_slave($slave);
    my $slave_status  = $self->get_slave_status($slave);
    my $slave_pos     = $self->repl_posn($slave_status);
-   my $master_status = $self->get_master_status($master);
-   my $master_pos    = $self->repl_posn($master_status);
-   PTDEBUG && _d('Master position:', $self->pos_to_string($master_pos),
+   my $source_status = $self->get_source_status($source);
+   my $source_pos    = $self->repl_posn($source_status);
+   PTDEBUG && _d('Master position:', $self->pos_to_string($source_pos),
       'Slave position:', $self->pos_to_string($slave_pos));
 
    my $result;
-   if ( $self->pos_cmp($slave_pos, $master_pos) < 0 ) {
-      PTDEBUG && _d('Waiting for slave to catch up to master');
-      $self->start_slave($slave, $master_pos);
+   if ( $self->pos_cmp($slave_pos, $source_pos) < 0 ) {
+      PTDEBUG && _d('Waiting for slave to catch up to source');
+      $self->start_slave($slave, $source_pos);
 
       # The slave may catch up instantly and stop, in which case
       # MASTER_POS_WAIT will return NULL and $result->{result} will be undef.
       # We must catch this; if it returns NULL, then we check that
       # its position is as desired.
-      # TODO: what if master_pos_wait times out and $result == -1? retry?
-      $result = $self->wait_for_master(
-            master_status => $master_status,
+      # TODO: what if source_pos_wait times out and $result == -1? retry?
+      $result = $self->wait_for_source(
+            source_status => $source_status,
             slave_dbh     => $slave,
             timeout       => $timeout,
-            master_status => $master_status
+            source_status => $source_status
       );
       if ($result->{error}) {
           die $result->{error};
@@ -696,22 +746,22 @@ sub catchup_to_master {
          $slave_status = $self->get_slave_status($slave);
          if ( !$self->slave_is_running($slave_status) ) {
             PTDEBUG && _d('Master position:',
-               $self->pos_to_string($master_pos),
+               $self->pos_to_string($source_pos),
                'Slave position:', $self->pos_to_string($slave_pos));
             $slave_pos = $self->repl_posn($slave_status);
-            if ( $self->pos_cmp($slave_pos, $master_pos) != 0 ) {
+            if ( $self->pos_cmp($slave_pos, $source_pos) != 0 ) {
                die "MASTER_POS_WAIT() returned NULL but slave has not "
-                  . "caught up to master";
+                  . "caught up to source";
             }
-            PTDEBUG && _d('Slave is caught up to master and stopped');
+            PTDEBUG && _d('Slave is caught up to source and stopped');
          }
          else {
-            die "Slave has not caught up to master and it is still running";
+            die "Slave has not caught up to source and it is still running";
          }
       }
    }
    else {
-      PTDEBUG && _d("Slave is already caught up to master");
+      PTDEBUG && _d("Slave is already caught up to source");
    }
 
    return $result;
@@ -776,6 +826,13 @@ sub repl_posn {
          position => $status->{position},
       };
    }
+   elsif ( exists $status->{relay_source_log_file} && exists $status->{exec_source_log_pos} ) {
+      # We are on MySQL 8.0.22+
+      return {
+         file     => $status->{relay_source_log_file},
+         position => $status->{exec_source_log_pos},
+      };
+   }
    else {
       return {
          file     => $status->{relay_master_log_file},
@@ -787,9 +844,16 @@ sub repl_posn {
 # Gets the slave's lag.  TODO: permit using a heartbeat table.
 sub get_slave_lag {
    my ( $self, $dbh ) = @_;
+   
+   my $vp = VersionParser->new($dbh);
+   my $source_name = 'source';
+   if ( $vp < '8.1' || $vp->flavor() =~ m/maria/ ) {
+      $source_name = 'master';
+   }
+
    my $stat = $self->get_slave_status($dbh);
    return unless $stat;  # server is not a slave
-   return $stat->{seconds_behind_master};
+   return $stat->{"seconds_behind_${source_name}"};
 }
 
 # Compares two replication positions and returns -1, 0, or 1 just as the cmp
@@ -834,7 +898,7 @@ sub short_host {
 #
 # Arguments:
 #   type            - Which kind of repl thread to match:
-#                     all, binlog_dump (master), slave_io, or slave_sql
+#                     all, binlog_dump (source), slave_io, or slave_sql
 #                     (default: all)
 #   check_known_ids - Check known replication thread IDs (default: yes)
 #
@@ -886,7 +950,7 @@ sub is_replication_thread {
             }
          }
          else {
-            # Type is "all" and it's not a master (binlog_dump) thread,
+            # Type is "all" and it's not a source (binlog_dump) thread,
             # else we wouldn't have gotten here.  It's either of the 2
             # slave threads and we don't care which.
             $match = 1;
@@ -929,7 +993,7 @@ sub is_replication_thread {
 #   %args - Arguments
 #
 # Required Arguments:
-#   dbh - dbh, master or slave
+#   dbh - dbh, source or slave
 #
 # Returns:
 #   Hashref of any replication filters.  If none are set, an empty hashref
@@ -944,7 +1008,7 @@ sub get_replication_filters {
 
    my %filters = ();
 
-   my $status = $self->get_master_status($dbh);
+   my $status = $self->get_source_status($dbh);
    if ( $status ) {
       map { $filters{$_} = $status->{$_} }
       grep { defined $status->{$_} && $status->{$_} ne '' }
diff --git a/lib/PerconaTest.pm b/lib/PerconaTest.pm
index 715967fc4..aaca82233 100644
--- a/lib/PerconaTest.pm
+++ b/lib/PerconaTest.pm
@@ -68,6 +68,9 @@ our @EXPORT      = qw(
    $sandbox_version
    $can_load_data
    $test_diff
+   $source_name
+   $source_status
+   $replica_name
 );
 
 our $trunk = $ENV{PERCONA_TOOLKIT_BRANCH};
@@ -78,6 +81,15 @@ eval {
    $sandbox_version = $v if $v;
 };
 
+our $source_name = 'source';
+our $source_status = 'binary log';
+our $replica_name = 'replica';
+if ( $sandbox_version < '8.1' || ( $ENV{FORK} || "" eq 'mariadb' ) ) {
+   $source_name = 'master';
+   $source_status = 'master';
+   $replica_name = 'slave';
+}
+
 our $can_load_data = can_load_data();
 
 our $test_diff = '';
@@ -137,6 +149,12 @@ our $dsn_opts = [
       dsn  => 'user',
       copy => 1,
    },
+   {
+      key  => 'mysql_ssl',
+      desc => 'Use SSL',
+      dsn  => 'mysql_ssl',
+      copy => 1,
+   },
 ];
 
 # Runs code, captures and returns its output.
diff --git a/lib/Sandbox.pm b/lib/Sandbox.pm
index fc91802b9..a9f495874 100644
--- a/lib/Sandbox.pm
+++ b/lib/Sandbox.pm
@@ -38,41 +38,42 @@ $Data::Dumper::Sortkeys  = 1;
 $Data::Dumper::Quotekeys = 0;
 use constant PTDEBUG    => $ENV{PTDEBUG}    || 0;
 use constant PTDEVDEBUG => $ENV{PTDEVDEBUG} || 0;
+use VersionParser;
 
 use IO::Socket::INET;
 
 my $trunk = $ENV{PERCONA_TOOLKIT_BRANCH};
 
 my %port_for = (
-   master  => 12345,
-   slave1  => 12346,
-   slave2  => 12347,
-   master1 => 12348, # master-master
-   master2 => 12349, # master-master
-   master3 => 2900,
-   master4 => 2901,
-   master5 => 2902,
-   master6 => 2903,
-   node1   => 12345, # pxc...
-   node2   => 12346,
-   node3   => 12347,
-   node4   => 2900,
-   node5   => 2901,
-   node6   => 2902,
-   node7   => 2903,
-   cmaster => 12349, # master -> cluster
-   cslave1 => 12348, # cluster -> slave
-   host1   => 12345, # pt-upgrade
-   host2   => 12348, # pt-upgrade
-   chan_master1 => 2900,
-   chan_master2 => 2901,
-   chan_slave1  => 2902,
-   chan_slave2  => 2903,
+   source    => 12345,
+   replica1  => 12346,
+   replica2  => 12347,
+   source1   => 12348, # source-source
+   source2   => 12349, # source-source
+   source3   => 2900,
+   source4   => 2901,
+   source5   => 2902,
+   source6   => 2903,
+   node1     => 12345, # pxc...
+   node2     => 12346,
+   node3     => 12347,
+   node4     => 2900,
+   node5     => 2901,
+   node6     => 2902,
+   node7     => 2903,
+   csource   => 12349, # source -> cluster
+   creplica1 => 12348, # cluster -> replica
+   host1     => 12345, # pt-upgrade
+   host2     => 12348, # pt-upgrade
+   chan_source1   => 2900,
+   chan_source2   => 2901,
+   chan_replica1  => 2902,
+   chan_replica2  => 2903,
 );
 
 my %server_type = (
-   master   => 1,
-   slave    => 1,
+   source   => 1,
+   replica  => 1,
    node     => 1,
 );
 
@@ -134,7 +135,7 @@ sub create_dbs {
 sub get_dbh_for {
    my ( $self, $server, $cxn_ops, $user ) = @_;
    _check_server($server);
-   $cxn_ops ||= { AutoCommit => 1, mysql_enable_utf8 => 1 };
+   $cxn_ops ||= { AutoCommit => 1, mysql_enable_utf8 => 1, mysql_ssl => 1 };
    $user    ||= 'msandbox';
    PTDEBUG && _d('dbh for', $server, 'on port', $port_for{$server});
    my $dp = $self->{DSNParser};
@@ -144,7 +145,7 @@ sub get_dbh_for {
    # also quite convenient when using an affected OS
    # TODO: this fails if the server isn't started yet.
    $cxn_ops->{L} = 1 if !exists $cxn_ops->{L}
-                     && !$self->can_load_data('master');
+                     && !$self->can_load_data('source');
    eval { $dbh = $dp->get_dbh($dp->get_cxn_params($dsn), $cxn_ops) };
    if ( $EVAL_ERROR ) {
       die 'Failed to get dbh for ' . $server . ': ' . $EVAL_ERROR;
@@ -216,7 +217,7 @@ sub wipe_clean {
    return;
 }
 
-# Returns a string if there is a problem with the master.
+# Returns a string if there is a problem with the source.
 sub master_is_ok {
    my ($self, $master) = @_;
    my $master_dbh = $self->get_dbh_for($master);
@@ -227,11 +228,11 @@ sub master_is_ok {
    return;
 }
 
-# Returns a string if there is a problem with the slave.
+# Returns a string if there is a problem with the replica.
 sub slave_is_ok {
    my ($self, $slave, $master, $ro) = @_;
    return if $self->is_cluster_node($slave);
-   PTDEBUG && _d('Checking if slave', $slave, $port_for{$slave},
+   PTDEBUG && _d('Checking if replica', $slave, $port_for{$slave},
       'to', $master, $port_for{$master}, 'is ok');
 
    my $slave_dbh = $self->get_dbh_for($slave);
@@ -239,11 +240,16 @@ sub slave_is_ok {
       return  "Sandbox $slave " . $port_for{$slave} . " is down.";
    }
 
+   my $vp = VersionParser->new($slave_dbh);
+   my $replica_name = 'replica';
+   if ( $vp->cmp('8.1') < 0 || $vp->flavor() =~ m/maria/i ) {
+      $replica_name = 'slave';
+   }
    my $master_port = $port_for{$master};
    my $status = $slave_dbh->selectall_arrayref(
-      "SHOW SLAVE STATUS", { Slice => {} });
+      "SHOW ${replica_name} STATUS", { Slice => {} });
    if ( !$status || !@$status ) {
-      return "Sandbox $slave " . $port_for{$slave} . " is not a slave.";
+      return "Sandbox $slave " . $port_for{$slave} . " is not a replica.";
    }
 
    if ( $status->[0]->{last_error} ) {
@@ -252,7 +258,7 @@ sub slave_is_ok {
          . $status->[0]->{last_error} . ".";
    }
 
-   foreach my $thd ( qw(slave_io_running slave_sql_running) ) {
+   foreach my $thd ( "${replica_name}_io_running", "${replica_name}_sql_running" ) {
       if ( ($status->[0]->{$thd} || 'No') eq 'No' ) {
          warn Dumper($status);
          return "Sandbox $slave " . $port_for{$slave} . " $thd thread "
@@ -272,11 +278,11 @@ sub slave_is_ok {
    my $total_t = 0;
    while ( defined $status->[0]->{seconds_behind_master}
            &&  $status->[0]->{seconds_behind_master} > 0 ) {
-      PTDEBUG && _d('Slave lag:', $status->[0]->{seconds_behind_master});
+      PTDEBUG && _d('Replica lag:', $status->[0]->{seconds_behind_master});
       sleep $sleep_t;
       $total_t += $sleep_t;
       $status = $slave_dbh->selectall_arrayref(
-         "SHOW SLAVE STATUS", { Slice => {} });
+         "SHOW ${replica_name} STATUS", { Slice => {} });
       if ( $total_t == 5 ) {
          Test::More::diag("Waiting for sandbox $slave " . $port_for{$slave}
             . " to catch up...");
@@ -293,7 +299,7 @@ sub leftover_servers {
    my ($self) = @_;
    PTDEBUG && _d('Checking for leftover servers');
    foreach my $serverno ( 1..6 ) {
-      my $server = "master$serverno";
+      my $server = "source$serverno";
       my $dbh = eval { $self->get_dbh_for($server) };
       if ( $dbh ) {
          $dbh->disconnect();
@@ -322,13 +328,13 @@ sub leftover_databases {
 sub ok {
    my ($self) = @_;
    my @errors;
-   # First, wait for all slaves to be caught up to their masters.
+   # First, wait for all replicas to be caught up to their sources.
    $self->wait_for_slaves();
-   push @errors, $self->master_is_ok('master');
-   push @errors, $self->slave_is_ok('slave1', 'master');
-   push @errors, $self->slave_is_ok('slave2', 'slave1', 1);
+   push @errors, $self->master_is_ok('source');
+   push @errors, $self->slave_is_ok('replica1', 'source');
+   push @errors, $self->slave_is_ok('replica2', 'replica1', 1);
    push @errors, $self->leftover_servers();
-   foreach my $host ( qw(master slave1 slave2) ) {
+   foreach my $host ( qw(source replica1 replica2) ) {
       push @errors, $self->leftover_databases($host);
       push @errors, $self->verify_test_data($host);
    }
@@ -337,11 +343,11 @@ sub ok {
    return !@errors;
 }
 
-# Dings a heartbeat on the master, and waits until the slave catches up fully.
+# Dings a heartbeat on the source, and waits until the replica catches up fully.
 sub wait_for_slaves {
    my ($self, %args) = @_;
-   my $master_dbh = $self->get_dbh_for($args{master} || 'master');
-   my $slave2_dbh = $self->get_dbh_for($args{slave}  || 'slave2');
+   my $master_dbh = $self->get_dbh_for($args{source} || 'source');
+   my $slave2_dbh = $self->get_dbh_for($args{replica}  || 'replica2');
    my ($ping) = $master_dbh->selectrow_array("SELECT MD5(RAND())");
    $master_dbh->do("UPDATE percona_test.sentinel SET ping='$ping' WHERE id=1 /* wait_for_slaves */");
    PerconaTest::wait_until(
@@ -353,14 +359,14 @@ sub wait_for_slaves {
    );
 }
 
-# Verifies that master, slave1, and slave2 have a faithful copy of the mysql and
+# Verifies that source, replica1, and replica2 have a faithful copy of the mysql and
 # sakila databases. The reference data is inserted into percona_test.checksums
 # by util/checksum-test-dataset when sandbox/test-env starts the environment.
 sub verify_test_data {
    my ($self, $host) = @_;
 
-   # Get the known-good checksums from the master.
-   my $master = $self->get_dbh_for('master');
+   # Get the known-good checksums from the source.
+   my $master = $self->get_dbh_for('source');
    my $ref    = $self->{checksum_ref} || $master->selectall_hashref(
          'SELECT * FROM percona_test.checksums',
          'db_tbl');
@@ -391,7 +397,7 @@ sub verify_test_data {
 
    my @checksums = @{$dbh->selectall_arrayref($sql, {Slice => {} })};
 
-   # Diff the two sets of checksums: host to master (ref).
+   # Diff the two sets of checksums: host to source (ref).
    my @diffs;
    foreach my $c ( @checksums ) {
       next unless $c->{checksum};
@@ -427,7 +433,7 @@ sub genlog {
 
 sub clear_genlogs {
    my ($self, @hosts) = @_;
-   @hosts = qw(master slave1 slave2) unless scalar @hosts;
+   @hosts = qw(source replica1 replica2) unless scalar @hosts;
    foreach my $host ( @hosts ) {
       PTDEVDEBUG && _d('Clearing general log on', $host);
       Test::More::diag(`echo > /tmp/$port_for{$host}/data/genlog`);
@@ -463,7 +469,7 @@ sub can_load_data {
 
 sub set_as_slave {
    my ($self, $server, $master_server, @extras) = @_;
-   PTDEBUG && _d("Setting $server as slave of $master_server");
+   PTDEBUG && _d("Setting $server as replica of $master_server");
    my $master_port = $port_for{$master_server};
    my $sql = join ", ", qq{change master to master_host='127.0.0.1'},
                         qq{master_user='msandbox'},
@@ -489,14 +495,14 @@ sub start_sandbox {
    _check_server($server);
    my $port = $port_for{$server};
 
-   if ( $type eq 'master') {
+   if ( $type eq 'source') {
       my $out = `$env $trunk/sandbox/start-sandbox $type $port`;
       die $out if $CHILD_ERROR;
    }
-   elsif ( $type eq 'slave' ) {
-      die "I need a slave arg" unless $args{master};
-      _check_server($args{master});
-      my $master_port = $port_for{$args{master}};
+   elsif ( $type eq 'replica' ) {
+      die "I need a replica arg" unless $args{source};
+      _check_server($args{source});
+      my $master_port = $port_for{$args{source}};
 
       my $out = `$env $trunk/sandbox/start-sandbox $type $port $master_port`;
       die $out if $CHILD_ERROR;
@@ -593,7 +599,7 @@ sub has_engine {
    my $sql = "SHOW ENGINES";
    my @engines = @{$dbh->selectall_arrayref($sql, {Slice => {} })};
 
-   # Diff the two sets of checksums: host to master (ref).
+   # Diff the two sets of checksums: host to source (ref).
    my $has_engine=0;
    foreach my $engine ( @engines ) {
       if ( $engine->{engine} =~ m/$want_engine/i ) {
diff --git a/lib/TableSyncer.pm b/lib/TableSyncer.pm
index 16f21e04b..729b93050 100644
--- a/lib/TableSyncer.pm
+++ b/lib/TableSyncer.pm
@@ -529,8 +529,8 @@ sub lock_and_wait {
                # Always use the misc_dbh dbh to check the master's position
                # because the main dbh might be in use due to executing
                # $src_sth.
-               $wait = $ms->wait_for_master(
-                  master_status => $ms->get_master_status($src->{misc_dbh}),
+               $wait = $ms->wait_for_source(
+                  source_status => $ms->get_source_status($src->{misc_dbh}),
                   slave_dbh     => $dst->{dbh},
                   timeout       => $timeout,
                );
diff --git a/sandbox/gtid_on-legacy.sql b/sandbox/gtid_on-legacy.sql
new file mode 100644
index 000000000..f436d19e7
--- /dev/null
+++ b/sandbox/gtid_on-legacy.sql
@@ -0,0 +1,8 @@
+STOP SLAVE FOR CHANNEL '';
+SET GLOBAL master_info_repository = 'TABLE';
+SET @@GLOBAL.relay_log_info_repository = 'TABLE';
+SET @@GLOBAL.ENFORCE_GTID_CONSISTENCY=ON;
+SET @@GLOBAL.GTID_MODE = OFF_PERMISSIVE;
+SET @@GLOBAL.GTID_MODE = ON_PERMISSIVE;
+SET @@GLOBAL.GTID_MODE = ON;
+
diff --git a/sandbox/prove2junit.pl b/sandbox/prove2junit.pl
deleted file mode 100755
index ef2f83072..000000000
--- a/sandbox/prove2junit.pl
+++ /dev/null
@@ -1,56 +0,0 @@
-#!/usr/bin/env perl
-
-use strict;
-use warnings;
-
-my $file = $ARGV[0];
-my $testcase = "";
-my $testsuite = "";
-my $error_collect = "";
-my $open_error = 0;
-
-if (not defined $file) {
-  die "Need filename as parameter!\n";
-}
-
-sub close_error {
-  if ( $open_error == 1 ) {
-    print "$error_collect ]]></system-err></testcase>\n";
-    $error_collect=""; $open_error=0;
-  }
-
-  return;
-}
-
-open (my $info, $file) or die "Could not open $file: $!";
-
-print "<testsuites name=\"PT-MySQL\">\n";
-while(my $line = <$info>) {
-  if ($line =~ /^(t\/)(\S+)(\/)(\S+).* (\.*) (skipped:) (.*)$/) {
-    close_error();
-    print "<testcase name=\"$4\"><skipped/><system-out>Skip reason:<![CDATA[ $7 ]]></system-out></testcase>\n";
-  }
-  elsif ($line =~ /^ok (\d+) - (.*)$/) {
-    close_error();
-    print "<testcase name=\"$testcase - test $1\"><system-out>Test description:<![CDATA[ $2 ]]></system-out></testcase>\n";
-  }
-  elsif ($line =~ /^not ok (\d+) - (.*)$/) {
-    close_error();
-    print "<testcase name=\"$testcase - test $1\"><failure/><system-out>Test description:<![CDATA[ $2 ]]></system-out><system-err><![CDATA[ ";
-    $open_error=1;
-  }
-  elsif ($line =~ /^(t\/)(\S+)(\/)(\S+).* (\.*) $/) {
-    close_error();
-    if ( "$2" eq "$testsuite" ) {
-      $testcase="$4"; $error_collect="";
-    }
-    else {
-      if ( "$testsuite" ne "" ) { print "</testsuite>\n"; }
-      $testsuite="$2"; $testcase="$4"; $error_collect=""; print "<testsuite name=\"$testsuite\">\n";
-    }
-  }
-  elsif ($line !~ /^ok$/ && $line !~ /^\d+..\d+$/) {
-    $error_collect=$error_collect . $line;
-  }
-}
-print "</testsuite>\n</testsuites>\n";
diff --git a/sandbox/replica_channels.sql b/sandbox/replica_channels.sql
new file mode 100644
index 000000000..eac899868
--- /dev/null
+++ b/sandbox/replica_channels.sql
@@ -0,0 +1,13 @@
+STOP REPLICA FOR CHANNEL '';
+SET @@GLOBAL.ENFORCE_GTID_CONSISTENCY=ON;
+SET @@GLOBAL.GTID_MODE = OFF_PERMISSIVE;
+SET @@GLOBAL.GTID_MODE = ON_PERMISSIVE;
+SET @@GLOBAL.GTID_MODE = ON;
+
+CHANGE REPLICATION SOURCE TO source_host='127.0.0.1', source_port=12345, source_user='msandbox', source_password='msandbox', source_auto_position=1 FOR CHANNEL 'sourcechan1';
+
+CHANGE REPLICATION SOURCE TO source_host='127.0.0.1', source_port=12346, source_user='msandbox', source_password='msandbox', source_auto_position=1 FOR CHANNEL 'sourcechan2';
+
+START REPLICA for channel 'sourcechan1';
+START REPLICA for channel 'sourcechan2';
+
diff --git a/sandbox/servers/8.4/my.sandbox.cnf b/sandbox/servers/8.4/my.sandbox.cnf
index b8705e035..6eeb1d110 100644
--- a/sandbox/servers/8.4/my.sandbox.cnf
+++ b/sandbox/servers/8.4/my.sandbox.cnf
@@ -3,6 +3,7 @@ user     = msandbox
 password = msandbox
 port     = PORT
 socket   = /tmp/PORT/mysql_sandboxPORT.sock
+ssl-mode=PREFERRED
 
 [mysqld]
 port                       = PORT
diff --git a/t/lib/ChangeHandler.t b/t/lib/ChangeHandler.t
index ccae1d490..fbef26dc2 100644
--- a/t/lib/ChangeHandler.t
+++ b/t/lib/ChangeHandler.t
@@ -19,8 +19,8 @@ use PerconaTest;
 
 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 $master_dbh = $sb->get_dbh_for('source');
+my $slave1_dbh = $sb->get_dbh_for('replica1');
 
 throws_ok(
    sub { new ChangeHandler() },
@@ -439,7 +439,7 @@ is(
 
 SKIP: {
    skip 'Cannot connect to sandbox master', 1 unless $master_dbh;
-   $sb->load_file('master', "t/lib/samples/issue_641.sql");
+   $sb->load_file('source', "t/lib/samples/issue_641.sql");
 
    @rows = ();
    $tbl_struct = {
@@ -503,7 +503,7 @@ is_deeply(
 # #############################################################################
 SKIP: {
    skip 'Cannot connect to sandbox master', 1 unless $master_dbh;
-   $sb->load_file('master', "t/lib/samples/bug_1038276.sql");
+   $sb->load_file('source', "t/lib/samples/bug_1038276.sql");
 
    @rows = ();
    $tbl_struct = {
@@ -542,7 +542,7 @@ SKIP: {
 # #############################################################################
 $sb->wipe_clean($master_dbh);
 $sb->wipe_clean($slave1_dbh);
+$sb->ok();
 ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox");
 
-done_testing;
-   
+done_testing; 
diff --git a/t/lib/CompareQueryTimes.t b/t/lib/CompareQueryTimes.t
index 4e67fa70b..3a6f478db 100644
--- a/t/lib/CompareQueryTimes.t
+++ b/t/lib/CompareQueryTimes.t
@@ -20,7 +20,7 @@ use PerconaTest;
 
 my $dp  = new DSNParser(opts=>$dsn_opts);
 my $sb  = new Sandbox(basedir => '/tmp', DSNParser => $dp);
-my $dbh = $sb->get_dbh_for('master');
+my $dbh = $sb->get_dbh_for('source');
 
 if ( !$dbh ) {
    plan skip_all => "Cannot connect to sandbox master";
diff --git a/t/lib/CompareResults.t b/t/lib/CompareResults.t
index 1e61bfacb..517f8ef96 100644
--- a/t/lib/CompareResults.t
+++ b/t/lib/CompareResults.t
@@ -33,8 +33,8 @@ use PerconaTest;
 
 my $dp  = new DSNParser(opts=>$dsn_opts);
 my $sb  = new Sandbox(basedir => '/tmp', DSNParser => $dp);
-my $dbh1 = $sb->get_dbh_for('master');
-my $dbh2 = $sb->get_dbh_for('slave1');
+my $dbh1 = $sb->get_dbh_for('source');
+my $dbh2 = $sb->get_dbh_for('replica1');
 
 if ( !$dbh1 ) {
    plan skip_all => "Cannot connect to sandbox master";
@@ -99,7 +99,7 @@ sub get_id {
 # Test the checksum method.
 # #############################################################################
 
-$sb->load_file('master', "t/lib/samples/compare-results.sql");
+$sb->load_file('source', "t/lib/samples/compare-results.sql");
 
 $cr = new CompareResults(
    method     => 'checksum',
@@ -308,7 +308,7 @@ my $tmpdir = '/tmp/mk-upgrade-res';
 
 diag(`rm -rf $tmpdir 2>/dev/null; mkdir $tmpdir`);
 
-$sb->load_file('master', "t/lib/samples/compare-results.sql");
+$sb->load_file('source', "t/lib/samples/compare-results.sql");
 
 $cr = new CompareResults(
    method     => 'rows',
diff --git a/t/lib/CompareWarnings.t b/t/lib/CompareWarnings.t
index 8ff4b5bdc..51754e4b4 100644
--- a/t/lib/CompareWarnings.t
+++ b/t/lib/CompareWarnings.t
@@ -22,7 +22,7 @@ use PerconaTest;
 
 my $dp  = new DSNParser(opts=>$dsn_opts);
 my $sb  = new Sandbox(basedir => '/tmp', DSNParser => $dp);
-my $dbh = $sb->get_dbh_for('master', {no_lc=>1});
+my $dbh = $sb->get_dbh_for('source', {no_lc=>1});
 
 if ( !$dbh ) {
    plan skip_all => "Cannot connect to sandbox master";
diff --git a/t/lib/CopyRowsInsertSelect.t b/t/lib/CopyRowsInsertSelect.t
index 5ecd75c6d..758170231 100644
--- a/t/lib/CopyRowsInsertSelect.t
+++ b/t/lib/CopyRowsInsertSelect.t
@@ -29,7 +29,7 @@ $Data::Dumper::Quotekeys = 0;
 
 my $dp  = new DSNParser(opts=>$dsn_opts);
 my $sb  = new Sandbox(basedir => '/tmp', DSNParser => $dp);
-my $dbh = $sb->get_dbh_for('master');
+my $dbh = $sb->get_dbh_for('source');
 
 if ( !$dbh ) {
    plan skip_all => 'Cannot connect to MySQL';
@@ -57,7 +57,7 @@ sub test_copy_table {
    my (%args) = @_;
    my ($tbl, $col, $expect) = @args{qw(tbl col expect)};
 
-   $sb->load_file("master", "t/lib/samples/osc/$tbl");
+   $sb->load_file("source", "t/lib/samples/osc/$tbl");
    $dbh->do("USE osc");
 
    $osc->copy(
diff --git a/t/lib/Cxn.t b/t/lib/Cxn.t
index 3ec841530..f7df8428a 100644
--- a/t/lib/Cxn.t
+++ b/t/lib/Cxn.t
@@ -23,9 +23,9 @@ use Data::Dumper;
 my $q   = new Quoter();
 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 $slave1_dsn = $sb->dsn_for('slave1');
+my $master_dbh = $sb->get_dbh_for('source');
+my $slave1_dbh = $sb->get_dbh_for('replica1');
+my $slave1_dsn = $sb->dsn_for('replica1');
 
 if ( !$master_dbh ) {
    plan skip_all => 'Cannot connect to sandbox master';
@@ -125,7 +125,7 @@ ok(
    "cxn->connect()"
 );
 
-my ($row) = $cxn->dbh()->selectrow_hashref('SHOW MASTER STATUS');
+my ($row) = $cxn->dbh()->selectrow_hashref("SHOW ${source_status} STATUS");
 ok(
    exists $row->{binlog_ignore_db},
    "FetchHashKeyName = NAME_lc",
@@ -174,7 +174,7 @@ test_var_val(
 $cxn->dbh()->disconnect();
 $cxn->connect();
 
-($row) = $cxn->dbh()->selectrow_hashref('SHOW MASTER STATUS');
+($row) = $cxn->dbh()->selectrow_hashref("SHOW ${source_status} STATUS");
 ok(
    exists $row->{binlog_ignore_db},
    "Reconnect FetchHashKeyName = NAME_lc",
@@ -213,6 +213,7 @@ is_deeply(
       S => undef,
       D => undef,
       t => undef,
+      mysql_ssl => undef,
    },
    "cxn->dsn()"
 );
@@ -240,6 +241,7 @@ is_deeply(
       S => undef,
       D => undef,
       t => undef,
+      mysql_ssl => undef,
    },
    "Defaults to h=localhost"
 );
@@ -259,6 +261,7 @@ is_deeply(
       S => undef,
       D => undef,
       t => undef,
+      mysql_ssl => undef,
    },
    "Default cxn inherits default connection options"
 );
@@ -339,7 +342,7 @@ SKIP: {
       "First connect()"
    );
 
-   ($row) = $cxn->dbh()->selectrow_hashref('SHOW SLAVE STATUS');
+   ($row) = $cxn->dbh()->selectrow_hashref("SHOW ${replica_name} STATUS");
    ok(
       !defined $row,
       "First connect() to master"
@@ -356,7 +359,7 @@ SKIP: {
 PXC_SKIP: {
       skip 'Not for PXC' if ( $sb->is_cluster_mode );
 
-      ($row) = $cxn->dbh()->selectrow_hashref('SHOW SLAVE STATUS');
+      ($row) = $cxn->dbh()->selectrow_hashref("SHOW ${replica_name} STATUS");
       ok(
          $row,
          "Re-connect connect(slave_dsn) to slave"
@@ -370,7 +373,7 @@ PXC_SKIP: {
          "Re-re-connect connect()"
       );
 
-      ($row) = $cxn->dbh()->selectrow_hashref('SHOW SLAVE STATUS');
+      ($row) = $cxn->dbh()->selectrow_hashref("SHOW ${source_status} STATUS");
       ok(
          $row,
          "Re-re-connect connect() to slave"
diff --git a/t/lib/DSNParser.t b/t/lib/DSNParser.t
index 98ebc33aa..df9d381e3 100644
--- a/t/lib/DSNParser.t
+++ b/t/lib/DSNParser.t
@@ -527,6 +527,7 @@ my @password_commas = (
    ['u=a,p=foo\,,P=12345',    'foo,',    12345, 'Pass ends with comma'],
    ['u=a,p=foo\,',            'foo,',    undef, 'Pass ends with comma, last part'],
    ['u=a,p=\,,P=12345',       ',',       12345, 'Pass is a comma'],
+   ['u=a,p=foo=bar,P=12345',  'foo=bar', 12345, '= in a pass'],
 );
 foreach my $password_comma ( @password_commas ) {
    test_password_comma(@$password_comma);
@@ -551,8 +552,9 @@ sub test_password_comma_with_auto {
 }
 
 @password_commas = (
-   ['host,p=a\,z,P=9', 'a,z', 9, 'Comma-pass with leading bareword host'],
-   ['p=a\,z,P=9,host', 'a,z', 9, 'Comma-pass with trailing bareword host'],
+   ['host,p=a\,z,P=9',    'a,z',     9, 'Comma-pass with leading bareword host'],
+   ['p=a\,z,P=9,host',    'a,z',     9, 'Comma-pass with trailing bareword host'],
+   ['p=foo=bar,P=9,host', 'foo=bar', 9, '= in a pass with trailing bareword host'],
 
 );
 foreach my $password_comma ( @password_commas ) {
diff --git a/t/lib/ExplainAnalyzer.t b/t/lib/ExplainAnalyzer.t
index 1e5ef2268..92451259c 100644
--- a/t/lib/ExplainAnalyzer.t
+++ b/t/lib/ExplainAnalyzer.t
@@ -26,7 +26,7 @@ use PerconaTest;
 
 my $dp  = new DSNParser(opts=>$dsn_opts);
 my $sb  = new Sandbox(basedir => '/tmp', DSNParser => $dp);
-my $dbh = $sb->get_dbh_for('master', {no_lc=>1});
+my $dbh = $sb->get_dbh_for('source', {no_lc=>1});
 
 if ( !$dbh ) {
    plan skip_all => "Cannot connect to sandbox master";
diff --git a/t/lib/IndexLength.pm b/t/lib/IndexLength.pm
index a61644baa..a1d3d544c 100644
--- a/t/lib/IndexLength.pm
+++ b/t/lib/IndexLength.pm
@@ -31,7 +31,7 @@ $Data::Dumper::Quotekeys = 0;
 
 my $dp  = new DSNParser(opts=>$dsn_opts);
 my $sb  = new Sandbox(basedir => '/tmp', DSNParser => $dp);
-my $dbh = $sb->get_dbh_for('master');
+my $dbh = $sb->get_dbh_for('source');
 
 if ( !$dbh ) {
    plan skip_all => 'Cannot connect to sandbox master';
@@ -77,7 +77,7 @@ sub test_index_len {
 # #############################################################################
 # bad_plan, PK with 4 cols
 # #############################################################################
-$sb->load_file('master', "t/pt-table-checksum/samples/bad-plan-bug-1010232.sql");
+$sb->load_file('source', "t/pt-table-checksum/samples/bad-plan-bug-1010232.sql");
 my $tbl_struct = $tp->parse(
    $tp->get_create_table($dbh, 'bad_plan', 't'));
 my $tbl = {
diff --git a/t/lib/IndexUsage.t b/t/lib/IndexUsage.t
index 066acaeb9..1ba8bc0d7 100644
--- a/t/lib/IndexUsage.t
+++ b/t/lib/IndexUsage.t
@@ -31,7 +31,7 @@ Transformers->import(qw(make_checksum));
 my $qr  = new QueryRewriter();
 my $dp  = new DSNParser(opts=>$dsn_opts);
 my $sb  = new Sandbox(basedir => '/tmp', DSNParser => $dp);
-my $dbh = $sb->get_dbh_for('master');
+my $dbh = $sb->get_dbh_for('source');
 
 my $iu = new IndexUsage();
 
diff --git a/t/lib/KeySize.t b/t/lib/KeySize.t
index 10bb326e0..6295d845a 100644
--- a/t/lib/KeySize.t
+++ b/t/lib/KeySize.t
@@ -21,7 +21,7 @@ require VersionParser;
 
 my $dp  = new DSNParser(opts=>$dsn_opts);
 my $sb  = new Sandbox(basedir => '/tmp', DSNParser => $dp);
-my $dbh = $sb->get_dbh_for('master');
+my $dbh = $sb->get_dbh_for('source');
 
 if ( !$dbh ) {
    plan skip_all => "Cannot connect to sandbox master";
@@ -38,7 +38,7 @@ my ($size, $chosen_key);
 
 sub key_info {
    my ( $file, $db, $tbl, $key, $cols ) = @_;
-   $sb->load_file('master', $file, $db);
+   $sb->load_file('source', $file, $db);
    my $tbl_name = $q->quote($db, $tbl);
    my $struct   = $tp->parse( load_file($file) );
    return (
@@ -83,7 +83,7 @@ is_deeply(
    'Two column int key'
 );
 
-$sb->load_file('master', 't/lib/samples/issue_331-parent.sql', 'test');
+$sb->load_file('source', 't/lib/samples/issue_331-parent.sql', 'test');
 %key = key_info('t/lib/samples/issue_331.sql', 'test', 'issue_331_t2', 'fk_1', ['id']);
 ($size, $chosen_key) = $ks->get_key_size(%key);
 is(
@@ -110,7 +110,7 @@ $dbh->do('DROP TABLE IF EXISTS test.issue_364');
    'BASE_KID_ID',
    [qw(BASE_KID_ID ID)]
 );
-$sb->load_file('master', 't/lib/samples/issue_364-data.sql', 'test');
+$sb->load_file('source', 't/lib/samples/issue_364-data.sql', 'test');
 
 # This issue had another issue: the key is ALL CAPS, but TableParser
 # lowercases all identifies, so KeySize said the key didn't exist.
@@ -214,7 +214,7 @@ is(
 # #############################################################################
 # https://bugs.launchpad.net/percona-toolkit/+bug/1201443
 # #############################################################################
-$sb->load_file('master', "t/pt-duplicate-key-checker/samples/fk_chosen_index_bug_1201443.sql");
+$sb->load_file('source', "t/pt-duplicate-key-checker/samples/fk_chosen_index_bug_1201443.sql");
 
 ($size, $chosen_key) = $ks->get_key_size(
    name       => 'child_ibfk_2',
diff --git a/t/lib/MasterSlave.t b/t/lib/MasterSlave.t
index 420784257..e05856b53 100644
--- a/t/lib/MasterSlave.t
+++ b/t/lib/MasterSlave.t
@@ -25,8 +25,8 @@ use Data::Dumper;
 my $dp = new DSNParser(opts=>$dsn_opts);
 my $sb = new Sandbox(basedir => '/tmp', DSNParser => $dp);
 
-my $master_dbh = $sb->get_dbh_for('master');
-my $slave_dbh  = $sb->get_dbh_for('slave1');
+my $master_dbh = $sb->get_dbh_for('source');
+my $slave_dbh  = $sb->get_dbh_for('replica1');
 my $master_dsn = {
    h => '127.1',
    P => '12345',
@@ -81,9 +81,10 @@ PXC_SKIP: {
             h => '127.0.0.1',
             p => 'msandbox',
             t => undef,
+            mysql_ssl => undef,
             u => 'msandbox',
             server_id => 12346,
-            master_id => 12345,
+            source_id => 12345,
             source    => 'hosts',
          },
          'get_slaves() from recurse_to_slaves() with a default --recursion-method'
@@ -137,7 +138,7 @@ PXC_SKIP: {
       diag(`/tmp/12345/use -u root < $trunk/t/lib/samples/ro-checksum-user.sql`);
 
       my $ro_dbh = DBI->connect(
-         "DBI:mysql:;host=127.0.0.1;port=12345", 'ro_checksum_user', 'msandbox',
+         "DBI:mysql:;host=127.0.0.1;port=12345;mysql_ssl=1", 'ro_checksum_user', 'msandbox',
               { PrintError => 0, RaiseError => 1 });
       my $ro_dsn = {
          h => '127.1',
@@ -219,20 +220,20 @@ PXC_SKIP: {
 # sandbox servers) as seen in the %port_for hash below.
 # #############################################################################
 my %port_for = (
-   master => 2900,
-   slave0 => 2901,
-   slave1 => 2902,
-   slave2 => 2903,
+   source => 2900,
+   replica0 => 2901,
+   replica1 => 2902,
+   replica2 => 2903,
 );
 foreach my $port ( values %port_for ) {
    if ( -d "/tmp/$port" ) {
       diag(`$trunk/sandbox/stop-sandbox $port >/dev/null 2>&1`);
    }
 }
-diag(`$trunk/sandbox/start-sandbox master 2900`);
-diag(`$trunk/sandbox/start-sandbox slave 2903 2900`);
-diag(`$trunk/sandbox/start-sandbox slave 2901 2900`);
-diag(`$trunk/sandbox/start-sandbox slave 2902 2901`);
+diag(`$trunk/sandbox/start-sandbox source 2900`);
+diag(`$trunk/sandbox/start-sandbox replica 2903 2900`);
+diag(`$trunk/sandbox/start-sandbox replica 2901 2900`);
+diag(`$trunk/sandbox/start-sandbox replica 2902 2901`);
 
 # I discovered something weird while updating this test. Above, you see that
 # slave2 is started first, then the others. Before, slave2 was started last,
@@ -256,7 +257,7 @@ my $dbh;
 my @slaves;
 my @sldsns;
 
-my $dsn = $dp->parse("h=127.0.0.1,P=$port_for{master},u=msandbox,p=msandbox");
+my $dsn = $dp->parse("h=127.0.0.1,P=$port_for{source},u=msandbox,p=msandbox,mysql_ssl=>1");
 $dbh    = $dp->get_dbh($dp->get_cxn_params($dsn), { AutoCommit => 1 });
 
 my $callback = sub {
@@ -294,16 +295,17 @@ is(
 ) or diag(Dumper(\@slaves));
 
 is_deeply(
-   $ms->get_master_dsn( $slaves[0], undef, $dp ),
+   $ms->get_source_dsn( $slaves[0], undef, $dp ),
    {  h => '127.0.0.1',
       u => undef,
-      P => $port_for{master},
+      P => $port_for{source},
       S => undef,
       F => undef,
       p => undef,
       D => undef,
       A => undef,
       t => undef,
+      mysql_ssl => undef,
    },
    'Got master DSN',
 );
@@ -313,17 +315,17 @@ is_deeply(
 # +- 127.0.0.1:slave0
 # |  +- 127.0.0.1:slave1
 # +- 127.0.0.1:slave2
-is($ms->get_slave_status($slaves[0])->{master_port}, $port_for{master}, 'slave 1 port');
-is($ms->get_slave_status($slaves[1])->{master_port}, $port_for{slave0}, 'slave 2 port');
-is($ms->get_slave_status($slaves[2])->{master_port}, $port_for{master}, 'slave 3 port');
+is($ms->get_slave_status($slaves[0])->{source_port}, $port_for{source}, 'slave 1 port');
+is($ms->get_slave_status($slaves[1])->{source_port}, $port_for{replica0}, 'slave 2 port');
+is($ms->get_slave_status($slaves[2])->{source_port}, $port_for{source}, 'slave 3 port');
 
-ok($ms->is_master_of($slaves[0], $slaves[1]), 'slave 1 is slave of slave 0');
+ok($ms->is_source_of($slaves[0], $slaves[1]), 'slave 1 is slave of slave 0');
 eval {
-   $ms->is_master_of($slaves[0], $slaves[2]);
+   $ms->is_source_of($slaves[0], $slaves[2]);
 };
-like($EVAL_ERROR, qr/but the master's port/, 'slave 2 is not slave of slave 0');
+like($EVAL_ERROR, qr/but the ${source_name}'s port/, 'slave 2 is not slave of slave 0');
 eval {
-   $ms->is_master_of($slaves[2], $slaves[1]);
+   $ms->is_source_of($slaves[2], $slaves[1]);
 };
 like($EVAL_ERROR, qr/has no connected slaves/, 'slave 1 is not slave of slave 2');
 
@@ -334,8 +336,8 @@ map { $ms->start_slave($_) } @slaves;
 sleep(5);
 
 my $res;
-$res = $ms->wait_for_master(
-   master_status => $ms->get_master_status($dbh),
+$res = $ms->wait_for_source(
+   source_status => $ms->get_source_status($dbh),
    slave_dbh     => $slaves[0],
    timeout       => 10,
 );
@@ -348,10 +350,10 @@ $dbh->do('create database test');
 $dbh->do('create table test.t(a int)');
 $dbh->do('insert into test.t(a) values(1)');
 $dbh->do('update test.t set a=sleep(5)');
-diag(`(/tmp/$port_for{slave0}/use -e 'start slave')&`);
+diag(`(/tmp/$port_for{replica0}/use -e 'start ${replica_name}')&`);
 eval {
-   $res = $ms->wait_for_master(
-      master_status => $ms->get_master_status($dbh),
+   $res = $ms->wait_for_source(
+      source_status => $ms->get_source_status($dbh),
       slave_dbh     => $slaves[0],
       timeout       => 1,
    );
@@ -366,11 +368,11 @@ sleep 1;
 $ms->stop_slave($slaves[0]);
 $dbh->do('drop database if exists test'); # Any stmt will do
 eval {
-   $res = $ms->catchup_to_master($slaves[0], $dbh, 10);
+   $res = $ms->catchup_to_source($slaves[0], $dbh, 10);
 };
 diag $EVAL_ERROR if $EVAL_ERROR;
 ok(!$EVAL_ERROR, 'No eval error catching up');
-my $master_stat = $ms->get_master_status($dbh);
+my $master_stat = $ms->get_source_status($dbh);
 my $slave_stat = $ms->get_slave_status($slaves[0]);
 is_deeply(
    $ms->repl_posn($master_stat),
@@ -626,8 +628,8 @@ PXC_SKIP: {
    diag(`/tmp/12345/start >/dev/null 2>&1`);
    diag(`/tmp/12346/start >/dev/null 2>&1`);
    
-   $master_dbh = $sb->get_dbh_for('master');
-   $slave_dbh  = $sb->get_dbh_for('slave1');
+   $master_dbh = $sb->get_dbh_for('source');
+   $slave_dbh  = $sb->get_dbh_for('replica1');
 
    is_deeply(
       $ms->get_replication_filters(dbh=>$master_dbh),
@@ -651,10 +653,10 @@ PXC_SKIP: {
    diag(`mv /tmp/12345/orig.cnf /tmp/12345/my.sandbox.cnf`);
    diag(`/tmp/12345/start >/dev/null`);
    diag(`/tmp/12346/start >/dev/null`);
-   diag(`/tmp/12347/use -e "STOP SLAVE; START SLAVE;" >/dev/null`);
+   diag(`/tmp/12347/use -e "STOP ${replica_name}; START ${replica_name};" >/dev/null`);
 
-   $master_dbh = $sb->get_dbh_for('master');
-   $slave_dbh  = $sb->get_dbh_for('slave1');
+   $master_dbh = $sb->get_dbh_for('source');
+   $slave_dbh  = $sb->get_dbh_for('replica1');
 };
 
 is(
@@ -671,7 +673,7 @@ ok(
 # ############################################################################
 # get_slaves() and DSN table
 # ############################################################################
-$sb->load_file('master', "t/lib/samples/MasterSlave/dsn_table.sql");
+$sb->load_file('source', "t/lib/samples/MasterSlave/dsn_table.sql");
 
 @ARGV = ('--recursion-method', 'dsn=F=/tmp/12345/my.sandbox.cnf,D=dsn_t,t=dsns');
 $o->get_opts();
@@ -702,6 +704,7 @@ is_deeply(
       p => 'msandbox',
       t => undef,
       u => 'msandbox',
+      mysql_ssl => undef,
    },
    'get_slaves() from DSN table'
 );
@@ -766,22 +769,22 @@ SKIP: {
    skip "Only test on mysql 5.7",6 if ( $sandbox_version lt '5.7' );
 
    my ($master1_dbh, $master1_dsn) = $sb->start_sandbox(
-      server => 'chan_master1',
-      type   => 'master',
+      server => 'chan_source1',
+      type   => 'source',
    );
    my ($master2_dbh, $master2_dsn) = $sb->start_sandbox(
-      server => 'chan_master2',
-      type   => 'master',
+      server => 'chan_source2',
+      type   => 'source',
    );
    my ($slave1_dbh, $slave1_dsn) = $sb->start_sandbox(
-      server => 'chan_slave1',
-      type   => 'master',
+      server => 'chan_replica1',
+      type   => 'source',
    );
-   my $slave1_port = $sb->port_for('chan_slave1');
+   my $slave1_port = $sb->port_for('chan_replica1');
    
-   $sb->load_file('chan_master1', "sandbox/gtid_on.sql", undef, no_wait => 1);
-   $sb->load_file('chan_master2', "sandbox/gtid_on.sql", undef, no_wait => 1);
-   $sb->load_file('chan_slave1', "sandbox/slave_channels.sql", undef, no_wait => 1);
+   $sb->load_file('chan_source1', "sandbox/gtid_on.sql", undef, no_wait => 1);
+   $sb->load_file('chan_source2', "sandbox/gtid_on.sql", undef, no_wait => 1);
+   $sb->load_file('chan_replica1', "sandbox/replica_channels.sql", undef, no_wait => 1);
                                                              
    my $chan_slaves;
    eval {
@@ -822,8 +825,8 @@ SKIP: {
 
    my $wfm;
    eval {
-       $wfm = $ms->wait_for_master(
-          master_status => $ms->get_master_status($dbh),
+       $wfm = $ms->wait_for_source(
+          source_status => $ms->get_source_status($dbh),
           slave_dbh     => $slave1_dbh,
           timeout       => 1,
        );
@@ -839,7 +842,7 @@ SKIP: {
    # After stopping one of the replication channels, show slave status returns only one slave
    # but it has a channel name and we didn't specified a channels name in the command line.
    # It should return undef
-   $slave1_dbh->do("STOP SLAVE for channel 'sourcechan2'");
+   $slave1_dbh->do("STOP ${replica_name} for channel 'sourcechan2'");
 
    eval {
        $css = $ms->get_slave_status($slave1_dbh);
@@ -850,7 +853,7 @@ SKIP: {
        'Cannot determine slave in a multi source config without --channel param (only one server)'
    );
 
-   $slave1_dbh->do("START SLAVE for channel 'sourcechan2'");
+   $slave1_dbh->do("START ${replica_name} for channel 'sourcechan2'");
 
    # Now try specifying a channel name 
    $ms->{channel} = 'sourcechan1';
@@ -861,8 +864,8 @@ SKIP: {
        'Returned the correct slave',
    );
 
-   $wfm = $ms->wait_for_master(
-      master_status => $ms->get_master_status($dbh),
+   $wfm = $ms->wait_for_source(
+      source_status => $ms->get_source_status($dbh),
       slave_dbh     => $slave1_dbh,
       timeout       => 1,
    );
@@ -872,7 +875,7 @@ SKIP: {
        'Wait for master returned no error',
    );
 
-   $sb->stop_sandbox(qw(chan_master1 chan_master2 chan_slave1));
+   $sb->stop_sandbox(qw(chan_source1 chan_source2 chan_replica1));
 }
 
 my $connected_slaves = [
diff --git a/t/lib/MockSyncStream.t b/t/lib/MockSyncStream.t
index b1f123873..24f56d382 100644
--- a/t/lib/MockSyncStream.t
+++ b/t/lib/MockSyncStream.t
@@ -81,7 +81,7 @@ use DSNParser;
 use Sandbox;
 my $dp  = new DSNParser(opts=>$dsn_opts);
 my $sb  = new Sandbox(basedir => '/tmp', DSNParser => $dp);
-my $dbh = $sb->get_dbh_for('master');
+my $dbh = $sb->get_dbh_for('source');
 
 SKIP: {
    skip 'Cannot connect to sandbox mater', 2 unless $dbh;
diff --git a/t/lib/MySQLConfig.t b/t/lib/MySQLConfig.t
index 190b50180..67dfcb636 100644
--- a/t/lib/MySQLConfig.t
+++ b/t/lib/MySQLConfig.t
@@ -19,7 +19,7 @@ use PerconaTest;
 
 my $dp  = new DSNParser(opts=>$dsn_opts);
 my $sb  = new Sandbox(basedir => '/tmp', DSNParser => $dp);
-my $dbh = $sb->get_dbh_for('master');
+my $dbh = $sb->get_dbh_for('source');
 
 use Data::Dumper;
 $Data::Dumper::Indent    = 1;
diff --git a/t/lib/NibbleIterator.t b/t/lib/NibbleIterator.t
index 922bf11e9..0021739fe 100644
--- a/t/lib/NibbleIterator.t
+++ b/t/lib/NibbleIterator.t
@@ -34,7 +34,7 @@ $Data::Dumper::Quotekeys = 0;
 
 my $dp  = new DSNParser(opts=>$dsn_opts);
 my $sb  = new Sandbox(basedir => '/tmp', DSNParser => $dp);
-my $dbh = $sb->get_dbh_for('master');
+my $dbh = $sb->get_dbh_for('source');
 
 if ( !$dbh ) {
    plan skip_all => 'Cannot connect to sandbox master';
@@ -69,7 +69,7 @@ sub make_nibble_iter {
 
 
    if (my $file = $args{sql_file}) {
-      $sb->load_file('master', "$in/$file");
+      $sb->load_file('source', "$in/$file");
    }
 
    @ARGV = $args{argv} ? @{$args{argv}} : ();
@@ -622,7 +622,7 @@ is_deeply(
 # ############################################################################
 # Avoid infinite loops.
 # ############################################################################
-$sb->load_file('master', "$in/bad_tables.sql");
+$sb->load_file('source', "$in/bad_tables.sql");
 $dbh->do('analyze table bad_tables.inv');
 $ni = make_nibble_iter(
    db   => 'bad_tables',
@@ -855,7 +855,7 @@ is(
 # https://bugs.launchpad.net/percona-toolkit/+bug/995274
 # Index case-sensitivity.
 # #############################################################################
-$sb->load_file('master', "t/pt-table-checksum/samples/undef-arrayref-bug-995274.sql");
+$sb->load_file('source', "t/pt-table-checksum/samples/undef-arrayref-bug-995274.sql");
 
 eval {
    $ni = make_nibble_iter(
diff --git a/t/lib/OobNibbleIterator.t b/t/lib/OobNibbleIterator.t
index 55e26d257..a2f933439 100644
--- a/t/lib/OobNibbleIterator.t
+++ b/t/lib/OobNibbleIterator.t
@@ -34,7 +34,7 @@ $Data::Dumper::Quotekeys = 0;
 
 my $dp  = new DSNParser(opts=>$dsn_opts);
 my $sb  = new Sandbox(basedir => '/tmp', DSNParser => $dp);
-my $dbh = $sb->get_dbh_for('master');
+my $dbh = $sb->get_dbh_for('source');
 my $output;
 
 plan skip_all => 'Cannot connect to sandbox master';
@@ -72,7 +72,7 @@ sub make_nibble_iter {
    my (%args) = @_;
 
    if (my $file = $args{sql_file}) {
-      $sb->load_file('master', "$in/$file");
+      $sb->load_file('source', "$in/$file");
    }
 
    @ARGV = $args{argv} ? @{$args{argv}} : ();
@@ -258,7 +258,7 @@ ok(
 # Empty table
 # https://bugs.launchpad.net/percona-toolkit/+bug/987393 
 # #############################################################################
-$sb->load_file('master', "t/pt-table-checksum/samples/empty-table-bug-987393.sql");
+$sb->load_file('source', "t/pt-table-checksum/samples/empty-table-bug-987393.sql");
 
 $ni = make_nibble_iter(
    db       => 'test',
diff --git a/t/lib/Outfile.t b/t/lib/Outfile.t
index 90fe21611..22de868a6 100644
--- a/t/lib/Outfile.t
+++ b/t/lib/Outfile.t
@@ -20,7 +20,7 @@ use PerconaTest;
 # instead of writing test rows by hand.
 my $dp  = new DSNParser(opts=>$dsn_opts);
 my $sb  = new Sandbox(basedir => '/tmp', DSNParser => $dp);
-my $dbh = $sb->get_dbh_for('master');
+my $dbh = $sb->get_dbh_for('source');
 
 my $outfile = new Outfile();
 
diff --git a/t/lib/Percona/XtraDB/Cluster-no-PXC.t b/t/lib/Percona/XtraDB/Cluster-no-PXC.t
index 044561db5..08c70a29d 100644
--- a/t/lib/Percona/XtraDB/Cluster-no-PXC.t
+++ b/t/lib/Percona/XtraDB/Cluster-no-PXC.t
@@ -31,7 +31,7 @@ use Percona::XtraDB::Cluster;
 my $q   = new Quoter();
 my $dp  = new DSNParser(opts=>$dsn_opts);
 my $sb  = new Sandbox(basedir => '/tmp', DSNParser => $dp);
-my $master_dbh = $sb->get_dbh_for('master');
+my $master_dbh = $sb->get_dbh_for('source');
 
 my $cluster = Percona::XtraDB::Cluster->new();
 my $db_flavor = VersionParser->new($master_dbh)->flavor();
@@ -74,14 +74,14 @@ local @ARGV = ();
 $o->get_opts();
 
 diag("Starting master1");
-$sb->start_sandbox(type => "master", server => "master1");
+$sb->start_sandbox(type => "source", server => "source1");
 
 my ($master_cxn, $slave1_cxn, $master1_cxn)
    = map {
          my $cxn = make_cxn( dsn_string => $sb->dsn_for($_) );
          $cxn->connect();
          $cxn;
-   } qw( master slave1 master1 );
+   } qw( source replica1 source1 );
 
 for my $cxn ( $master_cxn, $slave1_cxn, $master1_cxn ) {
    ok(
@@ -90,7 +90,7 @@ for my $cxn ( $master_cxn, $slave1_cxn, $master1_cxn ) {
    );
 }
 
-diag($sb->stop_sandbox("master1"));
+diag($sb->stop_sandbox("source1"));
 
 # #############################################################################
 # Done.
diff --git a/t/lib/Percona/XtraDB/Cluster.t b/t/lib/Percona/XtraDB/Cluster.t
index 9231c603d..24fd91167 100644
--- a/t/lib/Percona/XtraDB/Cluster.t
+++ b/t/lib/Percona/XtraDB/Cluster.t
@@ -31,7 +31,7 @@ use Percona::XtraDB::Cluster;
 my $q   = new Quoter();
 my $dp  = new DSNParser(opts=>$dsn_opts);
 my $sb  = new Sandbox(basedir => '/tmp', DSNParser => $dp);
-my $master_dbh = $sb->get_dbh_for('master');
+my $master_dbh = $sb->get_dbh_for('source');
 
 my $cluster = Percona::XtraDB::Cluster->new();
 
@@ -75,9 +75,9 @@ local @ARGV = ();
 $o->get_opts();
 
 diag("Starting master1");
-$sb->start_sandbox(type => "master", server => "master1");
+$sb->start_sandbox(type => "source", server => "source1");
 
-my $master1_cxn = make_cxn( dsn_string => $sb->dsn_for("master1") );
+my $master1_cxn = make_cxn( dsn_string => $sb->dsn_for("source1") );
 $master1_cxn->connect();
 
 diag("Starting a 1-node PXC");
@@ -94,7 +94,7 @@ ok(
 );
 
 diag("Setting node as a slave of master1");
-$sb->set_as_slave("node4", "master1");
+$sb->set_as_slave("node4", "source1");
 ok(
    !$cluster->same_cluster($master1_cxn, $cxn1),
    "->same_cluster works for master -> cluster"
@@ -109,7 +109,7 @@ $cxn1 = make_cxn( dsn_string => $c->{node4}->{dsn} );
 $cxn1->connect();
 
 diag("Setting master1 as a slave of the node");
-$sb->set_as_slave("master1", "node4");
+$sb->set_as_slave("source1", "node4");
 ok(
    !$cluster->same_cluster($cxn1, $master1_cxn),
    "->same_cluster works for cluster -> master"
@@ -178,7 +178,7 @@ ok(
 
 diag($sb->stop_sandbox(qw(node4 node5 node6 node7)));
 
-diag($sb->stop_sandbox("master1"));
+diag($sb->stop_sandbox("source1"));
 
 # #############################################################################
 # Done.
diff --git a/t/lib/QueryHistory.t b/t/lib/QueryHistory.t
index 8b185ad5e..552f0a492 100644
--- a/t/lib/QueryHistory.t
+++ b/t/lib/QueryHistory.t
@@ -22,14 +22,14 @@ use PerconaTest;
 
 my $dp  = new DSNParser(opts=>$dsn_opts);
 my $sb  = new Sandbox(basedir => '/tmp', DSNParser => $dp);
-my $dbh = $sb->get_dbh_for('master', {no_lc=>1});
+my $dbh = $sb->get_dbh_for('source', {no_lc=>1});
 
 if ( !$dbh ) {
    plan skip_all => "Cannot connect to sandbox master";
 }
 
 $sb->create_dbs($dbh, ['test']);
-$sb->load_file('master', "t/lib/samples/query_review.sql");
+$sb->load_file('source', "t/lib/samples/query_review.sql");
 my $output = "";
 my $tp = new TableParser(Quoter => 'Quoter');
 my $opt_parser = new OptionParser( description => 'QueryHistory tests' );
diff --git a/t/lib/QueryReportFormatter.t b/t/lib/QueryReportFormatter.t
index 2ad9801e1..61682dfe8 100644
--- a/t/lib/QueryReportFormatter.t
+++ b/t/lib/QueryReportFormatter.t
@@ -32,7 +32,7 @@ use PerconaTest;
 
 my $dp  = new DSNParser(opts=>$dsn_opts);
 my $sb  = new Sandbox(basedir => '/tmp', DSNParser => $dp);
-my $dbh = $sb->get_dbh_for('master', {no_lc=>1});  # for explain sparkline
+my $dbh = $sb->get_dbh_for('source', {no_lc=>1});  # for explain sparkline
 
 my ($result, $events, $expected);
 
@@ -1186,7 +1186,7 @@ ok(
 # #############################################################################
 SKIP: {
    skip 'Cannot connect to sandbox master', 3 unless $dbh;
-   $sb->load_file('master', "t/lib/samples/QueryReportFormatter/table.sql");
+   $sb->load_file('source', "t/lib/samples/QueryReportFormatter/table.sql");
 
    @ARGV = qw(--explain F=/tmp/12345/my.sandbox.cnf);
    $o->get_opts();
diff --git a/t/lib/QueryReview.t b/t/lib/QueryReview.t
index f294ffdd0..cf61cc70c 100644
--- a/t/lib/QueryReview.t
+++ b/t/lib/QueryReview.t
@@ -23,14 +23,14 @@ use PerconaTest;
 
 my $dp  = new DSNParser(opts=>$dsn_opts);
 my $sb  = new Sandbox(basedir => '/tmp', DSNParser => $dp);
-my $dbh = $sb->get_dbh_for('master', {no_lc=>1, AutoCommit => 1});
+my $dbh = $sb->get_dbh_for('source', {no_lc=>1, AutoCommit => 1});
 
 if ( !$dbh ) {
    plan skip_all => "Cannot connect to sandbox master";
 }
 
 $sb->create_dbs($dbh, ['test']);
-$sb->load_file('master', "t/lib/samples/query_review.sql");
+$sb->load_file('source', "t/lib/samples/query_review.sql");
 my $output = "";
 my $qr = new QueryRewriter();
 my $lp = new SlowLogParser;
diff --git a/t/lib/Quoter.t b/t/lib/Quoter.t
index b07c10af6..c29e0b0ac 100644
--- a/t/lib/Quoter.t
+++ b/t/lib/Quoter.t
@@ -19,7 +19,7 @@ use Sandbox;
 
 my $dp  = new DSNParser(opts=>$dsn_opts);
 my $sb  = new Sandbox(basedir => '/tmp', DSNParser => $dp);
-my $dbh = $sb->get_dbh_for('master');
+my $dbh = $sb->get_dbh_for('source');
 
 my $q = new Quoter;
 
@@ -213,7 +213,7 @@ SKIP: {
    }
 };
 
-my $utf8_dbh = $sb->get_dbh_for('master');
+my $utf8_dbh = $sb->get_dbh_for('source');
 $utf8_dbh->{mysql_enable_utf8} = 1;
 $utf8_dbh->do("SET NAMES 'utf8'");
 SKIP: {
diff --git a/t/lib/RowChecksum.t b/t/lib/RowChecksum.t
index 37febef06..4468b0089 100644
--- a/t/lib/RowChecksum.t
+++ b/t/lib/RowChecksum.t
@@ -21,7 +21,7 @@ use PerconaTest;
 
 my $dp = new DSNParser(opts=>$dsn_opts);
 my $sb = new Sandbox(basedir => '/tmp', DSNParser => $dp);
-my $dbh = $sb->get_dbh_for('master');
+my $dbh = $sb->get_dbh_for('source');
 
 if ( !$dbh ) {
    plan skip_all => "Cannot connect to sandbox master";
@@ -397,7 +397,7 @@ is(
 # #############################################################################
 # Issue 94: Enhance mk-table-checksum, add a --ignorecols option
 # #############################################################################
-$sb->load_file('master', 't/lib/samples/issue_94.sql');
+$sb->load_file('source', 't/lib/samples/issue_94.sql');
 $tbl = {
    db         => 'test',
    tbl        => 'issue_94',
diff --git a/t/lib/RowDiff-custom.t b/t/lib/RowDiff-custom.t
index be1083089..32172aac3 100644
--- a/t/lib/RowDiff-custom.t
+++ b/t/lib/RowDiff-custom.t
@@ -83,7 +83,7 @@ my $dp = new DSNParser(opts=>$dsn_opts);
 
 # Connect to sandbox now to make sure it's running.
 my $sb = new Sandbox(basedir => '/tmp', DSNParser => $dp);
-my $master_dbh = $sb->get_dbh_for('master');
+my $master_dbh = $sb->get_dbh_for('source');
 my $slave_dbh  = $sb->get_dbh_for('slave1');
 if ( !$master_dbh ) {
    plan skip_all => "Cannot connect to sandbox master";
@@ -97,7 +97,7 @@ else {
 
 
 $sb->create_dbs($master_dbh, [qw(test)]);
-$sb->load_file('master', 't/lib/samples/issue_11.sql');
+$sb->load_file('source', 't/lib/samples/issue_11.sql');
 
 my $tbl = $tp->parse(
    $tp->get_create_table($master_dbh, 'test', 'issue_11'));
diff --git a/t/lib/RowDiff.t b/t/lib/RowDiff.t
index e84a3e1c3..6e3e540f4 100644
--- a/t/lib/RowDiff.t
+++ b/t/lib/RowDiff.t
@@ -28,8 +28,8 @@ my $dp = new DSNParser(opts=>$dsn_opts);
 
 # Connect to sandbox now to make sure it's running.
 my $sb = new Sandbox(basedir => '/tmp', DSNParser => $dp);
-my $master_dbh = $sb->get_dbh_for('master');
-my $slave_dbh  = $sb->get_dbh_for('slave1');
+my $master_dbh = $sb->get_dbh_for('source');
+my $slave_dbh  = $sb->get_dbh_for('replica1');
 
 throws_ok( sub { new RowDiff() }, qr/I need a dbh/, 'DBH required' );
 $d = new RowDiff(dbh => 1);
@@ -448,7 +448,7 @@ PXC_SKIP: {
    $d = new RowDiff(dbh => $master_dbh);
 
    $sb->create_dbs($master_dbh, [qw(test)]);
-   $sb->load_file('master', 't/lib/samples/issue_11.sql');
+   $sb->load_file('source', 't/lib/samples/issue_11.sql');
    PerconaTest::wait_until(
       sub {
          my $r;
diff --git a/t/lib/SchemaIterator.t b/t/lib/SchemaIterator.t
index e5c8765b9..389092a54 100644
--- a/t/lib/SchemaIterator.t
+++ b/t/lib/SchemaIterator.t
@@ -30,7 +30,7 @@ $Data::Dumper::Quotekeys = 0;
 my $q   = new Quoter();
 my $dp  = new DSNParser(opts=>$dsn_opts);
 my $sb  = new Sandbox(basedir => '/tmp', DSNParser => $dp);
-my $dbh = $sb->get_dbh_for('master');
+my $dbh = $sb->get_dbh_for('source');
 
 my $tp = new TableParser(Quoter => $q);
 my $fi = new FileIterator();
@@ -178,7 +178,7 @@ SKIP: {
    # ########################################################################
    # Test filters.
    # ########################################################################
-   $sb->load_file('master', "t/lib/samples/SchemaIterator.sql");
+   $sb->load_file('source', "t/lib/samples/SchemaIterator.sql");
    
    test_so(
       filters   => [qw(-d this_db_does_not_exist)],
@@ -488,10 +488,10 @@ SKIP: {
    my $master3_port   = 2900;
    my $master_basedir = "/tmp/$master3_port";
    diag(`$trunk/sandbox/stop-sandbox $master3_port >/dev/null`);
-   diag(`$trunk/sandbox/start-sandbox master $master3_port >/dev/null`);
-   my $dbh3 = $sb->get_dbh_for("master3");
+   diag(`$trunk/sandbox/start-sandbox source $master3_port >/dev/null`);
+   my $dbh3 = $sb->get_dbh_for("source3");
 
-   $sb->load_file('master3', "t/lib/samples/bug_1047335_crashed_table.sql");
+   $sb->load_file('source3', "t/lib/samples/bug_1047335_crashed_table.sql");
 
    # Create the SI object before crashing the table
    my $tmp_si = new SchemaIterator(
@@ -600,7 +600,7 @@ diag(`/tmp/12345/use < $trunk/t/lib/samples/100-dbs-drop.sql`);
 # https://bugs.launchpad.net/percona-toolkit/+bug/1304062 
 # #############################################################################
 
-$sb->load_file('master', "t/lib/samples/SchemaIterator.sql");
+$sb->load_file('source', "t/lib/samples/SchemaIterator.sql");
 $dbh->do("CREATE TABLE d3.t1 (id int auto_increment primary key, c  char(8))");
 
 test_so(
diff --git a/t/lib/SqlModes.t b/t/lib/SqlModes.t
index 89120e360..7e46d4889 100644
--- a/t/lib/SqlModes.t
+++ b/t/lib/SqlModes.t
@@ -19,7 +19,7 @@ use SqlModes;
 
 my $dp  = new DSNParser(opts=>$dsn_opts);
 my $sb  = new Sandbox(basedir => '/tmp', DSNParser => $dp);
-my $dbh = $sb->get_dbh_for('master');
+my $dbh = $sb->get_dbh_for('source');
 
 if ( !$dbh ) {
    plan skip_all => "Cannot connect to sandbox master";
diff --git a/t/lib/TableChecksum.t b/t/lib/TableChecksum.t
index 6ed925b5d..509af1a15 100644
--- a/t/lib/TableChecksum.t
+++ b/t/lib/TableChecksum.t
@@ -20,7 +20,7 @@ use PerconaTest;
 
 my $dp = new DSNParser(opts=>$dsn_opts);
 my $sb = new Sandbox(basedir => '/tmp', DSNParser => $dp);
-my $dbh = $sb->get_dbh_for('master');
+my $dbh = $sb->get_dbh_for('source');
 
 if ( !$dbh ) {
    plan skip_all => "Cannot connect to sandbox master";
@@ -634,7 +634,7 @@ is_deeply(
 # #############################################################################
 # Issue 94: Enhance mk-table-checksum, add a --ignorecols option
 # #############################################################################
-$sb->load_file('master', 't/lib/samples/issue_94.sql');
+$sb->load_file('source', 't/lib/samples/issue_94.sql');
 $t= $tp->parse( $tp->get_create_table($dbh, 'test', 'issue_94') );
 my $query = $c->make_checksum_query(
    db         => 'test',
diff --git a/t/lib/TableChunker.t b/t/lib/TableChunker.t
index cbf5fc210..bf63723d9 100644
--- a/t/lib/TableChunker.t
+++ b/t/lib/TableChunker.t
@@ -20,7 +20,7 @@ use PerconaTest;
 
 my $dp = new DSNParser(opts=>$dsn_opts);
 my $sb = new Sandbox(basedir => '/tmp', DSNParser => $dp);
-my $dbh = $sb->get_dbh_for('master');
+my $dbh = $sb->get_dbh_for('source');
 
 if ( !$dbh ) {
    plan skip_all => 'Cannot connect to sandbox master';
@@ -550,7 +550,7 @@ SKIP: {
 # #############################################################################
 # Issue 47: TableChunker::range_num broken for very large bigint
 # #############################################################################
-$sb->load_file('master', 't/lib/samples/issue_47.sql');
+$sb->load_file('source', 't/lib/samples/issue_47.sql');
 $t = $tp->parse( $tp->get_create_table($dbh, 'test', 'issue_47') );
 my %params = $c->get_range_statistics(
    dbh        => $dbh,
@@ -591,7 +591,7 @@ is(
    'Adds USE INDEX (issue 8)'
 );
 
-$sb->load_file('master', 't/lib/samples/issue_8.sql');
+$sb->load_file('source', 't/lib/samples/issue_8.sql');
 $t = $tp->parse( $tp->get_create_table($dbh, 'test', 'issue_8') );
 my @candidates = $c->find_chunk_columns(tbl_struct=>$t);
 is_deeply(
@@ -628,7 +628,7 @@ $Data::Dumper::Quotekeys = 0;
 # is ignored then the chunks are much better and the first chunk will
 # cover the zero row.
 
-$sb->load_file('master', 't/lib/samples/issue_941.sql');
+$sb->load_file('source', 't/lib/samples/issue_941.sql');
 
 # We use empty SQL mode here, because zero dates do not work with 
 # the default SQL mode. We do not adjust the tool, because, if users
@@ -764,7 +764,7 @@ test_zero_row(
 # #############################################################################
 # Issue 602: mk-table-checksum issue with invalid dates
 # #############################################################################
-$sb->load_file('master', 't/pt-table-checksum/samples/issue_602.sql');
+$sb->load_file('source', 't/pt-table-checksum/samples/issue_602.sql');
 $t = $tp->parse( $tp->get_create_table($dbh, 'issue_602', 't') );
 %params = $c->get_range_statistics(
    dbh        => $dbh,
@@ -977,7 +977,7 @@ is_deeply(
    "get_first_chunkable_column(), bad preferred column and index"
 );
 
-$sb->load_file('master', "t/lib/samples/t1.sql", 'test');
+$sb->load_file('source', "t/lib/samples/t1.sql", 'test');
 $t = $tp->parse( load_file('t/lib/samples/t1.sql') );
 
 is_deeply(
@@ -987,7 +987,7 @@ is_deeply(
 );
 
 # char chunking ###############################################################
-$sb->load_file('master', "t/lib/samples/char-chunking/ascii.sql", 'test');
+$sb->load_file('source', "t/lib/samples/char-chunking/ascii.sql", 'test');
 $t = $tp->parse( $tp->get_create_table($dbh, 'test', 'ascii') );
 
 is_deeply(
@@ -1180,7 +1180,7 @@ SKIP: {
    );
 }
 
-$sb->load_file('master', "t/lib/samples/char-chunking/world-city.sql", 'test');
+$sb->load_file('source', "t/lib/samples/char-chunking/world-city.sql", 'test');
 $t = $tp->parse( $tp->get_create_table($dbh, 'test', 'world_city') );
 %params = $c->get_range_statistics(
    dbh        => $dbh,
@@ -1269,7 +1269,7 @@ SKIP: {
 # ############################################################################
 # Bug 821673: pt-table-checksum doesn't included --where in min max queries
 # ############################################################################
-$sb->load_file('master', "t/pt-table-checksum/samples/where01.sql");
+$sb->load_file('source', "t/pt-table-checksum/samples/where01.sql");
 $t = $tp->parse( $tp->get_create_table($dbh, 'test', 'checksum_test') );
 %params = $c->get_range_statistics(
    dbh        => $dbh,
@@ -1291,7 +1291,7 @@ is(
 );
 
 # char chunking
-$sb->load_file('master', "t/pt-table-checksum/samples/where02.sql");
+$sb->load_file('source', "t/pt-table-checksum/samples/where02.sql");
 $t = $tp->parse( $tp->get_create_table($dbh, 'test', 'checksum_test') );
 %params = $c->get_range_statistics(
    dbh        => $dbh,
@@ -1327,7 +1327,7 @@ is(
 # #############################################################################
 # Bug 967451: Char chunking doesn't quote column name
 # #############################################################################
-$sb->load_file('master', "t/lib/samples/char-chunking/ascii.sql", 'test');
+$sb->load_file('source', "t/lib/samples/char-chunking/ascii.sql", 'test');
 $dbh->do("ALTER TABLE test.ascii CHANGE COLUMN c `key` char(64) NOT NULL");
 $t = $tp->parse( $tp->get_create_table($dbh, 'test', 'ascii') );
 
@@ -1387,7 +1387,7 @@ is(
 # Bug 1034717: Divison by zero error when all columns tsart with the same char
 # https://bugs.launchpad.net/percona-toolkit/+bug/1034717
 # #############################################################################
-$sb->load_file('master', "t/lib/samples/bug_1034717.sql", 'test');
+$sb->load_file('source', "t/lib/samples/bug_1034717.sql", 'test');
 $t = $tp->parse( $tp->get_create_table($dbh, 'bug_1034717', 'table1') );
 
 %params = $c->get_range_statistics(
diff --git a/t/lib/TableParser.t b/t/lib/TableParser.t
index 6ba697e16..95ac71c08 100644
--- a/t/lib/TableParser.t
+++ b/t/lib/TableParser.t
@@ -20,7 +20,7 @@ use PerconaTest;
 
 my $dp  = new DSNParser(opts=>$dsn_opts);
 my $sb  = new Sandbox(basedir => '/tmp', DSNParser => $dp);
-my $dbh = $sb->get_dbh_for('master');
+my $dbh = $sb->get_dbh_for('source');
 
 my $q   = new Quoter();
 my $tp  = new TableParser(Quoter=>$q);
@@ -69,7 +69,7 @@ SKIP: {
    );
 
    # Bug 932442: column with 2 spaces
-   $sb->load_file('master', "t/pt-table-checksum/samples/2-space-col.sql");
+   $sb->load_file('source', "t/pt-table-checksum/samples/2-space-col.sql");
    $ddl = $tp->get_create_table($dbh, qw(test t));
    like(
       $ddl,
@@ -749,11 +749,11 @@ is_deeply(
 SKIP: {
    skip 'Cannot connect to sandbox master', 8 unless $dbh;
 
-   $sb->load_file('master', 't/lib/samples/check_table.sql');
+   $sb->load_file('source', 't/lib/samples/check_table.sql');
 
    # msandbox user does not have GRANT privs.
    my $root_dbh = DBI->connect(
-      "DBI:mysql:host=127.0.0.1;port=12345", 'root', 'msandbox',
+      "DBI:mysql:host=127.0.0.1;port=12345;mysql_ssl=1", 'root', 'msandbox',
       { PrintError => 0, RaiseError => 1 });
 
    $root_dbh->do(q[CREATE USER 'user'@'%' IDENTIFIED BY '';] ) || die($root_dbh->errstr);
diff --git a/t/lib/TableSyncChunk.t b/t/lib/TableSyncChunk.t
index c60f0960c..46eb0740b 100644
--- a/t/lib/TableSyncChunk.t
+++ b/t/lib/TableSyncChunk.t
@@ -18,7 +18,7 @@ use PerconaTest;
 
 my $dp  = new DSNParser(opts=>$dsn_opts);
 my $sb  = new Sandbox(basedir => '/tmp', DSNParser => $dp);
-my $dbh = $sb->get_dbh_for('master');
+my $dbh = $sb->get_dbh_for('source');
 
 if ( $dbh ) {
    plan tests => 35;
@@ -40,7 +40,7 @@ use TableSyncer;
 use MasterSlave;
 use Retry;
 
-my $mysql = $sb->_use_for('master');
+my $mysql = $sb->_use_for('source');
 
 diag(`$mysql < $trunk/t/lib/samples/before-TableSyncChunk.sql`);
 
diff --git a/t/lib/TableSyncNibble.t b/t/lib/TableSyncNibble.t
index d9fe2bf3e..75e3153dd 100644
--- a/t/lib/TableSyncNibble.t
+++ b/t/lib/TableSyncNibble.t
@@ -28,7 +28,7 @@ use PerconaTest;
 
 my $dp  = new DSNParser(opts=>$dsn_opts);
 my $sb  = new Sandbox(basedir => '/tmp', DSNParser => $dp);
-my $dbh = $sb->get_dbh_for('master');
+my $dbh = $sb->get_dbh_for('source');
 
 if ( !$dbh ) {
    plan skip_all => 'Cannot connect to sandbox master';
@@ -37,7 +37,7 @@ else {
    plan tests => 37;
 }
 
-my $mysql = $sb->_use_for('master');
+my $mysql = $sb->_use_for('source');
 
 my $q  = new Quoter();
 my $ms = new MasterSlave(OptionParser=>1,DSNParser=>1,Quoter=>1);
@@ -355,7 +355,7 @@ like(
 # #########################################################################
 # Issue 96: mk-table-sync: Nibbler infinite loop
 # #########################################################################
-$sb->load_file('master', 't/lib/samples/issue_96.sql');
+$sb->load_file('source', 't/lib/samples/issue_96.sql');
 $tbl_struct = $tp->parse($tp->get_create_table($dbh, 'issue_96', 't'));
 $t->prepare_to_sync(
    ChangeHandler  => $ch,
@@ -455,7 +455,7 @@ SKIP: {
 # chunk 2:
 my $where = '`player_id` >= 201 AND `player_id` < 301';
 
-$sb->load_file('master', 't/pt-table-sync/samples/issue_560.sql');
+$sb->load_file('source', 't/pt-table-sync/samples/issue_560.sql');
 $tbl_struct = $tp->parse($tp->get_create_table($dbh, 'issue_560', 'buddy_list'));
 (undef, %plugin_args) = $t->can_sync(tbl_struct => $tbl_struct);
 $t->prepare_to_sync(
@@ -566,7 +566,7 @@ is(
 # #############################################################################
 # Issue 804: mk-table-sync: can't nibble because index name isn't lower case?
 # #############################################################################
-$sb->load_file('master', 't/lib/samples/issue_804.sql');
+$sb->load_file('source', 't/lib/samples/issue_804.sql');
 $tbl_struct = $tp->parse($tp->get_create_table($dbh, 'issue_804', 't'));
 ($can_sync, %plugin_args) = $t->can_sync(tbl_struct => $tbl_struct);
 is(
diff --git a/t/lib/TableSyncer.t b/t/lib/TableSyncer.t
index bff4aa2e7..bf8848f31 100644
--- a/t/lib/TableSyncer.t
+++ b/t/lib/TableSyncer.t
@@ -39,9 +39,9 @@ use constant PTDEBUG => $ENV{PTDEBUG} || 0;
 
 my $dp = new DSNParser(opts=>$dsn_opts);
 my $sb = new Sandbox(basedir => '/tmp', DSNParser => $dp);
-my $dbh      = $sb->get_dbh_for('master');
-my $src_dbh  = $sb->get_dbh_for('master');
-my $dst_dbh  = $sb->get_dbh_for('slave1');
+my $dbh      = $sb->get_dbh_for('source');
+my $src_dbh  = $sb->get_dbh_for('source');
+my $dst_dbh  = $sb->get_dbh_for('replica1');
 
 if ( !$src_dbh || !$dbh ) {
    plan skip_all => 'Cannot connect to sandbox master';
@@ -50,8 +50,10 @@ elsif ( !$dst_dbh ) {
    plan skip_all => 'Cannot connect to sandbox slave';
 }
 
+my $vp = VersionParser->new($dbh);
+
 $sb->create_dbs($dbh, ['test']);
-$sb->load_file('master', 't/lib/samples/before-TableSyncChunk.sql');
+$sb->load_file('source', 't/lib/samples/before-TableSyncChunk.sql');
 
 my $q  = new Quoter();
 my $tp = new TableParser(Quoter=>$q);
@@ -565,8 +567,8 @@ SKIP: {
    # a lock.
    $src_dbh->disconnect();
    $dst_dbh->disconnect();
-   $src_dbh = $sb->get_dbh_for('master');
-   $dst_dbh = $sb->get_dbh_for('slave1');
+   $src_dbh = $sb->get_dbh_for('source');
+   $dst_dbh = $sb->get_dbh_for('replica1');
 
    $src->{dbh} = $src_dbh;
    $dst->{dbh} = $dst_dbh;
@@ -575,7 +577,7 @@ SKIP: {
 # Test TableSyncGroupBy.
 # ###########################################################################
 make_plugins();
-$sb->load_file('master', 't/lib/samples/before-TableSyncGroupBy.sql');
+$sb->load_file('source', 't/lib/samples/before-TableSyncGroupBy.sql');
 
 sync_table(
    src     => "test.test1",
@@ -604,7 +606,7 @@ is_deeply(
 # Issue 96: mk-table-sync: Nibbler infinite loop
 # #############################################################################
 make_plugins();
-$sb->load_file('master', 't/lib/samples/issue_96.sql');
+$sb->load_file('source', 't/lib/samples/issue_96.sql');
 
 # Make paranoid-sure that the tables differ.
 my $r1 = $src_dbh->selectall_arrayref('SELECT from_city FROM issue_96.t WHERE package_id=4');
@@ -703,8 +705,8 @@ is_deeply(
 # #############################################################################
 # Issue 464: Make mk-table-sync do two-way sync
 # #############################################################################
-diag(`$trunk/sandbox/start-sandbox master 12348 >/dev/null`);
-my $dbh3 = $sb->get_dbh_for('master1');
+diag(`$trunk/sandbox/start-sandbox source 12348 >/dev/null`);
+my $dbh3 = $sb->get_dbh_for('source1');
 SKIP: {
    skip 'Cannot connect to sandbox master', 7 unless $dbh;
    skip 'Cannot connect to second sandbox master', 7 unless $dbh3;
@@ -775,11 +777,11 @@ SKIP: {
    # First bidi test with chunk size=2, roughly 9 chunks.
    # ########################################################################
    # Load "master" data.
-   $sb->load_file('master', 't/pt-table-sync/samples/bidirectional/table.sql');
-   $sb->load_file('master', 't/pt-table-sync/samples/bidirectional/master-data.sql');
+   $sb->load_file('source', 't/pt-table-sync/samples/bidirectional/table.sql');
+   $sb->load_file('source', 't/pt-table-sync/samples/bidirectional/master-data.sql');
    # Load remote data.
-   $sb->load_file('master1', 't/pt-table-sync/samples/bidirectional/table.sql');
-   $sb->load_file('master1', 't/pt-table-sync/samples/bidirectional/remote-1.sql');
+   $sb->load_file('source1', 't/pt-table-sync/samples/bidirectional/table.sql');
+   $sb->load_file('source1', 't/pt-table-sync/samples/bidirectional/remote-1.sql');
    make_plugins();
    set_bidi_callbacks();
    $tbl_struct = $tp->parse($tp->get_create_table($src_dbh, 'bidi', 't'));
@@ -822,10 +824,10 @@ SKIP: {
    # ########################################################################
    # Test it again with a larger chunk size, roughly half the table.
    # ########################################################################
-   $sb->load_file('master', 't/pt-table-sync/samples/bidirectional/table.sql');
-   $sb->load_file('master', 't/pt-table-sync/samples/bidirectional/master-data.sql');
-   $sb->load_file('master1', 't/pt-table-sync/samples/bidirectional/table.sql');
-   $sb->load_file('master1', 't/pt-table-sync/samples/bidirectional/remote-1.sql');
+   $sb->load_file('source', 't/pt-table-sync/samples/bidirectional/table.sql');
+   $sb->load_file('source', 't/pt-table-sync/samples/bidirectional/master-data.sql');
+   $sb->load_file('source1', 't/pt-table-sync/samples/bidirectional/table.sql');
+   $sb->load_file('source1', 't/pt-table-sync/samples/bidirectional/remote-1.sql');
    make_plugins();
    set_bidi_callbacks();
    $args{ChangeHandler} = new_ch($dbh3, 0);
@@ -850,10 +852,10 @@ SKIP: {
    # ########################################################################
    # Chunk whole table.
    # ########################################################################
-   $sb->load_file('master', 't/pt-table-sync/samples/bidirectional/table.sql');
-   $sb->load_file('master', 't/pt-table-sync/samples/bidirectional/master-data.sql');
-   $sb->load_file('master1', 't/pt-table-sync/samples/bidirectional/table.sql');
-   $sb->load_file('master1', 't/pt-table-sync/samples/bidirectional/remote-1.sql');
+   $sb->load_file('source', 't/pt-table-sync/samples/bidirectional/table.sql');
+   $sb->load_file('source', 't/pt-table-sync/samples/bidirectional/master-data.sql');
+   $sb->load_file('source1', 't/pt-table-sync/samples/bidirectional/table.sql');
+   $sb->load_file('source1', 't/pt-table-sync/samples/bidirectional/remote-1.sql');
    make_plugins();
    set_bidi_callbacks();
    $args{ChangeHandler} = new_ch($dbh3, 0);
@@ -895,9 +897,9 @@ SKIP: {
 make_plugins();
 # Sandbox::get_dbh_for() defaults to AutoCommit=1.  Autocommit must
 # be off else commit() will cause an error.
-$dbh      = $sb->get_dbh_for('master', {AutoCommit=>0});
-$src_dbh  = $sb->get_dbh_for('master', {AutoCommit=>0});
-$dst_dbh  = $sb->get_dbh_for('slave1', {AutoCommit=>0});
+$dbh      = $sb->get_dbh_for('source', {AutoCommit=>0});
+$src_dbh  = $sb->get_dbh_for('source', {AutoCommit=>0});
+$dst_dbh  = $sb->get_dbh_for('replica1', {AutoCommit=>0});
 
 sync_table(
    src         => "test.test1",
@@ -945,7 +947,7 @@ like(
 # Issue 672: mk-table-sync should COALESCE to avoid undef
 # #############################################################################
 make_plugins();
-$sb->load_file('master', "t/lib/samples/empty_tables.sql");
+$sb->load_file('source', "t/lib/samples/empty_tables.sql");
 
 foreach my $sync( $sync_chunk, $sync_nibble, $sync_groupby ) {
    sync_table(
@@ -974,7 +976,7 @@ foreach my $sync( $sync_chunk, $sync_nibble, $sync_groupby ) {
 # #############################################################################
 # Retry wait.
 # #############################################################################
-diag(`/tmp/12346/use -e "stop slave"`);
+diag(`/tmp/12346/use -e "stop ${replica_name}"`);
 my $output = '';
 {
    local *STDERR;
@@ -1006,9 +1008,9 @@ my $output = '';
       "Retries wait"
    );
 }
-diag(`/tmp/12347/use -e "stop slave"`);
-diag(`/tmp/12346/use -e "start slave"`);
-diag(`/tmp/12347/use -e "start slave"`);
+diag(`/tmp/12347/use -e "stop ${replica_name}"`);
+diag(`/tmp/12346/use -e "start ${replica_name}"`);
+diag(`/tmp/12347/use -e "start ${replica_name}"`);
 
 # #############################################################################
 # Done.
@@ -1023,6 +1025,7 @@ like(
    qr/Complete test coverage/,
    '_d() works'
 );
+
 $src_dbh->disconnect() if $src_dbh;
 $dst_dbh->disconnect() if $dst_dbh;
 $sb->wipe_clean($dbh);
diff --git a/t/lib/TableUsage.t b/t/lib/TableUsage.t
index d106dfacb..eb0d0cda4 100644
--- a/t/lib/TableUsage.t
+++ b/t/lib/TableUsage.t
@@ -19,7 +19,7 @@ use Sandbox;
 
 my $dp = new DSNParser(opts=>$dsn_opts);
 my $sb = new Sandbox(basedir => '/tmp', DSNParser => $dp);
-my $dbh = $sb->get_dbh_for('master');
+my $dbh = $sb->get_dbh_for('source');
 
 use Data::Dumper;
 $Data::Dumper::Indent    = 1;
diff --git a/t/lib/Transformers.t b/t/lib/Transformers.t
index 4fbca1d41..a33cdec97 100644
--- a/t/lib/Transformers.t
+++ b/t/lib/Transformers.t
@@ -162,7 +162,7 @@ use DSNParser;
 use Sandbox;
 my $dp = new DSNParser(opts=>$dsn_opts);
 my $sb = new Sandbox(basedir => '/tmp', DSNParser => $dp);
-my $dbh = $sb->get_dbh_for('master');
+my $dbh = $sb->get_dbh_for('source');
 SKIP: {
    skip 'Cannot connect to sandbox master', 1 unless $dbh;
    my $now = $dbh->selectall_arrayref('SELECT NOW()')->[0]->[0];
diff --git a/t/lib/VersionCheck.t b/t/lib/VersionCheck.t
index 30436a687..e108179c7 100644
--- a/t/lib/VersionCheck.t
+++ b/t/lib/VersionCheck.t
@@ -22,8 +22,8 @@ use Percona::Toolkit;
 
 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 $master_dbh = $sb->get_dbh_for('source');
+my $slave1_dbh = $sb->get_dbh_for('replica1');
 
 local $ENV{PERCONA_FORCE_VERSION_CHECK} = 1;
 
diff --git a/t/lib/VersionParser.t b/t/lib/VersionParser.t
index 525e44172..0e88012e6 100644
--- a/t/lib/VersionParser.t
+++ b/t/lib/VersionParser.t
@@ -112,7 +112,7 @@ use DSNParser;
 use Sandbox;
 my $dp  = new DSNParser(opts=>$dsn_opts);
 my $sb  = new Sandbox(basedir => '/tmp', DSNParser => $dp);
-my $dbh = $sb->get_dbh_for('master');
+my $dbh = $sb->get_dbh_for('source');
 SKIP: {
    skip 'Cannot connect to MySQL', 2 unless $dbh;
    my $vp = new_ok "VersionParser", [ $dbh ], "new from dbh works";
diff --git a/t/lib/samples/SchemaIterator/all-dbs-tbls-8.4.txt b/t/lib/samples/SchemaIterator/all-dbs-tbls-8.4.txt
new file mode 100644
index 000000000..efc6f1cbd
--- /dev/null
+++ b/t/lib/samples/SchemaIterator/all-dbs-tbls-8.4.txt
@@ -0,0 +1,611 @@
+mysql.columns_priv
+CREATE TABLE `columns_priv` (
+  `Host` char(255) CHARACTER SET ascii COLLATE ascii_general_ci NOT NULL DEFAULT '',
+  `Db` char(64) COLLATE utf8mb3_bin NOT NULL DEFAULT '',
+  `User` char(32) COLLATE utf8mb3_bin NOT NULL DEFAULT '',
+  `Table_name` char(64) COLLATE utf8mb3_bin NOT NULL DEFAULT '',
+  `Column_name` char(64) COLLATE utf8mb3_bin NOT NULL DEFAULT '',
+  `Timestamp` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+  `Column_priv` set('Select','Insert','Update','References') CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NOT NULL DEFAULT '',
+  PRIMARY KEY (`Host`,`User`,`Db`,`Table_name`,`Column_name`)
+) /*!50100 TABLESPACE `mysql` */ ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_bin STATS_PERSISTENT=0 ROW_FORMAT=DYNAMIC COMMENT='Column privileges'
+
+mysql.component
+CREATE TABLE `component` (
+  `component_id` int unsigned NOT NULL AUTO_INCREMENT,
+  `component_group_id` int unsigned NOT NULL,
+  `component_urn` text NOT NULL,
+  PRIMARY KEY (`component_id`)
+) /*!50100 TABLESPACE `mysql` */ ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 ROW_FORMAT=DYNAMIC COMMENT='Components'
+
+mysql.db
+CREATE TABLE `db` (
+  `Host` char(255) CHARACTER SET ascii COLLATE ascii_general_ci NOT NULL DEFAULT '',
+  `Db` char(64) COLLATE utf8mb3_bin NOT NULL DEFAULT '',
+  `User` char(32) COLLATE utf8mb3_bin NOT NULL DEFAULT '',
+  `Select_priv` enum('N','Y') CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NOT NULL DEFAULT 'N',
+  `Insert_priv` enum('N','Y') CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NOT NULL DEFAULT 'N',
+  `Update_priv` enum('N','Y') CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NOT NULL DEFAULT 'N',
+  `Delete_priv` enum('N','Y') CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NOT NULL DEFAULT 'N',
+  `Create_priv` enum('N','Y') CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NOT NULL DEFAULT 'N',
+  `Drop_priv` enum('N','Y') CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NOT NULL DEFAULT 'N',
+  `Grant_priv` enum('N','Y') CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NOT NULL DEFAULT 'N',
+  `References_priv` enum('N','Y') CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NOT NULL DEFAULT 'N',
+  `Index_priv` enum('N','Y') CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NOT NULL DEFAULT 'N',
+  `Alter_priv` enum('N','Y') CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NOT NULL DEFAULT 'N',
+  `Create_tmp_table_priv` enum('N','Y') CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NOT NULL DEFAULT 'N',
+  `Lock_tables_priv` enum('N','Y') CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NOT NULL DEFAULT 'N',
+  `Create_view_priv` enum('N','Y') CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NOT NULL DEFAULT 'N',
+  `Show_view_priv` enum('N','Y') CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NOT NULL DEFAULT 'N',
+  `Create_routine_priv` enum('N','Y') CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NOT NULL DEFAULT 'N',
+  `Alter_routine_priv` enum('N','Y') CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NOT NULL DEFAULT 'N',
+  `Execute_priv` enum('N','Y') CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NOT NULL DEFAULT 'N',
+  `Event_priv` enum('N','Y') CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NOT NULL DEFAULT 'N',
+  `Trigger_priv` enum('N','Y') CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NOT NULL DEFAULT 'N',
+  PRIMARY KEY (`Host`,`User`,`Db`),
+  KEY `User` (`User`)
+) /*!50100 TABLESPACE `mysql` */ ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_bin STATS_PERSISTENT=0 ROW_FORMAT=DYNAMIC COMMENT='Database privileges'
+
+mysql.default_roles
+CREATE TABLE `default_roles` (
+  `HOST` char(255) CHARACTER SET ascii COLLATE ascii_general_ci NOT NULL DEFAULT '',
+  `USER` char(32) COLLATE utf8mb3_bin NOT NULL DEFAULT '',
+  `DEFAULT_ROLE_HOST` char(255) CHARACTER SET ascii COLLATE ascii_general_ci NOT NULL DEFAULT '%',
+  `DEFAULT_ROLE_USER` char(32) COLLATE utf8mb3_bin NOT NULL DEFAULT '',
+  PRIMARY KEY (`HOST`,`USER`,`DEFAULT_ROLE_HOST`,`DEFAULT_ROLE_USER`)
+) /*!50100 TABLESPACE `mysql` */ ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_bin STATS_PERSISTENT=0 ROW_FORMAT=DYNAMIC COMMENT='Default roles'
+
+mysql.engine_cost
+CREATE TABLE `engine_cost` (
+  `engine_name` varchar(64) NOT NULL,
+  `device_type` int NOT NULL,
+  `cost_name` varchar(64) NOT NULL,
+  `cost_value` float DEFAULT NULL,
+  `last_update` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+  `comment` varchar(1024) DEFAULT NULL,
+  `default_value` float GENERATED ALWAYS AS ((case `cost_name` when _utf8mb3'io_block_read_cost' then 1.0 when _utf8mb3'memory_block_read_cost' then 0.25 else NULL end)) VIRTUAL,
+  PRIMARY KEY (`cost_name`,`engine_name`,`device_type`)
+) /*!50100 TABLESPACE `mysql` */ ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 STATS_PERSISTENT=0 ROW_FORMAT=DYNAMIC
+
+mysql.func
+CREATE TABLE `func` (
+  `name` char(64) COLLATE utf8mb3_bin NOT NULL DEFAULT '',
+  `ret` tinyint NOT NULL DEFAULT '0',
+  `dl` char(128) COLLATE utf8mb3_bin NOT NULL DEFAULT '',
+  `type` enum('function','aggregate') CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NOT NULL,
+  PRIMARY KEY (`name`)
+) /*!50100 TABLESPACE `mysql` */ ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_bin STATS_PERSISTENT=0 ROW_FORMAT=DYNAMIC COMMENT='User defined functions'
+
+mysql.global_grants
+CREATE TABLE `global_grants` (
+  `USER` char(32) COLLATE utf8mb3_bin NOT NULL DEFAULT '',
+  `HOST` char(255) CHARACTER SET ascii COLLATE ascii_general_ci NOT NULL DEFAULT '',
+  `PRIV` char(32) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NOT NULL DEFAULT '',
+  `WITH_GRANT_OPTION` enum('N','Y') CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NOT NULL DEFAULT 'N',
+  PRIMARY KEY (`USER`,`HOST`,`PRIV`)
+) /*!50100 TABLESPACE `mysql` */ ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_bin STATS_PERSISTENT=0 ROW_FORMAT=DYNAMIC COMMENT='Extended global grants'
+
+mysql.help_category
+CREATE TABLE `help_category` (
+  `help_category_id` smallint unsigned NOT NULL,
+  `name` char(64) NOT NULL,
+  `parent_category_id` smallint unsigned DEFAULT NULL,
+  `url` text NOT NULL,
+  PRIMARY KEY (`help_category_id`),
+  UNIQUE KEY `name` (`name`)
+) /*!50100 TABLESPACE `mysql` */ ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 STATS_PERSISTENT=0 ROW_FORMAT=DYNAMIC COMMENT='help categories'
+
+mysql.help_keyword
+CREATE TABLE `help_keyword` (
+  `help_keyword_id` int unsigned NOT NULL,
+  `name` char(64) NOT NULL,
+  PRIMARY KEY (`help_keyword_id`),
+  UNIQUE KEY `name` (`name`)
+) /*!50100 TABLESPACE `mysql` */ ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 STATS_PERSISTENT=0 ROW_FORMAT=DYNAMIC COMMENT='help keywords'
+
+mysql.help_relation
+CREATE TABLE `help_relation` (
+  `help_topic_id` int unsigned NOT NULL,
+  `help_keyword_id` int unsigned NOT NULL,
+  PRIMARY KEY (`help_keyword_id`,`help_topic_id`)
+) /*!50100 TABLESPACE `mysql` */ ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 STATS_PERSISTENT=0 ROW_FORMAT=DYNAMIC COMMENT='keyword-topic relation'
+
+mysql.help_topic
+CREATE TABLE `help_topic` (
+  `help_topic_id` int unsigned NOT NULL,
+  `name` char(64) NOT NULL,
+  `help_category_id` smallint unsigned NOT NULL,
+  `description` text NOT NULL,
+  `example` text NOT NULL,
+  `url` text NOT NULL,
+  PRIMARY KEY (`help_topic_id`),
+  UNIQUE KEY `name` (`name`)
+) /*!50100 TABLESPACE `mysql` */ ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 STATS_PERSISTENT=0 ROW_FORMAT=DYNAMIC COMMENT='help topics'
+
+mysql.ndb_binlog_index
+CREATE TABLE `ndb_binlog_index` (
+  `Position` bigint unsigned NOT NULL,
+  `File` varchar(255) NOT NULL,
+  `epoch` bigint unsigned NOT NULL,
+  `inserts` int unsigned NOT NULL,
+  `updates` int unsigned NOT NULL,
+  `deletes` int unsigned NOT NULL,
+  `schemaops` int unsigned NOT NULL,
+  `orig_server_id` int unsigned NOT NULL,
+  `orig_epoch` bigint unsigned NOT NULL,
+  `gci` int unsigned NOT NULL,
+  `next_position` bigint unsigned NOT NULL,
+  `next_file` varchar(255) NOT NULL,
+  PRIMARY KEY (`epoch`,`orig_server_id`,`orig_epoch`)
+) /*!50100 TABLESPACE `mysql` */ ENGINE=InnoDB DEFAULT CHARSET=latin1 STATS_PERSISTENT=0 ROW_FORMAT=DYNAMIC
+
+mysql.password_history
+CREATE TABLE `password_history` (
+  `Host` char(255) CHARACTER SET ascii COLLATE ascii_general_ci NOT NULL DEFAULT '',
+  `User` char(32) COLLATE utf8mb3_bin NOT NULL DEFAULT '',
+  `Password_timestamp` timestamp(6) NOT NULL DEFAULT CURRENT_TIMESTAMP(6),
+  `Password` text COLLATE utf8mb3_bin,
+  PRIMARY KEY (`Host`,`User`,`Password_timestamp` DESC)
+) /*!50100 TABLESPACE `mysql` */ ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_bin STATS_PERSISTENT=0 ROW_FORMAT=DYNAMIC COMMENT='Password history for user accounts'
+
+mysql.plugin
+CREATE TABLE `plugin` (
+  `name` varchar(64) NOT NULL DEFAULT '',
+  `dl` varchar(128) NOT NULL DEFAULT '',
+  PRIMARY KEY (`name`)
+) /*!50100 TABLESPACE `mysql` */ ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 STATS_PERSISTENT=0 ROW_FORMAT=DYNAMIC COMMENT='MySQL plugins'
+
+mysql.procs_priv
+CREATE TABLE `procs_priv` (
+  `Host` char(255) CHARACTER SET ascii COLLATE ascii_general_ci NOT NULL DEFAULT '',
+  `Db` char(64) COLLATE utf8mb3_bin NOT NULL DEFAULT '',
+  `User` char(32) COLLATE utf8mb3_bin NOT NULL DEFAULT '',
+  `Routine_name` char(64) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NOT NULL DEFAULT '',
+  `Routine_type` enum('FUNCTION','PROCEDURE') COLLATE utf8mb3_bin NOT NULL,
+  `Grantor` varchar(288) COLLATE utf8mb3_bin NOT NULL DEFAULT '',
+  `Proc_priv` set('Execute','Alter Routine','Grant') CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NOT NULL DEFAULT '',
+  `Timestamp` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+  PRIMARY KEY (`Host`,`User`,`Db`,`Routine_name`,`Routine_type`),
+  KEY `Grantor` (`Grantor`)
+) /*!50100 TABLESPACE `mysql` */ ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_bin STATS_PERSISTENT=0 ROW_FORMAT=DYNAMIC COMMENT='Procedure privileges'
+
+mysql.proxies_priv
+CREATE TABLE `proxies_priv` (
+  `Host` char(255) CHARACTER SET ascii COLLATE ascii_general_ci NOT NULL DEFAULT '',
+  `User` char(32) COLLATE utf8mb3_bin NOT NULL DEFAULT '',
+  `Proxied_host` char(255) CHARACTER SET ascii COLLATE ascii_general_ci NOT NULL DEFAULT '',
+  `Proxied_user` char(32) COLLATE utf8mb3_bin NOT NULL DEFAULT '',
+  `With_grant` tinyint(1) NOT NULL DEFAULT '0',
+  `Grantor` varchar(288) COLLATE utf8mb3_bin NOT NULL DEFAULT '',
+  `Timestamp` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+  PRIMARY KEY (`Host`,`User`,`Proxied_host`,`Proxied_user`),
+  KEY `Grantor` (`Grantor`)
+) /*!50100 TABLESPACE `mysql` */ ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_bin STATS_PERSISTENT=0 ROW_FORMAT=DYNAMIC COMMENT='User proxy privileges'
+
+mysql.replication_asynchronous_connection_failover
+CREATE TABLE `replication_asynchronous_connection_failover` (
+  `Channel_name` char(64) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NOT NULL COMMENT 'The replication channel name that connects source and replica.',
+  `Host` char(255) CHARACTER SET ascii COLLATE ascii_general_ci NOT NULL COMMENT 'The source hostname that the replica will attempt to switch over the replication connection to in case of a failure.',
+  `Port` int unsigned NOT NULL COMMENT 'The source port that the replica will attempt to switch over the replication connection to in case of a failure.',
+  `Network_namespace` char(64) NOT NULL COMMENT 'The source network namespace that the replica will attempt to switch over the replication connection to in case of a failure. If its value is empty, connections use the default (global) namespace.',
+  `Weight` tinyint unsigned NOT NULL COMMENT 'The order in which the replica shall try to switch the connection over to when there are failures. Weight can be set to a number between 1 and 100, where 100 is the highest weight and 1 the lowest.',
+  `Managed_name` char(64) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NOT NULL DEFAULT '' COMMENT 'The name of the group which this server belongs to.',
+  PRIMARY KEY (`Channel_name`,`Host`,`Port`,`Network_namespace`,`Managed_name`),
+  KEY `Channel_name` (`Channel_name`,`Managed_name`)
+) /*!50100 TABLESPACE `mysql` */ ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 STATS_PERSISTENT=0 ROW_FORMAT=DYNAMIC COMMENT='The source configuration details'
+
+mysql.replication_asynchronous_connection_failover_managed
+CREATE TABLE `replication_asynchronous_connection_failover_managed` (
+  `Channel_name` char(64) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NOT NULL COMMENT 'The replication channel name that connects source and replica.',
+  `Managed_name` char(64) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NOT NULL DEFAULT '' COMMENT 'The name of the source which needs to be managed.',
+  `Managed_type` char(64) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NOT NULL DEFAULT '' COMMENT 'Determines the managed type.',
+  `Configuration` json DEFAULT NULL COMMENT 'The data to help manage group. For Managed_type = GroupReplication, Configuration value should contain {"Primary_weight": 80, "Secondary_weight": 60}, so that it assigns weight=80 to PRIMARY of the group, and weight=60 for rest of the members in mysql.replication_asynchronous_connection_failover table.',
+  PRIMARY KEY (`Channel_name`,`Managed_name`)
+) /*!50100 TABLESPACE `mysql` */ ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 STATS_PERSISTENT=0 ROW_FORMAT=DYNAMIC COMMENT='The managed source configuration details'
+
+mysql.replication_group_configuration_version
+CREATE TABLE `replication_group_configuration_version` (
+  `name` char(255) CHARACTER SET ascii COLLATE ascii_general_ci NOT NULL COMMENT 'The configuration name.',
+  `version` bigint unsigned NOT NULL COMMENT 'The version of the configuration name.',
+  PRIMARY KEY (`name`)
+) /*!50100 TABLESPACE `mysql` */ ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci STATS_PERSISTENT=0 ROW_FORMAT=DYNAMIC COMMENT='The group configuration version.'
+
+mysql.replication_group_member_actions
+CREATE TABLE `replication_group_member_actions` (
+  `name` char(255) CHARACTER SET ascii COLLATE ascii_general_ci NOT NULL COMMENT 'The action name.',
+  `event` char(64) CHARACTER SET ascii COLLATE ascii_general_ci NOT NULL COMMENT 'The event that will trigger the action.',
+  `enabled` tinyint(1) NOT NULL COMMENT 'Whether the action is enabled.',
+  `type` char(64) CHARACTER SET ascii COLLATE ascii_general_ci NOT NULL COMMENT 'The action type.',
+  `priority` tinyint unsigned NOT NULL COMMENT 'The order on which the action will be run, value between 1 and 100, lower values first.',
+  `error_handling` char(64) CHARACTER SET ascii COLLATE ascii_general_ci NOT NULL COMMENT 'On errors during the action will be handled: IGNORE, CRITICAL.',
+  PRIMARY KEY (`name`,`event`),
+  KEY `event` (`event`)
+) /*!50100 TABLESPACE `mysql` */ ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci STATS_PERSISTENT=0 ROW_FORMAT=DYNAMIC COMMENT='The member actions configuration.'
+
+mysql.role_edges
+CREATE TABLE `role_edges` (
+  `FROM_HOST` char(255) CHARACTER SET ascii COLLATE ascii_general_ci NOT NULL DEFAULT '',
+  `FROM_USER` char(32) COLLATE utf8mb3_bin NOT NULL DEFAULT '',
+  `TO_HOST` char(255) CHARACTER SET ascii COLLATE ascii_general_ci NOT NULL DEFAULT '',
+  `TO_USER` char(32) COLLATE utf8mb3_bin NOT NULL DEFAULT '',
+  `WITH_ADMIN_OPTION` enum('N','Y') CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NOT NULL DEFAULT 'N',
+  PRIMARY KEY (`FROM_HOST`,`FROM_USER`,`TO_HOST`,`TO_USER`)
+) /*!50100 TABLESPACE `mysql` */ ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_bin STATS_PERSISTENT=0 ROW_FORMAT=DYNAMIC COMMENT='Role hierarchy and role grants'
+
+mysql.server_cost
+CREATE TABLE `server_cost` (
+  `cost_name` varchar(64) NOT NULL,
+  `cost_value` float DEFAULT NULL,
+  `last_update` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+  `comment` varchar(1024) DEFAULT NULL,
+  `default_value` float GENERATED ALWAYS AS ((case `cost_name` when _utf8mb3'disk_temptable_create_cost' then 20.0 when _utf8mb3'disk_temptable_row_cost' then 0.5 when _utf8mb3'key_compare_cost' then 0.05 when _utf8mb3'memory_temptable_create_cost' then 1.0 when _utf8mb3'memory_temptable_row_cost' then 0.1 when _utf8mb3'row_evaluate_cost' then 0.1 else NULL end)) VIRTUAL,
+  PRIMARY KEY (`cost_name`)
+) /*!50100 TABLESPACE `mysql` */ ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 STATS_PERSISTENT=0 ROW_FORMAT=DYNAMIC
+
+mysql.servers
+CREATE TABLE `servers` (
+  `Server_name` char(64) NOT NULL DEFAULT '',
+  `Host` char(255) CHARACTER SET ascii COLLATE ascii_general_ci NOT NULL DEFAULT '',
+  `Db` char(64) NOT NULL DEFAULT '',
+  `Username` char(64) NOT NULL DEFAULT '',
+  `Password` char(64) NOT NULL DEFAULT '',
+  `Port` int NOT NULL DEFAULT '0',
+  `Socket` char(64) NOT NULL DEFAULT '',
+  `Wrapper` char(64) NOT NULL DEFAULT '',
+  `Owner` char(64) NOT NULL DEFAULT '',
+  PRIMARY KEY (`Server_name`)
+) /*!50100 TABLESPACE `mysql` */ ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 STATS_PERSISTENT=0 ROW_FORMAT=DYNAMIC COMMENT='MySQL Foreign Servers table'
+
+mysql.tables_priv
+CREATE TABLE `tables_priv` (
+  `Host` char(255) CHARACTER SET ascii COLLATE ascii_general_ci NOT NULL DEFAULT '',
+  `Db` char(64) COLLATE utf8mb3_bin NOT NULL DEFAULT '',
+  `User` char(32) COLLATE utf8mb3_bin NOT NULL DEFAULT '',
+  `Table_name` char(64) COLLATE utf8mb3_bin NOT NULL DEFAULT '',
+  `Grantor` varchar(288) COLLATE utf8mb3_bin NOT NULL DEFAULT '',
+  `Timestamp` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+  `Table_priv` set('Select','Insert','Update','Delete','Create','Drop','Grant','References','Index','Alter','Create View','Show view','Trigger') CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NOT NULL DEFAULT '',
+  `Column_priv` set('Select','Insert','Update','References') CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NOT NULL DEFAULT '',
+  PRIMARY KEY (`Host`,`User`,`Db`,`Table_name`),
+  KEY `Grantor` (`Grantor`)
+) /*!50100 TABLESPACE `mysql` */ ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_bin STATS_PERSISTENT=0 ROW_FORMAT=DYNAMIC COMMENT='Table privileges'
+
+mysql.time_zone
+CREATE TABLE `time_zone` (
+  `Time_zone_id` int unsigned NOT NULL AUTO_INCREMENT,
+  `Use_leap_seconds` enum('Y','N') CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NOT NULL DEFAULT 'N',
+  PRIMARY KEY (`Time_zone_id`)
+) /*!50100 TABLESPACE `mysql` */ ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 STATS_PERSISTENT=0 ROW_FORMAT=DYNAMIC COMMENT='Time zones'
+
+mysql.time_zone_leap_second
+CREATE TABLE `time_zone_leap_second` (
+  `Transition_time` bigint NOT NULL,
+  `Correction` int NOT NULL,
+  PRIMARY KEY (`Transition_time`)
+) /*!50100 TABLESPACE `mysql` */ ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 STATS_PERSISTENT=0 ROW_FORMAT=DYNAMIC COMMENT='Leap seconds information for time zones'
+
+mysql.time_zone_name
+CREATE TABLE `time_zone_name` (
+  `Name` char(64) NOT NULL,
+  `Time_zone_id` int unsigned NOT NULL,
+  PRIMARY KEY (`Name`)
+) /*!50100 TABLESPACE `mysql` */ ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 STATS_PERSISTENT=0 ROW_FORMAT=DYNAMIC COMMENT='Time zone names'
+
+mysql.time_zone_transition
+CREATE TABLE `time_zone_transition` (
+  `Time_zone_id` int unsigned NOT NULL,
+  `Transition_time` bigint NOT NULL,
+  `Transition_type_id` int unsigned NOT NULL,
+  PRIMARY KEY (`Time_zone_id`,`Transition_time`)
+) /*!50100 TABLESPACE `mysql` */ ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 STATS_PERSISTENT=0 ROW_FORMAT=DYNAMIC COMMENT='Time zone transitions'
+
+mysql.time_zone_transition_type
+CREATE TABLE `time_zone_transition_type` (
+  `Time_zone_id` int unsigned NOT NULL,
+  `Transition_type_id` int unsigned NOT NULL,
+  `Offset` int NOT NULL DEFAULT '0',
+  `Is_DST` tinyint unsigned NOT NULL DEFAULT '0',
+  `Abbreviation` char(8) NOT NULL DEFAULT '',
+  PRIMARY KEY (`Time_zone_id`,`Transition_type_id`)
+) /*!50100 TABLESPACE `mysql` */ ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 STATS_PERSISTENT=0 ROW_FORMAT=DYNAMIC COMMENT='Time zone transition types'
+
+mysql.user
+CREATE TABLE `user` (
+  `Host` char(255) CHARACTER SET ascii COLLATE ascii_general_ci NOT NULL DEFAULT '',
+  `User` char(32) COLLATE utf8mb3_bin NOT NULL DEFAULT '',
+  `Select_priv` enum('N','Y') CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NOT NULL DEFAULT 'N',
+  `Insert_priv` enum('N','Y') CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NOT NULL DEFAULT 'N',
+  `Update_priv` enum('N','Y') CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NOT NULL DEFAULT 'N',
+  `Delete_priv` enum('N','Y') CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NOT NULL DEFAULT 'N',
+  `Create_priv` enum('N','Y') CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NOT NULL DEFAULT 'N',
+  `Drop_priv` enum('N','Y') CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NOT NULL DEFAULT 'N',
+  `Reload_priv` enum('N','Y') CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NOT NULL DEFAULT 'N',
+  `Shutdown_priv` enum('N','Y') CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NOT NULL DEFAULT 'N',
+  `Process_priv` enum('N','Y') CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NOT NULL DEFAULT 'N',
+  `File_priv` enum('N','Y') CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NOT NULL DEFAULT 'N',
+  `Grant_priv` enum('N','Y') CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NOT NULL DEFAULT 'N',
+  `References_priv` enum('N','Y') CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NOT NULL DEFAULT 'N',
+  `Index_priv` enum('N','Y') CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NOT NULL DEFAULT 'N',
+  `Alter_priv` enum('N','Y') CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NOT NULL DEFAULT 'N',
+  `Show_db_priv` enum('N','Y') CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NOT NULL DEFAULT 'N',
+  `Super_priv` enum('N','Y') CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NOT NULL DEFAULT 'N',
+  `Create_tmp_table_priv` enum('N','Y') CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NOT NULL DEFAULT 'N',
+  `Lock_tables_priv` enum('N','Y') CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NOT NULL DEFAULT 'N',
+  `Execute_priv` enum('N','Y') CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NOT NULL DEFAULT 'N',
+  `Repl_slave_priv` enum('N','Y') CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NOT NULL DEFAULT 'N',
+  `Repl_client_priv` enum('N','Y') CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NOT NULL DEFAULT 'N',
+  `Create_view_priv` enum('N','Y') CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NOT NULL DEFAULT 'N',
+  `Show_view_priv` enum('N','Y') CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NOT NULL DEFAULT 'N',
+  `Create_routine_priv` enum('N','Y') CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NOT NULL DEFAULT 'N',
+  `Alter_routine_priv` enum('N','Y') CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NOT NULL DEFAULT 'N',
+  `Create_user_priv` enum('N','Y') CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NOT NULL DEFAULT 'N',
+  `Event_priv` enum('N','Y') CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NOT NULL DEFAULT 'N',
+  `Trigger_priv` enum('N','Y') CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NOT NULL DEFAULT 'N',
+  `Create_tablespace_priv` enum('N','Y') CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NOT NULL DEFAULT 'N',
+  `ssl_type` enum('','ANY','X509','SPECIFIED') CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NOT NULL DEFAULT '',
+  `ssl_cipher` blob NOT NULL,
+  `x509_issuer` blob NOT NULL,
+  `x509_subject` blob NOT NULL,
+  `max_questions` int unsigned NOT NULL DEFAULT '0',
+  `max_updates` int unsigned NOT NULL DEFAULT '0',
+  `max_connections` int unsigned NOT NULL DEFAULT '0',
+  `max_user_connections` int unsigned NOT NULL DEFAULT '0',
+  `plugin` char(64) COLLATE utf8mb3_bin NOT NULL DEFAULT 'caching_sha2_password',
+  `authentication_string` text COLLATE utf8mb3_bin,
+  `password_expired` enum('N','Y') CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NOT NULL DEFAULT 'N',
+  `password_last_changed` timestamp NULL DEFAULT NULL,
+  `password_lifetime` smallint unsigned DEFAULT NULL,
+  `account_locked` enum('N','Y') CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NOT NULL DEFAULT 'N',
+  `Create_role_priv` enum('N','Y') CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NOT NULL DEFAULT 'N',
+  `Drop_role_priv` enum('N','Y') CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NOT NULL DEFAULT 'N',
+  `Password_reuse_history` smallint unsigned DEFAULT NULL,
+  `Password_reuse_time` smallint unsigned DEFAULT NULL,
+  `Password_require_current` enum('N','Y') CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci DEFAULT NULL,
+  `User_attributes` json DEFAULT NULL,
+  PRIMARY KEY (`Host`,`User`)
+) /*!50100 TABLESPACE `mysql` */ ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_bin STATS_PERSISTENT=0 ROW_FORMAT=DYNAMIC COMMENT='Users and global privileges'
+
+percona_test.checksums
+CREATE TABLE `checksums` (
+  `db_tbl` varchar(128) NOT NULL,
+  `checksum` int unsigned NOT NULL,
+  PRIMARY KEY (`db_tbl`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci
+
+percona_test.load_data
+CREATE TABLE `load_data` (
+  `i` int DEFAULT NULL
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci
+
+percona_test.sentinel
+CREATE TABLE `sentinel` (
+  `id` int NOT NULL,
+  `ping` varchar(64) NOT NULL DEFAULT '',
+  PRIMARY KEY (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci
+
+sakila.actor
+CREATE TABLE `actor` (
+  `actor_id` smallint unsigned NOT NULL AUTO_INCREMENT,
+  `first_name` varchar(45) NOT NULL,
+  `last_name` varchar(45) NOT NULL,
+  `last_update` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+  PRIMARY KEY (`actor_id`),
+  KEY `idx_actor_last_name` (`last_name`)
+) ENGINE=InnoDB AUTO_INCREMENT=201 DEFAULT CHARSET=utf8mb3
+
+sakila.address
+CREATE TABLE `address` (
+  `address_id` smallint unsigned NOT NULL AUTO_INCREMENT,
+  `address` varchar(50) NOT NULL,
+  `address2` varchar(50) DEFAULT NULL,
+  `district` varchar(20) NOT NULL,
+  `city_id` smallint unsigned NOT NULL,
+  `postal_code` varchar(10) DEFAULT NULL,
+  `phone` varchar(20) NOT NULL,
+  `last_update` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+  PRIMARY KEY (`address_id`),
+  KEY `idx_fk_city_id` (`city_id`),
+  CONSTRAINT `fk_address_city` FOREIGN KEY (`city_id`) REFERENCES `city` (`city_id`) ON UPDATE CASCADE
+) ENGINE=InnoDB AUTO_INCREMENT=606 DEFAULT CHARSET=utf8mb3
+
+sakila.category
+CREATE TABLE `category` (
+  `category_id` tinyint unsigned NOT NULL AUTO_INCREMENT,
+  `name` varchar(25) NOT NULL,
+  `last_update` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+  PRIMARY KEY (`category_id`)
+) ENGINE=InnoDB AUTO_INCREMENT=17 DEFAULT CHARSET=utf8mb3
+
+sakila.city
+CREATE TABLE `city` (
+  `city_id` smallint unsigned NOT NULL AUTO_INCREMENT,
+  `city` varchar(50) NOT NULL,
+  `country_id` smallint unsigned NOT NULL,
+  `last_update` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+  PRIMARY KEY (`city_id`),
+  KEY `idx_fk_country_id` (`country_id`),
+  CONSTRAINT `fk_city_country` FOREIGN KEY (`country_id`) REFERENCES `country` (`country_id`) ON UPDATE CASCADE
+) ENGINE=InnoDB AUTO_INCREMENT=601 DEFAULT CHARSET=utf8mb3
+
+sakila.country
+CREATE TABLE `country` (
+  `country_id` smallint unsigned NOT NULL AUTO_INCREMENT,
+  `country` varchar(50) NOT NULL,
+  `last_update` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+  PRIMARY KEY (`country_id`)
+) ENGINE=InnoDB AUTO_INCREMENT=110 DEFAULT CHARSET=utf8mb3
+
+sakila.customer
+CREATE TABLE `customer` (
+  `customer_id` smallint unsigned NOT NULL AUTO_INCREMENT,
+  `store_id` tinyint unsigned NOT NULL,
+  `first_name` varchar(45) NOT NULL,
+  `last_name` varchar(45) NOT NULL,
+  `email` varchar(50) DEFAULT NULL,
+  `address_id` smallint unsigned NOT NULL,
+  `active` tinyint(1) NOT NULL DEFAULT '1',
+  `create_date` datetime NOT NULL,
+  `last_update` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+  PRIMARY KEY (`customer_id`),
+  KEY `idx_fk_store_id` (`store_id`),
+  KEY `idx_fk_address_id` (`address_id`),
+  KEY `idx_last_name` (`last_name`),
+  CONSTRAINT `fk_customer_address` FOREIGN KEY (`address_id`) REFERENCES `address` (`address_id`) ON UPDATE CASCADE,
+  CONSTRAINT `fk_customer_store` FOREIGN KEY (`store_id`) REFERENCES `store` (`store_id`) ON UPDATE CASCADE
+) ENGINE=InnoDB AUTO_INCREMENT=600 DEFAULT CHARSET=utf8mb3
+
+sakila.film
+CREATE TABLE `film` (
+  `film_id` smallint unsigned NOT NULL AUTO_INCREMENT,
+  `title` varchar(255) NOT NULL,
+  `description` text,
+  `release_year` year DEFAULT NULL,
+  `language_id` tinyint unsigned NOT NULL,
+  `original_language_id` tinyint unsigned DEFAULT NULL,
+  `rental_duration` tinyint unsigned NOT NULL DEFAULT '3',
+  `rental_rate` decimal(4,2) NOT NULL DEFAULT '4.99',
+  `length` smallint unsigned DEFAULT NULL,
+  `replacement_cost` decimal(5,2) NOT NULL DEFAULT '19.99',
+  `rating` enum('G','PG','PG-13','R','NC-17') DEFAULT 'G',
+  `special_features` set('Trailers','Commentaries','Deleted Scenes','Behind the Scenes') DEFAULT NULL,
+  `last_update` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+  PRIMARY KEY (`film_id`),
+  KEY `idx_title` (`title`),
+  KEY `idx_fk_language_id` (`language_id`),
+  KEY `idx_fk_original_language_id` (`original_language_id`),
+  CONSTRAINT `fk_film_language` FOREIGN KEY (`language_id`) REFERENCES `language` (`language_id`) ON UPDATE CASCADE,
+  CONSTRAINT `fk_film_language_original` FOREIGN KEY (`original_language_id`) REFERENCES `language` (`language_id`) ON UPDATE CASCADE
+) ENGINE=InnoDB AUTO_INCREMENT=1001 DEFAULT CHARSET=utf8mb3
+
+sakila.film_actor
+CREATE TABLE `film_actor` (
+  `actor_id` smallint unsigned NOT NULL,
+  `film_id` smallint unsigned NOT NULL,
+  `last_update` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+  PRIMARY KEY (`actor_id`,`film_id`),
+  KEY `idx_fk_film_id` (`film_id`),
+  CONSTRAINT `fk_film_actor_actor` FOREIGN KEY (`actor_id`) REFERENCES `actor` (`actor_id`) ON UPDATE CASCADE,
+  CONSTRAINT `fk_film_actor_film` FOREIGN KEY (`film_id`) REFERENCES `film` (`film_id`) ON UPDATE CASCADE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3
+
+sakila.film_category
+CREATE TABLE `film_category` (
+  `film_id` smallint unsigned NOT NULL,
+  `category_id` tinyint unsigned NOT NULL,
+  `last_update` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+  PRIMARY KEY (`film_id`,`category_id`),
+  KEY `fk_film_category_category` (`category_id`),
+  CONSTRAINT `fk_film_category_category` FOREIGN KEY (`category_id`) REFERENCES `category` (`category_id`) ON UPDATE CASCADE,
+  CONSTRAINT `fk_film_category_film` FOREIGN KEY (`film_id`) REFERENCES `film` (`film_id`) ON UPDATE CASCADE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3
+
+sakila.film_text
+CREATE TABLE `film_text` (
+  `film_id` smallint NOT NULL,
+  `title` varchar(255) NOT NULL,
+  `description` text,
+  PRIMARY KEY (`film_id`),
+  FULLTEXT KEY `idx_title_description` (`title`,`description`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8mb3
+
+sakila.inventory
+CREATE TABLE `inventory` (
+  `inventory_id` mediumint unsigned NOT NULL AUTO_INCREMENT,
+  `film_id` smallint unsigned NOT NULL,
+  `store_id` tinyint unsigned NOT NULL,
+  `last_update` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+  PRIMARY KEY (`inventory_id`),
+  KEY `idx_fk_film_id` (`film_id`),
+  KEY `idx_store_id_film_id` (`store_id`,`film_id`),
+  CONSTRAINT `fk_inventory_film` FOREIGN KEY (`film_id`) REFERENCES `film` (`film_id`) ON UPDATE CASCADE,
+  CONSTRAINT `fk_inventory_store` FOREIGN KEY (`store_id`) REFERENCES `store` (`store_id`) ON UPDATE CASCADE
+) ENGINE=InnoDB AUTO_INCREMENT=4582 DEFAULT CHARSET=utf8mb3
+
+sakila.language
+CREATE TABLE `language` (
+  `language_id` tinyint unsigned NOT NULL AUTO_INCREMENT,
+  `name` char(20) NOT NULL,
+  `last_update` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+  PRIMARY KEY (`language_id`)
+) ENGINE=InnoDB AUTO_INCREMENT=7 DEFAULT CHARSET=utf8mb3
+
+sakila.payment
+CREATE TABLE `payment` (
+  `payment_id` smallint unsigned NOT NULL AUTO_INCREMENT,
+  `customer_id` smallint unsigned NOT NULL,
+  `staff_id` tinyint unsigned NOT NULL,
+  `rental_id` int DEFAULT NULL,
+  `amount` decimal(5,2) NOT NULL,
+  `payment_date` datetime NOT NULL,
+  `last_update` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+  PRIMARY KEY (`payment_id`),
+  KEY `idx_fk_staff_id` (`staff_id`),
+  KEY `idx_fk_customer_id` (`customer_id`),
+  KEY `fk_payment_rental` (`rental_id`),
+  CONSTRAINT `fk_payment_customer` FOREIGN KEY (`customer_id`) REFERENCES `customer` (`customer_id`) ON UPDATE CASCADE,
+  CONSTRAINT `fk_payment_rental` FOREIGN KEY (`rental_id`) REFERENCES `rental` (`rental_id`) ON DELETE SET NULL ON UPDATE CASCADE,
+  CONSTRAINT `fk_payment_staff` FOREIGN KEY (`staff_id`) REFERENCES `staff` (`staff_id`) ON UPDATE CASCADE
+) ENGINE=InnoDB AUTO_INCREMENT=16050 DEFAULT CHARSET=utf8mb3
+
+sakila.rental
+CREATE TABLE `rental` (
+  `rental_id` int NOT NULL AUTO_INCREMENT,
+  `rental_date` datetime NOT NULL,
+  `inventory_id` mediumint unsigned NOT NULL,
+  `customer_id` smallint unsigned NOT NULL,
+  `return_date` datetime DEFAULT NULL,
+  `staff_id` tinyint unsigned NOT NULL,
+  `last_update` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+  PRIMARY KEY (`rental_id`),
+  UNIQUE KEY `rental_date` (`rental_date`,`inventory_id`,`customer_id`),
+  KEY `idx_fk_inventory_id` (`inventory_id`),
+  KEY `idx_fk_customer_id` (`customer_id`),
+  KEY `idx_fk_staff_id` (`staff_id`),
+  CONSTRAINT `fk_rental_customer` FOREIGN KEY (`customer_id`) REFERENCES `customer` (`customer_id`) ON UPDATE CASCADE,
+  CONSTRAINT `fk_rental_inventory` FOREIGN KEY (`inventory_id`) REFERENCES `inventory` (`inventory_id`) ON UPDATE CASCADE,
+  CONSTRAINT `fk_rental_staff` FOREIGN KEY (`staff_id`) REFERENCES `staff` (`staff_id`) ON UPDATE CASCADE
+) ENGINE=InnoDB AUTO_INCREMENT=16050 DEFAULT CHARSET=utf8mb3
+
+sakila.staff
+CREATE TABLE `staff` (
+  `staff_id` tinyint unsigned NOT NULL AUTO_INCREMENT,
+  `first_name` varchar(45) NOT NULL,
+  `last_name` varchar(45) NOT NULL,
+  `address_id` smallint unsigned NOT NULL,
+  `picture` blob,
+  `email` varchar(50) DEFAULT NULL,
+  `store_id` tinyint unsigned NOT NULL,
+  `active` tinyint(1) NOT NULL DEFAULT '1',
+  `username` varchar(16) NOT NULL,
+  `password` varchar(40) CHARACTER SET utf8mb3 COLLATE utf8mb3_bin DEFAULT NULL,
+  `last_update` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+  PRIMARY KEY (`staff_id`),
+  KEY `idx_fk_store_id` (`store_id`),
+  KEY `idx_fk_address_id` (`address_id`),
+  CONSTRAINT `fk_staff_address` FOREIGN KEY (`address_id`) REFERENCES `address` (`address_id`) ON UPDATE CASCADE,
+  CONSTRAINT `fk_staff_store` FOREIGN KEY (`store_id`) REFERENCES `store` (`store_id`) ON UPDATE CASCADE
+) ENGINE=InnoDB AUTO_INCREMENT=3 DEFAULT CHARSET=utf8mb3
+
+sakila.store
+CREATE TABLE `store` (
+  `store_id` tinyint unsigned NOT NULL AUTO_INCREMENT,
+  `manager_staff_id` tinyint unsigned NOT NULL,
+  `address_id` smallint unsigned NOT NULL,
+  `last_update` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+  PRIMARY KEY (`store_id`),
+  UNIQUE KEY `idx_unique_manager` (`manager_staff_id`),
+  KEY `idx_fk_address_id` (`address_id`),
+  CONSTRAINT `fk_store_address` FOREIGN KEY (`address_id`) REFERENCES `address` (`address_id`) ON UPDATE CASCADE,
+  CONSTRAINT `fk_store_staff` FOREIGN KEY (`manager_staff_id`) REFERENCES `staff` (`staff_id`) ON UPDATE CASCADE
+) ENGINE=InnoDB AUTO_INCREMENT=3 DEFAULT CHARSET=utf8mb3
+
+sys.sys_config
+CREATE TABLE `sys_config` (
+  `variable` varchar(128) NOT NULL,
+  `value` varchar(128) DEFAULT NULL,
+  `set_time` timestamp NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+  `set_by` varchar(128) DEFAULT NULL,
+  PRIMARY KEY (`variable`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci
+
diff --git a/t/lib/samples/SchemaIterator/mysql-user-ddl-8.4.txt b/t/lib/samples/SchemaIterator/mysql-user-ddl-8.4.txt
new file mode 100644
index 000000000..b1622cb66
--- /dev/null
+++ b/t/lib/samples/SchemaIterator/mysql-user-ddl-8.4.txt
@@ -0,0 +1,56 @@
+mysql.user
+CREATE TABLE `user` (
+  `Host` char(255) CHARACTER SET ascii COLLATE ascii_general_ci NOT NULL DEFAULT '',
+  `User` char(32) COLLATE utf8mb3_bin NOT NULL DEFAULT '',
+  `Select_priv` enum('N','Y') CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NOT NULL DEFAULT 'N',
+  `Insert_priv` enum('N','Y') CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NOT NULL DEFAULT 'N',
+  `Update_priv` enum('N','Y') CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NOT NULL DEFAULT 'N',
+  `Delete_priv` enum('N','Y') CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NOT NULL DEFAULT 'N',
+  `Create_priv` enum('N','Y') CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NOT NULL DEFAULT 'N',
+  `Drop_priv` enum('N','Y') CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NOT NULL DEFAULT 'N',
+  `Reload_priv` enum('N','Y') CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NOT NULL DEFAULT 'N',
+  `Shutdown_priv` enum('N','Y') CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NOT NULL DEFAULT 'N',
+  `Process_priv` enum('N','Y') CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NOT NULL DEFAULT 'N',
+  `File_priv` enum('N','Y') CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NOT NULL DEFAULT 'N',
+  `Grant_priv` enum('N','Y') CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NOT NULL DEFAULT 'N',
+  `References_priv` enum('N','Y') CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NOT NULL DEFAULT 'N',
+  `Index_priv` enum('N','Y') CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NOT NULL DEFAULT 'N',
+  `Alter_priv` enum('N','Y') CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NOT NULL DEFAULT 'N',
+  `Show_db_priv` enum('N','Y') CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NOT NULL DEFAULT 'N',
+  `Super_priv` enum('N','Y') CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NOT NULL DEFAULT 'N',
+  `Create_tmp_table_priv` enum('N','Y') CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NOT NULL DEFAULT 'N',
+  `Lock_tables_priv` enum('N','Y') CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NOT NULL DEFAULT 'N',
+  `Execute_priv` enum('N','Y') CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NOT NULL DEFAULT 'N',
+  `Repl_slave_priv` enum('N','Y') CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NOT NULL DEFAULT 'N',
+  `Repl_client_priv` enum('N','Y') CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NOT NULL DEFAULT 'N',
+  `Create_view_priv` enum('N','Y') CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NOT NULL DEFAULT 'N',
+  `Show_view_priv` enum('N','Y') CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NOT NULL DEFAULT 'N',
+  `Create_routine_priv` enum('N','Y') CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NOT NULL DEFAULT 'N',
+  `Alter_routine_priv` enum('N','Y') CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NOT NULL DEFAULT 'N',
+  `Create_user_priv` enum('N','Y') CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NOT NULL DEFAULT 'N',
+  `Event_priv` enum('N','Y') CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NOT NULL DEFAULT 'N',
+  `Trigger_priv` enum('N','Y') CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NOT NULL DEFAULT 'N',
+  `Create_tablespace_priv` enum('N','Y') CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NOT NULL DEFAULT 'N',
+  `ssl_type` enum('','ANY','X509','SPECIFIED') CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NOT NULL DEFAULT '',
+  `ssl_cipher` blob NOT NULL,
+  `x509_issuer` blob NOT NULL,
+  `x509_subject` blob NOT NULL,
+  `max_questions` int unsigned NOT NULL DEFAULT '0',
+  `max_updates` int unsigned NOT NULL DEFAULT '0',
+  `max_connections` int unsigned NOT NULL DEFAULT '0',
+  `max_user_connections` int unsigned NOT NULL DEFAULT '0',
+  `plugin` char(64) COLLATE utf8mb3_bin NOT NULL DEFAULT 'caching_sha2_password',
+  `authentication_string` text COLLATE utf8mb3_bin,
+  `password_expired` enum('N','Y') CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NOT NULL DEFAULT 'N',
+  `password_last_changed` timestamp NULL DEFAULT NULL,
+  `password_lifetime` smallint unsigned DEFAULT NULL,
+  `account_locked` enum('N','Y') CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NOT NULL DEFAULT 'N',
+  `Create_role_priv` enum('N','Y') CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NOT NULL DEFAULT 'N',
+  `Drop_role_priv` enum('N','Y') CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NOT NULL DEFAULT 'N',
+  `Password_reuse_history` smallint unsigned DEFAULT NULL,
+  `Password_reuse_time` smallint unsigned DEFAULT NULL,
+  `Password_require_current` enum('N','Y') CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci DEFAULT NULL,
+  `User_attributes` json DEFAULT NULL,
+  PRIMARY KEY (`Host`,`User`)
+) /*!50100 TABLESPACE `mysql` */ ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_bin STATS_PERSISTENT=0 ROW_FORMAT=DYNAMIC COMMENT='Users and global privileges'
+

From b9a5231c9b2218782b87814b5269479c72b206ba Mon Sep 17 00:00:00 2001
From: Sveta Smirnova <sveta.smirnova@percona.com>
Date: Thu, 25 Jul 2024 23:12:43 +0300
Subject: [PATCH 04/31] PT-2340 - Support MySQL 8.4

- Removed all unneeded occuriences of the word "master" in lib
---
 lib/Cxn.pm                       |  6 +--
 lib/MasterSlave.pm               | 34 +++++++-------
 lib/Percona/Test.pm              | 15 ++++--
 lib/Percona/XtraDB/Cluster.pm    |  2 +-
 lib/PerconaTest.pm               | 26 +++++++++--
 lib/ReplicaLagWaiter.pm          |  4 +-
 lib/RowChecksum.pm               | 12 ++---
 lib/Sandbox.pm                   | 78 ++++++++++++++++++++------------
 lib/TableChecksum.pm             | 12 ++---
 lib/TableSyncer.pm               | 26 +++++------
 lib/WeightedAvgRate.pm           |  2 +-
 lib/bash/collect_mysql_info.sh   | 32 +++++++++----
 lib/bash/report_formatting.sh    |  4 +-
 lib/bash/report_mysql_info.sh    | 41 +++++++++++------
 t/lib/TableSyncer.t              |  2 +-
 t/lib/bash/collect_mysql_info.sh |  4 +-
 16 files changed, 186 insertions(+), 114 deletions(-)

diff --git a/lib/Cxn.pm b/lib/Cxn.pm
index 8ed34a75b..859a3621c 100644
--- a/lib/Cxn.pm
+++ b/lib/Cxn.pm
@@ -297,12 +297,12 @@ sub is_cluster_node {
 }
 
 # There's two reasons why there might be dupes:
-# If the "master" is a cluster node, then a DSN table might have been
+# If the "source" is a cluster node, then a DSN table might have been
 # used, and it may have all nodes' DSNs so the user can run the tool
-# on any node, in which case it has the "master" node, the DSN given
+# on any node, in which case it has the "source" node, the DSN given
 # on the command line.
 # On the other hand, maybe find_cluster_nodes worked, in which case
-# we definitely have a dupe for the master cxn, but we may also have a
+# we definitely have a dupe for the source cxn, but we may also have a
 # dupe for every other node if this was used in conjunction with a
 # DSN table.
 # So try to detect and remove those.
diff --git a/lib/MasterSlave.pm b/lib/MasterSlave.pm
index 67bad3a01..23c992c9f 100644
--- a/lib/MasterSlave.pm
+++ b/lib/MasterSlave.pm
@@ -456,7 +456,7 @@ sub is_source_of {
       # compare and make sure the source and slave are reasonably close to each
       # other.  Note that this is one of the few places where I check the I/O
       # thread positions instead of the SQL thread positions!
-      # Master_Log_File/Read_Master_Log_Pos is the I/O thread's position on the
+      # Source_Log_File/Read_Source_Log_Pos is the I/O thread's position on the
       # source.
       my ( $source_log_name, $source_log_num )
          = $source_status->{file} =~ m/^(.*?)\.0*([1-9][0-9]*)$/;
@@ -474,7 +474,7 @@ sub is_source_of {
 }
 
 # Figures out how to connect to the source, by examining SHOW SLAVE STATUS.  But
-# does NOT use the value from Master_User for the username, because typically we
+# does NOT use the value from Source_User for the username, because typically we
 # want to perform operations as the username that was specified (usually to the
 # program's --user option, or in a DSN), rather than as the replication user,
 # which is often restricted.
@@ -558,7 +558,7 @@ sub get_slave_status {
   }
 }
 
-# Gets SHOW MASTER STATUS, with column names all lowercased, as a hashref.
+# Gets SHOW SOURCE STATUS, with column names all lowercased, as a hashref.
 sub get_source_status {
    my ( $self, $dbh ) = @_;
 
@@ -575,7 +575,7 @@ sub get_source_status {
 
    my $sth;
    if ( $self->{sths}->{$dbh} && $dbh && $self->{sths}->{$dbh} == $dbh ) {
-      $sth = $self->{sths}->{$dbh}->{MASTER_STATUS}
+      $sth = $self->{sths}->{$dbh}->{SOURCE_STATUS}
          ||= $dbh->prepare("SHOW ${source_name} STATUS");
    }
    else {
@@ -597,7 +597,7 @@ sub get_source_status {
 }
 
 # Sub: wait_for_source
-#   Execute MASTER_POS_WAIT() to make slave wait for its source.
+#   Execute SOURCE_POS_WAIT() to make slave wait for its source.
 #
 # Parameters:
 #   %args - Arguments
@@ -613,7 +613,7 @@ sub get_source_status {
 #   Hashref with result of waiting, like:
 #   (start code)
 #   {
-#     result => the result returned by MASTER_POS_WAIT: -1, undef, 0+
+#     result => the result returned by SOURCE_POS_WAIT: -1, undef, 0+
 #     waited => the number of seconds waited, might be zero
 #   }
 #   (end code)
@@ -651,7 +651,7 @@ sub wait_for_source {
       my $start = time;
       ($result) = $slave_dbh->selectrow_array($sql);
 
-      # If MASTER_POS_WAIT() returned NULL and we waited at least 1s
+      # If SOURCE_POS_WAIT() returned NULL and we waited at least 1s
       # and the time we waited is less than the timeout then this is
       # a strong indication that the slave was stopped while we were
       # waiting.
@@ -695,7 +695,7 @@ sub start_slave {
       $replica_name = 'slave';
    }
    if ( $pos ) {
-      # Just like with CHANGE MASTER TO, you can't quote the position.
+      # Just like with CHANGE REPLICATION SOURCE TO, you can't quote the position.
       my $sql = "START ${replica_name} UNTIL ${source_name}_LOG_FILE='$pos->{file}', "
               . "${source_name}_LOG_POS=$pos->{position}";
       PTDEBUG && _d($dbh, $sql);
@@ -720,7 +720,7 @@ sub catchup_to_source {
    my $slave_pos     = $self->repl_posn($slave_status);
    my $source_status = $self->get_source_status($source);
    my $source_pos    = $self->repl_posn($source_status);
-   PTDEBUG && _d('Master position:', $self->pos_to_string($source_pos),
+   PTDEBUG && _d('Source position:', $self->pos_to_string($source_pos),
       'Slave position:', $self->pos_to_string($slave_pos));
 
    my $result;
@@ -729,7 +729,7 @@ sub catchup_to_source {
       $self->start_slave($slave, $source_pos);
 
       # The slave may catch up instantly and stop, in which case
-      # MASTER_POS_WAIT will return NULL and $result->{result} will be undef.
+      # SOURCE_POS_WAIT will return NULL and $result->{result} will be undef.
       # We must catch this; if it returns NULL, then we check that
       # its position is as desired.
       # TODO: what if source_pos_wait times out and $result == -1? retry?
@@ -745,12 +745,12 @@ sub catchup_to_source {
       if ( !defined $result->{result} ) {
          $slave_status = $self->get_slave_status($slave);
          if ( !$self->slave_is_running($slave_status) ) {
-            PTDEBUG && _d('Master position:',
+            PTDEBUG && _d('Source position:',
                $self->pos_to_string($source_pos),
                'Slave position:', $self->pos_to_string($slave_pos));
             $slave_pos = $self->repl_posn($slave_status);
             if ( $self->pos_cmp($slave_pos, $source_pos) != 0 ) {
-               die "MASTER_POS_WAIT() returned NULL but slave has not "
+               die "SOURCE_POS_WAIT() returned NULL but slave has not "
                   . "caught up to source";
             }
             PTDEBUG && _d('Slave is caught up to source and stopped');
@@ -815,12 +815,12 @@ sub has_slave_updates {
    return $value && $value =~ m/^(1|ON)$/;
 }
 
-# Extracts the replication position out of either SHOW MASTER STATUS or SHOW
+# Extracts the replication position out of either SHOW REPLICATION SOURCE STATUS or SHOW
 # SLAVE STATUS, and returns it as a hashref { file, position }
 sub repl_posn {
    my ( $self, $status ) = @_;
    if ( exists $status->{file} && exists $status->{position} ) {
-      # It's the output of SHOW MASTER STATUS
+      # It's the output of SHOW BINARY LOG STATUS
       return {
          file     => $status->{file},
          position => $status->{position},
@@ -878,9 +878,9 @@ sub pos_cmp {
 sub short_host {
    my ( $self, $dsn ) = @_;
    my ($host, $port);
-   if ( $dsn->{master_host} ) {
-      $host = $dsn->{master_host};
-      $port = $dsn->{master_port};
+   if ( $dsn->{source_host} ) {
+      $host = $dsn->{source_host};
+      $port = $dsn->{source_port};
    }
    else {
       $host = $dsn->{h};
diff --git a/lib/Percona/Test.pm b/lib/Percona/Test.pm
index b9408d5ab..e1221b497 100644
--- a/lib/Percona/Test.pm
+++ b/lib/Percona/Test.pm
@@ -702,18 +702,25 @@ sub normalize_checksum_results {
    return $normal_output;
 }
 
-sub get_master_binlog_pos {
+sub get_source_binlog_pos {
    my ($dbh) = @_;
-   my $sql = "SHOW MASTER STATUS";
+
+   my $vp = VersionParser->new($dbh);
+   my $source_name = 'source';
+   if ( $vp->cmp('8.1') < 0 || $vp->flavor() =~ m/maria/i ) {
+      $source_name = 'master';
+   }
+
+   my $sql = "SHOW ${source_name} STATUS";
    my $ms  = $dbh->selectrow_hashref($sql);
    return $ms->{position};
 }
 
-sub get_slave_pos_relative_to_master {
+sub get_slave_pos_relative_to_source {
    my ($dbh) = @_;
    my $sql = "SHOW SLAVE STATUS";
    my $ss  = $dbh->selectrow_hashref($sql);
-   return $ss->{exec_master_log_pos};
+   return $ss->{exec_source_log_pos};
 }
 
 # Like output(), but forks a process to execute the coderef.
diff --git a/lib/Percona/XtraDB/Cluster.pm b/lib/Percona/XtraDB/Cluster.pm
index aa152e455..4b57bd6e7 100644
--- a/lib/Percona/XtraDB/Cluster.pm
+++ b/lib/Percona/XtraDB/Cluster.pm
@@ -112,7 +112,7 @@ sub find_cluster_nodes {
          # If there wasn't a port, that means that this bug
          # https://bugs.launchpad.net/percona-toolkit/+bug/1082406
          # isn't fixed on this version of PXC. We tried using the
-         # master's port, but that didn't work. So try again, using
+         # source's port, but that didn't work. So try again, using
          # the default port.
          if ( !$port && $dsn->{P} != 3306 ) {
             $address .= ":3306";
diff --git a/lib/PerconaTest.pm b/lib/PerconaTest.pm
index aaca82233..d86399d81 100644
--- a/lib/PerconaTest.pm
+++ b/lib/PerconaTest.pm
@@ -760,18 +760,34 @@ sub normalize_checksum_results {
    return $normal_output;
 }
 
-sub get_master_binlog_pos {
+sub get_source_binlog_pos {
    my ($dbh) = @_;
-   my $sql = "SHOW MASTER STATUS";
+
+   my $vp = VersionParser->new($dbh);
+   my $source_name = 'source';
+   if ( $vp->cmp('8.1') < 0 || $vp->flavor() =~ m/maria/i ) {
+      $source_name = 'master';
+   }
+
+   my $sql = "SHOW ${source_name} STATUS";
    my $ms  = $dbh->selectrow_hashref($sql);
    return $ms->{position};
 }
 
-sub get_slave_pos_relative_to_master {
+sub get_slave_pos_relative_to_source {
    my ($dbh) = @_;
-   my $sql = "SHOW SLAVE STATUS";
+
+   my $vp = VersionParser->new($dbh);
+   my $source_name = 'source';
+   my $replica_name = 'replica';
+   if ( $vp->cmp('8.1') < 0 || $vp->flavor() =~ m/maria/i ) {
+      $source_name = 'master';
+      $replica_name = 'slave';
+   }
+
+   my $sql = "SHOW ${replica_name} STATUS";
    my $ss  = $dbh->selectrow_hashref($sql);
-   return $ss->{exec_master_log_pos};
+   return $ss->{"exec_${source_name}_log_pos"};
 }
 
 # Like output(), but forks a process to execute the coderef.
diff --git a/lib/ReplicaLagWaiter.pm b/lib/ReplicaLagWaiter.pm
index f1083af7a..47cec6846 100644
--- a/lib/ReplicaLagWaiter.pm
+++ b/lib/ReplicaLagWaiter.pm
@@ -19,7 +19,7 @@
 # ###########################################################################
 {
 # Package: ReplicaLagWaiter
-# ReplicaLagWaiter helps limit slave lag when working on the master.
+# ReplicaLagWaiter helps limit slave lag when working on the source.
 package ReplicaLagWaiter;
 
 use strict;
@@ -56,7 +56,7 @@ sub new {
 }
 
 # Sub: wait
-#   Wait for Seconds_Behind_Master on all slaves to become < max.
+#   Wait for Seconds_Behind_Source on all slaves to become < max.
 #
 # Optional Arguments:
 #   Progress - <Progress> object to report waiting
diff --git a/lib/RowChecksum.pm b/lib/RowChecksum.pm
index bcc995eb5..36b254dd2 100644
--- a/lib/RowChecksum.pm
+++ b/lib/RowChecksum.pm
@@ -468,7 +468,7 @@ sub _make_xor_slices {
    return join(', ', @slices);
 }
 
-# Queries the replication table for chunks that differ from the master's data.
+# Queries the replication table for chunks that differ from the source's data.
 sub find_replication_differences {
    my ($self, %args) = @_;
    my @required_args = qw(dbh repl_table);
@@ -484,13 +484,13 @@ sub find_replication_differences {
       my $sql
          = "SELECT CONCAT(db, '.', tbl) AS `table`, "
          . "chunk, chunk_index, lower_boundary, upper_boundary, "
-         . "COALESCE(this_cnt-master_cnt, 0) AS cnt_diff, "
+         . "COALESCE(this_cnt-source_cnt, 0) AS cnt_diff, "
          . "COALESCE("
-         .   "this_crc <> master_crc OR ISNULL(master_crc) <> ISNULL(this_crc), 0"
-         . ") AS crc_diff, this_cnt, master_cnt, this_crc, master_crc "
+         .   "this_crc <> source_crc OR ISNULL(source_crc) <> ISNULL(this_crc), 0"
+         . ") AS crc_diff, this_cnt, source_cnt, this_crc, source_crc "
          . "FROM $repl_table "
-         . "WHERE (master_cnt <> this_cnt OR master_crc <> this_crc "
-         .        "OR ISNULL(master_crc) <> ISNULL(this_crc)) "
+         . "WHERE (source_cnt <> this_cnt OR source_crc <> this_crc "
+         .        "OR ISNULL(source_crc) <> ISNULL(this_crc)) "
          . ($args{where} ? " AND ($args{where})" : "");
       PTDEBUG && _d($sql);
       $diffs = $dbh->selectall_arrayref($sql, { Slice => {} });
diff --git a/lib/Sandbox.pm b/lib/Sandbox.pm
index a9f495874..24403b1cd 100644
--- a/lib/Sandbox.pm
+++ b/lib/Sandbox.pm
@@ -218,22 +218,22 @@ sub wipe_clean {
 }
 
 # Returns a string if there is a problem with the source.
-sub master_is_ok {
-   my ($self, $master) = @_;
-   my $master_dbh = $self->get_dbh_for($master);
-   if ( !$master_dbh ) {
-      return "Sandbox $master " . $port_for{$master} . " is down.";
+sub source_is_ok {
+   my ($self, $source) = @_;
+   my $source_dbh = $self->get_dbh_for($source);
+   if ( !$source_dbh ) {
+      return "Sandbox $source " . $port_for{$source} . " is down.";
    }
-   $master_dbh->disconnect();
+   $source_dbh->disconnect();
    return;
 }
 
 # Returns a string if there is a problem with the replica.
 sub slave_is_ok {
-   my ($self, $slave, $master, $ro) = @_;
+   my ($self, $slave, $source, $ro) = @_;
    return if $self->is_cluster_node($slave);
    PTDEBUG && _d('Checking if replica', $slave, $port_for{$slave},
-      'to', $master, $port_for{$master}, 'is ok');
+      'to', $source, $port_for{$source}, 'is ok');
 
    my $slave_dbh = $self->get_dbh_for($slave);
    if ( !$slave_dbh ) {
@@ -242,10 +242,12 @@ sub slave_is_ok {
 
    my $vp = VersionParser->new($slave_dbh);
    my $replica_name = 'replica';
+   my $source_name = 'source';
    if ( $vp->cmp('8.1') < 0 || $vp->flavor() =~ m/maria/i ) {
       $replica_name = 'slave';
+      $source_name = 'master';
    }
-   my $master_port = $port_for{$master};
+   my $source_port = $port_for{$source};
    my $status = $slave_dbh->selectall_arrayref(
       "SHOW ${replica_name} STATUS", { Slice => {} });
    if ( !$status || !@$status ) {
@@ -276,9 +278,9 @@ sub slave_is_ok {
 
    my $sleep_t = 0.25;
    my $total_t = 0;
-   while ( defined $status->[0]->{seconds_behind_master}
-           &&  $status->[0]->{seconds_behind_master} > 0 ) {
-      PTDEBUG && _d('Replica lag:', $status->[0]->{seconds_behind_master});
+   while ( defined $status->[0]->{"seconds_behind_${source_name}"}
+           &&  $status->[0]->{"seconds_behind_${source_name}"} > 0 ) {
+      PTDEBUG && _d('Replica lag:', $status->[0]->{"seconds_behind_${source_name}"});
       sleep $sleep_t;
       $total_t += $sleep_t;
       $status = $slave_dbh->selectall_arrayref(
@@ -330,7 +332,7 @@ sub ok {
    my @errors;
    # First, wait for all replicas to be caught up to their sources.
    $self->wait_for_slaves();
-   push @errors, $self->master_is_ok('source');
+   push @errors, $self->source_is_ok('source');
    push @errors, $self->slave_is_ok('replica1', 'source');
    push @errors, $self->slave_is_ok('replica2', 'replica1', 1);
    push @errors, $self->leftover_servers();
@@ -346,10 +348,10 @@ sub ok {
 # Dings a heartbeat on the source, and waits until the replica catches up fully.
 sub wait_for_slaves {
    my ($self, %args) = @_;
-   my $master_dbh = $self->get_dbh_for($args{source} || 'source');
+   my $source_dbh = $self->get_dbh_for($args{source} || 'source');
    my $slave2_dbh = $self->get_dbh_for($args{replica}  || 'replica2');
-   my ($ping) = $master_dbh->selectrow_array("SELECT MD5(RAND())");
-   $master_dbh->do("UPDATE percona_test.sentinel SET ping='$ping' WHERE id=1 /* wait_for_slaves */");
+   my ($ping) = $source_dbh->selectrow_array("SELECT MD5(RAND())");
+   $source_dbh->do("UPDATE percona_test.sentinel SET ping='$ping' WHERE id=1 /* wait_for_slaves */");
    PerconaTest::wait_until(
       sub {
          my ($pong) = $slave2_dbh->selectrow_array(
@@ -366,8 +368,8 @@ sub verify_test_data {
    my ($self, $host) = @_;
 
    # Get the known-good checksums from the source.
-   my $master = $self->get_dbh_for('source');
-   my $ref    = $self->{checksum_ref} || $master->selectall_hashref(
+   my $source = $self->get_dbh_for('source');
+   my $ref    = $self->{checksum_ref} || $source->selectall_hashref(
          'SELECT * FROM percona_test.checksums',
          'db_tbl');
    $self->{checksum_ref} = $ref unless $self->{checksum_ref};
@@ -379,11 +381,11 @@ sub verify_test_data {
                           grep { !/user$/ }
                           grep { !/proxies_priv$/ }
                           grep { !/global_grants$/ }
-                          @{$master->selectcol_arrayref('SHOW TABLES FROM mysql')};
+                          @{$source->selectcol_arrayref('SHOW TABLES FROM mysql')};
    my @tables_in_sakila = qw(actor address category city country customer
                              film film_actor film_category film_text inventory
                              language payment rental staff store);
-   $master->disconnect;
+   $source->disconnect;
 
    # Get the current checksums on the host.
    my $dbh = $self->get_dbh_for($host);
@@ -468,15 +470,31 @@ sub can_load_data {
 }
 
 sub set_as_slave {
-   my ($self, $server, $master_server, @extras) = @_;
-   PTDEBUG && _d("Setting $server as replica of $master_server");
-   my $master_port = $port_for{$master_server};
-   my $sql = join ", ", qq{change master to master_host='127.0.0.1'},
-                        qq{master_user='msandbox'},
-                        qq{master_password='msandbox'},
-                        qq{master_port=$master_port},
+   my ($self, $server, $source_server, @extras) = @_;
+   PTDEBUG && _d("Setting $server as replica of $source_server");
+
+   my $dbh = $self->get_dbh_for($server);
+   if ( !$dbh ) {
+      return  "Sandbox $server " . $port_for{$server} . " is down.";
+   }
+
+   my $vp = VersionParser->new($dbh);
+   my $replica_name = 'replica';
+   my $source_name = 'source';
+   my $replication_source_name = 'replication source';
+   if ( $vp->cmp('8.1') < 0 || $vp->flavor() =~ m/maria/i ) {
+      $replica_name = 'slave';
+      $source_name = 'master';
+      $replication_source_name = 'master';
+   }
+
+   my $source_port = $port_for{$source_server};
+   my $sql = join ", ", qq{change ${replication_source_name} to ${source_name}_host='127.0.0.1'},
+                        qq{${source_name}_user='msandbox'},
+                        qq{${source_name}_password='msandbox'},
+                        qq{${source_name}_port=$source_port},
                         @extras;
-   for my $sql_to_run ($sql, "start slave") {
+   for my $sql_to_run ($sql, "start ${replica_name}") {
       my $out = $self->use($server, qq{-e "$sql_to_run"});
       PTDEBUG && _d($out);
    }
@@ -502,9 +520,9 @@ sub start_sandbox {
    elsif ( $type eq 'replica' ) {
       die "I need a replica arg" unless $args{source};
       _check_server($args{source});
-      my $master_port = $port_for{$args{source}};
+      my $source_port = $port_for{$args{source}};
 
-      my $out = `$env $trunk/sandbox/start-sandbox $type $port $master_port`;
+      my $out = `$env $trunk/sandbox/start-sandbox $type $port $source_port`;
       die $out if $CHILD_ERROR;
    }
    elsif ( $type eq 'node' ) {
diff --git a/lib/TableChecksum.pm b/lib/TableChecksum.pm
index bdc38caa5..cc732a775 100644
--- a/lib/TableChecksum.pm
+++ b/lib/TableChecksum.pm
@@ -469,20 +469,20 @@ sub make_checksum_query {
    return $result . "FROM /*DB_TBL*//*INDEX_HINT*//*WHERE*/";
 }
 
-# Queries the replication table for chunks that differ from the master's data.
+# Queries the replication table for chunks that differ from the source's data.
 sub find_replication_differences {
    my ( $self, $dbh, $table ) = @_;
 
    my $sql
       = "SELECT db, tbl, CONCAT(db, '.', tbl) AS `table`, "
       . "chunk, chunk_index, lower_boundary, upper_boundary, "
-      . "COALESCE(this_cnt-master_cnt, 0) AS cnt_diff, "
+      . "COALESCE(this_cnt-source_cnt, 0) AS cnt_diff, "
       . "COALESCE("
-      .   "this_crc <> master_crc OR ISNULL(master_crc) <> ISNULL(this_crc), 0"
-      . ") AS crc_diff, this_cnt, master_cnt, this_crc, master_crc "
+      .   "this_crc <> source_crc OR ISNULL(source_crc) <> ISNULL(this_crc), 0"
+      . ") AS crc_diff, this_cnt, source_cnt, this_crc, source_crc "
       . "FROM $table "
-      . "WHERE master_cnt <> this_cnt OR master_crc <> this_crc "
-      . "OR ISNULL(master_crc) <> ISNULL(this_crc)";
+      . "WHERE source_cnt <> this_cnt OR source_crc <> this_crc "
+      . "OR ISNULL(source_crc) <> ISNULL(this_crc)";
    PTDEBUG && _d($sql);
    my $diffs = $dbh->selectall_arrayref($sql, { Slice => {} });
    return $diffs;
diff --git a/lib/TableSyncer.pm b/lib/TableSyncer.pm
index 729b93050..7c2cd5196 100644
--- a/lib/TableSyncer.pm
+++ b/lib/TableSyncer.pm
@@ -255,7 +255,7 @@ sub sync_table {
             $dst_sql .= ' FOR UPDATE';
          }
          elsif ( $args{changing_src} ) {
-            # Making changes on master (src) which replicate to slave (dst).
+            # Making changes on source (src) which replicate to slave (dst).
             $src_sql .= ' FOR UPDATE';
             $dst_sql .= ' LOCK IN SHARE MODE';
          }
@@ -441,7 +441,7 @@ sub unlock {
 #    src          hashref
 #    dst          hashref
 # Optional arguments:
-#   * wait_retry_args  hashref: retry args for retrying wait/MASTER_POS_WAIT
+#   * wait_retry_args  hashref: retry args for retrying wait/SOURCE_POS_WAIT
 # Lock levels:
 #   0 => none
 #   1 => per sync cycle
@@ -449,7 +449,7 @@ sub unlock {
 #   3 => global
 # This function might actually execute the $src_sth.  If we're using
 # transactions instead of table locks, the $src_sth has to be executed before
-# the MASTER_POS_WAIT() on the slave.  The return value is whether the
+# the SOURCE_POS_WAIT() on the slave.  The return value is whether the
 # $src_sth was executed.
 sub lock_and_wait {
    my ( $self, %args ) = @_;
@@ -523,10 +523,10 @@ sub lock_and_wait {
                # here are the passed-in args, not the args to lock_and_wait().
 
                if ( $args{tryno} > 1 ) {
-                  warn "Retrying MASTER_POS_WAIT() for --wait $timeout...";
+                  warn "Retrying SOURCE_POS_WAIT() for --wait $timeout...";
                }
 
-               # Always use the misc_dbh dbh to check the master's position
+               # Always use the misc_dbh dbh to check the source's position
                # because the main dbh might be in use due to executing
                # $src_sth.
                $wait = $ms->wait_for_source(
@@ -552,10 +552,10 @@ sub lock_and_wait {
                   my $msg;
                   if ( $wait->{waited}  ) {
                      $msg = "The slave was stopped while waiting with "
-                          . "MASTER_POS_WAIT().";
+                          . "SOURCE_POS_WAIT().";
                   }
                   else {
-                     $msg = "MASTER_POS_WAIT() returned NULL.  Verify that "
+                     $msg = "SOURCE_POS_WAIT() returned NULL.  Verify that "
                           . "the slave is running.";
                   }
                   if ( $tries - $args{tryno} ) {
@@ -566,26 +566,26 @@ sub lock_and_wait {
                   return 1; # call wait, call try
                }
                elsif ( $wait->{result} == -1 ) {
-                  # MASTER_POS_WAIT timed out, don't retry since we've
+                  # SOURCE_POS_WAIT timed out, don't retry since we've
                   # already waited as long as the user specified with --wait.
                   return 0;  # call final_fail
                }
             },
             final_fail => sub {
-               die "Slave did not catch up to its master after $tries attempts "
-                  . "of waiting $timeout seconds with MASTER_POS_WAIT.  "
+               die "Slave did not catch up to its source after $tries attempts "
+                  . "of waiting $timeout seconds with SOURCE_POS_WAIT.  "
                   . "Check that the slave is running, increase the --wait "
                   . "time, or disable this feature by specifying --wait 0.";
             },
-         );  # retry MasterSlave::wait_for_master()
+         );  # retry MasterSlave::wait_for_source()
       }
 
       # Don't lock the destination if we're making changes on the source
-      # (for sync-to-master and sync via replicate) else the destination
+      # (for sync-to-source and sync via replicate) else the destination
       # won't be apply to make the changes.
       if ( $args{changing_src} ) {
          PTDEBUG && _d('Not locking destination because changing source ',
-            '(syncing via replication or sync-to-master)');
+            '(syncing via replication or sync-to-source)');
       }
       else {
          if ( $args{lock} == 3 ) {
diff --git a/lib/WeightedAvgRate.pm b/lib/WeightedAvgRate.pm
index 0c46fcef5..8b79cd8ba 100644
--- a/lib/WeightedAvgRate.pm
+++ b/lib/WeightedAvgRate.pm
@@ -67,7 +67,7 @@ sub new {
 #   n adjust to meet target_t based on weighted decaying avg rate
 sub update {
    my ($self, $n, $t) = @_;
-   PTDEBUG && _d('Master op time:', $n, 'n /', $t, 's');
+   PTDEBUG && _d('Source op time:', $n, 'n /', $t, 's');
 
    if ( $self->{avg_n} && $self->{avg_t} ) {
       $self->{avg_n}    = ($self->{avg_n} * $self->{weight}) + $n;
diff --git a/lib/bash/collect_mysql_info.sh b/lib/bash/collect_mysql_info.sh
index 7838c3798..b2370d681 100644
--- a/lib/bash/collect_mysql_info.sh
+++ b/lib/bash/collect_mysql_info.sh
@@ -150,11 +150,19 @@ collect_mysql_show_slave_hosts () {
    $CMD_MYSQL $EXT_ARGV -ssE -e 'SHOW SLAVE HOSTS' 2>/dev/null
 }
 
-collect_master_logs_status () {
-   local master_logs_file="$1"
-   local master_status_file="$2"
-   $CMD_MYSQL $EXT_ARGV -ss -e 'SHOW MASTER LOGS' > "$master_logs_file" 2>/dev/null
-   $CMD_MYSQL $EXT_ARGV -ss -e 'SHOW MASTER STATUS' > "$master_status_file" 2>/dev/null
+collect_source_logs_status () {
+   local source_logs_file="$1"
+   local source_status_file="$2"
+   local version="$3"
+
+   local source_log='binary'
+   local source_status='binary log'
+   if [ "$version" '<' "8.1" ]; then
+      source_log = 'master'
+      source_status = 'master'
+   fi
+   $CMD_MYSQL $EXT_ARGV -ss -e "SHOW ${source_log} LOGS" > "$source_logs_file" 2>/dev/null
+   $CMD_MYSQL $EXT_ARGV -ss -e "SHOW ${source_status} STATUS" > "$source_status_file" 2>/dev/null
 }
 
 # Somewhat different from the others, this one joins the status we got earlier
@@ -303,10 +311,19 @@ collect_mysql_info () {
    collect_mysqld_executables "$dir/mysqld-instances" > "$dir/mysqld-executables"
    collect_mysql_show_slave_hosts  "$dir/mysql-slave-hosts" > "$dir/mysql-slave-hosts"
 
+   local mysql_version="$(get_var version "$dir/mysql-variables")"
+
    local binlog="$(get_var log_bin "$dir/mysql-variables")"
    if [ "${binlog}" ]; then
-      # "Got a binlog, going to get MASTER LOGS and MASTER STATUS"
-      collect_master_logs_status "$dir/mysql-master-logs" "$dir/mysql-master-status"
+      # "Got a binlog, going to get BINARY LOGS and BINARY LOG STATUS"
+      local source_logs_file="mysql-binary-logs"
+      local source_status_file="mysql-binary-log-status"
+
+      if [ "$mysql_version" '<' "8.1" ]; then
+         source_logs_file='mysql-master-logs'
+         source_status_file='mysql-master-status'
+      fi
+      collect_source_logs_status "$dir/$source_logs_file" "$dir/$source_status_file" ${mysql_version}
    fi
 
    local uptime="$(get_var Uptime "$dir/mysql-status")"
@@ -337,7 +354,6 @@ collect_mysql_info () {
 
    # encrypted tables and tablespaces
    if [ "${OPT_LIST_ENCRYPTED_TABLES}" = 'yes' ]; then
-      local mysql_version="$(get_var version "$dir/mysql-variables")"
       collect_encrypted_tables                       > "$dir/encrypted-tables"
       collect_encrypted_tablespaces ${mysql_version} > "$dir/encrypted-tablespaces"
    fi
diff --git a/lib/bash/report_formatting.sh b/lib/bash/report_formatting.sh
index d090ced13..6ff700036 100644
--- a/lib/bash/report_formatting.sh
+++ b/lib/bash/report_formatting.sh
@@ -74,7 +74,7 @@ section () {
 }
 
 NAME_VAL_LEN=12
-name_val () {
+name_val() {
    # We use $NAME_VAL_LEN here because the two summary tools, as well as
    # the tests, use different widths.
    printf "%+*s | %s\n" "${NAME_VAL_LEN}" "$1" "$2"
@@ -113,7 +113,7 @@ shorten() {
    '
 }
 
-group_concat () {
+group_concat() {
    sed -e '{H; $!d;}' -e 'x' -e 's/\n[[:space:]]*\([[:digit:]]*\)[[:space:]]*/, \1x/g' -e 's/[[:space:]][[:space:]]*/ /g' -e 's/, //' "${1}"
 }
 
diff --git a/lib/bash/report_mysql_info.sh b/lib/bash/report_mysql_info.sh
index 79315b2f2..0f56b7246 100644
--- a/lib/bash/report_mysql_info.sh
+++ b/lib/bash/report_mysql_info.sh
@@ -200,7 +200,7 @@ get_mysql_uptime () {
    echo "${restart} (up ${uptime})"
 }
 
-# Summarizes the output of SHOW MASTER LOGS.
+# Summarizes the output of SHOW BINARY LOGS.
 summarize_binlogs () {
    local file="$1"
 
@@ -1144,13 +1144,13 @@ _semi_sync_stats_for () {
    name_val "${target} semisync status" "${semisync_status}"
    name_val "${target} trace level" "${semisync_trace}, ${trace_extra}"
 
-   if [ "${target}" = "master" ]; then
+   if [ "${target}" = "source" ] || [ "${target}" = "master" ]; then
       name_val "${target} timeout in milliseconds" \
                "$(get_var "rpl_semi_sync_${target}_timeout" "${file}")"
       name_val "${target} waits for slaves"        \
                "$(get_var "rpl_semi_sync_${target}_wait_no_slave" "${file}")"
 
-      _d "Prepend Rpl_semi_sync_master_ to the following"
+      _d "Prepend Rpl_semi_sync_${target}_ to the following"
       for v in                                              \
          clients net_avg_wait_time net_wait_time net_waits  \
          no_times no_tx timefunc_failures tx_avg_wait_time  \
@@ -1158,7 +1158,7 @@ _semi_sync_stats_for () {
          wait_sessions yes_tx;
       do
          name_val "${target} ${v}" \
-                  "$( get_var "Rpl_semi_sync_master_${v}" "${file}" )"
+                  "$( get_var "Rpl_semi_sync_${target}_${v}" "${file}" )"
       done
    fi
 }
@@ -1330,6 +1330,21 @@ report_mysql_summary () {
    local user="$(get_var "pt-summary-internal-user" "$dir/mysql-variables")"
    local port="$(get_var port "$dir/mysql-variables")"
    local now="$(get_var "pt-summary-internal-now" "$dir/mysql-variables")"
+   local mysql_version="$(get_var version "$dir/mysql-variables")"
+
+   local source_name='source'
+   local source_log='binary'
+   local source_status='binary log'
+   local source_logs_file="mysql-binary-logs"
+   local source_status_file="mysql-binary-log-status"
+   if [ "${mysql_version}" '<' "8.1" ]; then
+      source_name='master'
+      source_log='master'
+      source_status='master'
+      source_logs_file='mysql-master-logs'
+      source_status_file='mysql-master-status'
+   fi
+
    section "Report On Port ${port}"
    name_val User "${user}"
    name_val Time "${now} ($(get_mysql_timezone "$dir/mysql-variables"))"
@@ -1432,13 +1447,13 @@ report_mysql_summary () {
       name_val HitToInsertRatio "${hrat}"
    fi
 
-   local semisync_enabled_master="$(get_var "rpl_semi_sync_master_enabled" "$dir/mysql-variables")"
-   if [ -n "${semisync_enabled_master}" ]; then
+   local semisync_enabled_source="$(get_var "rpl_semi_sync_${source_name}_enabled" "$dir/mysql-variables")"
+   if [ -n "${semisync_enabled_source}" ]; then
       section "Semisynchronous Replication"
-      if [ "$semisync_enabled_master" = "OFF" -o "$semisync_enabled_master" = "0" -o -z "$semisync_enabled_master" ]; then
-         name_val "Master" "Disabled"
+      if [ "$semisync_enabled_source" = "OFF" -o "$semisync_enabled_source" = "0" -o -z "$semisync_enabled_source" ]; then
+         name_val "Source" "Disabled"
       else
-         _semi_sync_stats_for "master" "$dir/mysql-variables"
+         _semi_sync_stats_for "${source_name}" "$dir/mysql-variables"
       fi
       local semisync_enabled_slave="$(get_var rpl_semi_sync_slave_enabled "$dir/mysql-variables")"
       if    [ "$semisync_enabled_slave" = "OFF" -o "$semisync_enabled_slave" = "0" -o -z "$semisync_enabled_slave" ]; then
@@ -1610,15 +1625,15 @@ report_mysql_summary () {
    # ########################################################################
    section "Binary Logging"
 
-   if    [ -s "$dir/mysql-master-logs" ] \
-      || [ -s "$dir/mysql-master-status" ]; then
-      summarize_binlogs "$dir/mysql-master-logs"
+   if    [ -s "$dir/$source_logs_file" ] \
+      || [ -s "$dir/$source_status_file" ]; then
+      summarize_binlogs "$dir/$source_logs_file"
       local format="$(get_var binlog_format "$dir/mysql-variables")"
       name_val binlog_format "${format:-STATEMENT}"
       name_val expire_logs_days "$(get_var expire_logs_days "$dir/mysql-variables")"
       name_val sync_binlog "$(get_var sync_binlog "$dir/mysql-variables")"
       name_val server_id "$(get_var server_id "$dir/mysql-variables")"
-      format_binlog_filters "$dir/mysql-master-status"
+      format_binlog_filters "$dir/$source_status_file"
    fi
 
 # Replication: seconds behind, running, filters, skip_slave_start, skip_errors,
diff --git a/t/lib/TableSyncer.t b/t/lib/TableSyncer.t
index bf8848f31..8a7c44cc9 100644
--- a/t/lib/TableSyncer.t
+++ b/t/lib/TableSyncer.t
@@ -1004,7 +1004,7 @@ my $output = '';
             },
          );
       },
-      qr/Slave did not catch up to its master after 2 attempts of waiting 60/,
+      qr/Slave did not catch up to its source after 2 attempts of waiting 60/,
       "Retries wait"
    );
 }
diff --git a/t/lib/bash/collect_mysql_info.sh b/t/lib/bash/collect_mysql_info.sh
index f688f82e5..191711e16 100644
--- a/t/lib/bash/collect_mysql_info.sh
+++ b/t/lib/bash/collect_mysql_info.sh
@@ -164,10 +164,10 @@ cmd_ok \
 
 if [ -n "$(get_var log_bin "$p/mysql-variables")" ]; then
    cmd_ok \
-      "test -e $p/mysql-master-logs" \
+      "test -e $p/mysql-binary-logs" \
       "If we have a binlog, a file with the master logs should exist"
    cmd_ok \
-      "test -e $p/mysql-master-status" \
+      "test -e $p/mysql-binary-log-status" \
       "And likewise for master status"
 else
    skip 1 2 "no binlog"

From 8cbb5a0c8f4826478bbdfd485a73670c41d7d308 Mon Sep 17 00:00:00 2001
From: Sveta Smirnova <sveta.smirnova@percona.com>
Date: Thu, 25 Jul 2024 23:37:22 +0300
Subject: [PATCH 05/31] PT-2340 - Support MySQL 8.4

- Removed lib/Percona/Test.pm, lib/Safeguards.pm, t/lib/Safeguards.t, because they are not used anymore
- Removed word "slave" from lib
---
 bin/pt-table-checksum           |  20 +-
 bin/pt-variable-advisor         |  25 +
 lib/Cxn.pm                      |   6 +-
 lib/MasterSlave.pm              | 463 +++++++++---------
 lib/MySQLConfig.pm              |   2 +-
 lib/MySQLProtocolParser.pm      |   4 +-
 lib/Percona/Test.pm             | 814 --------------------------------
 lib/Percona/XtraDB/Cluster.pm   |  20 +-
 lib/PerconaTest.pm              |   4 +-
 lib/QueryRewriter.pm            |   2 +-
 lib/ReplicaLagWaiter.pm         | 102 ++--
 lib/Safeguards.pm               |  94 ----
 lib/Sandbox.pm                  |  58 +--
 lib/TableSyncer.pm              |  28 +-
 lib/VariableAdvisorRules.pm     |  22 +
 lib/bash/collect.sh             |  13 +-
 lib/bash/collect_mysql_info.sh  |  32 +-
 lib/bash/report_mysql_info.sh   |  90 ++--
 t/lib/CompareResults.t          |   2 +-
 t/lib/MasterSlave.t             | 128 ++---
 t/lib/ReplicaLagWaiter.t        |   5 +-
 t/lib/Safeguards.t              |  69 ---
 t/lib/TableSyncer.t             |   2 +-
 t/lib/bash/report_mysql_info.sh |   8 +-
 24 files changed, 573 insertions(+), 1440 deletions(-)
 delete mode 100644 lib/Percona/Test.pm
 delete mode 100644 lib/Safeguards.pm
 delete mode 100644 t/lib/Safeguards.t

diff --git a/bin/pt-table-checksum b/bin/pt-table-checksum
index fe0e7e22a..976349d7b 100755
--- a/bin/pt-table-checksum
+++ b/bin/pt-table-checksum
@@ -5227,20 +5227,20 @@ sub get_slaves {
       $self->recurse_to_slaves(
          {  dbh            => $dbh,
             dsn            => $dsn,
-            slave_user     => $o->got('slave-user') ? $o->get('slave-user') : '',
-            slave_password => $o->got('slave-password') ? $o->get('slave-password') : '',
+            slave_user     => $o->got('replica-user') ? $o->get('replica-user') : '',
+            slave_password => $o->got('replica-password') ? $o->get('replica-password') : '',
             slaves         => $args{slaves},
             callback  => sub {
                my ( $dsn, $dbh, $level, $parent ) = @_;
                return unless $level;
                PTDEBUG && _d('Found slave:', $dp->as_string($dsn));
                my $slave_dsn = $dsn;
-               if ($o->got('slave-user')) {
-                  $slave_dsn->{u} = $o->get('slave-user');
-                  PTDEBUG && _d("Using slave user ".$o->get('slave-user')." on ".$slave_dsn->{h}.":".$slave_dsn->{P});
+               if ($o->got('replica-user')) {
+                  $slave_dsn->{u} = $o->get('replica-user');
+                  PTDEBUG && _d("Using slave user ".$o->get('replica-user')." on ".$slave_dsn->{h}.":".$slave_dsn->{P});
                }
-               if ($o->got('slave-password')) {
-                  $slave_dsn->{p} = $o->get('slave-password');
+               if ($o->got('replica-password')) {
+                  $slave_dsn->{p} = $o->get('replica-password');
                   PTDEBUG && _d("Slave password set");
                }
                push @$slaves, $make_cxn->(dsn => $slave_dsn, dbh => $dbh, parent => $parent);
@@ -13847,7 +13847,7 @@ type: DSN; repeatable: yes
 DSN to skip when checking slave lag. It can be used multiple times.
 Example: --skip-check-slave-lag h=127.1,P=12345 --skip-check-slave-lag h=127.1,P=12346
 
-=item --slave-user
+=item --replica-user
 
 type: string
 
@@ -13855,12 +13855,12 @@ Sets the user to be used to connect to the slaves.
 This parameter allows you to have a different user with less privileges on the
 slaves but that user must exist on all slaves.
 
-=item --slave-password
+=item --replica-password
 
 type: string
 
 Sets the password to be used to connect to the slaves.
-It can be used with --slave-user and the password for the user must be the same
+It can be used with --replica-user and the password for the user must be the same
 on all slaves.
 
 =item --set-vars
diff --git a/bin/pt-variable-advisor b/bin/pt-variable-advisor
index 56a6d375d..477b4fec4 100755
--- a/bin/pt-variable-advisor
+++ b/bin/pt-variable-advisor
@@ -5609,6 +5609,12 @@ severity: note
 
 The init_slave option is enabled on this server.
 
+=item init_replica
+
+severity: note
+
+The init_replica option is enabled on this server.
+
 =item innodb_additional_mem_pool_size
 
 severity: warn
@@ -5862,6 +5868,16 @@ should probably be set to 60 seconds or less.  It is also a good idea to
 use pt-heartbeat to ensure that the connection does not appear to time out
 when the master is simply idle.
 
+=item replica_net_timeout
+
+severity: warn
+
+This variable is set too high.  This is too long to wait before
+noticing that the connection to the source has failed and retrying.  This
+should probably be set to 60 seconds or less.  It is also a good idea to
+use pt-heartbeat to ensure that the connection does not appear to time out
+when the source is simply idle.
+
 =item slave_skip_errors
 
 severity: crit
@@ -5871,6 +5887,15 @@ you need to find and resolve the cause of that; it is likely that your
 slave's data is different from the master.  You can find out with
 pt-table-checksum.
 
+=item replica_skip_errors
+
+severity: crit
+
+You should not set this option.  If replication is having errors,
+you need to find and resolve the cause of that; it is likely that your
+replica's data is different from the source.  You can find out with
+pt-table-checksum.
+
 =item sort_buffer_size-1
 
 severity: note
diff --git a/lib/Cxn.pm b/lib/Cxn.pm
index 859a3621c..26110cd91 100644
--- a/lib/Cxn.pm
+++ b/lib/Cxn.pm
@@ -39,8 +39,8 @@ use Scalar::Util qw(blessed);
 use constant {
    PTDEBUG => $ENV{PTDEBUG} || 0,
    # 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.
    PERCONA_TOOLKIT_TEST_USE_DSN_NAMES => $ENV{PERCONA_TOOLKIT_TEST_USE_DSN_NAMES} || 0,
 };
@@ -171,7 +171,7 @@ sub set_dbh {
    # dbh.  dbh_set is required so that if this obj was created with
    # a dbh, we set that dbh when connect() is called because whoever
    # created the dbh probably didn't set what we set here.  For example,
-   # MasterSlave makes dbhs when finding slaves, but it doesn't set
+   # MasterSlave makes dbhs when finding replicas, but it doesn't set
    # anything.
    # Due to https://github.com/perl5-dbi/DBD-mysql/issues/306 we assigning
    # connection_id to $self->{dbh_set} and compare it with current connection_id.
diff --git a/lib/MasterSlave.pm b/lib/MasterSlave.pm
index 23c992c9f..2ac422f24 100644
--- a/lib/MasterSlave.pm
+++ b/lib/MasterSlave.pm
@@ -19,7 +19,7 @@
 # ###########################################################################
 {
 # Package: MasterSlave
-# MasterSlave handles common tasks related to source-slave setups.
+# MasterSlave handles common tasks related to source-replica setups.
 package MasterSlave;
 
 use strict;
@@ -60,7 +60,7 @@ sub new {
    return bless $self, $class;
 }
 
-sub get_slaves {
+sub get_replicas {
    my ($self, %args) = @_;
    my @required_args = qw(make_cxn);
    foreach my $arg ( @required_args ) {
@@ -68,11 +68,11 @@ sub get_slaves {
    }
    my ($make_cxn) = @args{@required_args};
 
-   my $slaves  = [];
+   my $replicas  = [];
    my $dp      = $self->{DSNParser};
    my $methods = $self->_resolve_recursion_methods($args{dsn});
 
-   return $slaves unless @$methods;
+   return $replicas unless @$methods;
 
    if ( grep { m/processlist|hosts/i } @$methods ) {
       my @required_args = qw(dbh dsn);
@@ -82,26 +82,26 @@ sub get_slaves {
       my ($dbh, $dsn) = @args{@required_args};
       my $o = $self->{OptionParser};
 
-      $self->recurse_to_slaves(
-         {  dbh            => $dbh,
-            dsn            => $dsn,
-            slave_user     => $o->got('slave-user') ? $o->get('slave-user') : '',
-            slave_password => $o->got('slave-password') ? $o->get('slave-password') : '',
-            slaves         => $args{slaves},
+      $self->recurse_to_replicas(
+         {  dbh              => $dbh,
+            dsn              => $dsn,
+            replica_user     => $o->got('replica-user') ? $o->get('replica-user') : '',
+            replica_password => $o->got('replica-password') ? $o->get('replica-password') : '',
+            replicas         => $args{replicas},
             callback  => sub {
                my ( $dsn, $dbh, $level, $parent ) = @_;
                return unless $level;
-               PTDEBUG && _d('Found slave:', $dp->as_string($dsn));
-               my $slave_dsn = $dsn;
-               if ($o->got('slave-user')) {
-                  $slave_dsn->{u} = $o->get('slave-user');
-                  PTDEBUG && _d("Using slave user ".$o->get('slave-user')." on ".$slave_dsn->{h}.":".$slave_dsn->{P});
+               PTDEBUG && _d('Found replica:', $dp->as_string($dsn));
+               my $replica_dsn = $dsn;
+               if ($o->got('replica-user')) {
+                  $replica_dsn->{u} = $o->get('replica-user');
+                  PTDEBUG && _d("Using replica user ".$o->get('replica-user')." on ".$replica_dsn->{h}.":".$replica_dsn->{P});
                }
-               if ($o->got('slave-password')) {
-                  $slave_dsn->{p} = $o->get('slave-password');
-                  PTDEBUG && _d("Slave password set");
+               if ($o->got('replica-password')) {
+                  $replica_dsn->{p} = $o->get('replica-password');
+                  PTDEBUG && _d("Replica password set");
                }
-               push @$slaves, $make_cxn->(dsn => $slave_dsn, dbh => $dbh, parent => $parent);
+               push @$replicas, $make_cxn->(dsn => $replica_dsn, dbh => $dbh, parent => $parent);
                return;
             },
             wait_no_die => $args{'wait_no_die'},
@@ -109,20 +109,20 @@ sub get_slaves {
       );
    } elsif ( $methods->[0] =~ m/^dsn=/i ) {
       (my $dsn_table_dsn = join ",", @$methods) =~ s/^dsn=//i;
-      $slaves = $self->get_cxn_from_dsn_table(
+      $replicas = $self->get_cxn_from_dsn_table(
          %args,
          dsn_table_dsn => $dsn_table_dsn,
          wait_no_die => $args{'wait_no_die'},
       );
    }
    elsif ( $methods->[0] =~ m/none/i ) {
-      PTDEBUG && _d('Not getting to slaves');
+      PTDEBUG && _d('Not getting to replicas');
    }
    else {
       die "Unexpected recursion methods: @$methods";
    }
 
-   return $slaves;
+   return $replicas;
 }
 
 sub _resolve_recursion_methods {
@@ -142,9 +142,9 @@ sub _resolve_recursion_methods {
    }
 }
 
-# Sub: recurse_to_slaves
-#   Descend to slaves by examining SHOW SLAVE HOSTS.
-#   The callback gets the slave's DSN, dbh, parent, and the recursion level
+# Sub: recurse_to_replicas
+#   Descend to replicas by examining SHOW REPLICAS.
+#   The callback gets the replica's DSN, dbh, parent, and the recursion level
 #   as args.  The recursion is tail recursion.
 #
 # Parameters:
@@ -154,39 +154,39 @@ sub _resolve_recursion_methods {
 # Required Arguments:
 #   dsn           - The DSN to connect to; if no dbh arg, connect using this.
 #   recurse       - How many levels to recurse. 0 = none, undef = infinite.
-#   callback      - Code to execute after finding a new slave.
+#   callback      - Code to execute after finding a new replica.
 #   dsn_parser    - <DSNParser> object
 #
 # Optional Arguments:
 #   dbh           - dbh
-#   skip_callback - Execute with slaves that will be skipped.
+#   skip_callback - Execute with replicas that will be skipped.
 #   method        - Whether to prefer HOSTS over PROCESSLIST
 #   parent        - The DSN from which this call descended.
-sub recurse_to_slaves {
+sub recurse_to_replicas {
    my ( $self, $args, $level ) = @_;
    $level ||= 0;
    my $dp = $self->{DSNParser};
    my $recurse = $args->{recurse} || $self->{OptionParser}->get('recurse');
    my $dsn = $args->{dsn};
-   my $slave_user = $args->{slave_user} || '';
-   my $slave_password = $args->{slave_password} || '';
+   my $replica_user = $args->{replica_user} || '';
+   my $replica_password = $args->{replica_password} || '';
 
    my $methods = $self->_resolve_recursion_methods($dsn);
    PTDEBUG && _d('Recursion methods:', @$methods);
    if ( lc($methods->[0]) eq 'none' ) {
-      PTDEBUG && _d('Not recursing to slaves');
+      PTDEBUG && _d('Not recursing to replicas');
       return;
    }
 
-   my $slave_dsn = $dsn;
-   if ($slave_user) {
-      $slave_dsn->{u} = $slave_user;
-      PTDEBUG && _d("Using slave user $slave_user on "
-         . $slave_dsn->{h} . ":" . ( $slave_dsn->{P} ? $slave_dsn->{P} : ""));
+   my $replica_dsn = $dsn;
+   if ($replica_user) {
+      $replica_dsn->{u} = $replica_user;
+      PTDEBUG && _d("Using replica user $replica_user on "
+         . $replica_dsn->{h} . ":" . ( $replica_dsn->{P} ? $replica_dsn->{P} : ""));
    }
-   if ($slave_password) {
-      $slave_dsn->{p} = $slave_password;
-      PTDEBUG && _d("Slave password set");
+   if ($replica_password) {
+      $replica_dsn->{p} = $replica_password;
+      PTDEBUG && _d("Replica password set");
    }
 
    my $dbh = $args->{dbh};
@@ -194,12 +194,12 @@ sub recurse_to_slaves {
    my $get_dbh = sub {
          eval {
             $dbh = $dp->get_dbh(
-               $dp->get_cxn_params($slave_dsn), { AutoCommit => 1 }
+               $dp->get_cxn_params($replica_dsn), { AutoCommit => 1 }
             );
-            PTDEBUG && _d('Connected to', $dp->as_string($slave_dsn));
+            PTDEBUG && _d('Connected to', $dp->as_string($replica_dsn));
          };
          if ( $EVAL_ERROR ) {
-            print STDERR "Cannot connect to ", $dp->as_string($slave_dsn), ": ", $EVAL_ERROR, "\n"
+            print STDERR "Cannot connect to ", $dp->as_string($replica_dsn), ": ", $EVAL_ERROR, "\n"
                or die "Cannot print: $OS_ERROR";
             return;
          }
@@ -207,10 +207,10 @@ sub recurse_to_slaves {
 
    DBH: {
       if ( !defined $dbh ) {
-         foreach my $known_slave ( @{$args->{slaves}} ) {
-            if ($known_slave->{dsn}->{h} eq $slave_dsn->{h} and
-                $known_slave->{dsn}->{P} eq $slave_dsn->{P} ) {
-               $dbh = $known_slave->{dbh};
+         foreach my $known_replica ( @{$args->{replicas}} ) {
+            if ($known_replica->{dsn}->{h} eq $replica_dsn->{h} and
+                $known_replica->{dsn}->{P} eq $replica_dsn->{P} ) {
+               $dbh = $known_replica->{dbh};
                last DBH;
             }
          }
@@ -228,7 +228,7 @@ sub recurse_to_slaves {
 	   if ( $EVAL_ERROR ) {
 		   if ( $args->{wait_no_die} ) {
 			   print STDERR "Error getting server id: ", $EVAL_ERROR,
-               "\nRetrying query for server ", $slave_dsn->{h}, ":", $slave_dsn->{P}, "\n";
+               "\nRetrying query for server ", $replica_dsn->{h}, ":", $replica_dsn->{P}, "\n";
             sleep 1;
             $dbh->disconnect();
             $get_dbh->();
@@ -254,63 +254,63 @@ sub recurse_to_slaves {
 
    if ( !defined $recurse || $level < $recurse ) {
 
-      my @slaves =
-         grep { !$_->{source_id} || $_->{source_id} == $id } # Only my slaves.
-         $self->find_slave_hosts($dp, $dbh, $dsn, $methods);
+      my @replicas =
+         grep { !$_->{source_id} || $_->{source_id} == $id } # Only my replicas.
+         $self->find_replica_hosts($dp, $dbh, $dsn, $methods);
 
-      foreach my $slave ( @slaves ) {
+      foreach my $replica ( @replicas ) {
          PTDEBUG && _d('Recursing from',
-            $dp->as_string($dsn), 'to', $dp->as_string($slave));
-         $self->recurse_to_slaves(
-            { %$args, dsn => $slave, dbh => undef, parent => $dsn, slave_user => $slave_user, $slave_password => $slave_password }, $level + 1 );
+            $dp->as_string($dsn), 'to', $dp->as_string($replica));
+         $self->recurse_to_replicas(
+            { %$args, dsn => $replica, dbh => undef, parent => $dsn, replica_user => $replica_user, $replica_password => $replica_password }, $level + 1 );
       }
    }
 }
 
-# Finds slave hosts by trying different methods.  The default preferred method
-# is trying SHOW PROCESSLIST (processlist) and guessing which ones are slaves,
-# and if that doesn't reveal anything, then try SHOW SLAVE STATUS (hosts).
+# Finds replica hosts by trying different methods.  The default preferred method
+# is trying SHOW PROCESSLIST (processlist) and guessing which ones are replicas,
+# and if that doesn't reveal anything, then try SHOW REPLICA STATUS (hosts).
 # One exception is if the port is non-standard (3306), indicating that the port
-# from SHOW SLAVE HOSTS may be important.  Then only the hosts methods is used.
+# from SHOW REPLICAS may be important.  Then only the hosts methods is used.
 #
 # Returns a list of DSN hashes.  Optional extra keys in the DSN hash are
 # source_id and server_id.  Also, the 'source' key is either 'processlist' or
 # 'hosts'.
 #
 # If a method is given, it becomes the preferred (first tried) method.
-# Searching stops as soon as a method finds slaves.
-sub find_slave_hosts {
+# Searching stops as soon as a method finds replicas.
+sub find_replica_hosts {
    my ( $self, $dsn_parser, $dbh, $dsn, $methods ) = @_;
 
-   PTDEBUG && _d('Looking for slaves on', $dsn_parser->as_string($dsn),
+   PTDEBUG && _d('Looking for replicas on', $dsn_parser->as_string($dsn),
       'using methods', @$methods);
 
-   my @slaves;
+   my @replicas;
    METHOD:
    foreach my $method ( @$methods ) {
-      my $find_slaves = "_find_slaves_by_$method";
-      PTDEBUG && _d('Finding slaves with', $find_slaves);
-      @slaves = $self->$find_slaves($dsn_parser, $dbh, $dsn);
-      last METHOD if @slaves;
+      my $find_replicas = "_find_replicas_by_$method";
+      PTDEBUG && _d('Finding replicas with', $find_replicas);
+      @replicas = $self->$find_replicas($dsn_parser, $dbh, $dsn);
+      last METHOD if @replicas;
    }
 
-   PTDEBUG && _d('Found', scalar(@slaves), 'slaves');
-   return @slaves;
+   PTDEBUG && _d('Found', scalar(@replicas), 'replicas');
+   return @replicas;
 }
 
-sub _find_slaves_by_processlist {
+sub _find_replicas_by_processlist {
    my ( $self, $dsn_parser, $dbh, $dsn ) = @_;
-   my @connected_slaves = $self->get_connected_slaves($dbh);
-   my @slaves = $self->_process_slaves_list($dsn_parser, $dsn, \@connected_slaves);
-   return @slaves;
+   my @connected_replicas = $self->get_connected_replicas($dbh);
+   my @replicas = $self->_process_replicas_list($dsn_parser, $dsn, \@connected_replicas);
+   return @replicas;
 }
 
-sub _process_slaves_list {
-   my ($self, $dsn_parser, $dsn, $connected_slaves) = @_;
-   my @slaves = map  {
-      my $slave        = $dsn_parser->parse("h=$_", $dsn);
-      $slave->{source} = 'processlist';
-      $slave;
+sub _process_replicas_list {
+   my ($self, $dsn_parser, $dsn, $connected_replicas) = @_;
+   my @replicas = map  {
+      my $replica        = $dsn_parser->parse("h=$_", $dsn);
+      $replica->{source} = 'processlist';
+      $replica;
    }
    grep { $_ }
    map  {
@@ -322,32 +322,34 @@ sub _process_slaves_list {
           $host = '['.$host.']';
       }
       $host;
-   } @$connected_slaves;
+   } @$connected_replicas;
 
-   return @slaves;
+   return @replicas;
 }
 
-# SHOW SLAVE HOSTS is significantly less reliable.
+# SHOW REPLICAS is significantly less reliable.
 # Machines tend to share the host list around with every machine in the
 # replication hierarchy, but they don't update each other when machines
 # disconnect or change to use a different source or something.  So there is
-# lots of cruft in SHOW SLAVE HOSTS.
-sub _find_slaves_by_hosts {
+# lots of cruft in SHOW REPLICAS.
+sub _find_replicas_by_hosts {
    my ( $self, $dsn_parser, $dbh, $dsn ) = @_;
 
-   my @slaves;
-   my $server_version = VersionParser->new($dbh);
+   my @replicas;
+
+   my $vp = VersionParser->new($dbh);
    my $sql = 'SHOW REPLICAS';
-   if ( $server_version < '8.1' || $server_version->flavor() =~ m/maria/ ) {
+   if ( $vp < '8.1' || $vp->flavor() =~ m/maria/ ) {
       $sql = 'SHOW SLAVE HOSTS';
    }
+   
    PTDEBUG && _d($dbh, $sql);
-   @slaves = @{$dbh->selectall_arrayref($sql, { Slice => {} })};
+   @replicas = @{$dbh->selectall_arrayref($sql, { Slice => {} })};
 
-   # Convert SHOW SLAVE HOSTS into DSN hashes.
-   if ( @slaves ) {
-      PTDEBUG && _d('Found some SHOW SLAVE HOSTS info');
-      @slaves = map {
+   # Convert SHOW REPLICAS into DSN hashes.
+   if ( @replicas ) {
+      PTDEBUG && _d('Found some SHOW REPLICAS info');
+      @replicas = map {
          my %hash;
          @hash{ map { lc $_ } keys %$_ } = values %$_;
          my $spec = "h=$hash{host},P=$hash{port}"
@@ -358,15 +360,15 @@ sub _find_slaves_by_hosts {
          $dsn->{source_id} = $hash{source_id};
          $dsn->{source}    = 'hosts';
          $dsn;
-      } @slaves;
+      } @replicas;
    }
 
-   return @slaves;
+   return @replicas;
 }
 
-# Returns PROCESSLIST entries of connected slaves, normalized to lowercase
+# Returns PROCESSLIST entries of connected replicas, normalized to lowercase
 # column names.
-sub get_connected_slaves {
+sub get_connected_replicas {
    my ( $self, $dbh ) = @_;
 
    # Check for the PROCESS privilege.
@@ -407,7 +409,7 @@ sub get_connected_slaves {
 
    $sql = 'SHOW FULL PROCESSLIST';
    PTDEBUG && _d($dbh, $sql);
-   # It's probably a slave if it's doing a binlog dump.
+   # It's probably a replica if it's doing a binlog dump.
    grep { $_->{command} =~ m/Binlog Dump/i }
    map  { # Lowercase the column names
       my %hash;
@@ -417,13 +419,13 @@ sub get_connected_slaves {
    @{$dbh->selectall_arrayref($sql, { Slice => {} })};
 }
 
-# Verifies that $source is really the source of $slave.  This is not an exact
+# Verifies that $source is really the source of $replica.  This is not an exact
 # science, but there is a decent chance of catching some obvious cases when it
 # is not the source.  If not the source, it dies; otherwise returns true.
 sub is_source_of {
-   my ( $self, $source, $slave ) = @_;
+   my ( $self, $source, $replica ) = @_;
 
-   my $replica_version = VersionParser->new($slave);
+   my $replica_version = VersionParser->new($replica);
    my $source_name = 'source';
    my $source_port = 'source_port';
    if ( $replica_version < '8.1' || $replica_version->flavor() =~ m/maria/ ) {
@@ -433,47 +435,47 @@ sub is_source_of {
 
    my $source_status = $self->get_source_status($source)
       or die "The server specified as a source is not a source";
-   my $slave_status  = $self->get_slave_status($slave)
-      or die "The server specified as a slave is not a slave";
-   my @connected     = $self->get_connected_slaves($source)
-      or die "The server specified as a source has no connected slaves";
+   my $replica_status  = $self->get_replica_status($replica)
+      or die "The server specified as a replica is not a replica";
+   my @connected     = $self->get_connected_replicas($source)
+      or die "The server specified as a source has no connected replicas";
    my (undef, $port) = $source->selectrow_array("SHOW VARIABLES LIKE 'port'");
 
-   if ( $port != $slave_status->{$source_port} ) {
-      die "The slave is connected to $slave_status->{$source_port} "
+   if ( $port != $replica_status->{$source_port} ) {
+      die "The replica is connected to $replica_status->{$source_port} "
          . "but the source's port is $port";
    }
 
-   if ( !grep { $slave_status->{source_user} eq $_->{user} } @connected ) {
-      die "I don't see any slave I/O thread connected with user "
-         . $slave_status->{source_user};
+   if ( !grep { $replica_status->{source_user} eq $_->{user} } @connected ) {
+      die "I don't see any replica I/O thread connected with user "
+         . $replica_status->{source_user};
    }
 
-   if ( ($slave_status->{slave_io_state} || '')
+   if ( ($replica_status->{replica_io_state} || '')
       eq 'Waiting for ${source_name} to send event' )
    {
-      # The slave thinks its I/O thread is caught up to the source.  Let's
-      # compare and make sure the source and slave are reasonably close to each
+      # The replica thinks its I/O thread is caught up to the source.  Let's
+      # compare and make sure the source and replica are reasonably close to each
       # other.  Note that this is one of the few places where I check the I/O
       # thread positions instead of the SQL thread positions!
       # Source_Log_File/Read_Source_Log_Pos is the I/O thread's position on the
       # source.
       my ( $source_log_name, $source_log_num )
          = $source_status->{file} =~ m/^(.*?)\.0*([1-9][0-9]*)$/;
-      my ( $slave_log_name, $slave_log_num )
-         = $slave_status->{source_log_file} =~ m/^(.*?)\.0*([1-9][0-9]*)$/;
-      if ( $source_log_name ne $slave_log_name
-         || abs($source_log_num - $slave_log_num) > 1 )
+      my ( $replica_log_name, $replica_log_num )
+         = $replica_status->{source_log_file} =~ m/^(.*?)\.0*([1-9][0-9]*)$/;
+      if ( $source_log_name ne $replica_log_name
+         || abs($source_log_num - $replica_log_num) > 1 )
       {
-         die "The slave thinks it is reading from "
-            . "$slave_status->{source_log_file},  but the "
+         die "The replica thinks it is reading from "
+            . "$replica_status->{source_log_file},  but the "
             . "source is writing to $source_status->{file}";
       }
    }
    return 1;
 }
 
-# Figures out how to connect to the source, by examining SHOW SLAVE STATUS.  But
+# Figures out how to connect to the source, by examining SHOW REPLICA STATUS.  But
 # does NOT use the value from Source_User for the username, because typically we
 # want to perform operations as the username that was specified (usually to the
 # program's --user option, or in a DSN), rather than as the replication user,
@@ -489,29 +491,29 @@ sub get_source_dsn {
       $source_port = 'master_port';
    }
 
-   my $source = $self->get_slave_status($dbh) or return undef;
+   my $source = $self->get_replica_status($dbh) or return undef;
    my $spec   = "h=$source->{${source_host}},P=$source->{${source_port}}";
    return       $dsn_parser->parse($spec, $dsn);
 }
 
-# Gets SHOW SLAVE STATUS, with column names all lowercased, as a hashref.
-sub get_slave_status {
+# Gets SHOW REPLICA STATUS, with column names all lowercased, as a hashref.
+sub get_replica_status {
    my ( $self, $dbh ) = @_;
 
    my $server_version = VersionParser->new($dbh);
    my $replica_name = 'replica';
    if ( $server_version < '8.1' || $server_version->flavor() =~ m/maria/ ) {
-      $replica_name = 'slave';
+      $replica_name = 'replica';
    }
 
-   if ( !$self->{not_a_slave}->{$dbh} ) {
-      my $sth = $self->{sths}->{$dbh}->{SLAVE_STATUS}
+   if ( !$self->{not_a_replica}->{$dbh} ) {
+      my $sth = $self->{sths}->{$dbh}->{REPLICA_STATUS}
             ||= $dbh->prepare("SHOW ${replica_name} STATUS");
       PTDEBUG && _d($dbh, "SHOW ${replica_name} STATUS");
       $sth->execute();
-      my ($sss_rows) = $sth->fetchall_arrayref({}); # Show Slave Status rows
+      my ($sss_rows) = $sth->fetchall_arrayref({}); # Show Replica Status rows
 
-      # If SHOW SLAVE STATUS returns more than one row it means that this slave is connected to more
+      # If SHOW REPLICA STATUS returns more than one row it means that this replica is connected to more
       # than one source using replication channels.
       # If we have a channel name as a parameter, we need to select the correct row and return it.
       # If we don't have a channel name as a parameter, there is no way to know what the correct source is so,
@@ -520,20 +522,20 @@ sub get_slave_status {
       if ( $sss_rows && @$sss_rows ) {
           if (scalar @$sss_rows > 1) {
               if (!$self->{channel}) {
-                  die 'This server returned more than one row for SHOW SLAVE STATUS but "channel" was not specified on the command line';
+                  die 'This server returned more than one row for SHOW REPLICA STATUS but "channel" was not specified on the command line';
               }
-              my $slave_use_channels;
+              my $replica_use_channels;
               for my $row (@$sss_rows) {
                   $row = { map { lc($_) => $row->{$_} } keys %$row }; # lowercase the keys
                   if ($row->{channel_name}) {
-                      $slave_use_channels = 1;
+                      $replica_use_channels = 1;
                   }
                   if ($row->{channel_name} eq $self->{channel}) {
                       $ss = $row;
                       last;
                   }
               }
-              if (!$ss && $slave_use_channels) {
+              if (!$ss && $replica_use_channels) {
                  die 'This server is using replication channels but "channel" was not specified on the command line';
               }
           } else {
@@ -553,8 +555,8 @@ sub get_slave_status {
           }
       }
 
-      PTDEBUG && _d('This server returns nothing for SHOW SLAVE STATUS');
-      $self->{not_a_slave}->{$dbh}++;
+      PTDEBUG && _d('This server returns nothing for SHOW REPLICA STATUS');
+      $self->{not_a_replica}->{$dbh}++;
   }
 }
 
@@ -597,14 +599,14 @@ sub get_source_status {
 }
 
 # Sub: wait_for_source
-#   Execute SOURCE_POS_WAIT() to make slave wait for its source.
+#   Execute SOURCE_POS_WAIT() to make replica wait for its source.
 #
 # Parameters:
 #   %args - Arguments
 #
 # Required Arguments:
 #   * source_status - Hashref returned by <get_source_status()>
-#   * slave_dbh     - dbh for slave host
+#   * replica_dbh     - dbh for replica host
 #
 # Optional Arguments:
 #   * timeout - Wait time in seconds (default 60)
@@ -619,41 +621,41 @@ sub get_source_status {
 #   (end code)
 sub wait_for_source {
    my ( $self, %args ) = @_;
-   my @required_args = qw(source_status slave_dbh);
+   my @required_args = qw(source_status replica_dbh);
    foreach my $arg ( @required_args ) {
       die "I need a $arg argument" unless $args{$arg};
    }
-   my ($source_status, $slave_dbh) = @args{@required_args};
+   my ($source_status, $replica_dbh) = @args{@required_args};
    my $timeout       = $args{timeout} || 60;
 
    my $result;
    my $waited;
    if ( $source_status ) {
-      my $slave_status;
+      my $replica_status;
       eval {
-          $slave_status = $self->get_slave_status($slave_dbh);
+          $replica_status = $self->get_replica_status($replica_dbh);
       };
       if ($EVAL_ERROR) {
           return {
               result => undef,
               waited => 0,
-              error  =>'Wait for source: this is a multi-source slave but "channel" was not specified on the command line',
+              error  =>'Wait for source: this is a multi-source replica but "channel" was not specified on the command line',
           };
       }
-      my $vp = VersionParser->new($slave_dbh);
+      my $vp = VersionParser->new($replica_dbh);
       my $source_name = 'source';
       if ( $vp < '8.1' || $vp->flavor() =~ m/maria/ ) {
          $source_name = 'master';
       }
       my $channel_sql = $vp > '5.6' && $self->{channel} ? ", '$self->{channel}'" : '';
       my $sql = "SELECT ${source_name}_POS_WAIT('$source_status->{file}', $source_status->{position}, $timeout $channel_sql)";
-      PTDEBUG && _d($slave_dbh, $sql);
+      PTDEBUG && _d($replica_dbh, $sql);
       my $start = time;
-      ($result) = $slave_dbh->selectrow_array($sql);
+      ($result) = $replica_dbh->selectrow_array($sql);
 
       # If SOURCE_POS_WAIT() returned NULL and we waited at least 1s
       # and the time we waited is less than the timeout then this is
-      # a strong indication that the slave was stopped while we were
+      # a strong indication that the replica was stopped while we were
       # waiting.
       $waited = time - $start;
 
@@ -670,23 +672,24 @@ sub wait_for_source {
    };
 }
 
-# Executes STOP SLAVE.
-sub stop_slave {
+# Executes STOP REPLICA.
+sub stop_replica {
    my ( $self, $dbh ) = @_;
    my $vp = VersionParser->new($dbh);
    my $replica_name = 'replica';
    if ( $vp < '8.1' || $vp->flavor() =~ m/maria/ ) {
-      $replica_name = 'slave';
+      $replica_name = 'replica';
    }
-   my $sth = $self->{sths}->{$dbh}->{STOP_SLAVE}
+   my $sth = $self->{sths}->{$dbh}->{STOP_REPLICA}
          ||= $dbh->prepare("STOP ${replica_name}");
    PTDEBUG && _d($dbh, $sth->{Statement});
    $sth->execute();
 }
 
-# Executes START SLAVE, optionally with UNTIL.
-sub start_slave {
+# Executes START REPLICA, optionally with UNTIL.
+sub start_replica {
    my ( $self, $dbh, $pos ) = @_;
+
    my $vp = VersionParser->new($dbh);
    my $source_name = 'source';
    my $replica_name = 'replica';
@@ -694,6 +697,7 @@ sub start_slave {
       $source_name = 'master';
       $replica_name = 'slave';
    }
+
    if ( $pos ) {
       # Just like with CHANGE REPLICATION SOURCE TO, you can't quote the position.
       my $sql = "START ${replica_name} UNTIL ${source_name}_LOG_FILE='$pos->{file}', "
@@ -702,40 +706,40 @@ sub start_slave {
       $dbh->do($sql);
    }
    else {
-      my $sth = $self->{sths}->{$dbh}->{START_SLAVE}
+      my $sth = $self->{sths}->{$dbh}->{START_REPLICA}
             ||= $dbh->prepare("START ${replica_name}");
       PTDEBUG && _d($dbh, $sth->{Statement});
       $sth->execute();
    }
 }
 
-# Waits for the slave to catch up to its source, using START SLAVE UNTIL.  When
-# complete, the slave is caught up to the source, and the slave process is
+# Waits for the replica to catch up to its source, using START REPLICA UNTIL.  When
+# complete, the replica is caught up to the source, and the replica process is
 # stopped on both servers.
 sub catchup_to_source {
-   my ( $self, $slave, $source, $timeout ) = @_;
-   $self->stop_slave($source);
-   $self->stop_slave($slave);
-   my $slave_status  = $self->get_slave_status($slave);
-   my $slave_pos     = $self->repl_posn($slave_status);
+   my ( $self, $replica, $source, $timeout ) = @_;
+   $self->stop_replica($source);
+   $self->stop_replica($replica);
+   my $replica_status  = $self->get_replica_status($replica);
+   my $replica_pos     = $self->repl_posn($replica_status);
    my $source_status = $self->get_source_status($source);
    my $source_pos    = $self->repl_posn($source_status);
    PTDEBUG && _d('Source position:', $self->pos_to_string($source_pos),
-      'Slave position:', $self->pos_to_string($slave_pos));
+      'Replica position:', $self->pos_to_string($replica_pos));
 
    my $result;
-   if ( $self->pos_cmp($slave_pos, $source_pos) < 0 ) {
-      PTDEBUG && _d('Waiting for slave to catch up to source');
-      $self->start_slave($slave, $source_pos);
+   if ( $self->pos_cmp($replica_pos, $source_pos) < 0 ) {
+      PTDEBUG && _d('Waiting for replica to catch up to source');
+      $self->start_replica($replica, $source_pos);
 
-      # The slave may catch up instantly and stop, in which case
+      # The replica may catch up instantly and stop, in which case
       # SOURCE_POS_WAIT will return NULL and $result->{result} will be undef.
       # We must catch this; if it returns NULL, then we check that
       # its position is as desired.
       # TODO: what if source_pos_wait times out and $result == -1? retry?
       $result = $self->wait_for_source(
             source_status => $source_status,
-            slave_dbh     => $slave,
+            replica_dbh   => $replica,
             timeout       => $timeout,
             source_status => $source_status
       );
@@ -743,25 +747,32 @@ sub catchup_to_source {
           die $result->{error};
       }
       if ( !defined $result->{result} ) {
-         $slave_status = $self->get_slave_status($slave);
-         if ( !$self->slave_is_running($slave_status) ) {
+         $replica_status = $self->get_replica_status($replica);
+            
+         my $vp = VersionParser->new($replica);
+         my $replica_name = 'replica';
+         if ( $vp < '8.1' || $vp->flavor() =~ m/maria/ ) {
+            $replica_name = 'slave';
+         }
+
+         if ( !$self->replica_is_running($replica_status, $replica_name) ) {
             PTDEBUG && _d('Source position:',
                $self->pos_to_string($source_pos),
-               'Slave position:', $self->pos_to_string($slave_pos));
-            $slave_pos = $self->repl_posn($slave_status);
-            if ( $self->pos_cmp($slave_pos, $source_pos) != 0 ) {
-               die "SOURCE_POS_WAIT() returned NULL but slave has not "
+               'Replica position:', $self->pos_to_string($replica_pos));
+            $replica_pos = $self->repl_posn($replica_status);
+            if ( $self->pos_cmp($replica_pos, $source_pos) != 0 ) {
+               die "SOURCE_POS_WAIT() returned NULL but replica has not "
                   . "caught up to source";
             }
-            PTDEBUG && _d('Slave is caught up to source and stopped');
+            PTDEBUG && _d('Replica is caught up to source and stopped');
          }
          else {
-            die "Slave has not caught up to source and it is still running";
+            die "Replica has not caught up to source and it is still running";
          }
       }
    }
    else {
-      PTDEBUG && _d("Slave is already caught up to source");
+      PTDEBUG && _d("Replica is already caught up to source");
    }
 
    return $result;
@@ -771,28 +782,40 @@ sub catchup_to_source {
 # servers are stopped and at the same position.
 sub catchup_to_same_pos {
    my ( $self, $s1_dbh, $s2_dbh ) = @_;
-   $self->stop_slave($s1_dbh);
-   $self->stop_slave($s2_dbh);
-   my $s1_status = $self->get_slave_status($s1_dbh);
-   my $s2_status = $self->get_slave_status($s2_dbh);
+   $self->stop_replica($s1_dbh);
+   $self->stop_replica($s2_dbh);
+   my $s1_status = $self->get_replica_status($s1_dbh);
+   my $s2_status = $self->get_replica_status($s2_dbh);
    my $s1_pos    = $self->repl_posn($s1_status);
    my $s2_pos    = $self->repl_posn($s2_status);
    if ( $self->pos_cmp($s1_pos, $s2_pos) < 0 ) {
-      $self->start_slave($s1_dbh, $s2_pos);
+      $self->start_replica($s1_dbh, $s2_pos);
    }
    elsif ( $self->pos_cmp($s2_pos, $s1_pos) < 0 ) {
-      $self->start_slave($s2_dbh, $s1_pos);
+      $self->start_replica($s2_dbh, $s1_pos);
    }
 
    # Re-fetch the replication statuses and positions.
-   $s1_status = $self->get_slave_status($s1_dbh);
-   $s2_status = $self->get_slave_status($s2_dbh);
+   $s1_status = $self->get_replica_status($s1_dbh);
+   $s2_status = $self->get_replica_status($s2_dbh);
    $s1_pos    = $self->repl_posn($s1_status);
    $s2_pos    = $self->repl_posn($s2_status);
 
+   my $vp1 = VersionParser->new($s1_dbh);
+   my $replica1_name = 'replica';
+   if ( $vp1 < '8.1' || $vp1->flavor() =~ m/maria/ ) {
+      $replica1_name = 'slave';
+   }
+
+   my $vp2 = VersionParser->new($s2_dbh);
+   my $replica2_name = 'replica';
+   if ( $vp2 < '8.1' || $vp2->flavor() =~ m/maria/ ) {
+      $replica2_name = 'slave';
+   }
+
    # Verify that they are both stopped and are at the same position.
-   if ( $self->slave_is_running($s1_status)
-     || $self->slave_is_running($s2_status)
+   if ( $self->replica_is_running($s1_status, $replica1_name)
+     || $self->replica_is_running($s2_status, $replica2_name)
      || $self->pos_cmp($s1_pos, $s2_pos) != 0)
    {
       die "The servers aren't both stopped at the same position";
@@ -800,23 +823,30 @@ sub catchup_to_same_pos {
 
 }
 
-# Returns true if the slave is running.
-sub slave_is_running {
-   my ( $self, $slave_status ) = @_;
-   return ($slave_status->{slave_sql_running} || 'No') eq 'Yes';
+# Returns true if the replica is running.
+sub replica_is_running {
+   my ( $self, $replica_status, $replica_name ) = @_;
+   return ($replica_status->{"${replica_name}_sql_running"} || 'No') eq 'Yes';
 }
 
-# Returns true if the server's log_slave_updates option is enabled.
-sub has_slave_updates {
+# Returns true if the server's log_replica_updates option is enabled.
+sub has_replica_updates {
    my ( $self, $dbh ) = @_;
-   my $sql = q{SHOW VARIABLES LIKE 'log_slave_updates'};
+   
+   my $vp = VersionParser->new($dbh);
+   my $replica_name = 'replica';
+   if ( $vp < '8.1' || $vp->flavor() =~ m/maria/ ) {
+      $replica_name = 'slave';
+   }
+
+   my $sql = qq{SHOW VARIABLES LIKE 'log_${replica_name}_updates'};
    PTDEBUG && _d($dbh, $sql);
    my ($name, $value) = $dbh->selectrow_array($sql);
    return $value && $value =~ m/^(1|ON)$/;
 }
 
 # Extracts the replication position out of either SHOW REPLICATION SOURCE STATUS or SHOW
-# SLAVE STATUS, and returns it as a hashref { file, position }
+# REPLICA STATUS, and returns it as a hashref { file, position }
 sub repl_posn {
    my ( $self, $status ) = @_;
    if ( exists $status->{file} && exists $status->{position} ) {
@@ -841,8 +871,8 @@ sub repl_posn {
    }
 }
 
-# Gets the slave's lag.  TODO: permit using a heartbeat table.
-sub get_slave_lag {
+# Gets the replica's lag.  TODO: permit using a heartbeat table.
+sub get_replica_lag {
    my ( $self, $dbh ) = @_;
    
    my $vp = VersionParser->new($dbh);
@@ -851,8 +881,8 @@ sub get_slave_lag {
       $source_name = 'master';
    }
 
-   my $stat = $self->get_slave_status($dbh);
-   return unless $stat;  # server is not a slave
+   my $stat = $self->get_replica_status($dbh);
+   return unless $stat;  # server is not a replica
    return $stat->{"seconds_behind_${source_name}"};
 }
 
@@ -868,7 +898,7 @@ sub pos_cmp {
 #   hostname is really just the combination of hostname and port, since
 #   replication always uses TCP connections (it does not work via sockets).  If
 #   the port is the default 3306, it is omitted.  As a convenience, this sub
-#   accepts either SHOW SLAVE STATUS or a DSN.
+#   accepts either SHOW REPLICA STATUS or a DSN.
 #
 # Parameters:
 #   $dsn - DSN hashref
@@ -898,7 +928,7 @@ sub short_host {
 #
 # Arguments:
 #   type            - Which kind of repl thread to match:
-#                     all, binlog_dump (source), slave_io, or slave_sql
+#                     all, binlog_dump (source), replica_io, or replica_sql
 #                     (default: all)
 #   check_known_ids - Check known replication thread IDs (default: yes)
 #
@@ -910,7 +940,7 @@ sub is_replication_thread {
 
    my $type = lc($args{type} || 'all');
    die "Invalid type: $type"
-      unless $type =~ m/^binlog_dump|slave_io|slave_sql|all$/i;
+      unless $type =~ m/^binlog_dump|slave_io|slave_sql|replica_io|replica_sql|all$/i;
 
    my $match = 0;
    if ( $type =~ m/binlog_dump|all/i ) {
@@ -918,11 +948,11 @@ sub is_replication_thread {
          if ($query->{Command} || $query->{command} || '') eq "Binlog Dump";
    }
    if ( !$match ) {
-      # On a slave, there are two threads.  Both have user="system user".
+      # On a replica, there are two threads.  Both have user="system user".
       if ( ($query->{User} || $query->{user} || '') eq "system user" ) {
-         PTDEBUG && _d("Slave replication thread");
+         PTDEBUG && _d("Replica replication thread");
          if ( $type ne 'all' ) {
-            # Match a particular slave thread.
+            # Match a particular replica thread.
             my $state = $query->{State} || $query->{state} || '';
 
             if ( $state =~ m/^init|end$/ ) {
@@ -932,27 +962,28 @@ sub is_replication_thread {
             }
             else {
                # These patterns are abbreviated because if the first few words
-               # match chances are very high it's the full slave thd state.
-               my ($slave_sql) = $state =~ m/
+               # match chances are very high it's the full replica thd state.
+               my ($replica_sql) = $state =~ m/
                   ^(Waiting\sfor\sthe\snext\sevent
                    |Reading\sevent\sfrom\sthe\srelay\slog
                    |Has\sread\sall\srelay\slog;\swaiting
                    |Making\stemp\sfile
-                   |Waiting\sfor\sslave\smutex\son\sexit)/xi;
+                   |Waiting\sfor\sslave\smutex\son\sexit
+                   |Waiting\sfor\sreplica\smutex\son\sexit)/xi;
 
-               # Type is either "slave_sql" or "slave_io".  The second line
+               # Type is either "replica_sql" or "replica_io".  The second line
                # implies that if this isn't the sql thread then it must be
                # the io thread, so match is true if we were supposed to match
                # the io thread.
-               $match = $type eq 'slave_sql' &&  $slave_sql ? 1
-                      : $type eq 'slave_io'  && !$slave_sql ? 1
+               $match = $type eq 'replica_sql' &&  $replica_sql ? 1
+                      : $type eq 'replica_io'  && !$replica_sql ? 1
                       :                                       0;
             }
          }
          else {
             # Type is "all" and it's not a source (binlog_dump) thread,
             # else we wouldn't have gotten here.  It's either of the 2
-            # slave threads and we don't care which.
+            # replica threads and we don't care which.
             $match = 1;
          }
       }
@@ -960,9 +991,9 @@ sub is_replication_thread {
          PTDEBUG && _d('Not system user');
       }
 
-      # MySQL loves to trick us.  Sometimes a slave replication thread will
+      # MySQL loves to trick us.  Sometimes a replica replication thread will
       # temporarily morph into what looks like a regular user thread when
-      # really it's still the same slave repl thread.  So here we save known
+      # really it's still the same replica repl thread.  So here we save known
       # repl thread IDs and check if a non-matching event is actually a
       # known repl thread ID and if yes then we make it match.
       if ( !defined $args{check_known_ids} || $args{check_known_ids} ) {
@@ -993,7 +1024,7 @@ sub is_replication_thread {
 #   %args - Arguments
 #
 # Required Arguments:
-#   dbh - dbh, source or slave
+#   dbh - dbh, source or replica
 #
 # Returns:
 #   Hashref of any replication filters.  If none are set, an empty hashref
@@ -1006,6 +1037,12 @@ sub get_replication_filters {
    }
    my ($dbh) = @args{@required_args};
 
+   my $vp = VersionParser->new($dbh);
+   my $replica_name = 'replica';
+   if ( $vp < '8.1' || $vp->flavor() =~ m/maria/ ) {
+      $replica_name = 'slave';
+   }
+
    my %filters = ();
 
    my $status = $self->get_source_status($dbh);
@@ -1018,7 +1055,7 @@ sub get_replication_filters {
       );
    }
 
-   $status = $self->get_slave_status($dbh);
+   $status = $self->get_replica_status($dbh);
    if ( $status ) {
       map { $filters{$_} = $status->{$_} }
       grep { defined $status->{$_} && $status->{$_} ne '' }
@@ -1031,11 +1068,11 @@ sub get_replication_filters {
          replicate_wild_ignore_table
       );
 
-      my $sql = "SHOW VARIABLES LIKE 'slave_skip_errors'";
+      my $sql = "SHOW VARIABLES LIKE '${replica_name}_skip_errors'";
       PTDEBUG && _d($dbh, $sql);
       my $row = $dbh->selectrow_arrayref($sql);
       # "OFF" in 5.0, "" in 5.1
-      $filters{slave_skip_errors} = $row->[1] if $row->[1] && $row->[1] ne 'OFF';
+      $filters{replica_skip_errors} = $row->[1] if $row->[1] && $row->[1] ne 'OFF';
    }
 
    return \%filters;
diff --git a/lib/MySQLConfig.pm b/lib/MySQLConfig.pm
index 9c6cf272c..c21dd0720 100644
--- a/lib/MySQLConfig.pm
+++ b/lib/MySQLConfig.pm
@@ -282,7 +282,7 @@ sub parse_mysqld {
    #   and boolean options {FALSE|TRUE}  Value (after reading options)
    #   --------------------------------- -----------------------------
    #   help                              TRUE
-   #   abort-slave-event-count           0
+   #   auto_increment_increment          1
    # So we search for that line of hyphens.
    #
    # It also ends with something like
diff --git a/lib/MySQLProtocolParser.pm b/lib/MySQLProtocolParser.pm
index f81dc55f2..050fadff0 100644
--- a/lib/MySQLProtocolParser.pm
+++ b/lib/MySQLProtocolParser.pm
@@ -75,7 +75,7 @@ use constant {
    COM_BINLOG_DUMP         => '12',
    COM_TABLE_DUMP          => '13',
    COM_CONNECT_OUT         => '14',
-   COM_REGISTER_SLAVE      => '15',
+   COM_REGISTER_REPLICA    => '15',
    COM_STMT_PREPARE        => '16',
    COM_STMT_EXECUTE        => '17',
    COM_STMT_SEND_LONG_DATA => '18',
@@ -109,7 +109,7 @@ my %com_for = (
    '12' => 'COM_BINLOG_DUMP',
    '13' => 'COM_TABLE_DUMP',
    '14' => 'COM_CONNECT_OUT',
-   '15' => 'COM_REGISTER_SLAVE',
+   '15' => 'COM_REGISTER_REPLICA',
    '16' => 'COM_STMT_PREPARE',
    '17' => 'COM_STMT_EXECUTE',
    '18' => 'COM_STMT_SEND_LONG_DATA',
diff --git a/lib/Percona/Test.pm b/lib/Percona/Test.pm
deleted file mode 100644
index e1221b497..000000000
--- a/lib/Percona/Test.pm
+++ /dev/null
@@ -1,814 +0,0 @@
-# This program is copyright 2009-2013 Percona Inc.
-# Feedback and improvements are welcome.
-#
-# THIS PROGRAM IS PROVIDED "AS IS" AND WITHOUT ANY EXPRESS OR IMPLIED
-# WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
-# MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
-#
-# This program is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License as published by the Free Software
-# Foundation, version 2; OR the Perl Artistic License.  On UNIX and similar
-# systems, you can issue `man perlgpl' or `man perlartistic' to read these
-# licenses.
-#
-# You should have received a copy of the GNU General Public License along with
-# this program; if not, write to the Free Software Foundation, Inc., 59 Temple
-# Place, Suite 330, Boston, MA  02111-1307  USA.
-# ###########################################################################
-# Percona::Test package
-# ###########################################################################
-{
-# Package: Percona::Test
-# PerconaTest is a collection of helper-subs for Percona Toolkit tests.
-# Any file arguments (like no_diff() $expected_output) are relative to
-# PERCONA_TOOLKIT_BRANCH.  So passing "commont/t/samples/foo" means
-# "PERCONA_TOOLKIT_BRANCH/common/t/samples/foo".  Do not BAIL_OUT() because
-# this terminates the *entire* test process; die instead.  All
-# subs are exported by default, so is the variable $trunk, so there's
-# no need to import() in the test scripts.
-package Percona::Test;
-
-use strict;
-use warnings FATAL => 'all';
-use English qw(-no_match_vars);
-use constant PTDEVDEBUG => $ENV{PTDEVDEBUG} || 0;
-
-use Data::Dumper;
-$Data::Dumper::Indent    = 1;
-$Data::Dumper::Sortkeys  = 1;
-$Data::Dumper::Quotekeys = 0;
-
-use Test::More;
-use Time::HiRes qw(sleep time);
-use File::Temp qw(tempfile);
-use POSIX qw(signal_h);
-
-require Exporter;
-our @ISA         = qw(Exporter);
-our %EXPORT_TAGS = ();
-our @EXPORT_OK   = qw();
-our @EXPORT      = qw(
-   output
-   full_output
-   load_data
-   load_file
-   slurp_file
-   parse_file
-   wait_until
-   wait_for
-   wait_until_slave_running
-   wait_until_no_lag
-   test_log_parser
-   test_protocol_parser
-   test_packet_parser
-   no_diff
-   throws_ok
-   remove_traces
-   test_bash_tool
-   verify_test_data_integrity
-   $trunk
-   $dsn_opts
-   $sandbox_version
-   $can_load_data
-);
-
-our $trunk = $ENV{PERCONA_TOOLKIT_BRANCH};
-
-our $sandbox_version = '';
-eval {
-   chomp(my $v = `$trunk/sandbox/test-env version 2>/dev/null`);
-   $sandbox_version = $v if $v;
-};
-
-our $can_load_data = can_load_data();
-
-our $dsn_opts = [
-   {
-      key  => 'A',
-      desc => 'Default character set',
-      dsn  => 'charset',
-      copy => 1,
-   },
-   {
-      key  => 'D',
-      desc => 'Database to use',
-      dsn  => 'database',
-      copy => 1,
-   },
-   {
-      key  => 'F',
-      desc => 'Only read default options from the given file',
-      dsn  => 'mysql_read_default_file',
-      copy => 1,
-   },
-   {
-      key  => 'h',
-      desc => 'Connect to host',
-      dsn  => 'host',
-      copy => 1,
-   },
-   {
-      key  => 'p',
-      desc => 'Password to use when connecting',
-      dsn  => 'password',
-      copy => 1,
-   },
-   {
-      key  => 'P',
-      desc => 'Port number to use for connection',
-      dsn  => 'port',
-      copy => 1,
-   },
-   {
-      key  => 'S',
-      desc => 'Socket file to use for connection',
-      dsn  => 'mysql_socket',
-      copy => 1,
-   },
-   {
-      key  => 't',
-      desc => 'Table',
-      dsn  => undef,
-      copy => 1,
-   },
-   {
-      key  => 'u',
-      desc => 'User for login if not current user',
-      dsn  => 'user',
-      copy => 1,
-   },
-];
-
-# Runs code, captures and returns its output.
-# Optional arguments:
-#   * file    scalar: capture output to this file (default none)
-#   * stderr  scalar: capture STDERR (default no)
-#   * die     scalar: die if code dies (default no)
-#   * trf     coderef: pass output to this coderef (default none)
-sub output {
-   my ( $code, %args ) = @_;
-   die "I need a code argument" unless $code;
-   my ($file, $stderr, $die, $trf) = @args{qw(file stderr die trf)};
-
-   if ( $args{debug} ) {
-      my $retval = eval { $code->() };
-      warn $EVAL_ERROR if $EVAL_ERROR;
-      return $retval;
-   }
-
-   my $output = '';
-   {
-      if ( $file ) {
-         open *output_fh, '>', $file
-            or die "Cannot open file $file: $OS_ERROR";
-      }
-      else {
-         open *output_fh, '>', \$output
-            or die "Cannot capture output to variable: $OS_ERROR";
-      }
-      local *STDOUT = *output_fh;
-
-      # If capturing STDERR we must dynamically scope (local) STDERR
-      # in the outer scope of the sub.  If we did,
-      #   if ( $args{stderr} ) { local *STDERR; ... }
-      # then STDERR would revert to its original value outside the if
-      # block.
-      local *STDERR     if $args{stderr};  # do in outer scope of this sub
-      *STDERR = *STDOUT if $args{stderr};
-
-      eval { $code->() };
-      if ( $EVAL_ERROR ) {
-         die $EVAL_ERROR if $die;
-         warn $EVAL_ERROR;
-      }
-
-      close *output_fh;
-   }
-
-   select STDOUT;
-
-   # Possible transform output before returning it.  This doesn't work
-   # if output was captured to a file.
-   $output = $trf->($output) if $trf;
-
-   return $output;
-}
-
-# Load data from file and removes spaces.  Used to load tcpdump dumps.
-sub load_data {
-   my ( $file ) = @_;
-   $file = "$trunk/$file";
-   open my $fh, '<', $file or die "Cannot open $file: $OS_ERROR";
-   my $contents = do { local $/ = undef; <$fh> };
-   close $fh;
-   (my $data = join('', $contents =~ m/(.*)/g)) =~ s/\s+//g;
-   return $data;
-}
-
-# Slurp file and return its entire contents.
-sub load_file {
-   my ( $file, %args ) = @_;
-   $file = "$trunk/$file";
-   my $contents = slurp_file($file);
-   chomp $contents if $args{chomp_contents};
-   return $contents;
-}
-
-sub slurp_file {
-   my ($file) = @_;
-   open my $fh, "<", $file or die "Cannot open $file: $OS_ERROR";
-   my $contents = do { local $/ = undef; <$fh> };
-   close $fh;
-   return $contents;
-}
-
-sub parse_file {
-   my ( $file, $p, $ea ) = @_;
-   $file = "$trunk/$file";
-   my @e;
-   eval {
-      open my $fh, "<", $file or die "Cannot open $file: $OS_ERROR";
-      my %args = (
-         next_event => sub { return <$fh>;    },
-         tell       => sub { return tell $fh; },
-         fh         => $fh,
-      );
-      while ( my $e = $p->parse_event(%args) ) {
-         push @e, $e;
-         $ea->aggregate($e) if $ea;
-      }
-      close $fh;
-   };
-   die $EVAL_ERROR if $EVAL_ERROR;
-   return \@e;
-}
-
-# Wait until code returns true.
-sub wait_until {
-   my ( $code, $t, $max_t ) = @_;
-   $t     ||= .20;
-   $max_t ||= 30;
-
-   my $slept = 0;
-   while ( $slept <= $max_t ) {
-      return 1 if $code->();
-      PTDEVDEBUG && _d('wait_until sleeping', $t);
-      sleep $t;
-      $slept += $t;
-      PTDEVDEBUG && _d('wait_until slept', $slept, 'of', $max_t);
-   }
-   return 0;
-}
-
-# Wait t seconds for code to return.
-sub wait_for {
-   my ( $code, $t ) = @_;
-   $t ||= 0;
-   my $mask   = POSIX::SigSet->new(&POSIX::SIGALRM);
-   my $action = POSIX::SigAction->new(
-      sub { die },
-      $mask,
-   );
-   my $oldaction = POSIX::SigAction->new();
-   sigaction(&POSIX::SIGALRM, $action, $oldaction);
-   eval {
-      alarm $t;
-      $code->();
-      alarm 0;
-   };
-   if ( $EVAL_ERROR ) {
-      # alarm was raised
-      return 1;
-   }
-   return 0;
-}
-
-sub wait_for_table {
-   my ($dbh, $tbl, $where) = @_;
-   my $sql = "SELECT 1 FROM $tbl" . ($where ? " WHERE $where LIMIT 1" : "");
-   return wait_until(
-      sub {
-         my $r;
-         eval { $r = $dbh->selectrow_arrayref($sql); };
-         if ( $EVAL_ERROR ) {
-            PTDEVDEBUG && _d('Waiting on', $dbh, 'for table', $tbl,
-               'error:', $EVAL_ERROR);
-            return 0;
-         }
-         if ( $where && (!$r || !scalar @$r) ) {
-            PTDEVDEBUG && _d('Waiting on', $dbh, 'for table', $tbl,
-               'WHERE', $where);
-            return 0;
-         }
-         return 1;
-      },
-   );
-}
-
-sub wait_for_files {
-   my (@files) = @_;
-   return wait_until(
-      sub {
-         foreach my $file (@files) {
-            if ( ! -f $file ) {
-               PTDEVDEBUG && _d('Waiting for file', $file);
-               return 0;
-            }
-         }
-         return 1;
-      },
-   );
-}
-
-sub wait_for_sh {
-   my ($cmd) = @_;
-   return wait_until(
-      sub {
-         my $retval = system("$cmd 2>/dev/null");
-         return $retval >> 8 == 0 ? 1 : 0;
-      }
-   );
-};
-
-sub not_running {
-   my ($cmd) = @_;
-   PTDEVDEBUG && _d('Wait until not running:', $cmd);
-   return wait_until(
-      sub {
-         my $output = `ps x | grep -v grep | grep "$cmd"`;
-         PTDEVDEBUG && _d($output);
-         return 1 unless $output;
-         return 0;
-      }
-   );
-}
-
-sub _read {
-   my ( $fh ) = @_;
-   return <$fh>;
-}
-
-sub test_log_parser {
-   my ( %args ) = @_;
-   foreach my $arg ( qw(parser file) ) {
-      die "I need a $arg argument" unless $args{$arg};
-   }
-   my $p = $args{parser};
-
-   # Make sure caller isn't giving us something we don't understand.
-   # We could ignore it, but then caller might not get the results
-   # they expected.
-   map  { die "What is $_ for?"; }
-   grep { $_ !~ m/^(?:parser|misc|file|result|num_events|oktorun)$/ }
-   keys %args;
-
-   my $file = "$trunk/$args{file}";
-   my @e;
-   eval {
-      open my $fh, "<", $file or die "Cannot open $file: $OS_ERROR";
-      my %parser_args = (
-         next_event => sub { return _read($fh); },
-         tell       => sub { return tell($fh);  },
-         fh         => $fh,
-         misc       => $args{misc},
-         oktorun    => $args{oktorun},
-      );
-      while ( my $e = $p->parse_event(%parser_args) ) {
-         push @e, $e;
-      }
-      close $fh;
-   };
-
-   my ($base_file_name) = $args{file} =~ m/([^\/]+)$/;
-   is(
-      $EVAL_ERROR,
-      '',
-      "$base_file_name: no errors"
-   );
-
-   if ( defined $args{result} ) {
-      is_deeply(
-         \@e,
-         $args{result},
-         "$base_file_name: results"
-      ) or diag(Dumper(\@e));
-   }
-
-   if ( defined $args{num_events} ) {
-      is(
-         scalar @e,
-         $args{num_events},
-         "$base_file_name: $args{num_events} events"
-      );
-   }
-
-   return \@e;
-}
-
-sub test_protocol_parser {
-   my ( %args ) = @_;
-   foreach my $arg ( qw(parser protocol file) ) {
-      die "I need a $arg argument" unless $args{$arg};
-   }
-   my $parser   = $args{parser};
-   my $protocol = $args{protocol};
-
-   # Make sure caller isn't giving us something we don't understand.
-   # We could ignore it, but then caller might not get the results
-   # they expected.
-   map { die "What is $_ for?"; }
-   grep { $_ !~ m/^(?:parser|protocol|misc|file|result|num_events|desc)$/ }
-   keys %args;
-
-   my $file = "$trunk/$args{file}";
-   my @e;
-   eval {
-      open my $fh, "<", $file or die "Cannot open $file: $OS_ERROR";
-      my %parser_args = (
-         next_event => sub { return _read($fh); },
-         tell       => sub { return tell($fh);  },
-         misc       => $args{misc},
-      );
-      while ( my $p = $parser->parse_event(%parser_args) ) {
-         my $e = $protocol->parse_event(%parser_args, event => $p);
-         push @e, $e if $e;
-      }
-      close $fh;
-   };
-
-   my ($base_file_name) = $args{file} =~ m/([^\/]+)$/;
-   is(
-      $EVAL_ERROR,
-      '',
-      "$base_file_name: no errors"
-   );
-
-   if ( defined $args{result} ) {
-      is_deeply(
-         \@e,
-         $args{result},
-         "$base_file_name: " . ($args{desc} || "results")
-      ) or diag(Dumper(\@e));
-   }
-
-   if ( defined $args{num_events} ) {
-      is(
-         scalar @e,
-         $args{num_events},
-         "$base_file_name: $args{num_events} events"
-      );
-   }
-
-   return \@e;
-}
-
-sub test_packet_parser {
-   my ( %args ) = @_;
-   foreach my $arg ( qw(parser file) ) {
-      die "I need a $arg argument" unless $args{$arg};
-   }
-   my $parser   = $args{parser};
-
-   # Make sure caller isn't giving us something we don't understand.
-   # We could ignore it, but then caller might not get the results
-   # they expected.
-   map { die "What is $_ for?"; }
-   grep { $_ !~ m/^(?:parser|misc|file|result|desc|oktorun)$/ }
-   keys %args;
-
-   my $file = "$trunk/$args{file}";
-   my @packets;
-   open my $fh, '<', $file or die "Cannot open $file: $OS_ERROR";
-   my %parser_args = (
-      next_event => sub { return _read($fh); },
-      tell       => sub { return tell($fh);  },
-      misc       => $args{misc},
-      oktorun    => $args{oktorun},
-   );
-   while ( my $packet = $parser->parse_event(%parser_args) ) {
-      push @packets, $packet;
-   }
-
-   # raw_packet is the actual dump text from the file.  It's used
-   # in MySQLProtocolParser but I don't think we need to double-check
-   # it here.  It will make the results very long.
-   foreach my $packet ( @packets ) {
-      delete $packet->{raw_packet};
-   }
-
-   if ( !is_deeply(
-         \@packets,
-         $args{result},
-         "$args{file}" . ($args{desc} ? ": $args{desc}" : '')
-      ) ) {
-      diag(Dumper(\@packets));
-   }
-
-   return;
-}
-
-# no_diff() compares the STDOUT output of a cmd or code to expected output.
-# Returns true if there are no differences between the two outputs,
-# else returns false.  Dies if the cmd/code dies.  Does not capture STDERR.
-# Args:
-#   * cmd                 scalar or coderef: if cmd is a scalar then the
-#                         cmd is ran via the shell.  if it's a coderef then
-#                         the code is ran.  the latter is preferred because
-#                         it generates test coverage.
-#   * expected_output     scalar: file name relative to PERCONA_TOOLKIT_BRANCH
-#   * args                hash: (optional) may include
-#       update_sample            overwrite expected_output with cmd/code output
-#       keep_output              keep last cmd/code output file
-#       transform_result         transform the code to be compared but do not
-#                                reflect these changes on the original file
-#                                if update_sample is passed in
-#       transform_sample         similar to the above, but with the sample
-#                                file
-#   *   trf                      transform cmd/code output before diff
-# The sub dies if cmd or code dies.  STDERR is not captured.
-sub no_diff {
-   my ( $cmd, $expected_output, %args ) = @_;
-   die "I need a cmd argument" unless $cmd;
-   die "I need an expected_output argument" unless $expected_output;
-
-   die "$expected_output does not exist" unless -f "$trunk/$expected_output";
-   $expected_output = "$trunk/$expected_output";
-
-   my $tmp_file      = '/tmp/percona-toolkit-test-output.txt';
-   my $tmp_file_orig = '/tmp/percona-toolkit-test-output-original.txt';
-
-   if ( my $sed_args = $args{sed_out} ) {
-      `cat $expected_output | sed $sed_args > /tmp/pt-test-outfile-trf`;
-      $expected_output = "/tmp/pt-test-outfile-trf";
-   }
-
-   # Determine cmd type and run it.
-   if ( ref $cmd eq 'CODE' ) {
-      output($cmd, file => $tmp_file);
-   }
-   elsif ( $args{cmd_output} ) {
-      # Copy cmd output to tmp file so we don't with the original.
-      open my $tmp_fh, '>', $tmp_file or die "Cannot open $tmp_file: $OS_ERROR";
-      print $tmp_fh $cmd;
-      close $tmp_fh;
-   }
-   else {
-      `$cmd > $tmp_file`;
-   }
-
-   # Do optional arg stuff.
-   `cp $tmp_file $tmp_file_orig`;
-   if ( my $trf = $args{trf} ) {
-      `$trf $tmp_file_orig > $tmp_file`;
-   }
-   if ( my $post_pipe = $args{post_pipe} ) {
-      `cat $tmp_file | $post_pipe > $tmp_file-2`;
-       `mv $tmp_file-2 $tmp_file`;
-   }
-   if ( my $sed_args = $args{sed} ) {
-      foreach my $sed_args ( @{$args{sed}} ) {
-         `cat $tmp_file | sed $sed_args > $tmp_file-2`;
-         `mv $tmp_file-2 $tmp_file`;
-      }
-   }
-   if ( defined(my $sort_args = $args{sort}) ) {
-      `cat $tmp_file | sort $sort_args > $tmp_file-2`;
-      `mv $tmp_file-2 $tmp_file`;
-   }
-
-   my $res_file = $tmp_file;
-   if ( $args{transform_result} ) {
-      (undef, $res_file) = tempfile();
-      output(
-         sub { $args{transform_result}->($tmp_file) },
-         file => $res_file,
-      );
-   }
-
-   my $cmp_file = $expected_output;
-   if ( $args{transform_sample} ) {
-      (undef, $cmp_file) = tempfile();
-      output(
-         sub { $args{transform_sample}->($expected_output) },
-         file => $cmp_file,
-      );
-   }
-
-   # diff the outputs.
-   my $out = `diff $res_file $cmp_file`;
-   my $retval = $?;
-
-   # diff returns 0 if there were no differences,
-   # so !0 = 1 = no diff in our testing parlance.
-   $retval = $retval >> 8;
-
-   if ( $retval ) {
-      diag($out);
-      if ( $ENV{UPDATE_SAMPLES} || $args{update_sample} ) {
-         `cat $tmp_file > $expected_output`;
-         diag("Updated $expected_output");
-      }
-   }
-
-   # Remove our tmp files.
-   `rm -f $tmp_file $tmp_file_orig /tmp/pt-test-outfile-trf >/dev/null 2>&1`
-      unless $ENV{KEEP_OUTPUT} || $args{keep_output};
-
-   if ( $res_file ne $tmp_file ) {
-      1 while unlink $res_file;
-   }
-
-   if ( $cmp_file ne $expected_output ) {
-      1 while unlink $cmp_file;
-   }
-
-   return !$retval;
-}
-
-sub throws_ok {
-   my ( $code, $pat, $msg ) = @_;
-   eval { $code->(); };
-   like ( $EVAL_ERROR, $pat, $msg );
-}
-
-# Remove /*percona-toolkit ...*/ trace comments from the given SQL statement(s).
-# Traces are added in ChangeHandler::process_rows().
-sub remove_traces {
-   my ( $sql ) = @_;
-   my $trace_pat = qr/ \/\*percona-toolkit .+?\*\//;
-   if ( ref $sql && ref $sql eq 'ARRAY' ) {
-      map { $_ =~ s/$trace_pat//gm } @$sql;
-   }
-   else {
-      $sql =~ s/$trace_pat//gm;
-   }
-   return $sql;
-}
-
-sub test_bash_tool {
-   my ( $tool ) = @_;
-   die "I need a tool argument" unless $tool;
-   my $outfile = "/tmp/$tool-test-results.txt";
-   `rm -rf $outfile >/dev/null`;
-   `$trunk/util/test-bash-tool $tool > $outfile`;
-   print `cat $outfile`;
-   return;
-}
-
-my %checksum_result_col = (
-   ts        => 0,
-   errors    => 1,
-   diffs     => 2,
-   rows      => 3,
-   diff_rows => 4,
-   chunks    => 5,
-   skipped   => 5,
-   time      => 6,
-   table     => 7,
-);
-sub count_checksum_results {
-   my ($output, $column, $table) = @_;
-
-   my (@res) = map {
-      my $line = $_;
-      my (@cols) = $line =~ m/(\S+)/g;
-      \@cols;
-   }
-   grep {
-      my $line = $_;
-      if ( !$table ) {
-         $line;
-      }
-      else {
-         $line =~ m/$table$/m ? $line : '';
-      }
-   }
-   grep { m/^\d+\-\d+T\d\d:\d\d:\d\d\s+\d+/ } split /\n/, $output;
-   my $colno = $checksum_result_col{lc $column};
-   die "Invalid checksum result column: $column" unless defined $colno;
-   my $total = 0;
-   map { $total += $_->[$colno] } @res;
-   return $total;
-}
-
-sub normalize_checksum_results {
-   my ($output) = @_;
-   my $tmp_file = "/tmp/test-checksum-results-output";
-   open my $fh, ">", $tmp_file or die "Cannot open $tmp_file: $OS_ERROR";
-   printf $fh $output;
-   close $fh;
-   my $normal_output = `cat $tmp_file | awk '/^[0-9 ]/ {print \$2 " " \$3 " " \$4 " " \$5 " " \$6 " " \$7 " " \$9} /^[A-Z]/ {print \$0}'`;
-   `rm $tmp_file >/dev/null`;
-   return $normal_output;
-}
-
-sub get_source_binlog_pos {
-   my ($dbh) = @_;
-
-   my $vp = VersionParser->new($dbh);
-   my $source_name = 'source';
-   if ( $vp->cmp('8.1') < 0 || $vp->flavor() =~ m/maria/i ) {
-      $source_name = 'master';
-   }
-
-   my $sql = "SHOW ${source_name} STATUS";
-   my $ms  = $dbh->selectrow_hashref($sql);
-   return $ms->{position};
-}
-
-sub get_slave_pos_relative_to_source {
-   my ($dbh) = @_;
-   my $sql = "SHOW SLAVE STATUS";
-   my $ss  = $dbh->selectrow_hashref($sql);
-   return $ss->{exec_source_log_pos};
-}
-
-# Like output(), but forks a process to execute the coderef.
-# This is because otherwise, errors thrown during cleanup
-# would be skipped.
-sub full_output {
-   my ( $code, %args ) = @_;
-   die "I need a code argument" unless $code;
-
-   local (*STDOUT, *STDERR);
-   require IO::File;
-
-   my (undef, $file) = tempfile();
-   open *STDOUT, '>', $file
-         or die "Cannot open file $file: $OS_ERROR";
-   *STDOUT->autoflush(1);
-
-   my (undef, $file2) = tempfile();
-   open *STDERR, '>', $file2
-      or die "Cannot open file $file2: $OS_ERROR";
-   *STDERR->autoflush(1);
-
-   my $status;
-   if (my $pid = fork) {
-      if ( my $t = $args{wait_for} ) {
-         # Wait for t seconds then kill the child.
-         sleep $t;
-         my $tries = 3;
-         # Most tools require 2 interrupts to make them stop.
-         while ( kill(0, $pid) && $tries-- ) {
-            kill SIGTERM, $pid;
-            sleep 0.10;
-         }
-         # Child didn't respond to SIGTERM?  Then kill -9 it.
-         kill SIGKILL, $pid if kill(0, $pid);
-         sleep 0.25;
-      }
-      waitpid($pid, 0);
-      $status = $? >> 8;
-   }
-   else {
-      exit $code->();
-   }
-   close $_ or die "Cannot close $_: $OS_ERROR" for qw(STDOUT STDERR);
-   my $output = slurp_file($file) . slurp_file($file2);
-
-   unlink $file;
-   unlink $file2;
-
-   return ($output, $status);
-}
-
-sub tables_used {
-   my ($file) = @_;
-   local $INPUT_RECORD_SEPARATOR = '';
-   open my $fh, '<', $file or die "Cannot open $file: $OS_ERROR";
-   my %tables;
-   while ( defined(my $chunk = <$fh>) ) {
-      map {
-         my $db_tbl = $_;
-         $db_tbl =~ s/^\s*`?//;  # strip leading space and `
-         $db_tbl =~ s/\s*`?$//;  # strip trailing space and `
-         $db_tbl =~ s/`\.`/./;   # strip inner `.`
-         $tables{$db_tbl} = 1;
-      }
-      grep {
-         m/(?:\w\.\w|`\.`)/  # only db.tbl, not just db
-      }
-      $chunk =~ m/(?:FROM|INTO|UPDATE)\s+(\S+)/gi;
-   }
-   return [ sort keys %tables ];
-}
-
-sub can_load_data {
-    my $output = `/tmp/12345/use -e "SELECT * FROM percona_test.load_data" 2>/dev/null`;
-    return ($output || '') =~ /1/;
-}
-
-sub _d {
-   my ($package, undef, $line) = caller 0;
-   @_ = map { (my $temp = $_) =~ s/\n/\n# /g; $temp; }
-        map { defined $_ ? $_ : 'undef' }
-        @_;
-   print STDERR "# $package:$line $PID ", join(' ', @_), "\n";
-}
-
-1;
-}
-# ###########################################################################
-# End PerconaTest package
-# ###########################################################################
diff --git a/lib/Percona/XtraDB/Cluster.pm b/lib/Percona/XtraDB/Cluster.pm
index 4b57bd6e7..17c7a0d15 100644
--- a/lib/Percona/XtraDB/Cluster.pm
+++ b/lib/Percona/XtraDB/Cluster.pm
@@ -190,31 +190,31 @@ sub autodetect_nodes {
       seen_ids => $seen_ids
    );
 
-   my $new_slaves = [];
+   my $new_replicas = [];
    foreach my $node (@$new_nodes) {
-      my $node_slaves = $ms->get_slaves(
+      my $node_replicas = $ms->get_replicas(
          dbh      => $node->dbh(),
          dsn      => $node->dsn(),
          make_cxn => $make_cxn,
       );
-      push @$new_slaves, @$node_slaves;
+      push @$new_replicas, @$node_replicas;
    }
 
-   $new_slaves = $self->remove_duplicate_cxns(
-      cxns     => $new_slaves,
+   $new_replicas = $self->remove_duplicate_cxns(
+      cxns     => $new_replicas,
       seen_ids => $seen_ids
    );
 
-   # If some of the new slaves is a cluster node, autodetect new nodes
+   # If some of the new replicas is a cluster node, autodetect new nodes
    # from there too.
-   my @new_slave_nodes = grep { $self->is_cluster_node($_) } @$new_slaves;
+   my @new_replica_nodes = grep { $self->is_cluster_node($_) } @$new_replicas;
 
-   my $slaves_of_slaves = $self->autodetect_nodes(
+   my $replicas_of_replicas = $self->autodetect_nodes(
          %args,
-         nodes => \@new_slave_nodes,
+         nodes => \@new_replica_nodes,
    );
 
-   my @autodetected_nodes = ( @$new_nodes, @$new_slaves, @$slaves_of_slaves );
+   my @autodetected_nodes = ( @$new_nodes, @$new_replicas, @$replicas_of_replicas );
    return \@autodetected_nodes;
 }
 
diff --git a/lib/PerconaTest.pm b/lib/PerconaTest.pm
index d86399d81..3a211672c 100644
--- a/lib/PerconaTest.pm
+++ b/lib/PerconaTest.pm
@@ -54,7 +54,7 @@ our @EXPORT      = qw(
    parse_file
    wait_until
    wait_for
-   wait_until_slave_running
+   wait_until_replica_running
    test_log_parser
    test_protocol_parser
    test_packet_parser
@@ -774,7 +774,7 @@ sub get_source_binlog_pos {
    return $ms->{position};
 }
 
-sub get_slave_pos_relative_to_source {
+sub get_replica_pos_relative_to_source {
    my ($dbh) = @_;
 
    my $vp = VersionParser->new($dbh);
diff --git a/lib/QueryRewriter.pm b/lib/QueryRewriter.pm
index c92dccd25..e8ae6a183 100644
--- a/lib/QueryRewriter.pm
+++ b/lib/QueryRewriter.pm
@@ -274,7 +274,7 @@ sub distill_verbs {
    $query = $self->strip_comments($query);
 
    # SHOW statements are either 2 or 3 words: SHOW A (B), where A and B
-   # are words; B is optional.  E.g. "SHOW TABLES" or "SHOW SLAVE STATUS".
+   # are words; B is optional.  E.g. "SHOW TABLES" or "SHOW REPLICA STATUS".
    # There's a few common keywords that may show up in place of A, so we
    # remove them first.  Then there's some keywords that signify extra clauses
    # that may show up in place of B and since these clauses are at the
diff --git a/lib/ReplicaLagWaiter.pm b/lib/ReplicaLagWaiter.pm
index 47cec6846..c5e24d172 100644
--- a/lib/ReplicaLagWaiter.pm
+++ b/lib/ReplicaLagWaiter.pm
@@ -19,7 +19,7 @@
 # ###########################################################################
 {
 # Package: ReplicaLagWaiter
-# ReplicaLagWaiter helps limit slave lag when working on the source.
+# ReplicaLagWaiter helps limit replica lag when working on the source.
 package ReplicaLagWaiter;
 
 use strict;
@@ -34,16 +34,16 @@ use Data::Dumper;
 #
 # Required Arguments:
 #   oktorun - Callback that returns true if it's ok to continue running
-#   get_lag - Callback passed slave dbh and returns slave's lag
+#   get_lag - Callback passed replica dbh and returns replica's lag
 #   sleep   - Callback to sleep between checking lag.
 #   max_lag - Max lag
-#   slaves  - Arrayref of <Cxn> objects
+#   replicas  - Arrayref of <Cxn> objects
 #
 # Returns:
 #   ReplicaLagWaiter object
 sub new {
    my ( $class, %args ) = @_;
-   my @required_args = qw(oktorun get_lag sleep max_lag slaves);
+   my @required_args = qw(oktorun get_lag sleep max_lag replicas);
    foreach my $arg ( @required_args ) {
       die "I need a $arg argument" unless defined $args{$arg};
    }
@@ -56,13 +56,13 @@ sub new {
 }
 
 # Sub: wait
-#   Wait for Seconds_Behind_Source on all slaves to become < max.
+#   Wait for Seconds_Behind_Source on all replicas to become < max.
 #
 # Optional Arguments:
 #   Progress - <Progress> object to report waiting
 #
 # Returns:
-#   1 if all slaves catch up before timeout, else 0 if continue=yes, else die.
+#   1 if all replicas catch up before timeout, else 0 if continue=yes, else die.
 sub wait {
    my ( $self, %args ) = @_;
    my @required_args = qw();
@@ -71,34 +71,34 @@ sub wait {
    }
    my $pr = $args{Progress};
 
-   my $oktorun = $self->{oktorun};
-   my $get_lag = $self->{get_lag};
-   my $sleep   = $self->{sleep};
-   my $slaves  = $self->{slaves};
-   my $max_lag = $self->{max_lag};
+   my $oktorun  = $self->{oktorun};
+   my $get_lag  = $self->{get_lag};
+   my $sleep    = $self->{sleep};
+   my $replicas = $self->{replicas}; 
+   my $max_lag  = $self->{max_lag};
 
-   my $worst;  # most lagging slave
+   my $worst;  # most lagging replica
    my $pr_callback;
    my $pr_first_report;
 
-   ### refresh list of slaves. In: self passed to wait()
-   ### Returns: new slave list
-   my $pr_refresh_slave_list = sub {
+   ### refresh list of replicas. In: self passed to wait()
+   ### Returns: new replica list
+   my $pr_refresh_replica_list = sub {
       my ($self) = @_;
-      my ($slaves, $refresher) = ($self->{slaves}, $self->{get_slaves_cb});
-      return $slaves if ( not defined $refresher );
-      my $before = join ' ', sort map {$_->description()} @$slaves;
-      $slaves = $refresher->();
-      my $after = join ' ', sort map {$_->description()} @$slaves;
+      my ($replicas, $refresher) = ($self->{replicas}, $self->{get_replicas_cb});
+      return $replicas if ( not defined $refresher );
+      my $before = join ' ', sort map {$_->description()} @$replicas;
+      $replicas = $refresher->();
+      my $after = join ' ', sort map {$_->description()} @$replicas;
       if ($before ne $after) {
-         $self->{slaves} = $slaves;
-         printf STDERR "Slave set to watch has changed\n  Was: %s\n  Now: %s\n",
+         $self->{replicas} = $replicas;
+         printf STDERR "Replica set to watch has changed\n  Was: %s\n  Now: %s\n",
             $before, $after;
       }
-      return($self->{slaves});
+      return($self->{replicas});
    };
 
-   $slaves = $pr_refresh_slave_list->($self);
+   $replicas = $pr_refresh_replica_list->($self);
 
    if ( $pr ) {
       # If you use the default Progress report callback, you'll need to
@@ -136,54 +136,54 @@ sub wait {
       };
    }
 
-   # First check all slaves.
-   my @lagged_slaves = map { {cxn=>$_, lag=>undef} } @$slaves;
-   while ( $oktorun->() && @lagged_slaves ) {
-      PTDEBUG && _d('Checking slave lag');
+   # First check all replicas.
+   my @lagged_replicas = map { {cxn=>$_, lag=>undef} } @$replicas;
+   while ( $oktorun->() && @lagged_replicas ) {
+      PTDEBUG && _d('Checking replica lag');
 
-      ### while we were waiting our list of slaves may have changed
-      $slaves = $pr_refresh_slave_list->($self);
+      ### while we were waiting our list of replicas may have changed
+      $replicas = $pr_refresh_replica_list->($self);
       my $watched = 0;
-      @lagged_slaves = grep {
-         my $slave_name = $_->{cxn}->name();
-         grep {$slave_name eq $_->name()} @{$slaves // []}
-                            } @lagged_slaves;
+      @lagged_replicas = grep {
+         my $replica_name = $_->{cxn}->name();
+         grep {$replica_name eq $_->name()} @{$replicas // []}
+                            } @lagged_replicas;
 
-      for my $i ( 0..$#lagged_slaves ) {
+      for my $i ( 0..$#lagged_replicas ) {
          my $lag;
          eval {
-             $lag = $get_lag->($lagged_slaves[$i]->{cxn});
+             $lag = $get_lag->($lagged_replicas[$i]->{cxn});
          };
          if ($EVAL_ERROR) {
              die $EVAL_ERROR;
          }
-         PTDEBUG && _d($lagged_slaves[$i]->{cxn}->name(),
-            'slave lag:', $lag);
+         PTDEBUG && _d($lagged_replicas[$i]->{cxn}->name(),
+            'replica lag:', $lag);
          if ( !defined $lag || $lag > $max_lag ) {
-            $lagged_slaves[$i]->{lag} = $lag;
+            $lagged_replicas[$i]->{lag} = $lag;
          }
          else {
-            delete $lagged_slaves[$i];
+            delete $lagged_replicas[$i];
          }
       }
 
-      # Remove slaves that aren't lagging.
-      @lagged_slaves = grep { defined $_ } @lagged_slaves;
-      if ( @lagged_slaves ) {
-         # Sort lag, undef is highest because it means the slave is stopped.
-         @lagged_slaves = reverse sort {
+      # Remove replicas that aren't lagging.
+      @lagged_replicas = grep { defined $_ } @lagged_replicas;
+      if ( @lagged_replicas ) {
+         # Sort lag, undef is highest because it means the replica is stopped.
+         @lagged_replicas = reverse sort {
               defined $a->{lag} && defined $b->{lag} ? $a->{lag} <=> $b->{lag}
             : defined $a->{lag}                      ? -1
             :                                           1;
-         } @lagged_slaves;
-         $worst = $lagged_slaves[0];
-         PTDEBUG && _d(scalar @lagged_slaves, 'slaves are lagging, worst:',
+         } @lagged_replicas;
+         $worst = $lagged_replicas[0];
+         PTDEBUG && _d(scalar @lagged_replicas, 'replicas are lagging, worst:',
             $worst->{lag}, 'on', Dumper($worst->{cxn}->dsn()));
 
          if ( $pr ) {
             # There's no real progress because we can't estimate how long
-            # it will take all slaves to catch up.  The progress reports
-            # are just to inform the user every 30s which slave is still
+            # it will take all replicas to catch up.  The progress reports
+            # are just to inform the user every 30s which replica is still
             # lagging this most.
             $pr->update(
                sub { return 0; },
@@ -196,7 +196,7 @@ sub wait {
       }
    }
 
-   PTDEBUG && _d('All slaves caught up');
+   PTDEBUG && _d('All replicas caught up');
    return;
 }
 
diff --git a/lib/Safeguards.pm b/lib/Safeguards.pm
deleted file mode 100644
index 1cee49afb..000000000
--- a/lib/Safeguards.pm
+++ /dev/null
@@ -1,94 +0,0 @@
-# This program is copyright 2013 Percona Ireland Ltd.
-# Feedback and improvements are welcome.
-#
-# THIS PROGRAM IS PROVIDED "AS IS" AND WITHOUT ANY EXPRESS OR IMPLIED
-# WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
-# MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
-#
-# This program is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License as published by the Free Software
-# Foundation, version 2; OR the Perl Artistic License.  On UNIX and similar
-# systems, you can issue `man perlgpl' or `man perlartistic' to read these
-# licenses.
-#
-# You should have received a copy of the GNU General Public License along with
-# this program; if not, write to the Free Software Foundation, Inc., 59 Temple
-# Place, Suite 330, Boston, MA  02111-1307  USA.
-# ###########################################################################
-# Safeguards package
-# ###########################################################################
-package Safeguards;
-
-use strict;
-use warnings FATAL => 'all';
-use English qw(-no_match_vars);
-
-use constant PTDEBUG => $ENV{PTDEBUG} || 0;
-
-sub new {
-   my ($class, %args) = @_;
-   my $self = {
-      disk_bytes_free => $args{disk_bytes_free} || 104857600,  # 100 MiB
-      disk_pct_free   => $args{disk_pct_free}   || 5,
-   };
-   return bless $self, $class;
-}
-
-sub get_disk_space {
-   my ($self, %args) = @_;
-   my $filesystem = $args{filesystem} || $ENV{PWD};
-
-   # Filesystem   1024-blocks     Used Available Capacity  Mounted on
-   # /dev/disk0s2   118153176 94409664  23487512    81%    /
-   my $disk_space = `df -P -k "$filesystem"`;
-   chop($disk_space) if $disk_space;
-   PTDEBUG && _d('Disk space on', $filesystem, $disk_space);
-
-   return $disk_space;
-}
-
-sub check_disk_space() {
-   my ($self, %args) = @_;
-   my $disk_space = $args{disk_space};
-   PTDEBUG && _d("Checking disk space:\n", $disk_space);
-
-   # There may be other info, so extract just the partition line,
-   # i.e. the first line starting with /, as in:
-   #   Filesystem   1024-blocks     Used Available Capacity  Mounted on
-   #   /dev/disk0s2   118153176 94409664  23487512    81%    /
-   my ($partition) = $disk_space =~ m/^\s*(\/.+)/m;
-   PTDEBUG && _d('Partition:', $partition);
-   die "Failed to parse partition from disk space:\n$disk_space"
-      unless $partition;
-
-   # Parse the partition line.
-   my (undef, undef, $bytes_used, $bytes_free, $pct_used, undef)
-      = $partition =~ m/(\S+)/g;
-   PTDEBUG && _d('Bytes used:', $bytes_used, 'free:', $bytes_free,
-      'Percentage used:', $pct_used);
-
-   # Convert 1024-blocks blocks to bytes.
-   $bytes_used = ($bytes_used || 0) * 1024;
-   $bytes_free = ($bytes_free || 0) * 1024;
-
-   # Convert pct used to free.
-   $pct_used =~ s/%//;
-   my $pct_free = 100 - ($pct_used || 0);
-
-   # Return true if both thresholds are ok.
-   return $bytes_free >= $self->{disk_bytes_free}
-       && $pct_free   >= $self->{disk_pct_free};
-}
-
-sub _d {
-   my ($package, undef, $line) = caller 0;
-   @_ = map { (my $temp = $_) =~ s/\n/\n# /g; $temp; }
-        map { defined $_ ? $_ : 'undef' }
-        @_;
-   print STDERR "# $package:$line $PID ", join(' ', @_), "\n";
-}
-
-1;
-# ###########################################################################
-# End Safeguards package
-# ###########################################################################
diff --git a/lib/Sandbox.pm b/lib/Sandbox.pm
index 24403b1cd..93c2a2058 100644
--- a/lib/Sandbox.pm
+++ b/lib/Sandbox.pm
@@ -171,7 +171,7 @@ sub load_file {
    if ( $? >> 8 ) {
       die "Failed to execute $file on $server: $out";
    }
-   $self->wait_for_slaves() unless $args{no_wait};
+   $self->wait_for_replicas() unless $args{no_wait};
 }
 
 sub _use_for {
@@ -211,7 +211,7 @@ sub wipe_clean {
       $dbh->do("DROP DATABASE IF EXISTS `$db`");
    }
 
-   $self->wait_for_slaves();
+   $self->wait_for_replicas();
 
    $self->clear_genlogs();
    return;
@@ -229,18 +229,18 @@ sub source_is_ok {
 }
 
 # Returns a string if there is a problem with the replica.
-sub slave_is_ok {
-   my ($self, $slave, $source, $ro) = @_;
-   return if $self->is_cluster_node($slave);
-   PTDEBUG && _d('Checking if replica', $slave, $port_for{$slave},
+sub replica_is_ok {
+   my ($self, $replica, $source, $ro) = @_;
+   return if $self->is_cluster_node($replica);
+   PTDEBUG && _d('Checking if replica', $replica, $port_for{$replica},
       'to', $source, $port_for{$source}, 'is ok');
 
-   my $slave_dbh = $self->get_dbh_for($slave);
-   if ( !$slave_dbh ) {
-      return  "Sandbox $slave " . $port_for{$slave} . " is down.";
+   my $replica_dbh = $self->get_dbh_for($replica);
+   if ( !$replica_dbh ) {
+      return  "Sandbox $replica " . $port_for{$replica} . " is down.";
    }
 
-   my $vp = VersionParser->new($slave_dbh);
+   my $vp = VersionParser->new($replica_dbh);
    my $replica_name = 'replica';
    my $source_name = 'source';
    if ( $vp->cmp('8.1') < 0 || $vp->flavor() =~ m/maria/i ) {
@@ -248,31 +248,31 @@ sub slave_is_ok {
       $source_name = 'master';
    }
    my $source_port = $port_for{$source};
-   my $status = $slave_dbh->selectall_arrayref(
+   my $status = $replica_dbh->selectall_arrayref(
       "SHOW ${replica_name} STATUS", { Slice => {} });
    if ( !$status || !@$status ) {
-      return "Sandbox $slave " . $port_for{$slave} . " is not a replica.";
+      return "Sandbox $replica " . $port_for{$replica} . " is not a replica.";
    }
 
    if ( $status->[0]->{last_error} ) {
       warn Dumper($status);
-      return "Sandbox $slave " . $port_for{$slave} . " is broken: "
+      return "Sandbox $replica " . $port_for{$replica} . " is broken: "
          . $status->[0]->{last_error} . ".";
    }
 
    foreach my $thd ( "${replica_name}_io_running", "${replica_name}_sql_running" ) {
       if ( ($status->[0]->{$thd} || 'No') eq 'No' ) {
          warn Dumper($status);
-         return "Sandbox $slave " . $port_for{$slave} . " $thd thread "
+         return "Sandbox $replica " . $port_for{$replica} . " $thd thread "
             . "is not running.";
       }
    }
 
    if ( $ro ) {
-      my $row = $slave_dbh->selectrow_arrayref(
+      my $row = $replica_dbh->selectrow_arrayref(
          "SHOW VARIABLES LIKE 'read_only'");
       if ( !$row || $row->[1] ne 'ON' ) {
-         return "Sandbox $slave " . $port_for{$slave} . " is not read-only.";
+         return "Sandbox $replica " . $port_for{$replica} . " is not read-only.";
       }
    }
 
@@ -283,16 +283,16 @@ sub slave_is_ok {
       PTDEBUG && _d('Replica lag:', $status->[0]->{"seconds_behind_${source_name}"});
       sleep $sleep_t;
       $total_t += $sleep_t;
-      $status = $slave_dbh->selectall_arrayref(
+      $status = $replica_dbh->selectall_arrayref(
          "SHOW ${replica_name} STATUS", { Slice => {} });
       if ( $total_t == 5 ) {
-         Test::More::diag("Waiting for sandbox $slave " . $port_for{$slave}
+         Test::More::diag("Waiting for sandbox $replica " . $port_for{$replica}
             . " to catch up...");
       }
    }
 
-   PTDEBUG && _d('Slave', $slave, $port_for{$slave}, 'is ok');
-   $slave_dbh->disconnect();
+   PTDEBUG && _d('Replica', $replica, $port_for{$replica}, 'is ok');
+   $replica_dbh->disconnect();
    return;
 }
 
@@ -331,10 +331,10 @@ sub ok {
    my ($self) = @_;
    my @errors;
    # First, wait for all replicas to be caught up to their sources.
-   $self->wait_for_slaves();
+   $self->wait_for_replicas();
    push @errors, $self->source_is_ok('source');
-   push @errors, $self->slave_is_ok('replica1', 'source');
-   push @errors, $self->slave_is_ok('replica2', 'replica1', 1);
+   push @errors, $self->replica_is_ok('replica1', 'source');
+   push @errors, $self->replica_is_ok('replica2', 'replica1', 1);
    push @errors, $self->leftover_servers();
    foreach my $host ( qw(source replica1 replica2) ) {
       push @errors, $self->leftover_databases($host);
@@ -346,16 +346,16 @@ sub ok {
 }
 
 # Dings a heartbeat on the source, and waits until the replica catches up fully.
-sub wait_for_slaves {
+sub wait_for_replicas {
    my ($self, %args) = @_;
    my $source_dbh = $self->get_dbh_for($args{source} || 'source');
-   my $slave2_dbh = $self->get_dbh_for($args{replica}  || 'replica2');
+   my $replica2_dbh = $self->get_dbh_for($args{replica}  || 'replica2');
    my ($ping) = $source_dbh->selectrow_array("SELECT MD5(RAND())");
-   $source_dbh->do("UPDATE percona_test.sentinel SET ping='$ping' WHERE id=1 /* wait_for_slaves */");
+   $source_dbh->do("UPDATE percona_test.sentinel SET ping='$ping' WHERE id=1 /* wait_for_replicas */");
    PerconaTest::wait_until(
       sub {
-         my ($pong) = $slave2_dbh->selectrow_array(
-            "SELECT ping FROM percona_test.sentinel WHERE id=1 /* wait_for_slaves */");
+         my ($pong) = $replica2_dbh->selectrow_array(
+            "SELECT ping FROM percona_test.sentinel WHERE id=1 /* wait_for_replicas */");
          return $ping eq ($pong || '');
       }, undef, 300
    );
@@ -469,7 +469,7 @@ sub can_load_data {
     return ($output || '') =~ /1/;
 }
 
-sub set_as_slave {
+sub set_as_replica {
    my ($self, $server, $source_server, @extras) = @_;
    PTDEBUG && _d("Setting $server as replica of $source_server");
 
diff --git a/lib/TableSyncer.pm b/lib/TableSyncer.pm
index 7c2cd5196..8fb10b797 100644
--- a/lib/TableSyncer.pm
+++ b/lib/TableSyncer.pm
@@ -255,12 +255,12 @@ sub sync_table {
             $dst_sql .= ' FOR UPDATE';
          }
          elsif ( $args{changing_src} ) {
-            # Making changes on source (src) which replicate to slave (dst).
+            # Making changes on source (src) which replicate to replica (dst).
             $src_sql .= ' FOR UPDATE';
             $dst_sql .= ' LOCK IN SHARE MODE';
          }
          else {
-            # Making changes on slave (dst).
+            # Making changes on replica (dst).
             $src_sql .= ' LOCK IN SHARE MODE';
             $dst_sql .= ' FOR UPDATE';
          }
@@ -449,7 +449,7 @@ sub unlock {
 #   3 => global
 # This function might actually execute the $src_sth.  If we're using
 # transactions instead of table locks, the $src_sth has to be executed before
-# the SOURCE_POS_WAIT() on the slave.  The return value is whether the
+# the SOURCE_POS_WAIT() on the replica.  The return value is whether the
 # $src_sth was executed.
 sub lock_and_wait {
    my ( $self, %args ) = @_;
@@ -478,7 +478,7 @@ sub lock_and_wait {
    }
 
    # User wants us to lock for consistency.  But lock only on source initially;
-   # might have to wait for the slave to catch up before locking on the dest.
+   # might have to wait for the replica to catch up before locking on the dest.
    if ( $args{lock} == 3 ) {
       my $sql = 'FLUSH TABLES WITH READ LOCK';
       PTDEBUG && _d($src->{dbh}, $sql);
@@ -531,32 +531,32 @@ sub lock_and_wait {
                # $src_sth.
                $wait = $ms->wait_for_source(
                   source_status => $ms->get_source_status($src->{misc_dbh}),
-                  slave_dbh     => $dst->{dbh},
+                  replica_dbh     => $dst->{dbh},
                   timeout       => $timeout,
                );
                if ( defined $wait->{result} && $wait->{result} != -1 ) {
-                  return;  # slave caught up
+                  return;  # replica caught up
                }
                die; # call fail
             },
             fail => sub {
                my (%args) = @_;
                if ( !defined $wait->{result} ) {
-                  # Slave was stopped either before or during the wait.
+                  # Replica was stopped either before or during the wait.
                   # Wait a few seconds and try again in hopes that the
-                  # slave is restarted.  This is the only case for which
-                  # we wait and retry because the slave might have been
+                  # replica is restarted.  This is the only case for which
+                  # we wait and retry because the replica might have been
                   # stopped temporarily and/or unbeknownst to the user,
-                  # so they'll be happy if we wait for slave to be restarted
+                  # so they'll be happy if we wait for replica to be restarted
                   # and then continue syncing.
                   my $msg;
                   if ( $wait->{waited}  ) {
-                     $msg = "The slave was stopped while waiting with "
+                     $msg = "The replica was stopped while waiting with "
                           . "SOURCE_POS_WAIT().";
                   }
                   else {
                      $msg = "SOURCE_POS_WAIT() returned NULL.  Verify that "
-                          . "the slave is running.";
+                          . "the replica is running.";
                   }
                   if ( $tries - $args{tryno} ) {
                      $msg .= "  Sleeping $sleep seconds then retrying "
@@ -572,9 +572,9 @@ sub lock_and_wait {
                }
             },
             final_fail => sub {
-               die "Slave did not catch up to its source after $tries attempts "
+               die "Replica did not catch up to its source after $tries attempts "
                   . "of waiting $timeout seconds with SOURCE_POS_WAIT.  "
-                  . "Check that the slave is running, increase the --wait "
+                  . "Check that the replica is running, increase the --wait "
                   . "time, or disable this feature by specifying --wait 0.";
             },
          );  # retry MasterSlave::wait_for_source()
diff --git a/lib/VariableAdvisorRules.pm b/lib/VariableAdvisorRules.pm
index dcbace9b8..5ac4c88d8 100644
--- a/lib/VariableAdvisorRules.pm
+++ b/lib/VariableAdvisorRules.pm
@@ -129,6 +129,13 @@ sub get_rules {
          return $args{variables}->{init_slave} ? 1 : 0;
       },
    },
+   {
+      id   => 'init_replica',
+      code => sub {
+         my ( %args ) = @_;
+         return $args{variables}->{init_replica} ? 1 : 0;
+      },
+   },
    {
       id   => 'innodb_additional_mem_pool_size',
       code => sub {
@@ -375,6 +382,13 @@ sub get_rules {
          return _var_gt($args{variables}->{slave_net_timeout}, 60);
       },
    },
+   {
+      id   => 'replica_net_timeout',
+      code => sub {
+         my ( %args ) = @_;
+         return _var_gt($args{variables}->{replica_net_timeout}, 60);
+      },
+   },
    {
       id   => 'slave_skip_errors',
       code => sub {
@@ -383,6 +397,14 @@ sub get_rules {
              && $args{variables}->{slave_skip_errors} ne 'OFF' ? 1 : 0;
       },
    },
+   {
+      id   => 'replica_skip_errors',
+      code => sub {
+         my ( %args ) = @_;
+         return $args{variables}->{replica_skip_errors}
+             && $args{variables}->{replica_skip_errors} ne 'OFF' ? 1 : 0;
+      },
+   },
    {
       id   => 'sort_buffer_size-1',
       code => sub {
diff --git a/lib/bash/collect.sh b/lib/bash/collect.sh
index 81cf93a33..44b039ebb 100644
--- a/lib/bash/collect.sh
+++ b/lib/bash/collect.sh
@@ -301,7 +301,11 @@ collect_mysql_data_loop() {
       (echo $ts; ps_prepared_statements "$d/prepared_statements.isrunnning") >> "$d/$p-prepared-statements" &
    fi
 
-   slave_status "$d/$p-slave-status" "${mysql_version}"
+   local replica_name='replica'
+   if [ "${mysql_version}" '<' "8.1" ]; then
+      replica_name="slave"
+   fi
+   replica_status "$d/$p-${replica_name}-status" "${mysql_version}"
 }
 
 collect_system_data_loop() {
@@ -600,14 +604,13 @@ ps_prepared_statements() {
    fi
 }
 
-slave_status() {
+replica_status() {
    local outfile=$1
    local mysql_version=$2
 
+   local sql="SHOW REPLICA STATUS\G"
    if [ "${mysql_version}" '<' "8.1" ]; then
-      local sql="SHOW SLAVE STATUS\G"
-   else
-      local sql="SHOW REPLICA STATUS\G"
+      sql="SHOW SLAVE STATUS\G"
    fi
 
    echo -e "\n$sql\n" >> $outfile
diff --git a/lib/bash/collect_mysql_info.sh b/lib/bash/collect_mysql_info.sh
index b2370d681..4b8c065d8 100644
--- a/lib/bash/collect_mysql_info.sh
+++ b/lib/bash/collect_mysql_info.sh
@@ -116,8 +116,10 @@ collect_mysql_plugins () {
    $CMD_MYSQL $EXT_ARGV -ss -e 'SHOW PLUGINS' 2>/dev/null
 }
 
-collect_mysql_slave_status () {
-   $CMD_MYSQL $EXT_ARGV -ssE -e 'SHOW SLAVE STATUS' 2>/dev/null
+collect_mysql_replica_status () {
+   local replica_name="$1"
+
+   $CMD_MYSQL $EXT_ARGV -ssE -e "SHOW ${replica_name} STATUS" 2>/dev/null
 }
 
 collect_mysql_innodb_status () {
@@ -146,8 +148,15 @@ collect_mysql_roles () {
    $CMD_MYSQL $EXT_ARGV -ss -e "$QUERY" 2>/dev/null
 }
 
-collect_mysql_show_slave_hosts () {
-   $CMD_MYSQL $EXT_ARGV -ssE -e 'SHOW SLAVE HOSTS' 2>/dev/null
+collect_mysql_show_replica_hosts () {
+   local version="$1"
+
+   local replicas='replicas'
+   if [ "$version" '<' "8.1" ]; then
+      replicas='slave hosts'
+   fi
+
+   $CMD_MYSQL $EXT_ARGV -ssE -e "SHOW ${replicas}" 2>/dev/null
 }
 
 collect_source_logs_status () {
@@ -299,7 +308,6 @@ collect_mysql_info () {
    collect_mysql_status        > "$dir/mysql-status"
    collect_mysql_databases     > "$dir/mysql-databases"
    collect_mysql_plugins       > "$dir/mysql-plugins"
-   collect_mysql_slave_status  > "$dir/mysql-slave"
    collect_mysql_innodb_status > "$dir/innodb-status"
    collect_mysql_ndb_status    > "$dir/ndb-status"
    collect_mysql_processlist   > "$dir/mysql-processlist"
@@ -307,11 +315,19 @@ collect_mysql_info () {
    collect_mysql_roles         > "$dir/mysql-roles"
    collect_keyring_plugins     > "$dir/keyring-plugins"
 
+   local mysql_version="$(get_var version "$dir/mysql-variables")"
+
+   local replicas='replicas'
+   local replica_name='replica'
+   if [ "$mysql_version" '<' "8.1" ]; then
+      replicas='slave-hosts'
+      replica_name='slave'
+   fi
+
+   collect_mysql_replica_status $replica_name > "$dir/mysql-${replica_name}"
    collect_mysqld_instances   "$dir/mysql-variables"  > "$dir/mysqld-instances"
    collect_mysqld_executables "$dir/mysqld-instances" > "$dir/mysqld-executables"
-   collect_mysql_show_slave_hosts  "$dir/mysql-slave-hosts" > "$dir/mysql-slave-hosts"
-
-   local mysql_version="$(get_var version "$dir/mysql-variables")"
+   collect_mysql_show_replica_hosts "$mysql_version" > "$dir/mysql-${replicas}"
 
    local binlog="$(get_var log_bin "$dir/mysql-variables")"
    if [ "${binlog}" ]; then
diff --git a/lib/bash/report_mysql_info.sh b/lib/bash/report_mysql_info.sh
index 0f56b7246..a2d04390e 100644
--- a/lib/bash/report_mysql_info.sh
+++ b/lib/bash/report_mysql_info.sh
@@ -924,6 +924,7 @@ format_overall_db_stats () {
 
 section_percona_server_features () {
    local file="$1"
+   replica_name="$2"
 
    [ -e "$file" ] || return
 
@@ -952,7 +953,7 @@ section_percona_server_features () {
    name_val "Enhanced Logging"      \
             "$(feat_on "$file" log_slow_verbosity ne microtime)"
    name_val "Replica Perf Logging"  \
-            "$(feat_on "$file" log_slow_slave_statements)"
+            "$(feat_on "$file" log_slow_${replica_name}_statements)"
 
    # Renamed to query_response_time_stats in 5.5
    name_val "Response Time Hist."   \
@@ -1108,7 +1109,7 @@ section_noteworthy_variables () {
       name_val "${v}" "$(shorten $(get_var ${v} "$file") 0)"
    done
    for v in log log_error log_warnings log_slow_queries \
-         log_queries_not_using_indexes log_slave_updates;
+         log_queries_not_using_indexes log_${replica_name}_updates;
    do
       name_val "${v}" "$(get_var ${v} "$file")"
    done
@@ -1120,6 +1121,7 @@ section_noteworthy_variables () {
 _semi_sync_stats_for () {
    local target="$1"
    local file="$2"
+   local replica_name="$3"
 
    [ -e "$file" ] || return
 
@@ -1147,8 +1149,8 @@ _semi_sync_stats_for () {
    if [ "${target}" = "source" ] || [ "${target}" = "master" ]; then
       name_val "${target} timeout in milliseconds" \
                "$(get_var "rpl_semi_sync_${target}_timeout" "${file}")"
-      name_val "${target} waits for slaves"        \
-               "$(get_var "rpl_semi_sync_${target}_wait_no_slave" "${file}")"
+      name_val "${target} waits for ${replica_name}s"        \
+               "$(get_var "rpl_semi_sync_${target}_wait_no_${replica_name}" "${file}")"
 
       _d "Prepend Rpl_semi_sync_${target}_ to the following"
       for v in                                              \
@@ -1182,7 +1184,7 @@ noncounters_pattern () {
       Not_flushed_delayed_rows Open_files Open_streams Open_tables \
       Prepared_stmt_count Qcache_free_blocks Qcache_free_memory \
       Qcache_queries_in_cache Qcache_total_blocks Rpl_status \
-      Slave_open_temp_tables Slave_running Ssl_cipher Ssl_cipher_list \
+      Slave_open_temp_tables Slave_running Replica_open_temp_tables Ssl_cipher Ssl_cipher_list \
       Ssl_ctx_verify_depth Ssl_ctx_verify_mode Ssl_default_timeout \
       Ssl_session_cache_mode Ssl_session_cache_size Ssl_verify_depth \
       Ssl_verify_mode Ssl_version Tc_log_max_pages_used Tc_log_page_size \
@@ -1213,16 +1215,17 @@ section_mysqld () {
    done < "$executables_file"
 }
 
-section_slave_hosts () {
-   local slave_hosts_file="$1"
+section_replica_hosts () {
+   local replica_hosts_file="$1"
+   local replica_name="$2"
 
-   [ -e "$slave_hosts_file" ] || return
+   [ -e "$replica_hosts_file" ] || return
 
-   section "Slave Hosts"
-   if [ -s "$slave_hosts_file" ]; then
-       cat "$slave_hosts_file"
+   section "${replica_name^} Hosts"
+   if [ -s "$replica_hosts_file" ]; then
+       cat "$replica_hosts_file"
    else
-       echo "No slaves found"
+       echo "No ${replica_name} found"
    fi
 }
 
@@ -1245,6 +1248,7 @@ section_mysql_files () {
 section_percona_xtradb_cluster () {
    local mysql_var="$1"
    local mysql_status="$2"
+   local replica_name="$3"
 
    name_val "Cluster Name"    "$(get_var "wsrep_cluster_name" "$mysql_var")"
    name_val "Cluster Address" "$(get_var "wsrep_cluster_address" "$mysql_var")"
@@ -1255,7 +1259,7 @@ section_percona_xtradb_cluster () {
    name_val "Node Status"     "$(get_var "wsrep_cluster_status" "$mysql_status")"
 
    name_val "SST Method"      "$(get_var "wsrep_sst_method" "$mysql_var")"
-   name_val "Slave Threads"   "$(get_var "wsrep_slave_threads" "$mysql_var")"
+   name_val "${replica_name^} Threads"   "$(get_var "wsrep_${replica_name}_threads" "$mysql_var")"
 
    name_val "Ignore Split Brain" "$( parse_wsrep_provider_options "pc.ignore_sb" "$mysql_var" )"
    name_val "Ignore Quorum" "$( parse_wsrep_provider_options "pc.ignore_quorum" "$mysql_var" )"
@@ -1312,39 +1316,43 @@ report_mysql_summary () {
    # Field width for name_val
    local NAME_VAL_LEN=25
 
-   # ########################################################################
-   # Header for the whole thing, table of discovered instances
-   # ########################################################################
-
-   section "Percona Toolkit MySQL Summary Report"
-   name_val "System time" "`date -u +'%F %T UTC'` (local TZ: `date +'%Z %z'`)"
-   section "Instances"
-   parse_mysqld_instances "$dir/mysqld-instances" "$dir/mysql-variables"
-
-   section_mysqld "$dir/mysqld-executables" "$dir/mysql-variables"
-
-   section_slave_hosts "$dir/mysql-slave-hosts"
-   # ########################################################################
-   # General date, hostname, etc
-   # ########################################################################
+   # Local variables
    local user="$(get_var "pt-summary-internal-user" "$dir/mysql-variables")"
    local port="$(get_var port "$dir/mysql-variables")"
    local now="$(get_var "pt-summary-internal-now" "$dir/mysql-variables")"
    local mysql_version="$(get_var version "$dir/mysql-variables")"
 
    local source_name='source'
+   local replica_name='replica'
    local source_log='binary'
    local source_status='binary log'
    local source_logs_file="mysql-binary-logs"
    local source_status_file="mysql-binary-log-status"
    if [ "${mysql_version}" '<' "8.1" ]; then
       source_name='master'
+      replica_name='slave'
       source_log='master'
       source_status='master'
       source_logs_file='mysql-master-logs'
       source_status_file='mysql-master-status'
    fi
 
+   # ########################################################################
+   # Header for the whole thing, table of discovered instances
+   # ########################################################################
+
+   section "Percona Toolkit MySQL Summary Report"
+   name_val "System time" "`date -u +'%F %T UTC'` (local TZ: `date +'%Z %z'`)"
+   section "Instances"
+   parse_mysqld_instances "$dir/mysqld-instances" "$dir/mysql-variables"
+
+   section_mysqld "$dir/mysqld-executables" "$dir/mysql-variables"
+
+   section_replica_hosts "$dir/mysql-${replica_name}-hosts" ${replica_name}
+   # ########################################################################
+   # General date, hostname, etc
+   # ########################################################################
+
    section "Report On Port ${port}"
    name_val User "${user}"
    name_val Time "${now} ($(get_mysql_timezone "$dir/mysql-variables"))"
@@ -1363,10 +1371,10 @@ report_mysql_summary () {
    local fuzz_procr=$(fuzz $(get_var Threads_running "$dir/mysql-status"))
    name_val Processes "${fuzz_procs} connected, ${fuzz_procr} running"
 
-   local slave=""
-   if [ -s "$dir/mysql-slave" ]; then slave=""; else slave="not "; fi
-   local slavecount=$(grep -c 'Binlog Dump' "$dir/mysql-processlist")
-   name_val Replication "Is ${slave}a slave, has ${slavecount} slaves connected"
+   local replica=""
+   if [ -s "$dir/mysql-${replica_name}" ]; then replica=""; else replica="not "; fi
+   local replicacount=$(grep -c 'Binlog Dump' "$dir/mysql-processlist")
+   name_val Replication "Is ${replica}a ${replica_name}, has ${replicacount} ${replica_name}s connected"
 
 
    # TODO move this into a section with other files: error log, slow log and
@@ -1409,7 +1417,7 @@ report_mysql_summary () {
    # Percona Server features
    # ########################################################################
    section "Key Percona Server features"
-   section_percona_server_features "$dir/mysql-variables"
+   section_percona_server_features "$dir/mysql-variables" "${replica_name}"
 
    # ########################################################################
    # Percona XtraDB Cluster data
@@ -1419,7 +1427,7 @@ report_mysql_summary () {
    if [ -n "${has_wsrep:-""}" ]; then
       local wsrep_on="$(feat_on "$dir/mysql-variables" "wsrep_on")"
       if [ "${wsrep_on:-""}" = "Enabled" ]; then
-         section_percona_xtradb_cluster "$dir/mysql-variables" "$dir/mysql-status"
+         section_percona_xtradb_cluster "$dir/mysql-variables" "$dir/mysql-status" "$replica_name"
       else
          name_val "wsrep_on" "OFF"
       fi
@@ -1453,13 +1461,13 @@ report_mysql_summary () {
       if [ "$semisync_enabled_source" = "OFF" -o "$semisync_enabled_source" = "0" -o -z "$semisync_enabled_source" ]; then
          name_val "Source" "Disabled"
       else
-         _semi_sync_stats_for "${source_name}" "$dir/mysql-variables"
+         _semi_sync_stats_for "${source_name}" "$dir/mysql-variables" "${replica_name}"
       fi
-      local semisync_enabled_slave="$(get_var rpl_semi_sync_slave_enabled "$dir/mysql-variables")"
-      if    [ "$semisync_enabled_slave" = "OFF" -o "$semisync_enabled_slave" = "0" -o -z "$semisync_enabled_slave" ]; then
-         name_val "Slave" "Disabled"
+      local semisync_enabled_replica="$(get_var rpl_semi_sync_${replica_name}_enabled "$dir/mysql-variables")"
+      if    [ "$semisync_enabled_replica" = "OFF" -o "$semisync_enabled_replica" = "0" -o -z "$semisync_enabled_replica" ]; then
+         name_val "${replica_name^}" "Disabled"
       else
-         _semi_sync_stats_for "slave" "$dir/mysql-variables"
+         _semi_sync_stats_for "${replica_name}" "$dir/mysql-variables" "${replica_name}"
       fi
    fi
 
@@ -1636,8 +1644,8 @@ report_mysql_summary () {
       format_binlog_filters "$dir/$source_status_file"
    fi
 
-# Replication: seconds behind, running, filters, skip_slave_start, skip_errors,
-# read_only, temp tables open, slave_net_timeout, slave_exec_mode
+# Replication: seconds behind, running, filters, skip_replica_start, skip_errors,
+# read_only, temp tables open, replica_net_timeout, replica_exec_mode
 
    # ########################################################################
    # Interesting things that you just ought to know about.
diff --git a/t/lib/CompareResults.t b/t/lib/CompareResults.t
index 517f8ef96..398b3da4a 100644
--- a/t/lib/CompareResults.t
+++ b/t/lib/CompareResults.t
@@ -655,7 +655,7 @@ EOF
    $dbh1->do('SET SQL_LOG_BIN=0');
    $dbh1->do('insert into test.t3 values (2.0),(3.0)');
    $dbh1->do('SET SQL_LOG_BIN=1');
-   $sb->wait_for_slaves();
+   $sb->wait_for_replicas();
 
    my $left_n_rows = $dbh1->selectcol_arrayref('select count(*) from test.t3')->[0];
    my $right_n_rows = $dbh2->selectcol_arrayref('select count(*) from test.t3')->[0];
diff --git a/t/lib/MasterSlave.t b/t/lib/MasterSlave.t
index e05856b53..f757b695c 100644
--- a/t/lib/MasterSlave.t
+++ b/t/lib/MasterSlave.t
@@ -26,7 +26,7 @@ my $dp = new DSNParser(opts=>$dsn_opts);
 my $sb = new Sandbox(basedir => '/tmp', DSNParser => $dp);
 
 my $master_dbh = $sb->get_dbh_for('source');
-my $slave_dbh  = $sb->get_dbh_for('replica1');
+my $replica_dbh  = $sb->get_dbh_for('replica1');
 my $master_dsn = {
    h => '127.1',
    P => '12345',
@@ -45,7 +45,7 @@ my $ms = new MasterSlave(
 );
 
 # ############################################################################
-# get_slaves() wrapper around recurse_to_slaves()
+# get_replicas() wrapper around recurse_to_replicas()
 # ############################################################################
 
 SKIP: {
@@ -57,7 +57,7 @@ PXC_SKIP: {
       local @ARGV = ();
       $o->get_opts();
    
-      my $slaves = $ms->get_slaves(
+      my $slaves = $ms->get_replicas(
          dbh      => $master_dbh,
          dsn      => $master_dsn,
          make_cxn => sub {
@@ -87,14 +87,14 @@ PXC_SKIP: {
             source_id => 12345,
             source    => 'hosts',
          },
-         'get_slaves() from recurse_to_slaves() with a default --recursion-method'
+         'get_replicas() from recurse_to_replicas() with a default --recursion-method'
       );
 
       my ($id) = $slaves->[0]->dbh()->selectrow_array('SELECT @@SERVER_ID');
       is(
          $id,
          '12346',
-         'dbh created from get_slaves()'
+         'dbh created from get_replicas()'
       );
 
       # This doesn't actually work because the master and slave are both
@@ -105,7 +105,7 @@ PXC_SKIP: {
       local @ARGV = ('--recursion-method', 'processlist');
       $o->get_opts();
 
-      $slaves = $ms->get_slaves(
+      $slaves = $ms->get_replicas(
          dbh      => $master_dbh,
          dsn      => $master_dsn,
          make_cxn => sub {
@@ -122,7 +122,7 @@ PXC_SKIP: {
       is_deeply(
          $slaves,
          [],
-         "get_slaves() by processlist"
+         "get_replicas() by processlist"
       );
 
       # ##########################################################################
@@ -151,7 +151,7 @@ PXC_SKIP: {
       $o->get_opts();
       throws_ok(
          sub {
-            $slaves = $ms->get_slaves(
+            $slaves = $ms->get_replicas(
                dbh      => $ro_dbh,
                dsn      => $ro_dsn,
                make_cxn => sub {
@@ -171,7 +171,7 @@ PXC_SKIP: {
 
       @ARGV = ('--recursion-method', 'none');
       $o->get_opts();
-      $slaves = $ms->get_slaves(
+      $slaves = $ms->get_replicas(
          dbh      => $ro_dbh,
          dsn      => $ro_dsn,
          make_cxn => sub {
@@ -193,7 +193,7 @@ PXC_SKIP: {
       @ARGV = ('--recursion-method', 'none', '--recurse', '2');
       $o->get_opts();
       my $recursed = 0;
-      $ms->recurse_to_slaves(
+      $ms->recurse_to_replicas(
          {  dbh      => $ro_dbh,
             dsn      => $ro_dsn,
             callback => sub { $recursed++ },
@@ -201,7 +201,7 @@ PXC_SKIP: {
       is(
          $recursed,
          0,
-         "recurse_to_slaves() doesn't recurse if method=none"
+         "recurse_to_replicas() doesn't recurse if method=none"
       );
 
       $ro_dbh->disconnect();
@@ -245,7 +245,7 @@ diag(`$trunk/sandbox/start-sandbox replica 2902 2901`);
 # |      2903 | 127.0.0.1 | 2903 |                 0 |      2900 | 
 # |      2901 | 127.0.0.1 | 2901 |                 0 |      2900 | 
 # +-----------+-----------+------+-------------------+-----------+
-# This caused recurse_to_slaves() to report 2903, 2901, 2902.
+# This caused recurse_to_replicas() to report 2903, 2901, 2902.
 # Since the tests are senstive to the order of @slaves, they failed
 # because $slaves->[1] was no longer slave1 but slave0. Starting slave2
 # last fixes/works around this.
@@ -281,7 +281,7 @@ my $skip_callback = sub {
 @ARGV = ('--recurse', '2');
 $o->get_opts();
 
-$ms->recurse_to_slaves(
+$ms->recurse_to_replicas(
    {  dbh           => $dbh,
       dsn           => $dsn,
       callback      => $callback,
@@ -315,9 +315,9 @@ is_deeply(
 # +- 127.0.0.1:slave0
 # |  +- 127.0.0.1:slave1
 # +- 127.0.0.1:slave2
-is($ms->get_slave_status($slaves[0])->{source_port}, $port_for{source}, 'slave 1 port');
-is($ms->get_slave_status($slaves[1])->{source_port}, $port_for{replica0}, 'slave 2 port');
-is($ms->get_slave_status($slaves[2])->{source_port}, $port_for{source}, 'slave 3 port');
+is($ms->get_replica_status($slaves[0])->{source_port}, $port_for{source}, 'slave 1 port');
+is($ms->get_replica_status($slaves[1])->{source_port}, $port_for{replica0}, 'slave 2 port');
+is($ms->get_replica_status($slaves[2])->{source_port}, $port_for{source}, 'slave 3 port');
 
 ok($ms->is_source_of($slaves[0], $slaves[1]), 'slave 1 is slave of slave 0');
 eval {
@@ -327,10 +327,10 @@ like($EVAL_ERROR, qr/but the ${source_name}'s port/, 'slave 2 is not slave of sl
 eval {
    $ms->is_source_of($slaves[2], $slaves[1]);
 };
-like($EVAL_ERROR, qr/has no connected slaves/, 'slave 1 is not slave of slave 2');
+like($EVAL_ERROR, qr/has no connected replicas/, 'slave 1 is not slave of slave 2');
 
-map { $ms->stop_slave($_) } @slaves;
-map { $ms->start_slave($_) } @slaves;
+map { $ms->stop_replica($_) } @slaves;
+map { $ms->start_replica($_) } @slaves;
 
 # Give the slaves so time to restart
 sleep(5);
@@ -338,13 +338,13 @@ sleep(5);
 my $res;
 $res = $ms->wait_for_source(
    source_status => $ms->get_source_status($dbh),
-   slave_dbh     => $slaves[0],
+   replica_dbh     => $slaves[0],
    timeout       => 10,
 );
 
 ok($res->{result} >= 0, 'Wait was successful');
 
-$ms->stop_slave($slaves[0]);
+$ms->stop_replica($slaves[0]);
 $dbh->do('drop database if exists test');
 $dbh->do('create database test');
 $dbh->do('create table test.t(a int)');
@@ -354,18 +354,18 @@ diag(`(/tmp/$port_for{replica0}/use -e 'start ${replica_name}')&`);
 eval {
    $res = $ms->wait_for_source(
       source_status => $ms->get_source_status($dbh),
-      slave_dbh     => $slaves[0],
+      replica_dbh     => $slaves[0],
       timeout       => 1,
    );
 };
 ok($res->{result}, 'Waited for some events');
 
 # Clear any START SLAVE UNTIL conditions.
-map { $ms->stop_slave($_) } @slaves;
-map { $ms->start_slave($_) } @slaves;
+map { $ms->stop_replica($_) } @slaves;
+map { $ms->start_replica($_) } @slaves;
 sleep 1;
 
-$ms->stop_slave($slaves[0]);
+$ms->stop_replica($slaves[0]);
 $dbh->do('drop database if exists test'); # Any stmt will do
 eval {
    $res = $ms->catchup_to_source($slaves[0], $dbh, 10);
@@ -373,7 +373,7 @@ eval {
 diag $EVAL_ERROR if $EVAL_ERROR;
 ok(!$EVAL_ERROR, 'No eval error catching up');
 my $master_stat = $ms->get_source_status($dbh);
-my $slave_stat = $ms->get_slave_status($slaves[0]);
+my $slave_stat = $ms->get_replica_status($slaves[0]);
 is_deeply(
    $ms->repl_posn($master_stat),
    $ms->repl_posn($slave_stat),
@@ -404,12 +404,12 @@ ok(
 );
 
 ok(
-   !$ms->is_replication_thread($query, type=>'slave_io', check_known_ids=>0),
+   !$ms->is_replication_thread($query, type=>'replica_io', check_known_ids=>0),
    "Non-rpl thd is not slave io thd"
 );
 
 ok(
-   !$ms->is_replication_thread($query, type=>'slave_sql', check_known_ids=>0),
+   !$ms->is_replication_thread($query, type=>'replica_sql', check_known_ids=>0),
    "Non-rpl thd is not slave sql thd"
 );
 
@@ -430,12 +430,12 @@ ok(
 );
 
 ok(
-   !$ms->is_replication_thread($query, type=>'slave_io', check_known_ids=>0),
+   !$ms->is_replication_thread($query, type=>'replica_io', check_known_ids=>0),
    'Binlog Dump is not a slave io thd'
 );
 
 ok(
-   !$ms->is_replication_thread($query, type=>'slave_sql', check_known_ids=>0),
+   !$ms->is_replication_thread($query, type=>'replica_sql', check_known_ids=>0),
    'Binlog Dump is not a slave sql thd'
 );
 
@@ -456,12 +456,12 @@ ok(
 );
 
 ok(
-   $ms->is_replication_thread($query, type=>'slave_io', check_known_ids=>0),
+   $ms->is_replication_thread($query, type=>'replica_io', check_known_ids=>0),
    'Slave io thd is a slave io thd'
 );
 
 ok(
-   !$ms->is_replication_thread($query, type=>'slave_sql', check_known_ids=>0),
+   !$ms->is_replication_thread($query, type=>'replica_sql', check_known_ids=>0),
    'Slave io thd is not a slave sql thd',
 );
 
@@ -482,12 +482,12 @@ ok(
 );
 
 ok(
-   !$ms->is_replication_thread($query, type=>'slave_io', check_known_ids=>0),
+   !$ms->is_replication_thread($query, type=>'replica_io', check_known_ids=>0),
    'Slave sql thd is not a slave io thd'
 );
 
 ok(
-   $ms->is_replication_thread($query, type=>'slave_sql', check_known_ids=>0),
+   $ms->is_replication_thread($query, type=>'replica_sql', check_known_ids=>0),
    'Slave sql thd is a slave sql thd',
 );
 
@@ -507,12 +507,12 @@ ok(
    'Slave thread in init state matches all (issue 1121)',
 );
 ok(
-   $ms->is_replication_thread($query, type=>'slave_io'),
-   'Slave thread in init state matches slave_io (issue 1121)',
+   $ms->is_replication_thread($query, type=>'replica_io'),
+   'Slave thread in init state matches replica_io (issue 1121)',
 );
 ok(
-   $ms->is_replication_thread($query, type=>'slave_sql'),
-   'Slave thread in init state matches slave_sql (issue 1121)',
+   $ms->is_replication_thread($query, type=>'replica_sql'),
+   'Slave thread in init state matches replica_sql (issue 1121)',
 );
 
 # Issue 1143: mk-kill Can Kill Slave's Replication Thread
@@ -533,12 +533,12 @@ ok(
    'Slave thread executing trigger matches all (issue 1143)',
 );
 ok(
-   $ms->is_replication_thread($query, type=>'slave_io'),
-   'Slave thread executing trigger matches slave_io (issue 1143)',
+   $ms->is_replication_thread($query, type=>'replica_io'),
+   'Slave thread executing trigger matches replica_io (issue 1143)',
 );
 ok(
-   $ms->is_replication_thread($query, type=>'slave_sql'),
-   'Slave thread executing trigger matches slave_sql (issue 1143)',
+   $ms->is_replication_thread($query, type=>'replica_sql'),
+   'Slave thread executing trigger matches replica_sql (issue 1143)',
 );
 
 throws_ok(
@@ -604,20 +604,20 @@ ok(
 # #############################################################################
 SKIP: {
    skip "Cannot connect to sandbox master", 3 unless $master_dbh;
-   skip "Cannot connect to sandbox slave", 3 unless $slave_dbh;
+   skip "Cannot connect to sandbox slave", 3 unless $replica_dbh;
 
 PXC_SKIP: {
       skip 'Not for PXC' if ( $sb->is_cluster_mode );
 
    is_deeply(
-      $ms->get_replication_filters(dbh=>$slave_dbh),
+      $ms->get_replication_filters(dbh=>$replica_dbh),
       {
       },
       "No replication filters"
    );
 
    $master_dbh->disconnect();
-   $slave_dbh->disconnect();
+   $replica_dbh->disconnect();
 
    diag(`/tmp/12346/stop >/dev/null 2>&1`);
    diag(`/tmp/12345/stop >/dev/null 2>&1`);
@@ -629,7 +629,7 @@ PXC_SKIP: {
    diag(`/tmp/12346/start >/dev/null 2>&1`);
    
    $master_dbh = $sb->get_dbh_for('source');
-   $slave_dbh  = $sb->get_dbh_for('replica1');
+   $replica_dbh  = $sb->get_dbh_for('replica1');
 
    is_deeply(
       $ms->get_replication_filters(dbh=>$master_dbh),
@@ -640,7 +640,7 @@ PXC_SKIP: {
    );
 
    is_deeply(
-      $ms->get_replication_filters(dbh=>$slave_dbh),
+      $ms->get_replication_filters(dbh=>$replica_dbh),
       {
          replicate_ignore_db => 'foo',
       },
@@ -656,29 +656,29 @@ PXC_SKIP: {
    diag(`/tmp/12347/use -e "STOP ${replica_name}; START ${replica_name};" >/dev/null`);
 
    $master_dbh = $sb->get_dbh_for('source');
-   $slave_dbh  = $sb->get_dbh_for('replica1');
+   $replica_dbh  = $sb->get_dbh_for('replica1');
 };
 
 is(
-   $ms->get_slave_lag($dbh),
+   $ms->get_replica_lag($dbh),
    undef,
-   "get_slave_lag() for master"
+   "get_replica_lag() for master"
 );
 
 ok(
-   defined $ms->get_slave_lag($slaves[1]),
-   "get_slave_lag() for slave"
+   defined $ms->get_replica_lag($slaves[1]),
+   "get_replica_lag() for slave"
 );
 
 # ############################################################################
-# get_slaves() and DSN table
+# get_replicas() and DSN table
 # ############################################################################
 $sb->load_file('source', "t/lib/samples/MasterSlave/dsn_table.sql");
 
 @ARGV = ('--recursion-method', 'dsn=F=/tmp/12345/my.sandbox.cnf,D=dsn_t,t=dsns');
 $o->get_opts();
 
-my $slaves = $ms->get_slaves(
+my $slaves = $ms->get_replicas(
    OptionParser => $o,
    DSNParser    => $dp,
    Quoter       => $q,
@@ -706,7 +706,7 @@ is_deeply(
       u => 'msandbox',
       mysql_ssl => undef,
    },
-   'get_slaves() from DSN table'
+   'get_replicas() from DSN table'
 );
 
 my ($id) = $slaves->[0]->dbh()->selectrow_array('SELECT @@SERVER_ID');
@@ -788,7 +788,7 @@ SKIP: {
                                                              
    my $chan_slaves;
    eval {
-       $chan_slaves = $ms->get_slaves(
+       $chan_slaves = $ms->get_replicas(
           dbh      => $master1_dbh,
           dsn      => $master1_dsn,
           make_cxn => sub {
@@ -808,7 +808,7 @@ SKIP: {
    #};
    my $css;
    eval {
-       $css = $ms->get_slave_status($slave1_dbh);
+       $css = $ms->get_replica_status($slave1_dbh);
    };
    #local $SIG{__WARN__} = undef;
    is (
@@ -819,15 +819,15 @@ SKIP: {
 
    like (
        $EVAL_ERROR,
-       qr/This server returned more than one row for SHOW SLAVE STATUS/,
-       'Got warning message if we cannot determine slave in a multi source config without --channel param',
+       qr/This server returned more than one row for SHOW (REPLICA|SLAVE) STATUS/,
+       'Got warning message if we cannot determine replica in a multi source config without --channel param',
    );
 
    my $wfm;
    eval {
        $wfm = $ms->wait_for_source(
           source_status => $ms->get_source_status($dbh),
-          slave_dbh     => $slave1_dbh,
+          replica_dbh     => $slave1_dbh,
           timeout       => 1,
        );
    };
@@ -845,7 +845,7 @@ SKIP: {
    $slave1_dbh->do("STOP ${replica_name} for channel 'sourcechan2'");
 
    eval {
-       $css = $ms->get_slave_status($slave1_dbh);
+       $css = $ms->get_replica_status($slave1_dbh);
    };
    is (
        $css,
@@ -857,7 +857,7 @@ SKIP: {
 
    # Now try specifying a channel name 
    $ms->{channel} = 'sourcechan1';
-   $css = $ms->get_slave_status($slave1_dbh);
+   $css = $ms->get_replica_status($slave1_dbh);
    is (
        $css->{channel_name},
        'sourcechan1',
@@ -866,7 +866,7 @@ SKIP: {
 
    $wfm = $ms->wait_for_source(
       source_status => $ms->get_source_status($dbh),
-      slave_dbh     => $slave1_dbh,
+      replica_dbh     => $slave1_dbh,
       timeout       => 1,
    );
    is(
@@ -893,7 +893,7 @@ my $connected_slaves = [
   },
 ];
 
-my @g = $ms->_process_slaves_list ($dp, $dsn, $connected_slaves);
+my @g = $ms->_process_replicas_list ($dp, $dsn, $connected_slaves);
 is (
     scalar @g,
     1,
diff --git a/t/lib/ReplicaLagWaiter.t b/t/lib/ReplicaLagWaiter.t
index d74c34d1e..2dae62292 100644
--- a/t/lib/ReplicaLagWaiter.t
+++ b/t/lib/ReplicaLagWaiter.t
@@ -11,8 +11,7 @@ use warnings FATAL => 'all';
 use English qw(-no_match_vars);
 use Test::More;
 
-plan skip_all => 'FIXME ReplicaLagWaiter.t';
-#plan tests => 7;
+plan tests => 7;
 
 use ReplicaLagWaiter;
 use OptionParser;
@@ -68,7 +67,7 @@ my $rll = new ReplicaLagWaiter(
    get_lag => \&get_lag,
    sleep   => \&sleep,
    max_lag => 1,
-   slaves  => [$r1, $r2],
+   replicas  => [$r1, $r2],
 );
 
 @lag = (0, 0);
diff --git a/t/lib/Safeguards.t b/t/lib/Safeguards.t
deleted file mode 100644
index 43d6db5c1..000000000
--- a/t/lib/Safeguards.t
+++ /dev/null
@@ -1,69 +0,0 @@
-#!/usr/bin/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 Safeguards;
-use Percona::Test;
-
-use Data::Dumper;
-$Data::Dumper::Indent    = 1;
-$Data::Dumper::Sortkeys  = 1;
-$Data::Dumper::Quotekeys = 0;
-
-my $sample = "t/lib/samples/bash/";
-
-my $safeguards = Safeguards->new(
-   disk_bytes_free => 104857600,
-   disk_pct_free   => 10,
-);
-
-# Filesystem   1024-blocks     Used Available Capacity  Mounted on
-# /dev/disk0s2   118153176 94409664  23487512    81%    /
-#
-# Those values are in Kb, so:
-#   used     = 94409664 (94.4G) = 96_675_495_936 bytes
-#   free     = 23487512 (23.4G) = 24_051_212_288 bytes
-#   pct free = 100 - 81         = 19 %
-my $df = slurp_file("$trunk/$sample/diskspace001.txt");
-
-ok(
-   $safeguards->check_disk_space(
-      disk_space => $df,
-   ),
-   "diskspace001: Enough bytes and pct free"
-);
-
-$safeguards = Safeguards->new(
-   disk_bytes_free => 104857600,
-   disk_pct_free   => 20,
-);
-
-ok(
-   !$safeguards->check_disk_space(
-      disk_space => $df,
-   ),
-   "diskspace001: Not enough pct free"
-);
-
-$safeguards = Safeguards->new(
-   disk_bytes_free => 24_051_212_289,
-   disk_pct_free   => 5,
-);
-
-ok(
-   !$safeguards->check_disk_space(
-      disk_space => $df,
-   ),
-   "diskspace001: Not enough bytes free"
-);
-
-done_testing;
diff --git a/t/lib/TableSyncer.t b/t/lib/TableSyncer.t
index 8a7c44cc9..0945737da 100644
--- a/t/lib/TableSyncer.t
+++ b/t/lib/TableSyncer.t
@@ -1004,7 +1004,7 @@ my $output = '';
             },
          );
       },
-      qr/Slave did not catch up to its source after 2 attempts of waiting 60/,
+      qr/Replica did not catch up to its source after 2 attempts of waiting 60/,
       "Retries wait"
    );
 }
diff --git a/t/lib/bash/report_mysql_info.sh b/t/lib/bash/report_mysql_info.sh
index 08e13ed50..24d0e78aa 100644
--- a/t/lib/bash/report_mysql_info.sh
+++ b/t/lib/bash/report_mysql_info.sh
@@ -147,7 +147,7 @@ master wait_pos_backtraverse |
             master yes_tx | 
 EOF
 
-_semi_sync_stats_for "master" "$samples/mysql-variables-with-semisync.txt" > "$PT_TMPDIR/got"
+_semi_sync_stats_for "master" "$samples/mysql-variables-with-semisync.txt" "slave" > "$PT_TMPDIR/got"
 no_diff "$PT_TMPDIR/expected" "$PT_TMPDIR/got" "semisync replication"
 
 # ###########################################################################
@@ -805,20 +805,20 @@ is \
 # https://bugs.launchpad.net/percona-toolkit/+bug/1015590
 # ###########################################################################
 
-section_percona_server_features "$samples/percona-server-5.5-variables" > "$PT_TMPDIR/got"
+section_percona_server_features "$samples/percona-server-5.5-variables" "slave" > "$PT_TMPDIR/got"
 
 no_diff \
    "$PT_TMPDIR/got" \
    "$samples/expected_output_ps-features.txt" \
    "Bug 1015590: pt-mysql-summary not Percona Server 5.5-ready"
 
-section_percona_server_features "$samples/percona-server-5.1-variables" > "$PT_TMPDIR/got"
+section_percona_server_features "$samples/percona-server-5.1-variables" "slave" > "$PT_TMPDIR/got"
 no_diff \
    "$PT_TMPDIR/got" \
    "$samples/expected_output_ps-5.1-features.txt" \
    "Bug 1015590: section_percona_server_features works on 5.1 with innodb_adaptive_checkpoint=none"
 
-section_percona_server_features "$samples/percona-server-5.1-variables-martin" > "$PT_TMPDIR/got"
+section_percona_server_features "$samples/percona-server-5.1-variables-martin" "slave" > "$PT_TMPDIR/got"
 no_diff \
    "$PT_TMPDIR/got" \
    "$samples/expected_output_ps-5.1-martin.txt" \

From 5c999ca3e01812dfa45bae66dbfc54be4e9a3c66 Mon Sep 17 00:00:00 2001
From: Sveta Smirnova <sveta.smirnova@percona.com>
Date: Fri, 26 Jul 2024 13:35:29 +0300
Subject: [PATCH 06/31] PT-2340 - Support MySQL 8.4

- Removed runtime.txt after discussion with Anastasia Alexandrova
- Added "use VersionParser" into tests in t/lib when needed
- Removed word master from tests for pt-archiver, pt-config-diff, pt-deadlock-logger, pt-duplicate-key-checker, pt-find, pt-fk-error-logger, pt-heartbeat, pt-index-usage, pt-ioprofile, pt-kill, pt-mysql-summary
- Removed word slave from tests for pt-archiver, pt-config-diff, pt-deadlock-logger, pt-duplicate-key-checker, pt-find, pt-fk-error-logger, pt-heartbeat, pt-index-usage, pt-ioprofile, pt-kill, pt-mysql-summary
- Updated modules for pt-archiver, pt-config-diff, pt-deadlock-logger, pt-duplicate-key-checker, pt-find, pt-fk-error-logger, pt-heartbeat, pt-index-usage, pt-ioprofile, pt-kill, pt-mysql-summary
- Changed mysql_ssl patch, so it is now short option s
- Added a check for existing zombies in t/pt-kill/execute_command.t
- Added bin/pt-galera-log-explainer to .gitignore
---
 .gitignore                                    |   1 +
 bin/pt-archiver                               | 554 +++++++++-------
 bin/pt-config-diff                            |   2 +-
 bin/pt-deadlock-logger                        |   2 +-
 bin/pt-duplicate-key-checker                  |   2 +-
 bin/pt-find                                   |   2 +-
 bin/pt-fk-error-logger                        |   2 +-
 bin/pt-heartbeat                              | 599 +++++++++++-------
 bin/pt-index-usage                            |   2 +-
 bin/pt-kill                                   | 532 +++++++++-------
 bin/pt-mysql-summary                          | 158 +++--
 lib/DSNParser.pm                              |   5 +-
 lib/PerconaTest.pm                            |   5 +-
 lib/Sandbox.pm                                |   3 +-
 lib/bash/report_mysql_info.sh                 |  12 +-
 runtime.txt                                   |   1 -
 t/lib/ChangeHandler.t                         |   1 +
 t/lib/CompareQueryTimes.t                     |   1 +
 t/lib/CopyRowsInsertSelect.t                  |   1 +
 t/lib/Cxn.t                                   |   7 +-
 t/lib/ExplainAnalyzer.t                       |   1 +
 t/lib/IndexUsage.t                            |   1 +
 t/lib/MasterSlave.t                           |   8 +-
 t/lib/MockSyncStream.t                        |   1 +
 t/lib/MySQLConfig.t                           |   1 +
 t/lib/NibbleIterator.t                        |   1 +
 t/lib/OptionParser.t                          |   2 +
 t/lib/Outfile.t                               |   1 +
 t/lib/QueryHistory.t                          |   1 +
 t/lib/QueryReportFormatter.t                  |   1 +
 t/lib/QueryReview.t                           |   1 +
 t/lib/Quoter.t                                |   1 +
 t/lib/RowChecksum.t                           |   1 +
 t/lib/RowDiff.t                               |   1 +
 t/lib/SchemaIterator.t                        |   1 +
 t/lib/TableChecksum.t                         |   1 +
 t/lib/TableChunker.t                          |   1 +
 t/lib/TableParser.t                           |   1 +
 t/lib/Transformers.t                          |   1 +
 t/lib/VersionCheck.t                          |   1 +
 t/pt-archiver/archive_using_channels.t        |  60 +-
 t/pt-archiver/basics.t                        |  54 +-
 t/pt-archiver/bugs.t                          |  16 +-
 t/pt-archiver/bulk_delete.t                   |   8 +-
 t/pt-archiver/bulk_insert.t                   |  14 +-
 t/pt-archiver/bulk_regular_insert.t           |   8 +-
 t/pt-archiver/check_slave_lag.t               |  35 +-
 t/pt-archiver/compact_col_vals.t              |   8 +-
 t/pt-archiver/delete_more.t                   |  44 +-
 t/pt-archiver/dest.t                          |  16 +-
 t/pt-archiver/file.t                          |  14 +-
 t/pt-archiver/gt_n.t                          |   6 +-
 t/pt-archiver/indexes.t                       |  22 +-
 t/pt-archiver/issue_1152.t                    |   6 +-
 t/pt-archiver/issue_1166.t                    |  10 +-
 t/pt-archiver/issue_1225.t                    |   8 +-
 t/pt-archiver/issue_1229.t                    |   6 +-
 t/pt-archiver/issue_131.t                     |   6 +-
 t/pt-archiver/issue_1593265.t                 |   6 +-
 t/pt-archiver/issue_524.t                     |   6 +-
 t/pt-archiver/issue_655.t                     |   4 +-
 t/pt-archiver/plugin.t                        |  18 +-
 t/pt-archiver/pt-143.t                        |   6 +-
 t/pt-archiver/pt-2064.t                       |  28 +-
 t/pt-archiver/pt-2083.t                       |   8 +-
 t/pt-archiver/pt-2114.t                       |  16 +-
 t/pt-archiver/pt-2207.t                       |   6 +-
 t/pt-archiver/pt-2279.t                       |   8 +-
 t/pt-archiver/purge.t                         |  12 +-
 t/pt-archiver/res_fk.t                        |   6 +-
 t/pt-archiver/safe_auto_increment.t           |   8 +-
 t/pt-archiver/standard_options.t              |  22 +-
 t/pt-config-diff/basics.t                     |  21 +-
 t/pt-config-diff/reports.t                    |  13 +-
 t/pt-deadlock-logger/basics.t                 |  12 +-
 t/pt-deadlock-logger/check_schema_exists.t    |   2 +-
 t/pt-deadlock-logger/clear_deadlocks.t        |   4 +-
 t/pt-deadlock-logger/create_dest_table.t      |   6 +-
 t/pt-deadlock-logger/standard_options.t       |   8 +-
 t/pt-duplicate-key-checker/basics.t           |  15 +-
 t/pt-duplicate-key-checker/clustered_keys.t   |  11 +-
 t/pt-duplicate-key-checker/issue_1192.t       |   7 +-
 t/pt-duplicate-key-checker/issue_298.t        |   5 +-
 t/pt-duplicate-key-checker/issue_331.t        |   7 +-
 t/pt-duplicate-key-checker/issue_663.t        |   7 +-
 t/pt-duplicate-key-checker/pt-2282.t          |   7 +-
 t/pt-find/pt-find.t                           |  11 +-
 t/pt-fk-error-logger/basics.t                 |  11 +-
 t/pt-heartbeat/basics.t                       |  98 +--
 t/pt-heartbeat/check_schema_exists.t          |   2 +-
 t/pt-heartbeat/multi_update_mode.t            | 119 ++--
 t/pt-heartbeat/pt-1508.t                      |  46 +-
 t/pt-heartbeat/pt-1857.t                      |  46 +-
 t/pt-heartbeat/pxc.t                          | 128 ++--
 t/pt-heartbeat/standard_options.t             |   6 +-
 t/pt-heartbeat/utc.t                          |  56 +-
 t/pt-index-usage/basics.t                     |   5 +-
 t/pt-index-usage/save_results.t               |   5 +-
 t/pt-ioprofile/pt-ioprofile.t                 |   5 +-
 t/pt-kill/basics.t                            |  11 +-
 t/pt-kill/execute_command.t                   |  23 +-
 t/pt-kill/group_queries.t                     |   4 +-
 t/pt-kill/kill.t                              |   7 +-
 t/pt-kill/log_dsn.t                           | 113 ++--
 t/pt-kill/match.t                             |  12 +-
 t/pt-kill/pt-2284.t                           |  11 +-
 t/pt-kill/pt_167.t                            |   7 +-
 t/pt-kill/standard_options.t                  |   7 +-
 t/pt-mysql-summary/pt-2102.t                  |   8 +-
 t/pt-mysql-summary/pt-2109.t                  |   4 +-
 t/pt-mysql-summary/pt-2327.t                  |  16 +-
 t/pt-mysql-summary/pt-76.t                    |   2 +-
 t/pt-mysql-summary/pt-mysql-summary.t         |  12 +-
 .../pt-mysql-summary_encryption.t             |  32 +-
 114 files changed, 1895 insertions(+), 1452 deletions(-)
 delete mode 100644 runtime.txt

diff --git a/.gitignore b/.gitignore
index c5152c3d6..8618ee04a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,6 +13,7 @@ bin/pt-mongodb-*
 bin/pt-secure-*
 bin/pt-pg-*
 bin/pt-k8s-debug-collector
+bin/pt-galera-log-explainer
 !src/go/pt-mongodb-query-digest/vendor/vendor.json
 !src/go/pt-mongodb-summary/vendor/vendor.json
 src/go/pt-mongodb-query-digest/vendor/
diff --git a/bin/pt-archiver b/bin/pt-archiver
index 290ce0414..1131cf081 100755
--- a/bin/pt-archiver
+++ b/bin/pt-archiver
@@ -2487,7 +2487,7 @@ sub get_cxn_params {
       $dsn = 'DBI:mysql:' . ( $info->{D} || '' ) . ';'
          . join(';', map  { "$opts{$_}->{dsn}=$info->{$_}" }
                      grep { defined $info->{$_} }
-                     qw(F h P S A))
+                     qw(F h P S A s))
          . ';mysql_read_default_group=client'
          . ($info->{L} ? ';mysql_local_infile=1' : '');
    }
@@ -3682,7 +3682,7 @@ sub new {
    return bless $self, $class;
 }
 
-sub get_slaves {
+sub get_replicas {
    my ($self, %args) = @_;
    my @required_args = qw(make_cxn);
    foreach my $arg ( @required_args ) {
@@ -3690,11 +3690,11 @@ sub get_slaves {
    }
    my ($make_cxn) = @args{@required_args};
 
-   my $slaves  = [];
+   my $replicas  = [];
    my $dp      = $self->{DSNParser};
    my $methods = $self->_resolve_recursion_methods($args{dsn});
 
-   return $slaves unless @$methods;
+   return $replicas unless @$methods;
 
    if ( grep { m/processlist|hosts/i } @$methods ) {
       my @required_args = qw(dbh dsn);
@@ -3704,26 +3704,26 @@ sub get_slaves {
       my ($dbh, $dsn) = @args{@required_args};
       my $o = $self->{OptionParser};
 
-      $self->recurse_to_slaves(
-         {  dbh            => $dbh,
-            dsn            => $dsn,
-            slave_user     => $o->got('slave-user') ? $o->get('slave-user') : '',
-            slave_password => $o->got('slave-password') ? $o->get('slave-password') : '',
-            slaves         => $args{slaves},
+      $self->recurse_to_replicas(
+         {  dbh              => $dbh,
+            dsn              => $dsn,
+            replica_user     => $o->got('replica-user') ? $o->get('replica-user') : '',
+            replica_password => $o->got('replica-password') ? $o->get('replica-password') : '',
+            replicas         => $args{replicas},
             callback  => sub {
                my ( $dsn, $dbh, $level, $parent ) = @_;
                return unless $level;
-               PTDEBUG && _d('Found slave:', $dp->as_string($dsn));
-               my $slave_dsn = $dsn;
-               if ($o->got('slave-user')) {
-                  $slave_dsn->{u} = $o->get('slave-user');
-                  PTDEBUG && _d("Using slave user ".$o->get('slave-user')." on ".$slave_dsn->{h}.":".$slave_dsn->{P});
+               PTDEBUG && _d('Found replica:', $dp->as_string($dsn));
+               my $replica_dsn = $dsn;
+               if ($o->got('replica-user')) {
+                  $replica_dsn->{u} = $o->get('replica-user');
+                  PTDEBUG && _d("Using replica user ".$o->get('replica-user')." on ".$replica_dsn->{h}.":".$replica_dsn->{P});
                }
-               if ($o->got('slave-password')) {
-                  $slave_dsn->{p} = $o->get('slave-password');
-                  PTDEBUG && _d("Slave password set");
+               if ($o->got('replica-password')) {
+                  $replica_dsn->{p} = $o->get('replica-password');
+                  PTDEBUG && _d("Replica password set");
                }
-               push @$slaves, $make_cxn->(dsn => $slave_dsn, dbh => $dbh, parent => $parent);
+               push @$replicas, $make_cxn->(dsn => $replica_dsn, dbh => $dbh, parent => $parent);
                return;
             },
             wait_no_die => $args{'wait_no_die'},
@@ -3731,20 +3731,20 @@ sub get_slaves {
       );
    } elsif ( $methods->[0] =~ m/^dsn=/i ) {
       (my $dsn_table_dsn = join ",", @$methods) =~ s/^dsn=//i;
-      $slaves = $self->get_cxn_from_dsn_table(
+      $replicas = $self->get_cxn_from_dsn_table(
          %args,
          dsn_table_dsn => $dsn_table_dsn,
          wait_no_die => $args{'wait_no_die'},
       );
    }
    elsif ( $methods->[0] =~ m/none/i ) {
-      PTDEBUG && _d('Not getting to slaves');
+      PTDEBUG && _d('Not getting to replicas');
    }
    else {
       die "Unexpected recursion methods: @$methods";
    }
 
-   return $slaves;
+   return $replicas;
 }
 
 sub _resolve_recursion_methods {
@@ -3762,31 +3762,31 @@ sub _resolve_recursion_methods {
    }
 }
 
-sub recurse_to_slaves {
+sub recurse_to_replicas {
    my ( $self, $args, $level ) = @_;
    $level ||= 0;
    my $dp = $self->{DSNParser};
    my $recurse = $args->{recurse} || $self->{OptionParser}->get('recurse');
    my $dsn = $args->{dsn};
-   my $slave_user = $args->{slave_user} || '';
-   my $slave_password = $args->{slave_password} || '';
+   my $replica_user = $args->{replica_user} || '';
+   my $replica_password = $args->{replica_password} || '';
 
    my $methods = $self->_resolve_recursion_methods($dsn);
    PTDEBUG && _d('Recursion methods:', @$methods);
    if ( lc($methods->[0]) eq 'none' ) {
-      PTDEBUG && _d('Not recursing to slaves');
+      PTDEBUG && _d('Not recursing to replicas');
       return;
    }
 
-   my $slave_dsn = $dsn;
-   if ($slave_user) {
-      $slave_dsn->{u} = $slave_user;
-      PTDEBUG && _d("Using slave user $slave_user on "
-         . $slave_dsn->{h} . ":" . ( $slave_dsn->{P} ? $slave_dsn->{P} : ""));
+   my $replica_dsn = $dsn;
+   if ($replica_user) {
+      $replica_dsn->{u} = $replica_user;
+      PTDEBUG && _d("Using replica user $replica_user on "
+         . $replica_dsn->{h} . ":" . ( $replica_dsn->{P} ? $replica_dsn->{P} : ""));
    }
-   if ($slave_password) {
-      $slave_dsn->{p} = $slave_password;
-      PTDEBUG && _d("Slave password set");
+   if ($replica_password) {
+      $replica_dsn->{p} = $replica_password;
+      PTDEBUG && _d("Replica password set");
    }
 
    my $dbh = $args->{dbh};
@@ -3794,12 +3794,12 @@ sub recurse_to_slaves {
    my $get_dbh = sub {
          eval {
             $dbh = $dp->get_dbh(
-               $dp->get_cxn_params($slave_dsn), { AutoCommit => 1 }
+               $dp->get_cxn_params($replica_dsn), { AutoCommit => 1 }
             );
-            PTDEBUG && _d('Connected to', $dp->as_string($slave_dsn));
+            PTDEBUG && _d('Connected to', $dp->as_string($replica_dsn));
          };
          if ( $EVAL_ERROR ) {
-            print STDERR "Cannot connect to ", $dp->as_string($slave_dsn), ": ", $EVAL_ERROR, "\n"
+            print STDERR "Cannot connect to ", $dp->as_string($replica_dsn), ": ", $EVAL_ERROR, "\n"
                or die "Cannot print: $OS_ERROR";
             return;
          }
@@ -3807,10 +3807,10 @@ sub recurse_to_slaves {
 
    DBH: {
       if ( !defined $dbh ) {
-         foreach my $known_slave ( @{$args->{slaves}} ) {
-            if ($known_slave->{dsn}->{h} eq $slave_dsn->{h} and
-                $known_slave->{dsn}->{P} eq $slave_dsn->{P} ) {
-               $dbh = $known_slave->{dbh};
+         foreach my $known_replica ( @{$args->{replicas}} ) {
+            if ($known_replica->{dsn}->{h} eq $replica_dsn->{h} and
+                $known_replica->{dsn}->{P} eq $replica_dsn->{P} ) {
+               $dbh = $known_replica->{dbh};
                last DBH;
             }
          }
@@ -3828,7 +3828,7 @@ sub recurse_to_slaves {
 	   if ( $EVAL_ERROR ) {
 		   if ( $args->{wait_no_die} ) {
 			   print STDERR "Error getting server id: ", $EVAL_ERROR,
-               "\nRetrying query for server ", $slave_dsn->{h}, ":", $slave_dsn->{P}, "\n";
+               "\nRetrying query for server ", $replica_dsn->{h}, ":", $replica_dsn->{P}, "\n";
             sleep 1;
             $dbh->disconnect();
             $get_dbh->();
@@ -3838,12 +3838,12 @@ sub recurse_to_slaves {
       }
    } until (defined $id);
    PTDEBUG && _d('Working on server ID', $id);
-   my $master_thinks_i_am = $dsn->{server_id};
+   my $source_thinks_i_am = $dsn->{server_id};
    if ( !defined $id
-       || ( defined $master_thinks_i_am && $master_thinks_i_am != $id )
+       || ( defined $source_thinks_i_am && $source_thinks_i_am != $id )
        || $args->{server_ids_seen}->{$id}++
    ) {
-      PTDEBUG && _d('Server ID seen, or not what master said');
+      PTDEBUG && _d('Server ID seen, or not what source said');
       if ( $args->{skip_callback} ) {
          $args->{skip_callback}->($dsn, $dbh, $level, $args->{parent});
       }
@@ -3854,51 +3854,51 @@ sub recurse_to_slaves {
 
    if ( !defined $recurse || $level < $recurse ) {
 
-      my @slaves =
-         grep { !$_->{master_id} || $_->{master_id} == $id } # Only my slaves.
-         $self->find_slave_hosts($dp, $dbh, $dsn, $methods);
+      my @replicas =
+         grep { !$_->{source_id} || $_->{source_id} == $id } # Only my replicas.
+         $self->find_replica_hosts($dp, $dbh, $dsn, $methods);
 
-      foreach my $slave ( @slaves ) {
+      foreach my $replica ( @replicas ) {
          PTDEBUG && _d('Recursing from',
-            $dp->as_string($dsn), 'to', $dp->as_string($slave));
-         $self->recurse_to_slaves(
-            { %$args, dsn => $slave, dbh => undef, parent => $dsn, slave_user => $slave_user, $slave_password => $slave_password }, $level + 1 );
+            $dp->as_string($dsn), 'to', $dp->as_string($replica));
+         $self->recurse_to_replicas(
+            { %$args, dsn => $replica, dbh => undef, parent => $dsn, replica_user => $replica_user, $replica_password => $replica_password }, $level + 1 );
       }
    }
 }
 
-sub find_slave_hosts {
+sub find_replica_hosts {
    my ( $self, $dsn_parser, $dbh, $dsn, $methods ) = @_;
 
-   PTDEBUG && _d('Looking for slaves on', $dsn_parser->as_string($dsn),
+   PTDEBUG && _d('Looking for replicas on', $dsn_parser->as_string($dsn),
       'using methods', @$methods);
 
-   my @slaves;
+   my @replicas;
    METHOD:
    foreach my $method ( @$methods ) {
-      my $find_slaves = "_find_slaves_by_$method";
-      PTDEBUG && _d('Finding slaves with', $find_slaves);
-      @slaves = $self->$find_slaves($dsn_parser, $dbh, $dsn);
-      last METHOD if @slaves;
+      my $find_replicas = "_find_replicas_by_$method";
+      PTDEBUG && _d('Finding replicas with', $find_replicas);
+      @replicas = $self->$find_replicas($dsn_parser, $dbh, $dsn);
+      last METHOD if @replicas;
    }
 
-   PTDEBUG && _d('Found', scalar(@slaves), 'slaves');
-   return @slaves;
+   PTDEBUG && _d('Found', scalar(@replicas), 'replicas');
+   return @replicas;
 }
 
-sub _find_slaves_by_processlist {
+sub _find_replicas_by_processlist {
    my ( $self, $dsn_parser, $dbh, $dsn ) = @_;
-   my @connected_slaves = $self->get_connected_slaves($dbh);
-   my @slaves = $self->_process_slaves_list($dsn_parser, $dsn, \@connected_slaves);
-   return @slaves;
+   my @connected_replicas = $self->get_connected_replicas($dbh);
+   my @replicas = $self->_process_replicas_list($dsn_parser, $dsn, \@connected_replicas);
+   return @replicas;
 }
 
-sub _process_slaves_list {
-   my ($self, $dsn_parser, $dsn, $connected_slaves) = @_;
-   my @slaves = map  {
-      my $slave        = $dsn_parser->parse("h=$_", $dsn);
-      $slave->{source} = 'processlist';
-      $slave;
+sub _process_replicas_list {
+   my ($self, $dsn_parser, $dsn, $connected_replicas) = @_;
+   my @replicas = map  {
+      my $replica        = $dsn_parser->parse("h=$_", $dsn);
+      $replica->{source} = 'processlist';
+      $replica;
    }
    grep { $_ }
    map  {
@@ -3910,22 +3910,28 @@ sub _process_slaves_list {
           $host = '['.$host.']';
       }
       $host;
-   } @$connected_slaves;
+   } @$connected_replicas;
 
-   return @slaves;
+   return @replicas;
 }
 
-sub _find_slaves_by_hosts {
+sub _find_replicas_by_hosts {
    my ( $self, $dsn_parser, $dbh, $dsn ) = @_;
 
-   my @slaves;
-   my $sql = 'SHOW SLAVE HOSTS';
+   my @replicas;
+
+   my $vp = VersionParser->new($dbh);
+   my $sql = 'SHOW REPLICAS';
+   if ( $vp < '8.1' || $vp->flavor() =~ m/maria/ ) {
+      $sql = 'SHOW SLAVE HOSTS';
+   }
+   
    PTDEBUG && _d($dbh, $sql);
-   @slaves = @{$dbh->selectall_arrayref($sql, { Slice => {} })};
+   @replicas = @{$dbh->selectall_arrayref($sql, { Slice => {} })};
 
-   if ( @slaves ) {
-      PTDEBUG && _d('Found some SHOW SLAVE HOSTS info');
-      @slaves = map {
+   if ( @replicas ) {
+      PTDEBUG && _d('Found some SHOW REPLICAS info');
+      @replicas = map {
          my %hash;
          @hash{ map { lc $_ } keys %$_ } = values %$_;
          my $spec = "h=$hash{host},P=$hash{port}"
@@ -3933,16 +3939,16 @@ sub _find_slaves_by_hosts {
             . ( $hash{password} ? ",p=$hash{password}" : '');
          my $dsn           = $dsn_parser->parse($spec, $dsn);
          $dsn->{server_id} = $hash{server_id};
-         $dsn->{master_id} = $hash{master_id};
+         $dsn->{source_id} = $hash{source_id};
          $dsn->{source}    = 'hosts';
          $dsn;
-      } @slaves;
+      } @replicas;
    }
 
-   return @slaves;
+   return @replicas;
 }
 
-sub get_connected_slaves {
+sub get_connected_replicas {
    my ( $self, $dbh ) = @_;
 
    my $show = "SHOW GRANTS FOR ";
@@ -3988,79 +3994,103 @@ sub get_connected_slaves {
    @{$dbh->selectall_arrayref($sql, { Slice => {} })};
 }
 
-sub is_master_of {
-   my ( $self, $master, $slave ) = @_;
-   my $master_status = $self->get_master_status($master)
-      or die "The server specified as a master is not a master";
-   my $slave_status  = $self->get_slave_status($slave)
-      or die "The server specified as a slave is not a slave";
-   my @connected     = $self->get_connected_slaves($master)
-      or die "The server specified as a master has no connected slaves";
-   my (undef, $port) = $master->selectrow_array("SHOW VARIABLES LIKE 'port'");
+sub is_source_of {
+   my ( $self, $source, $replica ) = @_;
+
+   my $replica_version = VersionParser->new($replica);
+   my $source_name = 'source';
+   my $source_port = 'source_port';
+   if ( $replica_version < '8.1' || $replica_version->flavor() =~ m/maria/ ) {
+      $source_name = 'master';
+      $source_port = 'master_port';
+   }
+
+   my $source_status = $self->get_source_status($source)
+      or die "The server specified as a source is not a source";
+   my $replica_status  = $self->get_replica_status($replica)
+      or die "The server specified as a replica is not a replica";
+   my @connected     = $self->get_connected_replicas($source)
+      or die "The server specified as a source has no connected replicas";
+   my (undef, $port) = $source->selectrow_array("SHOW VARIABLES LIKE 'port'");
 
-   if ( $port != $slave_status->{master_port} ) {
-      die "The slave is connected to $slave_status->{master_port} "
-         . "but the master's port is $port";
+   if ( $port != $replica_status->{$source_port} ) {
+      die "The replica is connected to $replica_status->{$source_port} "
+         . "but the source's port is $port";
    }
 
-   if ( !grep { $slave_status->{master_user} eq $_->{user} } @connected ) {
-      die "I don't see any slave I/O thread connected with user "
-         . $slave_status->{master_user};
+   if ( !grep { $replica_status->{source_user} eq $_->{user} } @connected ) {
+      die "I don't see any replica I/O thread connected with user "
+         . $replica_status->{source_user};
    }
 
-   if ( ($slave_status->{slave_io_state} || '')
-      eq 'Waiting for master to send event' )
+   if ( ($replica_status->{replica_io_state} || '')
+      eq 'Waiting for ${source_name} to send event' )
    {
-      my ( $master_log_name, $master_log_num )
-         = $master_status->{file} =~ m/^(.*?)\.0*([1-9][0-9]*)$/;
-      my ( $slave_log_name, $slave_log_num )
-         = $slave_status->{master_log_file} =~ m/^(.*?)\.0*([1-9][0-9]*)$/;
-      if ( $master_log_name ne $slave_log_name
-         || abs($master_log_num - $slave_log_num) > 1 )
+      my ( $source_log_name, $source_log_num )
+         = $source_status->{file} =~ m/^(.*?)\.0*([1-9][0-9]*)$/;
+      my ( $replica_log_name, $replica_log_num )
+         = $replica_status->{source_log_file} =~ m/^(.*?)\.0*([1-9][0-9]*)$/;
+      if ( $source_log_name ne $replica_log_name
+         || abs($source_log_num - $replica_log_num) > 1 )
       {
-         die "The slave thinks it is reading from "
-            . "$slave_status->{master_log_file},  but the "
-            . "master is writing to $master_status->{file}";
+         die "The replica thinks it is reading from "
+            . "$replica_status->{source_log_file},  but the "
+            . "source is writing to $source_status->{file}";
       }
    }
    return 1;
 }
 
-sub get_master_dsn {
+sub get_source_dsn {
    my ( $self, $dbh, $dsn, $dsn_parser ) = @_;
-   my $master = $self->get_slave_status($dbh) or return undef;
-   my $spec   = "h=$master->{master_host},P=$master->{master_port}";
+
+   my $vp = VersionParser->new($dbh);
+   my $source_host = 'source_host';
+   my $source_port = 'source_port';
+   if ( $vp < '8.1' || $vp->flavor() =~ m/maria/ ) {
+      $source_host = 'master_host';
+      $source_port = 'master_port';
+   }
+
+   my $source = $self->get_replica_status($dbh) or return undef;
+   my $spec   = "h=$source->{${source_host}},P=$source->{${source_port}}";
    return       $dsn_parser->parse($spec, $dsn);
 }
 
-sub get_slave_status {
+sub get_replica_status {
    my ( $self, $dbh ) = @_;
 
-   if ( !$self->{not_a_slave}->{$dbh} ) {
-      my $sth = $self->{sths}->{$dbh}->{SLAVE_STATUS}
-            ||= $dbh->prepare('SHOW SLAVE STATUS');
-      PTDEBUG && _d($dbh, 'SHOW SLAVE STATUS');
+   my $server_version = VersionParser->new($dbh);
+   my $replica_name = 'replica';
+   if ( $server_version < '8.1' || $server_version->flavor() =~ m/maria/ ) {
+      $replica_name = 'replica';
+   }
+
+   if ( !$self->{not_a_replica}->{$dbh} ) {
+      my $sth = $self->{sths}->{$dbh}->{REPLICA_STATUS}
+            ||= $dbh->prepare("SHOW ${replica_name} STATUS");
+      PTDEBUG && _d($dbh, "SHOW ${replica_name} STATUS");
       $sth->execute();
-      my ($sss_rows) = $sth->fetchall_arrayref({}); # Show Slave Status rows
+      my ($sss_rows) = $sth->fetchall_arrayref({}); # Show Replica Status rows
 
       my $ss;
       if ( $sss_rows && @$sss_rows ) {
           if (scalar @$sss_rows > 1) {
               if (!$self->{channel}) {
-                  die 'This server returned more than one row for SHOW SLAVE STATUS but "channel" was not specified on the command line';
+                  die 'This server returned more than one row for SHOW REPLICA STATUS but "channel" was not specified on the command line';
               }
-              my $slave_use_channels;
+              my $replica_use_channels;
               for my $row (@$sss_rows) {
                   $row = { map { lc($_) => $row->{$_} } keys %$row }; # lowercase the keys
                   if ($row->{channel_name}) {
-                      $slave_use_channels = 1;
+                      $replica_use_channels = 1;
                   }
                   if ($row->{channel_name} eq $self->{channel}) {
                       $ss = $row;
                       last;
                   }
               }
-              if (!$ss && $slave_use_channels) {
+              if (!$ss && $replica_use_channels) {
                  die 'This server is using replication channels but "channel" was not specified on the command line';
               }
           } else {
@@ -4080,28 +4110,34 @@ sub get_slave_status {
           }
       }
 
-      PTDEBUG && _d('This server returns nothing for SHOW SLAVE STATUS');
-      $self->{not_a_slave}->{$dbh}++;
+      PTDEBUG && _d('This server returns nothing for SHOW REPLICA STATUS');
+      $self->{not_a_replica}->{$dbh}++;
   }
 }
 
-sub get_master_status {
+sub get_source_status {
    my ( $self, $dbh ) = @_;
 
-   if ( $self->{not_a_master}->{$dbh} ) {
-      PTDEBUG && _d('Server on dbh', $dbh, 'is not a master');
+   if ( $self->{not_a_source}->{$dbh} ) {
+      PTDEBUG && _d('Server on dbh', $dbh, 'is not a source');
       return;
    }
 
+   my $vp = VersionParser->new($dbh);
+   my $source_name = 'binary log';
+   if ( $vp < '8.1' || $vp->flavor() =~ m/maria/ ) {
+      $source_name = 'master';
+   }
+
    my $sth;
    if ( $self->{sths}->{$dbh} && $dbh && $self->{sths}->{$dbh} == $dbh ) {
-      $sth = $self->{sths}->{$dbh}->{MASTER_STATUS}
-         ||= $dbh->prepare('SHOW MASTER STATUS');
+      $sth = $self->{sths}->{$dbh}->{SOURCE_STATUS}
+         ||= $dbh->prepare("SHOW ${source_name} STATUS");
    }
    else {
-      $sth = $dbh->prepare('SHOW MASTER STATUS');
+      $sth = $dbh->prepare("SHOW ${source_name} STATUS");
    }
-   PTDEBUG && _d($dbh, 'SHOW MASTER STATUS');
+   PTDEBUG && _d($dbh, "SHOW ${source_name} STATUS");
    $sth->execute();
    my ($ms) = @{$sth->fetchall_arrayref({})};
    PTDEBUG && _d(
@@ -4109,42 +4145,46 @@ sub get_master_status {
           : '');
 
    if ( !$ms || scalar keys %$ms < 2 ) {
-      PTDEBUG && _d('Server on dbh', $dbh, 'does not seem to be a master');
-      $self->{not_a_master}->{$dbh}++;
+      PTDEBUG && _d('Server on dbh', $dbh, 'does not seem to be a source');
+      $self->{not_a_source}->{$dbh}++;
    }
 
   return { map { lc($_) => $ms->{$_} } keys %$ms }; # lowercase the keys
 }
 
-sub wait_for_master {
+sub wait_for_source {
    my ( $self, %args ) = @_;
-   my @required_args = qw(master_status slave_dbh);
+   my @required_args = qw(source_status replica_dbh);
    foreach my $arg ( @required_args ) {
       die "I need a $arg argument" unless $args{$arg};
    }
-   my ($master_status, $slave_dbh) = @args{@required_args};
+   my ($source_status, $replica_dbh) = @args{@required_args};
    my $timeout       = $args{timeout} || 60;
 
    my $result;
    my $waited;
-   if ( $master_status ) {
-      my $slave_status;
+   if ( $source_status ) {
+      my $replica_status;
       eval {
-          $slave_status = $self->get_slave_status($slave_dbh);
+          $replica_status = $self->get_replica_status($replica_dbh);
       };
       if ($EVAL_ERROR) {
           return {
               result => undef,
               waited => 0,
-              error  =>'Wait for master: this is a multi-master slave but "channel" was not specified on the command line',
+              error  =>'Wait for source: this is a multi-source replica but "channel" was not specified on the command line',
           };
       }
-      my $server_version = VersionParser->new($slave_dbh);
-      my $channel_sql = $server_version > '5.6' && $self->{channel} ? ", '$self->{channel}'" : '';
-      my $sql = "SELECT MASTER_POS_WAIT('$master_status->{file}', $master_status->{position}, $timeout $channel_sql)";
-      PTDEBUG && _d($slave_dbh, $sql);
+      my $vp = VersionParser->new($replica_dbh);
+      my $source_name = 'source';
+      if ( $vp < '8.1' || $vp->flavor() =~ m/maria/ ) {
+         $source_name = 'master';
+      }
+      my $channel_sql = $vp > '5.6' && $self->{channel} ? ", '$self->{channel}'" : '';
+      my $sql = "SELECT ${source_name}_POS_WAIT('$source_status->{file}', $source_status->{position}, $timeout $channel_sql)";
+      PTDEBUG && _d($replica_dbh, $sql);
       my $start = time;
-      ($result) = $slave_dbh->selectrow_array($sql);
+      ($result) = $replica_dbh->selectrow_array($sql);
 
       $waited = time - $start;
 
@@ -4152,7 +4192,7 @@ sub wait_for_master {
       PTDEBUG && _d("Waited", $waited, "seconds");
    }
    else {
-      PTDEBUG && _d('Not waiting: this server is not a master');
+      PTDEBUG && _d('Not waiting: this server is not a source');
    }
 
    return {
@@ -4161,75 +4201,96 @@ sub wait_for_master {
    };
 }
 
-sub stop_slave {
+sub stop_replica {
    my ( $self, $dbh ) = @_;
-   my $sth = $self->{sths}->{$dbh}->{STOP_SLAVE}
-         ||= $dbh->prepare('STOP SLAVE');
+   my $vp = VersionParser->new($dbh);
+   my $replica_name = 'replica';
+   if ( $vp < '8.1' || $vp->flavor() =~ m/maria/ ) {
+      $replica_name = 'replica';
+   }
+   my $sth = $self->{sths}->{$dbh}->{STOP_REPLICA}
+         ||= $dbh->prepare("STOP ${replica_name}");
    PTDEBUG && _d($dbh, $sth->{Statement});
    $sth->execute();
 }
 
-sub start_slave {
+sub start_replica {
    my ( $self, $dbh, $pos ) = @_;
+
+   my $vp = VersionParser->new($dbh);
+   my $source_name = 'source';
+   my $replica_name = 'replica';
+   if ( $vp < '8.1' || $vp->flavor() =~ m/maria/ ) {
+      $source_name = 'master';
+      $replica_name = 'slave';
+   }
+
    if ( $pos ) {
-      my $sql = "START SLAVE UNTIL MASTER_LOG_FILE='$pos->{file}', "
-              . "MASTER_LOG_POS=$pos->{position}";
+      my $sql = "START ${replica_name} UNTIL ${source_name}_LOG_FILE='$pos->{file}', "
+              . "${source_name}_LOG_POS=$pos->{position}";
       PTDEBUG && _d($dbh, $sql);
       $dbh->do($sql);
    }
    else {
-      my $sth = $self->{sths}->{$dbh}->{START_SLAVE}
-            ||= $dbh->prepare('START SLAVE');
+      my $sth = $self->{sths}->{$dbh}->{START_REPLICA}
+            ||= $dbh->prepare("START ${replica_name}");
       PTDEBUG && _d($dbh, $sth->{Statement});
       $sth->execute();
    }
 }
 
-sub catchup_to_master {
-   my ( $self, $slave, $master, $timeout ) = @_;
-   $self->stop_slave($master);
-   $self->stop_slave($slave);
-   my $slave_status  = $self->get_slave_status($slave);
-   my $slave_pos     = $self->repl_posn($slave_status);
-   my $master_status = $self->get_master_status($master);
-   my $master_pos    = $self->repl_posn($master_status);
-   PTDEBUG && _d('Master position:', $self->pos_to_string($master_pos),
-      'Slave position:', $self->pos_to_string($slave_pos));
+sub catchup_to_source {
+   my ( $self, $replica, $source, $timeout ) = @_;
+   $self->stop_replica($source);
+   $self->stop_replica($replica);
+   my $replica_status  = $self->get_replica_status($replica);
+   my $replica_pos     = $self->repl_posn($replica_status);
+   my $source_status = $self->get_source_status($source);
+   my $source_pos    = $self->repl_posn($source_status);
+   PTDEBUG && _d('Source position:', $self->pos_to_string($source_pos),
+      'Replica position:', $self->pos_to_string($replica_pos));
 
    my $result;
-   if ( $self->pos_cmp($slave_pos, $master_pos) < 0 ) {
-      PTDEBUG && _d('Waiting for slave to catch up to master');
-      $self->start_slave($slave, $master_pos);
+   if ( $self->pos_cmp($replica_pos, $source_pos) < 0 ) {
+      PTDEBUG && _d('Waiting for replica to catch up to source');
+      $self->start_replica($replica, $source_pos);
 
-      $result = $self->wait_for_master(
-            master_status => $master_status,
-            slave_dbh     => $slave,
+      $result = $self->wait_for_source(
+            source_status => $source_status,
+            replica_dbh   => $replica,
             timeout       => $timeout,
-            master_status => $master_status
+            source_status => $source_status
       );
       if ($result->{error}) {
           die $result->{error};
       }
       if ( !defined $result->{result} ) {
-         $slave_status = $self->get_slave_status($slave);
-         if ( !$self->slave_is_running($slave_status) ) {
-            PTDEBUG && _d('Master position:',
-               $self->pos_to_string($master_pos),
-               'Slave position:', $self->pos_to_string($slave_pos));
-            $slave_pos = $self->repl_posn($slave_status);
-            if ( $self->pos_cmp($slave_pos, $master_pos) != 0 ) {
-               die "MASTER_POS_WAIT() returned NULL but slave has not "
-                  . "caught up to master";
+         $replica_status = $self->get_replica_status($replica);
+            
+         my $vp = VersionParser->new($replica);
+         my $replica_name = 'replica';
+         if ( $vp < '8.1' || $vp->flavor() =~ m/maria/ ) {
+            $replica_name = 'slave';
+         }
+
+         if ( !$self->replica_is_running($replica_status, $replica_name) ) {
+            PTDEBUG && _d('Source position:',
+               $self->pos_to_string($source_pos),
+               'Replica position:', $self->pos_to_string($replica_pos));
+            $replica_pos = $self->repl_posn($replica_status);
+            if ( $self->pos_cmp($replica_pos, $source_pos) != 0 ) {
+               die "SOURCE_POS_WAIT() returned NULL but replica has not "
+                  . "caught up to source";
             }
-            PTDEBUG && _d('Slave is caught up to master and stopped');
+            PTDEBUG && _d('Replica is caught up to source and stopped');
          }
          else {
-            die "Slave has not caught up to master and it is still running";
+            die "Replica has not caught up to source and it is still running";
          }
       }
    }
    else {
-      PTDEBUG && _d("Slave is already caught up to master");
+      PTDEBUG && _d("Replica is already caught up to source");
    }
 
    return $result;
@@ -4237,26 +4298,38 @@ sub catchup_to_master {
 
 sub catchup_to_same_pos {
    my ( $self, $s1_dbh, $s2_dbh ) = @_;
-   $self->stop_slave($s1_dbh);
-   $self->stop_slave($s2_dbh);
-   my $s1_status = $self->get_slave_status($s1_dbh);
-   my $s2_status = $self->get_slave_status($s2_dbh);
+   $self->stop_replica($s1_dbh);
+   $self->stop_replica($s2_dbh);
+   my $s1_status = $self->get_replica_status($s1_dbh);
+   my $s2_status = $self->get_replica_status($s2_dbh);
    my $s1_pos    = $self->repl_posn($s1_status);
    my $s2_pos    = $self->repl_posn($s2_status);
    if ( $self->pos_cmp($s1_pos, $s2_pos) < 0 ) {
-      $self->start_slave($s1_dbh, $s2_pos);
+      $self->start_replica($s1_dbh, $s2_pos);
    }
    elsif ( $self->pos_cmp($s2_pos, $s1_pos) < 0 ) {
-      $self->start_slave($s2_dbh, $s1_pos);
+      $self->start_replica($s2_dbh, $s1_pos);
    }
 
-   $s1_status = $self->get_slave_status($s1_dbh);
-   $s2_status = $self->get_slave_status($s2_dbh);
+   $s1_status = $self->get_replica_status($s1_dbh);
+   $s2_status = $self->get_replica_status($s2_dbh);
    $s1_pos    = $self->repl_posn($s1_status);
    $s2_pos    = $self->repl_posn($s2_status);
 
-   if ( $self->slave_is_running($s1_status)
-     || $self->slave_is_running($s2_status)
+   my $vp1 = VersionParser->new($s1_dbh);
+   my $replica1_name = 'replica';
+   if ( $vp1 < '8.1' || $vp1->flavor() =~ m/maria/ ) {
+      $replica1_name = 'slave';
+   }
+
+   my $vp2 = VersionParser->new($s2_dbh);
+   my $replica2_name = 'replica';
+   if ( $vp2 < '8.1' || $vp2->flavor() =~ m/maria/ ) {
+      $replica2_name = 'slave';
+   }
+
+   if ( $self->replica_is_running($s1_status, $replica1_name)
+     || $self->replica_is_running($s2_status, $replica2_name)
      || $self->pos_cmp($s1_pos, $s2_pos) != 0)
    {
       die "The servers aren't both stopped at the same position";
@@ -4264,14 +4337,21 @@ sub catchup_to_same_pos {
 
 }
 
-sub slave_is_running {
-   my ( $self, $slave_status ) = @_;
-   return ($slave_status->{slave_sql_running} || 'No') eq 'Yes';
+sub replica_is_running {
+   my ( $self, $replica_status, $replica_name ) = @_;
+   return ($replica_status->{"${replica_name}_sql_running"} || 'No') eq 'Yes';
 }
 
-sub has_slave_updates {
+sub has_replica_updates {
    my ( $self, $dbh ) = @_;
-   my $sql = q{SHOW VARIABLES LIKE 'log_slave_updates'};
+   
+   my $vp = VersionParser->new($dbh);
+   my $replica_name = 'replica';
+   if ( $vp < '8.1' || $vp->flavor() =~ m/maria/ ) {
+      $replica_name = 'slave';
+   }
+
+   my $sql = qq{SHOW VARIABLES LIKE 'log_${replica_name}_updates'};
    PTDEBUG && _d($dbh, $sql);
    my ($name, $value) = $dbh->selectrow_array($sql);
    return $value && $value =~ m/^(1|ON)$/;
@@ -4285,6 +4365,12 @@ sub repl_posn {
          position => $status->{position},
       };
    }
+   elsif ( exists $status->{relay_source_log_file} && exists $status->{exec_source_log_pos} ) {
+      return {
+         file     => $status->{relay_source_log_file},
+         position => $status->{exec_source_log_pos},
+      };
+   }
    else {
       return {
          file     => $status->{relay_master_log_file},
@@ -4293,11 +4379,18 @@ sub repl_posn {
    }
 }
 
-sub get_slave_lag {
+sub get_replica_lag {
    my ( $self, $dbh ) = @_;
-   my $stat = $self->get_slave_status($dbh);
-   return unless $stat;  # server is not a slave
-   return $stat->{seconds_behind_master};
+   
+   my $vp = VersionParser->new($dbh);
+   my $source_name = 'source';
+   if ( $vp < '8.1' || $vp->flavor() =~ m/maria/ ) {
+      $source_name = 'master';
+   }
+
+   my $stat = $self->get_replica_status($dbh);
+   return unless $stat;  # server is not a replica
+   return $stat->{"seconds_behind_${source_name}"};
 }
 
 sub pos_cmp {
@@ -4308,9 +4401,9 @@ sub pos_cmp {
 sub short_host {
    my ( $self, $dsn ) = @_;
    my ($host, $port);
-   if ( $dsn->{master_host} ) {
-      $host = $dsn->{master_host};
-      $port = $dsn->{master_port};
+   if ( $dsn->{source_host} ) {
+      $host = $dsn->{source_host};
+      $port = $dsn->{source_port};
    }
    else {
       $host = $dsn->{h};
@@ -4325,7 +4418,7 @@ sub is_replication_thread {
 
    my $type = lc($args{type} || 'all');
    die "Invalid type: $type"
-      unless $type =~ m/^binlog_dump|slave_io|slave_sql|all$/i;
+      unless $type =~ m/^binlog_dump|slave_io|slave_sql|replica_io|replica_sql|all$/i;
 
    my $match = 0;
    if ( $type =~ m/binlog_dump|all/i ) {
@@ -4334,7 +4427,7 @@ sub is_replication_thread {
    }
    if ( !$match ) {
       if ( ($query->{User} || $query->{user} || '') eq "system user" ) {
-         PTDEBUG && _d("Slave replication thread");
+         PTDEBUG && _d("Replica replication thread");
          if ( $type ne 'all' ) {
             my $state = $query->{State} || $query->{state} || '';
 
@@ -4343,15 +4436,16 @@ sub is_replication_thread {
                $match = 1;
             }
             else {
-               my ($slave_sql) = $state =~ m/
+               my ($replica_sql) = $state =~ m/
                   ^(Waiting\sfor\sthe\snext\sevent
                    |Reading\sevent\sfrom\sthe\srelay\slog
                    |Has\sread\sall\srelay\slog;\swaiting
                    |Making\stemp\sfile
-                   |Waiting\sfor\sslave\smutex\son\sexit)/xi;
+                   |Waiting\sfor\sslave\smutex\son\sexit
+                   |Waiting\sfor\sreplica\smutex\son\sexit)/xi;
 
-               $match = $type eq 'slave_sql' &&  $slave_sql ? 1
-                      : $type eq 'slave_io'  && !$slave_sql ? 1
+               $match = $type eq 'replica_sql' &&  $replica_sql ? 1
+                      : $type eq 'replica_io'  && !$replica_sql ? 1
                       :                                       0;
             }
          }
@@ -4392,9 +4486,15 @@ sub get_replication_filters {
    }
    my ($dbh) = @args{@required_args};
 
+   my $vp = VersionParser->new($dbh);
+   my $replica_name = 'replica';
+   if ( $vp < '8.1' || $vp->flavor() =~ m/maria/ ) {
+      $replica_name = 'slave';
+   }
+
    my %filters = ();
 
-   my $status = $self->get_master_status($dbh);
+   my $status = $self->get_source_status($dbh);
    if ( $status ) {
       map { $filters{$_} = $status->{$_} }
       grep { defined $status->{$_} && $status->{$_} ne '' }
@@ -4404,7 +4504,7 @@ sub get_replication_filters {
       );
    }
 
-   $status = $self->get_slave_status($dbh);
+   $status = $self->get_replica_status($dbh);
    if ( $status ) {
       map { $filters{$_} = $status->{$_} }
       grep { defined $status->{$_} && $status->{$_} ne '' }
@@ -4417,10 +4517,10 @@ sub get_replication_filters {
          replicate_wild_ignore_table
       );
 
-      my $sql = "SHOW VARIABLES LIKE 'slave_skip_errors'";
+      my $sql = "SHOW VARIABLES LIKE '${replica_name}_skip_errors'";
       PTDEBUG && _d($dbh, $sql);
       my $row = $dbh->selectrow_arrayref($sql);
-      $filters{slave_skip_errors} = $row->[1] if $row->[1] && $row->[1] ne 'OFF';
+      $filters{replica_skip_errors} = $row->[1] if $row->[1] && $row->[1] ne 'OFF';
    }
 
    return \%filters;
@@ -6510,9 +6610,9 @@ sub main {
    # ########################################################################
    my @lag_dbh;
    my $ms;
-   if ( $o->get('check-slave-lag') ) {
+   if ( $o->get('check-replica-lag') ) {
       my $dsn_defaults = $dp->parse_options($o);
-      my $lag_slaves_dsn = $o->get('check-slave-lag');
+      my $lag_slaves_dsn = $o->get('check-replica-lag');
       $ms = new MasterSlave(
          OptionParser => $o,
          DSNParser    => $dp,
@@ -7179,14 +7279,14 @@ sub main {
             my $lag_dbh = $lag_server->{'dbh'};
             my $id      = $lag_server->{'id'};
             if ( $lag_dbh ) {
-               my $lag = $ms->get_slave_lag($lag_dbh);
+               my $lag = $ms->get_replica_lag($lag_dbh);
                while ( !defined $lag || $lag > $o->get('max-lag') ) {
                   PTDEBUG && _d("Sleeping: slave lag for server '$id' is", $lag);
                   if ($o->got('progress')) {
                      _d("Sleeping: slave lag for server '$id' is", $lag);
                   }
                   sleep($o->get('check-interval'));
-                  $lag = $ms->get_slave_lag($lag_dbh);
+                  $lag = $ms->get_replica_lag($lag_dbh);
                   commit($o, $txnsize || $commit_each);
                   $src->{dbh}->do("SELECT 'pt-archiver keepalive'") if $src;
                   $dst->{dbh}->do("SELECT 'pt-archiver keepalive'") if $dst;
@@ -7585,7 +7685,7 @@ included.  The tool does not check for this!
 =item Non-cluster options
 
 Certain options may or may not work.  For example, if a cluster node
-is not also a slave, then L<"--check-slave-lag"> does not work.  And since PXC
+is not also a slave, then L<"--check-replica-lag"> does not work.  And since PXC
 tables are usually InnoDB, but InnoDB doesn't support C<INSERT DELAYED>, then
 L<"--delayed-insert"> does not work.  Other options may also not work, but
 the tool does not check them, therefore you should test archiving on a test
@@ -7793,11 +7893,11 @@ To disable this check, specify --no-check-columns.
 
 type: time; default: 1s
 
-If L<"--check-slave-lag"> is given, this defines how long the tool pauses each
+If L<"--check-replica-lag"> is given, this defines how long the tool pauses each
  time it discovers that a slave is lagging.
  This check is performed every 100 rows.
 
-=item --check-slave-lag
+=item --check-replica-lag
 
 type: string; repeatable: yes
 
@@ -8005,7 +8105,7 @@ This option is available for PXC versions 5.6 or higher.
 
 type: time; default: 1s
 
-Pause archiving if the slave given by L<"--check-slave-lag"> lags.
+Pause archiving if the slave given by L<"--check-replica-lag"> lags.
 
 This option causes pt-archiver to look at the slave every time it's about
 to fetch another row.  If the slave's lag is greater than the option's value,
@@ -8612,6 +8712,12 @@ dsn: user; copy: yes
 
 User for login if not current user.
 
+=item * s
+
+dsn: mysql_ssl; copy: yes
+
+Create SSL connection
+
 =back
 
 =head1 EXTENDING
diff --git a/bin/pt-config-diff b/bin/pt-config-diff
index 021fbd4de..0fd3821a3 100755
--- a/bin/pt-config-diff
+++ b/bin/pt-config-diff
@@ -2033,7 +2033,7 @@ sub get_cxn_params {
       $dsn = 'DBI:mysql:' . ( $info->{D} || '' ) . ';'
          . join(';', map  { "$opts{$_}->{dsn}=$info->{$_}" }
                      grep { defined $info->{$_} }
-                     qw(F h P S A))
+                     qw(F h P S A s))
          . ';mysql_read_default_group=client'
          . ($info->{L} ? ';mysql_local_infile=1' : '');
    }
diff --git a/bin/pt-deadlock-logger b/bin/pt-deadlock-logger
index 8b5a0d5b3..f144243be 100755
--- a/bin/pt-deadlock-logger
+++ b/bin/pt-deadlock-logger
@@ -2377,7 +2377,7 @@ sub get_cxn_params {
       $dsn = 'DBI:mysql:' . ( $info->{D} || '' ) . ';'
          . join(';', map  { "$opts{$_}->{dsn}=$info->{$_}" }
                      grep { defined $info->{$_} }
-                     qw(F h P S A))
+                     qw(F h P S A s))
          . ';mysql_read_default_group=client'
          . ($info->{L} ? ';mysql_local_infile=1' : '');
    }
diff --git a/bin/pt-duplicate-key-checker b/bin/pt-duplicate-key-checker
index 1b9e924a9..25df5f839 100755
--- a/bin/pt-duplicate-key-checker
+++ b/bin/pt-duplicate-key-checker
@@ -874,7 +874,7 @@ sub get_cxn_params {
       $dsn = 'DBI:mysql:' . ( $info->{D} || '' ) . ';'
          . join(';', map  { "$opts{$_}->{dsn}=$info->{$_}" }
                      grep { defined $info->{$_} }
-                     qw(F h P S A))
+                     qw(F h P S A s))
          . ';mysql_read_default_group=client'
          . ($info->{L} ? ';mysql_local_infile=1' : '');
    }
diff --git a/bin/pt-find b/bin/pt-find
index 1b1adbb42..6f66b5aa2 100755
--- a/bin/pt-find
+++ b/bin/pt-find
@@ -265,7 +265,7 @@ sub get_cxn_params {
       $dsn = 'DBI:mysql:' . ( $info->{D} || '' ) . ';'
          . join(';', map  { "$opts{$_}->{dsn}=$info->{$_}" }
                      grep { defined $info->{$_} }
-                     qw(F h P S A))
+                     qw(F h P S A s))
          . ';mysql_read_default_group=client'
          . ($info->{L} ? ';mysql_local_infile=1' : '');
    }
diff --git a/bin/pt-fk-error-logger b/bin/pt-fk-error-logger
index ed489d9f3..0d7485f4a 100755
--- a/bin/pt-fk-error-logger
+++ b/bin/pt-fk-error-logger
@@ -1531,7 +1531,7 @@ sub get_cxn_params {
       $dsn = 'DBI:mysql:' . ( $info->{D} || '' ) . ';'
          . join(';', map  { "$opts{$_}->{dsn}=$info->{$_}" }
                      grep { defined $info->{$_} }
-                     qw(F h P S A))
+                     qw(F h P S A s))
          . ';mysql_read_default_group=client'
          . ($info->{L} ? ';mysql_local_infile=1' : '');
    }
diff --git a/bin/pt-heartbeat b/bin/pt-heartbeat
index 342b86f20..ae6de56a7 100755
--- a/bin/pt-heartbeat
+++ b/bin/pt-heartbeat
@@ -143,7 +143,7 @@ sub new {
    return bless $self, $class;
 }
 
-sub get_slaves {
+sub get_replicas {
    my ($self, %args) = @_;
    my @required_args = qw(make_cxn);
    foreach my $arg ( @required_args ) {
@@ -151,11 +151,11 @@ sub get_slaves {
    }
    my ($make_cxn) = @args{@required_args};
 
-   my $slaves  = [];
+   my $replicas  = [];
    my $dp      = $self->{DSNParser};
    my $methods = $self->_resolve_recursion_methods($args{dsn});
 
-   return $slaves unless @$methods;
+   return $replicas unless @$methods;
 
    if ( grep { m/processlist|hosts/i } @$methods ) {
       my @required_args = qw(dbh dsn);
@@ -165,26 +165,26 @@ sub get_slaves {
       my ($dbh, $dsn) = @args{@required_args};
       my $o = $self->{OptionParser};
 
-      $self->recurse_to_slaves(
-         {  dbh            => $dbh,
-            dsn            => $dsn,
-            slave_user     => $o->got('slave-user') ? $o->get('slave-user') : '',
-            slave_password => $o->got('slave-password') ? $o->get('slave-password') : '',
-            slaves         => $args{slaves},
+      $self->recurse_to_replicas(
+         {  dbh              => $dbh,
+            dsn              => $dsn,
+            replica_user     => $o->got('replica-user') ? $o->get('replica-user') : '',
+            replica_password => $o->got('replica-password') ? $o->get('replica-password') : '',
+            replicas         => $args{replicas},
             callback  => sub {
                my ( $dsn, $dbh, $level, $parent ) = @_;
                return unless $level;
-               PTDEBUG && _d('Found slave:', $dp->as_string($dsn));
-               my $slave_dsn = $dsn;
-               if ($o->got('slave-user')) {
-                  $slave_dsn->{u} = $o->get('slave-user');
-                  PTDEBUG && _d("Using slave user ".$o->get('slave-user')." on ".$slave_dsn->{h}.":".$slave_dsn->{P});
+               PTDEBUG && _d('Found replica:', $dp->as_string($dsn));
+               my $replica_dsn = $dsn;
+               if ($o->got('replica-user')) {
+                  $replica_dsn->{u} = $o->get('replica-user');
+                  PTDEBUG && _d("Using replica user ".$o->get('replica-user')." on ".$replica_dsn->{h}.":".$replica_dsn->{P});
                }
-               if ($o->got('slave-password')) {
-                  $slave_dsn->{p} = $o->get('slave-password');
-                  PTDEBUG && _d("Slave password set");
+               if ($o->got('replica-password')) {
+                  $replica_dsn->{p} = $o->get('replica-password');
+                  PTDEBUG && _d("Replica password set");
                }
-               push @$slaves, $make_cxn->(dsn => $slave_dsn, dbh => $dbh, parent => $parent);
+               push @$replicas, $make_cxn->(dsn => $replica_dsn, dbh => $dbh, parent => $parent);
                return;
             },
             wait_no_die => $args{'wait_no_die'},
@@ -192,20 +192,20 @@ sub get_slaves {
       );
    } elsif ( $methods->[0] =~ m/^dsn=/i ) {
       (my $dsn_table_dsn = join ",", @$methods) =~ s/^dsn=//i;
-      $slaves = $self->get_cxn_from_dsn_table(
+      $replicas = $self->get_cxn_from_dsn_table(
          %args,
          dsn_table_dsn => $dsn_table_dsn,
          wait_no_die => $args{'wait_no_die'},
       );
    }
    elsif ( $methods->[0] =~ m/none/i ) {
-      PTDEBUG && _d('Not getting to slaves');
+      PTDEBUG && _d('Not getting to replicas');
    }
    else {
       die "Unexpected recursion methods: @$methods";
    }
 
-   return $slaves;
+   return $replicas;
 }
 
 sub _resolve_recursion_methods {
@@ -223,31 +223,31 @@ sub _resolve_recursion_methods {
    }
 }
 
-sub recurse_to_slaves {
+sub recurse_to_replicas {
    my ( $self, $args, $level ) = @_;
    $level ||= 0;
    my $dp = $self->{DSNParser};
    my $recurse = $args->{recurse} || $self->{OptionParser}->get('recurse');
    my $dsn = $args->{dsn};
-   my $slave_user = $args->{slave_user} || '';
-   my $slave_password = $args->{slave_password} || '';
+   my $replica_user = $args->{replica_user} || '';
+   my $replica_password = $args->{replica_password} || '';
 
    my $methods = $self->_resolve_recursion_methods($dsn);
    PTDEBUG && _d('Recursion methods:', @$methods);
    if ( lc($methods->[0]) eq 'none' ) {
-      PTDEBUG && _d('Not recursing to slaves');
+      PTDEBUG && _d('Not recursing to replicas');
       return;
    }
 
-   my $slave_dsn = $dsn;
-   if ($slave_user) {
-      $slave_dsn->{u} = $slave_user;
-      PTDEBUG && _d("Using slave user $slave_user on "
-         . $slave_dsn->{h} . ":" . ( $slave_dsn->{P} ? $slave_dsn->{P} : ""));
+   my $replica_dsn = $dsn;
+   if ($replica_user) {
+      $replica_dsn->{u} = $replica_user;
+      PTDEBUG && _d("Using replica user $replica_user on "
+         . $replica_dsn->{h} . ":" . ( $replica_dsn->{P} ? $replica_dsn->{P} : ""));
    }
-   if ($slave_password) {
-      $slave_dsn->{p} = $slave_password;
-      PTDEBUG && _d("Slave password set");
+   if ($replica_password) {
+      $replica_dsn->{p} = $replica_password;
+      PTDEBUG && _d("Replica password set");
    }
 
    my $dbh = $args->{dbh};
@@ -255,12 +255,12 @@ sub recurse_to_slaves {
    my $get_dbh = sub {
          eval {
             $dbh = $dp->get_dbh(
-               $dp->get_cxn_params($slave_dsn), { AutoCommit => 1 }
+               $dp->get_cxn_params($replica_dsn), { AutoCommit => 1 }
             );
-            PTDEBUG && _d('Connected to', $dp->as_string($slave_dsn));
+            PTDEBUG && _d('Connected to', $dp->as_string($replica_dsn));
          };
          if ( $EVAL_ERROR ) {
-            print STDERR "Cannot connect to ", $dp->as_string($slave_dsn), ": ", $EVAL_ERROR, "\n"
+            print STDERR "Cannot connect to ", $dp->as_string($replica_dsn), ": ", $EVAL_ERROR, "\n"
                or die "Cannot print: $OS_ERROR";
             return;
          }
@@ -268,10 +268,10 @@ sub recurse_to_slaves {
 
    DBH: {
       if ( !defined $dbh ) {
-         foreach my $known_slave ( @{$args->{slaves}} ) {
-            if ($known_slave->{dsn}->{h} eq $slave_dsn->{h} and
-                $known_slave->{dsn}->{P} eq $slave_dsn->{P} ) {
-               $dbh = $known_slave->{dbh};
+         foreach my $known_replica ( @{$args->{replicas}} ) {
+            if ($known_replica->{dsn}->{h} eq $replica_dsn->{h} and
+                $known_replica->{dsn}->{P} eq $replica_dsn->{P} ) {
+               $dbh = $known_replica->{dbh};
                last DBH;
             }
          }
@@ -289,7 +289,7 @@ sub recurse_to_slaves {
 	   if ( $EVAL_ERROR ) {
 		   if ( $args->{wait_no_die} ) {
 			   print STDERR "Error getting server id: ", $EVAL_ERROR,
-               "\nRetrying query for server ", $slave_dsn->{h}, ":", $slave_dsn->{P}, "\n";
+               "\nRetrying query for server ", $replica_dsn->{h}, ":", $replica_dsn->{P}, "\n";
             sleep 1;
             $dbh->disconnect();
             $get_dbh->();
@@ -299,12 +299,12 @@ sub recurse_to_slaves {
       }
    } until (defined $id);
    PTDEBUG && _d('Working on server ID', $id);
-   my $master_thinks_i_am = $dsn->{server_id};
+   my $source_thinks_i_am = $dsn->{server_id};
    if ( !defined $id
-       || ( defined $master_thinks_i_am && $master_thinks_i_am != $id )
+       || ( defined $source_thinks_i_am && $source_thinks_i_am != $id )
        || $args->{server_ids_seen}->{$id}++
    ) {
-      PTDEBUG && _d('Server ID seen, or not what master said');
+      PTDEBUG && _d('Server ID seen, or not what source said');
       if ( $args->{skip_callback} ) {
          $args->{skip_callback}->($dsn, $dbh, $level, $args->{parent});
       }
@@ -315,51 +315,51 @@ sub recurse_to_slaves {
 
    if ( !defined $recurse || $level < $recurse ) {
 
-      my @slaves =
-         grep { !$_->{master_id} || $_->{master_id} == $id } # Only my slaves.
-         $self->find_slave_hosts($dp, $dbh, $dsn, $methods);
+      my @replicas =
+         grep { !$_->{source_id} || $_->{source_id} == $id } # Only my replicas.
+         $self->find_replica_hosts($dp, $dbh, $dsn, $methods);
 
-      foreach my $slave ( @slaves ) {
+      foreach my $replica ( @replicas ) {
          PTDEBUG && _d('Recursing from',
-            $dp->as_string($dsn), 'to', $dp->as_string($slave));
-         $self->recurse_to_slaves(
-            { %$args, dsn => $slave, dbh => undef, parent => $dsn, slave_user => $slave_user, $slave_password => $slave_password }, $level + 1 );
+            $dp->as_string($dsn), 'to', $dp->as_string($replica));
+         $self->recurse_to_replicas(
+            { %$args, dsn => $replica, dbh => undef, parent => $dsn, replica_user => $replica_user, $replica_password => $replica_password }, $level + 1 );
       }
    }
 }
 
-sub find_slave_hosts {
+sub find_replica_hosts {
    my ( $self, $dsn_parser, $dbh, $dsn, $methods ) = @_;
 
-   PTDEBUG && _d('Looking for slaves on', $dsn_parser->as_string($dsn),
+   PTDEBUG && _d('Looking for replicas on', $dsn_parser->as_string($dsn),
       'using methods', @$methods);
 
-   my @slaves;
+   my @replicas;
    METHOD:
    foreach my $method ( @$methods ) {
-      my $find_slaves = "_find_slaves_by_$method";
-      PTDEBUG && _d('Finding slaves with', $find_slaves);
-      @slaves = $self->$find_slaves($dsn_parser, $dbh, $dsn);
-      last METHOD if @slaves;
+      my $find_replicas = "_find_replicas_by_$method";
+      PTDEBUG && _d('Finding replicas with', $find_replicas);
+      @replicas = $self->$find_replicas($dsn_parser, $dbh, $dsn);
+      last METHOD if @replicas;
    }
 
-   PTDEBUG && _d('Found', scalar(@slaves), 'slaves');
-   return @slaves;
+   PTDEBUG && _d('Found', scalar(@replicas), 'replicas');
+   return @replicas;
 }
 
-sub _find_slaves_by_processlist {
+sub _find_replicas_by_processlist {
    my ( $self, $dsn_parser, $dbh, $dsn ) = @_;
-   my @connected_slaves = $self->get_connected_slaves($dbh);
-   my @slaves = $self->_process_slaves_list($dsn_parser, $dsn, \@connected_slaves);
-   return @slaves;
+   my @connected_replicas = $self->get_connected_replicas($dbh);
+   my @replicas = $self->_process_replicas_list($dsn_parser, $dsn, \@connected_replicas);
+   return @replicas;
 }
 
-sub _process_slaves_list {
-   my ($self, $dsn_parser, $dsn, $connected_slaves) = @_;
-   my @slaves = map  {
-      my $slave        = $dsn_parser->parse("h=$_", $dsn);
-      $slave->{source} = 'processlist';
-      $slave;
+sub _process_replicas_list {
+   my ($self, $dsn_parser, $dsn, $connected_replicas) = @_;
+   my @replicas = map  {
+      my $replica        = $dsn_parser->parse("h=$_", $dsn);
+      $replica->{source} = 'processlist';
+      $replica;
    }
    grep { $_ }
    map  {
@@ -371,22 +371,28 @@ sub _process_slaves_list {
           $host = '['.$host.']';
       }
       $host;
-   } @$connected_slaves;
+   } @$connected_replicas;
 
-   return @slaves;
+   return @replicas;
 }
 
-sub _find_slaves_by_hosts {
+sub _find_replicas_by_hosts {
    my ( $self, $dsn_parser, $dbh, $dsn ) = @_;
 
-   my @slaves;
-   my $sql = 'SHOW SLAVE HOSTS';
+   my @replicas;
+
+   my $vp = VersionParser->new($dbh);
+   my $sql = 'SHOW REPLICAS';
+   if ( $vp < '8.1' || $vp->flavor() =~ m/maria/ ) {
+      $sql = 'SHOW SLAVE HOSTS';
+   }
+   
    PTDEBUG && _d($dbh, $sql);
-   @slaves = @{$dbh->selectall_arrayref($sql, { Slice => {} })};
+   @replicas = @{$dbh->selectall_arrayref($sql, { Slice => {} })};
 
-   if ( @slaves ) {
-      PTDEBUG && _d('Found some SHOW SLAVE HOSTS info');
-      @slaves = map {
+   if ( @replicas ) {
+      PTDEBUG && _d('Found some SHOW REPLICAS info');
+      @replicas = map {
          my %hash;
          @hash{ map { lc $_ } keys %$_ } = values %$_;
          my $spec = "h=$hash{host},P=$hash{port}"
@@ -394,16 +400,16 @@ sub _find_slaves_by_hosts {
             . ( $hash{password} ? ",p=$hash{password}" : '');
          my $dsn           = $dsn_parser->parse($spec, $dsn);
          $dsn->{server_id} = $hash{server_id};
-         $dsn->{master_id} = $hash{master_id};
+         $dsn->{source_id} = $hash{source_id};
          $dsn->{source}    = 'hosts';
          $dsn;
-      } @slaves;
+      } @replicas;
    }
 
-   return @slaves;
+   return @replicas;
 }
 
-sub get_connected_slaves {
+sub get_connected_replicas {
    my ( $self, $dbh ) = @_;
 
    my $show = "SHOW GRANTS FOR ";
@@ -449,79 +455,103 @@ sub get_connected_slaves {
    @{$dbh->selectall_arrayref($sql, { Slice => {} })};
 }
 
-sub is_master_of {
-   my ( $self, $master, $slave ) = @_;
-   my $master_status = $self->get_master_status($master)
-      or die "The server specified as a master is not a master";
-   my $slave_status  = $self->get_slave_status($slave)
-      or die "The server specified as a slave is not a slave";
-   my @connected     = $self->get_connected_slaves($master)
-      or die "The server specified as a master has no connected slaves";
-   my (undef, $port) = $master->selectrow_array("SHOW VARIABLES LIKE 'port'");
+sub is_source_of {
+   my ( $self, $source, $replica ) = @_;
+
+   my $replica_version = VersionParser->new($replica);
+   my $source_name = 'source';
+   my $source_port = 'source_port';
+   if ( $replica_version < '8.1' || $replica_version->flavor() =~ m/maria/ ) {
+      $source_name = 'master';
+      $source_port = 'master_port';
+   }
+
+   my $source_status = $self->get_source_status($source)
+      or die "The server specified as a source is not a source";
+   my $replica_status  = $self->get_replica_status($replica)
+      or die "The server specified as a replica is not a replica";
+   my @connected     = $self->get_connected_replicas($source)
+      or die "The server specified as a source has no connected replicas";
+   my (undef, $port) = $source->selectrow_array("SHOW VARIABLES LIKE 'port'");
 
-   if ( $port != $slave_status->{master_port} ) {
-      die "The slave is connected to $slave_status->{master_port} "
-         . "but the master's port is $port";
+   if ( $port != $replica_status->{$source_port} ) {
+      die "The replica is connected to $replica_status->{$source_port} "
+         . "but the source's port is $port";
    }
 
-   if ( !grep { $slave_status->{master_user} eq $_->{user} } @connected ) {
-      die "I don't see any slave I/O thread connected with user "
-         . $slave_status->{master_user};
+   if ( !grep { $replica_status->{source_user} eq $_->{user} } @connected ) {
+      die "I don't see any replica I/O thread connected with user "
+         . $replica_status->{source_user};
    }
 
-   if ( ($slave_status->{slave_io_state} || '')
-      eq 'Waiting for master to send event' )
+   if ( ($replica_status->{replica_io_state} || '')
+      eq 'Waiting for ${source_name} to send event' )
    {
-      my ( $master_log_name, $master_log_num )
-         = $master_status->{file} =~ m/^(.*?)\.0*([1-9][0-9]*)$/;
-      my ( $slave_log_name, $slave_log_num )
-         = $slave_status->{master_log_file} =~ m/^(.*?)\.0*([1-9][0-9]*)$/;
-      if ( $master_log_name ne $slave_log_name
-         || abs($master_log_num - $slave_log_num) > 1 )
+      my ( $source_log_name, $source_log_num )
+         = $source_status->{file} =~ m/^(.*?)\.0*([1-9][0-9]*)$/;
+      my ( $replica_log_name, $replica_log_num )
+         = $replica_status->{source_log_file} =~ m/^(.*?)\.0*([1-9][0-9]*)$/;
+      if ( $source_log_name ne $replica_log_name
+         || abs($source_log_num - $replica_log_num) > 1 )
       {
-         die "The slave thinks it is reading from "
-            . "$slave_status->{master_log_file},  but the "
-            . "master is writing to $master_status->{file}";
+         die "The replica thinks it is reading from "
+            . "$replica_status->{source_log_file},  but the "
+            . "source is writing to $source_status->{file}";
       }
    }
    return 1;
 }
 
-sub get_master_dsn {
+sub get_source_dsn {
    my ( $self, $dbh, $dsn, $dsn_parser ) = @_;
-   my $master = $self->get_slave_status($dbh) or return undef;
-   my $spec   = "h=$master->{master_host},P=$master->{master_port}";
+
+   my $vp = VersionParser->new($dbh);
+   my $source_host = 'source_host';
+   my $source_port = 'source_port';
+   if ( $vp < '8.1' || $vp->flavor() =~ m/maria/ ) {
+      $source_host = 'master_host';
+      $source_port = 'master_port';
+   }
+
+   my $source = $self->get_replica_status($dbh) or return undef;
+   my $spec   = "h=$source->{${source_host}},P=$source->{${source_port}}";
    return       $dsn_parser->parse($spec, $dsn);
 }
 
-sub get_slave_status {
+sub get_replica_status {
    my ( $self, $dbh ) = @_;
 
-   if ( !$self->{not_a_slave}->{$dbh} ) {
-      my $sth = $self->{sths}->{$dbh}->{SLAVE_STATUS}
-            ||= $dbh->prepare('SHOW SLAVE STATUS');
-      PTDEBUG && _d($dbh, 'SHOW SLAVE STATUS');
+   my $server_version = VersionParser->new($dbh);
+   my $replica_name = 'replica';
+   if ( $server_version < '8.1' || $server_version->flavor() =~ m/maria/ ) {
+      $replica_name = 'replica';
+   }
+
+   if ( !$self->{not_a_replica}->{$dbh} ) {
+      my $sth = $self->{sths}->{$dbh}->{REPLICA_STATUS}
+            ||= $dbh->prepare("SHOW ${replica_name} STATUS");
+      PTDEBUG && _d($dbh, "SHOW ${replica_name} STATUS");
       $sth->execute();
-      my ($sss_rows) = $sth->fetchall_arrayref({}); # Show Slave Status rows
+      my ($sss_rows) = $sth->fetchall_arrayref({}); # Show Replica Status rows
 
       my $ss;
       if ( $sss_rows && @$sss_rows ) {
           if (scalar @$sss_rows > 1) {
               if (!$self->{channel}) {
-                  die 'This server returned more than one row for SHOW SLAVE STATUS but "channel" was not specified on the command line';
+                  die 'This server returned more than one row for SHOW REPLICA STATUS but "channel" was not specified on the command line';
               }
-              my $slave_use_channels;
+              my $replica_use_channels;
               for my $row (@$sss_rows) {
                   $row = { map { lc($_) => $row->{$_} } keys %$row }; # lowercase the keys
                   if ($row->{channel_name}) {
-                      $slave_use_channels = 1;
+                      $replica_use_channels = 1;
                   }
                   if ($row->{channel_name} eq $self->{channel}) {
                       $ss = $row;
                       last;
                   }
               }
-              if (!$ss && $slave_use_channels) {
+              if (!$ss && $replica_use_channels) {
                  die 'This server is using replication channels but "channel" was not specified on the command line';
               }
           } else {
@@ -541,28 +571,34 @@ sub get_slave_status {
           }
       }
 
-      PTDEBUG && _d('This server returns nothing for SHOW SLAVE STATUS');
-      $self->{not_a_slave}->{$dbh}++;
+      PTDEBUG && _d('This server returns nothing for SHOW REPLICA STATUS');
+      $self->{not_a_replica}->{$dbh}++;
   }
 }
 
-sub get_master_status {
+sub get_source_status {
    my ( $self, $dbh ) = @_;
 
-   if ( $self->{not_a_master}->{$dbh} ) {
-      PTDEBUG && _d('Server on dbh', $dbh, 'is not a master');
+   if ( $self->{not_a_source}->{$dbh} ) {
+      PTDEBUG && _d('Server on dbh', $dbh, 'is not a source');
       return;
    }
 
+   my $vp = VersionParser->new($dbh);
+   my $source_name = 'binary log';
+   if ( $vp < '8.1' || $vp->flavor() =~ m/maria/ ) {
+      $source_name = 'master';
+   }
+
    my $sth;
    if ( $self->{sths}->{$dbh} && $dbh && $self->{sths}->{$dbh} == $dbh ) {
-      $sth = $self->{sths}->{$dbh}->{MASTER_STATUS}
-         ||= $dbh->prepare('SHOW MASTER STATUS');
+      $sth = $self->{sths}->{$dbh}->{SOURCE_STATUS}
+         ||= $dbh->prepare("SHOW ${source_name} STATUS");
    }
    else {
-      $sth = $dbh->prepare('SHOW MASTER STATUS');
+      $sth = $dbh->prepare("SHOW ${source_name} STATUS");
    }
-   PTDEBUG && _d($dbh, 'SHOW MASTER STATUS');
+   PTDEBUG && _d($dbh, "SHOW ${source_name} STATUS");
    $sth->execute();
    my ($ms) = @{$sth->fetchall_arrayref({})};
    PTDEBUG && _d(
@@ -570,42 +606,46 @@ sub get_master_status {
           : '');
 
    if ( !$ms || scalar keys %$ms < 2 ) {
-      PTDEBUG && _d('Server on dbh', $dbh, 'does not seem to be a master');
-      $self->{not_a_master}->{$dbh}++;
+      PTDEBUG && _d('Server on dbh', $dbh, 'does not seem to be a source');
+      $self->{not_a_source}->{$dbh}++;
    }
 
   return { map { lc($_) => $ms->{$_} } keys %$ms }; # lowercase the keys
 }
 
-sub wait_for_master {
+sub wait_for_source {
    my ( $self, %args ) = @_;
-   my @required_args = qw(master_status slave_dbh);
+   my @required_args = qw(source_status replica_dbh);
    foreach my $arg ( @required_args ) {
       die "I need a $arg argument" unless $args{$arg};
    }
-   my ($master_status, $slave_dbh) = @args{@required_args};
+   my ($source_status, $replica_dbh) = @args{@required_args};
    my $timeout       = $args{timeout} || 60;
 
    my $result;
    my $waited;
-   if ( $master_status ) {
-      my $slave_status;
+   if ( $source_status ) {
+      my $replica_status;
       eval {
-          $slave_status = $self->get_slave_status($slave_dbh);
+          $replica_status = $self->get_replica_status($replica_dbh);
       };
       if ($EVAL_ERROR) {
           return {
               result => undef,
               waited => 0,
-              error  =>'Wait for master: this is a multi-master slave but "channel" was not specified on the command line',
+              error  =>'Wait for source: this is a multi-source replica but "channel" was not specified on the command line',
           };
       }
-      my $server_version = VersionParser->new($slave_dbh);
-      my $channel_sql = $server_version > '5.6' && $self->{channel} ? ", '$self->{channel}'" : '';
-      my $sql = "SELECT MASTER_POS_WAIT('$master_status->{file}', $master_status->{position}, $timeout $channel_sql)";
-      PTDEBUG && _d($slave_dbh, $sql);
+      my $vp = VersionParser->new($replica_dbh);
+      my $source_name = 'source';
+      if ( $vp < '8.1' || $vp->flavor() =~ m/maria/ ) {
+         $source_name = 'master';
+      }
+      my $channel_sql = $vp > '5.6' && $self->{channel} ? ", '$self->{channel}'" : '';
+      my $sql = "SELECT ${source_name}_POS_WAIT('$source_status->{file}', $source_status->{position}, $timeout $channel_sql)";
+      PTDEBUG && _d($replica_dbh, $sql);
       my $start = time;
-      ($result) = $slave_dbh->selectrow_array($sql);
+      ($result) = $replica_dbh->selectrow_array($sql);
 
       $waited = time - $start;
 
@@ -613,7 +653,7 @@ sub wait_for_master {
       PTDEBUG && _d("Waited", $waited, "seconds");
    }
    else {
-      PTDEBUG && _d('Not waiting: this server is not a master');
+      PTDEBUG && _d('Not waiting: this server is not a source');
    }
 
    return {
@@ -622,75 +662,96 @@ sub wait_for_master {
    };
 }
 
-sub stop_slave {
+sub stop_replica {
    my ( $self, $dbh ) = @_;
-   my $sth = $self->{sths}->{$dbh}->{STOP_SLAVE}
-         ||= $dbh->prepare('STOP SLAVE');
+   my $vp = VersionParser->new($dbh);
+   my $replica_name = 'replica';
+   if ( $vp < '8.1' || $vp->flavor() =~ m/maria/ ) {
+      $replica_name = 'replica';
+   }
+   my $sth = $self->{sths}->{$dbh}->{STOP_REPLICA}
+         ||= $dbh->prepare("STOP ${replica_name}");
    PTDEBUG && _d($dbh, $sth->{Statement});
    $sth->execute();
 }
 
-sub start_slave {
+sub start_replica {
    my ( $self, $dbh, $pos ) = @_;
+
+   my $vp = VersionParser->new($dbh);
+   my $source_name = 'source';
+   my $replica_name = 'replica';
+   if ( $vp < '8.1' || $vp->flavor() =~ m/maria/ ) {
+      $source_name = 'master';
+      $replica_name = 'slave';
+   }
+
    if ( $pos ) {
-      my $sql = "START SLAVE UNTIL MASTER_LOG_FILE='$pos->{file}', "
-              . "MASTER_LOG_POS=$pos->{position}";
+      my $sql = "START ${replica_name} UNTIL ${source_name}_LOG_FILE='$pos->{file}', "
+              . "${source_name}_LOG_POS=$pos->{position}";
       PTDEBUG && _d($dbh, $sql);
       $dbh->do($sql);
    }
    else {
-      my $sth = $self->{sths}->{$dbh}->{START_SLAVE}
-            ||= $dbh->prepare('START SLAVE');
+      my $sth = $self->{sths}->{$dbh}->{START_REPLICA}
+            ||= $dbh->prepare("START ${replica_name}");
       PTDEBUG && _d($dbh, $sth->{Statement});
       $sth->execute();
    }
 }
 
-sub catchup_to_master {
-   my ( $self, $slave, $master, $timeout ) = @_;
-   $self->stop_slave($master);
-   $self->stop_slave($slave);
-   my $slave_status  = $self->get_slave_status($slave);
-   my $slave_pos     = $self->repl_posn($slave_status);
-   my $master_status = $self->get_master_status($master);
-   my $master_pos    = $self->repl_posn($master_status);
-   PTDEBUG && _d('Master position:', $self->pos_to_string($master_pos),
-      'Slave position:', $self->pos_to_string($slave_pos));
+sub catchup_to_source {
+   my ( $self, $replica, $source, $timeout ) = @_;
+   $self->stop_replica($source);
+   $self->stop_replica($replica);
+   my $replica_status  = $self->get_replica_status($replica);
+   my $replica_pos     = $self->repl_posn($replica_status);
+   my $source_status = $self->get_source_status($source);
+   my $source_pos    = $self->repl_posn($source_status);
+   PTDEBUG && _d('Source position:', $self->pos_to_string($source_pos),
+      'Replica position:', $self->pos_to_string($replica_pos));
 
    my $result;
-   if ( $self->pos_cmp($slave_pos, $master_pos) < 0 ) {
-      PTDEBUG && _d('Waiting for slave to catch up to master');
-      $self->start_slave($slave, $master_pos);
+   if ( $self->pos_cmp($replica_pos, $source_pos) < 0 ) {
+      PTDEBUG && _d('Waiting for replica to catch up to source');
+      $self->start_replica($replica, $source_pos);
 
-      $result = $self->wait_for_master(
-            master_status => $master_status,
-            slave_dbh     => $slave,
+      $result = $self->wait_for_source(
+            source_status => $source_status,
+            replica_dbh   => $replica,
             timeout       => $timeout,
-            master_status => $master_status
+            source_status => $source_status
       );
       if ($result->{error}) {
           die $result->{error};
       }
       if ( !defined $result->{result} ) {
-         $slave_status = $self->get_slave_status($slave);
-         if ( !$self->slave_is_running($slave_status) ) {
-            PTDEBUG && _d('Master position:',
-               $self->pos_to_string($master_pos),
-               'Slave position:', $self->pos_to_string($slave_pos));
-            $slave_pos = $self->repl_posn($slave_status);
-            if ( $self->pos_cmp($slave_pos, $master_pos) != 0 ) {
-               die "MASTER_POS_WAIT() returned NULL but slave has not "
-                  . "caught up to master";
+         $replica_status = $self->get_replica_status($replica);
+            
+         my $vp = VersionParser->new($replica);
+         my $replica_name = 'replica';
+         if ( $vp < '8.1' || $vp->flavor() =~ m/maria/ ) {
+            $replica_name = 'slave';
+         }
+
+         if ( !$self->replica_is_running($replica_status, $replica_name) ) {
+            PTDEBUG && _d('Source position:',
+               $self->pos_to_string($source_pos),
+               'Replica position:', $self->pos_to_string($replica_pos));
+            $replica_pos = $self->repl_posn($replica_status);
+            if ( $self->pos_cmp($replica_pos, $source_pos) != 0 ) {
+               die "SOURCE_POS_WAIT() returned NULL but replica has not "
+                  . "caught up to source";
             }
-            PTDEBUG && _d('Slave is caught up to master and stopped');
+            PTDEBUG && _d('Replica is caught up to source and stopped');
          }
          else {
-            die "Slave has not caught up to master and it is still running";
+            die "Replica has not caught up to source and it is still running";
          }
       }
    }
    else {
-      PTDEBUG && _d("Slave is already caught up to master");
+      PTDEBUG && _d("Replica is already caught up to source");
    }
 
    return $result;
@@ -698,26 +759,38 @@ sub catchup_to_master {
 
 sub catchup_to_same_pos {
    my ( $self, $s1_dbh, $s2_dbh ) = @_;
-   $self->stop_slave($s1_dbh);
-   $self->stop_slave($s2_dbh);
-   my $s1_status = $self->get_slave_status($s1_dbh);
-   my $s2_status = $self->get_slave_status($s2_dbh);
+   $self->stop_replica($s1_dbh);
+   $self->stop_replica($s2_dbh);
+   my $s1_status = $self->get_replica_status($s1_dbh);
+   my $s2_status = $self->get_replica_status($s2_dbh);
    my $s1_pos    = $self->repl_posn($s1_status);
    my $s2_pos    = $self->repl_posn($s2_status);
    if ( $self->pos_cmp($s1_pos, $s2_pos) < 0 ) {
-      $self->start_slave($s1_dbh, $s2_pos);
+      $self->start_replica($s1_dbh, $s2_pos);
    }
    elsif ( $self->pos_cmp($s2_pos, $s1_pos) < 0 ) {
-      $self->start_slave($s2_dbh, $s1_pos);
+      $self->start_replica($s2_dbh, $s1_pos);
    }
 
-   $s1_status = $self->get_slave_status($s1_dbh);
-   $s2_status = $self->get_slave_status($s2_dbh);
+   $s1_status = $self->get_replica_status($s1_dbh);
+   $s2_status = $self->get_replica_status($s2_dbh);
    $s1_pos    = $self->repl_posn($s1_status);
    $s2_pos    = $self->repl_posn($s2_status);
 
-   if ( $self->slave_is_running($s1_status)
-     || $self->slave_is_running($s2_status)
+   my $vp1 = VersionParser->new($s1_dbh);
+   my $replica1_name = 'replica';
+   if ( $vp1 < '8.1' || $vp1->flavor() =~ m/maria/ ) {
+      $replica1_name = 'slave';
+   }
+
+   my $vp2 = VersionParser->new($s2_dbh);
+   my $replica2_name = 'replica';
+   if ( $vp2 < '8.1' || $vp2->flavor() =~ m/maria/ ) {
+      $replica2_name = 'slave';
+   }
+
+   if ( $self->replica_is_running($s1_status, $replica1_name)
+     || $self->replica_is_running($s2_status, $replica2_name)
      || $self->pos_cmp($s1_pos, $s2_pos) != 0)
    {
       die "The servers aren't both stopped at the same position";
@@ -725,14 +798,21 @@ sub catchup_to_same_pos {
 
 }
 
-sub slave_is_running {
-   my ( $self, $slave_status ) = @_;
-   return ($slave_status->{slave_sql_running} || 'No') eq 'Yes';
+sub replica_is_running {
+   my ( $self, $replica_status, $replica_name ) = @_;
+   return ($replica_status->{"${replica_name}_sql_running"} || 'No') eq 'Yes';
 }
 
-sub has_slave_updates {
+sub has_replica_updates {
    my ( $self, $dbh ) = @_;
-   my $sql = q{SHOW VARIABLES LIKE 'log_slave_updates'};
+   
+   my $vp = VersionParser->new($dbh);
+   my $replica_name = 'replica';
+   if ( $vp < '8.1' || $vp->flavor() =~ m/maria/ ) {
+      $replica_name = 'slave';
+   }
+
+   my $sql = qq{SHOW VARIABLES LIKE 'log_${replica_name}_updates'};
    PTDEBUG && _d($dbh, $sql);
    my ($name, $value) = $dbh->selectrow_array($sql);
    return $value && $value =~ m/^(1|ON)$/;
@@ -746,6 +826,12 @@ sub repl_posn {
          position => $status->{position},
       };
    }
+   elsif ( exists $status->{relay_source_log_file} && exists $status->{exec_source_log_pos} ) {
+      return {
+         file     => $status->{relay_source_log_file},
+         position => $status->{exec_source_log_pos},
+      };
+   }
    else {
       return {
          file     => $status->{relay_master_log_file},
@@ -754,11 +840,18 @@ sub repl_posn {
    }
 }
 
-sub get_slave_lag {
+sub get_replica_lag {
    my ( $self, $dbh ) = @_;
-   my $stat = $self->get_slave_status($dbh);
-   return unless $stat;  # server is not a slave
-   return $stat->{seconds_behind_master};
+   
+   my $vp = VersionParser->new($dbh);
+   my $source_name = 'source';
+   if ( $vp < '8.1' || $vp->flavor() =~ m/maria/ ) {
+      $source_name = 'master';
+   }
+
+   my $stat = $self->get_replica_status($dbh);
+   return unless $stat;  # server is not a replica
+   return $stat->{"seconds_behind_${source_name}"};
 }
 
 sub pos_cmp {
@@ -769,9 +862,9 @@ sub pos_cmp {
 sub short_host {
    my ( $self, $dsn ) = @_;
    my ($host, $port);
-   if ( $dsn->{master_host} ) {
-      $host = $dsn->{master_host};
-      $port = $dsn->{master_port};
+   if ( $dsn->{source_host} ) {
+      $host = $dsn->{source_host};
+      $port = $dsn->{source_port};
    }
    else {
       $host = $dsn->{h};
@@ -786,7 +879,7 @@ sub is_replication_thread {
 
    my $type = lc($args{type} || 'all');
    die "Invalid type: $type"
-      unless $type =~ m/^binlog_dump|slave_io|slave_sql|all$/i;
+      unless $type =~ m/^binlog_dump|slave_io|slave_sql|replica_io|replica_sql|all$/i;
 
    my $match = 0;
    if ( $type =~ m/binlog_dump|all/i ) {
@@ -795,7 +888,7 @@ sub is_replication_thread {
    }
    if ( !$match ) {
       if ( ($query->{User} || $query->{user} || '') eq "system user" ) {
-         PTDEBUG && _d("Slave replication thread");
+         PTDEBUG && _d("Replica replication thread");
          if ( $type ne 'all' ) {
             my $state = $query->{State} || $query->{state} || '';
 
@@ -804,15 +897,16 @@ sub is_replication_thread {
                $match = 1;
             }
             else {
-               my ($slave_sql) = $state =~ m/
+               my ($replica_sql) = $state =~ m/
                   ^(Waiting\sfor\sthe\snext\sevent
                    |Reading\sevent\sfrom\sthe\srelay\slog
                    |Has\sread\sall\srelay\slog;\swaiting
                    |Making\stemp\sfile
-                   |Waiting\sfor\sslave\smutex\son\sexit)/xi;
+                   |Waiting\sfor\sslave\smutex\son\sexit
+                   |Waiting\sfor\sreplica\smutex\son\sexit)/xi;
 
-               $match = $type eq 'slave_sql' &&  $slave_sql ? 1
-                      : $type eq 'slave_io'  && !$slave_sql ? 1
+               $match = $type eq 'replica_sql' &&  $replica_sql ? 1
+                      : $type eq 'replica_io'  && !$replica_sql ? 1
                       :                                       0;
             }
          }
@@ -853,9 +947,15 @@ sub get_replication_filters {
    }
    my ($dbh) = @args{@required_args};
 
+   my $vp = VersionParser->new($dbh);
+   my $replica_name = 'replica';
+   if ( $vp < '8.1' || $vp->flavor() =~ m/maria/ ) {
+      $replica_name = 'slave';
+   }
+
    my %filters = ();
 
-   my $status = $self->get_master_status($dbh);
+   my $status = $self->get_source_status($dbh);
    if ( $status ) {
       map { $filters{$_} = $status->{$_} }
       grep { defined $status->{$_} && $status->{$_} ne '' }
@@ -865,7 +965,7 @@ sub get_replication_filters {
       );
    }
 
-   $status = $self->get_slave_status($dbh);
+   $status = $self->get_replica_status($dbh);
    if ( $status ) {
       map { $filters{$_} = $status->{$_} }
       grep { defined $status->{$_} && $status->{$_} ne '' }
@@ -878,10 +978,10 @@ sub get_replication_filters {
          replicate_wild_ignore_table
       );
 
-      my $sql = "SHOW VARIABLES LIKE 'slave_skip_errors'";
+      my $sql = "SHOW VARIABLES LIKE '${replica_name}_skip_errors'";
       PTDEBUG && _d($dbh, $sql);
       my $row = $dbh->selectrow_arrayref($sql);
-      $filters{slave_skip_errors} = $row->[1] if $row->[1] && $row->[1] ne 'OFF';
+      $filters{replica_skip_errors} = $row->[1] if $row->[1] && $row->[1] ne 'OFF';
    }
 
    return \%filters;
@@ -2913,7 +3013,7 @@ sub get_cxn_params {
       $dsn = 'DBI:mysql:' . ( $info->{D} || '' ) . ';'
          . join(';', map  { "$opts{$_}->{dsn}=$info->{$_}" }
                      grep { defined $info->{$_} }
-                     qw(F h P S A))
+                     qw(F h P S A s))
          . ';mysql_read_default_group=client'
          . ($info->{L} ? ';mysql_local_infile=1' : '');
    }
@@ -6243,7 +6343,7 @@ sub main {
          $pk_val = $server_id;
       }
       else {  # monitor or check
-         my $master_server_id = $o->get('master-server-id');
+         my $master_server_id = $o->get('source-server-id');
          if ( !$master_server_id ) {
             eval {
                my $ms = new MasterSlave(
@@ -6251,7 +6351,7 @@ sub main {
                   DSNParser    => $dp,
                   Quoter       => $q,
                );
-               my $master_dsn = $ms->get_master_dsn($dbh, $dsn, $dp)
+               my $master_dsn = $ms->get_source_dsn($dbh, $dsn, $dp)
                   or die "This server is not a slave";
                my $master_dbh = $dp->get_dbh($dp->get_cxn_params($master_dsn),
                   { AutoCommit => 1 });
@@ -6264,7 +6364,7 @@ sub main {
             }
          }
          if ( !$master_server_id ) {
-            die "The --master-server-id option must be specified because "
+            die "The --source-server-id option must be specified because "
                . "the heartbeat table $db_tbl uses the server_id column "
                . "for --update or --check but the server's master could "
                . "not be automatically determined.\n"
@@ -6317,12 +6417,19 @@ sub main {
    my ($get_delay, $update_heartbeat);
 
    if ( $o->get('update') ) {
+      my $vp = VersionParser->new($dbh);
+
+      my $source_name = 'source';
+      if ( $vp < '8.1' || $vp->flavor() =~ m/maria/  ) {
+         $source_name = 'master';
+      }
+
       my @master_status_cols = grep { $tbl_struct->{is_col}->{$_} }
          qw(file position);
       PTDEBUG && _d("Master status columns:", join(', ', @master_status_cols));
 
       my @slave_status_cols  = grep { $tbl_struct->{is_col}->{$_} }
-         qw(relay_master_log_file exec_master_log_pos);
+         ("relay_${source_name}_log_file", "exec_${source_name}_log_pos");
       PTDEBUG && _d("Slave status columns:", join(', ', @slave_status_cols));
 
       # Just a shortcut so I don't have to check both arrays when creating
@@ -6356,7 +6463,12 @@ sub main {
 
          my $sql;
          if ( @master_status_cols ) {
-            $sql = "SHOW MASTER STATUS";
+            if ( $vp >= '8.1' && $vp->flavor() !~ m/maria/ ) {
+               $sql = 'SHOW BINARY LOG STATUS';
+            }
+            else {
+               $sql = 'SHOW MASTER STATUS';
+            }
             PTDEBUG && _d($dbh, $sql);
             my $row = $dbh->selectrow_hashref($sql);
             if ( !$row ) {
@@ -6369,7 +6481,12 @@ sub main {
          }
 
          if ( @slave_status_cols ) {
-            $sql = "SHOW SLAVE STATUS";
+            if ( $vp >= '8.1' && $vp->flavor() !~ m/maria/ ) {
+               $sql = 'SHOW REPLICA STATUS';
+            }
+            else {
+               $sql = 'SHOW SLAVE STATUS';
+            }
             PTDEBUG && _d($dbh, $sql);
             my $row = $dbh->selectrow_hashref($sql);
             if ( !$row ) {
@@ -6528,7 +6645,7 @@ sub main {
       $findex++;
    }
    $format .= " ]";
-   $format .= ($o->get('print-master-server-id') ? ' %'.$findex.'$d' : '')
+   $format .= ($o->get('print-source-server-id') ? ' %'.$findex.'$d' : '')
             . "\n";
 
    # ########################################################################
@@ -6668,7 +6785,7 @@ sub check_delay {
          DSNParser    => $dp,
          Quoter       => "Quoter",
       );
-      $ms->recurse_to_slaves(
+      $ms->recurse_to_replicas(
          {  dbh        => $dbh,
             dsn        => $dsn,
             callback   => sub {
@@ -6685,10 +6802,10 @@ sub check_delay {
    }
 
    my $format_delay = ($args{hires_ts} ? '%1$.2f' : '%1$d')
-                    . ($o->get('print-master-server-id') ? ' %2$d' : "")
+                    . ($o->get('print-source-server-id') ? ' %2$d' : "")
                     . "\n";
    my $format_host  = '%1$-20s '.($args{hires_ts} ? '%2$.2f' : '%2$d')
-                    . ($o->get('print-master-server-id') ? ' %3$d' : "")
+                    . ($o->get('print-source-server-id') ? ' %3$d' : "")
                     . "\n";
 
    # Before hi-res ts, we could check all slaves at one interval, assuming
@@ -6850,7 +6967,7 @@ used to identify records.
 
 The second part is a L<"--monitor"> or L<"--check"> instance of pt-heartbeat
 that connects to a slave, examines the replicated heartbeat record from its
-immediate master or the specified L<"--master-server-id">, and computes the
+immediate master or the specified L<"--source-server-id">, and computes the
 difference from the current system time.  If replication between the slave and
 the master is delayed or broken, the computed difference will be greater than
 zero and potentially increase if L<"--monitor"> is specified.
@@ -6895,10 +7012,10 @@ can be ran on the slaves as well as the master.  The default heartbeat
 table (see L<"--create-table">) is keyed on the C<server_id> column, so
 each server will update the row where C<server_id=@@server_id>.
 
-For L<"--monitor"> and L<"--check">, if L<"--master-server-id"> is not
+For L<"--monitor"> and L<"--check">, if L<"--source-server-id"> is not
 specified, the tool tries to discover and use the slave's immediate master.
 If this fails, or if you want monitor lag from another master, then you can
-specify the L<"--master-server-id"> to use.
+specify the L<"--source-server-id"> to use.
 
 For example, if the replication hierarchy is "master -> slave1 -> slave2"
 with corresponding server IDs 1, 2 and 3, you can:
@@ -6908,11 +7025,11 @@ with corresponding server IDs 1, 2 and 3, you can:
 
 Then check (or monitor) the replication delay from master to slave2:
 
-  pt-heartbeat -D test --master-server-id 1 --check slave2
+  pt-heartbeat -D test --source-server-id 1 --check slave2
 
 Or check the replication delay from slave1 to slave2:
 
-  pt-heartbeat -D test --master-server-id 2 --check slave2
+  pt-heartbeat -D test --source-server-id 2 --check slave2
 
 Stopping the L<"--update"> instance one slave1 will not affect the instance
 on master.
@@ -6934,7 +7051,7 @@ that, since the speed of the cluster is determined by its slowest node,
 pt-heartbeat will not report how fast the cluster itself is, but only how
 fast events are replicating from one node to another.
 
-You must specify L<"--master-server-id"> for L<"--monitor"> and L<"--check">
+You must specify L<"--source-server-id"> for L<"--monitor"> and L<"--check">
 instances.
 
 =head1 OPTIONS
@@ -6994,8 +7111,8 @@ be created with the following MAGIC_create_heartbeat table definition:
     server_id             int unsigned NOT NULL PRIMARY KEY,
     file                  varchar(255) DEFAULT NULL,    -- SHOW MASTER STATUS
     position              bigint unsigned DEFAULT NULL, -- SHOW MASTER STATUS
-    relay_master_log_file varchar(255) DEFAULT NULL,    -- SHOW SLAVE STATUS
-    exec_master_log_pos   bigint unsigned DEFAULT NULL  -- SHOW SLAVE STATUS
+    relay_source_log_file varchar(255) DEFAULT NULL,    -- SHOW SLAVE STATUS
+    exec_source_log_pos   bigint unsigned DEFAULT NULL  -- SHOW SLAVE STATUS
   );
 
 The heartbeat table requires at least one row.  If you manually create the
@@ -7141,7 +7258,7 @@ type: string
 
 Print all output to this file when daemonized.
 
-=item --master-server-id
+=item --source-server-id
 
 type: string
 
@@ -7190,11 +7307,11 @@ short form: -P; type: int
 
 Port number to use for connection.
 
-=item --print-master-server-id
+=item --print-source-server-id
 
-Print the auto-detected or given L<"--master-server-id">.  If L<"--check">
+Print the auto-detected or given L<"--source-server-id">.  If L<"--check">
 or L<"--monitor"> is specified, specifying this option will print the
-auto-detected or given L<"--master-server-id"> at the end of each line.
+auto-detected or given L<"--source-server-id"> at the end of each line.
 
 =item --read-only-interval
 
@@ -7462,6 +7579,12 @@ dsn: user; copy: yes
 
 User for login if not current user.
 
+=item * s
+
+dsn: mysql_ssl; copy: yes
+
+Create SSL connection
+
 =back
 
 =head1 ENVIRONMENT
diff --git a/bin/pt-index-usage b/bin/pt-index-usage
index 1d3df0e6b..b3c4c78e3 100755
--- a/bin/pt-index-usage
+++ b/bin/pt-index-usage
@@ -275,7 +275,7 @@ sub get_cxn_params {
       $dsn = 'DBI:mysql:' . ( $info->{D} || '' ) . ';'
          . join(';', map  { "$opts{$_}->{dsn}=$info->{$_}" }
                      grep { defined $info->{$_} }
-                     qw(F h P S A))
+                     qw(F h P S A s))
          . ';mysql_read_default_group=client'
          . ($info->{L} ? ';mysql_local_infile=1' : '');
    }
diff --git a/bin/pt-kill b/bin/pt-kill
index af64bb796..65b533065 100755
--- a/bin/pt-kill
+++ b/bin/pt-kill
@@ -2037,7 +2037,7 @@ sub get_cxn_params {
       $dsn = 'DBI:mysql:' . ( $info->{D} || '' ) . ';'
          . join(';', map  { "$opts{$_}->{dsn}=$info->{$_}" }
                      grep { defined $info->{$_} }
-                     qw(F h P S A))
+                     qw(F h P S A s))
          . ';mysql_read_default_group=client'
          . ($info->{L} ? ';mysql_local_infile=1' : '');
    }
@@ -3959,7 +3959,7 @@ sub new {
    return bless $self, $class;
 }
 
-sub get_slaves {
+sub get_replicas {
    my ($self, %args) = @_;
    my @required_args = qw(make_cxn);
    foreach my $arg ( @required_args ) {
@@ -3967,11 +3967,11 @@ sub get_slaves {
    }
    my ($make_cxn) = @args{@required_args};
 
-   my $slaves  = [];
+   my $replicas  = [];
    my $dp      = $self->{DSNParser};
    my $methods = $self->_resolve_recursion_methods($args{dsn});
 
-   return $slaves unless @$methods;
+   return $replicas unless @$methods;
 
    if ( grep { m/processlist|hosts/i } @$methods ) {
       my @required_args = qw(dbh dsn);
@@ -3981,26 +3981,26 @@ sub get_slaves {
       my ($dbh, $dsn) = @args{@required_args};
       my $o = $self->{OptionParser};
 
-      $self->recurse_to_slaves(
-         {  dbh            => $dbh,
-            dsn            => $dsn,
-            slave_user     => $o->got('slave-user') ? $o->get('slave-user') : '',
-            slave_password => $o->got('slave-password') ? $o->get('slave-password') : '',
-            slaves         => $args{slaves},
+      $self->recurse_to_replicas(
+         {  dbh              => $dbh,
+            dsn              => $dsn,
+            replica_user     => $o->got('replica-user') ? $o->get('replica-user') : '',
+            replica_password => $o->got('replica-password') ? $o->get('replica-password') : '',
+            replicas         => $args{replicas},
             callback  => sub {
                my ( $dsn, $dbh, $level, $parent ) = @_;
                return unless $level;
-               PTDEBUG && _d('Found slave:', $dp->as_string($dsn));
-               my $slave_dsn = $dsn;
-               if ($o->got('slave-user')) {
-                  $slave_dsn->{u} = $o->get('slave-user');
-                  PTDEBUG && _d("Using slave user ".$o->get('slave-user')." on ".$slave_dsn->{h}.":".$slave_dsn->{P});
+               PTDEBUG && _d('Found replica:', $dp->as_string($dsn));
+               my $replica_dsn = $dsn;
+               if ($o->got('replica-user')) {
+                  $replica_dsn->{u} = $o->get('replica-user');
+                  PTDEBUG && _d("Using replica user ".$o->get('replica-user')." on ".$replica_dsn->{h}.":".$replica_dsn->{P});
                }
-               if ($o->got('slave-password')) {
-                  $slave_dsn->{p} = $o->get('slave-password');
-                  PTDEBUG && _d("Slave password set");
+               if ($o->got('replica-password')) {
+                  $replica_dsn->{p} = $o->get('replica-password');
+                  PTDEBUG && _d("Replica password set");
                }
-               push @$slaves, $make_cxn->(dsn => $slave_dsn, dbh => $dbh, parent => $parent);
+               push @$replicas, $make_cxn->(dsn => $replica_dsn, dbh => $dbh, parent => $parent);
                return;
             },
             wait_no_die => $args{'wait_no_die'},
@@ -4008,20 +4008,20 @@ sub get_slaves {
       );
    } elsif ( $methods->[0] =~ m/^dsn=/i ) {
       (my $dsn_table_dsn = join ",", @$methods) =~ s/^dsn=//i;
-      $slaves = $self->get_cxn_from_dsn_table(
+      $replicas = $self->get_cxn_from_dsn_table(
          %args,
          dsn_table_dsn => $dsn_table_dsn,
          wait_no_die => $args{'wait_no_die'},
       );
    }
    elsif ( $methods->[0] =~ m/none/i ) {
-      PTDEBUG && _d('Not getting to slaves');
+      PTDEBUG && _d('Not getting to replicas');
    }
    else {
       die "Unexpected recursion methods: @$methods";
    }
 
-   return $slaves;
+   return $replicas;
 }
 
 sub _resolve_recursion_methods {
@@ -4039,31 +4039,31 @@ sub _resolve_recursion_methods {
    }
 }
 
-sub recurse_to_slaves {
+sub recurse_to_replicas {
    my ( $self, $args, $level ) = @_;
    $level ||= 0;
    my $dp = $self->{DSNParser};
    my $recurse = $args->{recurse} || $self->{OptionParser}->get('recurse');
    my $dsn = $args->{dsn};
-   my $slave_user = $args->{slave_user} || '';
-   my $slave_password = $args->{slave_password} || '';
+   my $replica_user = $args->{replica_user} || '';
+   my $replica_password = $args->{replica_password} || '';
 
    my $methods = $self->_resolve_recursion_methods($dsn);
    PTDEBUG && _d('Recursion methods:', @$methods);
    if ( lc($methods->[0]) eq 'none' ) {
-      PTDEBUG && _d('Not recursing to slaves');
+      PTDEBUG && _d('Not recursing to replicas');
       return;
    }
 
-   my $slave_dsn = $dsn;
-   if ($slave_user) {
-      $slave_dsn->{u} = $slave_user;
-      PTDEBUG && _d("Using slave user $slave_user on "
-         . $slave_dsn->{h} . ":" . ( $slave_dsn->{P} ? $slave_dsn->{P} : ""));
+   my $replica_dsn = $dsn;
+   if ($replica_user) {
+      $replica_dsn->{u} = $replica_user;
+      PTDEBUG && _d("Using replica user $replica_user on "
+         . $replica_dsn->{h} . ":" . ( $replica_dsn->{P} ? $replica_dsn->{P} : ""));
    }
-   if ($slave_password) {
-      $slave_dsn->{p} = $slave_password;
-      PTDEBUG && _d("Slave password set");
+   if ($replica_password) {
+      $replica_dsn->{p} = $replica_password;
+      PTDEBUG && _d("Replica password set");
    }
 
    my $dbh = $args->{dbh};
@@ -4071,12 +4071,12 @@ sub recurse_to_slaves {
    my $get_dbh = sub {
          eval {
             $dbh = $dp->get_dbh(
-               $dp->get_cxn_params($slave_dsn), { AutoCommit => 1 }
+               $dp->get_cxn_params($replica_dsn), { AutoCommit => 1 }
             );
-            PTDEBUG && _d('Connected to', $dp->as_string($slave_dsn));
+            PTDEBUG && _d('Connected to', $dp->as_string($replica_dsn));
          };
          if ( $EVAL_ERROR ) {
-            print STDERR "Cannot connect to ", $dp->as_string($slave_dsn), ": ", $EVAL_ERROR, "\n"
+            print STDERR "Cannot connect to ", $dp->as_string($replica_dsn), ": ", $EVAL_ERROR, "\n"
                or die "Cannot print: $OS_ERROR";
             return;
          }
@@ -4084,10 +4084,10 @@ sub recurse_to_slaves {
 
    DBH: {
       if ( !defined $dbh ) {
-         foreach my $known_slave ( @{$args->{slaves}} ) {
-            if ($known_slave->{dsn}->{h} eq $slave_dsn->{h} and
-                $known_slave->{dsn}->{P} eq $slave_dsn->{P} ) {
-               $dbh = $known_slave->{dbh};
+         foreach my $known_replica ( @{$args->{replicas}} ) {
+            if ($known_replica->{dsn}->{h} eq $replica_dsn->{h} and
+                $known_replica->{dsn}->{P} eq $replica_dsn->{P} ) {
+               $dbh = $known_replica->{dbh};
                last DBH;
             }
          }
@@ -4105,7 +4105,7 @@ sub recurse_to_slaves {
 	   if ( $EVAL_ERROR ) {
 		   if ( $args->{wait_no_die} ) {
 			   print STDERR "Error getting server id: ", $EVAL_ERROR,
-               "\nRetrying query for server ", $slave_dsn->{h}, ":", $slave_dsn->{P}, "\n";
+               "\nRetrying query for server ", $replica_dsn->{h}, ":", $replica_dsn->{P}, "\n";
             sleep 1;
             $dbh->disconnect();
             $get_dbh->();
@@ -4115,12 +4115,12 @@ sub recurse_to_slaves {
       }
    } until (defined $id);
    PTDEBUG && _d('Working on server ID', $id);
-   my $master_thinks_i_am = $dsn->{server_id};
+   my $source_thinks_i_am = $dsn->{server_id};
    if ( !defined $id
-       || ( defined $master_thinks_i_am && $master_thinks_i_am != $id )
+       || ( defined $source_thinks_i_am && $source_thinks_i_am != $id )
        || $args->{server_ids_seen}->{$id}++
    ) {
-      PTDEBUG && _d('Server ID seen, or not what master said');
+      PTDEBUG && _d('Server ID seen, or not what source said');
       if ( $args->{skip_callback} ) {
          $args->{skip_callback}->($dsn, $dbh, $level, $args->{parent});
       }
@@ -4131,51 +4131,51 @@ sub recurse_to_slaves {
 
    if ( !defined $recurse || $level < $recurse ) {
 
-      my @slaves =
-         grep { !$_->{master_id} || $_->{master_id} == $id } # Only my slaves.
-         $self->find_slave_hosts($dp, $dbh, $dsn, $methods);
+      my @replicas =
+         grep { !$_->{source_id} || $_->{source_id} == $id } # Only my replicas.
+         $self->find_replica_hosts($dp, $dbh, $dsn, $methods);
 
-      foreach my $slave ( @slaves ) {
+      foreach my $replica ( @replicas ) {
          PTDEBUG && _d('Recursing from',
-            $dp->as_string($dsn), 'to', $dp->as_string($slave));
-         $self->recurse_to_slaves(
-            { %$args, dsn => $slave, dbh => undef, parent => $dsn, slave_user => $slave_user, $slave_password => $slave_password }, $level + 1 );
+            $dp->as_string($dsn), 'to', $dp->as_string($replica));
+         $self->recurse_to_replicas(
+            { %$args, dsn => $replica, dbh => undef, parent => $dsn, replica_user => $replica_user, $replica_password => $replica_password }, $level + 1 );
       }
    }
 }
 
-sub find_slave_hosts {
+sub find_replica_hosts {
    my ( $self, $dsn_parser, $dbh, $dsn, $methods ) = @_;
 
-   PTDEBUG && _d('Looking for slaves on', $dsn_parser->as_string($dsn),
+   PTDEBUG && _d('Looking for replicas on', $dsn_parser->as_string($dsn),
       'using methods', @$methods);
 
-   my @slaves;
+   my @replicas;
    METHOD:
    foreach my $method ( @$methods ) {
-      my $find_slaves = "_find_slaves_by_$method";
-      PTDEBUG && _d('Finding slaves with', $find_slaves);
-      @slaves = $self->$find_slaves($dsn_parser, $dbh, $dsn);
-      last METHOD if @slaves;
+      my $find_replicas = "_find_replicas_by_$method";
+      PTDEBUG && _d('Finding replicas with', $find_replicas);
+      @replicas = $self->$find_replicas($dsn_parser, $dbh, $dsn);
+      last METHOD if @replicas;
    }
 
-   PTDEBUG && _d('Found', scalar(@slaves), 'slaves');
-   return @slaves;
+   PTDEBUG && _d('Found', scalar(@replicas), 'replicas');
+   return @replicas;
 }
 
-sub _find_slaves_by_processlist {
+sub _find_replicas_by_processlist {
    my ( $self, $dsn_parser, $dbh, $dsn ) = @_;
-   my @connected_slaves = $self->get_connected_slaves($dbh);
-   my @slaves = $self->_process_slaves_list($dsn_parser, $dsn, \@connected_slaves);
-   return @slaves;
+   my @connected_replicas = $self->get_connected_replicas($dbh);
+   my @replicas = $self->_process_replicas_list($dsn_parser, $dsn, \@connected_replicas);
+   return @replicas;
 }
 
-sub _process_slaves_list {
-   my ($self, $dsn_parser, $dsn, $connected_slaves) = @_;
-   my @slaves = map  {
-      my $slave        = $dsn_parser->parse("h=$_", $dsn);
-      $slave->{source} = 'processlist';
-      $slave;
+sub _process_replicas_list {
+   my ($self, $dsn_parser, $dsn, $connected_replicas) = @_;
+   my @replicas = map  {
+      my $replica        = $dsn_parser->parse("h=$_", $dsn);
+      $replica->{source} = 'processlist';
+      $replica;
    }
    grep { $_ }
    map  {
@@ -4187,22 +4187,28 @@ sub _process_slaves_list {
           $host = '['.$host.']';
       }
       $host;
-   } @$connected_slaves;
+   } @$connected_replicas;
 
-   return @slaves;
+   return @replicas;
 }
 
-sub _find_slaves_by_hosts {
+sub _find_replicas_by_hosts {
    my ( $self, $dsn_parser, $dbh, $dsn ) = @_;
 
-   my @slaves;
-   my $sql = 'SHOW SLAVE HOSTS';
+   my @replicas;
+
+   my $vp = VersionParser->new($dbh);
+   my $sql = 'SHOW REPLICAS';
+   if ( $vp < '8.1' || $vp->flavor() =~ m/maria/ ) {
+      $sql = 'SHOW SLAVE HOSTS';
+   }
+   
    PTDEBUG && _d($dbh, $sql);
-   @slaves = @{$dbh->selectall_arrayref($sql, { Slice => {} })};
+   @replicas = @{$dbh->selectall_arrayref($sql, { Slice => {} })};
 
-   if ( @slaves ) {
-      PTDEBUG && _d('Found some SHOW SLAVE HOSTS info');
-      @slaves = map {
+   if ( @replicas ) {
+      PTDEBUG && _d('Found some SHOW REPLICAS info');
+      @replicas = map {
          my %hash;
          @hash{ map { lc $_ } keys %$_ } = values %$_;
          my $spec = "h=$hash{host},P=$hash{port}"
@@ -4210,16 +4216,16 @@ sub _find_slaves_by_hosts {
             . ( $hash{password} ? ",p=$hash{password}" : '');
          my $dsn           = $dsn_parser->parse($spec, $dsn);
          $dsn->{server_id} = $hash{server_id};
-         $dsn->{master_id} = $hash{master_id};
+         $dsn->{source_id} = $hash{source_id};
          $dsn->{source}    = 'hosts';
          $dsn;
-      } @slaves;
+      } @replicas;
    }
 
-   return @slaves;
+   return @replicas;
 }
 
-sub get_connected_slaves {
+sub get_connected_replicas {
    my ( $self, $dbh ) = @_;
 
    my $show = "SHOW GRANTS FOR ";
@@ -4265,79 +4271,103 @@ sub get_connected_slaves {
    @{$dbh->selectall_arrayref($sql, { Slice => {} })};
 }
 
-sub is_master_of {
-   my ( $self, $master, $slave ) = @_;
-   my $master_status = $self->get_master_status($master)
-      or die "The server specified as a master is not a master";
-   my $slave_status  = $self->get_slave_status($slave)
-      or die "The server specified as a slave is not a slave";
-   my @connected     = $self->get_connected_slaves($master)
-      or die "The server specified as a master has no connected slaves";
-   my (undef, $port) = $master->selectrow_array("SHOW VARIABLES LIKE 'port'");
+sub is_source_of {
+   my ( $self, $source, $replica ) = @_;
+
+   my $replica_version = VersionParser->new($replica);
+   my $source_name = 'source';
+   my $source_port = 'source_port';
+   if ( $replica_version < '8.1' || $replica_version->flavor() =~ m/maria/ ) {
+      $source_name = 'master';
+      $source_port = 'master_port';
+   }
+
+   my $source_status = $self->get_source_status($source)
+      or die "The server specified as a source is not a source";
+   my $replica_status  = $self->get_replica_status($replica)
+      or die "The server specified as a replica is not a replica";
+   my @connected     = $self->get_connected_replicas($source)
+      or die "The server specified as a source has no connected replicas";
+   my (undef, $port) = $source->selectrow_array("SHOW VARIABLES LIKE 'port'");
 
-   if ( $port != $slave_status->{master_port} ) {
-      die "The slave is connected to $slave_status->{master_port} "
-         . "but the master's port is $port";
+   if ( $port != $replica_status->{$source_port} ) {
+      die "The replica is connected to $replica_status->{$source_port} "
+         . "but the source's port is $port";
    }
 
-   if ( !grep { $slave_status->{master_user} eq $_->{user} } @connected ) {
-      die "I don't see any slave I/O thread connected with user "
-         . $slave_status->{master_user};
+   if ( !grep { $replica_status->{source_user} eq $_->{user} } @connected ) {
+      die "I don't see any replica I/O thread connected with user "
+         . $replica_status->{source_user};
    }
 
-   if ( ($slave_status->{slave_io_state} || '')
-      eq 'Waiting for master to send event' )
+   if ( ($replica_status->{replica_io_state} || '')
+      eq 'Waiting for ${source_name} to send event' )
    {
-      my ( $master_log_name, $master_log_num )
-         = $master_status->{file} =~ m/^(.*?)\.0*([1-9][0-9]*)$/;
-      my ( $slave_log_name, $slave_log_num )
-         = $slave_status->{master_log_file} =~ m/^(.*?)\.0*([1-9][0-9]*)$/;
-      if ( $master_log_name ne $slave_log_name
-         || abs($master_log_num - $slave_log_num) > 1 )
+      my ( $source_log_name, $source_log_num )
+         = $source_status->{file} =~ m/^(.*?)\.0*([1-9][0-9]*)$/;
+      my ( $replica_log_name, $replica_log_num )
+         = $replica_status->{source_log_file} =~ m/^(.*?)\.0*([1-9][0-9]*)$/;
+      if ( $source_log_name ne $replica_log_name
+         || abs($source_log_num - $replica_log_num) > 1 )
       {
-         die "The slave thinks it is reading from "
-            . "$slave_status->{master_log_file},  but the "
-            . "master is writing to $master_status->{file}";
+         die "The replica thinks it is reading from "
+            . "$replica_status->{source_log_file},  but the "
+            . "source is writing to $source_status->{file}";
       }
    }
    return 1;
 }
 
-sub get_master_dsn {
+sub get_source_dsn {
    my ( $self, $dbh, $dsn, $dsn_parser ) = @_;
-   my $master = $self->get_slave_status($dbh) or return undef;
-   my $spec   = "h=$master->{master_host},P=$master->{master_port}";
+
+   my $vp = VersionParser->new($dbh);
+   my $source_host = 'source_host';
+   my $source_port = 'source_port';
+   if ( $vp < '8.1' || $vp->flavor() =~ m/maria/ ) {
+      $source_host = 'master_host';
+      $source_port = 'master_port';
+   }
+
+   my $source = $self->get_replica_status($dbh) or return undef;
+   my $spec   = "h=$source->{${source_host}},P=$source->{${source_port}}";
    return       $dsn_parser->parse($spec, $dsn);
 }
 
-sub get_slave_status {
+sub get_replica_status {
    my ( $self, $dbh ) = @_;
 
-   if ( !$self->{not_a_slave}->{$dbh} ) {
-      my $sth = $self->{sths}->{$dbh}->{SLAVE_STATUS}
-            ||= $dbh->prepare('SHOW SLAVE STATUS');
-      PTDEBUG && _d($dbh, 'SHOW SLAVE STATUS');
+   my $server_version = VersionParser->new($dbh);
+   my $replica_name = 'replica';
+   if ( $server_version < '8.1' || $server_version->flavor() =~ m/maria/ ) {
+      $replica_name = 'replica';
+   }
+
+   if ( !$self->{not_a_replica}->{$dbh} ) {
+      my $sth = $self->{sths}->{$dbh}->{REPLICA_STATUS}
+            ||= $dbh->prepare("SHOW ${replica_name} STATUS");
+      PTDEBUG && _d($dbh, "SHOW ${replica_name} STATUS");
       $sth->execute();
-      my ($sss_rows) = $sth->fetchall_arrayref({}); # Show Slave Status rows
+      my ($sss_rows) = $sth->fetchall_arrayref({}); # Show Replica Status rows
 
       my $ss;
       if ( $sss_rows && @$sss_rows ) {
           if (scalar @$sss_rows > 1) {
               if (!$self->{channel}) {
-                  die 'This server returned more than one row for SHOW SLAVE STATUS but "channel" was not specified on the command line';
+                  die 'This server returned more than one row for SHOW REPLICA STATUS but "channel" was not specified on the command line';
               }
-              my $slave_use_channels;
+              my $replica_use_channels;
               for my $row (@$sss_rows) {
                   $row = { map { lc($_) => $row->{$_} } keys %$row }; # lowercase the keys
                   if ($row->{channel_name}) {
-                      $slave_use_channels = 1;
+                      $replica_use_channels = 1;
                   }
                   if ($row->{channel_name} eq $self->{channel}) {
                       $ss = $row;
                       last;
                   }
               }
-              if (!$ss && $slave_use_channels) {
+              if (!$ss && $replica_use_channels) {
                  die 'This server is using replication channels but "channel" was not specified on the command line';
               }
           } else {
@@ -4357,28 +4387,34 @@ sub get_slave_status {
           }
       }
 
-      PTDEBUG && _d('This server returns nothing for SHOW SLAVE STATUS');
-      $self->{not_a_slave}->{$dbh}++;
+      PTDEBUG && _d('This server returns nothing for SHOW REPLICA STATUS');
+      $self->{not_a_replica}->{$dbh}++;
   }
 }
 
-sub get_master_status {
+sub get_source_status {
    my ( $self, $dbh ) = @_;
 
-   if ( $self->{not_a_master}->{$dbh} ) {
-      PTDEBUG && _d('Server on dbh', $dbh, 'is not a master');
+   if ( $self->{not_a_source}->{$dbh} ) {
+      PTDEBUG && _d('Server on dbh', $dbh, 'is not a source');
       return;
    }
 
+   my $vp = VersionParser->new($dbh);
+   my $source_name = 'binary log';
+   if ( $vp < '8.1' || $vp->flavor() =~ m/maria/ ) {
+      $source_name = 'master';
+   }
+
    my $sth;
    if ( $self->{sths}->{$dbh} && $dbh && $self->{sths}->{$dbh} == $dbh ) {
-      $sth = $self->{sths}->{$dbh}->{MASTER_STATUS}
-         ||= $dbh->prepare('SHOW MASTER STATUS');
+      $sth = $self->{sths}->{$dbh}->{SOURCE_STATUS}
+         ||= $dbh->prepare("SHOW ${source_name} STATUS");
    }
    else {
-      $sth = $dbh->prepare('SHOW MASTER STATUS');
+      $sth = $dbh->prepare("SHOW ${source_name} STATUS");
    }
-   PTDEBUG && _d($dbh, 'SHOW MASTER STATUS');
+   PTDEBUG && _d($dbh, "SHOW ${source_name} STATUS");
    $sth->execute();
    my ($ms) = @{$sth->fetchall_arrayref({})};
    PTDEBUG && _d(
@@ -4386,42 +4422,46 @@ sub get_master_status {
           : '');
 
    if ( !$ms || scalar keys %$ms < 2 ) {
-      PTDEBUG && _d('Server on dbh', $dbh, 'does not seem to be a master');
-      $self->{not_a_master}->{$dbh}++;
+      PTDEBUG && _d('Server on dbh', $dbh, 'does not seem to be a source');
+      $self->{not_a_source}->{$dbh}++;
    }
 
   return { map { lc($_) => $ms->{$_} } keys %$ms }; # lowercase the keys
 }
 
-sub wait_for_master {
+sub wait_for_source {
    my ( $self, %args ) = @_;
-   my @required_args = qw(master_status slave_dbh);
+   my @required_args = qw(source_status replica_dbh);
    foreach my $arg ( @required_args ) {
       die "I need a $arg argument" unless $args{$arg};
    }
-   my ($master_status, $slave_dbh) = @args{@required_args};
+   my ($source_status, $replica_dbh) = @args{@required_args};
    my $timeout       = $args{timeout} || 60;
 
    my $result;
    my $waited;
-   if ( $master_status ) {
-      my $slave_status;
+   if ( $source_status ) {
+      my $replica_status;
       eval {
-          $slave_status = $self->get_slave_status($slave_dbh);
+          $replica_status = $self->get_replica_status($replica_dbh);
       };
       if ($EVAL_ERROR) {
           return {
               result => undef,
               waited => 0,
-              error  =>'Wait for master: this is a multi-master slave but "channel" was not specified on the command line',
+              error  =>'Wait for source: this is a multi-source replica but "channel" was not specified on the command line',
           };
       }
-      my $server_version = VersionParser->new($slave_dbh);
-      my $channel_sql = $server_version > '5.6' && $self->{channel} ? ", '$self->{channel}'" : '';
-      my $sql = "SELECT MASTER_POS_WAIT('$master_status->{file}', $master_status->{position}, $timeout $channel_sql)";
-      PTDEBUG && _d($slave_dbh, $sql);
+      my $vp = VersionParser->new($replica_dbh);
+      my $source_name = 'source';
+      if ( $vp < '8.1' || $vp->flavor() =~ m/maria/ ) {
+         $source_name = 'master';
+      }
+      my $channel_sql = $vp > '5.6' && $self->{channel} ? ", '$self->{channel}'" : '';
+      my $sql = "SELECT ${source_name}_POS_WAIT('$source_status->{file}', $source_status->{position}, $timeout $channel_sql)";
+      PTDEBUG && _d($replica_dbh, $sql);
       my $start = time;
-      ($result) = $slave_dbh->selectrow_array($sql);
+      ($result) = $replica_dbh->selectrow_array($sql);
 
       $waited = time - $start;
 
@@ -4429,7 +4469,7 @@ sub wait_for_master {
       PTDEBUG && _d("Waited", $waited, "seconds");
    }
    else {
-      PTDEBUG && _d('Not waiting: this server is not a master');
+      PTDEBUG && _d('Not waiting: this server is not a source');
    }
 
    return {
@@ -4438,75 +4478,96 @@ sub wait_for_master {
    };
 }
 
-sub stop_slave {
+sub stop_replica {
    my ( $self, $dbh ) = @_;
-   my $sth = $self->{sths}->{$dbh}->{STOP_SLAVE}
-         ||= $dbh->prepare('STOP SLAVE');
+   my $vp = VersionParser->new($dbh);
+   my $replica_name = 'replica';
+   if ( $vp < '8.1' || $vp->flavor() =~ m/maria/ ) {
+      $replica_name = 'replica';
+   }
+   my $sth = $self->{sths}->{$dbh}->{STOP_REPLICA}
+         ||= $dbh->prepare("STOP ${replica_name}");
    PTDEBUG && _d($dbh, $sth->{Statement});
    $sth->execute();
 }
 
-sub start_slave {
+sub start_replica {
    my ( $self, $dbh, $pos ) = @_;
+
+   my $vp = VersionParser->new($dbh);
+   my $source_name = 'source';
+   my $replica_name = 'replica';
+   if ( $vp < '8.1' || $vp->flavor() =~ m/maria/ ) {
+      $source_name = 'master';
+      $replica_name = 'slave';
+   }
+
    if ( $pos ) {
-      my $sql = "START SLAVE UNTIL MASTER_LOG_FILE='$pos->{file}', "
-              . "MASTER_LOG_POS=$pos->{position}";
+      my $sql = "START ${replica_name} UNTIL ${source_name}_LOG_FILE='$pos->{file}', "
+              . "${source_name}_LOG_POS=$pos->{position}";
       PTDEBUG && _d($dbh, $sql);
       $dbh->do($sql);
    }
    else {
-      my $sth = $self->{sths}->{$dbh}->{START_SLAVE}
-            ||= $dbh->prepare('START SLAVE');
+      my $sth = $self->{sths}->{$dbh}->{START_REPLICA}
+            ||= $dbh->prepare("START ${replica_name}");
       PTDEBUG && _d($dbh, $sth->{Statement});
       $sth->execute();
    }
 }
 
-sub catchup_to_master {
-   my ( $self, $slave, $master, $timeout ) = @_;
-   $self->stop_slave($master);
-   $self->stop_slave($slave);
-   my $slave_status  = $self->get_slave_status($slave);
-   my $slave_pos     = $self->repl_posn($slave_status);
-   my $master_status = $self->get_master_status($master);
-   my $master_pos    = $self->repl_posn($master_status);
-   PTDEBUG && _d('Master position:', $self->pos_to_string($master_pos),
-      'Slave position:', $self->pos_to_string($slave_pos));
+sub catchup_to_source {
+   my ( $self, $replica, $source, $timeout ) = @_;
+   $self->stop_replica($source);
+   $self->stop_replica($replica);
+   my $replica_status  = $self->get_replica_status($replica);
+   my $replica_pos     = $self->repl_posn($replica_status);
+   my $source_status = $self->get_source_status($source);
+   my $source_pos    = $self->repl_posn($source_status);
+   PTDEBUG && _d('Source position:', $self->pos_to_string($source_pos),
+      'Replica position:', $self->pos_to_string($replica_pos));
 
    my $result;
-   if ( $self->pos_cmp($slave_pos, $master_pos) < 0 ) {
-      PTDEBUG && _d('Waiting for slave to catch up to master');
-      $self->start_slave($slave, $master_pos);
+   if ( $self->pos_cmp($replica_pos, $source_pos) < 0 ) {
+      PTDEBUG && _d('Waiting for replica to catch up to source');
+      $self->start_replica($replica, $source_pos);
 
-      $result = $self->wait_for_master(
-            master_status => $master_status,
-            slave_dbh     => $slave,
+      $result = $self->wait_for_source(
+            source_status => $source_status,
+            replica_dbh   => $replica,
             timeout       => $timeout,
-            master_status => $master_status
+            source_status => $source_status
       );
       if ($result->{error}) {
           die $result->{error};
       }
       if ( !defined $result->{result} ) {
-         $slave_status = $self->get_slave_status($slave);
-         if ( !$self->slave_is_running($slave_status) ) {
-            PTDEBUG && _d('Master position:',
-               $self->pos_to_string($master_pos),
-               'Slave position:', $self->pos_to_string($slave_pos));
-            $slave_pos = $self->repl_posn($slave_status);
-            if ( $self->pos_cmp($slave_pos, $master_pos) != 0 ) {
-               die "MASTER_POS_WAIT() returned NULL but slave has not "
-                  . "caught up to master";
+         $replica_status = $self->get_replica_status($replica);
+            
+         my $vp = VersionParser->new($replica);
+         my $replica_name = 'replica';
+         if ( $vp < '8.1' || $vp->flavor() =~ m/maria/ ) {
+            $replica_name = 'slave';
+         }
+
+         if ( !$self->replica_is_running($replica_status, $replica_name) ) {
+            PTDEBUG && _d('Source position:',
+               $self->pos_to_string($source_pos),
+               'Replica position:', $self->pos_to_string($replica_pos));
+            $replica_pos = $self->repl_posn($replica_status);
+            if ( $self->pos_cmp($replica_pos, $source_pos) != 0 ) {
+               die "SOURCE_POS_WAIT() returned NULL but replica has not "
+                  . "caught up to source";
             }
-            PTDEBUG && _d('Slave is caught up to master and stopped');
+            PTDEBUG && _d('Replica is caught up to source and stopped');
          }
          else {
-            die "Slave has not caught up to master and it is still running";
+            die "Replica has not caught up to source and it is still running";
          }
       }
    }
    else {
-      PTDEBUG && _d("Slave is already caught up to master");
+      PTDEBUG && _d("Replica is already caught up to source");
    }
 
    return $result;
@@ -4514,26 +4575,38 @@ sub catchup_to_master {
 
 sub catchup_to_same_pos {
    my ( $self, $s1_dbh, $s2_dbh ) = @_;
-   $self->stop_slave($s1_dbh);
-   $self->stop_slave($s2_dbh);
-   my $s1_status = $self->get_slave_status($s1_dbh);
-   my $s2_status = $self->get_slave_status($s2_dbh);
+   $self->stop_replica($s1_dbh);
+   $self->stop_replica($s2_dbh);
+   my $s1_status = $self->get_replica_status($s1_dbh);
+   my $s2_status = $self->get_replica_status($s2_dbh);
    my $s1_pos    = $self->repl_posn($s1_status);
    my $s2_pos    = $self->repl_posn($s2_status);
    if ( $self->pos_cmp($s1_pos, $s2_pos) < 0 ) {
-      $self->start_slave($s1_dbh, $s2_pos);
+      $self->start_replica($s1_dbh, $s2_pos);
    }
    elsif ( $self->pos_cmp($s2_pos, $s1_pos) < 0 ) {
-      $self->start_slave($s2_dbh, $s1_pos);
+      $self->start_replica($s2_dbh, $s1_pos);
    }
 
-   $s1_status = $self->get_slave_status($s1_dbh);
-   $s2_status = $self->get_slave_status($s2_dbh);
+   $s1_status = $self->get_replica_status($s1_dbh);
+   $s2_status = $self->get_replica_status($s2_dbh);
    $s1_pos    = $self->repl_posn($s1_status);
    $s2_pos    = $self->repl_posn($s2_status);
 
-   if ( $self->slave_is_running($s1_status)
-     || $self->slave_is_running($s2_status)
+   my $vp1 = VersionParser->new($s1_dbh);
+   my $replica1_name = 'replica';
+   if ( $vp1 < '8.1' || $vp1->flavor() =~ m/maria/ ) {
+      $replica1_name = 'slave';
+   }
+
+   my $vp2 = VersionParser->new($s2_dbh);
+   my $replica2_name = 'replica';
+   if ( $vp2 < '8.1' || $vp2->flavor() =~ m/maria/ ) {
+      $replica2_name = 'slave';
+   }
+
+   if ( $self->replica_is_running($s1_status, $replica1_name)
+     || $self->replica_is_running($s2_status, $replica2_name)
      || $self->pos_cmp($s1_pos, $s2_pos) != 0)
    {
       die "The servers aren't both stopped at the same position";
@@ -4541,14 +4614,21 @@ sub catchup_to_same_pos {
 
 }
 
-sub slave_is_running {
-   my ( $self, $slave_status ) = @_;
-   return ($slave_status->{slave_sql_running} || 'No') eq 'Yes';
+sub replica_is_running {
+   my ( $self, $replica_status, $replica_name ) = @_;
+   return ($replica_status->{"${replica_name}_sql_running"} || 'No') eq 'Yes';
 }
 
-sub has_slave_updates {
+sub has_replica_updates {
    my ( $self, $dbh ) = @_;
-   my $sql = q{SHOW VARIABLES LIKE 'log_slave_updates'};
+   
+   my $vp = VersionParser->new($dbh);
+   my $replica_name = 'replica';
+   if ( $vp < '8.1' || $vp->flavor() =~ m/maria/ ) {
+      $replica_name = 'slave';
+   }
+
+   my $sql = qq{SHOW VARIABLES LIKE 'log_${replica_name}_updates'};
    PTDEBUG && _d($dbh, $sql);
    my ($name, $value) = $dbh->selectrow_array($sql);
    return $value && $value =~ m/^(1|ON)$/;
@@ -4562,6 +4642,12 @@ sub repl_posn {
          position => $status->{position},
       };
    }
+   elsif ( exists $status->{relay_source_log_file} && exists $status->{exec_source_log_pos} ) {
+      return {
+         file     => $status->{relay_source_log_file},
+         position => $status->{exec_source_log_pos},
+      };
+   }
    else {
       return {
          file     => $status->{relay_master_log_file},
@@ -4570,11 +4656,18 @@ sub repl_posn {
    }
 }
 
-sub get_slave_lag {
+sub get_replica_lag {
    my ( $self, $dbh ) = @_;
-   my $stat = $self->get_slave_status($dbh);
-   return unless $stat;  # server is not a slave
-   return $stat->{seconds_behind_master};
+   
+   my $vp = VersionParser->new($dbh);
+   my $source_name = 'source';
+   if ( $vp < '8.1' || $vp->flavor() =~ m/maria/ ) {
+      $source_name = 'master';
+   }
+
+   my $stat = $self->get_replica_status($dbh);
+   return unless $stat;  # server is not a replica
+   return $stat->{"seconds_behind_${source_name}"};
 }
 
 sub pos_cmp {
@@ -4585,9 +4678,9 @@ sub pos_cmp {
 sub short_host {
    my ( $self, $dsn ) = @_;
    my ($host, $port);
-   if ( $dsn->{master_host} ) {
-      $host = $dsn->{master_host};
-      $port = $dsn->{master_port};
+   if ( $dsn->{source_host} ) {
+      $host = $dsn->{source_host};
+      $port = $dsn->{source_port};
    }
    else {
       $host = $dsn->{h};
@@ -4602,7 +4695,7 @@ sub is_replication_thread {
 
    my $type = lc($args{type} || 'all');
    die "Invalid type: $type"
-      unless $type =~ m/^binlog_dump|slave_io|slave_sql|all$/i;
+      unless $type =~ m/^binlog_dump|slave_io|slave_sql|replica_io|replica_sql|all$/i;
 
    my $match = 0;
    if ( $type =~ m/binlog_dump|all/i ) {
@@ -4611,7 +4704,7 @@ sub is_replication_thread {
    }
    if ( !$match ) {
       if ( ($query->{User} || $query->{user} || '') eq "system user" ) {
-         PTDEBUG && _d("Slave replication thread");
+         PTDEBUG && _d("Replica replication thread");
          if ( $type ne 'all' ) {
             my $state = $query->{State} || $query->{state} || '';
 
@@ -4620,15 +4713,16 @@ sub is_replication_thread {
                $match = 1;
             }
             else {
-               my ($slave_sql) = $state =~ m/
+               my ($replica_sql) = $state =~ m/
                   ^(Waiting\sfor\sthe\snext\sevent
                    |Reading\sevent\sfrom\sthe\srelay\slog
                    |Has\sread\sall\srelay\slog;\swaiting
                    |Making\stemp\sfile
-                   |Waiting\sfor\sslave\smutex\son\sexit)/xi;
+                   |Waiting\sfor\sslave\smutex\son\sexit
+                   |Waiting\sfor\sreplica\smutex\son\sexit)/xi;
 
-               $match = $type eq 'slave_sql' &&  $slave_sql ? 1
-                      : $type eq 'slave_io'  && !$slave_sql ? 1
+               $match = $type eq 'replica_sql' &&  $replica_sql ? 1
+                      : $type eq 'replica_io'  && !$replica_sql ? 1
                       :                                       0;
             }
          }
@@ -4669,9 +4763,15 @@ sub get_replication_filters {
    }
    my ($dbh) = @args{@required_args};
 
+   my $vp = VersionParser->new($dbh);
+   my $replica_name = 'replica';
+   if ( $vp < '8.1' || $vp->flavor() =~ m/maria/ ) {
+      $replica_name = 'slave';
+   }
+
    my %filters = ();
 
-   my $status = $self->get_master_status($dbh);
+   my $status = $self->get_source_status($dbh);
    if ( $status ) {
       map { $filters{$_} = $status->{$_} }
       grep { defined $status->{$_} && $status->{$_} ne '' }
@@ -4681,7 +4781,7 @@ sub get_replication_filters {
       );
    }
 
-   $status = $self->get_slave_status($dbh);
+   $status = $self->get_replica_status($dbh);
    if ( $status ) {
       map { $filters{$_} = $status->{$_} }
       grep { defined $status->{$_} && $status->{$_} ne '' }
@@ -4694,10 +4794,10 @@ sub get_replication_filters {
          replicate_wild_ignore_table
       );
 
-      my $sql = "SHOW VARIABLES LIKE 'slave_skip_errors'";
+      my $sql = "SHOW VARIABLES LIKE '${replica_name}_skip_errors'";
       PTDEBUG && _d($dbh, $sql);
       my $row = $dbh->selectrow_arrayref($sql);
-      $filters{slave_skip_errors} = $row->[1] if $row->[1] && $row->[1] ne 'OFF';
+      $filters{replica_skip_errors} = $row->[1] if $row->[1] && $row->[1] ne 'OFF';
    }
 
    return \%filters;
diff --git a/bin/pt-mysql-summary b/bin/pt-mysql-summary
index 94039a767..569febbee 100755
--- a/bin/pt-mysql-summary
+++ b/bin/pt-mysql-summary
@@ -686,7 +686,7 @@ section () {
 }
 
 NAME_VAL_LEN=12
-name_val () {
+name_val() {
    printf "%+*s | %s\n" "${NAME_VAL_LEN}" "$1" "$2"
 }
 
@@ -712,7 +712,7 @@ shorten() {
    '
 }
 
-group_concat () {
+group_concat() {
    sed -e '{H; $!d;}' -e 'x' -e 's/\n[[:space:]]*\([[:digit:]]*\)[[:space:]]*/, \1x/g' -e 's/[[:space:]][[:space:]]*/ /g' -e 's/, //' "${1}"
 }
 
@@ -946,8 +946,10 @@ collect_mysql_plugins () {
    $CMD_MYSQL $EXT_ARGV -ss -e 'SHOW PLUGINS' 2>/dev/null
 }
 
-collect_mysql_slave_status () {
-   $CMD_MYSQL $EXT_ARGV -ssE -e 'SHOW SLAVE STATUS' 2>/dev/null
+collect_mysql_replica_status () {
+   local replica_name="$1"
+
+   $CMD_MYSQL $EXT_ARGV -ssE -e "SHOW ${replica_name} STATUS" 2>/dev/null
 }
 
 collect_mysql_innodb_status () {
@@ -974,15 +976,30 @@ collect_mysql_roles () {
    $CMD_MYSQL $EXT_ARGV -ss -e "$QUERY" 2>/dev/null
 }
 
-collect_mysql_show_slave_hosts () {
-   $CMD_MYSQL $EXT_ARGV -ssE -e 'SHOW SLAVE HOSTS' 2>/dev/null
+collect_mysql_show_replica_hosts () {
+   local version="$1"
+
+   local replicas='replicas'
+   if [ "$version" '<' "8.1" ]; then
+      replicas='slave hosts'
+   fi
+
+   $CMD_MYSQL $EXT_ARGV -ssE -e "SHOW ${replicas}" 2>/dev/null
 }
 
-collect_master_logs_status () {
-   local master_logs_file="$1"
-   local master_status_file="$2"
-   $CMD_MYSQL $EXT_ARGV -ss -e 'SHOW MASTER LOGS' > "$master_logs_file" 2>/dev/null
-   $CMD_MYSQL $EXT_ARGV -ss -e 'SHOW MASTER STATUS' > "$master_status_file" 2>/dev/null
+collect_source_logs_status () {
+   local source_logs_file="$1"
+   local source_status_file="$2"
+   local version="$3"
+
+   local source_log='binary'
+   local source_status='binary log'
+   if [ "$version" '<' "8.1" ]; then
+      source_log = 'master'
+      source_status = 'master'
+   fi
+   $CMD_MYSQL $EXT_ARGV -ss -e "SHOW ${source_log} LOGS" > "$source_logs_file" 2>/dev/null
+   $CMD_MYSQL $EXT_ARGV -ss -e "SHOW ${source_status} STATUS" > "$source_status_file" 2>/dev/null
 }
 
 collect_mysql_deferred_status () {
@@ -1106,7 +1123,6 @@ collect_mysql_info () {
    collect_mysql_status        > "$dir/mysql-status"
    collect_mysql_databases     > "$dir/mysql-databases"
    collect_mysql_plugins       > "$dir/mysql-plugins"
-   collect_mysql_slave_status  > "$dir/mysql-slave"
    collect_mysql_innodb_status > "$dir/innodb-status"
    collect_mysql_ndb_status    > "$dir/ndb-status"
    collect_mysql_processlist   > "$dir/mysql-processlist"
@@ -1114,13 +1130,30 @@ collect_mysql_info () {
    collect_mysql_roles         > "$dir/mysql-roles"
    collect_keyring_plugins     > "$dir/keyring-plugins"
 
+   local mysql_version="$(get_var version "$dir/mysql-variables")"
+
+   local replicas='replicas'
+   local replica_name='replica'
+   if [ "$mysql_version" '<' "8.1" ]; then
+      replicas='slave-hosts'
+      replica_name='slave'
+   fi
+
+   collect_mysql_replica_status $replica_name > "$dir/mysql-${replica_name}"
    collect_mysqld_instances   "$dir/mysql-variables"  > "$dir/mysqld-instances"
    collect_mysqld_executables "$dir/mysqld-instances" > "$dir/mysqld-executables"
-   collect_mysql_show_slave_hosts  "$dir/mysql-slave-hosts" > "$dir/mysql-slave-hosts"
+   collect_mysql_show_replica_hosts "$mysql_version" > "$dir/mysql-${replicas}"
 
    local binlog="$(get_var log_bin "$dir/mysql-variables")"
    if [ "${binlog}" ]; then
-      collect_master_logs_status "$dir/mysql-master-logs" "$dir/mysql-master-status"
+      local source_logs_file="mysql-binary-logs"
+      local source_status_file="mysql-binary-log-status"
+
+      if [ "$mysql_version" '<' "8.1" ]; then
+         source_logs_file='mysql-master-logs'
+         source_status_file='mysql-master-status'
+      fi
+      collect_source_logs_status "$dir/$source_logs_file" "$dir/$source_status_file" ${mysql_version}
    fi
 
    local uptime="$(get_var Uptime "$dir/mysql-status")"
@@ -1148,7 +1181,6 @@ collect_mysql_info () {
    fi
 
    if [ "${OPT_LIST_ENCRYPTED_TABLES}" = 'yes' ]; then
-      local mysql_version="$(get_var version "$dir/mysql-variables")"
       collect_encrypted_tables                       > "$dir/encrypted-tables"
       collect_encrypted_tablespaces ${mysql_version} > "$dir/encrypted-tablespaces"
    fi
@@ -2016,6 +2048,7 @@ format_overall_db_stats () {
 
 section_percona_server_features () {
    local file="$1"
+   replica_name="$2"
 
    [ -e "$file" ] || return
 
@@ -2039,7 +2072,7 @@ section_percona_server_features () {
    name_val "Enhanced Logging"      \
             "$(feat_on "$file" log_slow_verbosity ne microtime)"
    name_val "Replica Perf Logging"  \
-            "$(feat_on "$file" log_slow_slave_statements)"
+            "$(feat_on "$file" log_slow_${replica_name}_statements)"
 
    name_val "Response Time Hist."   \
             "$(feat_on_renamed "$file" enable_query_response_time_stats query_response_time_stats)"
@@ -2188,7 +2221,7 @@ section_noteworthy_variables () {
       name_val "${v}" "$(shorten $(get_var ${v} "$file") 0)"
    done
    for v in log log_error log_warnings log_slow_queries \
-         log_queries_not_using_indexes log_slave_updates;
+         log_queries_not_using_indexes log_${replica_name}_updates;
    do
       name_val "${v}" "$(get_var ${v} "$file")"
    done
@@ -2197,6 +2230,7 @@ section_noteworthy_variables () {
 _semi_sync_stats_for () {
    local target="$1"
    local file="$2"
+   local replica_name="$3"
 
    [ -e "$file" ] || return
 
@@ -2221,13 +2255,13 @@ _semi_sync_stats_for () {
    name_val "${target} semisync status" "${semisync_status}"
    name_val "${target} trace level" "${semisync_trace}, ${trace_extra}"
 
-   if [ "${target}" = "master" ]; then
+   if [ "${target}" = "source" ] || [ "${target}" = "master" ]; then
       name_val "${target} timeout in milliseconds" \
                "$(get_var "rpl_semi_sync_${target}_timeout" "${file}")"
-      name_val "${target} waits for slaves"        \
-               "$(get_var "rpl_semi_sync_${target}_wait_no_slave" "${file}")"
+      name_val "${target} waits for ${replica_name}s"        \
+               "$(get_var "rpl_semi_sync_${target}_wait_no_${replica_name}" "${file}")"
 
-      _d "Prepend Rpl_semi_sync_master_ to the following"
+      _d "Prepend Rpl_semi_sync_${target}_ to the following"
       for v in                                              \
          clients net_avg_wait_time net_wait_time net_waits  \
          no_times no_tx timefunc_failures tx_avg_wait_time  \
@@ -2235,7 +2269,7 @@ _semi_sync_stats_for () {
          wait_sessions yes_tx;
       do
          name_val "${target} ${v}" \
-                  "$( get_var "Rpl_semi_sync_master_${v}" "${file}" )"
+                  "$( get_var "Rpl_semi_sync_${target}_${v}" "${file}" )"
       done
    fi
 }
@@ -2256,7 +2290,7 @@ noncounters_pattern () {
       Not_flushed_delayed_rows Open_files Open_streams Open_tables \
       Prepared_stmt_count Qcache_free_blocks Qcache_free_memory \
       Qcache_queries_in_cache Qcache_total_blocks Rpl_status \
-      Slave_open_temp_tables Slave_running Ssl_cipher Ssl_cipher_list \
+      Slave_open_temp_tables Slave_running Replica_open_temp_tables Ssl_cipher Ssl_cipher_list \
       Ssl_ctx_verify_depth Ssl_ctx_verify_mode Ssl_default_timeout \
       Ssl_session_cache_mode Ssl_session_cache_size Ssl_verify_depth \
       Ssl_verify_mode Ssl_version Tc_log_max_pages_used Tc_log_page_size \
@@ -2287,16 +2321,17 @@ section_mysqld () {
    done < "$executables_file"
 }
 
-section_slave_hosts () {
-   local slave_hosts_file="$1"
+section_replica_hosts () {
+   local replica_hosts_file="$1"
+   local replica_name=`echo "$2" | sed 's/[^ ]*/\u&/'`
 
-   [ -e "$slave_hosts_file" ] || return
+   [ -e "$replica_hosts_file" ] || return
 
-   section "Slave Hosts"
-   if [ -s "$slave_hosts_file" ]; then
-       cat "$slave_hosts_file"
+   section "${replica_name} Hosts"
+   if [ -s "$replica_hosts_file" ]; then
+       cat "$replica_hosts_file"
    else
-       echo "No slaves found"
+       echo "No ${replica_name} found"
    fi
 }
 
@@ -2385,6 +2420,26 @@ report_mysql_summary () {
 
    local NAME_VAL_LEN=25
 
+   local user="$(get_var "pt-summary-internal-user" "$dir/mysql-variables")"
+   local port="$(get_var port "$dir/mysql-variables")"
+   local now="$(get_var "pt-summary-internal-now" "$dir/mysql-variables")"
+   local mysql_version="$(get_var version "$dir/mysql-variables")"
+
+   local source_name='source'
+   local replica_name='replica'
+   local source_log='binary'
+   local source_status='binary log'
+   local source_logs_file="mysql-binary-logs"
+   local source_status_file="mysql-binary-log-status"
+   if [ "${mysql_version}" '<' "8.1" ]; then
+      source_name='master'
+      replica_name='slave'
+      source_log='master'
+      source_status='master'
+      source_logs_file='mysql-master-logs'
+      source_status_file='mysql-master-status'
+   fi
+
 
    section "Percona Toolkit MySQL Summary Report"
    name_val "System time" "`date -u +'%F %T UTC'` (local TZ: `date +'%Z %z'`)"
@@ -2393,10 +2448,8 @@ report_mysql_summary () {
 
    section_mysqld "$dir/mysqld-executables" "$dir/mysql-variables"
 
-   section_slave_hosts "$dir/mysql-slave-hosts"
-   local user="$(get_var "pt-summary-internal-user" "$dir/mysql-variables")"
-   local port="$(get_var port "$dir/mysql-variables")"
-   local now="$(get_var "pt-summary-internal-now" "$dir/mysql-variables")"
+   section_replica_hosts "$dir/mysql-${replica_name}-hosts" ${replica_name}
+
    section "Report On Port ${port}"
    name_val User "${user}"
    name_val Time "${now} ($(get_mysql_timezone "$dir/mysql-variables"))"
@@ -2415,10 +2468,10 @@ report_mysql_summary () {
    local fuzz_procr=$(fuzz $(get_var Threads_running "$dir/mysql-status"))
    name_val Processes "${fuzz_procs} connected, ${fuzz_procr} running"
 
-   local slave=""
-   if [ -s "$dir/mysql-slave" ]; then slave=""; else slave="not "; fi
-   local slavecount=$(grep -c 'Binlog Dump' "$dir/mysql-processlist")
-   name_val Replication "Is ${slave}a slave, has ${slavecount} slaves connected"
+   local replica=""
+   if [ -s "$dir/mysql-${replica_name}" ]; then replica=""; else replica="not "; fi
+   local replicacount=$(grep -c 'Binlog Dump' "$dir/mysql-processlist")
+   name_val Replication "Is ${replica}a ${replica_name}, has ${replicacount} ${replica_name}s connected"
 
 
    local pid_file="$(get_var "pid_file" "$dir/mysql-variables")"
@@ -2445,7 +2498,7 @@ report_mysql_summary () {
    name_val Usage "$(fuzzy_pct ${open_tables} ${table_cache})"
 
    section "Key Percona Server features"
-   section_percona_server_features "$dir/mysql-variables"
+   section_percona_server_features "$dir/mysql-variables" "${replica_name}"
 
    section "Percona XtraDB Cluster"
    local has_wsrep="$(get_var "wsrep_on" "$dir/mysql-variables")"
@@ -2473,19 +2526,20 @@ report_mysql_summary () {
       name_val HitToInsertRatio "${hrat}"
    fi
 
-   local semisync_enabled_master="$(get_var "rpl_semi_sync_master_enabled" "$dir/mysql-variables")"
-   if [ -n "${semisync_enabled_master}" ]; then
+   local semisync_enabled_source="$(get_var "rpl_semi_sync_${source_name}_enabled" "$dir/mysql-variables")"
+   if [ -n "${semisync_enabled_source}" ]; then
       section "Semisynchronous Replication"
-      if [ "$semisync_enabled_master" = "OFF" -o "$semisync_enabled_master" = "0" -o -z "$semisync_enabled_master" ]; then
-         name_val "Master" "Disabled"
+      if [ "$semisync_enabled_source" = "OFF" -o "$semisync_enabled_source" = "0" -o -z "$semisync_enabled_source" ]; then
+         name_val "Source" "Disabled"
       else
-         _semi_sync_stats_for "master" "$dir/mysql-variables"
+         _semi_sync_stats_for "${source_name}" "$dir/mysql-variables" "${replica_name}"
       fi
-      local semisync_enabled_slave="$(get_var rpl_semi_sync_slave_enabled "$dir/mysql-variables")"
-      if    [ "$semisync_enabled_slave" = "OFF" -o "$semisync_enabled_slave" = "0" -o -z "$semisync_enabled_slave" ]; then
-         name_val "Slave" "Disabled"
+      local semisync_enabled_replica="$(get_var rpl_semi_sync_${replica_name}_enabled "$dir/mysql-variables")"
+      if    [ "$semisync_enabled_replica" = "OFF" -o "$semisync_enabled_replica" = "0" -o -z "$semisync_enabled_replica" ]; then
+         local replica_name_cap=`echo "$replica_name" | sed 's/[^ ]*/\u&/'`
+         name_val "${replica_name_cap}" "Disabled"
       else
-         _semi_sync_stats_for "slave" "$dir/mysql-variables"
+         _semi_sync_stats_for "${replica_name}" "$dir/mysql-variables" "${replica_name}"
       fi
    fi
 
@@ -2627,15 +2681,15 @@ report_mysql_summary () {
 
    section "Binary Logging"
 
-   if    [ -s "$dir/mysql-master-logs" ] \
-      || [ -s "$dir/mysql-master-status" ]; then
-      summarize_binlogs "$dir/mysql-master-logs"
+   if    [ -s "$dir/$source_logs_file" ] \
+      || [ -s "$dir/$source_status_file" ]; then
+      summarize_binlogs "$dir/$source_logs_file"
       local format="$(get_var binlog_format "$dir/mysql-variables")"
       name_val binlog_format "${format:-STATEMENT}"
       name_val expire_logs_days "$(get_var expire_logs_days "$dir/mysql-variables")"
       name_val sync_binlog "$(get_var sync_binlog "$dir/mysql-variables")"
       name_val server_id "$(get_var server_id "$dir/mysql-variables")"
-      format_binlog_filters "$dir/mysql-master-status"
+      format_binlog_filters "$dir/$source_status_file"
    fi
 
 
diff --git a/lib/DSNParser.pm b/lib/DSNParser.pm
index 71c16b16d..c5f81ff5a 100644
--- a/lib/DSNParser.pm
+++ b/lib/DSNParser.pm
@@ -132,7 +132,7 @@ sub parse {
    # Parse given props
    foreach my $dsn_part ( split($dsn_sep, $dsn) ) {
       $dsn_part =~ s/\\,/,/g;
-      if ( my ($prop_key, $prop_val) = $dsn_part =~  m/^(.*?)=(.*)$/ ) {
+      if ( my ($prop_key, $prop_val) = $dsn_part =~  m/^(.)=(.*)$/ ) {
          # Handle the typical DSN parts like h=host, P=3306, etc.
          $given_props{$prop_key} = $prop_val;
       }
@@ -243,9 +243,8 @@ sub get_cxn_params {
       $dsn = 'DBI:mysql:' . ( $info->{D} || '' ) . ';'
          . join(';', map  { "$opts{$_}->{dsn}=$info->{$_}" }
                      grep { defined $info->{$_} }
-                     qw(F h P S A mysql_ssl))
+                     qw(F h P S A s))
          . ';mysql_read_default_group=client'
-         #. ($info->{s} ? ';mysql_ssl=1' : '')
          . ($info->{L} ? ';mysql_local_infile=1' : '');
    }
    PTDEBUG && _d($dsn);
diff --git a/lib/PerconaTest.pm b/lib/PerconaTest.pm
index 3a211672c..ede6824e1 100644
--- a/lib/PerconaTest.pm
+++ b/lib/PerconaTest.pm
@@ -70,6 +70,7 @@ our @EXPORT      = qw(
    $test_diff
    $source_name
    $source_status
+   $source_reset
    $replica_name
 );
 
@@ -83,10 +84,12 @@ eval {
 
 our $source_name = 'source';
 our $source_status = 'binary log';
+our $source_reset = 'binary logs and gtids';
 our $replica_name = 'replica';
 if ( $sandbox_version < '8.1' || ( $ENV{FORK} || "" eq 'mariadb' ) ) {
    $source_name = 'master';
    $source_status = 'master';
+   $source_reset = 'master';
    $replica_name = 'slave';
 }
 
@@ -150,7 +153,7 @@ our $dsn_opts = [
       copy => 1,
    },
    {
-      key  => 'mysql_ssl',
+      key  => 's',
       desc => 'Use SSL',
       dsn  => 'mysql_ssl',
       copy => 1,
diff --git a/lib/Sandbox.pm b/lib/Sandbox.pm
index 93c2a2058..6e041ccff 100644
--- a/lib/Sandbox.pm
+++ b/lib/Sandbox.pm
@@ -38,7 +38,6 @@ $Data::Dumper::Sortkeys  = 1;
 $Data::Dumper::Quotekeys = 0;
 use constant PTDEBUG    => $ENV{PTDEBUG}    || 0;
 use constant PTDEVDEBUG => $ENV{PTDEVDEBUG} || 0;
-use VersionParser;
 
 use IO::Socket::INET;
 
@@ -636,8 +635,8 @@ sub _d {
    print STDERR "# $package:$line $PID ", join(' ', @_), "\n";
 }
 
-1;
 }
+1;
 # ###########################################################################
 # End Sandbox package
 # ###########################################################################
diff --git a/lib/bash/report_mysql_info.sh b/lib/bash/report_mysql_info.sh
index a2d04390e..fe8fbf2fe 100644
--- a/lib/bash/report_mysql_info.sh
+++ b/lib/bash/report_mysql_info.sh
@@ -1217,11 +1217,11 @@ section_mysqld () {
 
 section_replica_hosts () {
    local replica_hosts_file="$1"
-   local replica_name="$2"
+   local replica_name=`echo "$2" | sed 's/[^ ]*/\u&/'`
 
    [ -e "$replica_hosts_file" ] || return
 
-   section "${replica_name^} Hosts"
+   section "${replica_name} Hosts"
    if [ -s "$replica_hosts_file" ]; then
        cat "$replica_hosts_file"
    else
@@ -1248,7 +1248,6 @@ section_mysql_files () {
 section_percona_xtradb_cluster () {
    local mysql_var="$1"
    local mysql_status="$2"
-   local replica_name="$3"
 
    name_val "Cluster Name"    "$(get_var "wsrep_cluster_name" "$mysql_var")"
    name_val "Cluster Address" "$(get_var "wsrep_cluster_address" "$mysql_var")"
@@ -1259,7 +1258,7 @@ section_percona_xtradb_cluster () {
    name_val "Node Status"     "$(get_var "wsrep_cluster_status" "$mysql_status")"
 
    name_val "SST Method"      "$(get_var "wsrep_sst_method" "$mysql_var")"
-   name_val "${replica_name^} Threads"   "$(get_var "wsrep_${replica_name}_threads" "$mysql_var")"
+   name_val "Slave Threads"   "$(get_var "wsrep_slave_threads" "$mysql_var")"
 
    name_val "Ignore Split Brain" "$( parse_wsrep_provider_options "pc.ignore_sb" "$mysql_var" )"
    name_val "Ignore Quorum" "$( parse_wsrep_provider_options "pc.ignore_quorum" "$mysql_var" )"
@@ -1427,7 +1426,7 @@ report_mysql_summary () {
    if [ -n "${has_wsrep:-""}" ]; then
       local wsrep_on="$(feat_on "$dir/mysql-variables" "wsrep_on")"
       if [ "${wsrep_on:-""}" = "Enabled" ]; then
-         section_percona_xtradb_cluster "$dir/mysql-variables" "$dir/mysql-status" "$replica_name"
+         section_percona_xtradb_cluster "$dir/mysql-variables" "$dir/mysql-status"
       else
          name_val "wsrep_on" "OFF"
       fi
@@ -1465,7 +1464,8 @@ report_mysql_summary () {
       fi
       local semisync_enabled_replica="$(get_var rpl_semi_sync_${replica_name}_enabled "$dir/mysql-variables")"
       if    [ "$semisync_enabled_replica" = "OFF" -o "$semisync_enabled_replica" = "0" -o -z "$semisync_enabled_replica" ]; then
-         name_val "${replica_name^}" "Disabled"
+         local replica_name_cap=`echo "$replica_name" | sed 's/[^ ]*/\u&/'`
+         name_val "${replica_name_cap}" "Disabled"
       else
          _semi_sync_stats_for "${replica_name}" "$dir/mysql-variables" "${replica_name}"
       fi
diff --git a/runtime.txt b/runtime.txt
deleted file mode 100644
index 475ba515c..000000000
--- a/runtime.txt
+++ /dev/null
@@ -1 +0,0 @@
-3.7
diff --git a/t/lib/ChangeHandler.t b/t/lib/ChangeHandler.t
index fbef26dc2..311090794 100644
--- a/t/lib/ChangeHandler.t
+++ b/t/lib/ChangeHandler.t
@@ -14,6 +14,7 @@ use Test::More;
 use ChangeHandler;
 use Quoter;
 use DSNParser;
+use VersionParser;
 use Sandbox;
 use PerconaTest;
 
diff --git a/t/lib/CompareQueryTimes.t b/t/lib/CompareQueryTimes.t
index 3a6f478db..38e28946b 100644
--- a/t/lib/CompareQueryTimes.t
+++ b/t/lib/CompareQueryTimes.t
@@ -14,6 +14,7 @@ use Test::More;
 use ReportFormatter;
 use Transformers;
 use DSNParser;
+use VersionParser;
 use Sandbox;
 use CompareQueryTimes;
 use PerconaTest;
diff --git a/t/lib/CopyRowsInsertSelect.t b/t/lib/CopyRowsInsertSelect.t
index 758170231..e6d5d319b 100644
--- a/t/lib/CopyRowsInsertSelect.t
+++ b/t/lib/CopyRowsInsertSelect.t
@@ -12,6 +12,7 @@ use English qw(-no_match_vars);
 use Test::More;
 
 use DSNParser;
+use VersionParser;
 use Sandbox;
 use PerconaTest;
 use Progress;
diff --git a/t/lib/Cxn.t b/t/lib/Cxn.t
index f7df8428a..c02dc9c03 100644
--- a/t/lib/Cxn.t
+++ b/t/lib/Cxn.t
@@ -14,6 +14,7 @@ use Test::More;
 use Sandbox;
 use OptionParser;
 use DSNParser;
+use VersionParser;
 use Quoter;
 use PerconaTest;
 use Cxn;
@@ -213,7 +214,7 @@ is_deeply(
       S => undef,
       D => undef,
       t => undef,
-      mysql_ssl => undef,
+      s => undef,
    },
    "cxn->dsn()"
 );
@@ -241,7 +242,7 @@ is_deeply(
       S => undef,
       D => undef,
       t => undef,
-      mysql_ssl => undef,
+      s => undef,
    },
    "Defaults to h=localhost"
 );
@@ -261,7 +262,7 @@ is_deeply(
       S => undef,
       D => undef,
       t => undef,
-      mysql_ssl => undef,
+      s => undef,
    },
    "Default cxn inherits default connection options"
 );
diff --git a/t/lib/ExplainAnalyzer.t b/t/lib/ExplainAnalyzer.t
index 92451259c..e192bdff3 100644
--- a/t/lib/ExplainAnalyzer.t
+++ b/t/lib/ExplainAnalyzer.t
@@ -21,6 +21,7 @@ use ExplainAnalyzer;
 use QueryRewriter;
 use QueryParser;
 use DSNParser;
+use VersionParser;
 use Sandbox;
 use PerconaTest;
 
diff --git a/t/lib/IndexUsage.t b/t/lib/IndexUsage.t
index 1ba8bc0d7..452514714 100644
--- a/t/lib/IndexUsage.t
+++ b/t/lib/IndexUsage.t
@@ -16,6 +16,7 @@ use constant PTDEBUG => $ENV{PTDEBUG} || 0;
 use IndexUsage;
 use OptionParser;
 use DSNParser;
+use VersionParser;
 use Transformers;
 use QueryRewriter;
 use Sandbox;
diff --git a/t/lib/MasterSlave.t b/t/lib/MasterSlave.t
index f757b695c..8fb283886 100644
--- a/t/lib/MasterSlave.t
+++ b/t/lib/MasterSlave.t
@@ -81,7 +81,7 @@ PXC_SKIP: {
             h => '127.0.0.1',
             p => 'msandbox',
             t => undef,
-            mysql_ssl => undef,
+            s => undef,
             u => 'msandbox',
             server_id => 12346,
             source_id => 12345,
@@ -257,7 +257,7 @@ my $dbh;
 my @slaves;
 my @sldsns;
 
-my $dsn = $dp->parse("h=127.0.0.1,P=$port_for{source},u=msandbox,p=msandbox,mysql_ssl=>1");
+my $dsn = $dp->parse("h=127.0.0.1,P=$port_for{source},u=msandbox,p=msandbox,s=>1");
 $dbh    = $dp->get_dbh($dp->get_cxn_params($dsn), { AutoCommit => 1 });
 
 my $callback = sub {
@@ -305,7 +305,7 @@ is_deeply(
       D => undef,
       A => undef,
       t => undef,
-      mysql_ssl => undef,
+      s => undef,
    },
    'Got master DSN',
 );
@@ -704,7 +704,7 @@ is_deeply(
       p => 'msandbox',
       t => undef,
       u => 'msandbox',
-      mysql_ssl => undef,
+      s => undef,
    },
    'get_replicas() from DSN table'
 );
diff --git a/t/lib/MockSyncStream.t b/t/lib/MockSyncStream.t
index 24f56d382..f2c806321 100644
--- a/t/lib/MockSyncStream.t
+++ b/t/lib/MockSyncStream.t
@@ -78,6 +78,7 @@ is_deeply(
 # Test online stuff, e.g. get_cols_and_struct().
 # #############################################################################
 use DSNParser;
+use VersionParser;
 use Sandbox;
 my $dp  = new DSNParser(opts=>$dsn_opts);
 my $sb  = new Sandbox(basedir => '/tmp', DSNParser => $dp);
diff --git a/t/lib/MySQLConfig.t b/t/lib/MySQLConfig.t
index 67dfcb636..16c3d14a0 100644
--- a/t/lib/MySQLConfig.t
+++ b/t/lib/MySQLConfig.t
@@ -13,6 +13,7 @@ use Test::More;
 
 use MySQLConfig;
 use DSNParser;
+use VersionParser;
 use Sandbox;
 use TextResultSetParser;
 use PerconaTest;
diff --git a/t/lib/NibbleIterator.t b/t/lib/NibbleIterator.t
index 0021739fe..bdba373aa 100644
--- a/t/lib/NibbleIterator.t
+++ b/t/lib/NibbleIterator.t
@@ -15,6 +15,7 @@ use Schema;
 use SchemaIterator;
 use Quoter;
 use DSNParser;
+use VersionParser;
 use Sandbox;
 use OptionParser;
 use TableParser;
diff --git a/t/lib/OptionParser.t b/t/lib/OptionParser.t
index 717955f2f..d0e23306f 100644
--- a/t/lib/OptionParser.t
+++ b/t/lib/OptionParser.t
@@ -1828,6 +1828,7 @@ is_deeply(
       t => undef,
       u => 'bob',
       L => undef,
+      s => undef,
    },
    'DSN opt gets missing vals from --host, --port, etc. (issue 248)',
 );
@@ -1865,6 +1866,7 @@ is_deeply(
       t => undef,
       u => 'bob',
       L => undef,
+      s => undef,
    },
    'Vals from "defaults to" DSN take precedence over defaults (issue 248)'
 );
diff --git a/t/lib/Outfile.t b/t/lib/Outfile.t
index 22de868a6..2b649669a 100644
--- a/t/lib/Outfile.t
+++ b/t/lib/Outfile.t
@@ -13,6 +13,7 @@ use Test::More tests => 2;
 
 use Outfile;
 use DSNParser;
+use VersionParser;
 use Sandbox;
 use PerconaTest;
 
diff --git a/t/lib/QueryHistory.t b/t/lib/QueryHistory.t
index 552f0a492..ab532f04e 100644
--- a/t/lib/QueryHistory.t
+++ b/t/lib/QueryHistory.t
@@ -17,6 +17,7 @@ use TableParser;
 use Quoter;
 use OptionParser;
 use DSNParser;
+use VersionParser;
 use Sandbox;
 use PerconaTest;
 
diff --git a/t/lib/QueryReportFormatter.t b/t/lib/QueryReportFormatter.t
index 61682dfe8..cb4add7c0 100644
--- a/t/lib/QueryReportFormatter.t
+++ b/t/lib/QueryReportFormatter.t
@@ -25,6 +25,7 @@ use Quoter;
 use ReportFormatter;
 use OptionParser;
 use DSNParser;
+use VersionParser;
 use ReportFormatter;
 use ExplainAnalyzer;
 use Sandbox;
diff --git a/t/lib/QueryReview.t b/t/lib/QueryReview.t
index cf61cc70c..92475e508 100644
--- a/t/lib/QueryReview.t
+++ b/t/lib/QueryReview.t
@@ -18,6 +18,7 @@ use TableParser;
 use Quoter;
 use SlowLogParser;
 use DSNParser;
+use VersionParser;
 use Sandbox;
 use PerconaTest;
 
diff --git a/t/lib/Quoter.t b/t/lib/Quoter.t
index c29e0b0ac..7a4177680 100644
--- a/t/lib/Quoter.t
+++ b/t/lib/Quoter.t
@@ -15,6 +15,7 @@ use Data::Dumper;
 use Quoter;
 use PerconaTest;
 use DSNParser;
+use VersionParser;
 use Sandbox;
 
 my $dp  = new DSNParser(opts=>$dsn_opts);
diff --git a/t/lib/RowChecksum.t b/t/lib/RowChecksum.t
index 4468b0089..a405b1898 100644
--- a/t/lib/RowChecksum.t
+++ b/t/lib/RowChecksum.t
@@ -15,6 +15,7 @@ use RowChecksum;
 use TableParser;
 use Quoter;
 use DSNParser;
+use VersionParser;
 use OptionParser;
 use Sandbox;
 use PerconaTest;
diff --git a/t/lib/RowDiff.t b/t/lib/RowDiff.t
index 6e3e540f4..65081f765 100644
--- a/t/lib/RowDiff.t
+++ b/t/lib/RowDiff.t
@@ -16,6 +16,7 @@ use RowDiff;
 use MockSth;
 use Sandbox;
 use DSNParser;
+use VersionParser;
 use TableParser;
 use Quoter;
 use PerconaTest;
diff --git a/t/lib/SchemaIterator.t b/t/lib/SchemaIterator.t
index 389092a54..6f3e5a741 100644
--- a/t/lib/SchemaIterator.t
+++ b/t/lib/SchemaIterator.t
@@ -15,6 +15,7 @@ use SchemaIterator;
 use FileIterator;
 use Quoter;
 use DSNParser;
+use VersionParser;
 use Sandbox;
 use OptionParser;
 use TableParser;
diff --git a/t/lib/TableChecksum.t b/t/lib/TableChecksum.t
index 509af1a15..327878ceb 100644
--- a/t/lib/TableChecksum.t
+++ b/t/lib/TableChecksum.t
@@ -15,6 +15,7 @@ use TableChecksum;
 use TableParser;
 use Quoter;
 use DSNParser;
+use VersionParser;
 use Sandbox;
 use PerconaTest;
 
diff --git a/t/lib/TableChunker.t b/t/lib/TableChunker.t
index bf63723d9..eb3bd65b8 100644
--- a/t/lib/TableChunker.t
+++ b/t/lib/TableChunker.t
@@ -15,6 +15,7 @@ use TableParser;
 use TableChunker;
 use Quoter;
 use DSNParser;
+use VersionParser;
 use Sandbox;
 use PerconaTest;
 
diff --git a/t/lib/TableParser.t b/t/lib/TableParser.t
index 95ac71c08..173afc4a3 100644
--- a/t/lib/TableParser.t
+++ b/t/lib/TableParser.t
@@ -15,6 +15,7 @@ use Text::Diff;
 use TableParser;
 use Quoter;
 use DSNParser;
+use VersionParser;
 use Sandbox;
 use PerconaTest;
 
diff --git a/t/lib/Transformers.t b/t/lib/Transformers.t
index a33cdec97..df41f9c5f 100644
--- a/t/lib/Transformers.t
+++ b/t/lib/Transformers.t
@@ -159,6 +159,7 @@ is(
 );
 
 use DSNParser;
+use VersionParser;
 use Sandbox;
 my $dp = new DSNParser(opts=>$dsn_opts);
 my $sb = new Sandbox(basedir => '/tmp', DSNParser => $dp);
diff --git a/t/lib/VersionCheck.t b/t/lib/VersionCheck.t
index e108179c7..3278ed00c 100644
--- a/t/lib/VersionCheck.t
+++ b/t/lib/VersionCheck.t
@@ -16,6 +16,7 @@ use Sys::Hostname qw(hostname);
 
 use VersionCheck;
 use DSNParser;
+use VersionParser;
 use Sandbox;
 use PerconaTest;
 use Percona::Toolkit;
diff --git a/t/pt-archiver/archive_using_channels.t b/t/pt-archiver/archive_using_channels.t
index 778fc24c8..38c056cd6 100644
--- a/t/pt-archiver/archive_using_channels.t
+++ b/t/pt-archiver/archive_using_channels.t
@@ -17,58 +17,58 @@ require "$trunk/bin/pt-archiver";
 
 my $dp = new DSNParser(opts=>$dsn_opts);
 my $sb = new Sandbox(basedir => '/tmp', DSNParser => $dp);
-my $master_dbh = $sb->get_dbh_for('master');
-my $slave_dbh  = $sb->get_dbh_for('slave1'); 
+my $source_dbh = $sb->get_dbh_for('source');
+my $replica_dbh  = $sb->get_dbh_for('replica1'); 
 
-if ( !$master_dbh ) {
-   plan skip_all => 'Cannot connect to sandbox master';
+if ( !$source_dbh ) {
+   plan skip_all => 'Cannot connect to sandbox source';
 }
-elsif ( !$slave_dbh ) {
-   plan skip_all => 'Cannot connect to sandbox slave';
+elsif ( !$replica_dbh ) {
+   plan skip_all => 'Cannot connect to sandbox replica';
 } elsif ($sandbox_version lt '5.7') {
    plan skip_all => 'Only on MySQL 5.7+';
 } else {
    plan tests => 5;
 }
 
-my ($master1_dbh, $master1_dsn) = $sb->start_sandbox(
-   server => 'chan_master1',
-   type   => 'master',
+my ($source1_dbh, $source1_dsn) = $sb->start_sandbox(
+   server => 'chan_source1',
+   type   => 'source',
 );
-my ($master2_dbh, $master2_dsn) = $sb->start_sandbox(
-   server => 'chan_master2',
-   type   => 'master',
+my ($source2_dbh, $source2_dsn) = $sb->start_sandbox(
+   server => 'chan_source2',
+   type   => 'source',
 );
-my ($slave1_dbh, $slave1_dsn) = $sb->start_sandbox(
-   server => 'chan_slave1',
-   type   => 'master',
+my ($replica1_dbh, $replica1_dsn) = $sb->start_sandbox(
+   server => 'chan_replica1',
+   type   => 'source',
 );
-my $slave1_port = $sb->port_for('chan_slave1');
+my $replica1_port = $sb->port_for('chan_replica1');
 
-$sb->load_file('chan_master1', "sandbox/gtid_on.sql", undef, no_wait => 1);
-$sb->load_file('chan_master2', "sandbox/gtid_on.sql", undef, no_wait => 1);
-$sb->load_file('chan_slave1', "sandbox/slave_channels.sql", undef, no_wait => 1);
+$sb->load_file('chan_source1', "sandbox/gtid_on.sql", undef, no_wait => 1);
+$sb->load_file('chan_source2', "sandbox/gtid_on.sql", undef, no_wait => 1);
+$sb->load_file('chan_replica1', "sandbox/replica_channels.sql", undef, no_wait => 1);
 
-my $master1_port = $sb->port_for('chan_master1');
+my $source1_port = $sb->port_for('chan_source1');
 my $num_rows = 40000;
 
-# Load some rows into masters 1 & 2.
-$sb->load_file('chan_master1', "t/pt-archiver/samples/channels.sql", undef, no_wait => 1);
+# Load some rows into sources 1 & 2.
+$sb->load_file('chan_source1', "t/pt-archiver/samples/channels.sql", undef, no_wait => 1);
 
-diag("Loading $num_rows into the test.t1 table on first master. This might take some time.");
-diag(`util/mysql_random_data_load --host=127.0.0.1 --port=$master1_port --user=msandbox --password=msandbox test t1 $num_rows`);
+diag("Loading $num_rows into the test.t1 table on first source. This might take some time.");
+diag(`util/mysql_random_data_load --host=127.0.0.1 --port=$source1_port --user=msandbox --password=msandbox test t1 $num_rows`);
 diag("$num_rows rows loaded. Starting tests.");
-$master_dbh->do("FLUSH TABLES");
+$source_dbh->do("FLUSH TABLES");
 
-my $rows = $master1_dbh->selectrow_arrayref('SELECT COUNT(*) FROM test.t1 ');
+my $rows = $source1_dbh->selectrow_arrayref('SELECT COUNT(*) FROM test.t1 ');
 
 is(
     @$rows[0],
     $num_rows,
-    "All rows were loaded into master 1",
+    "All rows were loaded into source 1",
 );
 
-my @args = ('--source', $master1_dsn.',D=test,t=t1', '--purge', '--where', sprintf('id >= %d', $num_rows / 2), '--check-slave-lag', $slave1_dsn);
+my @args = ('--source', $source1_dsn.',D=test,t=t1', '--purge', '--where', sprintf('id >= %d', $num_rows / 2), "--check-${replica_name}-lag", $replica1_dsn);
 
 my ($exit_status, $output);
 
@@ -104,12 +104,12 @@ is(
     'Ok if channel name was specified',
 );
 
-$sb->stop_sandbox(qw(chan_master1 chan_master2 chan_slave1));
+$sb->stop_sandbox(qw(chan_source1 chan_source2 chan_replica1));
 
 
 # #############################################################################
 # Done.
 # #############################################################################
-$sb->wipe_clean($master_dbh);
+$sb->wipe_clean($source_dbh);
 ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox");
 exit;
diff --git a/t/pt-archiver/basics.t b/t/pt-archiver/basics.t
index a76ee8207..bd889272f 100644
--- a/t/pt-archiver/basics.t
+++ b/t/pt-archiver/basics.t
@@ -19,14 +19,14 @@ require "$trunk/bin/pt-archiver";
 
 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 $source_dbh = $sb->get_dbh_for('source');
+my $replica1_dbh = $sb->get_dbh_for('replica1');
 
-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';
 }
 
 my $output;
@@ -35,9 +35,9 @@ my $cnf  = "/tmp/12345/my.sandbox.cnf";
 my $cmd  = "$trunk/bin/pt-archiver";
 my @args = qw(--dry-run --where 1=1);
 
-$sb->create_dbs($master_dbh, ['test']);
-$sb->load_file('master', 't/pt-archiver/samples/tables1-4.sql');
-$sb->wait_for_slaves();
+$sb->create_dbs($source_dbh, ['test']);
+$sb->load_file('source', 't/pt-archiver/samples/tables1-4.sql');
+$sb->wait_for_replicas();
 
 # ###########################################################################
 # These are dry-run tests of various options to test that the correct
@@ -97,7 +97,7 @@ like($output, qr/SELECT/, 'I can disable the check OK');
 shift @args;  # remove --dry-run
 
 # Test --why-quit and --statistics output
-$sb->load_file('master', 't/pt-archiver/samples/tables1-4.sql');
+$sb->load_file('source', 't/pt-archiver/samples/tables1-4.sql');
 $output = output(sub {pt_archiver::main(@args, '--source', "D=test,t=table_1,F=$cnf", qw(--purge --why-quit --statistics)) });
 like($output, qr/Started at \d/, 'Start timestamp');
 like($output, qr/Source:/, 'source');
@@ -105,18 +105,18 @@ like($output, qr/SELECT 4\nINSERT 0\nDELETE 4\n/, 'row counts');
 like($output, qr/Exiting because there are no more rows/, 'Exit reason');
 
 # Test basic functionality with OPTIMIZE
-$sb->load_file('master', 't/pt-archiver/samples/tables1-4.sql');
+$sb->load_file('source', 't/pt-archiver/samples/tables1-4.sql');
 $output = output(sub {pt_archiver::main(@args, qw(--optimize ds --source), "D=test,t=table_1,F=$cnf", qw(--purge)) });
 is($output, '', 'OPTIMIZE did not fail');
 
 # Test an empty table
-$sb->load_file('master', 't/pt-archiver/samples/tables1-4.sql');
+$sb->load_file('source', 't/pt-archiver/samples/tables1-4.sql');
 $output = `/tmp/12345/use -N -e "delete from test.table_1"`;
 $output = output(sub {pt_archiver::main(@args, '--source', "D=test,t=table_1,F=$cnf", qw(--purge)) });
 is($output, "", 'Empty table OK');
 
 # Test the output
-$sb->load_file('master', 't/pt-archiver/samples/tables1-4.sql');
+$sb->load_file('source', 't/pt-archiver/samples/tables1-4.sql');
 $output = `$trunk/bin/pt-archiver --where 1=1 --source D=test,t=table_1,F=$cnf --purge --progress 2 2>&1 | awk '{print \$3}'`;
 is($output, <<EOF
 COUNT
@@ -128,12 +128,12 @@ EOF
 ,'Progress output looks okay');
 
 # Statistics
-$sb->load_file('master', 't/pt-archiver/samples/tables1-4.sql');
+$sb->load_file('source', 't/pt-archiver/samples/tables1-4.sql');
 $output = output(sub {pt_archiver::main(@args, qw(--statistics --source), "D=test,t=table_1,F=$cnf", qw(--dest t=table_2)) });
 like($output, qr/commit *10/, 'Stats print OK');
 
 # Test --no-delete.
-$sb->load_file('master', 't/pt-archiver/samples/tables1-4.sql');
+$sb->load_file('source', 't/pt-archiver/samples/tables1-4.sql');
 $output = output(sub {pt_archiver::main(@args, qw(--no-delete --source), "D=test,t=table_1,F=$cnf", qw(--dry-run --file /tmp/pt-archiver-test-no-delete-1)) });
 like($output, qr/> /, '--no-delete implies strict ascending');
 unlike($output, qr/>=/, '--no-delete implies strict ascending');
@@ -146,7 +146,7 @@ is($output + 0, 4, 'All 4 rows are still there');
 # --sleep
 # #############################################################################
 # This table, gt_n.t1, is nothing special; it just has 19 rows and a PK.
-$sb->load_file('master', 't/pt-archiver/samples/gt_n.sql');
+$sb->load_file('source', 't/pt-archiver/samples/gt_n.sql');
 
 # https://bugs.launchpad.net/percona-toolkit/+bug/979092
 # This shouldn't take more than 3 seconds because it only takes 2 SELECT
@@ -166,7 +166,7 @@ ok(
 ) or diag($output, "t=", $t);
 
 # Try again with --bulk-delete.  The tool should work the same.
-$sb->load_file('master', 't/pt-archiver/samples/gt_n.sql');
+$sb->load_file('source', 't/pt-archiver/samples/gt_n.sql');
 $t0 = time;
 $output = output(
    sub { pt_archiver::main(@args, '--source', "D=gt_n,t=t1,F=$cnf",
@@ -184,11 +184,11 @@ ok(
 # Bug 903387: pt-archiver doesn't honor b=1 flag to create SQL_LOG_BIN statement
 # #############################################################################
 SKIP: {
-   $sb->load_file('master', "t/pt-archiver/samples/bulk_regular_insert.sql");
-   $sb->wait_for_slaves();
+   $sb->load_file('source', "t/pt-archiver/samples/bulk_regular_insert.sql");
+   $sb->wait_for_replicas();
 
-   my $original_rows  = $slave1_dbh->selectall_arrayref("SELECT * FROM bri.t ORDER BY id");
-   my $original_no_id = $slave1_dbh->selectall_arrayref("SELECT c,t FROM bri.t ORDER BY id");
+   my $original_rows  = $replica1_dbh->selectall_arrayref("SELECT * FROM bri.t ORDER BY id");
+   my $original_no_id = $replica1_dbh->selectall_arrayref("SELECT c,t FROM bri.t ORDER BY id");
    is_deeply(
       $original_no_id,
       [
@@ -203,7 +203,7 @@ SKIP: {
          ['ii', '11:11:19'],
          ['jj', '11:11:10'],
       ],
-      "Bug 903387: slave has rows"
+      "Bug 903387: replica has rows"
    );
 
    $output = output(
@@ -214,26 +214,26 @@ SKIP: {
          qw(--limit 10)) },
    );
 
-   $rows = $master_dbh->selectall_arrayref("SELECT c,t FROM bri.t ORDER BY id");
+   $rows = $source_dbh->selectall_arrayref("SELECT c,t FROM bri.t ORDER BY id");
    is_deeply(
       $rows,
       [
          ['jj', '11:11:10'],
       ],
-      "Bug 903387: rows deleted on master"
+      "Bug 903387: rows deleted on source"
    ) or diag(Dumper($rows));
 
-   $rows = $slave1_dbh->selectall_arrayref("SELECT * FROM bri.t ORDER BY id");
+   $rows = $replica1_dbh->selectall_arrayref("SELECT * FROM bri.t ORDER BY id");
    is_deeply(
       $rows,
       $original_rows,
-      "Bug 903387: slave still has rows"
+      "Bug 903387: replica still has rows"
    ) or diag(Dumper($rows));
 }
 # #############################################################################
 # 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;
diff --git a/t/pt-archiver/bugs.t b/t/pt-archiver/bugs.t
index 898e0ea0f..f76e8ef21 100644
--- a/t/pt-archiver/bugs.t
+++ b/t/pt-archiver/bugs.t
@@ -18,29 +18,29 @@ require "$trunk/bin/pt-archiver";
 
 my $dp = new DSNParser(opts=>$dsn_opts);
 my $sb = new Sandbox(basedir => '/tmp', DSNParser => $dp);
-my $master_dbh = $sb->get_dbh_for('master');
+my $source_dbh = $sb->get_dbh_for('source');
 
-if ( !$master_dbh ) {
-   plan skip_all => 'Cannot connect to sandbox master';
+if ( !$source_dbh ) {
+   plan skip_all => 'Cannot connect to sandbox source';
 }
 
 my $output;
 my $cnf = "/tmp/12345/my.sandbox.cnf";
 my $cmd = "$trunk/bin/pt-archiver";
 
-$sb->create_dbs($master_dbh, ['test']);
-$sb->load_file('master', 't/pt-archiver/samples/tables1-4.sql');
+$sb->create_dbs($source_dbh, ['test']);
+$sb->load_file('source', 't/pt-archiver/samples/tables1-4.sql');
 
 # ###########################################################################
 # pt-archiver deletes data despite --dry-run
 # https://bugs.launchpad.net/percona-toolkit/+bug/1199589
 # ###########################################################################
 
-my $rows_before = $master_dbh->selectall_arrayref("SELECT * FROM test.table_1 ORDER BY a");
+my $rows_before = $source_dbh->selectall_arrayref("SELECT * FROM test.table_1 ORDER BY a");
 
 $output = `$cmd --optimize --dry-run --purge --where 1=1 --source D=test,t=table_1,F=$cnf 2>&1`;
 
-my $rows_after = $master_dbh->selectall_arrayref("SELECT * FROM test.table_1 ORDER BY a");
+my $rows_after = $source_dbh->selectall_arrayref("SELECT * FROM test.table_1 ORDER BY a");
 
 is_deeply(
    $rows_after,
@@ -51,6 +51,6 @@ is_deeply(
 # #############################################################################
 # 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;
diff --git a/t/pt-archiver/bulk_delete.t b/t/pt-archiver/bulk_delete.t
index 0569f7af5..8776ea282 100644
--- a/t/pt-archiver/bulk_delete.t
+++ b/t/pt-archiver/bulk_delete.t
@@ -17,10 +17,10 @@ require "$trunk/bin/pt-archiver";
 
 my $dp  = new DSNParser(opts=>$dsn_opts);
 my $sb  = new Sandbox(basedir => '/tmp', DSNParser => $dp);
-my $dbh = $sb->get_dbh_for('master');
+my $dbh = $sb->get_dbh_for('source');
 
 if ( !$dbh ) {
-   plan skip_all => 'Cannot connect to sandbox master';
+   plan skip_all => 'Cannot connect to sandbox source';
 }
 else {
    plan tests => 14;
@@ -34,7 +34,7 @@ my $cmd = "$trunk/bin/pt-archiver";
 $sb->create_dbs($dbh, ['test']);
 
 # Test --bulk-delete deletes in chunks
-$sb->load_file('master', 't/pt-archiver/samples/table5.sql');
+$sb->load_file('source', 't/pt-archiver/samples/table5.sql');
 $output = `perl -I $trunk/t/pt-archiver/samples $cmd --plugin Plugin7 --no-ascend --limit 50 --bulk-delete --purge --where 1=1 --source D=test,t=table_5,F=$cnf --statistics 2>&1`;
 like($output, qr/SELECT 105/, 'Fetched 105 rows');
 like($output, qr/DELETE 105/, 'Deleted 105 rows');
@@ -54,7 +54,7 @@ like($output, qr/\(1=1\)/, 'WHERE clause is jailed');
 unlike($output, qr/[^(]1=1/, 'WHERE clause is jailed');
 
 # Test --bulk-delete works ok with a destination table
-$sb->load_file('master', 't/pt-archiver/samples/table5.sql');
+$sb->load_file('source', 't/pt-archiver/samples/table5.sql');
 $output = output(
    sub { pt_archiver::main(qw(--no-ascend --limit 50 --bulk-delete --where 1=1), "--source", "D=test,t=table_5,F=$cnf", qw(--statistics --dest t=table_5_dest)) },
 );
diff --git a/t/pt-archiver/bulk_insert.t b/t/pt-archiver/bulk_insert.t
index 3bfd7fff6..8697b34be 100644
--- a/t/pt-archiver/bulk_insert.t
+++ b/t/pt-archiver/bulk_insert.t
@@ -19,10 +19,10 @@ require "$trunk/bin/pt-archiver";
 
 my $dp  = new DSNParser(opts=>$dsn_opts);
 my $sb  = new Sandbox(basedir => '/tmp', DSNParser => $dp);
-my $dbh = $sb->get_dbh_for('master');
+my $dbh = $sb->get_dbh_for('source');
 
 if ( !$dbh ) {
-   plan skip_all => 'Cannot connect to sandbox master';
+   plan skip_all => 'Cannot connect to sandbox source';
 }
 
 my $output;
@@ -34,7 +34,7 @@ $sb->wipe_clean($dbh);
 $sb->create_dbs($dbh, ['test']);
 
 # Test --bulk-insert
-$sb->load_file('master', 't/pt-archiver/samples/table5.sql');
+$sb->load_file('source', 't/pt-archiver/samples/table5.sql');
 $dbh->do('INSERT INTO `test`.`table_5_copy` SELECT * FROM `test`.`table_5`');
 
 $output = output(
@@ -60,7 +60,7 @@ like($output, qr/copy\s+$chks/, 'copy checksum');
 # ############################################################################
 # Issue 1260: mk-archiver --bulk-insert data loss
 # ############################################################################
-$sb->load_file('master', 't/pt-archiver/samples/bulk_regular_insert.sql');
+$sb->load_file('source', 't/pt-archiver/samples/bulk_regular_insert.sql');
 my $orig_rows   = $dbh->selectall_arrayref('select id from bri.t order by id');
 my $lt_8 = [ grep { $_->[0] < 8 } @$orig_rows ];
 my $ge_8 = [ grep { $_->[0] >= 8 } @$orig_rows ];
@@ -97,9 +97,9 @@ if( Test::Builder->VERSION < 2 ) {
 }
 # >"
 for my $char ( "\N{KATAKANA LETTER NI}", "\N{U+DF}" ) {
-   my $utf8_dbh = $sb->get_dbh_for('master', { mysql_enable_utf8 => 1, AutoCommit => 1 });
+   my $utf8_dbh = $sb->get_dbh_for('source', { mysql_enable_utf8 => 1, AutoCommit => 1 });
 
-   $sb->load_file('master', 't/pt-archiver/samples/bug_1127450.sql');
+   $sb->load_file('source', 't/pt-archiver/samples/bug_1127450.sql');
    my $sql = qq{INSERT INTO `bug_1127450`.`original` VALUES (1, ?)};
    $utf8_dbh->prepare($sql)->execute($char);
 
@@ -144,7 +144,7 @@ for my $char ( "\N{KATAKANA LETTER NI}", "\N{U+DF}" ) {
 # PT-2123: pt-archiver gives error "Wide character in print at 
 # /usr/bin/pt-archiver line 6815" when using --bulk-insert 
 # #############################################################################
-$sb->load_file('master', 't/pt-archiver/samples/pt-2123.sql');
+$sb->load_file('source', 't/pt-archiver/samples/pt-2123.sql');
 
 $dbh->do('set names "utf8mb4"');
 my $original_rows = $dbh->selectall_arrayref('select col2 from pt_2123.t1 where col1=5');
diff --git a/t/pt-archiver/bulk_regular_insert.t b/t/pt-archiver/bulk_regular_insert.t
index 70bde6b04..57d556786 100644
--- a/t/pt-archiver/bulk_regular_insert.t
+++ b/t/pt-archiver/bulk_regular_insert.t
@@ -17,10 +17,10 @@ require "$trunk/bin/pt-archiver";
 
 my $dp  = new DSNParser(opts=>$dsn_opts);
 my $sb  = new Sandbox(basedir => '/tmp', DSNParser => $dp);
-my $dbh = $sb->get_dbh_for('master');
+my $dbh = $sb->get_dbh_for('source');
 
 if ( !$dbh ) {
-   plan skip_all => 'Cannot connect to sandbox master';
+   plan skip_all => 'Cannot connect to sandbox source';
 }
 
 my $output;
@@ -32,7 +32,7 @@ my $cmd = "perl -I $trunk/t/pt-archiver/samples $trunk/bin/pt-archiver";
 # First run without the plugin to get a reference for how the tables should
 # be after a normal bulk insert run.
 # #############################################################################
-$sb->load_file('master', "t/pt-archiver/samples/bulk_regular_insert.sql");
+$sb->load_file('source', "t/pt-archiver/samples/bulk_regular_insert.sql");
 $dbh->do('use bri');
 
 output(
@@ -67,7 +67,7 @@ is_deeply(
 # #############################################################################
 # Do it again with the plugin.  The tables should be identical.
 # #############################################################################
-$sb->load_file('master', "t/pt-archiver/samples/bulk_regular_insert.sql");
+$sb->load_file('source', "t/pt-archiver/samples/bulk_regular_insert.sql");
 $dbh->do('use bri');
 
 `$cmd --source F=$cnf,D=bri,t=t,L=1 --dest t=t_arch,m=bulk_regular_insert --where "1=1" --bulk-insert --limit 3`;
diff --git a/t/pt-archiver/check_slave_lag.t b/t/pt-archiver/check_slave_lag.t
index cc817561e..80bb1b6ea 100644
--- a/t/pt-archiver/check_slave_lag.t
+++ b/t/pt-archiver/check_slave_lag.t
@@ -17,20 +17,20 @@ require "$trunk/bin/pt-archiver";
 
 my $dp   = new DSNParser(opts=>$dsn_opts);
 my $sb   = new Sandbox(basedir => '/tmp', DSNParser => $dp);
-my $dbh  = $sb->get_dbh_for('master');
-my $dbh2 = $sb->get_dbh_for('slave1');
+my $dbh  = $sb->get_dbh_for('source');
+my $dbh2 = $sb->get_dbh_for('replica1');
 
 if ( !$dbh ) {
-   plan skip_all => 'Cannot connect to sandbox master';
+   plan skip_all => 'Cannot connect to sandbox source';
 }
 elsif ( !$dbh2 ) {
-   plan skip_all => 'Cannot connect to sandbox slave';
+   plan skip_all => 'Cannot connect to sandbox replica';
 }
 elsif ( $sb->is_cluster_mode ) {
    plan skip_all => 'Not for PXC',
 }
 elsif ( $sandbox_version ge '5.6' ) {
-   plan skip_all => 'Slave trick does not work on MySQL 5.6+';
+   plan skip_all => 'Replica trick does not work on MySQL 5.6+';
 }
 
 my $output;
@@ -39,10 +39,10 @@ my $cnf = "/tmp/12345/my.sandbox.cnf";
 my $cmd = "$trunk/bin/pt-archiver";
 
 # #############################################################################
-# Issue 758: Make mk-archiver wait for a slave
+# Issue 758: Make mk-archiver wait for a replica
 # #############################################################################
 
-$sb->load_file('master', 't/pt-archiver/samples/issue_758.sql');
+$sb->load_file('source', 't/pt-archiver/samples/issue_758.sql');
 
 is_deeply(
    $dbh->selectall_arrayref('select * from issue_758.t'),
@@ -50,21 +50,20 @@ is_deeply(
    'Table not purged yet (issue 758)'
 );
 
-# Once this goes through repl, the slave will sleep causing
-# seconds behind master to increase > 0.
+# Once this goes through repl, the replica will sleep causing
+# seconds behind source to increase > 0.
 system('/tmp/12345/use -e "insert into issue_758.t select sleep(3)"');
 
-# Slave seems to be lagging now so the first row should get purged
+# Replica seems to be lagging now so the first row should get purged
 # immediately, then the script should wait about 2 seconds until
-# slave lag is gone.
-#system("$cmd --source F=$cnf,D=issue_758,t=t --purge --where 'i>0' --check-slave-lag h=127.1,P=12346,u=msandbox,p=msandbox >/dev/null 2>&1 &");
-system("$cmd --source F=$cnf,D=issue_758,t=t --purge --where 'i>0' --check-slave-lag h=127.1,P=12346,u=msandbox,p=msandbox &");
+# replica lag is gone.
+system("$cmd --source F=$cnf,D=issue_758,t=t --purge --where 'i>0' --check-${replica_name}-lag h=127.1,P=12346,u=msandbox,p=msandbox &");
 
 sleep 1;
 is_deeply(
    $dbh2->selectall_arrayref('select * from issue_758.t'),
    [[1],[2]],
-   'No changes on slave yet (issue 758)'
+   'No changes on replica yet (issue 758)'
 );
 
 is_deeply(
@@ -73,7 +72,7 @@ is_deeply(
    'First row purged (issue 758)'
 );
 
-# The script it waiting for slave lag so no more rows should be purged yet.
+# The script it waiting for replica lag so no more rows should be purged yet.
 sleep 1;
 is_deeply(
    $dbh->selectall_arrayref('select * from issue_758.t'),
@@ -81,19 +80,19 @@ is_deeply(
    'Still only first row purged (issue 758)'
 );
 
-# After this sleep the slave should have executed the INSERT SELECT,
+# After this sleep the replica should have executed the INSERT SELECT,
 # which returns 0, and the 2 purge/delete statments from above.
 sleep 3;
 is_deeply(
    $dbh->selectall_arrayref('select * from issue_758.t'),
    [[0]],
-   'Final table state on master (issue 758)'
+   'Final table state on source (issue 758)'
 );
 
 is_deeply(
    $dbh2->selectall_arrayref('select * from issue_758.t'),
    [[0]],
-   'Final table state on slave (issue 758)'
+   'Final table state on replica (issue 758)'
 );
 
 # #############################################################################
diff --git a/t/pt-archiver/compact_col_vals.t b/t/pt-archiver/compact_col_vals.t
index 8c6295c01..0b69408ac 100644
--- a/t/pt-archiver/compact_col_vals.t
+++ b/t/pt-archiver/compact_col_vals.t
@@ -17,11 +17,11 @@ require "$trunk/bin/pt-archiver";
 
 my $dp  = new DSNParser(opts=>$dsn_opts);
 my $sb  = new Sandbox(basedir => '/tmp', DSNParser => $dp);
-my $dbh = $sb->get_dbh_for('master');
-my $slave_dbh = $sb->get_dbh_for('slave1');
+my $dbh = $sb->get_dbh_for('source');
+my $replica_dbh = $sb->get_dbh_for('replica1');
 
 if ( !$dbh ) {
-   plan skip_all => 'Cannot connect to sandbox master';
+   plan skip_all => 'Cannot connect to sandbox source';
 }
 else {
    plan tests => 4;
@@ -35,7 +35,7 @@ my $cmd = "perl -I $trunk/t/pt-archiver/samples $trunk/bin/pt-archiver";
 # ###########################################################################
 # Bulk delete with limit that results in 2 chunks.
 # ###########################################################################
-$sb->load_file('master', "t/pt-archiver/samples/compact_col_vals.sql");
+$sb->load_file('source', "t/pt-archiver/samples/compact_col_vals.sql");
 $dbh->do('use cai');
 
 is_deeply(
diff --git a/t/pt-archiver/delete_more.t b/t/pt-archiver/delete_more.t
index 513de2b83..8efb4df96 100644
--- a/t/pt-archiver/delete_more.t
+++ b/t/pt-archiver/delete_more.t
@@ -17,11 +17,11 @@ require "$trunk/bin/pt-archiver";
 
 my $dp  = new DSNParser(opts=>$dsn_opts);
 my $sb  = new Sandbox(basedir => '/tmp', DSNParser => $dp);
-my $dbh = $sb->get_dbh_for('master');
-my $slave_dbh = $sb->get_dbh_for('slave1');
+my $dbh = $sb->get_dbh_for('source');
+my $replica_dbh = $sb->get_dbh_for('replica1');
 
 if ( !$dbh ) {
-   plan skip_all => 'Cannot connect to sandbox master';
+   plan skip_all => 'Cannot connect to sandbox source';
 }
 else {
    plan tests => 19;
@@ -35,7 +35,7 @@ my $cmd = "perl -I $trunk/t/pt-archiver/samples $trunk/bin/pt-archiver";
 # ###########################################################################
 # Bulk delete with limit that results in 2 chunks.
 # ###########################################################################
-$sb->load_file('master', "t/pt-archiver/samples/delete_more.sql");
+$sb->load_file('source', "t/pt-archiver/samples/delete_more.sql");
 $dbh->do('use dm');
 
 #1
@@ -97,11 +97,11 @@ is_deeply(
 );
 
 SKIP: {
-   skip 'Cannot connect to slave sandbox', 6 unless $slave_dbh;
-   $slave_dbh->do('use dm');
+   skip 'Cannot connect to replica sandbox', 6 unless $replica_dbh;
+   $replica_dbh->do('use dm');
 #5
    is_deeply(
-      $slave_dbh->selectall_arrayref('select * from `main_table-123` order by id'),
+      $replica_dbh->selectall_arrayref('select * from `main_table-123` order by id'),
       [
          [1, '2010-02-16', 'a'],
          [2, '2010-02-15', 'b'],
@@ -109,11 +109,11 @@ SKIP: {
          [4, '2010-02-16', 'd'],
          [5, '2010-02-14', 'e'],
       ],
-      'Slave main_table-123 not changed'
+      'Replica main_table-123 not changed'
    );
 #6
    is_deeply(
-      $slave_dbh->selectall_arrayref('select * from `other_table-123` order by id'),
+      $replica_dbh->selectall_arrayref('select * from `other_table-123` order by id'),
       [
          [1, 'a'],
          [2, 'b'],
@@ -124,15 +124,15 @@ SKIP: {
          [5, 'e'],
          [6, 'ot1'],
       ],
-      'Slave other_table-123 not changed'
+      'Replica other_table-123 not changed'
    );
 
-   # Run it again without DSN b so changes should be made on slave.
-   $sb->load_file('master', "t/pt-archiver/samples/delete_more.sql");
+   # Run it again without DSN b so changes should be made on replica.
+   $sb->load_file('source', "t/pt-archiver/samples/delete_more.sql");
 
 #7
    is_deeply(
-      $slave_dbh->selectall_arrayref('select * from `main_table-123` order by id'),
+      $replica_dbh->selectall_arrayref('select * from `main_table-123` order by id'),
       [
          [1, '2010-02-16', 'a'],
          [2, '2010-02-15', 'b'],
@@ -140,11 +140,11 @@ SKIP: {
          [4, '2010-02-16', 'd'],
          [5, '2010-02-14', 'e'],
       ],
-      'Reset slave main_table-123'
+      'Reset replica main_table-123'
    );
 #8
    is_deeply(
-      $slave_dbh->selectall_arrayref('select * from `other_table-123` order by id'),
+      $replica_dbh->selectall_arrayref('select * from `other_table-123` order by id'),
       [
          [1, 'a'],
          [2, 'b'],
@@ -155,14 +155,14 @@ SKIP: {
          [5, 'e'],
          [6, 'ot1'],
       ],
-      'Reset slave other_table-123'
+      'Reset replica other_table-123'
    );
 
    `$cmd --purge --primary-key-only --source F=$cnf,D=dm,t=main_table-123,i=pub_date,m=delete_more --where "pub_date < '2010-02-16'" --bulk-delete --limit 2`;
    sleep 1;
 #9
    is_deeply(
-      $slave_dbh->selectall_arrayref('select * from `main_table-123` order by id'),
+      $replica_dbh->selectall_arrayref('select * from `main_table-123` order by id'),
       [
          [1, '2010-02-16', 'a'],
          # [2, '2010-02-15', 'b'],
@@ -170,26 +170,26 @@ SKIP: {
          [4, '2010-02-16', 'd'],
          [5, '2010-02-14', 'e'],
       ],
-      'Slave main_table-123 changed'
+      'Replica main_table-123 changed'
    );
 
 #10
    is_deeply(
-      $slave_dbh->selectall_arrayref('select * from `other_table-123` order by id'),
+      $replica_dbh->selectall_arrayref('select * from `other_table-123` order by id'),
       [
          [1, 'a'],
          [4, 'd'],
          [5, 'e'],
          [6, 'ot1'],
       ],
-      'Slave other_table-123 changed'
+      'Replica other_table-123 changed'
    );
 }
 
 # ###########################################################################
 # Bulk delete in single chunk.
 # ###########################################################################
-$sb->load_file('master', "t/pt-archiver/samples/delete_more.sql");
+$sb->load_file('source', "t/pt-archiver/samples/delete_more.sql");
 $dbh->do('use dm');
 #11
 is_deeply(
@@ -247,7 +247,7 @@ is_deeply(
 # ###########################################################################
 # Single delete.
 # ###########################################################################
-$sb->load_file('master', "t/pt-archiver/samples/delete_more.sql");
+$sb->load_file('source', "t/pt-archiver/samples/delete_more.sql");
 $dbh->do('use dm');
 #15
 is_deeply(
diff --git a/t/pt-archiver/dest.t b/t/pt-archiver/dest.t
index 9de5693ce..bc540c9ed 100644
--- a/t/pt-archiver/dest.t
+++ b/t/pt-archiver/dest.t
@@ -18,10 +18,10 @@ require "$trunk/bin/pt-archiver";
 
 my $dp  = new DSNParser(opts=>$dsn_opts);
 my $sb  = new Sandbox(basedir => '/tmp', DSNParser => $dp);
-my $dbh = $sb->get_dbh_for('master');
+my $dbh = $sb->get_dbh_for('source');
 
 if ( !$dbh ) {
-   plan skip_all => 'Cannot connect to sandbox master';
+   plan skip_all => 'Cannot connect to sandbox source';
 }
 
 my $output;
@@ -31,7 +31,7 @@ my $cmd = "$trunk/bin/pt-archiver";
 
 # Make sure load works.
 $sb->create_dbs($dbh, ['test']);
-$sb->load_file('master', 't/pt-archiver/samples/tables1-4.sql');
+$sb->load_file('source', 't/pt-archiver/samples/tables1-4.sql');
 
 # Archive to another table.
 $output = output(
@@ -44,7 +44,7 @@ $output = `/tmp/12345/use -N -e "select count(*) from test.table_2"`;
 is($output + 0, 4, 'Found rows in new table OK when archiving to another table');
 
 # Archive only some columns to another table.
-$sb->load_file('master', 't/pt-archiver/samples/tables1-4.sql');
+$sb->load_file('source', 't/pt-archiver/samples/tables1-4.sql');
 $output = output(
    sub { pt_archiver::main("-c", "b,c", qw(--where 1=1), "--source", "D=test,t=table_1,F=$cnf", qw(--dest t=table_2)) },
 );
@@ -55,7 +55,7 @@ ok(scalar @$rows == 0, 'Purged all rows ok');
 # and after the archive operation and I am convinced that the original
 # expected output was incorrect.
 my ($sql, $expect_rows);
-if ( $sb->is_cluster_node('master') ) {
+if ( $sb->is_cluster_node('source') ) {
    # PXC nodes have auto-inc offsets, so rather than see what they are
    # and account for them, we just don't select the auto-inc col, a.
    # This test is really about b, c, and d anyway.
@@ -84,7 +84,7 @@ is_deeply(
    'Found rows in new table OK when archiving only some columns to another table') or diag(Dumper($rows));
 
 # Archive to another table with autocommit
-$sb->load_file('master', 't/pt-archiver/samples/tables1-4.sql');
+$sb->load_file('source', 't/pt-archiver/samples/tables1-4.sql');
 $output = output(
    sub { pt_archiver::main(qw(--where 1=1 --txn-size 0), "--source", "D=test,t=table_1,F=$cnf", qw(--dest t=table_2)) },
 );
@@ -95,7 +95,7 @@ $output = `/tmp/12345/use -N -e "select count(*) from test.table_2"`;
 is($output + 0, 4, 'Found rows in new table OK when archiving to another table with autocommit');
 
 # Archive to another table with commit every 2 rows
-$sb->load_file('master', 't/pt-archiver/samples/tables1-4.sql');
+$sb->load_file('source', 't/pt-archiver/samples/tables1-4.sql');
 $output = output(
    sub { pt_archiver::main(qw(--where 1=1 --txn-size 2), "--source", "D=test,t=table_1,F=$cnf", qw(--dest t=table_2)) },
 );
@@ -106,7 +106,7 @@ $output = `/tmp/12345/use -N -e "select count(*) from test.table_2"`;
 is($output + 0, 4, 'Found rows in new table OK when archiving to another table with commit every 2 rows');
 
 # Test that table with many rows can be archived to table with few
-$sb->load_file('master', 't/pt-archiver/samples/tables1-4.sql');
+$sb->load_file('source', 't/pt-archiver/samples/tables1-4.sql');
 $output = output(
    sub { pt_archiver::main(qw(--where 1=1 --dest t=table_4 --no-check-columns), "--source", "D=test,t=table_1,F=$cnf") },
 );
diff --git a/t/pt-archiver/file.t b/t/pt-archiver/file.t
index 7a427db09..7295e7eae 100644
--- a/t/pt-archiver/file.t
+++ b/t/pt-archiver/file.t
@@ -17,10 +17,10 @@ require "$trunk/bin/pt-archiver";
 
 my $dp  = new DSNParser(opts=>$dsn_opts);
 my $sb  = new Sandbox(basedir => '/tmp', DSNParser => $dp);
-my $dbh = $sb->get_dbh_for('master');
+my $dbh = $sb->get_dbh_for('source');
 
 if ( !$dbh ) {
-   plan skip_all => 'Cannot connect to sandbox master';
+   plan skip_all => 'Cannot connect to sandbox source';
 }
 
 my $output;
@@ -29,7 +29,7 @@ my $cnf = "/tmp/12345/my.sandbox.cnf";
 my $cmd = "$trunk/bin/pt-archiver";
 
 $sb->create_dbs($dbh, ['test']);
-$sb->load_file('master', 't/pt-archiver/samples/table1.sql');
+$sb->load_file('source', 't/pt-archiver/samples/table1.sql');
 
 # Archive to a file.
 `rm -f archive.test.table_1`;
@@ -51,7 +51,7 @@ EOF
 `rm -f archive.test.table_1`;
 
 # Archive to a file, but specify only some columns.
-$sb->load_file('master', 't/pt-archiver/samples/table1.sql');
+$sb->load_file('source', 't/pt-archiver/samples/table1.sql');
 `rm -f archive.test.table_1`;
 $output = output(
    sub { pt_archiver::main("-c", "b,c", qw(--where 1=1 --header), "--source", "D=test,t=table_1,F=$cnf", "--file", 'archive.%D.%t') },
@@ -74,7 +74,7 @@ EOF
 sub test_charset {
    my ($charset) = @_;
    
-   $sb->load_file('master', 't/pt-archiver/samples/table1.sql');
+   $sb->load_file('source', 't/pt-archiver/samples/table1.sql');
    local $@;
    my ($out, $exit_val) = full_output( sub {
       pt_archiver::main("-c", "b,c", qw(--where 1=1 --header),
@@ -98,7 +98,7 @@ for my $charset (qw(latin1 utf8 UTF8 )) {
 my $warning;
 local $SIG{__WARN__} = sub { $warning .= shift };
 my ($out) = full_output( sub {
-      $sb->load_file('master', 't/pt-archiver/samples/table1.sql');
+      $sb->load_file('source', 't/pt-archiver/samples/table1.sql');
       pt_archiver::main("-c", "b,c", qw(--where 1=1 --header),
             "--source", "D=test,t=table_1,F=$cnf",
             '--file', '/tmp/%Y-%m-%d-%D_%H:%i:%s.%t',
@@ -116,7 +116,7 @@ like(
 
 local $SIG{__WARN__} = undef;
 
-$sb->load_file('master', 't/pt-archiver/samples/table2.sql');
+$sb->load_file('source', 't/pt-archiver/samples/table2.sql');
 `rm -f archive.test.table_2`;
 $output = output(
     sub { pt_archiver::main(qw(--where 1=1 --output-format=csv), "--source", "D=test,t=table_2,F=$cnf", "--file", 'archive.%D.%t') },
diff --git a/t/pt-archiver/gt_n.t b/t/pt-archiver/gt_n.t
index 23eff652a..ce0a9f7f4 100644
--- a/t/pt-archiver/gt_n.t
+++ b/t/pt-archiver/gt_n.t
@@ -17,10 +17,10 @@ require "$trunk/bin/pt-archiver";
 
 my $dp  = new DSNParser(opts=>$dsn_opts);
 my $sb  = new Sandbox(basedir => '/tmp', DSNParser => $dp);
-my $dbh = $sb->get_dbh_for('master');
+my $dbh = $sb->get_dbh_for('source');
 
 if ( !$dbh ) {
-   plan skip_all => 'Cannot connect to sandbox master';
+   plan skip_all => 'Cannot connect to sandbox source';
 }
 else {
    plan tests => 3;
@@ -34,7 +34,7 @@ my $cmd = "$trunk/bin/pt-archiver";
 # ###########################################################################
 # Test the custom plugin gt_n.
 # ###########################################################################
-$sb->load_file('master', 't/pt-archiver/samples/gt_n.sql');
+$sb->load_file('source', 't/pt-archiver/samples/gt_n.sql');
 my $sql = 'select status, count(*) from gt_n.t1 group by status';
 is_deeply(
    $dbh->selectall_arrayref($sql),
diff --git a/t/pt-archiver/indexes.t b/t/pt-archiver/indexes.t
index 2f19d5d8d..c25ef7c62 100644
--- a/t/pt-archiver/indexes.t
+++ b/t/pt-archiver/indexes.t
@@ -17,10 +17,10 @@ require "$trunk/bin/pt-archiver";
 
 my $dp  = new DSNParser(opts=>$dsn_opts);
 my $sb  = new Sandbox(basedir => '/tmp', DSNParser => $dp);
-my $dbh = $sb->get_dbh_for('master');
+my $dbh = $sb->get_dbh_for('source');
 
 if ( !$dbh ) {
-   plan skip_all => 'Cannot connect to sandbox master';
+   plan skip_all => 'Cannot connect to sandbox source';
 }
 else {
    plan tests => 18;
@@ -35,7 +35,7 @@ $sb->wipe_clean($dbh);
 $sb->create_dbs($dbh, ['test']);
 
 # Test ascending index; it should ascend the primary key
-$sb->load_file('master', 't/pt-archiver/samples/tables1-4.sql');
+$sb->load_file('source', 't/pt-archiver/samples/tables1-4.sql');
 $output = `$cmd --dry-run --where 1=1 --source D=test,t=table_3,F=$cnf --purge 2>&1`;
 like($output, qr/FORCE INDEX\(`PRIMARY`\)/, 'Uses PRIMARY index');
 $output = `$cmd --where 1=1 --source D=test,t=table_3,F=$cnf --purge 2>&1`;
@@ -44,22 +44,22 @@ $output = `/tmp/12345/use -N -e "select count(*) from test.table_3"`;
 is($output + 0, 0, 'Ascended key OK');
 
 # Test specifying a wrong index.
-$sb->load_file('master', 't/pt-archiver/samples/tables1-4.sql');
+$sb->load_file('source', 't/pt-archiver/samples/tables1-4.sql');
 $output = `$cmd --where 1=1 --source i=foo,D=test,t=table_3,F=$cnf --purge 2>&1`;
 like($output, qr/Index 'foo' does not exist in table/, 'Got bad-index error OK');
 
 # Test specifying a NULLable index.
-$sb->load_file('master', 't/pt-archiver/samples/tables1-4.sql');
+$sb->load_file('source', 't/pt-archiver/samples/tables1-4.sql');
 $output = `$cmd --where 1=1 --source i=b,D=test,t=table_1,F=$cnf --purge 2>&1`;
 is($output, "", 'Got no error with a NULLable index');
 
 # Test table without a primary key
-$sb->load_file('master', 't/pt-archiver/samples/tables1-4.sql');
+$sb->load_file('source', 't/pt-archiver/samples/tables1-4.sql');
 $output = `$cmd --where 1=1 --source D=test,t=table_4,F=$cnf --purge 2>&1`;
 like($output, qr/Cannot find an ascendable index/, 'Got need-PK-error OK');
 
 # Test ascending index explicitly
-$sb->load_file('master', 't/pt-archiver/samples/tables1-4.sql');
+$sb->load_file('source', 't/pt-archiver/samples/tables1-4.sql');
 $output = `$cmd --where 1=1 --source D=test,t=table_3,F=$cnf,i=PRIMARY --purge 2>&1`;
 is($output, '', 'No output for ascending index explicitly');
 $output = `/tmp/12345/use -N -e "select count(*) from test.table_3"`;
@@ -67,7 +67,7 @@ is($output + 0, 0, 'Ascended explicit key OK');
 
 # Test that mk-archiver gets column ordinals and such right when building the
 # ascending-index queries.
-$sb->load_file('master', 't/pt-archiver/samples/table11.sql');
+$sb->load_file('source', 't/pt-archiver/samples/table11.sql');
 $output = `$cmd --limit 2 --where 1=1 --source D=test,t=table_11,F=$cnf --purge 2>&1`;
 is($output, '', 'No output while dealing with out-of-order PK');
 $output = `/tmp/12345/use -N -e "select count(*) from test.table_11"`;
@@ -75,14 +75,14 @@ is($output + 0, 0, 'Ascended out-of-order PK OK');
 
 #####################
 # Test that ascending index check WHERE clause can't be hijacked
-$sb->load_file('master', 't/pt-archiver/samples/table6.sql');
+$sb->load_file('source', 't/pt-archiver/samples/table6.sql');
 $output = `$cmd --source D=test,t=table_6,F=$cnf --purge --limit 2 --where 'c=1'`;
 is($output, '', 'No errors purging table_6');
 $output = `/tmp/12345/use -N -e "select count(*) from test.table_6"`;
 is($output + 0, 1, 'Did not purge last row');
 
 # Test that ascending index check doesn't leave any holes
-$sb->load_file('master', 't/pt-archiver/samples/table5.sql');
+$sb->load_file('source', 't/pt-archiver/samples/table5.sql');
 $output = `$cmd --source D=test,t=table_5,F=$cnf --purge --limit 50 --where 'a<current_date - interval 1 day' 2>&1`;
 is($output, '', 'No errors in larger table');
 $output = `/tmp/12345/use -N -e "select count(*) from test.table_5"`;
@@ -91,7 +91,7 @@ is($output + 0, 0, 'Purged completely on multi-column ascending index');
 # Make sure ascending index check can be disabled
 $output = `$cmd --where 1=1 --dry-run --no-ascend --source D=test,t=table_5,F=$cnf --purge --limit 50 2>&1`;
 like ( $output, qr/(^SELECT .*$)\n\1/m, '--no-ascend makes fetch-first and fetch-next identical' );
-$sb->load_file('master', 't/pt-archiver/samples/table5.sql');
+$sb->load_file('source', 't/pt-archiver/samples/table5.sql');
 $output = `$cmd --where 1=1 --no-ascend --source D=test,t=table_5,F=$cnf --purge --limit 1 2>&1`;
 is($output, '', "No output when --no-ascend");
 
diff --git a/t/pt-archiver/issue_1152.t b/t/pt-archiver/issue_1152.t
index b7ef53fe6..fbf2ee652 100644
--- a/t/pt-archiver/issue_1152.t
+++ b/t/pt-archiver/issue_1152.t
@@ -17,13 +17,13 @@ require "$trunk/bin/pt-archiver";
 
 my $dp  = new DSNParser(opts=>$dsn_opts);
 my $sb  = new Sandbox(basedir => '/tmp', DSNParser => $dp);
-my $dbh = $sb->get_dbh_for('master');
+my $dbh = $sb->get_dbh_for('source');
 
 # This issue/bug seems not to have been reproduced or followed up on.
 plan skip_all => "issue 1152";
 
 if ( !$dbh ) {
-   plan skip_all => 'Cannot connect to sandbox master';
+   plan skip_all => 'Cannot connect to sandbox source';
 }
 else {
    plan tests => 2;
@@ -33,7 +33,7 @@ my $output;
 my $rows;
 my $cnf = "/tmp/12345/my.sandbox.cnf";
 
-$sb->load_file('master', 't/pt-archiver/samples/issue_1152.sql');
+$sb->load_file('source', 't/pt-archiver/samples/issue_1152.sql');
 
 # #############################################################################
 # Issue 1152: mk-archiver columns option resulting in null archived table data
diff --git a/t/pt-archiver/issue_1166.t b/t/pt-archiver/issue_1166.t
index fb511d3be..e4003565a 100644
--- a/t/pt-archiver/issue_1166.t
+++ b/t/pt-archiver/issue_1166.t
@@ -17,10 +17,10 @@ require "$trunk/bin/pt-archiver";
 
 my $dp  = new DSNParser(opts=>$dsn_opts);
 my $sb  = new Sandbox(basedir => '/tmp', DSNParser => $dp);
-my $dbh = $sb->get_dbh_for('master');
+my $dbh = $sb->get_dbh_for('source');
 
 if ( !$dbh ) {
-   plan skip_all => 'Cannot connect to sandbox master';
+   plan skip_all => 'Cannot connect to sandbox source';
 }
 else {
    plan tests => 4;
@@ -35,8 +35,8 @@ $sb->create_dbs($dbh, ['test']);
 # #############################################################################
 # Issue 1166: Don't LIMIT 1 for unique indexes 
 # #############################################################################
-$sb->load_file('master', 't/pt-archiver/samples/issue_131.sql');
-$sb->load_file('master', 't/pt-archiver/samples/issue_1166.sql');
+$sb->load_file('source', 't/pt-archiver/samples/issue_131.sql');
+$sb->load_file('source', 't/pt-archiver/samples/issue_1166.sql');
 
 $output = output(
    sub { pt_archiver::main(qw(--where 1=1 --dry-run --source),
@@ -65,7 +65,7 @@ like(
 # This issue is related:
 # Issue 1170: Allow bulk delete without LIMIT
 # #############################################################################
-$sb->load_file('master', 't/pt-archiver/samples/issue_131.sql');
+$sb->load_file('source', 't/pt-archiver/samples/issue_131.sql');
 
 $output = output(
    sub { pt_archiver::main(qw(--where 1=1 --dry-run --source),
diff --git a/t/pt-archiver/issue_1225.t b/t/pt-archiver/issue_1225.t
index 2498b448a..c769b8173 100644
--- a/t/pt-archiver/issue_1225.t
+++ b/t/pt-archiver/issue_1225.t
@@ -18,10 +18,10 @@ require "$trunk/bin/pt-archiver";
 
 my $dp  = new DSNParser(opts=>$dsn_opts);
 my $sb  = new Sandbox(basedir => '/tmp', DSNParser => $dp);
-my $dbh = $sb->get_dbh_for('master');
+my $dbh = $sb->get_dbh_for('source');
 
 if ( !$dbh ) {
-   plan skip_all => 'Cannot connect to sandbox master';
+   plan skip_all => 'Cannot connect to sandbox source';
 }
 elsif ($sandbox_version gt '5.7') {
    plan tests => 4;
@@ -36,7 +36,7 @@ my $archived_rows;
 # #############################################################################
 # Issue 1152: mk-archiver columns option resulting in null archived table data
 # #############################################################################
-$sb->load_file('master', 't/pt-archiver/samples/issue_1225.sql');
+$sb->load_file('source', 't/pt-archiver/samples/issue_1225.sql');
 
 $dbh->do('set names "utf8"');
 my $original_rows = $dbh->selectall_arrayref('select c from issue_1225.t limit 2');
@@ -77,7 +77,7 @@ ok(
 );
 }
 
-$sb->load_file('master', 't/pt-archiver/samples/issue_1225.sql');
+$sb->load_file('source', 't/pt-archiver/samples/issue_1225.sql');
 
 $output = output(
    sub { pt_archiver::main(
diff --git a/t/pt-archiver/issue_1229.t b/t/pt-archiver/issue_1229.t
index 0946b687f..99cf8dfe8 100644
--- a/t/pt-archiver/issue_1229.t
+++ b/t/pt-archiver/issue_1229.t
@@ -20,10 +20,10 @@ require "$trunk/bin/pt-archiver";
 
 my $dp  = new DSNParser(opts=>$dsn_opts);
 my $sb  = new Sandbox(basedir => '/tmp', DSNParser => $dp);
-my $dbh = $sb->get_dbh_for('master');
+my $dbh = $sb->get_dbh_for('source');
 
 if ( !$dbh ) {
-   plan skip_all => 'Cannot connect to sandbox master';
+   plan skip_all => 'Cannot connect to sandbox source';
 }
 elsif ( $DBD::mysql::VERSION lt '4' ) {
    plan skip_all => "DBD::mysql version $DBD::mysql::VERSION has utf8 bugs. "
@@ -39,7 +39,7 @@ my $file = "/tmp/pt-archiver-file.txt";
 # Issue 1229: mk-archiver not creating UTF8 compatible file handles for
 # archive to file
 # #############################################################################
-$sb->load_file('master', 't/pt-archiver/samples/issue_1225.sql');
+$sb->load_file('source', 't/pt-archiver/samples/issue_1225.sql');
 
 $dbh->do('set names "utf8"');
 my $original_rows = $dbh->selectall_arrayref('select c from issue_1225.t where i in (1, 2)');
diff --git a/t/pt-archiver/issue_131.t b/t/pt-archiver/issue_131.t
index 6ad428f17..643e7ba17 100644
--- a/t/pt-archiver/issue_131.t
+++ b/t/pt-archiver/issue_131.t
@@ -17,10 +17,10 @@ require "$trunk/bin/pt-archiver";
 
 my $dp  = new DSNParser(opts=>$dsn_opts);
 my $sb  = new Sandbox(basedir => '/tmp', DSNParser => $dp);
-my $dbh = $sb->get_dbh_for('master');
+my $dbh = $sb->get_dbh_for('source');
 
 if ( !$dbh ) {
-   plan skip_all => 'Cannot connect to sandbox master';
+   plan skip_all => 'Cannot connect to sandbox source';
 }
 else {
    plan tests => 2;
@@ -36,7 +36,7 @@ $sb->create_dbs($dbh, ['test']);
 # Issue 131: mk-archiver fails to insert records if destination table columns
 # in different order than source table
 # #############################################################################
-$sb->load_file('master', 't/pt-archiver/samples/issue_131.sql');
+$sb->load_file('source', 't/pt-archiver/samples/issue_131.sql');
 $output = output(
    sub { pt_archiver::main(qw(--where 1=1), "--source", "F=$cnf,D=test,t=issue_131_src", qw(--statistics --dest t=issue_131_dst)) },
 );
diff --git a/t/pt-archiver/issue_1593265.t b/t/pt-archiver/issue_1593265.t
index 2ba5a3401..b4d0bae65 100644
--- a/t/pt-archiver/issue_1593265.t
+++ b/t/pt-archiver/issue_1593265.t
@@ -17,10 +17,10 @@ require "$trunk/bin/pt-archiver";
 
 my $dp  = new DSNParser(opts=>$dsn_opts);
 my $sb  = new Sandbox(basedir => '/tmp', DSNParser => $dp);
-my $dbh = $sb->get_dbh_for('master');
+my $dbh = $sb->get_dbh_for('source');
 
 if ( !$dbh ) {
-   plan skip_all => 'Cannot connect to sandbox master';
+   plan skip_all => 'Cannot connect to sandbox source';
 }
 else {
    plan tests => 3;
@@ -31,7 +31,7 @@ my $output;
 # #############################################################################
 # Issue 1152: mk-archiver columns option resulting in null archived table data
 # #############################################################################
-$sb->load_file('master', 't/pt-archiver/samples/issue_1593265.sql');
+$sb->load_file('source', 't/pt-archiver/samples/issue_1593265.sql');
 
 $dbh->do('set names "utf8"');
 
diff --git a/t/pt-archiver/issue_524.t b/t/pt-archiver/issue_524.t
index 14db17aa9..aff87c66a 100644
--- a/t/pt-archiver/issue_524.t
+++ b/t/pt-archiver/issue_524.t
@@ -17,10 +17,10 @@ require "$trunk/bin/pt-archiver";
 
 my $dp  = new DSNParser(opts=>$dsn_opts);
 my $sb  = new Sandbox(basedir => '/tmp', DSNParser => $dp);
-my $dbh = $sb->get_dbh_for('master');
+my $dbh = $sb->get_dbh_for('source');
 
 if ( !$dbh ) {
-   plan skip_all => 'Cannot connect to sandbox master';
+   plan skip_all => 'Cannot connect to sandbox source';
 }
 else {
    plan tests => 2;
@@ -35,7 +35,7 @@ $sb->create_dbs($dbh, ['test']);
 # #############################################################################
 # Issue 524: mk-archiver --no-delete --dry-run prints out DELETE statement
 # #############################################################################
-$sb->load_file('master', 't/pt-archiver/samples/issue_131.sql');
+$sb->load_file('source', 't/pt-archiver/samples/issue_131.sql');
 $output = output(
    sub { pt_archiver::main(qw(--where 1=1 --dry-run --no-delete), "--source",  "F=$cnf,D=test,t=issue_131_src", qw(--dest t=issue_131_dst)) },
 );
diff --git a/t/pt-archiver/issue_655.t b/t/pt-archiver/issue_655.t
index ddda3458d..248d34f7c 100644
--- a/t/pt-archiver/issue_655.t
+++ b/t/pt-archiver/issue_655.t
@@ -17,10 +17,10 @@ require "$trunk/bin/pt-archiver";
 
 my $dp  = new DSNParser(opts=>$dsn_opts);
 my $sb  = new Sandbox(basedir => '/tmp', DSNParser => $dp);
-my $dbh = $sb->get_dbh_for('master');
+my $dbh = $sb->get_dbh_for('source');
 
 if ( !$dbh ) {
-   plan skip_all => 'Cannot connect to sandbox master';
+   plan skip_all => 'Cannot connect to sandbox source';
 }
 else {
    plan tests => 3;
diff --git a/t/pt-archiver/plugin.t b/t/pt-archiver/plugin.t
index ccb604437..aba4992b5 100644
--- a/t/pt-archiver/plugin.t
+++ b/t/pt-archiver/plugin.t
@@ -17,10 +17,10 @@ require "$trunk/bin/pt-archiver";
 
 my $dp  = new DSNParser(opts=>$dsn_opts);
 my $sb  = new Sandbox(basedir => '/tmp', DSNParser => $dp);
-my $dbh = $sb->get_dbh_for('master');
+my $dbh = $sb->get_dbh_for('source');
 
 if ( !$dbh ) {
-   plan skip_all => 'Cannot connect to sandbox master';
+   plan skip_all => 'Cannot connect to sandbox source';
 }
 else {
    plan tests => 18;
@@ -35,7 +35,7 @@ my $cmd = "perl -I $trunk/t/pt-archiver/samples $trunk/bin/pt-archiver";
 $sb->create_dbs($dbh, ['test']);
 
 # Check plugin that does nothing
-$sb->load_file('master', 't/pt-archiver/samples/tables1-4.sql');
+$sb->load_file('source', 't/pt-archiver/samples/tables1-4.sql');
 $output = `$cmd --where 1=1 --source m=Plugin1,D=test,t=table_1,F=$cnf --dest t=table_2 2>&1`;
 is($output, '', 'Loading a blank plugin worked OK');
 $output = `/tmp/12345/use -N -e "select count(*) from test.table_1"`;
@@ -43,7 +43,7 @@ is($output + 0, 4, 'Purged no rows ok b/c of blank plugin');
 
 # Test that ascending index check doesn't leave any holes on a unique index when
 # there is a plugin that always says rows are archivable
-$sb->load_file('master', 't/pt-archiver/samples/table5.sql');
+$sb->load_file('source', 't/pt-archiver/samples/table5.sql');
 $output = `$cmd --source m=Plugin2,D=test,t=table_5,F=$cnf --purge --limit 50 --where 'a<current_date - interval 1 day' 2>&1`;
 is($output, '', 'No errors with strictly ascending index');
 $output = `/tmp/12345/use -N -e "select count(*) from test.table_5"`;
@@ -51,7 +51,7 @@ is($output + 0, 0, 'Purged completely with strictly ascending index');
 
 # Check plugin that adds rows to another table (same thing as --dest, but on
 # same db handle)
-$sb->load_file('master', 't/pt-archiver/samples/tables1-4.sql');
+$sb->load_file('source', 't/pt-archiver/samples/tables1-4.sql');
 $output = `$cmd --where 1=1 --source m=Plugin3,D=test,t=table_1,F=$cnf --purge 2>&1`;
 is($output, '', 'Running with plugin did not die');
 $output = `/tmp/12345/use -N -e "select count(*) from test.table_1"`;
@@ -60,7 +60,7 @@ $output = `/tmp/12345/use -N -e "select count(*) from test.table_2"`;
 is($output + 0, 4, 'Plugin archived all rows to table_2 OK');
 
 # Check plugin that does ON DUPLICATE KEY UPDATE on insert
-$sb->load_file('master', 't/pt-archiver/samples/tables7-9.sql');
+$sb->load_file('source', 't/pt-archiver/samples/tables7-9.sql');
 $output = `$cmd --where 1=1 --source D=test,t=table_7,F=$cnf --dest m=Plugin4,t=table_8 2>&1`;
 is($output, '', 'Loading plugin worked OK');
 $output = `/tmp/12345/use -N -e "select count(*) from test.table_7"`;
@@ -73,7 +73,7 @@ $output = `/tmp/12345/use -N -e "select a, b, c from test.table_9"`;
 like($output, qr/1\s+3\s+6/, 'ODKU added rows up');
 
 # Check plugin that sets up and archives a temp table
-$sb->load_file('master', 't/pt-archiver/samples/table10.sql');
+$sb->load_file('source', 't/pt-archiver/samples/table10.sql');
 $output = `$cmd --where 1=1 --source m=Plugin5,D=test,t=tmp_table,F=$cnf --dest t=table_10 2>&1`;
 is($output, '', 'Loading plugin worked OK');
 $output = `/tmp/12345/use -N -e "select count(*) from test.table_10"`;
@@ -81,8 +81,8 @@ is($output + 0, 2, 'Plugin archived all rows to table_10 OK');
 
 # Check plugin that sets up and archives to one or the other table depending
 # on even/odd
-$sb->load_file('master', 't/pt-archiver/samples/table10.sql');
-$sb->load_file('master', 't/pt-archiver/samples/table13.sql');
+$sb->load_file('source', 't/pt-archiver/samples/table10.sql');
+$sb->load_file('source', 't/pt-archiver/samples/table13.sql');
 $output = `$cmd --where 1=1 --source D=test,t=table_13,F=$cnf --dest m=Plugin6,t=table_10 2>&1`;
 is($output, '', 'Loading plugin worked OK');
 $output = `/tmp/12345/use -N -e "select count(*) from test.table_even"`;
diff --git a/t/pt-archiver/pt-143.t b/t/pt-archiver/pt-143.t
index 960ff35b2..ea7286a26 100644
--- a/t/pt-archiver/pt-143.t
+++ b/t/pt-archiver/pt-143.t
@@ -17,10 +17,10 @@ require "$trunk/bin/pt-archiver";
 
 my $dp  = new DSNParser(opts=>$dsn_opts);
 my $sb  = new Sandbox(basedir => '/tmp', DSNParser => $dp);
-my $dbh = $sb->get_dbh_for('master');
+my $dbh = $sb->get_dbh_for('source');
 
 if ( !$dbh ) {
-   plan skip_all => 'Cannot connect to sandbox master';
+   plan skip_all => 'Cannot connect to sandbox source';
 }
 else {
    plan tests => 3;
@@ -31,7 +31,7 @@ my $output;
 # #############################################################################
 # Issue 1152: mk-archiver columns option resulting in null archived table data
 # #############################################################################
-$sb->load_file('master', 't/pt-archiver/samples/pt-143.sql');
+$sb->load_file('source', 't/pt-archiver/samples/pt-143.sql');
 
 my $original_rows = $dbh->selectall_arrayref('select * from test.stats_r');
 my $exit_status;
diff --git a/t/pt-archiver/pt-2064.t b/t/pt-archiver/pt-2064.t
index 405b1cc74..2ba2d2070 100644
--- a/t/pt-archiver/pt-2064.t
+++ b/t/pt-archiver/pt-2064.t
@@ -19,31 +19,31 @@ require "$trunk/bin/pt-archiver";
 
 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 $source_dbh = $sb->get_dbh_for('source');
+my $replica1_dbh = $sb->get_dbh_for('replica1');
 
-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';
 }
 
 my $cnf  = "/tmp/12345/my.sandbox.cnf";
 my $cmd  = "$trunk/bin/pt-archiver";
 my @args = qw(--where 1=1);
 
-$sb->create_dbs($master_dbh, ['test']);
-$sb->load_file('master', 't/pt-archiver/samples/table1.sql');
-$sb->wait_for_slaves();
+$sb->create_dbs($source_dbh, ['test']);
+$sb->load_file('source', 't/pt-archiver/samples/table1.sql');
+$sb->wait_for_replicas();
 
 my $old_innodb_lock_wait_timeout = `/tmp/12345/use -ss -e 'select \@\@global.innodb_lock_wait_timeout'`;
 chomp $old_innodb_lock_wait_timeout;
 
-$master_dbh->do('set global innodb_lock_wait_timeout=1');
+$source_dbh->do('set global innodb_lock_wait_timeout=1');
 
-$master_dbh->do('begin');
-$master_dbh->do('select * from test.table_1 for update;');
+$source_dbh->do('begin');
+$source_dbh->do('select * from test.table_1 for update;');
 
 my ($output, $exit_val) = full_output(sub {pt_archiver::main(@args, '--source', "D=test,t=table_1,F=$cnf", qw(--purge)) });
 
@@ -62,9 +62,9 @@ unlike(
 # #############################################################################
 # Done.
 # #############################################################################
-$master_dbh->do("set global innodb_lock_wait_timeout=$old_innodb_lock_wait_timeout");
+$source_dbh->do("set global innodb_lock_wait_timeout=$old_innodb_lock_wait_timeout");
 
-$sb->wipe_clean($master_dbh);
+$sb->wipe_clean($source_dbh);
 ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox");
 
 done_testing;
diff --git a/t/pt-archiver/pt-2083.t b/t/pt-archiver/pt-2083.t
index 3962e1c03..a2d32b8a0 100644
--- a/t/pt-archiver/pt-2083.t
+++ b/t/pt-archiver/pt-2083.t
@@ -19,10 +19,10 @@ require "$trunk/bin/pt-archiver";
 
 my $dp  = new DSNParser(opts=>$dsn_opts);
 my $sb  = new Sandbox(basedir => '/tmp', DSNParser => $dp);
-my $dbh = $sb->get_dbh_for('master');
+my $dbh = $sb->get_dbh_for('source');
 
 if ( !$dbh ) {
-   plan skip_all => 'Cannot connect to sandbox master';
+   plan skip_all => 'Cannot connect to sandbox source';
 }
 
 my $output;
@@ -33,7 +33,7 @@ $sb->wipe_clean($dbh);
 $sb->create_dbs($dbh, ['test']);
 
 # Test --bulk-insert
-$sb->load_file('master', 't/pt-archiver/samples/pt-2083.sql');
+$sb->load_file('source', 't/pt-archiver/samples/pt-2083.sql');
 
 $output = output(
    sub { pt_archiver::main(qw(--commit-each --where 1=1 --statistics --charset latin1),
@@ -56,7 +56,7 @@ like(
 ) or diag($copied[0]);
 
 # Test --file
-$sb->load_file('master', 't/pt-archiver/samples/pt-2083.sql');
+$sb->load_file('source', 't/pt-archiver/samples/pt-2083.sql');
 
 $output = output(
    sub { pt_archiver::main(qw(--where 1=1 --statistics --charset latin1),
diff --git a/t/pt-archiver/pt-2114.t b/t/pt-archiver/pt-2114.t
index d8497c865..4f5649bb3 100644
--- a/t/pt-archiver/pt-2114.t
+++ b/t/pt-archiver/pt-2114.t
@@ -17,10 +17,10 @@ require "$trunk/bin/pt-archiver";
 
 my $dp  = new DSNParser(opts=>$dsn_opts);
 my $sb  = new Sandbox(basedir => '/tmp', DSNParser => $dp);
-my $dbh = $sb->get_dbh_for('master');
+my $dbh = $sb->get_dbh_for('source');
 
 if ( !$dbh ) {
-   plan skip_all => 'Cannot connect to sandbox master';
+   plan skip_all => 'Cannot connect to sandbox source';
 }
 else {
    plan tests => 23;
@@ -31,7 +31,7 @@ my $output;
 # #############################################################################
 # PT-2114: Incorrect casting of BIT columns by pt-archiver 
 # #############################################################################
-$sb->load_file('master', 't/pt-archiver/samples/pt-2114.sql');
+$sb->load_file('source', 't/pt-archiver/samples/pt-2114.sql');
 
 my $zero_rows = $dbh->selectall_arrayref('select id, hex(val) from pt_2114.t1 where val = 0');
 my $exit_status;
@@ -69,7 +69,7 @@ is (
 # #############################################################################
 # Reloading dump to perform archiving
 # #############################################################################
-$sb->load_file('master', 't/pt-archiver/samples/pt-2114.sql');
+$sb->load_file('source', 't/pt-archiver/samples/pt-2114.sql');
 
 my $one_rows = $dbh->selectall_arrayref('select id, hex(val) from pt_2114.t1 where val = 1');
 
@@ -115,7 +115,7 @@ is_deeply(
 # #############################################################################
 # Reloading dump to perform archiving
 # #############################################################################
-$sb->load_file('master', 't/pt-archiver/samples/pt-2114.sql');
+$sb->load_file('source', 't/pt-archiver/samples/pt-2114.sql');
 
 $output = output(
    sub { $exit_status = pt_archiver::main(
@@ -159,7 +159,7 @@ is_deeply(
 # #############################################################################
 # Reloading dump to perform archiving
 # #############################################################################
-$sb->load_file('master', 't/pt-archiver/samples/pt-2114.sql');
+$sb->load_file('source', 't/pt-archiver/samples/pt-2114.sql');
 
 $output = output(
    sub { $exit_status = pt_archiver::main(
@@ -194,7 +194,7 @@ is (
 # #############################################################################
 # Reloading dump to perform archiving
 # #############################################################################
-$sb->load_file('master', 't/pt-archiver/samples/pt-2114.sql');
+$sb->load_file('source', 't/pt-archiver/samples/pt-2114.sql');
 
 # Archiving into a file
 $output = output(
@@ -244,7 +244,7 @@ is (
 # Longer BIT values
 # Loading dump to perform archiving
 # #############################################################################
-$sb->load_file('master', 't/pt-archiver/samples/pt-2114-2.sql');
+$sb->load_file('source', 't/pt-archiver/samples/pt-2114-2.sql');
 my $not_archived_rows = $dbh->selectall_arrayref("select id, hex(val) from pt_2114.t1 where val = b'1111000010'");
 
 $output = output(
diff --git a/t/pt-archiver/pt-2207.t b/t/pt-archiver/pt-2207.t
index 28256e7f4..efd57ba06 100644
--- a/t/pt-archiver/pt-2207.t
+++ b/t/pt-archiver/pt-2207.t
@@ -17,10 +17,10 @@ require "$trunk/bin/pt-archiver";
 
 my $dp  = new DSNParser(opts=>$dsn_opts);
 my $sb  = new Sandbox(basedir => '/tmp', DSNParser => $dp);
-my $dbh = $sb->get_dbh_for('master');
+my $dbh = $sb->get_dbh_for('source');
 
 if ( !$dbh ) {
-   plan skip_all => 'Cannot connect to sandbox master';
+   plan skip_all => 'Cannot connect to sandbox source';
 }
 
 my $output;
@@ -30,7 +30,7 @@ my $cnf = "/tmp/12345/my.sandbox.cnf";
 my $cmd = "$trunk/bin/pt-archiver";
 
 $sb->create_dbs($dbh, ['test']);
-$sb->load_file('master', 't/pt-archiver/samples/table1.sql');
+$sb->load_file('source', 't/pt-archiver/samples/table1.sql');
 
 # Archive to a file.
 `rm -f archive.test.table_1`;
diff --git a/t/pt-archiver/pt-2279.t b/t/pt-archiver/pt-2279.t
index fc4022dc5..d4c0dd949 100644
--- a/t/pt-archiver/pt-2279.t
+++ b/t/pt-archiver/pt-2279.t
@@ -19,10 +19,10 @@ require "$trunk/bin/pt-archiver";
 
 my $dp  = new DSNParser(opts=>$dsn_opts);
 my $sb  = new Sandbox(basedir => '/tmp', DSNParser => $dp);
-my $dbh = $sb->get_dbh_for('master');
+my $dbh = $sb->get_dbh_for('source');
 
 if ( !$dbh ) {
-   plan skip_all => 'Cannot connect to sandbox master';
+   plan skip_all => 'Cannot connect to sandbox source';
 }
 
 my $output;
@@ -33,7 +33,7 @@ $sb->wipe_clean($dbh);
 $sb->create_dbs($dbh, ['test']);
 
 # Test --bulk-insert
-$sb->load_file('master', 't/pt-archiver/samples/pt-2279.sql');
+$sb->load_file('source', 't/pt-archiver/samples/pt-2279.sql');
 
 $output = output(
    sub { pt_archiver::main(qw(--limit 50 --bulk-insert),
@@ -49,7 +49,7 @@ unlike(
 ) or diag($output);
 
 # Test --file
-$sb->load_file('master', 't/pt-archiver/samples/pt-2279.sql');
+$sb->load_file('source', 't/pt-archiver/samples/pt-2279.sql');
 
 $output = output(
    sub { pt_archiver::main(qw(--limit 50),
diff --git a/t/pt-archiver/purge.t b/t/pt-archiver/purge.t
index 9b02aec4d..77e359500 100644
--- a/t/pt-archiver/purge.t
+++ b/t/pt-archiver/purge.t
@@ -17,10 +17,10 @@ require "$trunk/bin/pt-archiver";
 
 my $dp  = new DSNParser(opts=>$dsn_opts);
 my $sb  = new Sandbox(basedir => '/tmp', DSNParser => $dp);
-my $dbh = $sb->get_dbh_for('master');
+my $dbh = $sb->get_dbh_for('source');
 
 if ( !$dbh ) {
-   plan skip_all => 'Cannot connect to sandbox master';
+   plan skip_all => 'Cannot connect to sandbox source';
 }
 else {
    plan tests => 8;
@@ -32,7 +32,7 @@ my $cnf = "/tmp/12345/my.sandbox.cnf";
 my $cmd = "$trunk/bin/pt-archiver";
 
 $sb->create_dbs($dbh, ['test']);
-$sb->load_file('master', 't/pt-archiver/samples/table1.sql');
+$sb->load_file('source', 't/pt-archiver/samples/table1.sql');
 
 # Test basic functionality with defaults
 $output = output(
@@ -45,7 +45,7 @@ $output = `/tmp/12345/use -N -e "select count(*) from test.table_1"`;
 is($output + 0, 0, 'Purged ok');
 
 # Test basic functionality with --commit-each
-$sb->load_file('master', 't/pt-archiver/samples/table1.sql');
+$sb->load_file('source', 't/pt-archiver/samples/table1.sql');
 $output = output(
    sub { pt_archiver::main(qw(--where 1=1), "--source", "D=test,t=table_1,F=$cnf", qw(--commit-each --limit 1 --purge)) },
 );
@@ -56,7 +56,7 @@ $output = `/tmp/12345/use -N -e "select count(*) from test.table_1"`;
 is($output + 0, 0, 'Purged ok with --commit-each');
 
 # Archive only part of the table
-$sb->load_file('master', 't/pt-archiver/samples/table1.sql');
+$sb->load_file('source', 't/pt-archiver/samples/table1.sql');
 $output = output(
    sub { pt_archiver::main(qw(--where 1=1), "--source", "D=test,t=table_1,F=$cnf", qw(--where a<4 --purge)) },
 );
@@ -67,7 +67,7 @@ $output = `/tmp/12345/use -N -e "select count(*) from test.table_1"`;
 is($output + 0, 1, 'Purged some rows ok');
 
 # Fail if --primary-key-only was specified and there is no PK in the table
-$sb->load_file('master', 't/pt-archiver/samples/pt_157.sql');
+$sb->load_file('source', 't/pt-archiver/samples/pt_157.sql');
 $output = output(
    sub { pt_archiver::main(qw(--where 1=1), "--source", "D=test,t=t1,F=$cnf", qw(--purge --primary-key-only)) },
    stderr => 1,
diff --git a/t/pt-archiver/res_fk.t b/t/pt-archiver/res_fk.t
index c1619a959..7bc94527f 100644
--- a/t/pt-archiver/res_fk.t
+++ b/t/pt-archiver/res_fk.t
@@ -17,10 +17,10 @@ require "$trunk/bin/pt-archiver";
 
 my $dp  = new DSNParser(opts=>$dsn_opts);
 my $sb  = new Sandbox(basedir => '/tmp', DSNParser => $dp);
-my $dbh = $sb->get_dbh_for('master');
+my $dbh = $sb->get_dbh_for('source');
 
 if ( !$dbh ) {
-   plan skip_all => 'Cannot connect to sandbox master';
+   plan skip_all => 'Cannot connect to sandbox source';
 }
 else {
    plan tests => 8;
@@ -35,7 +35,7 @@ my $cmd = "perl -I $trunk/t/pt-archiver/samples $trunk/bin/pt-archiver";
 # ###########################################################################
 # Test the custom plugin res_fk.
 # ###########################################################################
-$sb->load_file('master', 't/pt-archiver/samples/res_fk.sql');
+$sb->load_file('source', 't/pt-archiver/samples/res_fk.sql');
 $sql = 'select * from test.comp';
 is_deeply(
    $dbh->selectall_arrayref($sql),
diff --git a/t/pt-archiver/safe_auto_increment.t b/t/pt-archiver/safe_auto_increment.t
index f5d46d12d..306038a33 100644
--- a/t/pt-archiver/safe_auto_increment.t
+++ b/t/pt-archiver/safe_auto_increment.t
@@ -17,10 +17,10 @@ require "$trunk/bin/pt-archiver";
 
 my $dp  = new DSNParser(opts=>$dsn_opts);
 my $sb  = new Sandbox(basedir => '/tmp', DSNParser => $dp);
-my $dbh = $sb->get_dbh_for('master');
+my $dbh = $sb->get_dbh_for('source');
 
 if ( !$dbh ) {
-   plan skip_all => 'Cannot connect to sandbox master';
+   plan skip_all => 'Cannot connect to sandbox source';
 }
 else {
    plan tests => 5;
@@ -34,7 +34,7 @@ my $cmd = "$trunk/bin/pt-archiver";
 $sb->create_dbs($dbh, ['test']);
 
 # Safe auto-increment behavior.
-$sb->load_file('master', 't/pt-archiver/samples/table12.sql');
+$sb->load_file('source', 't/pt-archiver/samples/table12.sql');
 $output = output(
    sub { pt_archiver::main(qw(--purge --where 1=1), "--source", "D=test,t=table_12,F=$cnf") },
 );
@@ -43,7 +43,7 @@ $output = `/tmp/12345/use -N -e "select min(a),count(*) from test.table_12"`;
 like($output, qr/^3\t1$/, 'Did not touch the max auto_increment');
 
 # Safe auto-increment behavior, disabled.
-$sb->load_file('master', 't/pt-archiver/samples/table12.sql');
+$sb->load_file('source', 't/pt-archiver/samples/table12.sql');
 $output = output(
    sub { pt_archiver::main(qw(--no-safe-auto-increment --purge --where 1=1), "--source", "D=test,t=table_12,F=$cnf") },
 );
diff --git a/t/pt-archiver/standard_options.t b/t/pt-archiver/standard_options.t
index 0d9414141..1ab22609e 100644
--- a/t/pt-archiver/standard_options.t
+++ b/t/pt-archiver/standard_options.t
@@ -17,14 +17,14 @@ require "$trunk/bin/pt-archiver";
 
 my $dp   = new DSNParser(opts=>$dsn_opts);
 my $sb   = new Sandbox(basedir => '/tmp', DSNParser => $dp);
-my $dbh  = $sb->get_dbh_for('master');
-my $dbh2 = $sb->get_dbh_for('slave1');
+my $dbh  = $sb->get_dbh_for('source');
+my $dbh2 = $sb->get_dbh_for('replica1');
 
 if ( !$dbh ) {
-   plan skip_all => 'Cannot connect to sandbox master';
+   plan skip_all => 'Cannot connect to sandbox source';
 }
 elsif ( !$dbh2 ) {
-   plan skip_all => 'Cannot connect to sandbox slave';
+   plan skip_all => 'Cannot connect to sandbox replica';
 }
 
 my $output;
@@ -47,7 +47,7 @@ ok(
 );
 
 # Test with a sentinel file
-$sb->load_file('master', 't/pt-archiver/samples/table1.sql');
+$sb->load_file('source', 't/pt-archiver/samples/table1.sql');
 diag(`touch $sentinel`);
 
 $output = output(
@@ -131,20 +131,20 @@ diag(`rm -f $pid_file`);
 # #############################################################################
 
 # This test will achive rows from dbh:test.table_1 to dbh2:test.table_2.
-$sb->load_file('master', 't/pt-archiver/samples/tables1-4.sql');
+$sb->load_file('source', 't/pt-archiver/samples/tables1-4.sql');
 
 # Change passwords so defaults files won't work.
 $sb->do_as_root(
-   'master',
+   'source',
    q/CREATE USER 'bob'@'%' IDENTIFIED BY 'foo'/,
    q/GRANT ALL ON *.* TO 'bob'@'%'/,
 );
 $dbh2->do('TRUNCATE TABLE test.table_2');
-$sb->wait_for_slaves;
+$sb->wait_for_replicas;
 
 $output = output(
    sub { pt_archiver::main(
-      '--source', 'h=127.1,P=12345,D=test,t=table_1,u=bob,p=foo',
+      '--source', 'h=127.1,P=12345,D=test,t=table_1,u=bob,p=foo,s=1',
       '--dest',   'P=12346,t=table_2',
       qw(--where 1=1))
    },
@@ -156,9 +156,9 @@ is(
    scalar @$r,
    4,
    '--dest inherited from --source'
-);
+) or diag($output);
 
-$sb->do_as_root('master', q/DROP USER 'bob'@'%'/);
+$sb->do_as_root('source', q/DROP USER 'bob'@'%'/);
 
 # #############################################################################
 # Done.
diff --git a/t/pt-config-diff/basics.t b/t/pt-config-diff/basics.t
index cbcbfe61b..d244a0c62 100644
--- a/t/pt-config-diff/basics.t
+++ b/t/pt-config-diff/basics.t
@@ -15,16 +15,17 @@ use PerconaTest;
 use Sandbox;
 require "$trunk/bin/pt-config-diff";
 
+require VersionParser;
 my $dp = new DSNParser(opts=>$dsn_opts);
 my $sb = new Sandbox(basedir => '/tmp', DSNParser => $dp);
-my $master_dbh = $sb->get_dbh_for('master');
-my $slave_dbh  = $sb->get_dbh_for('slave1');
+my $source_dbh = $sb->get_dbh_for('source');
+my $replica_dbh  = $sb->get_dbh_for('replica1');
 
-if ( !$master_dbh ) {
-   plan skip_all => 'Cannot connect to sandbox master';
+if ( !$source_dbh ) {
+   plan skip_all => 'Cannot connect to sandbox source';
 }
-elsif ( !$slave_dbh ) {
-   plan skip_all => 'Cannot connect to sandbox slave';
+elsif ( !$replica_dbh ) {
+   plan skip_all => 'Cannot connect to sandbox replica';
 }
 
 my $cnf = '/tmp/12345/my.sandbox.cnf';
@@ -55,7 +56,7 @@ is(
    "No output when no diff"
 );
 
-# Diff master to slave1.  There should be several differences.
+# Diff source to replica1.  There should be several differences.
 $output = output(
    sub { $retval = pt_config_diff::main(
       'h=127.1,P=12345,u=msandbox,p=msandbox', 'P=12346')
@@ -99,7 +100,7 @@ is(
    "No output"
 );
 
-# Compare master config to slave active/SHOW VARS
+# Compare source config to replica active/SHOW VARS
 $output = output(
    sub { $retval = pt_config_diff::main(
       $cnf, 'h=127.1,P=12346,u=msandbox,p=msandbox')
@@ -110,7 +111,7 @@ $output = output(
 is(
    $retval,
    1,
-   "Master my.sandbox.cnf differs from slave active config"
+   "Source my.sandbox.cnf differs from replica active config"
 );
 
 like(
@@ -151,7 +152,7 @@ $output = output(
 is(
    $retval,
    1,
-   "Master and slave option files differ"
+   "Source and replica option files differ"
 );
 
 like(
diff --git a/t/pt-config-diff/reports.t b/t/pt-config-diff/reports.t
index 1afca95bf..e199f11ec 100644
--- a/t/pt-config-diff/reports.t
+++ b/t/pt-config-diff/reports.t
@@ -15,16 +15,17 @@ use PerconaTest;
 use Sandbox;
 require "$trunk/bin/pt-config-diff";
 
+require VersionParser;
 my $dp = new DSNParser(opts=>$dsn_opts);
 my $sb = new Sandbox(basedir => '/tmp', DSNParser => $dp);
-my $master_dbh = $sb->get_dbh_for('master');
-my $slave_dbh  = $sb->get_dbh_for('slave1');
+my $source_dbh = $sb->get_dbh_for('source');
+my $replica_dbh  = $sb->get_dbh_for('replica1');
 
-if ( !$master_dbh ) {
-   plan skip_all => 'Cannot connect to sandbox master';
+if ( !$source_dbh ) {
+   plan skip_all => 'Cannot connect to sandbox source';
 }
-elsif ( !$slave_dbh ) {
-   plan skip_all => 'Cannot connect to sandbox slave';
+elsif ( !$replica_dbh ) {
+   plan skip_all => 'Cannot connect to sandbox replica';
 }
 else {
    plan tests => 3;
diff --git a/t/pt-deadlock-logger/basics.t b/t/pt-deadlock-logger/basics.t
index 7a7f96661..8ff6c196b 100644
--- a/t/pt-deadlock-logger/basics.t
+++ b/t/pt-deadlock-logger/basics.t
@@ -19,15 +19,15 @@ require "$trunk/bin/pt-deadlock-logger";
 
 my $dp   = new DSNParser(opts=>$dsn_opts);
 my $sb   = new Sandbox(basedir => '/tmp', DSNParser => $dp);
-my $dbh1 = $sb->get_dbh_for('master', { PrintError => 0, RaiseError => 1, AutoCommit => 0 });
-my $dbh2 = $sb->get_dbh_for('master', { PrintError => 0, RaiseError => 1, AutoCommit => 0 });
+my $dbh1 = $sb->get_dbh_for('source', { PrintError => 0, RaiseError => 1, AutoCommit => 0 });
+my $dbh2 = $sb->get_dbh_for('source', { PrintError => 0, RaiseError => 1, AutoCommit => 0 });
 
 if ( !$dbh1 || !$dbh2 ) {
-   plan skip_all => 'Cannot connect to sandbox master';
+   plan skip_all => 'Cannot connect to sandbox source';
 }
 
 my $output;
-my $dsn  = $sb->dsn_for('master');
+my $dsn  = $sb->dsn_for('source');
 my @args = ($dsn, qw(--iterations 1));
 
 $dbh1->commit;
@@ -98,7 +98,7 @@ sub make_deadlock {
 sub reconnect {
     my $dbh = shift;
     $dbh->disconnect();
-    $dbh = $sb->get_dbh_for('master', { PrintError => 0, RaiseError => 1, AutoCommit => 0 });
+    $dbh = $sb->get_dbh_for('source', { PrintError => 0, RaiseError => 1, AutoCommit => 0 });
     return $dbh;
 }
 
@@ -209,7 +209,7 @@ SKIP: {
    $output = 'foo';
    $dbh1->do('TRUNCATE TABLE test.deadlocks');
 
-   $sb->load_file('master', "t/pt-deadlock-logger/samples/dead-lock-with-partitions.sql");
+   $sb->load_file('source', "t/pt-deadlock-logger/samples/dead-lock-with-partitions.sql");
 
    make_deadlock();
 
diff --git a/t/pt-deadlock-logger/check_schema_exists.t b/t/pt-deadlock-logger/check_schema_exists.t
index 540453961..b664a913b 100644
--- a/t/pt-deadlock-logger/check_schema_exists.t
+++ b/t/pt-deadlock-logger/check_schema_exists.t
@@ -17,7 +17,7 @@ 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');
+my $dbh = $sb->get_dbh_for('source');
 
 my ($output, $exist_status) = full_output(
    sub {
diff --git a/t/pt-deadlock-logger/clear_deadlocks.t b/t/pt-deadlock-logger/clear_deadlocks.t
index 07e7ab323..f5fc317d4 100644
--- a/t/pt-deadlock-logger/clear_deadlocks.t
+++ b/t/pt-deadlock-logger/clear_deadlocks.t
@@ -17,10 +17,10 @@ require "$trunk/bin/pt-deadlock-logger";
 
 my $dp   = new DSNParser(opts=>$dsn_opts);
 my $sb   = new Sandbox(basedir => '/tmp', DSNParser => $dp);
-my $dbh1 = $sb->get_dbh_for('master');
+my $dbh1 = $sb->get_dbh_for('source');
 
 if ( !$dbh1 ) {
-   plan skip_all => 'Cannot connect to sandbox master';
+   plan skip_all => 'Cannot connect to sandbox source';
 }
 
 my $output;
diff --git a/t/pt-deadlock-logger/create_dest_table.t b/t/pt-deadlock-logger/create_dest_table.t
index 5280d8f8f..bd14fa132 100644
--- a/t/pt-deadlock-logger/create_dest_table.t
+++ b/t/pt-deadlock-logger/create_dest_table.t
@@ -17,14 +17,14 @@ require "$trunk/bin/pt-deadlock-logger";
 
 my $dp   = new DSNParser(opts=>$dsn_opts);
 my $sb   = new Sandbox(basedir => '/tmp', DSNParser => $dp);
-my $dbh1 = $sb->get_dbh_for('master');
+my $dbh1 = $sb->get_dbh_for('source');
 
 if ( !$dbh1 ) {
-   plan skip_all => 'Cannot connect to sandbox master';
+   plan skip_all => 'Cannot connect to sandbox source';
 }
 
 my $output;
-my $dsn = $sb->dsn_for('master');
+my $dsn = $sb->dsn_for('source');
 
 $sb->create_dbs($dbh1, ['test']);
 
diff --git a/t/pt-deadlock-logger/standard_options.t b/t/pt-deadlock-logger/standard_options.t
index 4195eea8e..30299e4e4 100644
--- a/t/pt-deadlock-logger/standard_options.t
+++ b/t/pt-deadlock-logger/standard_options.t
@@ -17,14 +17,14 @@ 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');
+my $dbh = $sb->get_dbh_for('source');
 
 if ( !$dbh ) {
-   plan skip_all => 'Cannot connect to sandbox master';
+   plan skip_all => 'Cannot connect to sandbox source';
 }
 
 my $output;
-my $dsn  = $sb->dsn_for('master');
+my $dsn  = $sb->dsn_for('source');
 my @args = ($dsn, qw(--iterations 1));
 
 $sb->wipe_clean($dbh);
@@ -78,7 +78,7 @@ unlink $pid_file if -f $pid_file;
 # #############################################################################
 $dbh->do('USE test');
 $dbh->do('DROP TABLE IF EXISTS deadlocks');
-$sb->load_file('master', 't/pt-deadlock-logger/samples/deadlocks_tbl.sql', 'test');
+$sb->load_file('source', '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`;
 
diff --git a/t/pt-duplicate-key-checker/basics.t b/t/pt-duplicate-key-checker/basics.t
index a6ff47708..05a3d765b 100644
--- a/t/pt-duplicate-key-checker/basics.t
+++ b/t/pt-duplicate-key-checker/basics.t
@@ -15,12 +15,13 @@ use PerconaTest;
 use Sandbox;
 require "$trunk/bin/pt-duplicate-key-checker";
 
+require VersionParser;
 my $dp  = new DSNParser(opts=>$dsn_opts);
 my $sb  = new Sandbox(basedir => '/tmp', DSNParser => $dp);
-my $dbh = $sb->get_dbh_for('master');
+my $dbh = $sb->get_dbh_for('source');
 
 if ( !$dbh ) {
-   plan skip_all => 'Cannot connect to sandbox master';
+   plan skip_all => 'Cannot connect to sandbox source';
 }
 
 my $output;
@@ -59,7 +60,7 @@ if ($sandbox_version ge '8.0') {
 
 is(`$cmd -d test --nosummary`, '', 'No dupes on clean sandbox');
 
-$sb->load_file('master', 't/lib/samples/dupe_key.sql', 'test');
+$sb->load_file('source', 't/lib/samples/dupe_key.sql', 'test');
 
 ok(
    no_diff(
@@ -88,7 +89,7 @@ ok(
    '--nosummary'
 );
 
-$sb->load_file('master', 't/lib/samples/uppercase_names.sql', 'test');
+$sb->load_file('source', 't/lib/samples/uppercase_names.sql', 'test');
 
 ok(
    no_diff(
@@ -100,7 +101,7 @@ ok(
    'Issue 306 crash on uppercase column names'
 );
 
-$sb->load_file('master', 't/lib/samples/issue_269-1.sql', 'test');
+$sb->load_file('source', 't/lib/samples/issue_269-1.sql', 'test');
 
 ok(
    no_diff(
@@ -119,7 +120,7 @@ ok(
 );
 
 $dbh->do('create database test');
-$sb->load_file('master', 't/lib/samples/dupekeys/dupe-cluster-bug-894140.sql', 'test');
+$sb->load_file('source', 't/lib/samples/dupekeys/dupe-cluster-bug-894140.sql', 'test');
 
 ok(
    no_diff(
@@ -165,7 +166,7 @@ ok(
 # https://bugs.launchpad.net/percona-toolkit/+bug/1217013
 # #############################################################################
 
-$sb->load_file('master', 't/lib/samples/dupekeys/simple_dupe_bug_1217013.sql', 'test');
+$sb->load_file('source', 't/lib/samples/dupekeys/simple_dupe_bug_1217013.sql', 'test');
 
 my $want = $sandbox_version lt '8.0' ? "$sample/simple_dupe_bug_1217013.txt" : "$sample/simple_dupe_bug_1217013_80.txt";
 ok(
diff --git a/t/pt-duplicate-key-checker/clustered_keys.t b/t/pt-duplicate-key-checker/clustered_keys.t
index c9a974716..cec74240c 100644
--- a/t/pt-duplicate-key-checker/clustered_keys.t
+++ b/t/pt-duplicate-key-checker/clustered_keys.t
@@ -15,12 +15,13 @@ use PerconaTest;
 use Sandbox;
 require "$trunk/bin/pt-duplicate-key-checker";
 
+require VersionParser;
 my $dp  = new DSNParser(opts=>$dsn_opts);
 my $sb  = new Sandbox(basedir => '/tmp', DSNParser => $dp);
-my $dbh = $sb->get_dbh_for('master');
+my $dbh = $sb->get_dbh_for('source');
 
 if ( !$dbh ) {
-   plan skip_all => 'Cannot connect to sandbox master';
+   plan skip_all => 'Cannot connect to sandbox source';
 }
 
 my $cnf    = "/tmp/12345/my.sandbox.cnf";
@@ -44,7 +45,7 @@ if ($sandbox_version ge '8.0') {
 # #############################################################################
 # Issue 295: Enhance rules for clustered keys in mk-duplicate-key-checker
 # #############################################################################
-$sb->load_file('master', 't/pt-duplicate-key-checker/samples/issue_295.sql', 'test');
+$sb->load_file('source', 't/pt-duplicate-key-checker/samples/issue_295.sql', 'test');
 ok(
    no_diff(
       sub { pt_duplicate_key_checker::main(@args, qw(-d issue_295)) },
@@ -59,7 +60,7 @@ ok(
 # Error if InnoDB table has no PK or unique indexes
 # https://bugs.launchpad.net/percona-toolkit/+bug/1036804
 # #############################################################################
-$sb->load_file('master', "t/pt-duplicate-key-checker/samples/idb-no-uniques-bug-894140.sql");
+$sb->load_file('source', "t/pt-duplicate-key-checker/samples/idb-no-uniques-bug-894140.sql");
 
 # PTDEBUG was auto-vivifying $clustered_key:
 #
@@ -96,7 +97,7 @@ unlike(
 # 
 # https://bugs.launchpad.net/percona-toolkit/+bug/1201443
 # #############################################################################
-$sb->load_file('master', "t/pt-duplicate-key-checker/samples/fk_chosen_index_bug_1201443.sql");
+$sb->load_file('source', "t/pt-duplicate-key-checker/samples/fk_chosen_index_bug_1201443.sql");
 
 $output = `$trunk/bin/pt-duplicate-key-checker F=$cnf -d fk_chosen_index_bug_1201443 2>&1`;
 
diff --git a/t/pt-duplicate-key-checker/issue_1192.t b/t/pt-duplicate-key-checker/issue_1192.t
index 5ca41c42b..d410e45bb 100644
--- a/t/pt-duplicate-key-checker/issue_1192.t
+++ b/t/pt-duplicate-key-checker/issue_1192.t
@@ -15,12 +15,13 @@ use PerconaTest;
 use Sandbox;
 require "$trunk/bin/pt-duplicate-key-checker";
 
+require VersionParser;
 my $dp  = new DSNParser(opts=>$dsn_opts);
 my $sb  = new Sandbox(basedir => '/tmp', DSNParser => $dp);
-my $dbh = $sb->get_dbh_for('master');
+my $dbh = $sb->get_dbh_for('source');
 
 if ( !$dbh ) {
-   plan skip_all => 'Cannot connect to sandbox master';
+   plan skip_all => 'Cannot connect to sandbox source';
 }
 else {
    plan tests => 2;
@@ -47,7 +48,7 @@ if ($sandbox_version ge '8.0') {
 # #############################################################################
 # Issue 1192: DROP/ADD leaves structure unchanged
 # #############################################################################
-$sb->load_file('master', "t/lib/samples/dupekeys/issue-1192.sql", "issue_1192");
+$sb->load_file('source', "t/lib/samples/dupekeys/issue-1192.sql", "issue_1192");
 
 ok(
    no_diff(
diff --git a/t/pt-duplicate-key-checker/issue_298.t b/t/pt-duplicate-key-checker/issue_298.t
index 7f0d76699..62fcc8d7c 100644
--- a/t/pt-duplicate-key-checker/issue_298.t
+++ b/t/pt-duplicate-key-checker/issue_298.t
@@ -15,12 +15,13 @@ use PerconaTest;
 use Sandbox;
 require "$trunk/bin/pt-duplicate-key-checker";
 
+require VersionParser;
 my $dp  = new DSNParser(opts=>$dsn_opts);
 my $sb  = new Sandbox(basedir => '/tmp', DSNParser => $dp);
-my $dbh = $sb->get_dbh_for('master');
+my $dbh = $sb->get_dbh_for('source');
 
 if ( !$dbh ) {
-   plan skip_all => 'Cannot connect to sandbox master';
+   plan skip_all => 'Cannot connect to sandbox source';
 }
 else {
    plan tests => 2;
diff --git a/t/pt-duplicate-key-checker/issue_331.t b/t/pt-duplicate-key-checker/issue_331.t
index 52770190b..5c88e28db 100644
--- a/t/pt-duplicate-key-checker/issue_331.t
+++ b/t/pt-duplicate-key-checker/issue_331.t
@@ -15,12 +15,13 @@ use PerconaTest;
 use Sandbox;
 require "$trunk/bin/pt-duplicate-key-checker";
 
+require VersionParser;
 my $dp  = new DSNParser(opts=>$dsn_opts);
 my $sb  = new Sandbox(basedir => '/tmp', DSNParser => $dp);
-my $dbh = $sb->get_dbh_for('master');
+my $dbh = $sb->get_dbh_for('source');
 
 if ( !$dbh ) {
-   plan skip_all => 'Cannot connect to sandbox master';
+   plan skip_all => 'Cannot connect to sandbox source';
 }
 else {
    plan tests => 2;
@@ -48,7 +49,7 @@ if ($sandbox_version ge '8.0') {
 # Issue 331: mk-duplicate-key-checker crashes getting size of foreign keys
 # #############################################################################
 
-$sb->load_file('master', 't/pt-duplicate-key-checker/samples/issue_331.sql', 'test');
+$sb->load_file('source', 't/pt-duplicate-key-checker/samples/issue_331.sql', 'test');
 ok(
    no_diff(
       sub { pt_duplicate_key_checker::main(@args, qw(-d issue_331)) },
diff --git a/t/pt-duplicate-key-checker/issue_663.t b/t/pt-duplicate-key-checker/issue_663.t
index 35d1254bd..1da325700 100644
--- a/t/pt-duplicate-key-checker/issue_663.t
+++ b/t/pt-duplicate-key-checker/issue_663.t
@@ -15,12 +15,13 @@ use PerconaTest;
 use Sandbox;
 require "$trunk/bin/pt-duplicate-key-checker";
 
+require VersionParser;
 my $dp  = new DSNParser(opts=>$dsn_opts);
 my $sb  = new Sandbox(basedir => '/tmp', DSNParser => $dp);
-my $dbh = $sb->get_dbh_for('master');
+my $dbh = $sb->get_dbh_for('source');
 
 if ( !$dbh ) {
-   plan skip_all => 'Cannot connect to sandbox master';
+   plan skip_all => 'Cannot connect to sandbox source';
 }
 else {
    plan tests => 2;
@@ -36,7 +37,7 @@ $sb->create_dbs($dbh, ['test']);
 # #############################################################################
 # Issue 663: Index length prefix gives uninitialized value
 # #############################################################################
-$sb->load_file('master', 't/pt-duplicate-key-checker/samples/issue_663.sql');
+$sb->load_file('source', 't/pt-duplicate-key-checker/samples/issue_663.sql');
 $output = `$cmd -d issue_663`;
 like(
    $output,
diff --git a/t/pt-duplicate-key-checker/pt-2282.t b/t/pt-duplicate-key-checker/pt-2282.t
index d6b37db9a..c26a34b13 100644
--- a/t/pt-duplicate-key-checker/pt-2282.t
+++ b/t/pt-duplicate-key-checker/pt-2282.t
@@ -11,16 +11,17 @@ use warnings FATAL => 'all';
 use English qw(-no_match_vars);
 use Test::More;
 
+require VersionParser;
 use PerconaTest;
 use Sandbox;
 require "$trunk/bin/pt-duplicate-key-checker";
 
 my $dp  = new DSNParser(opts=>$dsn_opts);
 my $sb  = new Sandbox(basedir => '/tmp', DSNParser => $dp);
-my $dbh = $sb->get_dbh_for('master');
+my $dbh = $sb->get_dbh_for('source');
 
 if ( !$dbh ) {
-   plan skip_all => 'Cannot connect to sandbox master';
+   plan skip_all => 'Cannot connect to sandbox source';
 }
 else {
    plan tests => 5;
@@ -36,7 +37,7 @@ $sb->create_dbs($dbh, ['test']);
 # #############################################################################
 # PT-2282: pt-duplicate-key-checker give a "Wide character in print" warning
 # #############################################################################
-$sb->load_file('master', 't/pt-duplicate-key-checker/samples/pt-2282.sql');
+$sb->load_file('source', 't/pt-duplicate-key-checker/samples/pt-2282.sql');
 $output = `$cmd -d test -t season_pk_historties_60 `;
 unlike(
    $output,
diff --git a/t/pt-find/pt-find.t b/t/pt-find/pt-find.t
index 3e895980f..b2783ec35 100644
--- a/t/pt-find/pt-find.t
+++ b/t/pt-find/pt-find.t
@@ -15,15 +15,16 @@ use PerconaTest;
 use Sandbox;
 require "$trunk/bin/pt-find";
 
+require VersionParser;
 my $dp = new DSNParser(opts=>$dsn_opts);
 my $sb = new Sandbox(basedir => '/tmp', DSNParser => $dp);
-my $dbh = $sb->get_dbh_for('master');
+my $dbh = $sb->get_dbh_for('source');
 
 if ( !$dbh ) {
-   plan skip_all => 'Cannot connect to sandbox master';
+   plan skip_all => 'Cannot connect to sandbox source';
 }
 
-$sb->load_file('master', 't/lib/samples/stored-objs.sql');
+$sb->load_file('source', 't/lib/samples/stored-objs.sql');
 
 my $output;
 my $cnf = '/tmp/12345/my.sandbox.cnf';
@@ -53,7 +54,7 @@ unlike(
 
 
 SKIP: {
-   skip 'Sandbox master does not have the sakila database', 17
+   skip 'Sandbox source does not have the sakila database', 17
       unless @{$dbh->selectcol_arrayref("SHOW DATABASES LIKE 'sakila'")};
 
    # ########################################################################
@@ -203,7 +204,7 @@ SKIP: {
    };
 }
 
-$sb->load_file('master', "t/pt-find/samples/pseudo-sakila.sql");
+$sb->load_file('source', "t/pt-find/samples/pseudo-sakila.sql");
 
 # Test --procedure.
 $output = `$cmd sakila_test  --procedure min_monthly_purchases  --print`;
diff --git a/t/pt-fk-error-logger/basics.t b/t/pt-fk-error-logger/basics.t
index 9094745f7..2c951dd14 100644
--- a/t/pt-fk-error-logger/basics.t
+++ b/t/pt-fk-error-logger/basics.t
@@ -16,12 +16,13 @@ use PerconaTest;
 use Sandbox;
 require "$trunk/bin/pt-fk-error-logger";
 
+require VersionParser;
 my $dp = new DSNParser(opts=>$dsn_opts);
 my $sb = new Sandbox(basedir => '/tmp', DSNParser => $dp);
-my $dbh = $sb->get_dbh_for('master');
+my $dbh = $sb->get_dbh_for('source');
 
 if ( !$dbh ) {
-   plan skip_all => 'Cannot connect to sandbox master';
+   plan skip_all => 'Cannot connect to sandbox source';
 }
 
 $sb->create_dbs($dbh, [qw(test)]);
@@ -31,7 +32,7 @@ my $cnf  = '/tmp/12345/my.sandbox.cnf';
 my $cmd  = "$trunk/bin/pt-fk-error-logger -F $cnf ";
 my @args = qw(--iterations 1);
 
-$sb->load_file('master', 't/pt-fk-error-logger/samples/fke_tbl.sql', 'test');
+$sb->load_file('source', 't/pt-fk-error-logger/samples/fke_tbl.sql', 'test');
 
 # #########################################################################
 # Test saving foreign key errors to --dest.
@@ -162,9 +163,9 @@ $dbh->do('DROP TABLE test.parent');
 # https://bugs.launchpad.net/percona-toolkit/+bug/1075773
 # #############################################################################
 diag(`$trunk/sandbox/stop-sandbox 12348 >/dev/null`);
-diag(`$trunk/sandbox/start-sandbox master 12348 >/dev/null`);
+diag(`$trunk/sandbox/start-sandbox source 12348 >/dev/null`);
 diag(`/tmp/12348/use -e "create database test"`);
-$sb->load_file('master1', 't/pt-fk-error-logger/samples/fke_tbl.sql', 'test');
+$sb->load_file('source1', 't/pt-fk-error-logger/samples/fke_tbl.sql', 'test');
 
 $output = output(
    sub {
diff --git a/t/pt-heartbeat/basics.t b/t/pt-heartbeat/basics.t
index d9c48875e..c31cf0c06 100644
--- a/t/pt-heartbeat/basics.t
+++ b/t/pt-heartbeat/basics.t
@@ -18,18 +18,18 @@ require "$trunk/bin/pt-heartbeat";
 
 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 $source_dbh = $sb->get_dbh_for('source');
+my $replica1_dbh = $sb->get_dbh_for('replica1');
 
-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';
 }
 
 
-$sb->create_dbs($master_dbh, ['test']);
+$sb->create_dbs($source_dbh, ['test']);
 
 my $output;
 my $cnf       = '/tmp/12345/my.sandbox.cnf';
@@ -40,12 +40,12 @@ my $ps_grep_cmd = "ps x | grep pt-heartbeat | grep daemonize | grep -v grep";
 
 diag(`rm $sent_file 2>/dev/null`);
 
-$master_dbh->do('drop table if exists test.heartbeat');
-$master_dbh->do(q{CREATE TABLE test.heartbeat (
+$source_dbh->do('drop table if exists test.heartbeat');
+$source_dbh->do(q{CREATE TABLE test.heartbeat (
              id int NOT NULL PRIMARY KEY,
              ts datetime NOT NULL
           ) ENGINE=MEMORY});
-$sb->wait_for_slaves;
+$sb->wait_for_replicas;
 
 
 # Issue: pt-heartbeat should check that the heartbeat table has a row
@@ -74,7 +74,7 @@ like(
 $output = output(
    sub { pt_heartbeat::main('-F', $cnf, qw(-D test --check)) },
 );
-my $row = $master_dbh->selectall_hashref('select * from test.heartbeat', 'id');
+my $row = $source_dbh->selectall_hashref('select * from test.heartbeat', 'id');
 is(
    $row->{1}->{id},
    1,
@@ -88,7 +88,7 @@ output(
    stderr => 1,
 );
 ok(
-   $master_dbh->selectrow_array('select id from test.heartbeat'),
+   $source_dbh->selectrow_array('select id from test.heartbeat'),
    'Record is there'
 );
 
@@ -141,17 +141,17 @@ $output = `$ps_grep_cmd`;
 unlike($output, qr/$cmd/, 'It is not running');
 ok(-f $sent_file, 'Sentinel file is there');
 unlink($sent_file);
-$master_dbh->do('drop table if exists test.heartbeat'); # This will kill it
+$source_dbh->do('drop table if exists test.heartbeat'); # This will kill it
 
 # #############################################################################
 # Issue 353: Add --create-table to mk-heartbeat
 # #############################################################################
 
 # These creates the new table format, whereas the preceding tests used the
-# old format, so tests from here on may need --master-server-id.
+# old format, so tests from here on may need --source-server-id.
 
-$master_dbh->do('drop table if exists test.heartbeat');
-$sb->wait_for_slaves;
+$source_dbh->do('drop table if exists test.heartbeat');
+$sb->wait_for_replicas;
 
 $output = output(
    sub { pt_heartbeat::main('-F', $cnf,
@@ -159,16 +159,16 @@ $output = output(
       qw(--create-table)) },
    stderr => 1,
 );
-$master_dbh->do('use test');
-$row = $master_dbh->selectcol_arrayref("SHOW TABLES LIKE 'heartbeat'");
+$source_dbh->do('use test');
+$row = $source_dbh->selectcol_arrayref("SHOW TABLES LIKE 'heartbeat'");
 is(
    $row->[0],
    'heartbeat', 
    '--create-table creates heartbeat table'
 ) or diag($output, Dumper($row));
 
-$master_dbh->do('drop table if exists test.heartbeat');
-$sb->wait_for_slaves;
+$source_dbh->do('drop table if exists test.heartbeat');
+$sb->wait_for_replicas;
 
 $output = output(
    sub { pt_heartbeat::main('-F', $cnf,
@@ -176,8 +176,8 @@ $output = output(
       qw(--create-table --create-table-engine MEMORY)) },
    stderr => 1,
 );
-$master_dbh->do('use test');
-$row = $master_dbh->selectrow_hashref("SHOW TABLE STATUS LIKE 'heartbeat'");
+$source_dbh->do('use test');
+$row = $source_dbh->selectrow_hashref("SHOW TABLE STATUS LIKE 'heartbeat'");
 is(
    uc($row->{engine}),
    'MEMORY', 
@@ -191,7 +191,7 @@ sleep 1;
 $output = output(
    sub { pt_heartbeat::main(
       qw(--host 127.1 --user msandbox --password msandbox --port 12345),
-      qw(-D test --check --recurse 1 --master-server-id 12345)) },
+      qw(-D test --check --recurse 1 --source-server-id 12345)) },
    stderr => 1,
 );
 like(
@@ -204,64 +204,64 @@ like(
 # Bug 1004567: pt-heartbeat --update --replace causes duplicate key error
 # #############################################################################
 
-# Create the heartbeat table on the master and slave.
-$master_dbh->do("DROP TABLE IF EXISTS test.heartbeat");
-$sb->wait_for_slaves();
+# Create the heartbeat table on the source and replica.
+$source_dbh->do("DROP TABLE IF EXISTS test.heartbeat");
+$sb->wait_for_replicas();
 
 $output = output(
    sub { pt_heartbeat::main("F=/tmp/12345/my.sandbox.cnf",
       qw(-D test --update --replace --create-table --run-time 1))
    }
 );
-$row = $master_dbh->selectrow_arrayref('SELECT server_id FROM test.heartbeat');
+$row = $source_dbh->selectrow_arrayref('SELECT server_id FROM test.heartbeat');
 is(
    $row->[0],
    '12345',
-   'Heartbeat on master'
+   'Heartbeat on source'
 );
 
-$sb->wait_for_slaves();
+$sb->wait_for_replicas();
 
-$row = $slave1_dbh->selectrow_arrayref('SELECT server_id FROM test.heartbeat');
+$row = $replica1_dbh->selectrow_arrayref('SELECT server_id FROM test.heartbeat');
 is(
    $row->[0],
    '12345',
-   'Heartbeat on slave1'
+   'Heartbeat on replica1'
 );
 
-# Drop the heartbeat table only on the master.
-$master_dbh->do("SET SQL_LOG_BIN=0");
-$master_dbh->do("DROP TABLE test.heartbeat");
-$master_dbh->do("SET SQL_LOG_BIN=1");
+# Drop the heartbeat table only on the source.
+$source_dbh->do("SET SQL_LOG_BIN=0");
+$source_dbh->do("DROP TABLE test.heartbeat");
+$source_dbh->do("SET SQL_LOG_BIN=1");
 
-# Re-create the heartbeat table on the master.
+# Re-create the heartbeat table on the source.
 $output = output(
    sub { pt_heartbeat::main("F=/tmp/12345/my.sandbox.cnf",
       qw(-D test --update --replace --create-table --run-time 1))
    }
 );
 
-$row = $master_dbh->selectrow_arrayref('SELECT server_id FROM test.heartbeat');
+$row = $source_dbh->selectrow_arrayref('SELECT server_id FROM test.heartbeat');
 is(
    $row->[0],
    '12345',
-   'New heartbeat on master'
+   'New heartbeat on source'
 );
 
-$sb->wait_for_slaves();
+$sb->wait_for_replicas();
 
-$row = $slave1_dbh->selectrow_hashref("SHOW SLAVE STATUS");
+$row = $replica1_dbh->selectrow_hashref("SHOW ${replica_name} STATUS");
 is(
    $row->{last_error},
    '',
-   "No slave error"
+   "No replica error"
 );
 
 # #############################################################################
 # --check-read-only
 # #############################################################################
 
-if ($sandbox_version ge '8.0') {
+if ($sandbox_version eq '8.0') {
     diag(`/tmp/12345/use -u root -e "CREATE USER 'bob'\@'%' IDENTIFIED WITH mysql_native_password BY 'msandbox'"`);
 } else {
     diag(`/tmp/12345/use -u root -e "CREATE USER 'bob'\@'%' IDENTIFIED BY 'msandbox'"`);
@@ -277,11 +277,13 @@ diag(`/tmp/12345/use -u root -e "FLUSH PRIVILEGES"`);
 # to STATEMENT if it's set to ROW, so the tool will fail with a different error 
 # message earlier in the code. (This should be tested separately)
 # So we set binlog_format = STATEMENT globaly before these tests and then revert.
-# Notice these tests are run on slave1 so we change it there.
+# Notice these tests are run on replica1 so we change it there.
 
 # get original binlog_format, so we can revert later
-my (undef, $orig_binlog_format) = $slave1_dbh->selectrow_array('SHOW VARIABLES LIKE "binlog_format"'); 
+my (undef, $orig_binlog_format) = $replica1_dbh->selectrow_array('SHOW VARIABLES LIKE "binlog_format"'); 
+diag(`/tmp/12346/use -u root -e "stop ${replica_name} sql_thread"`);
 diag(`/tmp/12346/use -u root -e "set global binlog_format=STATEMENT"`);
+diag(`/tmp/12346/use -u root -e "start ${replica_name} sql_thread"`);
 
 $output = output(
    sub { pt_heartbeat::main("u=bob,F=/tmp/12346/my.sandbox.cnf",
@@ -297,7 +299,7 @@ like(
    $output,
    qr/--read-only/,
    "By default, fails if the server is read_only=1"
-);
+) or diag($output);
 
 $output = output(
    sub { pt_heartbeat::main("u=bob,F=/tmp/12346/my.sandbox.cnf",
@@ -314,7 +316,9 @@ unlike(
 
 diag(`/tmp/12345/use -u root -e "DROP USER 'bob'\@'%'"`);
 #revert to original binlog_format
+diag(`/tmp/12346/use -u root -e "stop ${replica_name} sql_thread"`);
 diag(`/tmp/12346/use -u root -e "set global binlog_format=$orig_binlog_format"`);
+diag(`/tmp/12346/use -u root -e "start ${replica_name} sql_thread"`);
 diag(`/tmp/12345/use -u root -e "DROP DATABASE test"`);
 
 
@@ -322,8 +326,8 @@ diag(`/tmp/12345/use -u root -e "DROP DATABASE test"`);
 # Done.
 # #############################################################################
 diag(`rm $pid_file $sent_file 2>/dev/null`);
-# $sb->wipe_clean($master_dbh);
-# $sb->wipe_clean($slave1_dbh);
+# $sb->wipe_clean($source_dbh);
+# $sb->wipe_clean($replica1_dbh);
 ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox");
 
 done_testing;
diff --git a/t/pt-heartbeat/check_schema_exists.t b/t/pt-heartbeat/check_schema_exists.t
index 30d1e5f19..62c5352df 100644
--- a/t/pt-heartbeat/check_schema_exists.t
+++ b/t/pt-heartbeat/check_schema_exists.t
@@ -17,7 +17,7 @@ require "$trunk/bin/pt-heartbeat";
 
 my $dp  = new DSNParser(opts=>$dsn_opts);
 my $sb  = new Sandbox(basedir => '/tmp', DSNParser => $dp);
-my $dbh = $sb->get_dbh_for('master');
+my $dbh = $sb->get_dbh_for('source');
 
 my ($output, $exist_status) = full_output(
    sub {
diff --git a/t/pt-heartbeat/multi_update_mode.t b/t/pt-heartbeat/multi_update_mode.t
index 1b14df6b6..65e1a2ceb 100644
--- a/t/pt-heartbeat/multi_update_mode.t
+++ b/t/pt-heartbeat/multi_update_mode.t
@@ -10,6 +10,7 @@ use strict;
 use warnings FATAL => 'all';
 use English qw(-no_match_vars);
 use Test::More;
+use Data::Dumper;
 
 use PerconaTest;
 use Sandbox;
@@ -17,36 +18,36 @@ require "$trunk/bin/pt-heartbeat";
 
 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 ( !$slave2_dbh ) {
-   plan skip_all => 'Cannot connect to sandbox slave2';
+elsif ( !$replica2_dbh ) {
+   plan skip_all => 'Cannot connect to sandbox replica2';
 }
 else {
    plan tests => 29;
 }
 
 diag(`rm -rf /tmp/pt-heartbeat-sentinel >/dev/null 2>&1`);
-$sb->create_dbs($master_dbh, ['test']);
-$sb->wait_for_slaves();
+$sb->create_dbs($source_dbh, ['test']);
+$sb->wait_for_replicas();
 
 my $output;
 my $pid_file = "/tmp/pt-heartbeat-test.$PID.pid";
 
 # Multi-update mode is the new, hi-res mode that allows a single table to
-# be updated by multiple servers: a slave's master, its master's master, etc.
+# be updated by multiple servers: a replica's source, its source's source, etc.
 #
-# We have master -> slave1 -> slave2 where master has server_id=12345,
-# slave1 server_id=12346, and slave2 server_id=12347.  The  heartbeat table
-# on slave2 can have 3 heartbeat rows: one from the master, one from slave1
+# We have source -> replica1 -> replica2 where source has server_id=12345,
+# replica1 server_id=12346, and replica2 server_id=12347.  The  heartbeat table
+# on replica2 can have 3 heartbeat rows: one from the source, one from replica1
 # and one for itself.
 my @ports = qw(12345 12346 12347);
 
@@ -60,167 +61,167 @@ foreach my $port (@ports) {
    );
 }
 sleep 5;
-# Check heartbeat on master.
-my $rows = $master_dbh->selectall_hashref("select * from test.heartbeat", 'server_id');
+# Check heartbeat on source.
+my $rows = $source_dbh->selectall_hashref("select * from test.heartbeat", 'server_id');
 
 is(
    scalar keys %$rows,
    1,
-   "One heartbeat row on master"
+   "One heartbeat row on source"
 );
 
 ok(
    exists $rows->{12345},
-   "Master heartbeat"
+   "Source heartbeat"
 );
 
 ok(
    defined $rows->{12345}->{file} && defined $rows->{12345}->{position},
-   "Master file and position"
+   "Source file and position"
 );
 
 ok(
-   !$rows->{12345}->{relay_master_log_file} && !$rows->{12345}->{exec_master_log_pos},
-   "No relay_master_log_file or exec_master_log_pos for master"
+   !$rows->{12345}->{"relay_${source_name}_log_file"} && !$rows->{12345}->{"exec_${source_name}_log_pos"},
+   "No relay_source_log_file or exec_source_log_pos for source"
 );
 
-# Check heartbeat on slave1.
-$rows = $slave1_dbh->selectall_hashref("select * from test.heartbeat", 'server_id');
+# Check heartbeat on replica1.
+$rows = $replica1_dbh->selectall_hashref("select * from test.heartbeat", 'server_id');
 
 is(
    scalar keys %$rows,
    2,
-   "Two heartbeat rows on slave1"
+   "Two heartbeat rows on replica1"
 );
 
 ok(
    exists $rows->{12345},
-   "Slave1 has master heartbeat",
+   "Replica1 has source heartbeat",
 );
 
 ok(
    exists $rows->{12346},
-   "Slave1 heartbeat"
+   "Replica1 heartbeat"
 );
 
 ok(
    defined $rows->{12346}->{file} && defined $rows->{12346}->{position},
-   "Slave1 master file and position"
+   "Replica1 source file and position"
 );
 
 ok(
-   $rows->{12346}->{relay_master_log_file} && $rows->{12346}->{exec_master_log_pos},
-   "Slave1 relay_master_log_file and exec_master_log_pos for master"
-);
+   $rows->{12346}->{"relay_${source_name}_log_file"} && $rows->{12346}->{"exec_${source_name}_log_pos"},
+   "Replica1 relay_source_log_file and exec_source_log_pos for source"
+) or diag(Dumper($rows));
 
-# Check heartbeat on slave2.
-$rows = $slave2_dbh->selectall_hashref("select * from test.heartbeat", 'server_id');
+# Check heartbeat on replica2.
+$rows = $replica2_dbh->selectall_hashref("select * from test.heartbeat", 'server_id');
 
 is(
    scalar keys %$rows,
    3,
-   "Three heartbeat rows on slave2"
+   "Three heartbeat rows on replica2"
 );
 
 ok(
    exists $rows->{12345},
-   "Slave2 has master heartbeat",
+   "Replica2 has source heartbeat",
 );
 
 ok(
    exists $rows->{12346},
-   "Slave2 has slave1 heartbeat",
+   "Replica2 has replica1 heartbeat",
 );
 
 ok(
    exists $rows->{12347},
-   "Slave1 heartbeat"
+   "Replica1 heartbeat"
 );
 
 ok(
    defined $rows->{12347}->{file} && defined $rows->{12347}->{position},
-   "Slave2 master file and position"
+   "Replica2 source file and position"
 );
 
 ok(
-   $rows->{12347}->{relay_master_log_file} && $rows->{12347}->{exec_master_log_pos},
-   "Slave2 relay_master_log_file and exec_master_log_pos for master"
+   $rows->{12347}->{"relay_${source_name}_log_file"} && $rows->{12347}->{"exec_${source_name}_log_pos"},
+   "Replica2 relay_source_log_file and exec_source_log_pos for source"
 );
 
 # ############################################################################
-# Verify that the master heartbeat is changing and replicating.
+# Verify that the source heartbeat is changing and replicating.
 # ############################################################################
 
-# $rows already has slave2 heartbeat info.
+# $rows already has replica2 heartbeat info.
 sleep 4;
 
-my $rows2 = $slave2_dbh->selectall_hashref("select * from test.heartbeat", 'server_id');
+my $rows2 = $replica2_dbh->selectall_hashref("select * from test.heartbeat", 'server_id');
 
 cmp_ok(
    $rows2->{12345}->{ts},
    'gt',
    $rows->{12345}->{ts},
-   "Master heartbeat ts is changing and replicating"
+   "Source heartbeat ts is changing and replicating"
 );
 
 cmp_ok(
    $rows2->{12345}->{position},
    '>',
    $rows->{12345}->{position},
-   "Master binlog position is changing and replicating"
+   "Source binlog position is changing and replicating"
 );
 
-# But the master binlog file shouldn't change.
+# But the source binlog file shouldn't change.
 is(
    $rows->{12345}->{file},
    $rows2->{12345}->{file},
-   "Master binlog file is not changing"
+   "Source binlog file is not changing"
 );
 
 
 # ############################################################################
-# Test --master-server-id.
+# Test --source-server-id.
 # ############################################################################
 
 # First, the option should be optional.  If not given, the server's
-# immediate master should be used.
+# immediate source should be used.
 $output = output(
    sub { pt_heartbeat::main(qw(-h 127.1 -P 12347 -u msandbox -p msandbox),
-      qw(-D test --check --print-master-server-id)) },
+      qw(-D test --check --print-source-server-id)) },
 );
 
 like(
    $output,
    qr/0\.\d\d\s+12346\n/,
-   "--check 12347, automatic master server_id"
-);
+   "--check 12347, automatic source server_id"
+) or diag($output);
 
 $output = output(
    sub { pt_heartbeat::main(qw(-h 127.1 -P 12347 -u msandbox -p msandbox),
-      qw(-D test --check --print-master-server-id --master-server-id 12346)) },
+      qw(-D test --check --print-source-server-id --source-server-id 12346)) },
 );
 
 like(
    $output,
    qr/0\.\d\d\s+12346\n/,
-   "--check 12347 from --master-server-id 12346"
+   "--check 12347 from --source-server-id 12346"
 );
 
 $output = output(
    sub { pt_heartbeat::main(qw(-h 127.1 -P 12347 -u msandbox -p msandbox),
-      qw(-D test --check --print-master-server-id --master-server-id 12345)) },
+      qw(-D test --check --print-source-server-id --source-server-id 12345)) },
 );
 
 sleep 3;
 like(
    $output,
    qr/0\.\d\d\s+12345\n/,
-   "--check 12347 from --master-server-id 12345"
+   "--check 12347 from --source-server-id 12345"
 );
 
 $output = output(
    sub { pt_heartbeat::main(qw(-h 127.1 -P 12347 -u msandbox -p msandbox),
-      qw(-D test --check --print-master-server-id --master-server-id 42),
+      qw(-D test --check --print-source-server-id --source-server-id 42),
       qw(--no-insert-heartbeat-row)) },
    stderr => 1,
 );
@@ -228,7 +229,7 @@ $output = output(
 like(
    $output,
    qr/No row found in heartbeat table for server_id 42/,
-   "Error if --master-server-id row doesn't exist"
+   "Error if --source-server-id row doesn't exist"
 );
 
 # ############################################################################
@@ -248,6 +249,6 @@ foreach my $port (@ports) {
 # Done.
 # #############################################################################
 diag(`rm -rf /tmp/pt-heartbeat-sentinel >/dev/null`);
-$sb->wipe_clean($master_dbh);
+$sb->wipe_clean($source_dbh);
 ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox");
 exit;
diff --git a/t/pt-heartbeat/pt-1508.t b/t/pt-heartbeat/pt-1508.t
index a5975937d..a7a42917c 100644
--- a/t/pt-heartbeat/pt-1508.t
+++ b/t/pt-heartbeat/pt-1508.t
@@ -25,18 +25,18 @@ require "$trunk/bin/pt-heartbeat";
 
 my $dp = new DSNParser(opts=>$dsn_opts);
 my $sb = new Sandbox(basedir => '/tmp', DSNParser => $dp);
-my $master_dbh = $sb->get_dbh_for('master');
-my $master_dsn = 'h=127.1,P=12345,u=msandbox,p=msandbox';
+my $source_dbh = $sb->get_dbh_for('source');
+my $source_dsn = 'h=127.1,P=12345,u=msandbox,p=msandbox';
 
 my ($tfh, $pid_file) = tempfile();
 close($tfh);
 unlink($pid_file);
 
-my $slave1_dbh = $sb->get_dbh_for('slave1');
-my $slave1_dsn = 'h=127.1,P=12346,u=unprivileged,p=password';
+my $replica1_dbh = $sb->get_dbh_for('replica1');
+my $replica1_dsn = 'h=127.1,P=12346,u=unprivileged,p=password,s=1';
 
-if ( !$master_dbh ) {
-   plan skip_all => 'Cannot connect to sandbox master';
+if ( !$source_dbh ) {
+   plan skip_all => 'Cannot connect to sandbox source';
 }
 
 sub start_thread {
@@ -44,7 +44,7 @@ sub start_thread {
 
     my $dp = new DSNParser(opts=>$dsn_opts);
     my $sb = new Sandbox(basedir => '/tmp', DSNParser => $dp);
-    my $dbh= $sb->get_dbh_for('slave1');
+    my $dbh= $sb->get_dbh_for('replica1');
     diag("Thread started");
 
     warn "Sleeping $sleep seconds";
@@ -57,28 +57,28 @@ my $create_table_sql = <<__EOQ;
   CREATE TABLE IF NOT EXISTS sakila.heartbeat (
     ts                    varchar(26) NOT NULL,
     server_id             int unsigned NOT NULL PRIMARY KEY,
-    file                  varchar(255) DEFAULT NULL,    -- SHOW MASTER STATUS
-    position              bigint unsigned DEFAULT NULL, -- SHOW MASTER STATUS
-    relay_master_log_file varchar(255) DEFAULT NULL,    -- SHOW SLAVE STATUS
-    exec_master_log_pos   bigint unsigned DEFAULT NULL  -- SHOW SLAVE STATUS
+    file                  varchar(255) DEFAULT NULL,    -- SHOW BINARY LOG STATUS
+    position              bigint unsigned DEFAULT NULL, -- SHOW BINARY LOG STATUS
+    relay_${source_name}_log_file varchar(255) DEFAULT NULL,    -- SHOW REPLICA STATUS
+    exec_${source_name}_log_pos   bigint unsigned DEFAULT NULL  -- SHOW REPLICA STATUS
   );
 __EOQ
 
-$sb->do_as_root('master', "$create_table_sql");
-if ($sandbox_version ge '8.0') {
-    $sb->do_as_root('slave1', 'CREATE USER "unprivileged"@"localhost" IDENTIFIED WITH mysql_native_password BY "password"');
+$sb->do_as_root('source', "$create_table_sql");
+if ($sandbox_version eq '8.0') {
+    $sb->do_as_root('replica1', 'CREATE USER "unprivileged"@"localhost" IDENTIFIED WITH mysql_native_password BY "password"');
 } else {
-    $sb->do_as_root('slave1', 'CREATE USER "unprivileged"@"localhost" IDENTIFIED BY "password"');
+    $sb->do_as_root('replica1', 'CREATE USER "unprivileged"@"localhost" IDENTIFIED BY "password"');
 }
-$sb->do_as_root('slave1', 'GRANT SELECT, INSERT, UPDATE, REPLICATION CLIENT ON *.* TO "unprivileged"@"localhost"');
-$sb->do_as_root('slave1', "FLUSH TABLES WITH READ LOCK;");
-$sb->do_as_root('slave1', "SET GLOBAL read_only = 1;");
+$sb->do_as_root('replica1', 'GRANT SELECT, INSERT, UPDATE, REPLICATION CLIENT ON *.* TO "unprivileged"@"localhost"');
+$sb->do_as_root('replica1', "FLUSH TABLES WITH READ LOCK;");
+$sb->do_as_root('replica1', "SET GLOBAL read_only = 1;");
 
 my $thread = threads->create('start_thread', $dsn_opts, 4, $pid_file);
 $thread->detach();
 threads->yield();
 
-my $output = `PTDEBUG=1 $trunk/bin/pt-heartbeat --database=sakila --table heartbeat --read-only-interval 2 --check-read-only --run-time 5 --update $slave1_dsn 2>&1`;
+my $output = `PTDEBUG=1 $trunk/bin/pt-heartbeat --database=sakila --table heartbeat --read-only-interval 2 --check-read-only --run-time 5 --update $replica1_dsn 2>&1`;
 
 like (
     $output,
@@ -86,14 +86,14 @@ like (
     'PT-1508 --read-only-interval',
 );
 
-$master_dbh->do("DROP DATABASE IF EXISTS test");
+$source_dbh->do("DROP DATABASE IF EXISTS test");
 
 # #############################################################################
 # Done.
 # #############################################################################
-$sb->do_as_root('master', 'DROP TABLE IF EXISTS sakila.heartbeat');
-$sb->do_as_root('slave1', 'DROP USER "unprivileged"@"localhost"');
+$sb->do_as_root('source', 'DROP TABLE IF EXISTS sakila.heartbeat');
+$sb->do_as_root('replica1', 'DROP USER "unprivileged"@"localhost"');
 
-$sb->wipe_clean($master_dbh);
+$sb->wipe_clean($source_dbh);
 ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox");
 done_testing;
diff --git a/t/pt-heartbeat/pt-1857.t b/t/pt-heartbeat/pt-1857.t
index a309df503..7b42da89c 100644
--- a/t/pt-heartbeat/pt-1857.t
+++ b/t/pt-heartbeat/pt-1857.t
@@ -25,14 +25,14 @@ require "$trunk/bin/pt-heartbeat";
 
 my $dp = new DSNParser(opts=>$dsn_opts);
 my $sb = new Sandbox(basedir => '/tmp', DSNParser => $dp);
-my $master_dbh = $sb->get_dbh_for('master');
-my $master_dsn = 'h=127.1,P=12345,u=msandbox,p=msandbox';
+my $source_dbh = $sb->get_dbh_for('source');
+my $source_dsn = 'h=127.1,P=12345,u=msandbox,p=msandbox';
 
-my $slave1_dbh = $sb->get_dbh_for('slave1');
-my $slave1_dsn = 'h=127.1,P=12346,u=unprivileged,p=password';
+my $replica1_dbh = $sb->get_dbh_for('replica1');
+my $replica1_dsn = 'h=127.1,P=12346,u=unprivileged,p=password,s=1';
 
-if ( !$master_dbh ) {
-   plan skip_all => 'Cannot connect to sandbox master';
+if ( !$source_dbh ) {
+   plan skip_all => 'Cannot connect to sandbox source';
 }
 
 sub start_thread {
@@ -40,7 +40,7 @@ sub start_thread {
 
     my $dp = new DSNParser(opts=>$dsn_opts);
     my $sb = new Sandbox(basedir => '/tmp', DSNParser => $dp);
-    my $dbh= $sb->get_dbh_for('slave1');
+    my $dbh= $sb->get_dbh_for('replica1');
     my $rows = $dbh->selectall_arrayref('SHOW PROCESSLIST', { Slice => {} });
     for my $row (@$rows) {
         if ($row->{user} eq 'unprivileged') {
@@ -53,28 +53,28 @@ my $create_table_sql = <<__EOQ;
   CREATE TABLE IF NOT EXISTS sakila.heartbeat (
     ts                    varchar(26) NOT NULL,
     server_id             int unsigned NOT NULL PRIMARY KEY,
-    file                  varchar(255) DEFAULT NULL,    -- SHOW MASTER STATUS
-    position              bigint unsigned DEFAULT NULL, -- SHOW MASTER STATUS
-    relay_master_log_file varchar(255) DEFAULT NULL,    -- SHOW SLAVE STATUS
-    exec_master_log_pos   bigint unsigned DEFAULT NULL  -- SHOW SLAVE STATUS
+    file                  varchar(255) DEFAULT NULL,    -- SHOW BINARY LOG STATUS
+    position              bigint unsigned DEFAULT NULL, -- SHOW BINARY LOG STATUS
+    relay_${source_name}_log_file varchar(255) DEFAULT NULL,    -- SHOW REPLICA STATUS
+    exec_${source_name}_log_pos   bigint unsigned DEFAULT NULL  -- SHOW REPLICA STATUS
   );
 __EOQ
 
-$sb->do_as_root('master', "$create_table_sql");
-if ($sandbox_version ge '8.0') {
-    $sb->do_as_root('slave1', 'CREATE USER "unprivileged"@"localhost" IDENTIFIED WITH mysql_native_password BY "password"');
+$sb->do_as_root('source', "$create_table_sql");
+if ($sandbox_version eq '8.0') {
+    $sb->do_as_root('replica1', 'CREATE USER "unprivileged"@"localhost" IDENTIFIED WITH mysql_native_password BY "password"');
 } else {
-    $sb->do_as_root('slave1', 'CREATE USER "unprivileged"@"localhost" IDENTIFIED BY "password"');
+    $sb->do_as_root('replica1', 'CREATE USER "unprivileged"@"localhost" IDENTIFIED BY "password"');
 }
-$sb->do_as_root('slave1', 'GRANT SELECT, INSERT, UPDATE, REPLICATION CLIENT ON *.* TO "unprivileged"@"localhost"');
-$sb->do_as_root('slave1', "FLUSH TABLES WITH READ LOCK;");
-$sb->do_as_root('slave1', "SET GLOBAL read_only = 1;");
+$sb->do_as_root('replica1', 'GRANT SELECT, INSERT, UPDATE, REPLICATION CLIENT ON *.* TO "unprivileged"@"localhost"');
+$sb->do_as_root('replica1', "FLUSH TABLES WITH READ LOCK;");
+$sb->do_as_root('replica1', "SET GLOBAL read_only = 1;");
 
 my $thread = threads->create('start_thread', $dsn_opts, 4);
 $thread->detach();
 threads->yield();
 
-my $output = `PTDEBUG=1 $trunk/bin/pt-heartbeat --database=sakila --table heartbeat --read-only-interval 2 --check-read-only --run-time 5 --update $slave1_dsn 2>&1`;
+my $output = `PTDEBUG=1 $trunk/bin/pt-heartbeat --database=sakila --table heartbeat --read-only-interval 2 --check-read-only --run-time 5 --update $replica1_dsn 2>&1`;
 
 unlike (
     $output,
@@ -82,14 +82,14 @@ unlike (
     'PT-1508 --read-only-interval',
 );
 
-$master_dbh->do("DROP DATABASE IF EXISTS test");
+$source_dbh->do("DROP DATABASE IF EXISTS test");
 
 # #############################################################################
 # Done.
 # #############################################################################
-$sb->do_as_root('master', 'DROP TABLE IF EXISTS sakila.heartbeat');
-$sb->do_as_root('slave1', 'DROP USER "unprivileged"@"localhost"');
+$sb->do_as_root('source', 'DROP TABLE IF EXISTS sakila.heartbeat');
+$sb->do_as_root('replica1', 'DROP USER "unprivileged"@"localhost"');
 
-$sb->wipe_clean($master_dbh);
+$sb->wipe_clean($source_dbh);
 ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox");
 done_testing;
diff --git a/t/pt-heartbeat/pxc.t b/t/pt-heartbeat/pxc.t
index 7216de4c8..c692d0d95 100644
--- a/t/pt-heartbeat/pxc.t
+++ b/t/pt-heartbeat/pxc.t
@@ -116,24 +116,24 @@ is(
 );
 
 # These values may be 0 or '' depending on whether or not a previous test
-# turned 12345 into a slave or not.  For this purpose 0 == undef == ''.
-my $only_slave_data = {
+# turned 12345 into a replica or not.  For this purpose 0 == undef == ''.
+my $only_replica_data = {
    map {
       $_ => {
-         relay_master_log_file => $rows->{$_}->{relay_master_log_file} || undef,
-         exec_master_log_pos   => $rows->{$_}->{exec_master_log_pos}   || undef,
+         relay_source_log_file => $rows->{$_}->{"relay_${source_name}_log_file"} || undef,
+         exec_source_log_pos   => $rows->{$_}->{"exec_${source_name}_log_pos"}   || undef,
       } } keys %$rows
 };
 
-my $same_data = { relay_master_log_file => undef, exec_master_log_pos => undef };
+my $same_data = { relay_${source_name}_log_file => undef, exec_${source_name}_log_pos => undef };
 is_deeply(
-   $only_slave_data,
+   $only_replica_data,
    {
       12345 => $same_data,
       12346 => $same_data,
       12347 => $same_data,
    },
-   "Sanity check: No slave data (relay log or master pos) is stored"
+   "Sanity check: No replica data (relay log or source pos) is stored"
 ) or diag(Dumper($rows));
 
 $output = output(sub{
@@ -144,13 +144,13 @@ $output = output(sub{
 
 like(
    $output,
-   qr/\QThe --master-server-id option must be specified because the heartbeat table `test`.`heartbeat`/,
-   "pt-heartbeat --check + PXC doesn't autodetect a master if there isn't any"
+   qr/\QThe --${source_name}-server-id option must be specified because the heartbeat table `test`.`heartbeat`/,
+   "pt-heartbeat --check + PXC doesn't autodetect a source if there isn't any"
 );
 
 $output = output(sub{
       pt_heartbeat::main($node1_dsn, qw(-D test --check),
-                         '--master-server-id', $node3_port),
+                         '--${source_name}-server-id', $node3_port),
    },
    stderr => 1,
 );
@@ -159,7 +159,7 @@ $output =~ s/\d\.\d{2}/0.00/g;
 is(
    $output,
    "0.00\n",
-   "pt-heartbeat --check + PXC works with --master-server-id"
+   "pt-heartbeat --check + PXC works with --source-server-id"
 );
 
 # Test --monitor
@@ -167,7 +167,7 @@ is(
 $output = output(sub {
    pt_heartbeat::main($node1_dsn,
       qw(-D test --monitor --run-time 1s),
-      '--master-server-id', $node3_port)
+      '--${source_name}-server-id', $node3_port)
    },
    stderr => 1,
 );
@@ -189,13 +189,13 @@ my $query_table_pid    = "/tmp/query_table.$PID.pid";
 my $query_table_output = "/tmp/query_table.$PID.output";
 
 $sb->create_dbs($node1, ['pt_osc']);
-$sb->load_file('master', "$pt_osc_sample/basic_no_fks_innodb.sql");
+$sb->load_file('source', "$pt_osc_sample/basic_no_fks_innodb.sql");
 
 $node1->do("USE pt_osc");
 $node1->do("TRUNCATE TABLE t");
 $node1->do("LOAD DATA INFILE '$trunk/$pt_osc_sample/basic_no_fks.data' INTO TABLE t");
 $node1->do("ANALYZE TABLE t");
-$sb->wait_for_slaves();
+$sb->wait_for_replicas();
 
 diag(`rm -rf $query_table_stop`);
 diag(`echo > $query_table_output`);
@@ -210,7 +210,7 @@ system "$trunk/sandbox/load-sakila-db $node1_port &";
 $output = output(sub {
    pt_heartbeat::main($node3_dsn,
       qw(-D test --monitor --run-time 5s),
-      '--master-server-id', $node1_port)
+      '--${source_name}-server-id', $node1_port)
    },
    stderr => 1,
 );
@@ -227,26 +227,26 @@ wait_until(sub{!kill 0, $p});
 
 $node1->do(q{DROP DATABASE pt_osc});
 
-$sb->wait_for_slaves();
+$sb->wait_for_replicas();
 
 # #############################################################################
-# cluster, node1 -> slave, run on node1
+# cluster, node1 -> replica, run on node1
 # #############################################################################
 
-my ($slave_dbh, $slave_dsn) = $sb->start_sandbox(
-   server => 'cslave1',
-   type   => 'slave',
-   master => 'node1',
+my ($replica_dbh, $replica_dsn) = $sb->start_sandbox(
+   server => 'creplica1',
+   type   => 'replica',
+   source => 'node1',
    env    => q/FORK="pxc" BINLOG_FORMAT="ROW"/,
 );
 
-$sb->create_dbs($slave_dbh, ['test']);
-$sb->wait_for_slaves(master => 'node1', slave => 'cslave1');
-start_update_instance($sb->port_for('cslave1'));
-PerconaTest::wait_for_table($slave_dbh, "test.heartbeat", "1=1");
+$sb->create_dbs($replica_dbh, ['test']);
+$sb->wait_for_replicas(source => 'node1', replica => 'creplica1');
+start_update_instance($sb->port_for('creplica1'));
+PerconaTest::wait_for_table($replica_dbh, "test.heartbeat", "1=1");
 
 $output = output(sub{
-      pt_heartbeat::main($slave_dsn, qw(-D test --check)),
+      pt_heartbeat::main($replica_dsn, qw(-D test --check)),
    },
    stderr => 1,
 );
@@ -254,11 +254,11 @@ $output = output(sub{
 like(
    $output,
    qr/\d\.\d{2}\n/,
-   "pt-heartbeat --check works on a slave of a cluster node"
+   "pt-heartbeat --check works on a replica of a cluster node"
 );
 
 $output = output(sub {
-   pt_heartbeat::main($slave_dsn,
+   pt_heartbeat::main($replica_dsn,
       qw(-D test --monitor --run-time 2s))
    },
    stderr => 1,
@@ -267,13 +267,13 @@ $output = output(sub {
 like(
    $output,
    qr/^\d.\d{2}s\s+\[/,
-   "pt-heartbeat --monitor + slave of a node1, without --master-server-id"
+   "pt-heartbeat --monitor + replica of a node1, without --source-server-id"
 );
 
 $output = output(sub {
-   pt_heartbeat::main($slave_dsn,
+   pt_heartbeat::main($replica_dsn,
       qw(-D test --monitor --run-time 2s),
-      '--master-server-id', $node3_port)
+      '--${source_name}-server-id', $node3_port)
    },
    stderr => 1,
 );
@@ -281,55 +281,55 @@ $output = output(sub {
 like(
    $output,
    qr/^\d.\d{2}s\s+\[/,
-   "pt-heartbeat --monitor + slave of node1, --master-server-id pointing to node3"
+   "pt-heartbeat --monitor + replica of node1, --source-server-id pointing to node3"
 );
 
 # #############################################################################
-# master -> node1 in cluster
+# source -> node1 in cluster
 # #############################################################################
 
-# CAREFUL! See the comments in t/pt-table-checksum/pxc.t about cmaster.
+# CAREFUL! See the comments in t/pt-table-checksum/pxc.t about csource.
 # Nearly everything applies here.
 
-my ($master_dbh, $master_dsn) = $sb->start_sandbox(
-   server => 'cmaster',
-   type   => 'master',
+my ($source_dbh, $source_dsn) = $sb->start_sandbox(
+   server => 'csource',
+   type   => 'source',
    env    => q/FORK="pxc" BINLOG_FORMAT="ROW"/,
 );
 
-my $cmaster_port = $sb->port_for('cmaster');
+my $csource_port = $sb->port_for('csource');
 
-$sb->create_dbs($master_dbh, ['test']);
-$master_dbh->do("INSERT INTO percona_test.sentinel (id, ping) VALUES (1, '')");
-$master_dbh->do("FLUSH LOGS");
-$master_dbh->do("RESET MASTER");
+$sb->create_dbs($source_dbh, ['test']);
+$source_dbh->do("INSERT INTO percona_test.sentinel (id, ping) VALUES (1, '')");
+$source_dbh->do("FLUSH LOGS");
+$source_dbh->do("RESET ${source_reset}");
 
-$sb->set_as_slave('node1', 'cmaster');
-$sb->wait_for_slaves(master => 'cmaster', slave => 'node1');
+$sb->set_as_replica('node1', 'csource');
+$sb->wait_for_replicas(source => 'csource', replica => 'node1');
 
-start_update_instance($sb->port_for('cmaster'));
-PerconaTest::wait_for_table($node1, "test.heartbeat", "server_id=$cmaster_port");
+start_update_instance($sb->port_for('csource'));
+PerconaTest::wait_for_table($node1, "test.heartbeat", "server_id=$csource_port");
 
-# Auto-detecting the master id only works when ran on node1, the direct
-# slave of the master, because other nodes aren't slaves, but this could
+# Auto-detecting the source id only works when ran on node1, the direct
+# replica of the source, because other nodes aren't replicas, but this could
 # be made to work; see the node autodiscovery branch.
 $output = output(
    sub {
       pt_heartbeat::main($node1_dsn,
-         qw(-D test --check --print-master-server-id)
+         qw(-D test --check --print-${source_name}-server-id)
    )},
    stderr => 1,
 );
 
 like(
    $output,
-   qr/^\d.\d{2} $cmaster_port$/,
-   "Auto-detect master ID from node1"
+   qr/^\d.\d{2} $csource_port$/,
+   "Auto-detect source ID from node1"
 );
 
-# Wait until node2 & node3 get cmaster in their heartbeat tables
-$sb->wait_for_slaves(master => 'node1', slave => 'node2');
-$sb->wait_for_slaves(master => 'node1', slave => 'node3');
+# Wait until node2 & node3 get csource in their heartbeat tables
+$sb->wait_for_replicas(source => 'node1', replica => 'node2');
+$sb->wait_for_replicas(source => 'node1', replica => 'node3');
 
 foreach my $test (
    [ $node2_port, $node2_dsn, $node2, 'node2' ],
@@ -340,21 +340,21 @@ foreach my $test (
    $output = output(
       sub {
          pt_heartbeat::main($dsn,
-            qw(-D test --check --print-master-server-id)
+            qw(-D test --check --print-${source_name}-server-id)
       )},
       stderr => 1,
    );
 
    like(
       $output,
-      qr/server's master could not be automatically determined/,
-      "Limitation: cannot auto-detect master id from $name"
+      qr/server's ${source_name} could not be automatically determined/,
+      "Limitation: cannot auto-detect source id from $name"
    );
 
    $output = output(
       sub {
          pt_heartbeat::main($dsn,
-            qw(-D test --check --master-server-id), $cmaster_port
+            qw(-D test --check --${source_name}-server-id), $csource_port
       )},
       stderr => 1,
    );
@@ -364,7 +364,7 @@ foreach my $test (
    is(
       $output,
       "0.00\n",
-      "$name --check --master-server-id $cmaster_port"
+      "$name --check --source-server-id $csource_port"
    );
 }
 
@@ -381,11 +381,11 @@ stop_all_instances();
 # We have to do this after the --stop, otherwise the --update processes will
 # spew a bunch of warnings and clog 
 
-$slave_dbh->disconnect;
-$master_dbh->disconnect;
-$sb->stop_sandbox('cslave1', 'cmaster');
-$node1->do("STOP SLAVE");
-$node1->do("RESET SLAVE");
+$replica_dbh->disconnect;
+$source_dbh->disconnect;
+$sb->stop_sandbox('creplica1', 'csource');
+$node1->do("STOP ${replica_name}");
+$node1->do("RESET ${replica_name}");
 
 # #############################################################################
 # Done.
diff --git a/t/pt-heartbeat/standard_options.t b/t/pt-heartbeat/standard_options.t
index 15da68c5b..398bea66f 100644
--- a/t/pt-heartbeat/standard_options.t
+++ b/t/pt-heartbeat/standard_options.t
@@ -17,10 +17,10 @@ require "$trunk/bin/pt-heartbeat";
 
 my $dp  = new DSNParser(opts=>$dsn_opts);
 my $sb  = new Sandbox(basedir => '/tmp', DSNParser => $dp);
-my $dbh = $sb->get_dbh_for('master');
+my $dbh = $sb->get_dbh_for('source');
 
 if ( !$dbh ) {
-   plan skip_all => 'Cannot connect to sandbox master';
+   plan skip_all => 'Cannot connect to sandbox source';
 }
 else {
    plan tests => 2;
@@ -39,7 +39,7 @@ my $cmd = "$trunk/bin/pt-heartbeat -F $cnf ";
 # Issue 391: Add --pid option to all scripts
 # #########################################################################
 `touch /tmp/mk-script.pid`;
-$output = `$cmd --host 127.1 -u msandbox -p msandbox --port 12345 -D test --check --recurse 1 --pid /tmp/mk-script.pid --create-table --master-server-id 12345 2>&1`;
+$output = `$cmd --host 127.1 -u msandbox -p msandbox --port 12345 -D test --check --recurse 1 --pid /tmp/mk-script.pid --create-table --source-server-id 12345 2>&1`;
 like(
    $output,
    qr{PID file /tmp/mk-script.pid exists},
diff --git a/t/pt-heartbeat/utc.t b/t/pt-heartbeat/utc.t
index ad53226f2..3a44f7a14 100644
--- a/t/pt-heartbeat/utc.t
+++ b/t/pt-heartbeat/utc.t
@@ -20,27 +20,27 @@ require "$trunk/bin/pt-heartbeat";
 
 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 ( !$slave2_dbh ) {
-   plan skip_all => 'Cannot connect to sandbox slave2';
+elsif ( !$replica2_dbh ) {
+   plan skip_all => 'Cannot connect to sandbox replica2';
 }
 
 unlink '/tmp/pt-heartbeat-sentinel';
-$sb->create_dbs($master_dbh, ['test']);
-$sb->wait_for_slaves();
+$sb->create_dbs($source_dbh, ['test']);
+$sb->wait_for_replicas();
 
 my $output;
 my $base_pidfile = (tempfile("/tmp/pt-heartbeat-test.XXXXXXXX", OPEN => 0, UNLINK => 0))[1];
-my $master_port = $sb->port_for('master');
+my $source_port = $sb->port_for('source');
 
 my @exec_pids;
 my @pidfiles;
@@ -82,18 +82,18 @@ sub stop_all_instances {
 # https://bugs.launchpad.net/percona-toolkit/+bug/886059
 # ############################################################################
 
-start_update_instance( $master_port );
+start_update_instance( $source_port );
 
-PerconaTest::wait_for_table($slave1_dbh, 'test.heartbeat', 'server_id=12345');
+PerconaTest::wait_for_table($replica1_dbh, 'test.heartbeat', 'server_id=12345');
 
-my $slave1_dsn = $sb->dsn_for('slave1');
+my $replica1_dsn = $sb->dsn_for('replica1');
 # Using full_output here to work around a Perl bug: Only the first explicit
 # tzset works.
 ($output) = full_output(sub {
    local $ENV{TZ} = '-09:00';
    tzset();
-   pt_heartbeat::main($slave1_dsn, qw(--database test --table heartbeat),
-                        qw(--utc --check --master-server-id), $master_port)
+   pt_heartbeat::main($replica1_dsn, qw(--database test --table heartbeat),
+                        qw(--utc --check --source-server-id), $source_port)
 });
 
 # If the servers use UTC then the lag should be 0.00, or at least
@@ -112,19 +112,19 @@ stop_all_instances();
 # https://bugs.launchpad.net/percona-toolkit/+bug/1103221
 # #############################################################################
 
-$master_dbh->do('truncate table test.heartbeat');
-$sb->wait_for_slaves;
+$source_dbh->do('truncate table test.heartbeat');
+$sb->wait_for_replicas;
 
-my $master_dsn = $sb->dsn_for('master');
+my $source_dsn = $sb->dsn_for('source');
 
 ($output) = output(
    sub {
-      pt_heartbeat::main($master_dsn, qw(--database test --update),
+      pt_heartbeat::main($source_dsn, qw(--database test --update),
          qw(--run-time 1))
    },
 );
 
-my ($row) = $master_dbh->selectrow_hashref('select * from test.heartbeat');
+my ($row) = $source_dbh->selectrow_hashref('select * from test.heartbeat');
 like(
    $row->{ts},
    qr/\d{4}-\d\d-\d\dT\d+:\d+:\d+\.\d+/,
@@ -149,15 +149,15 @@ my $old_utc_ts = sprintf(
    "%d-%02d-%02dT%02d:%02d:%02d",
    $year, $mon, $mday, $hour, $min, $sec);
 
-$master_dbh->do("truncate table test.heartbeat");
-$master_dbh->do("insert into test.heartbeat (ts, server_id) values ('$old_utc_ts', 1)");
-$sb->wait_for_slaves;
+$source_dbh->do("truncate table test.heartbeat");
+$source_dbh->do("insert into test.heartbeat (ts, server_id) values ('$old_utc_ts', 1)");
+$sb->wait_for_replicas;
 
 ($output) = output(
    sub {
       pt_heartbeat::main(
-         $slave1_dsn, qw(--database test --table heartbeat),
-         qw(--utc --check --master-server-id), $master_port
+         $replica1_dsn, qw(--database test --table heartbeat),
+         qw(--utc --check --source-server-id), $source_port
       )
    },
 );
@@ -171,6 +171,6 @@ like(
 # ############################################################################
 # 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;
diff --git a/t/pt-index-usage/basics.t b/t/pt-index-usage/basics.t
index 5e2e07215..8507175c4 100644
--- a/t/pt-index-usage/basics.t
+++ b/t/pt-index-usage/basics.t
@@ -13,14 +13,15 @@ use Test::More;
 
 use PerconaTest;
 require "$trunk/bin/pt-index-usage";
+require VersionParser;
 
 use Sandbox;
 my $dp  = new DSNParser(opts=>$dsn_opts);
 my $sb  = new Sandbox(basedir => '/tmp', DSNParser => $dp);
-my $dbh = $sb->get_dbh_for('master');
+my $dbh = $sb->get_dbh_for('source');
 
 if ( !$dbh ) {
-   plan skip_all => 'Cannot connect to sandbox master';
+   plan skip_all => 'Cannot connect to sandbox source';
 }
 if ( !@{ $dbh->selectall_arrayref("show databases like 'sakila'") } ) {
    plan skip_all => "Sakila database is not loaded";
diff --git a/t/pt-index-usage/save_results.t b/t/pt-index-usage/save_results.t
index 5ecc5f010..3350b2a8a 100644
--- a/t/pt-index-usage/save_results.t
+++ b/t/pt-index-usage/save_results.t
@@ -13,14 +13,15 @@ use Test::More;
 
 use PerconaTest;
 require "$trunk/bin/pt-index-usage";
+require VersionParser;
 
 use Sandbox;
 my $dp  = new DSNParser(opts=>$dsn_opts);
 my $sb  = new Sandbox(basedir => '/tmp', DSNParser => $dp);
-my $dbh = $sb->get_dbh_for('master');
+my $dbh = $sb->get_dbh_for('source');
 
 if ( !$dbh ) {
-   plan skip_all => 'Cannot connect to sandbox master';
+   plan skip_all => 'Cannot connect to sandbox source';
 }
 if ( !@{ $dbh->selectall_arrayref("show databases like 'sakila'") } ) {
    plan skip_all => "Sakila database is not loaded";
diff --git a/t/pt-ioprofile/pt-ioprofile.t b/t/pt-ioprofile/pt-ioprofile.t
index 95a4232be..502189639 100644
--- a/t/pt-ioprofile/pt-ioprofile.t
+++ b/t/pt-ioprofile/pt-ioprofile.t
@@ -14,15 +14,16 @@ use Time::HiRes qw(time);
 
 use PerconaTest;
 use DSNParser;
+use VersionParser;
 use Sandbox;
 
 my $dp = new DSNParser(opts=>$dsn_opts);
 my $sb = new Sandbox(basedir => '/tmp', DSNParser => $dp);
-my $dbh = $sb->get_dbh_for('master');
+my $dbh = $sb->get_dbh_for('source');
 my $have_strace = `which strace 2>/dev/null`;
 
 if ( !$dbh ) {
-   plan skip_all => "Cannot connect to master sandbox";
+   plan skip_all => "Cannot connect to source sandbox";
 }
 elsif ( !$have_strace ) {
    plan skip_all => 'strace is not installed or not in PATH';
diff --git a/t/pt-kill/basics.t b/t/pt-kill/basics.t
index 6b3e18448..88afe0944 100644
--- a/t/pt-kill/basics.t
+++ b/t/pt-kill/basics.t
@@ -17,13 +17,14 @@ use Data::Dumper;
 use PerconaTest;
 use Sandbox;
 require "$trunk/bin/pt-kill";
+require VersionParser;
 
 my $dp = new DSNParser(opts=>$dsn_opts);
 my $sb = new Sandbox(basedir => '/tmp', DSNParser => $dp);
-my $master_dbh = $sb->get_dbh_for('master');
+my $source_dbh = $sb->get_dbh_for('source');
 
-if ( !$master_dbh ) {
-   plan skip_all => 'Cannot connect to sandbox master';
+if ( !$source_dbh ) {
+   plan skip_all => 'Cannot connect to sandbox source';
 }
 else {
    plan tests => 6;
@@ -83,7 +84,7 @@ like(
 # #############################################################################
 # Reconnect if cxn lost.
 # #############################################################################
-$master_dbh->do("CREATE DATABASE IF NOT EXISTS pt_kill_test");
+$source_dbh->do("CREATE DATABASE IF NOT EXISTS pt_kill_test");
 
 system(qq($trunk/util/kill-mysql-process db=pt_kill_test wait=2 &));
 
@@ -109,6 +110,6 @@ is(
 # #############################################################################
 # Done.
 # #############################################################################
-$sb->wipe_clean($master_dbh);
+$sb->wipe_clean($source_dbh);
 ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox");
 exit;
diff --git a/t/pt-kill/execute_command.t b/t/pt-kill/execute_command.t
index a35692c27..4be19e92d 100644
--- a/t/pt-kill/execute_command.t
+++ b/t/pt-kill/execute_command.t
@@ -14,10 +14,11 @@ use Test::More tests => 9;
 use PerconaTest;
 use Sandbox;
 require "$trunk/bin/pt-kill";
+require VersionParser;
 
 my $dp = new DSNParser(opts=>$dsn_opts);
 my $sb = new Sandbox(basedir => '/tmp', DSNParser => $dp);
-my $master_dbh = $sb->get_dbh_for('master');
+my $source_dbh = $sb->get_dbh_for('source');
 
 my $output;
 my $cnf ='/tmp/12345/my.sandbox.cnf';
@@ -46,8 +47,8 @@ is(
 diag(`rm $out 2>/dev/null`);
 
 SKIP: {
-   skip 'Cannot connect to sandbox master', 2 unless $master_dbh;
-   $master_dbh->do("CREATE DATABASE IF NOT EXISTS pt_kill_zombie_test");
+   skip 'Cannot connect to sandbox source', 2 unless $source_dbh;
+   $source_dbh->do("CREATE DATABASE IF NOT EXISTS pt_kill_zombie_test");
 
    system "/tmp/12345/use -e 'select sleep(2)' >/dev/null 2>&1 &";
 
@@ -71,7 +72,11 @@ SKIP: {
    diag(`rm $out 2>/dev/null`);
 
    # Don't make zombies (https://bugs.launchpad.net/percona-toolkit/+bug/919819)
-   $master_dbh->do("USE pt_kill_zombie_test");
+
+   # We have to store existing zombies, otherwise test occasionally fails
+   my $our_zombies = `ps x | grep Z | grep -v grep`;
+
+   $source_dbh->do("USE pt_kill_zombie_test");
 
    my $sentinel = "/tmp/pt-kill-test.$PID.stop";
    my $pid_file = "/tmp/pt-kill-test.$PID.pid";
@@ -92,9 +97,9 @@ SKIP: {
    $output = `ps x | grep Z | grep -v grep`;
    is(
       $output,
-      "",
+      $our_zombies,
       "No zombies"
-   );
+   ) or diag($output);
 
    diag(`touch $sentinel`);
    sleep 1;
@@ -105,9 +110,9 @@ SKIP: {
    $output = `ps x | grep Z | grep -v grep`;
    is(
       $output,
-      "",
+      $our_zombies,
       "No zombies"
-   );
+   ) or diag($output);
 
    diag(`rm $sentinel 2>/dev/null`);
    diag(`rm $pid_file 2>/dev/null`);
@@ -118,6 +123,6 @@ SKIP: {
 # Done.
 # #############################################################################
 diag(`rm $out 2>/dev/null`);
-$sb->wipe_clean($master_dbh) if $master_dbh;
+$sb->wipe_clean($source_dbh) if $source_dbh;
 ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox");
 exit;
diff --git a/t/pt-kill/group_queries.t b/t/pt-kill/group_queries.t
index a4fa9181f..d80271417 100644
--- a/t/pt-kill/group_queries.t
+++ b/t/pt-kill/group_queries.t
@@ -24,7 +24,7 @@ my $proclist =
          'Id'      => '4',
          'Info'    => undef,
          'User'    => 'system user',
-         'State'   => 'Waiting for master to send event',
+         'State'   => 'Waiting for source to send event',
          'Host'    => ''
       },
       {  'Time'    => '488',
@@ -119,7 +119,7 @@ is_deeply(
             'Id'      => '4',
             'Info'    => undef,
             'User'    => 'system user',
-            'State'   => 'Waiting for master to send event',
+            'State'   => 'Waiting for source to send event',
             'Host'    => ''
          },
          {  'Time'    => '488',
diff --git a/t/pt-kill/kill.t b/t/pt-kill/kill.t
index 090da5dd3..4d238c845 100644
--- a/t/pt-kill/kill.t
+++ b/t/pt-kill/kill.t
@@ -15,6 +15,7 @@ use Test::More;
 use PerconaTest;
 use Sandbox;
 require "$trunk/bin/pt-kill";
+require VersionParser;
 
 use Data::Dumper;
 $Data::Dumper::Indent    = 1;
@@ -23,14 +24,14 @@ $Data::Dumper::Quotekeys = 0;
 
 my $dp  = new DSNParser(opts=>$dsn_opts);
 my $sb  = new Sandbox(basedir => '/tmp', DSNParser => $dp);
-my $dbh = $sb->get_dbh_for('master');
+my $dbh = $sb->get_dbh_for('source');
 
 if ( !$dbh ) {
-   plan skip_all => 'Cannot connect to sandbox master';
+   plan skip_all => 'Cannot connect to sandbox source';
 }
 
 my $output;
-my $dsn = $sb->dsn_for('master');
+my $dsn = $sb->dsn_for('source');
 my $cnf = '/tmp/12345/my.sandbox.cnf';
 
 # TODO:  These tests need something to match, so we background
diff --git a/t/pt-kill/log_dsn.t b/t/pt-kill/log_dsn.t
index 4db82e54c..5c8f9615f 100644
--- a/t/pt-kill/log_dsn.t
+++ b/t/pt-kill/log_dsn.t
@@ -15,6 +15,7 @@ use Test::More;
 use PerconaTest;
 use Sandbox;
 require "$trunk/bin/pt-kill";
+require VersionParser;
 
 use Data::Dumper;
 $Data::Dumper::Indent    = 1;
@@ -23,34 +24,34 @@ $Data::Dumper::Quotekeys = 0;
 
 my $dp  = new DSNParser(opts=>$dsn_opts);
 my $sb  = new Sandbox(basedir => '/tmp', DSNParser => $dp);
-my $master_dbh = $sb->get_dbh_for('master');
-my $slave_dbh  = $sb->get_dbh_for('slave1');
-my $target_dbh = $sb->get_dbh_for('master');
+my $source_dbh = $sb->get_dbh_for('source');
+my $replica_dbh  = $sb->get_dbh_for('replica1');
+my $target_dbh = $sb->get_dbh_for('source');
 
-if ( !$master_dbh ) {
-   plan skip_all => 'Cannot connect to sandbox master';
+if ( !$source_dbh ) {
+   plan skip_all => 'Cannot connect to sandbox source';
 }
 elsif ( !$target_dbh ) {
-   plan skip_all => 'Cannot connect to sandbox master (target)';
+   plan skip_all => 'Cannot connect to sandbox source (target)';
 }
-elsif ( !$slave_dbh ) {
-   plan skip_all => 'Cannot connect to sandbox slave';
+elsif ( !$replica_dbh ) {
+   plan skip_all => 'Cannot connect to sandbox replica';
 }
 
 my $output;
-my $master_dsn = $sb->dsn_for('master');
-my $master_cnf = $sb->cnf_for('master');
-my $slave_dsn  = $sb->dsn_for('slave1');
+my $source_dsn = $sb->dsn_for('source');
+my $source_cnf = $sb->cnf_for('source');
+my $replica_dsn  = $sb->dsn_for('replica1');
 
 # Create the --log-dsn table.
-$sb->create_dbs($master_dbh, [qw(kill_test)]);
+$sb->create_dbs($source_dbh, [qw(kill_test)]);
 my $log_table = "kill_test.log_table";
 my $log_dsn   = "D=kill_test,t=log_table";
 my $log_sql   = OptionParser->read_para_after(
    "$trunk/bin/pt-kill", qr/MAGIC_create_log_table/);
 $log_sql =~ s/kill_log/$log_table/;
-$master_dbh->do($log_sql);
-$sb->wait_for_slaves();
+$source_dbh->do($log_sql);
+$sb->wait_for_replicas();
 
 # Create the target db for --match-db.
 my $target_db = "x$PID";
@@ -64,7 +65,7 @@ sub setup_target {
       eval {
          $target_dbh->disconnect();
       };
-      $target_dbh = $sb->get_dbh_for('master');
+      $target_dbh = $sb->get_dbh_for('source');
    }
    $target_dbh->do("USE $target_db");
 }
@@ -79,7 +80,7 @@ foreach my $test (
    [q/h=127.1,P=12345,u=msandbox,p=msandbox,D=kill_test/, 't'],
 ) {
    eval {
-      pt_kill::main($master_dsn, qw(--kill --run-time 1 --interval 1),
+      pt_kill::main($source_dsn, qw(--kill --run-time 1 --interval 1),
          "--match-db", $target_db,
          "--log-dsn", $test->[0],
       )
@@ -97,9 +98,9 @@ foreach my $test (
 
 eval {
    setup_target();
-   pt_kill::main($master_dsn, qw(--kill --run-time 1 --interval 1),
+   pt_kill::main($source_dsn, qw(--kill --run-time 1 --interval 1),
       "--match-db", $target_db,
-      "--log-dsn", "$master_dsn,$log_dsn"
+      "--log-dsn", "$source_dsn,$log_dsn"
    )
 };
 
@@ -128,7 +129,7 @@ is(
 #      user => 'msandbox'
 #   }
 # ];
-my $rows = $master_dbh->selectall_arrayref(
+my $rows = $source_dbh->selectall_arrayref(
    "SELECT * FROM $log_table", { Slice =>{} });
 
 is(
@@ -157,7 +158,7 @@ is(
 
 # Get the current ts in MySQL's format.
 my $current_ts = Transformers::ts(time());
-($current_ts) = $master_dbh->selectrow_array("SELECT TIMESTAMP('$current_ts')");
+($current_ts) = $source_dbh->selectrow_array("SELECT TIMESTAMP('$current_ts')");
 
 # Chop off the minutes & seconds. If the rest of the date is right,
 # this is unlikely to be broken.
@@ -194,10 +195,10 @@ is_deeply(
 
 eval {
    setup_target();
-   pt_kill::main('-F', $master_cnf, qw(--kill --run-time 1 --interval 1),
+   pt_kill::main('-F', $source_cnf, qw(--kill --run-time 1 --interval 1),
       "--create-log-table",
       "--match-info", 'select sleep\(4\)',
-      "--log-dsn", "$master_dsn,$log_dsn",
+      "--log-dsn", "$source_dsn,$log_dsn",
    )
 };
 
@@ -207,15 +208,15 @@ is(
    "--log-dsn --create-log-table and the table exists, no error"
 );
 
-$master_dbh->do("DROP TABLE IF EXISTS $log_table");
-$sb->wait_for_slaves();
+$source_dbh->do("DROP TABLE IF EXISTS $log_table");
+$sb->wait_for_replicas();
 
 eval {
    setup_target();
-   pt_kill::main('-F', $master_cnf, qw(--kill --run-time 1 --interval 1),
+   pt_kill::main('-F', $source_cnf, qw(--kill --run-time 1 --interval 1),
       "--create-log-table",
       "--match-info", 'select sleep\(4\)',
-      "--log-dsn", "$master_dsn,$log_dsn",
+      "--log-dsn", "$source_dsn,$log_dsn",
    )
 };
 
@@ -225,14 +226,14 @@ is(
    "--log-dsn --create-log-table and the table doesn't exist, no error"
 );
 
-$master_dbh->do("DROP TABLE IF EXISTS $log_table");
-$sb->wait_for_slaves();
+$source_dbh->do("DROP TABLE IF EXISTS $log_table");
+$sb->wait_for_replicas();
 
 eval {
    setup_target();
-   pt_kill::main('-F', $master_cnf, qw(--kill --run-time 1 --interval 1),
+   pt_kill::main('-F', $source_cnf, qw(--kill --run-time 1 --interval 1),
       "--match-info", 'select sleep\(4\)',
-      "--log-dsn", "$master_dsn,$log_dsn",
+      "--log-dsn", "$source_dsn,$log_dsn",
    )
 };
 
@@ -243,8 +244,8 @@ like(
 );
 
 # Re-create the log table for the next tests.
-$master_dbh->do($log_sql);
-$sb->wait_for_slaves();
+$source_dbh->do($log_sql);
+$sb->wait_for_replicas();
 
 # #############################################################################
 # Can re-use the log table.
@@ -252,15 +253,15 @@ $sb->wait_for_slaves();
 
 for (1,2) {
    setup_target();
-   pt_kill::main($master_dsn, qw(--kill --run-time 1 --interval 1),
+   pt_kill::main($source_dsn, qw(--kill --run-time 1 --interval 1),
       "--create-log-table",
       "--match-db", $target_db,
-      "--log-dsn", "$master_dsn,$log_dsn",
+      "--log-dsn", "$source_dsn,$log_dsn",
    );
    sleep 0.5;
 }
 
-$rows = $master_dbh->selectall_arrayref("SELECT * FROM $log_table");
+$rows = $source_dbh->selectall_arrayref("SELECT * FROM $log_table");
 
 is(
    scalar @$rows,
@@ -273,31 +274,31 @@ is(
 # https://bugs.launchpad.net/percona-toolkit/+bug/1209436
 # #############################################################################
 
-$master_dbh->do("TRUNCATE $log_table");
-$sb->wait_for_slaves();
+$source_dbh->do("TRUNCATE $log_table");
+$sb->wait_for_replicas();
 
 my $pid_file = "/tmp/pt-kill-test.$PID";
 my $log_file = "/tmp/pt-kill-test-log.$PID";
 diag(`rm -f $pid_file $log_file >/dev/null 2>&1`);
 
 setup_target();
-system("$trunk/bin/pt-kill $master_dsn --daemonize --run-time 1 --kill-query --interval 1 --match-db $target_db --log-dsn $slave_dsn,$log_dsn --pid $pid_file --log $log_file");
+system("$trunk/bin/pt-kill $source_dsn --daemonize --run-time 1 --kill-query --interval 1 --match-db $target_db --log-dsn $replica_dsn,$log_dsn --pid $pid_file --log $log_file");
 PerconaTest::wait_for_files($pid_file);         # start
 # ...                                           # run
 PerconaTest::wait_until(sub { !-f $pid_file});  # stop
 
-# Should *not* log to master
-$rows = $master_dbh->selectall_arrayref("SELECT * FROM $log_table");
+# Should *not* log to source
+$rows = $source_dbh->selectall_arrayref("SELECT * FROM $log_table");
 ok(
    !@$rows,
-   "--log-dsn --daemonize, master (bug 1209436)",
+   "--log-dsn --daemonize, source (bug 1209436)",
 ) or diag(Dumper($rows));
 
-# Should log to slave
-$rows = $slave_dbh->selectall_arrayref("SELECT * FROM $log_table");
+# Should log to replica
+$rows = $replica_dbh->selectall_arrayref("SELECT * FROM $log_table");
 ok(
    scalar @$rows,
-   "--log-dsn --daemonize, slave (bug 1209436)"
+   "--log-dsn --daemonize, replica (bug 1209436)"
 ) or diag(Dumper($rows));
 
 # #############################################################################
@@ -305,16 +306,16 @@ ok(
 # https://bugs.launchpad.net/percona-toolkit/+bug/1209436
 # #############################################################################
 
-$master_dbh->do("TRUNCATE $log_table");
-$sb->wait_for_slaves();
+$source_dbh->do("TRUNCATE $log_table");
+$sb->wait_for_replicas();
 
 my $cnf_file = "/tmp/pt-kill-test.cnf.$PID";
 diag(`rm -f $pid_file $log_file $cnf_file >/dev/null 2>&1`);
 
 open my $fh, '>', $cnf_file or die "Error opening $cnf_file: $OS_ERROR";
 print { $fh } <<EOF;
-defaults-file=$master_cnf
-log-dsn=$slave_dsn,$log_dsn
+defaults-file=$source_cnf
+log-dsn=$replica_dsn,$log_dsn
 daemonize
 run-time=1
 kill-query
@@ -331,18 +332,18 @@ PerconaTest::wait_for_files($pid_file);         # start
 # ...                                           # run
 PerconaTest::wait_until(sub { !-f $pid_file});  # stop
 
-# Should *not* log to master
-$rows = $master_dbh->selectall_arrayref("SELECT * FROM $log_table");
+# Should *not* log to source
+$rows = $source_dbh->selectall_arrayref("SELECT * FROM $log_table");
 ok(
    !@$rows,
-   "--log-dsn in --config file, master (bug 1209436)",
+   "--log-dsn in --config file, source (bug 1209436)",
 ) or diag(Dumper($rows));
 
-# Should log to slave
-$rows = $slave_dbh->selectall_arrayref("SELECT * FROM $log_table");
+# Should log to replica
+$rows = $replica_dbh->selectall_arrayref("SELECT * FROM $log_table");
 ok(
    scalar @$rows,
-   "--log-dsn in --config file, slave (bug 1209436)"
+   "--log-dsn in --config file, replica (bug 1209436)"
 ) or diag(Dumper($rows));
 
 diag(`rm -f $pid_file $log_file $cnf_file >/dev/null 2>&1`);
@@ -351,7 +352,7 @@ diag(`rm -f $pid_file $log_file $cnf_file >/dev/null 2>&1`);
 # Done.
 # #############################################################################
 eval { $target_dbh->disconnect() };
-$sb->wipe_clean($master_dbh);
-$sb->wipe_clean($slave_dbh);
+$sb->wipe_clean($source_dbh);
+$sb->wipe_clean($replica_dbh);
 ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox");
 done_testing;
diff --git a/t/pt-kill/match.t b/t/pt-kill/match.t
index c1fdf8265..37a0a9ac2 100644
--- a/t/pt-kill/match.t
+++ b/t/pt-kill/match.t
@@ -14,9 +14,11 @@ use Test::More tests => 17;
 use PerconaTest;
 use Sandbox;
 require "$trunk/bin/pt-kill";
+require VersionParser;
+
 my $dp = new DSNParser(opts=>$dsn_opts);
 my $sb = new Sandbox(basedir => '/tmp', DSNParser => $dp);
-my $slave_dbh = $sb->get_dbh_for('slave1');
+my $replica_dbh = $sb->get_dbh_for('replica1');
 
 my @args = qw(--test-matching);
 my $output;
@@ -161,11 +163,11 @@ like(
 # Live tests.
 # #############################################################################
 SKIP: {
-   skip "Cannot connect to sandbox slave", 1 unless $slave_dbh;
+   skip "Cannot connect to sandbox replica", 1 unless $replica_dbh;
    
-   my $pl        = $slave_dbh->selectall_arrayref('show processlist');
+   my $pl        = $replica_dbh->selectall_arrayref('show processlist');
    my @repl_thds = map { $_->[0] } grep { $_->[1] eq 'system user' } @$pl;
-   skip "Sandbox slave has no replication threads", unless scalar @repl_thds;
+   skip "Sandbox replica has no replication threads", unless scalar @repl_thds;
 
    my $repl_thd_ids = join("|", @repl_thds);
 
@@ -187,7 +189,7 @@ SKIP: {
       "--replication-threads allows matching replication thread"
    );
 
-   $slave_dbh->disconnect();
+   $replica_dbh->disconnect();
 };
 
 # #############################################################################
diff --git a/t/pt-kill/pt-2284.t b/t/pt-kill/pt-2284.t
index d15a314a9..21e9802ab 100644
--- a/t/pt-kill/pt-2284.t
+++ b/t/pt-kill/pt-2284.t
@@ -14,17 +14,18 @@ use Test::More tests => 6;
 use PerconaTest;
 use Sandbox;
 require "$trunk/bin/pt-kill";
+require VersionParser;
 
 my $dp = new DSNParser(opts=>$dsn_opts);
 my $sb = new Sandbox(basedir => '/tmp', DSNParser => $dp);
-my $master_dbh = $sb->get_dbh_for('master');
+my $source_dbh = $sb->get_dbh_for('source');
 
 my $output;
 my $cnf='/tmp/12345/my.sandbox.cnf';
 my $cmd = "$trunk/bin/pt-kill -F $cnf -h 127.1";
 
-if ( !$master_dbh ) {
-   plan skip_all => 'Cannot connect to sandbox master';
+if ( !$source_dbh ) {
+   plan skip_all => 'Cannot connect to sandbox source';
 }
 
 `$cmd --print --interval 1s --run-time 20 --pid /tmp/pt-kill.pid --log /tmp/pt-kill.log --daemonize --busy-time 5  --kill-query --victims all --charset utf8mb4`;
@@ -40,7 +41,7 @@ ok(
    'Log file created'
 );
 
-$master_dbh->do("select '柏木', sleep(20);");
+$source_dbh->do("select '柏木', sleep(20);");
 
 wait_until(sub { return !-f '/tmp/pt-kill.pid' });
 ok(
@@ -67,6 +68,6 @@ diag(`rm -rf /tmp/pt-kill.log 2>/dev/null`);
 # #############################################################################
 # Done.
 # #############################################################################
-$sb->wipe_clean($master_dbh) if $master_dbh;
+$sb->wipe_clean($source_dbh) if $source_dbh;
 ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox");
 exit;
diff --git a/t/pt-kill/pt_167.t b/t/pt-kill/pt_167.t
index 147ee106f..68f0f6d9b 100644
--- a/t/pt-kill/pt_167.t
+++ b/t/pt-kill/pt_167.t
@@ -16,6 +16,7 @@ use threads;
 use PerconaTest;
 use Sandbox;
 require "$trunk/bin/pt-kill";
+require VersionParser;
 
 use Data::Dumper;
 $Data::Dumper::Indent    = 1;
@@ -31,10 +32,10 @@ $o->get_opts();
 
 my $dp  = new DSNParser(opts=>$dsn_opts);
 my $sb  = new Sandbox(basedir => '/tmp', DSNParser => $dp);
-my $dbh = $sb->get_dbh_for('master');
+my $dbh = $sb->get_dbh_for('source');
 
 if ( !$dbh ) {
-   plan skip_all => 'Cannot connect to sandbox master';
+   plan skip_all => 'Cannot connect to sandbox source';
 }
 
 sub start_thread {
@@ -71,7 +72,7 @@ ok(
    "Got proc id of sleeping query: $pid"
 );
 
-$dsn = $sb->dsn_for('master');
+$dsn = $sb->dsn_for('source');
 my $output = output(
    sub { pt_kill::main($dsn, "--kill-busy-commands","Query,Execute", qw(--run-time 3s --kill --busy-time 2s --print --match-info), "^(select|SELECT)"), },
    stderr => 1,
diff --git a/t/pt-kill/standard_options.t b/t/pt-kill/standard_options.t
index 1899352ab..a6c8d38d8 100644
--- a/t/pt-kill/standard_options.t
+++ b/t/pt-kill/standard_options.t
@@ -14,10 +14,11 @@ use Test::More tests => 6;
 use PerconaTest;
 use Sandbox;
 require "$trunk/bin/pt-kill";
+require VersionParser;
 
 my $dp = new DSNParser(opts=>$dsn_opts);
 my $sb = new Sandbox(basedir => '/tmp', DSNParser => $dp);
-my $master_dbh = $sb->get_dbh_for('master');
+my $source_dbh = $sb->get_dbh_for('source');
 
 my $output;
 my $cnf='/tmp/12345/my.sandbox.cnf';
@@ -28,7 +29,7 @@ my $cmd = "$trunk/bin/pt-kill -F $cnf -h 127.1";
 # #########################################################################
 
 SKIP: {
-   skip 'Cannot connect to sandbox master', 4 unless $master_dbh;
+   skip 'Cannot connect to sandbox source', 4 unless $source_dbh;
 
    # There's no hung queries so we'll just make sure it outputs anything,
    # its debug stuff in this case.
@@ -72,6 +73,6 @@ diag(`rm -rf /tmp/pt-script.pid 2>/dev/null`);
 # #############################################################################
 # Done.
 # #############################################################################
-$sb->wipe_clean($master_dbh) if $master_dbh;
+$sb->wipe_clean($source_dbh) if $source_dbh;
 ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox");
 exit;
diff --git a/t/pt-mysql-summary/pt-2102.t b/t/pt-mysql-summary/pt-2102.t
index 79748864a..cda7bf84f 100644
--- a/t/pt-mysql-summary/pt-2102.t
+++ b/t/pt-mysql-summary/pt-2102.t
@@ -20,10 +20,10 @@ local $ENV{PTDEBUG} = "";
 
 my $dp         = new DSNParser(opts=>$dsn_opts);
 my $sb         = new Sandbox(basedir => '/tmp', DSNParser => $dp);
-my $master_dbh = $sb->get_dbh_for('master');
+my $source_dbh = $sb->get_dbh_for('source');
 
-if ( !$master_dbh ) {
-   plan skip_all => 'Cannot connect to sandbox master';
+if ( !$source_dbh ) {
+   plan skip_all => 'Cannot connect to sandbox source';
 }
 else {
    plan tests => 3;
@@ -72,6 +72,6 @@ diag(`cp $cnf.bak $cnf`);
 # #############################################################################
 # Done.
 # #############################################################################
-$sb->wipe_clean($master_dbh);
+$sb->wipe_clean($source_dbh);
 ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox");
 exit;
diff --git a/t/pt-mysql-summary/pt-2109.t b/t/pt-mysql-summary/pt-2109.t
index b2ebea4f8..194a683c7 100644
--- a/t/pt-mysql-summary/pt-2109.t
+++ b/t/pt-mysql-summary/pt-2109.t
@@ -19,11 +19,11 @@ local $ENV{PTDEBUG} = "";
 
 my $dp  = new DSNParser(opts=>$dsn_opts);
 my $sb  = new Sandbox(basedir => '/tmp', DSNParser => $dp);
-my $dbh = $sb->get_dbh_for('master');
+my $dbh = $sb->get_dbh_for('source');
 my $has_keyring_plugin;
 
 if ( !$dbh ) {
-   plan skip_all => 'Cannot connect to sandbox master';
+   plan skip_all => 'Cannot connect to sandbox source';
 }
 else {
    plan tests => 3;
diff --git a/t/pt-mysql-summary/pt-2327.t b/t/pt-mysql-summary/pt-2327.t
index 69c68021f..b0603714b 100644
--- a/t/pt-mysql-summary/pt-2327.t
+++ b/t/pt-mysql-summary/pt-2327.t
@@ -19,19 +19,19 @@ local $ENV{PTDEBUG} = "";
 
 my $dp  = new DSNParser(opts=>$dsn_opts);
 my $sb  = new Sandbox(basedir => '/tmp', DSNParser => $dp);
-my $dbh = $sb->get_dbh_for('master');
+my $dbh = $sb->get_dbh_for('source');
 my $cnf = '/tmp/12345/my.sandbox.cnf';
 my $output;
 
 if ( !$dbh ) {
-   plan skip_all => 'Cannot connect to sandbox master';
+   plan skip_all => 'Cannot connect to sandbox source';
 }
 else {
    plan tests => 5;
 }
 
-$sb->do_as_root("master", q/create user pt2302 identified by "root_'f<=*password"/);
-$sb->do_as_root("master", q/grant all on *.* to pt2302/);
+$sb->do_as_root("source", q/create user pt2302 identified by "root_'f<=*password"/);
+$sb->do_as_root("source", q/grant all on *.* to pt2302/);
 
 my $cmd = "$trunk/bin/pt-mysql-summary --sleep 1 -- --defaults-file=$cnf --user=pt2302 --password=\"root_'f<=*password\"";
 
@@ -49,9 +49,9 @@ unlike(
    "pt-mysql-summary works fine with password containing an apostrophe"
 );
 
-$sb->do_as_root("master", q/drop user pt2302/);
-$sb->do_as_root("master", q/create user pt2302 identified by 'root_"f<=*password'/);
-$sb->do_as_root("master", q/grant all on *.* to pt2302/);
+$sb->do_as_root("source", q/drop user pt2302/);
+$sb->do_as_root("source", q/create user pt2302 identified by 'root_"f<=*password'/);
+$sb->do_as_root("source", q/grant all on *.* to pt2302/);
 
 $cmd = "$trunk/bin/pt-mysql-summary --sleep 1 -- --defaults-file=$cnf --user=pt2302 --password='root_\"f<=*password'";
 
@@ -71,7 +71,7 @@ unlike(
 # #############################################################################
 # Done.
 # #############################################################################
-$sb->do_as_root("master", q/drop user pt2302/);
+$sb->do_as_root("source", q/drop user pt2302/);
 $sb->wipe_clean($dbh);
 ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox");
 exit;
diff --git a/t/pt-mysql-summary/pt-76.t b/t/pt-mysql-summary/pt-76.t
index 99732f6e4..df661e0bb 100644
--- a/t/pt-mysql-summary/pt-76.t
+++ b/t/pt-mysql-summary/pt-76.t
@@ -20,7 +20,7 @@ local $ENV{PTDEBUG} = "";
 
 my $dp  = new DSNParser(opts=>$dsn_opts);
 my $sb  = new Sandbox(basedir => '/tmp', DSNParser => $dp);
-my $dbh = $sb->get_dbh_for('master');
+my $dbh = $sb->get_dbh_for('source');
 
 if ( !$dbh ) {
    plan skip_all => 'Cannot connect to sandbox';
diff --git a/t/pt-mysql-summary/pt-mysql-summary.t b/t/pt-mysql-summary/pt-mysql-summary.t
index 6cae9e8c2..a3d1ff5df 100644
--- a/t/pt-mysql-summary/pt-mysql-summary.t
+++ b/t/pt-mysql-summary/pt-mysql-summary.t
@@ -20,12 +20,12 @@ local $ENV{PTDEBUG} = "";
 
 my $dp         = new DSNParser(opts=>$dsn_opts);
 my $sb         = new Sandbox(basedir => '/tmp', DSNParser => $dp);
-my $master_dbh = $sb->get_dbh_for('master');
+my $source_dbh = $sb->get_dbh_for('source');
 my $has_keyring_plugin;
 
-my $db_flavor = VersionParser->new($master_dbh)->flavor();
+my $db_flavor = VersionParser->new($source_dbh)->flavor();
 if ( $db_flavor =~ m/Percona Server/ ) {
-    my $rows = $master_dbh->selectall_hashref("SHOW PLUGINS", "name");
+    my $rows = $source_dbh->selectall_hashref("SHOW PLUGINS", "name");
     while (my ($key, $values) = each %$rows) {
         if ($key =~ m/^keyring_/) {
             $has_keyring_plugin=1;
@@ -62,10 +62,14 @@ ok(
 
 # If the box has a default my.cnf (e.g. /etc/my.cnf) there
 # should be 15 files, else 14.
+# Latest version creates 18 for PS/MySQL 8.0+
+# If run as regular user and there is default MySQL server, running as mysql user
+# there would be file collect.err, containing "Permission denied" error.
+# This error should be ignored.
 my @files = glob("$dir/*");
 my $n_files = scalar @files;
 ok(
-   $n_files >= 15 && $n_files <= 18,
+   $n_files >= 15 && $n_files <= 19,
    "And leaves all files in there"
 ) or diag($n_files, `ls -l $dir`);
 
diff --git a/t/pt-mysql-summary/pt-mysql-summary_encryption.t b/t/pt-mysql-summary/pt-mysql-summary_encryption.t
index 61f1446fd..de1293dc6 100644
--- a/t/pt-mysql-summary/pt-mysql-summary_encryption.t
+++ b/t/pt-mysql-summary/pt-mysql-summary_encryption.t
@@ -20,12 +20,12 @@ local $ENV{PTDEBUG} = "";
 
 my $dp         = new DSNParser(opts=>$dsn_opts);
 my $sb         = new Sandbox(basedir => '/tmp', DSNParser => $dp);
-my $master_dbh = $sb->get_dbh_for('master');
+my $source_dbh = $sb->get_dbh_for('source');
 my $has_keyring_plugin;
 
-my $db_flavor = VersionParser->new($master_dbh)->flavor();
+my $db_flavor = VersionParser->new($source_dbh)->flavor();
 if ( $db_flavor =~ m/Percona Server/ ) {
-    my $rows = $master_dbh->selectall_hashref("SHOW PLUGINS", "name");
+    my $rows = $source_dbh->selectall_hashref("SHOW PLUGINS", "name");
     while (my ($key, $values) = each %$rows) {
         if ($key =~ m/^keyring_/) {
             $has_keyring_plugin=1;
@@ -101,8 +101,8 @@ like(
 # SQL Mode ANSI_QUOTES
 #
 
-my ($orig_sql_mode) = $master_dbh->selectrow_array(q{SELECT @@SQL_MODE});
-$master_dbh->do("SET GLOBAL SQL_MODE='ANSI_QUOTES'");
+my ($orig_sql_mode) = $source_dbh->selectrow_array(q{SELECT @@SQL_MODE});
+$source_dbh->do("SET GLOBAL SQL_MODE='ANSI_QUOTES'");
 
 $out = `$env $trunk/bin/$tool --sleep 1 --databases mysql 2>/dev/null -- --defaults-file=/tmp/12345/my.sandbox.cnf`;
 
@@ -124,7 +124,7 @@ like(
    "Security works with SQL Mode ANSI_QUOTES"
 );
 
-$master_dbh->do("SET GLOBAL SQL_MODE='${orig_sql_mode}'");
+$source_dbh->do("SET GLOBAL SQL_MODE='${orig_sql_mode}'");
 
 # --read-samples
 for my $i (2..9) {
@@ -151,12 +151,12 @@ is(
    "--help works under sh and bash"
 );
 
-$master_dbh->do("DROP DATABASE IF EXISTS test");
-$master_dbh->do("CREATE DATABASE test");
-$master_dbh->do("CREATE TABLE test.t1(a INT PRIMARY KEY) ENCRYPTION='Y'");
-$master_dbh->do("CREATE TABLESPACE foo ADD DATAFILE 'foo.ibd' ENCRYPTION='Y'");
-$master_dbh->do("ALTER TABLE test.t1 TABLESPACE=foo");
-$master_dbh->do("CREATE TABLE test.t2(a INT PRIMARY KEY) ENCRYPTION='Y'");
+$source_dbh->do("DROP DATABASE IF EXISTS test");
+$source_dbh->do("CREATE DATABASE test");
+$source_dbh->do("CREATE TABLE test.t1(a INT PRIMARY KEY) ENCRYPTION='Y'");
+$source_dbh->do("CREATE TABLESPACE foo ADD DATAFILE 'foo.ibd' ENCRYPTION='Y'");
+$source_dbh->do("ALTER TABLE test.t1 TABLESPACE=foo");
+$source_dbh->do("CREATE TABLE test.t2(a INT PRIMARY KEY) ENCRYPTION='Y'");
 
 $out = `bash $trunk/bin/$tool --list-encrypted-tables -- --defaults-file=/tmp/12345/my.sandbox.cnf`;
 
@@ -184,9 +184,9 @@ like(
    "Encrypted tablespaces included in report"
 ) or diag $out;
 
-$master_dbh->do("DROP TABLE IF EXISTS test.t1");
-$master_dbh->do("DROP TABLE IF EXISTS test.t2");
-$master_dbh->do("DROP DATABASE IF EXISTS test");
-$master_dbh->do("DROP TABLESPACE foo");
+$source_dbh->do("DROP TABLE IF EXISTS test.t1");
+$source_dbh->do("DROP TABLE IF EXISTS test.t2");
+$source_dbh->do("DROP DATABASE IF EXISTS test");
+$source_dbh->do("DROP TABLESPACE foo");
 
 done_testing;

From 76c1202cb5589709b29f3a67dbc655f07b7670fb Mon Sep 17 00:00:00 2001
From: Sveta Smirnova <sveta.smirnova@percona.com>
Date: Mon, 29 Jul 2024 18:47:13 +0300
Subject: [PATCH 07/31] PT-2340 - Support MySQL 8.4

- Updated modules and tests for pt-online-schema-change
- Removed typo from lib/MasterSlave.pm
---
 bin/pt-online-schema-change                   | 731 ++++++++++--------
 lib/MasterSlave.pm                            |   4 +-
 lib/PerconaTest.pm                            |   3 +
 .../PT-1905_reverse_pt_osc_triggers.t         |  26 +-
 .../alter_active_table.t                      |  58 +-
 t/pt-online-schema-change/ansi_quotes.t       |  18 +-
 t/pt-online-schema-change/basics.t            | 106 +--
 t/pt-online-schema-change/bugs.t              | 172 ++---
 t/pt-online-schema-change/case-insensitive.t  |  22 +-
 t/pt-online-schema-change/charset.t           |  20 +-
 t/pt-online-schema-change/check_alter.t       |  20 +-
 t/pt-online-schema-change/cleanup.t           |  12 +-
 t/pt-online-schema-change/issue-1638293.t     |  32 +-
 t/pt-online-schema-change/issue-1646713.t     |  34 +-
 .../long_fk_constraints.t                     |  29 +-
 t/pt-online-schema-change/metadata_locks.t    |  14 +-
 t/pt-online-schema-change/no_drop_no_swap.t   |  16 +-
 t/pt-online-schema-change/plugin.t            |  12 +-
 t/pt-online-schema-change/plugin_before_die.t |  18 +-
 t/pt-online-schema-change/preserve_triggers.t |  88 +--
 t/pt-online-schema-change/privs.t             |  46 +-
 t/pt-online-schema-change/pt-1455.t           |  69 +-
 t/pt-online-schema-change/pt-1528.t           |   6 +-
 t/pt-online-schema-change/pt-153.t            |  18 +-
 t/pt-online-schema-change/pt-1574.t           |   6 +-
 t/pt-online-schema-change/pt-169.t            |  20 +-
 t/pt-online-schema-change/pt-1717-history.t   |  16 +-
 t/pt-online-schema-change/pt-1717-resume.t    | 100 +--
 t/pt-online-schema-change/pt-1751.t           |  34 +-
 t/pt-online-schema-change/pt-1760.t           |  57 +-
 t/pt-online-schema-change/pt-1853.t           |  12 +-
 t/pt-online-schema-change/pt-186.t            |  22 +-
 t/pt-online-schema-change/pt-1914.t           |  52 +-
 t/pt-online-schema-change/pt-1919.t           |  56 +-
 t/pt-online-schema-change/pt-196.t            |  16 +-
 t/pt-online-schema-change/pt-200.t            |  16 +-
 t/pt-online-schema-change/pt-202.t            |  16 +-
 t/pt-online-schema-change/pt-2048.t           |  18 +-
 t/pt-online-schema-change/pt-205.t            |  18 +-
 t/pt-online-schema-change/pt-207.t            |  18 +-
 t/pt-online-schema-change/pt-209.t            |  18 +-
 t/pt-online-schema-change/pt-2119.t           |  20 +-
 t/pt-online-schema-change/pt-2168-cancel.t    | 114 +--
 t/pt-online-schema-change/pt-2168.t           | 156 ++--
 t/pt-online-schema-change/pt-2231.t           |  26 +-
 t/pt-online-schema-change/pt-2241.t           |  72 +-
 t/pt-online-schema-change/pt-2258.t           |  14 +-
 t/pt-online-schema-change/pt-2268.t           |  14 +-
 t/pt-online-schema-change/pt-229.t            |  22 +-
 t/pt-online-schema-change/pt-244.t            |  26 +-
 t/pt-online-schema-change/pt_1757.t           |  24 +-
 t/pt-online-schema-change/pxc.t               |  40 +-
 t/pt-online-schema-change/rename_columns.t    |  54 +-
 .../rename_fk_constraints.t                   |  36 +-
 .../rename_self_ref_fk_constraints.t          |  24 +-
 .../rename_self_ref_fk_constraints_pt_1802.t  |  24 +-
 .../samples/create_dsns.sql                   |   4 +-
 .../samples/plugins/all_hooks.pm              |   7 +
 .../samples/pt-1455_replica.sql               |   6 +
 .../samples/pt-1455_reset_replica.sql         |   6 +
 ...{pt-1455_master.sql => pt-1455_source.sql} |   0
 .../{slave_lag.sql => replica_lag.sql}        |   0
 .../samples/stats-execute-8.4.txt             |  30 +
 t/pt-online-schema-change/sanity_checks.t     |  32 +-
 t/pt-online-schema-change/skip_innodb.t       |  12 +-
 t/pt-online-schema-change/slave_lag.t         | 144 ++--
 t/pt-table-checksum/pt-1616.t                 |   6 +-
 t/pt-table-checksum/replication_filters.t     |   6 +-
 t/pt-table-checksum/throttle.t                |   6 +-
 69 files changed, 1610 insertions(+), 1384 deletions(-)
 create mode 100644 t/pt-online-schema-change/samples/pt-1455_replica.sql
 create mode 100644 t/pt-online-schema-change/samples/pt-1455_reset_replica.sql
 rename t/pt-online-schema-change/samples/{pt-1455_master.sql => pt-1455_source.sql} (100%)
 rename t/pt-online-schema-change/samples/{slave_lag.sql => replica_lag.sql} (100%)
 create mode 100644 t/pt-online-schema-change/samples/stats-execute-8.4.txt

diff --git a/bin/pt-online-schema-change b/bin/pt-online-schema-change
index d7d118d95..54d7632b6 100755
--- a/bin/pt-online-schema-change
+++ b/bin/pt-online-schema-change
@@ -2287,7 +2287,7 @@ sub get_cxn_params {
       $dsn = 'DBI:mysql:' . ( $info->{D} || '' ) . ';'
          . join(';', map  { "$opts{$_}->{dsn}=$info->{$_}" }
                      grep { defined $info->{$_} }
-                     qw(F h P S A))
+                     qw(F h P S A s))
          . ';mysql_read_default_group=client'
          . ($info->{L} ? ';mysql_local_infile=1' : '');
    }
@@ -4247,7 +4247,7 @@ sub new {
    return bless $self, $class;
 }
 
-sub get_slaves {
+sub get_replicas {
    my ($self, %args) = @_;
    my @required_args = qw(make_cxn);
    foreach my $arg ( @required_args ) {
@@ -4255,11 +4255,11 @@ sub get_slaves {
    }
    my ($make_cxn) = @args{@required_args};
 
-   my $slaves  = [];
+   my $replicas  = [];
    my $dp      = $self->{DSNParser};
    my $methods = $self->_resolve_recursion_methods($args{dsn});
 
-   return $slaves unless @$methods;
+   return $replicas unless @$methods;
 
    if ( grep { m/processlist|hosts/i } @$methods ) {
       my @required_args = qw(dbh dsn);
@@ -4269,26 +4269,26 @@ sub get_slaves {
       my ($dbh, $dsn) = @args{@required_args};
       my $o = $self->{OptionParser};
 
-      $self->recurse_to_slaves(
-         {  dbh            => $dbh,
-            dsn            => $dsn,
-            slave_user     => $o->got('slave-user') ? $o->get('slave-user') : '',
-            slave_password => $o->got('slave-password') ? $o->get('slave-password') : '',
-            slaves         => $args{slaves},
+      $self->recurse_to_replicas(
+         {  dbh              => $dbh,
+            dsn              => $dsn,
+            replica_user     => $o->got('replica-user') ? $o->get('replica-user') : '',
+            replica_password => $o->got('replica-password') ? $o->get('replica-password') : '',
+            replicas         => $args{replicas},
             callback  => sub {
                my ( $dsn, $dbh, $level, $parent ) = @_;
                return unless $level;
-               PTDEBUG && _d('Found slave:', $dp->as_string($dsn));
-               my $slave_dsn = $dsn;
-               if ($o->got('slave-user')) {
-                  $slave_dsn->{u} = $o->get('slave-user');
-                  PTDEBUG && _d("Using slave user ".$o->get('slave-user')." on ".$slave_dsn->{h}.":".$slave_dsn->{P});
+               PTDEBUG && _d('Found replica:', $dp->as_string($dsn));
+               my $replica_dsn = $dsn;
+               if ($o->got('replica-user')) {
+                  $replica_dsn->{u} = $o->get('replica-user');
+                  PTDEBUG && _d("Using replica user ".$o->get('replica-user')." on ".$replica_dsn->{h}.":".$replica_dsn->{P});
                }
-               if ($o->got('slave-password')) {
-                  $slave_dsn->{p} = $o->get('slave-password');
-                  PTDEBUG && _d("Slave password set");
+               if ($o->got('replica-password')) {
+                  $replica_dsn->{p} = $o->get('replica-password');
+                  PTDEBUG && _d("Replica password set");
                }
-               push @$slaves, $make_cxn->(dsn => $slave_dsn, dbh => $dbh, parent => $parent);
+               push @$replicas, $make_cxn->(dsn => $replica_dsn, dbh => $dbh, parent => $parent);
                return;
             },
             wait_no_die => $args{'wait_no_die'},
@@ -4296,20 +4296,20 @@ sub get_slaves {
       );
    } elsif ( $methods->[0] =~ m/^dsn=/i ) {
       (my $dsn_table_dsn = join ",", @$methods) =~ s/^dsn=//i;
-      $slaves = $self->get_cxn_from_dsn_table(
+      $replicas = $self->get_cxn_from_dsn_table(
          %args,
          dsn_table_dsn => $dsn_table_dsn,
          wait_no_die => $args{'wait_no_die'},
       );
    }
    elsif ( $methods->[0] =~ m/none/i ) {
-      PTDEBUG && _d('Not getting to slaves');
+      PTDEBUG && _d('Not getting to replicas');
    }
    else {
       die "Unexpected recursion methods: @$methods";
    }
 
-   return $slaves;
+   return $replicas;
 }
 
 sub _resolve_recursion_methods {
@@ -4327,31 +4327,31 @@ sub _resolve_recursion_methods {
    }
 }
 
-sub recurse_to_slaves {
+sub recurse_to_replicas {
    my ( $self, $args, $level ) = @_;
    $level ||= 0;
    my $dp = $self->{DSNParser};
    my $recurse = $args->{recurse} || $self->{OptionParser}->get('recurse');
    my $dsn = $args->{dsn};
-   my $slave_user = $args->{slave_user} || '';
-   my $slave_password = $args->{slave_password} || '';
+   my $replica_user = $args->{replica_user} || '';
+   my $replica_password = $args->{replica_password} || '';
 
    my $methods = $self->_resolve_recursion_methods($dsn);
    PTDEBUG && _d('Recursion methods:', @$methods);
    if ( lc($methods->[0]) eq 'none' ) {
-      PTDEBUG && _d('Not recursing to slaves');
+      PTDEBUG && _d('Not recursing to replicas');
       return;
    }
 
-   my $slave_dsn = $dsn;
-   if ($slave_user) {
-      $slave_dsn->{u} = $slave_user;
-      PTDEBUG && _d("Using slave user $slave_user on "
-         . $slave_dsn->{h} . ":" . ( $slave_dsn->{P} ? $slave_dsn->{P} : ""));
+   my $replica_dsn = $dsn;
+   if ($replica_user) {
+      $replica_dsn->{u} = $replica_user;
+      PTDEBUG && _d("Using replica user $replica_user on "
+         . $replica_dsn->{h} . ":" . ( $replica_dsn->{P} ? $replica_dsn->{P} : ""));
    }
-   if ($slave_password) {
-      $slave_dsn->{p} = $slave_password;
-      PTDEBUG && _d("Slave password set");
+   if ($replica_password) {
+      $replica_dsn->{p} = $replica_password;
+      PTDEBUG && _d("Replica password set");
    }
 
    my $dbh = $args->{dbh};
@@ -4359,12 +4359,12 @@ sub recurse_to_slaves {
    my $get_dbh = sub {
          eval {
             $dbh = $dp->get_dbh(
-               $dp->get_cxn_params($slave_dsn), { AutoCommit => 1 }
+               $dp->get_cxn_params($replica_dsn), { AutoCommit => 1 }
             );
-            PTDEBUG && _d('Connected to', $dp->as_string($slave_dsn));
+            PTDEBUG && _d('Connected to', $dp->as_string($replica_dsn));
          };
          if ( $EVAL_ERROR ) {
-            print STDERR "Cannot connect to ", $dp->as_string($slave_dsn), ": ", $EVAL_ERROR, "\n"
+            print STDERR "Cannot connect to ", $dp->as_string($replica_dsn), ": ", $EVAL_ERROR, "\n"
                or die "Cannot print: $OS_ERROR";
             return;
          }
@@ -4372,10 +4372,10 @@ sub recurse_to_slaves {
 
    DBH: {
       if ( !defined $dbh ) {
-         foreach my $known_slave ( @{$args->{slaves}} ) {
-            if ($known_slave->{dsn}->{h} eq $slave_dsn->{h} and
-                $known_slave->{dsn}->{P} eq $slave_dsn->{P} ) {
-               $dbh = $known_slave->{dbh};
+         foreach my $known_replica ( @{$args->{replicas}} ) {
+            if ($known_replica->{dsn}->{h} eq $replica_dsn->{h} and
+                $known_replica->{dsn}->{P} eq $replica_dsn->{P} ) {
+               $dbh = $known_replica->{dbh};
                last DBH;
             }
          }
@@ -4393,7 +4393,7 @@ sub recurse_to_slaves {
 	   if ( $EVAL_ERROR ) {
 		   if ( $args->{wait_no_die} ) {
 			   print STDERR "Error getting server id: ", $EVAL_ERROR,
-               "\nRetrying query for server ", $slave_dsn->{h}, ":", $slave_dsn->{P}, "\n";
+               "\nRetrying query for server ", $replica_dsn->{h}, ":", $replica_dsn->{P}, "\n";
             sleep 1;
             $dbh->disconnect();
             $get_dbh->();
@@ -4403,12 +4403,12 @@ sub recurse_to_slaves {
       }
    } until (defined $id);
    PTDEBUG && _d('Working on server ID', $id);
-   my $master_thinks_i_am = $dsn->{server_id};
+   my $source_thinks_i_am = $dsn->{server_id};
    if ( !defined $id
-       || ( defined $master_thinks_i_am && $master_thinks_i_am != $id )
+       || ( defined $source_thinks_i_am && $source_thinks_i_am != $id )
        || $args->{server_ids_seen}->{$id}++
    ) {
-      PTDEBUG && _d('Server ID seen, or not what master said');
+      PTDEBUG && _d('Server ID seen, or not what source said');
       if ( $args->{skip_callback} ) {
          $args->{skip_callback}->($dsn, $dbh, $level, $args->{parent});
       }
@@ -4419,51 +4419,51 @@ sub recurse_to_slaves {
 
    if ( !defined $recurse || $level < $recurse ) {
 
-      my @slaves =
-         grep { !$_->{master_id} || $_->{master_id} == $id } # Only my slaves.
-         $self->find_slave_hosts($dp, $dbh, $dsn, $methods);
+      my @replicas =
+         grep { !$_->{source_id} || $_->{source_id} == $id } # Only my replicas.
+         $self->find_replica_hosts($dp, $dbh, $dsn, $methods);
 
-      foreach my $slave ( @slaves ) {
+      foreach my $replica ( @replicas ) {
          PTDEBUG && _d('Recursing from',
-            $dp->as_string($dsn), 'to', $dp->as_string($slave));
-         $self->recurse_to_slaves(
-            { %$args, dsn => $slave, dbh => undef, parent => $dsn, slave_user => $slave_user, $slave_password => $slave_password }, $level + 1 );
+            $dp->as_string($dsn), 'to', $dp->as_string($replica));
+         $self->recurse_to_replicas(
+            { %$args, dsn => $replica, dbh => undef, parent => $dsn, replica_user => $replica_user, $replica_password => $replica_password }, $level + 1 );
       }
    }
 }
 
-sub find_slave_hosts {
+sub find_replica_hosts {
    my ( $self, $dsn_parser, $dbh, $dsn, $methods ) = @_;
 
-   PTDEBUG && _d('Looking for slaves on', $dsn_parser->as_string($dsn),
+   PTDEBUG && _d('Looking for replicas on', $dsn_parser->as_string($dsn),
       'using methods', @$methods);
 
-   my @slaves;
+   my @replicas;
    METHOD:
    foreach my $method ( @$methods ) {
-      my $find_slaves = "_find_slaves_by_$method";
-      PTDEBUG && _d('Finding slaves with', $find_slaves);
-      @slaves = $self->$find_slaves($dsn_parser, $dbh, $dsn);
-      last METHOD if @slaves;
+      my $find_replicas = "_find_replicas_by_$method";
+      PTDEBUG && _d('Finding replicas with', $find_replicas);
+      @replicas = $self->$find_replicas($dsn_parser, $dbh, $dsn);
+      last METHOD if @replicas;
    }
 
-   PTDEBUG && _d('Found', scalar(@slaves), 'slaves');
-   return @slaves;
+   PTDEBUG && _d('Found', scalar(@replicas), 'replicas');
+   return @replicas;
 }
 
-sub _find_slaves_by_processlist {
+sub _find_replicas_by_processlist {
    my ( $self, $dsn_parser, $dbh, $dsn ) = @_;
-   my @connected_slaves = $self->get_connected_slaves($dbh);
-   my @slaves = $self->_process_slaves_list($dsn_parser, $dsn, \@connected_slaves);
-   return @slaves;
+   my @connected_replicas = $self->get_connected_replicas($dbh);
+   my @replicas = $self->_process_replicas_list($dsn_parser, $dsn, \@connected_replicas);
+   return @replicas;
 }
 
-sub _process_slaves_list {
-   my ($self, $dsn_parser, $dsn, $connected_slaves) = @_;
-   my @slaves = map  {
-      my $slave        = $dsn_parser->parse("h=$_", $dsn);
-      $slave->{source} = 'processlist';
-      $slave;
+sub _process_replicas_list {
+   my ($self, $dsn_parser, $dsn, $connected_replicas) = @_;
+   my @replicas = map  {
+      my $replica        = $dsn_parser->parse("h=$_", $dsn);
+      $replica->{source} = 'processlist';
+      $replica;
    }
    grep { $_ }
    map  {
@@ -4475,22 +4475,28 @@ sub _process_slaves_list {
           $host = '['.$host.']';
       }
       $host;
-   } @$connected_slaves;
+   } @$connected_replicas;
 
-   return @slaves;
+   return @replicas;
 }
 
-sub _find_slaves_by_hosts {
+sub _find_replicas_by_hosts {
    my ( $self, $dsn_parser, $dbh, $dsn ) = @_;
 
-   my @slaves;
-   my $sql = 'SHOW SLAVE HOSTS';
+   my @replicas;
+
+   my $vp = VersionParser->new($dbh);
+   my $sql = 'SHOW REPLICAS';
+   if ( $vp < '8.1' || $vp->flavor() =~ m/maria/ ) {
+      $sql = 'SHOW SLAVE HOSTS';
+   }
+   
    PTDEBUG && _d($dbh, $sql);
-   @slaves = @{$dbh->selectall_arrayref($sql, { Slice => {} })};
+   @replicas = @{$dbh->selectall_arrayref($sql, { Slice => {} })};
 
-   if ( @slaves ) {
-      PTDEBUG && _d('Found some SHOW SLAVE HOSTS info');
-      @slaves = map {
+   if ( @replicas ) {
+      PTDEBUG && _d('Found some SHOW REPLICAS info');
+      @replicas = map {
          my %hash;
          @hash{ map { lc $_ } keys %$_ } = values %$_;
          my $spec = "h=$hash{host},P=$hash{port}"
@@ -4498,16 +4504,16 @@ sub _find_slaves_by_hosts {
             . ( $hash{password} ? ",p=$hash{password}" : '');
          my $dsn           = $dsn_parser->parse($spec, $dsn);
          $dsn->{server_id} = $hash{server_id};
-         $dsn->{master_id} = $hash{master_id};
+         $dsn->{source_id} = $hash{source_id};
          $dsn->{source}    = 'hosts';
          $dsn;
-      } @slaves;
+      } @replicas;
    }
 
-   return @slaves;
+   return @replicas;
 }
 
-sub get_connected_slaves {
+sub get_connected_replicas {
    my ( $self, $dbh ) = @_;
 
    my $show = "SHOW GRANTS FOR ";
@@ -4553,79 +4559,103 @@ sub get_connected_slaves {
    @{$dbh->selectall_arrayref($sql, { Slice => {} })};
 }
 
-sub is_master_of {
-   my ( $self, $master, $slave ) = @_;
-   my $master_status = $self->get_master_status($master)
-      or die "The server specified as a master is not a master";
-   my $slave_status  = $self->get_slave_status($slave)
-      or die "The server specified as a slave is not a slave";
-   my @connected     = $self->get_connected_slaves($master)
-      or die "The server specified as a master has no connected slaves";
-   my (undef, $port) = $master->selectrow_array("SHOW VARIABLES LIKE 'port'");
+sub is_source_of {
+   my ( $self, $source, $replica ) = @_;
+
+   my $replica_version = VersionParser->new($replica);
+   my $source_name = 'source';
+   my $source_port = 'source_port';
+   if ( $replica_version < '8.1' || $replica_version->flavor() =~ m/maria/ ) {
+      $source_name = 'master';
+      $source_port = 'master_port';
+   }
+
+   my $source_status = $self->get_source_status($source)
+      or die "The server specified as a source is not a source";
+   my $replica_status  = $self->get_replica_status($replica)
+      or die "The server specified as a replica is not a replica";
+   my @connected     = $self->get_connected_replicas($source)
+      or die "The server specified as a source has no connected replicas";
+   my (undef, $port) = $source->selectrow_array("SHOW VARIABLES LIKE 'port'");
 
-   if ( $port != $slave_status->{master_port} ) {
-      die "The slave is connected to $slave_status->{master_port} "
-         . "but the master's port is $port";
+   if ( $port != $replica_status->{$source_port} ) {
+      die "The replica is connected to $replica_status->{$source_port} "
+         . "but the source's port is $port";
    }
 
-   if ( !grep { $slave_status->{master_user} eq $_->{user} } @connected ) {
-      die "I don't see any slave I/O thread connected with user "
-         . $slave_status->{master_user};
+   if ( !grep { $replica_status->{source_user} eq $_->{user} } @connected ) {
+      die "I don't see any replica I/O thread connected with user "
+         . $replica_status->{source_user};
    }
 
-   if ( ($slave_status->{slave_io_state} || '')
-      eq 'Waiting for master to send event' )
+   if ( ($replica_status->{replica_io_state} || '')
+      eq 'Waiting for ${source_name} to send event' )
    {
-      my ( $master_log_name, $master_log_num )
-         = $master_status->{file} =~ m/^(.*?)\.0*([1-9][0-9]*)$/;
-      my ( $slave_log_name, $slave_log_num )
-         = $slave_status->{master_log_file} =~ m/^(.*?)\.0*([1-9][0-9]*)$/;
-      if ( $master_log_name ne $slave_log_name
-         || abs($master_log_num - $slave_log_num) > 1 )
+      my ( $source_log_name, $source_log_num )
+         = $source_status->{file} =~ m/^(.*?)\.0*([1-9][0-9]*)$/;
+      my ( $replica_log_name, $replica_log_num )
+         = $replica_status->{source_log_file} =~ m/^(.*?)\.0*([1-9][0-9]*)$/;
+      if ( $source_log_name ne $replica_log_name
+         || abs($source_log_num - $replica_log_num) > 1 )
       {
-         die "The slave thinks it is reading from "
-            . "$slave_status->{master_log_file},  but the "
-            . "master is writing to $master_status->{file}";
+         die "The replica thinks it is reading from "
+            . "$replica_status->{source_log_file},  but the "
+            . "source is writing to $source_status->{file}";
       }
    }
    return 1;
 }
 
-sub get_master_dsn {
+sub get_source_dsn {
    my ( $self, $dbh, $dsn, $dsn_parser ) = @_;
-   my $master = $self->get_slave_status($dbh) or return undef;
-   my $spec   = "h=$master->{master_host},P=$master->{master_port}";
+
+   my $vp = VersionParser->new($dbh);
+   my $source_host = 'source_host';
+   my $source_port = 'source_port';
+   if ( $vp < '8.1' || $vp->flavor() =~ m/maria/ ) {
+      $source_host = 'master_host';
+      $source_port = 'master_port';
+   }
+
+   my $source = $self->get_replica_status($dbh) or return undef;
+   my $spec   = "h=$source->{${source_host}},P=$source->{${source_port}}";
    return       $dsn_parser->parse($spec, $dsn);
 }
 
-sub get_slave_status {
+sub get_replica_status {
    my ( $self, $dbh ) = @_;
 
-   if ( !$self->{not_a_slave}->{$dbh} ) {
-      my $sth = $self->{sths}->{$dbh}->{SLAVE_STATUS}
-            ||= $dbh->prepare('SHOW SLAVE STATUS');
-      PTDEBUG && _d($dbh, 'SHOW SLAVE STATUS');
+   my $server_version = VersionParser->new($dbh);
+   my $replica_name = 'replica';
+   if ( $server_version < '8.1' || $server_version->flavor() =~ m/maria/ ) {
+      $replica_name = 'slave';
+   }
+
+   if ( !$self->{not_a_replica}->{$dbh} ) {
+      my $sth = $self->{sths}->{$dbh}->{REPLICA_STATUS}
+            ||= $dbh->prepare("SHOW ${replica_name} STATUS");
+      PTDEBUG && _d($dbh, "SHOW ${replica_name} STATUS");
       $sth->execute();
-      my ($sss_rows) = $sth->fetchall_arrayref({}); # Show Slave Status rows
+      my ($sss_rows) = $sth->fetchall_arrayref({}); # Show Replica Status rows
 
       my $ss;
       if ( $sss_rows && @$sss_rows ) {
           if (scalar @$sss_rows > 1) {
               if (!$self->{channel}) {
-                  die 'This server returned more than one row for SHOW SLAVE STATUS but "channel" was not specified on the command line';
+                  die 'This server returned more than one row for SHOW REPLICA STATUS but "channel" was not specified on the command line';
               }
-              my $slave_use_channels;
+              my $replica_use_channels;
               for my $row (@$sss_rows) {
                   $row = { map { lc($_) => $row->{$_} } keys %$row }; # lowercase the keys
                   if ($row->{channel_name}) {
-                      $slave_use_channels = 1;
+                      $replica_use_channels = 1;
                   }
                   if ($row->{channel_name} eq $self->{channel}) {
                       $ss = $row;
                       last;
                   }
               }
-              if (!$ss && $slave_use_channels) {
+              if (!$ss && $replica_use_channels) {
                  die 'This server is using replication channels but "channel" was not specified on the command line';
               }
           } else {
@@ -4645,28 +4675,34 @@ sub get_slave_status {
           }
       }
 
-      PTDEBUG && _d('This server returns nothing for SHOW SLAVE STATUS');
-      $self->{not_a_slave}->{$dbh}++;
+      PTDEBUG && _d('This server returns nothing for SHOW REPLICA STATUS');
+      $self->{not_a_replica}->{$dbh}++;
   }
 }
 
-sub get_master_status {
+sub get_source_status {
    my ( $self, $dbh ) = @_;
 
-   if ( $self->{not_a_master}->{$dbh} ) {
-      PTDEBUG && _d('Server on dbh', $dbh, 'is not a master');
+   if ( $self->{not_a_source}->{$dbh} ) {
+      PTDEBUG && _d('Server on dbh', $dbh, 'is not a source');
       return;
    }
 
+   my $vp = VersionParser->new($dbh);
+   my $source_name = 'binary log';
+   if ( $vp < '8.1' || $vp->flavor() =~ m/maria/ ) {
+      $source_name = 'master';
+   }
+
    my $sth;
    if ( $self->{sths}->{$dbh} && $dbh && $self->{sths}->{$dbh} == $dbh ) {
-      $sth = $self->{sths}->{$dbh}->{MASTER_STATUS}
-         ||= $dbh->prepare('SHOW MASTER STATUS');
+      $sth = $self->{sths}->{$dbh}->{SOURCE_STATUS}
+         ||= $dbh->prepare("SHOW ${source_name} STATUS");
    }
    else {
-      $sth = $dbh->prepare('SHOW MASTER STATUS');
+      $sth = $dbh->prepare("SHOW ${source_name} STATUS");
    }
-   PTDEBUG && _d($dbh, 'SHOW MASTER STATUS');
+   PTDEBUG && _d($dbh, "SHOW ${source_name} STATUS");
    $sth->execute();
    my ($ms) = @{$sth->fetchall_arrayref({})};
    PTDEBUG && _d(
@@ -4674,42 +4710,46 @@ sub get_master_status {
           : '');
 
    if ( !$ms || scalar keys %$ms < 2 ) {
-      PTDEBUG && _d('Server on dbh', $dbh, 'does not seem to be a master');
-      $self->{not_a_master}->{$dbh}++;
+      PTDEBUG && _d('Server on dbh', $dbh, 'does not seem to be a source');
+      $self->{not_a_source}->{$dbh}++;
    }
 
   return { map { lc($_) => $ms->{$_} } keys %$ms }; # lowercase the keys
 }
 
-sub wait_for_master {
+sub wait_for_source {
    my ( $self, %args ) = @_;
-   my @required_args = qw(master_status slave_dbh);
+   my @required_args = qw(source_status replica_dbh);
    foreach my $arg ( @required_args ) {
       die "I need a $arg argument" unless $args{$arg};
    }
-   my ($master_status, $slave_dbh) = @args{@required_args};
+   my ($source_status, $replica_dbh) = @args{@required_args};
    my $timeout       = $args{timeout} || 60;
 
    my $result;
    my $waited;
-   if ( $master_status ) {
-      my $slave_status;
+   if ( $source_status ) {
+      my $replica_status;
       eval {
-          $slave_status = $self->get_slave_status($slave_dbh);
+          $replica_status = $self->get_replica_status($replica_dbh);
       };
       if ($EVAL_ERROR) {
           return {
               result => undef,
               waited => 0,
-              error  =>'Wait for master: this is a multi-master slave but "channel" was not specified on the command line',
+              error  =>'Wait for source: this is a multi-source replica but "channel" was not specified on the command line',
           };
       }
-      my $server_version = VersionParser->new($slave_dbh);
-      my $channel_sql = $server_version > '5.6' && $self->{channel} ? ", '$self->{channel}'" : '';
-      my $sql = "SELECT MASTER_POS_WAIT('$master_status->{file}', $master_status->{position}, $timeout $channel_sql)";
-      PTDEBUG && _d($slave_dbh, $sql);
+      my $vp = VersionParser->new($replica_dbh);
+      my $source_name = 'source';
+      if ( $vp < '8.1' || $vp->flavor() =~ m/maria/ ) {
+         $source_name = 'master';
+      }
+      my $channel_sql = $vp > '5.6' && $self->{channel} ? ", '$self->{channel}'" : '';
+      my $sql = "SELECT ${source_name}_POS_WAIT('$source_status->{file}', $source_status->{position}, $timeout $channel_sql)";
+      PTDEBUG && _d($replica_dbh, $sql);
       my $start = time;
-      ($result) = $slave_dbh->selectrow_array($sql);
+      ($result) = $replica_dbh->selectrow_array($sql);
 
       $waited = time - $start;
 
@@ -4717,7 +4757,7 @@ sub wait_for_master {
       PTDEBUG && _d("Waited", $waited, "seconds");
    }
    else {
-      PTDEBUG && _d('Not waiting: this server is not a master');
+      PTDEBUG && _d('Not waiting: this server is not a source');
    }
 
    return {
@@ -4726,75 +4766,96 @@ sub wait_for_master {
    };
 }
 
-sub stop_slave {
+sub stop_replica {
    my ( $self, $dbh ) = @_;
-   my $sth = $self->{sths}->{$dbh}->{STOP_SLAVE}
-         ||= $dbh->prepare('STOP SLAVE');
+   my $vp = VersionParser->new($dbh);
+   my $replica_name = 'replica';
+   if ( $vp < '8.1' || $vp->flavor() =~ m/maria/ ) {
+      $replica_name = 'slave';
+   }
+   my $sth = $self->{sths}->{$dbh}->{STOP_REPLICA}
+         ||= $dbh->prepare("STOP ${replica_name}");
    PTDEBUG && _d($dbh, $sth->{Statement});
    $sth->execute();
 }
 
-sub start_slave {
+sub start_replica {
    my ( $self, $dbh, $pos ) = @_;
+
+   my $vp = VersionParser->new($dbh);
+   my $source_name = 'source';
+   my $replica_name = 'replica';
+   if ( $vp < '8.1' || $vp->flavor() =~ m/maria/ ) {
+      $source_name = 'master';
+      $replica_name = 'slave';
+   }
+
    if ( $pos ) {
-      my $sql = "START SLAVE UNTIL MASTER_LOG_FILE='$pos->{file}', "
-              . "MASTER_LOG_POS=$pos->{position}";
+      my $sql = "START ${replica_name} UNTIL ${source_name}_LOG_FILE='$pos->{file}', "
+              . "${source_name}_LOG_POS=$pos->{position}";
       PTDEBUG && _d($dbh, $sql);
       $dbh->do($sql);
    }
    else {
-      my $sth = $self->{sths}->{$dbh}->{START_SLAVE}
-            ||= $dbh->prepare('START SLAVE');
+      my $sth = $self->{sths}->{$dbh}->{START_REPLICA}
+            ||= $dbh->prepare("START ${replica_name}");
       PTDEBUG && _d($dbh, $sth->{Statement});
       $sth->execute();
    }
 }
 
-sub catchup_to_master {
-   my ( $self, $slave, $master, $timeout ) = @_;
-   $self->stop_slave($master);
-   $self->stop_slave($slave);
-   my $slave_status  = $self->get_slave_status($slave);
-   my $slave_pos     = $self->repl_posn($slave_status);
-   my $master_status = $self->get_master_status($master);
-   my $master_pos    = $self->repl_posn($master_status);
-   PTDEBUG && _d('Master position:', $self->pos_to_string($master_pos),
-      'Slave position:', $self->pos_to_string($slave_pos));
+sub catchup_to_source {
+   my ( $self, $replica, $source, $timeout ) = @_;
+   $self->stop_replica($source);
+   $self->stop_replica($replica);
+   my $replica_status  = $self->get_replica_status($replica);
+   my $replica_pos     = $self->repl_posn($replica_status);
+   my $source_status = $self->get_source_status($source);
+   my $source_pos    = $self->repl_posn($source_status);
+   PTDEBUG && _d('Source position:', $self->pos_to_string($source_pos),
+      'Replica position:', $self->pos_to_string($replica_pos));
 
    my $result;
-   if ( $self->pos_cmp($slave_pos, $master_pos) < 0 ) {
-      PTDEBUG && _d('Waiting for slave to catch up to master');
-      $self->start_slave($slave, $master_pos);
+   if ( $self->pos_cmp($replica_pos, $source_pos) < 0 ) {
+      PTDEBUG && _d('Waiting for replica to catch up to source');
+      $self->start_replica($replica, $source_pos);
 
-      $result = $self->wait_for_master(
-            master_status => $master_status,
-            slave_dbh     => $slave,
+      $result = $self->wait_for_source(
+            source_status => $source_status,
+            replica_dbh   => $replica,
             timeout       => $timeout,
-            master_status => $master_status
+            source_status => $source_status
       );
       if ($result->{error}) {
           die $result->{error};
       }
       if ( !defined $result->{result} ) {
-         $slave_status = $self->get_slave_status($slave);
-         if ( !$self->slave_is_running($slave_status) ) {
-            PTDEBUG && _d('Master position:',
-               $self->pos_to_string($master_pos),
-               'Slave position:', $self->pos_to_string($slave_pos));
-            $slave_pos = $self->repl_posn($slave_status);
-            if ( $self->pos_cmp($slave_pos, $master_pos) != 0 ) {
-               die "MASTER_POS_WAIT() returned NULL but slave has not "
-                  . "caught up to master";
+         $replica_status = $self->get_replica_status($replica);
+            
+         my $vp = VersionParser->new($replica);
+         my $replica_name = 'replica';
+         if ( $vp < '8.1' || $vp->flavor() =~ m/maria/ ) {
+            $replica_name = 'slave';
+         }
+
+         if ( !$self->replica_is_running($replica_status, $replica_name) ) {
+            PTDEBUG && _d('Source position:',
+               $self->pos_to_string($source_pos),
+               'Replica position:', $self->pos_to_string($replica_pos));
+            $replica_pos = $self->repl_posn($replica_status);
+            if ( $self->pos_cmp($replica_pos, $source_pos) != 0 ) {
+               die "SOURCE_POS_WAIT() returned NULL but replica has not "
+                  . "caught up to source";
             }
-            PTDEBUG && _d('Slave is caught up to master and stopped');
+            PTDEBUG && _d('Replica is caught up to source and stopped');
          }
          else {
-            die "Slave has not caught up to master and it is still running";
+            die "Replica has not caught up to source and it is still running";
          }
       }
    }
    else {
-      PTDEBUG && _d("Slave is already caught up to master");
+      PTDEBUG && _d("Replica is already caught up to source");
    }
 
    return $result;
@@ -4802,26 +4863,38 @@ sub catchup_to_master {
 
 sub catchup_to_same_pos {
    my ( $self, $s1_dbh, $s2_dbh ) = @_;
-   $self->stop_slave($s1_dbh);
-   $self->stop_slave($s2_dbh);
-   my $s1_status = $self->get_slave_status($s1_dbh);
-   my $s2_status = $self->get_slave_status($s2_dbh);
+   $self->stop_replica($s1_dbh);
+   $self->stop_replica($s2_dbh);
+   my $s1_status = $self->get_replica_status($s1_dbh);
+   my $s2_status = $self->get_replica_status($s2_dbh);
    my $s1_pos    = $self->repl_posn($s1_status);
    my $s2_pos    = $self->repl_posn($s2_status);
    if ( $self->pos_cmp($s1_pos, $s2_pos) < 0 ) {
-      $self->start_slave($s1_dbh, $s2_pos);
+      $self->start_replica($s1_dbh, $s2_pos);
    }
    elsif ( $self->pos_cmp($s2_pos, $s1_pos) < 0 ) {
-      $self->start_slave($s2_dbh, $s1_pos);
+      $self->start_replica($s2_dbh, $s1_pos);
    }
 
-   $s1_status = $self->get_slave_status($s1_dbh);
-   $s2_status = $self->get_slave_status($s2_dbh);
+   $s1_status = $self->get_replica_status($s1_dbh);
+   $s2_status = $self->get_replica_status($s2_dbh);
    $s1_pos    = $self->repl_posn($s1_status);
    $s2_pos    = $self->repl_posn($s2_status);
 
-   if ( $self->slave_is_running($s1_status)
-     || $self->slave_is_running($s2_status)
+   my $vp1 = VersionParser->new($s1_dbh);
+   my $replica1_name = 'replica';
+   if ( $vp1 < '8.1' || $vp1->flavor() =~ m/maria/ ) {
+      $replica1_name = 'slave';
+   }
+
+   my $vp2 = VersionParser->new($s2_dbh);
+   my $replica2_name = 'replica';
+   if ( $vp2 < '8.1' || $vp2->flavor() =~ m/maria/ ) {
+      $replica2_name = 'slave';
+   }
+
+   if ( $self->replica_is_running($s1_status, $replica1_name)
+     || $self->replica_is_running($s2_status, $replica2_name)
      || $self->pos_cmp($s1_pos, $s2_pos) != 0)
    {
       die "The servers aren't both stopped at the same position";
@@ -4829,14 +4902,21 @@ sub catchup_to_same_pos {
 
 }
 
-sub slave_is_running {
-   my ( $self, $slave_status ) = @_;
-   return ($slave_status->{slave_sql_running} || 'No') eq 'Yes';
+sub replica_is_running {
+   my ( $self, $replica_status, $replica_name ) = @_;
+   return ($replica_status->{"${replica_name}_sql_running"} || 'No') eq 'Yes';
 }
 
-sub has_slave_updates {
+sub has_replica_updates {
    my ( $self, $dbh ) = @_;
-   my $sql = q{SHOW VARIABLES LIKE 'log_slave_updates'};
+   
+   my $vp = VersionParser->new($dbh);
+   my $replica_name = 'replica';
+   if ( $vp < '8.1' || $vp->flavor() =~ m/maria/ ) {
+      $replica_name = 'slave';
+   }
+
+   my $sql = qq{SHOW VARIABLES LIKE 'log_${replica_name}_updates'};
    PTDEBUG && _d($dbh, $sql);
    my ($name, $value) = $dbh->selectrow_array($sql);
    return $value && $value =~ m/^(1|ON)$/;
@@ -4850,6 +4930,12 @@ sub repl_posn {
          position => $status->{position},
       };
    }
+   elsif ( exists $status->{relay_source_log_file} && exists $status->{exec_source_log_pos} ) {
+      return {
+         file     => $status->{relay_source_log_file},
+         position => $status->{exec_source_log_pos},
+      };
+   }
    else {
       return {
          file     => $status->{relay_master_log_file},
@@ -4858,11 +4944,18 @@ sub repl_posn {
    }
 }
 
-sub get_slave_lag {
+sub get_replica_lag {
    my ( $self, $dbh ) = @_;
-   my $stat = $self->get_slave_status($dbh);
-   return unless $stat;  # server is not a slave
-   return $stat->{seconds_behind_master};
+   
+   my $vp = VersionParser->new($dbh);
+   my $source_name = 'source';
+   if ( $vp < '8.1' || $vp->flavor() =~ m/maria/ ) {
+      $source_name = 'master';
+   }
+
+   my $stat = $self->get_replica_status($dbh);
+   return unless $stat;  # server is not a replica
+   return $stat->{"seconds_behind_${source_name}"};
 }
 
 sub pos_cmp {
@@ -4873,9 +4966,9 @@ sub pos_cmp {
 sub short_host {
    my ( $self, $dsn ) = @_;
    my ($host, $port);
-   if ( $dsn->{master_host} ) {
-      $host = $dsn->{master_host};
-      $port = $dsn->{master_port};
+   if ( $dsn->{source_host} ) {
+      $host = $dsn->{source_host};
+      $port = $dsn->{source_port};
    }
    else {
       $host = $dsn->{h};
@@ -4890,7 +4983,7 @@ sub is_replication_thread {
 
    my $type = lc($args{type} || 'all');
    die "Invalid type: $type"
-      unless $type =~ m/^binlog_dump|slave_io|slave_sql|all$/i;
+      unless $type =~ m/^binlog_dump|slave_io|slave_sql|replica_io|replica_sql|all$/i;
 
    my $match = 0;
    if ( $type =~ m/binlog_dump|all/i ) {
@@ -4899,7 +4992,7 @@ sub is_replication_thread {
    }
    if ( !$match ) {
       if ( ($query->{User} || $query->{user} || '') eq "system user" ) {
-         PTDEBUG && _d("Slave replication thread");
+         PTDEBUG && _d("Replica replication thread");
          if ( $type ne 'all' ) {
             my $state = $query->{State} || $query->{state} || '';
 
@@ -4908,15 +5001,16 @@ sub is_replication_thread {
                $match = 1;
             }
             else {
-               my ($slave_sql) = $state =~ m/
+               my ($replica_sql) = $state =~ m/
                   ^(Waiting\sfor\sthe\snext\sevent
                    |Reading\sevent\sfrom\sthe\srelay\slog
                    |Has\sread\sall\srelay\slog;\swaiting
                    |Making\stemp\sfile
-                   |Waiting\sfor\sslave\smutex\son\sexit)/xi;
+                   |Waiting\sfor\sslave\smutex\son\sexit
+                   |Waiting\sfor\sreplica\smutex\son\sexit)/xi;
 
-               $match = $type eq 'slave_sql' &&  $slave_sql ? 1
-                      : $type eq 'slave_io'  && !$slave_sql ? 1
+               $match = $type eq 'replica_sql' &&  $replica_sql ? 1
+                      : $type eq 'replica_io'  && !$replica_sql ? 1
                       :                                       0;
             }
          }
@@ -4957,9 +5051,15 @@ sub get_replication_filters {
    }
    my ($dbh) = @args{@required_args};
 
+   my $vp = VersionParser->new($dbh);
+   my $replica_name = 'replica';
+   if ( $vp < '8.1' || $vp->flavor() =~ m/maria/ ) {
+      $replica_name = 'slave';
+   }
+
    my %filters = ();
 
-   my $status = $self->get_master_status($dbh);
+   my $status = $self->get_source_status($dbh);
    if ( $status ) {
       map { $filters{$_} = $status->{$_} }
       grep { defined $status->{$_} && $status->{$_} ne '' }
@@ -4969,7 +5069,7 @@ sub get_replication_filters {
       );
    }
 
-   $status = $self->get_slave_status($dbh);
+   $status = $self->get_replica_status($dbh);
    if ( $status ) {
       map { $filters{$_} = $status->{$_} }
       grep { defined $status->{$_} && $status->{$_} ne '' }
@@ -4982,10 +5082,10 @@ sub get_replication_filters {
          replicate_wild_ignore_table
       );
 
-      my $sql = "SHOW VARIABLES LIKE 'slave_skip_errors'";
+      my $sql = "SHOW VARIABLES LIKE '${replica_name}_skip_errors'";
       PTDEBUG && _d($dbh, $sql);
       my $row = $dbh->selectrow_arrayref($sql);
-      $filters{slave_skip_errors} = $row->[1] if $row->[1] && $row->[1] ne 'OFF';
+      $filters{replica_skip_errors} = $row->[1] if $row->[1] && $row->[1] ne 'OFF';
    }
 
    return \%filters;
@@ -5100,7 +5200,7 @@ use Data::Dumper;
 
 sub new {
    my ( $class, %args ) = @_;
-   my @required_args = qw(oktorun get_lag sleep max_lag slaves);
+   my @required_args = qw(oktorun get_lag sleep max_lag replicas);
    foreach my $arg ( @required_args ) {
       die "I need a $arg argument" unless defined $args{$arg};
    }
@@ -5120,32 +5220,32 @@ sub wait {
    }
    my $pr = $args{Progress};
 
-   my $oktorun = $self->{oktorun};
-   my $get_lag = $self->{get_lag};
-   my $sleep   = $self->{sleep};
-   my $slaves  = $self->{slaves};
-   my $max_lag = $self->{max_lag};
+   my $oktorun  = $self->{oktorun};
+   my $get_lag  = $self->{get_lag};
+   my $sleep    = $self->{sleep};
+   my $replicas = $self->{replicas}; 
+   my $max_lag  = $self->{max_lag};
 
-   my $worst;  # most lagging slave
+   my $worst;  # most lagging replica
    my $pr_callback;
    my $pr_first_report;
 
-   my $pr_refresh_slave_list = sub {
+   my $pr_refresh_replica_list = sub {
       my ($self) = @_;
-      my ($slaves, $refresher) = ($self->{slaves}, $self->{get_slaves_cb});
-      return $slaves if ( not defined $refresher );
-      my $before = join ' ', sort map {$_->description()} @$slaves;
-      $slaves = $refresher->();
-      my $after = join ' ', sort map {$_->description()} @$slaves;
+      my ($replicas, $refresher) = ($self->{replicas}, $self->{get_replicas_cb});
+      return $replicas if ( not defined $refresher );
+      my $before = join ' ', sort map {$_->description()} @$replicas;
+      $replicas = $refresher->();
+      my $after = join ' ', sort map {$_->description()} @$replicas;
       if ($before ne $after) {
-         $self->{slaves} = $slaves;
-         printf STDERR "Slave set to watch has changed\n  Was: %s\n  Now: %s\n",
+         $self->{replicas} = $replicas;
+         printf STDERR "Replica set to watch has changed\n  Was: %s\n  Now: %s\n",
             $before, $after;
       }
-      return($self->{slaves});
+      return($self->{replicas});
    };
 
-   $slaves = $pr_refresh_slave_list->($self);
+   $replicas = $pr_refresh_replica_list->($self);
 
    if ( $pr ) {
       $pr_callback = sub {
@@ -5178,44 +5278,44 @@ sub wait {
       };
    }
 
-   my @lagged_slaves = map { {cxn=>$_, lag=>undef} } @$slaves;
-   while ( $oktorun->() && @lagged_slaves ) {
-      PTDEBUG && _d('Checking slave lag');
+   my @lagged_replicas = map { {cxn=>$_, lag=>undef} } @$replicas;
+   while ( $oktorun->() && @lagged_replicas ) {
+      PTDEBUG && _d('Checking replica lag');
 
-      $slaves = $pr_refresh_slave_list->($self);
+      $replicas = $pr_refresh_replica_list->($self);
       my $watched = 0;
-      @lagged_slaves = grep {
-         my $slave_name = $_->{cxn}->name();
-         grep {$slave_name eq $_->name()} @{$slaves // []}
-                            } @lagged_slaves;
+      @lagged_replicas = grep {
+         my $replica_name = $_->{cxn}->name();
+         grep {$replica_name eq $_->name()} @{$replicas // []}
+                            } @lagged_replicas;
 
-      for my $i ( 0..$#lagged_slaves ) {
+      for my $i ( 0..$#lagged_replicas ) {
          my $lag;
          eval {
-             $lag = $get_lag->($lagged_slaves[$i]->{cxn});
+             $lag = $get_lag->($lagged_replicas[$i]->{cxn});
          };
          if ($EVAL_ERROR) {
              die $EVAL_ERROR;
          }
-         PTDEBUG && _d($lagged_slaves[$i]->{cxn}->name(),
-            'slave lag:', $lag);
+         PTDEBUG && _d($lagged_replicas[$i]->{cxn}->name(),
+            'replica lag:', $lag);
          if ( !defined $lag || $lag > $max_lag ) {
-            $lagged_slaves[$i]->{lag} = $lag;
+            $lagged_replicas[$i]->{lag} = $lag;
          }
          else {
-            delete $lagged_slaves[$i];
+            delete $lagged_replicas[$i];
          }
       }
 
-      @lagged_slaves = grep { defined $_ } @lagged_slaves;
-      if ( @lagged_slaves ) {
-         @lagged_slaves = reverse sort {
+      @lagged_replicas = grep { defined $_ } @lagged_replicas;
+      if ( @lagged_replicas ) {
+         @lagged_replicas = reverse sort {
               defined $a->{lag} && defined $b->{lag} ? $a->{lag} <=> $b->{lag}
             : defined $a->{lag}                      ? -1
             :                                           1;
-         } @lagged_slaves;
-         $worst = $lagged_slaves[0];
-         PTDEBUG && _d(scalar @lagged_slaves, 'slaves are lagging, worst:',
+         } @lagged_replicas;
+         $worst = $lagged_replicas[0];
+         PTDEBUG && _d(scalar @lagged_replicas, 'replicas are lagging, worst:',
             $worst->{lag}, 'on', Dumper($worst->{cxn}->dsn()));
 
          if ( $pr ) {
@@ -5230,7 +5330,7 @@ sub wait {
       }
    }
 
-   PTDEBUG && _d('All slaves caught up');
+   PTDEBUG && _d('All replicas caught up');
    return;
 }
 
@@ -5589,7 +5689,7 @@ sub new {
 
 sub update {
    my ($self, $n, $t) = @_;
-   PTDEBUG && _d('Master op time:', $n, 'n /', $t, 's');
+   PTDEBUG && _d('Source op time:', $n, 'n /', $t, 's');
 
    if ( $self->{avg_n} && $self->{avg_t} ) {
       $self->{avg_n}    = ($self->{avg_n} * $self->{weight}) + $n;
@@ -8450,29 +8550,29 @@ sub autodetect_nodes {
       seen_ids => $seen_ids
    );
 
-   my $new_slaves = [];
+   my $new_replicas = [];
    foreach my $node (@$new_nodes) {
-      my $node_slaves = $ms->get_slaves(
+      my $node_replicas = $ms->get_replicas(
          dbh      => $node->dbh(),
          dsn      => $node->dsn(),
          make_cxn => $make_cxn,
       );
-      push @$new_slaves, @$node_slaves;
+      push @$new_replicas, @$node_replicas;
    }
 
-   $new_slaves = $self->remove_duplicate_cxns(
-      cxns     => $new_slaves,
+   $new_replicas = $self->remove_duplicate_cxns(
+      cxns     => $new_replicas,
       seen_ids => $seen_ids
    );
 
-   my @new_slave_nodes = grep { $self->is_cluster_node($_) } @$new_slaves;
+   my @new_replica_nodes = grep { $self->is_cluster_node($_) } @$new_replicas;
 
-   my $slaves_of_slaves = $self->autodetect_nodes(
+   my $replicas_of_replicas = $self->autodetect_nodes(
          %args,
-         nodes => \@new_slave_nodes,
+         nodes => \@new_replica_nodes,
    );
 
-   my @autodetected_nodes = ( @$new_nodes, @$new_slaves, @$slaves_of_slaves );
+   my @autodetected_nodes = ( @$new_nodes, @$new_replicas, @$replicas_of_replicas );
    return \@autodetected_nodes;
 }
 
@@ -9067,14 +9167,14 @@ sub main {
          channel      => $o->get('channel'),
       );
 
-     my $slaves_to_skip = $o->get('skip-check-slave-lag');
+     my $slaves_to_skip = $o->get('skip-check-replica-lag');
 
-     my $get_slaves_cb = sub {
+     my $get_replicas_cb = sub {
          my ($intolerant) = @_;
-         my $slaves =$ms->get_slaves(
+         my $slaves =$ms->get_replicas(
                dbh      => $cxn->dbh(),
                dsn      => $cxn->dsn(),
-               slaves   => $slaves,
+               replicas => $slaves,
                make_cxn => sub {
                   return $make_cxn->(
                      @_,
@@ -9112,52 +9212,58 @@ sub main {
       };
 
       ### first ever call only: do not tolerate connection errors
-      $slaves = $get_slaves_cb->('intolerant');
+      $slaves = $get_replicas_cb->('intolerant');
+
+      my $vp = VersionParser->new($cxn->dbh());
+      my $replica_name = 'replica';
+      if ( $vp < '8.1' || $vp->flavor() =~ m/maria/ ) {
+         $replica_name = 'slave';
+      }
 
-      PTDEBUG && _d(scalar @$slaves, 'slaves found');
+      PTDEBUG && _d(scalar @$slaves, "${replica_name}s found");
       if ( scalar @$slaves ) {
-         print "Found " . scalar(@$slaves) . " slaves:\n";
+         print "Found " . scalar(@$slaves) . " ${replica_name}s:\n";
          foreach my $cxn ( @$slaves ) {
             print $cxn->description()."\n";
          }
       }
       elsif ( ($o->get('recursion-method') || '') ne 'none') {
-         print "No slaves found.  See --recursion-method if host "
-               . $cxn->name() . " has slaves.\n";
+         print "No ${replica_name}s found.  See --recursion-method if host "
+               . $cxn->name() . " has ${replica_name}s.\n";
       }
       else {
-         print "Ignoring all slaves because --recursion-method=none "
+         print "Ignoring all ${replica_name}s because --recursion-method=none "
             . "was specified\n";
       }
 
-      if ( my $dsn = $o->get('check-slave-lag') ) {
-         PTDEBUG && _d('Will use --check-slave-lag to check for slave lag');
+      if ( my $dsn = $o->get('check-replica-lag') ) {
+         PTDEBUG && _d('Will use --check-replica-lag to check for slave lag');
          my $cxn = $make_cxn->(
-            dsn_string => $o->get('check-slave-lag'),
+            dsn_string => $o->get('check-replica-lag'),
             #prev_dsn   => $cxn->dsn(),
          );
          $slave_lag_cxns = [ $cxn ];
-         $get_slaves_cb  = undef;
+         $get_replicas_cb  = undef;
       }
       else {
-         PTDEBUG && _d('Will check slave lag on all slaves');
+         PTDEBUG && _d('Will check ${replica_name} lag on all slaves');
          $slave_lag_cxns = $slaves;
       }
 
       if ( $slave_lag_cxns && scalar @$slave_lag_cxns ) {
-         print "Will check slave lag on:\n";
+         print "Will check ${replica_name} lag on:\n";
          foreach my $cxn ( @$slave_lag_cxns ) {
             print $cxn->description()."\n";
          }
       }
       else {
-         print "Not checking slave lag because no slaves were found "
-               . "and --check-slave-lag was not specified.\n";
+         print "Not checking ${replica_name} lag because no ${replica_name}s were found "
+               . "and --check-replica-lag was not specified.\n";
       }
       # Before starting, check the replication is not using replications channels or that --channel was specified
       for my $slave (@$slave_lag_cxns) {
           eval {
-             my $ss = $ms->get_slave_status($slave->{dbh});
+             my $ss = $ms->get_replica_status($slave->{dbh});
           };
           if ($EVAL_ERROR) {
               die $EVAL_ERROR;
@@ -9223,7 +9329,10 @@ sub main {
       # The plugin is able to override the slavelag check so tools like
       # pt-heartbeat or other replicators (Tungsten...) can be used to
       # measure replication lag
-      if ( $plugin && $plugin->can('get_slave_lag') ) {
+      if ( $plugin && $plugin->can('get_replica_lag') ) {
+         $get_lag = $plugin->get_replica_lag(oktorun => \$oktorun);
+      }
+      elsif ( $plugin && $plugin->can('get_slave_lag') ) {
          $get_lag = $plugin->get_slave_lag(oktorun => \$oktorun);
       }
       else {
@@ -9245,7 +9354,7 @@ sub main {
             }
             my $lag;
             eval {
-               $lag = $ms->get_slave_lag($dbh);
+               $lag = $ms->get_replica_lag($dbh);
             };
             if ( $EVAL_ERROR ) {
                PTDEBUG && _d('Cannot get lag for', $cxn->name(), ':', $EVAL_ERROR);
@@ -9255,12 +9364,12 @@ sub main {
       }
 
       $replica_lag = new ReplicaLagWaiter(
-         slaves        => $slave_lag_cxns,
-         get_slaves_cb => $get_slaves_cb,
-         max_lag       => $o->get('max-lag'),
-         oktorun       => sub { return $oktorun },
-         get_lag       => $get_lag,
-         sleep         => $sleep,
+         replicas        => $slave_lag_cxns,
+         get_replicas_cb => $get_replicas_cb,
+         max_lag         => $o->get('max-lag'),
+         oktorun         => sub { return $oktorun },
+         get_lag         => $get_lag,
+         sleep           => $sleep,
       );
 
       my $get_status;
@@ -12887,7 +12996,7 @@ not to modify any databases or tables that exist on the master and not the
 replicas, because it could cause replication to fail.  For more information on
 replication rules, see L<http://dev.mysql.com/doc/en/replication-rules.html>.
 
-=item --check-slave-lag
+=item --check-replica-lag
 
 type: string
 
@@ -13189,7 +13298,7 @@ data-copy query (each chunk), the tool looks at the replication lag of
 all replicas to which it connects, using Seconds_Behind_Master. If any replica
 is lagging more than the value of this option, then the tool will sleep
 for L<"--check-interval"> seconds, then check all replicas again.  If you
-specify L<"--check-slave-lag">, then the tool only examines that server for
+specify L<"--check-replica-lag">, then the tool only examines that server for
 lag, not all servers.  If you want to control exactly which servers the tool
 monitors, use the DSN value to L<"--recursion-method">.
 
@@ -13442,30 +13551,30 @@ Warning! To use this option previous, failed, run of pt-online-schema-change sho
 L<"--history">, L<"--nodrop-new-table">, and L<"--nodrop-triggers">. Otherwise,
 pt-online-schema-change would not be able to resume.
 
-=item --skip-check-slave-lag
+=item --skip-check-replica-lag
 
 type: DSN; repeatable: yes
 
-DSN to skip when checking slave lag. It can be used multiple times.
-Example: --skip-check-slave-lag h=127.0.0.1,P=12345 --skip-check-slave-lag h=127.0.0.1,P=12346
+DSN to skip when checking replica lag. It can be used multiple times.
+Example: --skip-check-replica-lag h=127.0.0.1,P=12345 --skip-check-replica-lag h=127.0.0.1,P=12346
 Please take into consideration that even when for the MySQL driver h=127.1 is equal to h=127.0.0.1,
 for this parameter you need to specify the full IP address.
 
-=item --slave-user
+=item --replica-user
 
 type: string
 
-Sets the user to be used to connect to the slaves.
+Sets the user to be used to connect to the replicas.
 This parameter allows you to have a different user with less privileges on the
-slaves but that user must exist on all slaves.
+replicas but that user must exist on all replicas.
 
-=item --slave-password
+=item --replica-password
 
 type: string
 
-Sets the password to be used to connect to the slaves.
-It can be used with --slave-user and the password for the user must be the same
-on all slaves.
+Sets the password to be used to connect to the replicas.
+It can be used with --replica-user and the password for the user must be the same
+on all replicas.
 
 =item --set-vars
 
@@ -13681,7 +13790,8 @@ These hooks, in this order, are called if defined:
    before_drop_triggers
    before_die
    before_exit
-   get_slave_lag
+   get_slave_lag (deprecated)
+   get_replica_lag
 
 Each hook is passed different arguments.  To see which arguments are passed
 to a hook, search for the hook's name in the tool's source code, like:
@@ -13806,6 +13916,13 @@ Here's a plugin file template for all hooks:
       print "PLUGIN before_exit\n";
    }
 
+   sub get_replica_lag {
+      my ($self, %args) = @_;
+      print "PLUGIN get_replica_lag\n";
+
+      return sub { return 0; };
+   }
+
    sub get_slave_lag {
       my ($self, %args) = @_;
       print "PLUGIN get_slave_lag\n";
@@ -13917,6 +14034,12 @@ dsn: user; copy: yes
 
 User for login if not current user.
 
+=item * s
+
+dsn: mysql_ssl; copy: yes
+
+Create SSL connection
+
 =back
 
 =head1 ENVIRONMENT
diff --git a/lib/MasterSlave.pm b/lib/MasterSlave.pm
index 2ac422f24..fcd725fa5 100644
--- a/lib/MasterSlave.pm
+++ b/lib/MasterSlave.pm
@@ -503,7 +503,7 @@ sub get_replica_status {
    my $server_version = VersionParser->new($dbh);
    my $replica_name = 'replica';
    if ( $server_version < '8.1' || $server_version->flavor() =~ m/maria/ ) {
-      $replica_name = 'replica';
+      $replica_name = 'slave';
    }
 
    if ( !$self->{not_a_replica}->{$dbh} ) {
@@ -678,7 +678,7 @@ sub stop_replica {
    my $vp = VersionParser->new($dbh);
    my $replica_name = 'replica';
    if ( $vp < '8.1' || $vp->flavor() =~ m/maria/ ) {
-      $replica_name = 'replica';
+      $replica_name = 'slave';
    }
    my $sth = $self->{sths}->{$dbh}->{STOP_REPLICA}
          ||= $dbh->prepare("STOP ${replica_name}");
diff --git a/lib/PerconaTest.pm b/lib/PerconaTest.pm
index ede6824e1..3591240ce 100644
--- a/lib/PerconaTest.pm
+++ b/lib/PerconaTest.pm
@@ -71,6 +71,7 @@ our @EXPORT      = qw(
    $source_name
    $source_status
    $source_reset
+   $source_change
    $replica_name
 );
 
@@ -85,11 +86,13 @@ eval {
 our $source_name = 'source';
 our $source_status = 'binary log';
 our $source_reset = 'binary logs and gtids';
+our $source_change = 'replication source';
 our $replica_name = 'replica';
 if ( $sandbox_version < '8.1' || ( $ENV{FORK} || "" eq 'mariadb' ) ) {
    $source_name = 'master';
    $source_status = 'master';
    $source_reset = 'master';
+   $source_change = 'master';
    $replica_name = 'slave';
 }
 
diff --git a/t/pt-online-schema-change/PT-1905_reverse_pt_osc_triggers.t b/t/pt-online-schema-change/PT-1905_reverse_pt_osc_triggers.t
index f47f22b17..0e820e634 100644
--- a/t/pt-online-schema-change/PT-1905_reverse_pt_osc_triggers.t
+++ b/t/pt-online-schema-change/PT-1905_reverse_pt_osc_triggers.t
@@ -28,20 +28,20 @@ require "$trunk/bin/pt-online-schema-change";
 
 my $dp = new DSNParser(opts=>$dsn_opts);
 my $sb = new Sandbox(basedir => '/tmp', DSNParser => $dp);
-my $master_dbh = $sb->get_dbh_for('master');
-my $master_dsn = 'h=127.1,P=12345,u=msandbox,p=msandbox';
+my $source_dbh = $sb->get_dbh_for('source');
+my $source_dsn = 'h=127.1,P=12345,u=msandbox,p=msandbox';
 
-if ( !$master_dbh ) {
-   plan skip_all => 'Cannot connect to sandbox master';
+if ( !$source_dbh ) {
+   plan skip_all => 'Cannot connect to sandbox source';
 }
 
-$sb->load_file('master', "t/pt-online-schema-change/samples/pt-153.sql");
+$sb->load_file('source', "t/pt-online-schema-change/samples/pt-153.sql");
 
 sub start_thread {
    my ($dsn_opts) = @_;
    my $dp = new DSNParser(opts=>$dsn_opts);
    my $sb = new Sandbox(basedir => '/tmp', DSNParser => $dp);
-   my $dbh = $sb->get_dbh_for('master');
+   my $dbh = $sb->get_dbh_for('source');
    PTDEBUG && diag("Thread started...");
 
    local $SIG{KILL} = sub { 
@@ -69,7 +69,7 @@ my $exit_status;
 sleep(1); # Let is generate some rows. 
 
 ($output, $exit_status) = full_output(
-   sub { pt_online_schema_change::main(@args, "$master_dsn,D=test,t=t1",
+   sub { pt_online_schema_change::main(@args, "$source_dsn,D=test,t=t1",
          '--execute', 
          '--alter', "DROP COLUMN f3", 
          '--reverse-triggers', '--no-drop-old-table',
@@ -81,7 +81,7 @@ is(
       $exit_status,
       0,
       "Exit status is 0",
-);
+) or diag($output);
 
 like(
       $output,
@@ -94,7 +94,7 @@ my $triggers_sql = "SELECT TRIGGER_SCHEMA, TRIGGER_NAME, DEFINER, EVENT_OBJECT_S
                  . "  FROM INFORMATION_SCHEMA.TRIGGERS "
                  . " WHERE TRIGGER_SCHEMA = 'test' ORDER BY TRIGGER_NAME";
 
-my $rows = $master_dbh->selectall_arrayref($triggers_sql, {Slice =>{}});
+my $rows = $source_dbh->selectall_arrayref($triggers_sql, {Slice =>{}});
 
 is_deeply (
     want_triggers(), 
@@ -106,8 +106,8 @@ is_deeply (
 $thr->kill('KILL'); 
 $thr->join();
 
-my $new_count = $master_dbh->selectrow_hashref('SELECT COUNT(*) AS cnt FROM test.t1');
-my $old_count = $master_dbh->selectrow_hashref('SELECT COUNT(*) AS cnt FROM test._t1_old');
+my $new_count = $source_dbh->selectrow_hashref('SELECT COUNT(*) AS cnt FROM test.t1');
+my $old_count = $source_dbh->selectrow_hashref('SELECT COUNT(*) AS cnt FROM test._t1_old');
 
 is (
     $old_count->{cnt},
@@ -115,12 +115,12 @@ is (
     "Rows count is correct",
 );
 
-$master_dbh->do("DROP DATABASE IF EXISTS test");
+$source_dbh->do("DROP DATABASE IF EXISTS test");
 
 # #############################################################################
 # 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;
 
diff --git a/t/pt-online-schema-change/alter_active_table.t b/t/pt-online-schema-change/alter_active_table.t
index aa7426150..f1d6d4ed1 100644
--- a/t/pt-online-schema-change/alter_active_table.t
+++ b/t/pt-online-schema-change/alter_active_table.t
@@ -24,18 +24,18 @@ $Data::Dumper::Quotekeys = 0;
 
 my $dp         = new DSNParser(opts=>$dsn_opts);
 my $sb         = new Sandbox(basedir => '/tmp', DSNParser => $dp);
-my $master_dbh = $sb->get_dbh_for('master');
-my $slave_dbh  = $sb->get_dbh_for('slave1');
+my $source_dbh = $sb->get_dbh_for('source');
+my $replica_dbh  = $sb->get_dbh_for('replica1');
 
-if ( !$master_dbh ) {
-   plan skip_all => 'Cannot connect to sandbox master';
+if ( !$source_dbh ) {
+   plan skip_all => 'Cannot connect to sandbox source';
 }
-elsif ( !$slave_dbh ) {
-   plan skip_all => 'Cannot connect to sandbox slave';
+elsif ( !$replica_dbh ) {
+   plan skip_all => 'Cannot connect to sandbox replica';
 }
 
 my $output;
-my $master_dsn = "h=127.1,P=12345,u=msandbox,p=msandbox";
+my $source_dsn = "h=127.1,P=12345,u=msandbox,p=msandbox";
 my $sample     = "t/pt-online-schema-change/samples";
 my $exit;
 my $rows;
@@ -100,7 +100,7 @@ sub check_ids {
    $n_deleted++ if $ids->{deleted};
    $n_inserted++ if $ids->{inserted};
 
-   $rows = $master_dbh->selectrow_arrayref(
+   $rows = $source_dbh->selectrow_arrayref(
       "SELECT COUNT($pkcol) FROM $db.$tbl");
    is(
       $rows->[0],
@@ -109,7 +109,7 @@ sub check_ids {
    ) or diag(Dumper($rows));
 
    my $where_ids = $ids->{inserted} ? $ids->{inserted} : '0';
-   $rows = $master_dbh->selectall_arrayref(
+   $rows = $source_dbh->selectall_arrayref(
       "SELECT $pkcol FROM $db.$tbl WHERE $pkcol > 500 AND $pkcol NOT IN ($where_ids)");
    is_deeply(
       $rows,
@@ -118,7 +118,7 @@ sub check_ids {
    ) or die(Dumper($rows));
 
    if ( $n_deleted ) {
-      $rows = $master_dbh->selectall_arrayref(
+      $rows = $source_dbh->selectall_arrayref(
          "SELECT $pkcol FROM $db.$tbl WHERE $pkcol IN ($ids->{deleted})");
       is_deeply(
          $rows,
@@ -136,7 +136,7 @@ sub check_ids {
    if ( $n_updated ) {
       my $sql = "SELECT $pkcol FROM $db.$tbl WHERE $pkcol IN ($ids->{updated}) "
               . "AND c NOT LIKE 'updated%'";
-      $rows = $master_dbh->selectall_arrayref($sql);
+      $rows = $source_dbh->selectall_arrayref($sql);
       is_deeply(
          $rows,
          [],
@@ -157,18 +157,18 @@ sub check_ids {
 # Attempt to alter a table while another process is changing it.
 # #############################################################################
 
-my $db_flavor = VersionParser->new($master_dbh)->flavor();
+my $db_flavor = VersionParser->new($source_dbh)->flavor();
 if ( $db_flavor =~ m/XtraDB Cluster/ ) {
-   $sb->load_file('master', "$sample/basic_no_fks_innodb.sql");
+   $sb->load_file('source', "$sample/basic_no_fks_innodb.sql");
 }
 else {
-   $sb->load_file('master', "$sample/basic_no_fks.sql");
+   $sb->load_file('source', "$sample/basic_no_fks.sql");
 }
-$master_dbh->do("USE pt_osc");
-$master_dbh->do("TRUNCATE TABLE t");
-$master_dbh->do("LOAD DATA INFILE '$trunk/t/pt-online-schema-change/samples/basic_no_fks.data' INTO TABLE t");
-$master_dbh->do("ANALYZE TABLE t");
-$sb->wait_for_slaves();
+$source_dbh->do("USE pt_osc");
+$source_dbh->do("TRUNCATE TABLE t");
+$source_dbh->do("LOAD DATA INFILE '$trunk/t/pt-online-schema-change/samples/basic_no_fks.data' INTO TABLE t");
+$source_dbh->do("ANALYZE TABLE t");
+$sb->wait_for_replicas();
 
 # Start inserting, updating, and deleting rows at random.
 start_query_table(qw(pt_osc t id));
@@ -176,7 +176,7 @@ start_query_table(qw(pt_osc t id));
 # While that's ^ happening, alter the table.
 ($output, $exit) = full_output(
    sub { pt_online_schema_change::main(
-      "$master_dsn,D=pt_osc,t=t",
+      "$source_dsn,D=pt_osc,t=t",
       qw(--set-vars innodb_lock_wait_timeout=5),
       qw(--print --execute --chunk-size 100 --alter ENGINE=InnoDB --no-check-plan)) },
    stderr => 1,
@@ -191,7 +191,7 @@ like(
    'Change engine: altered OK'
 );
 
-$rows = $master_dbh->selectall_hashref('SHOW TABLE STATUS FROM pt_osc', 'name');
+$rows = $source_dbh->selectall_hashref('SHOW TABLE STATUS FROM pt_osc', 'name');
 is(
    $rows->{t}->{engine},
    'InnoDB',
@@ -214,11 +214,11 @@ is(
 # Check that triggers work when renaming a column
 # #############################################################################
 
-$master_dbh->do("USE pt_osc");
-$master_dbh->do("TRUNCATE TABLE t");
-$master_dbh->do("LOAD DATA INFILE '$trunk/t/pt-online-schema-change/samples/basic_no_fks.data' INTO TABLE t");
-$master_dbh->do("ANALYZE TABLE t");
-$sb->wait_for_slaves();
+$source_dbh->do("USE pt_osc");
+$source_dbh->do("TRUNCATE TABLE t");
+$source_dbh->do("LOAD DATA INFILE '$trunk/t/pt-online-schema-change/samples/basic_no_fks.data' INTO TABLE t");
+$source_dbh->do("ANALYZE TABLE t");
+$sb->wait_for_replicas();
 
 # Start inserting, updating, and deleting rows at random.
 start_query_table(qw(pt_osc t id));
@@ -226,7 +226,7 @@ start_query_table(qw(pt_osc t id));
 # While that's ^ happening, alter the table.
 ($output, $exit) = full_output(
    sub { pt_online_schema_change::main(
-      "$master_dsn,D=pt_osc,t=t",
+      "$source_dsn,D=pt_osc,t=t",
       qw(--set-vars innodb_lock_wait_timeout=5),
       qw(--print --execute --chunk-size 100 --no-check-alter),
       '--alter', 'CHANGE COLUMN d q date',
@@ -249,7 +249,7 @@ is(
    "Rename columnn: exit status 0"
 );
 
-$sb->wait_for_slaves();
+$sb->wait_for_replicas();
 
 check_ids(qw(pt_osc t id), get_ids(), "Rename column");
 
@@ -259,7 +259,7 @@ check_ids(qw(pt_osc t id), get_ids(), "Rename column");
 unlink $query_table_stop or warn $OS_ERROR;
 unlink $query_table_output or warn $OS_ERROR;
 unlink $query_table_pid or warn $OS_ERROR;
-$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;
diff --git a/t/pt-online-schema-change/ansi_quotes.t b/t/pt-online-schema-change/ansi_quotes.t
index c61a5e044..dc2eb0b02 100644
--- a/t/pt-online-schema-change/ansi_quotes.t
+++ b/t/pt-online-schema-change/ansi_quotes.t
@@ -18,20 +18,20 @@ use Sandbox;
 require "$trunk/bin/pt-online-schema-change";
 
 diag(`$trunk/sandbox/stop-sandbox 12348 >/dev/null`);
-diag(`MODE_ANSI=1 $trunk/sandbox/start-sandbox master 12348 >/dev/null`);
+diag(`MODE_ANSI=1 $trunk/sandbox/start-sandbox source 12348 >/dev/null`);
 
 my $dp  = new DSNParser(opts=>$dsn_opts);
 my $sb  = new Sandbox(basedir => '/tmp', DSNParser => $dp);
-my $dbh = $sb->get_dbh_for('master1');
+my $dbh = $sb->get_dbh_for('source1');
 
 if ( !$dbh ) {
-   plan skip_all => 'Cannot connect to sandbox master 12348';
+   plan skip_all => 'Cannot connect to sandbox source 12348';
 }
 
 # 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=12348,u=msandbox,p=msandbox';
+my $source_dsn = 'h=127.1,P=12348,u=msandbox,p=msandbox';
 my @args       = (qw(--set-vars innodb_lock_wait_timeout=3));
 my $output;
 my $exit_status;
@@ -41,7 +41,7 @@ my $sample  = "t/pt-online-schema-change/samples/";
 # pt-online-schema-change doesn't work with ANSI_QUOTES + some other sql_modes
 # https://bugs.launchpad.net/percona-toolkit/+bug/1058285
 # ############################################################################
-$sb->load_file('master1', "$sample/sql-mode-bug-1058285.sql");
+$sb->load_file('source1', "$sample/sql-mode-bug-1058285.sql");
 
 my ($orig_sql_mode) = $dbh->selectrow_array(q{SELECT @@SQL_MODE});
 # check that ANSI_QUOTES and ANSI is there
@@ -54,7 +54,7 @@ SKIP: {
     skip "Skipping in MySQL 8.0.4-rc since there is an error in the server itself. See https://bugs.mysql.com/bug.php?id=89441", 9 if ($sandbox_version ge '8.0' and VersionParser->new($dbh) le'8.0.14');
     ($output, $exit_status) = full_output(
        sub { pt_online_schema_change::main(@args,
-          "$master_dsn,D=issue26211,t=process_model_inst",
+          "$source_dsn,D=issue26211,t=process_model_inst",
           "--alter", "ADD COLUMN foo int",
           qw(--dry-run --print --alter-foreign-keys-method auto)) },
     );
@@ -80,7 +80,7 @@ SKIP: {
     
     ($output, $exit_status) = full_output(
        sub { pt_online_schema_change::main(@args,
-          "$master_dsn,D=issue26211,t=process_model_inst",
+          "$source_dsn,D=issue26211,t=process_model_inst",
           "--alter", "ADD COLUMN foo int",
           qw(--execute --alter-foreign-keys-method auto)) },
     );
@@ -116,14 +116,14 @@ SKIP: {
     # pt-online-schema-change foreign key error
     # Customer issue 26211
     # ############################################################################
-    $sb->load_file('master1', "$sample/issue-26211.sql");
+    $sb->load_file('source1', "$sample/issue-26211.sql");
     
     my $retval;
     ($output, $retval) = full_output(sub { pt_online_schema_change::main(@args,
                                   '--alter-foreign-keys-method', 'auto',
                                   '--no-check-replication-filters',
                                   '--alter', "ENGINE=InnoDB",
-                                  '--execute', "$master_dsn,D=bug_26211,t=prm_inst")});
+                                  '--execute', "$source_dsn,D=bug_26211,t=prm_inst")});
     
     is(
        $retval,
diff --git a/t/pt-online-schema-change/basics.t b/t/pt-online-schema-change/basics.t
index 3370d1ce8..0b5b5ceb0 100644
--- a/t/pt-online-schema-change/basics.t
+++ b/t/pt-online-schema-change/basics.t
@@ -27,14 +27,14 @@ $Data::Dumper::Quotekeys = 0;
 
 my $dp         = new DSNParser(opts=>$dsn_opts);
 my $sb         = new Sandbox(basedir => '/tmp', DSNParser => $dp);
-my $master_dbh = $sb->get_dbh_for('master');
-my $slave_dbh  = $sb->get_dbh_for('slave1');
+my $source_dbh = $sb->get_dbh_for('source');
+my $replica_dbh  = $sb->get_dbh_for('replica1');
 
-if ( !$master_dbh ) {
-   plan skip_all => 'Cannot connect to sandbox master';
+if ( !$source_dbh ) {
+   plan skip_all => 'Cannot connect to sandbox source';
 }
-elsif ( !$slave_dbh ) {
-   plan skip_all => 'Cannot connect to sandbox slave';
+elsif ( !$replica_dbh ) {
+   plan skip_all => 'Cannot connect to sandbox replica';
 }
 
 my $q      = new Quoter();
@@ -51,7 +51,7 @@ my $rows;
 # #############################################################################
 
 
-$sb->load_file('master', "$sample/basic_no_fks_innodb.sql");
+$sb->load_file('source', "$sample/basic_no_fks_innodb.sql");
 
 ($output, $exit) = full_output(
    sub { pt_online_schema_change::main(@args, "$dsn,D=pt_osc,t=t",
@@ -64,7 +64,7 @@ like(
    "Doesn't run without --execute (bug 933232)"
 ) or diag($output);
 
-my $ddl = $master_dbh->selectrow_arrayref("show create table pt_osc.t");
+my $ddl = $source_dbh->selectrow_arrayref("show create table pt_osc.t");
 like(
    $ddl->[1],
    qr/^\s+["`]id["`]/m,
@@ -96,12 +96,12 @@ sub test_alter_table {
    my $pk_col     = $args{pk_col} || 'id';
 
    if ( my $file = $args{file} ) {
-      $sb->load_file('master', "$sample/$file");
-      $master_dbh->do("USE `$db`");
-      $slave_dbh->do("USE `$db`");
+      $sb->load_file('source', "$sample/$file");
+      $source_dbh->do("USE `$db`");
+      $replica_dbh->do("USE `$db`");
    }
 
-   my $ddl        = $tp->get_create_table($master_dbh, $db, $tbl);
+   my $ddl        = $tp->get_create_table($source_dbh, $db, $tbl);
    my $tbl_struct = $tp->parse($ddl);
 
    my $cols = '*';
@@ -111,13 +111,13 @@ sub test_alter_table {
       die "I need a drop_col argument" unless $col;
       $cols = join(', ', grep { $_ ne $col } @{$tbl_struct->{cols}});
    }
-   my $orig_rows = $master_dbh->selectall_arrayref(
+   my $orig_rows = $source_dbh->selectall_arrayref(
       "SELECT $cols FROM $table ORDER BY `$pk_col`");
 
-   my $orig_tbls = $master_dbh->selectall_arrayref(
+   my $orig_tbls = $source_dbh->selectall_arrayref(
       "SHOW TABLES FROM `$db`");
 
-   my $orig_max_id = $master_dbh->selectall_arrayref(
+   my $orig_max_id = $source_dbh->selectall_arrayref(
       "SELECT MAX(`$pk_col`) FROM `$db`.`$tbl`");
 
    my $triggers_sql = "SELECT TRIGGER_SCHEMA, TRIGGER_NAME, DEFINER, ACTION_STATEMENT, SQL_MODE, "
@@ -125,7 +125,7 @@ sub test_alter_table {
                     . "  FROM INFORMATION_SCHEMA.TRIGGERS "
                     . " WHERE TRIGGER_SCHEMA = '$db' " 
                     .  "  AND EVENT_OBJECT_TABLE = '$tbl'";
-   my $orig_triggers = $master_dbh->selectall_arrayref($triggers_sql);
+   my $orig_triggers = $source_dbh->selectall_arrayref($triggers_sql);
 
    my ($orig_auto_inc) = $ddl =~ m/\s+AUTO_INCREMENT=(\d+)\s+/;
 
@@ -134,7 +134,7 @@ sub test_alter_table {
    if ( $fk_method ) {
       foreach my $tbl ( @$orig_tbls ) {
          my $fks = $tp->get_fks(
-            $tp->get_create_table($master_dbh, $db, $tbl->[0]));
+            $tp->get_create_table($source_dbh, $db, $tbl->[0]));
          push @orig_fks, $fks;
       }
    }
@@ -152,13 +152,13 @@ sub test_alter_table {
       sub { pt_online_schema_change::main(
          @args,
          '--print',
-         "$dsn,D=$db,t=$tbl",
+         "$dsn,D=$db,t=$tbl,s=1",
          @$cmds,
       )},
       stderr => 1,
    );
 
-   my $new_ddl = $tp->get_create_table($master_dbh, $db, $tbl);
+   my $new_ddl = $tp->get_create_table($source_dbh, $db, $tbl);
    my $new_tbl_struct = $tp->parse($new_ddl);
    my $fail    = 0;
 
@@ -169,7 +169,7 @@ sub test_alter_table {
    ) or $fail = 1;
 
    # There should be no new or missing tables.
-   my $new_tbls = $master_dbh->selectall_arrayref("SHOW TABLES FROM `$db`");
+   my $new_tbls = $source_dbh->selectall_arrayref("SHOW TABLES FROM `$db`");
    is_deeply(
       $new_tbls,
       $orig_tbls,
@@ -178,7 +178,7 @@ sub test_alter_table {
 
    # Rows in the original and new table should be identical.
    my $query = "SELECT $cols FROM $table ORDER BY `$pk_col`";
-   my $new_rows = $master_dbh->selectall_arrayref("SELECT $cols FROM $table ORDER BY `$pk_col`");
+   my $new_rows = $source_dbh->selectall_arrayref("SELECT $cols FROM $table ORDER BY `$pk_col`");
    my $should_diag;
    is_deeply(
       $new_rows,
@@ -187,7 +187,7 @@ sub test_alter_table {
    ) or $fail=1;
 
    if ( grep { $_ eq '--preserve-triggers' } @$cmds ) {
-      my $new_triggers = $master_dbh->selectall_arrayref($triggers_sql);
+      my $new_triggers = $source_dbh->selectall_arrayref($triggers_sql);
       is_deeply(
          $new_triggers,
          $orig_triggers,
@@ -196,7 +196,7 @@ sub test_alter_table {
    }
 
    if ( grep { $_ eq '--no-drop-new-table' } @$cmds ) {
-      $new_rows = $master_dbh->selectall_arrayref(
+      $new_rows = $source_dbh->selectall_arrayref(
          "SELECT $cols FROM `$db`.`$new_tbl` ORDER BY `$pk_col`");
       is_deeply(
          $new_rows,
@@ -205,7 +205,7 @@ sub test_alter_table {
       ) or $fail = 1;
    }
 
-   my $new_max_id = $master_dbh->selectall_arrayref(
+   my $new_max_id = $source_dbh->selectall_arrayref(
       "SELECT MAX(`$pk_col`) FROM `$db`.`$tbl`");
    is(
       $orig_max_id->[0]->[0],
@@ -256,7 +256,7 @@ sub test_alter_table {
    elsif ( $test_type eq 'new_engine' ) {
       my $new_engine = lc($args{new_engine});
       die "I need a new_engine argument" unless $new_engine;
-      my $rows = $master_dbh->selectall_hashref(
+      my $rows = $source_dbh->selectall_hashref(
          "SHOW TABLE STATUS FROM `$db`", "name");
       is(
          lc($rows->{$tbl}->{engine}),
@@ -272,7 +272,7 @@ sub test_alter_table {
 
       foreach my $tbl ( @$orig_tbls ) {
          my $fks = $tp->get_fks(
-            $tp->get_create_table($master_dbh, $db, $tbl->[0]));
+            $tp->get_create_table($source_dbh, $db, $tbl->[0]));
 
          # The tool does not use the same/original fk name,
          # it appends a single _.  So we need to strip this
@@ -318,7 +318,7 @@ sub test_alter_table {
       # a parent row that's being referenced by a child.
       my $sql = "DELETE FROM $table WHERE $pk_col=1 LIMIT 1";
       eval {
-         $master_dbh->do($sql);
+         $source_dbh->do($sql);
       };
       like(
          $EVAL_ERROR,
@@ -341,7 +341,7 @@ sub test_alter_table {
 # The most basic: alter a small table with no fks that's not active.
 # #############################################################################
 
-my $db_flavor = VersionParser->new($master_dbh)->flavor();
+my $db_flavor = VersionParser->new($source_dbh)->flavor();
 if ( $db_flavor =~ m/XtraDB Cluster/ ) {
 diag('====================================================================================================');
 diag($db_flavor);
@@ -459,7 +459,7 @@ test_alter_table(
 # Somewhat dangerous, but quick.  Downside: table doesn't exist for a moment.
 
 SKIP: {
-    skip "MySQL error https://bugs.mysql.com/bug.php?id=89441", 2 if ($sandbox_version ge '8.0' and VersionParser->new($master_dbh) le '8.0.14');
+    skip "MySQL error https://bugs.mysql.com/bug.php?id=89441", 2 if ($sandbox_version ge '8.0' and VersionParser->new($source_dbh) le '8.0.14');
 
 test_alter_table(
    name       => "Basic FK drop_swap --dry-run",
@@ -573,10 +573,10 @@ test_alter_table(
 );
 
 SKIP: {
-   skip 'Sandbox master does not have the sakila database', 7
-   unless @{$master_dbh->selectcol_arrayref("SHOW DATABASES LIKE 'sakila'")};
+   skip 'Sandbox source does not have the sakila database', 7
+   unless @{$source_dbh->selectcol_arrayref("SHOW DATABASES LIKE 'sakila'")};
 
-   skip "MySQL error https://bugs.mysql.com/bug.php?id=89441", 2 if ($sandbox_version ge '8.0' and VersionParser->new($master_dbh) le '8.0.14');
+   skip "MySQL error https://bugs.mysql.com/bug.php?id=89441", 2 if ($sandbox_version ge '8.0' and VersionParser->new($source_dbh) le '8.0.14');
 
    # This test will use the drop_swap method because the child tables
    # are large.  To prove this, change check_fks to rebuild_constraints
@@ -623,7 +623,7 @@ test_alter_table(
 );
 
 my $fks = $tp->get_fks(
-   $tp->get_create_table($master_dbh, "pt_osc", "city"));
+   $tp->get_create_table($source_dbh, "pt_osc", "city"));
 is(
    $fks->{fk_city_country}->{parent_tbl}->{tbl},
    "_country_old",
@@ -637,11 +637,11 @@ sub test_table {
    my (%args) = @_;
    my ($file, $name) = @args{qw(file name)};
 
-   $sb->load_file('master', "t/lib/samples/osc/$file");
-   $master_dbh->do('use osc');
-   $master_dbh->do("DROP TABLE IF EXISTS osc.__new_t");
+   $sb->load_file('source', "t/lib/samples/osc/$file");
+   $source_dbh->do('use osc');
+   $source_dbh->do("DROP TABLE IF EXISTS osc.__new_t");
 
-   my $org_rows = $master_dbh->selectall_arrayref('select * from osc.t order by id');
+   my $org_rows = $source_dbh->selectall_arrayref('select * from osc.t order by id');
 
    ($output, $exit) = full_output(
       sub { pt_online_schema_change::main(@args,
@@ -649,7 +649,7 @@ sub test_table {
       stderr => 1,
    );
 
-   my $new_rows = $master_dbh->selectall_arrayref('select * from osc.t order by id');
+   my $new_rows = $source_dbh->selectall_arrayref('select * from osc.t order by id');
 
    my $fail = 0;
 
@@ -715,7 +715,7 @@ test_alter_table(
 # --statistics
 # #############################################################################
 
-$sb->load_file('master', "$sample/bug_1045317.sql");
+$sb->load_file('source', "$sample/bug_1045317.sql");
 
 ok(
    no_diff(
@@ -739,6 +739,8 @@ if ($sandbox_version eq '5.5' && $db_flavor !~ m/XtraDB Cluster/) {
    $res_file =  "$sample/stats-execute-5.7.txt";
 } elsif ($sandbox_version eq '8.0' && $db_flavor !~ m/XtraDB Cluster/) {
    $res_file =  "$sample/stats-execute-8.0.txt";
+} elsif ($sandbox_version ge '8.4' && $db_flavor !~ m/XtraDB Cluster/ && $db_flavor !~ m/mariadb/) {
+   $res_file =  "$sample/stats-execute-8.4.txt";
 }
  
 
@@ -835,11 +837,11 @@ test_alter_table(
 SKIP: {
    skip 'Not for PXC' if ( $sb->is_cluster_mode );
 
-   $sb->load_file('master', "$sample/create_dsns.sql");
+   $sb->load_file('source', "$sample/create_dsns.sql");
 
    ($output, $exit) = full_output(
       sub { pt_online_schema_change::main(@args,
-         "$dsn,D=sakila,t=actor", ('--recursion-method=dsn=D=test_recursion_method,t=dsns,h=127.0.0.1,P=12345,u=msandbox,p=msandbox',  
+         "$dsn,D=sakila,t=actor,s=1", ('--recursion-method=dsn=D=test_recursion_method,t=dsns,h=127.0.0.1,P=12345,u=msandbox,p=msandbox,s=1',  
              '--alter-foreign-keys-method', 'rebuild_constraints', '--execute', '--alter', 'ENGINE=InnoDB')) 
           },
       stderr => 1,
@@ -847,37 +849,37 @@ SKIP: {
 
    like(
       $output,
-      qr/Found 2 slaves.*Successfully altered/si,
+      qr/Found 2 replicas.*Successfully altered/si,
       "--recursion-method=dns works"
    );
 
-   $master_dbh->do("DROP DATABASE test_recursion_method");
+   $source_dbh->do("DROP DATABASE test_recursion_method");
 
    diag("Reloading sakila");
-   my $master_port = $sb->port_for('master');
-   system "$trunk/sandbox/load-sakila-db $master_port";
-   $sb->wait_for_slaves();
+   my $source_port = $sb->port_for('source');
+   system "$trunk/sandbox/load-sakila-db $source_port";
+   $sb->wait_for_replicas();
 
-   $sb->do_as_root("slave1", q/CREATE USER 'slave_user'@'%' IDENTIFIED BY 'slave_password'/);
-   $sb->do_as_root("slave1", q/GRANT SELECT, INSERT, UPDATE, SUPER, REPLICATION SLAVE ON *.* TO 'slave_user'@'%'/);
+   $sb->do_as_root("replica1", q/CREATE USER 'replica_user'@'%' IDENTIFIED BY 'replica_password'/);
+   $sb->do_as_root("replica1", q/GRANT SELECT, INSERT, UPDATE, SUPER, REPLICATION SLAVE ON *.* TO 'replica_user'@'%'/);
 
    test_alter_table(
-      name       => "--slave-user --slave-password",
+      name       => "--replica-user --replica-password",
       file       => "basic_no_fks_innodb.sql",
       table      => "pt_osc.t",
       test_type  => "add_col",
       new_col    => "bar",
       cmds       => [
-            qw(--execute --slave-user slave_user --slave-password slave_password), '--alter', 'ADD COLUMN bar INT',
+            qw(--execute --replica-user replica_user --replica-password replica_password), '--alter', 'ADD COLUMN bar INT',
       ],
    );
-   $sb->do_as_root("slave1", q/DROP USER 'slave_user'@'%'/);
+   $sb->do_as_root("replica1", q/DROP USER 'replica_user'@'%'/);
 }
 # #############################################################################
 # 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;
diff --git a/t/pt-online-schema-change/bugs.t b/t/pt-online-schema-change/bugs.t
index 5bb7d23a7..279b68b85 100644
--- a/t/pt-online-schema-change/bugs.t
+++ b/t/pt-online-schema-change/bugs.t
@@ -19,20 +19,20 @@ require "$trunk/bin/pt-online-schema-change";
 
 my $dp = new DSNParser(opts=>$dsn_opts);
 my $sb = new Sandbox(basedir => '/tmp', DSNParser => $dp);
-my $master_dbh = $sb->get_dbh_for('master');
-my $slave_dbh  = $sb->get_dbh_for('slave1');
+my $source_dbh = $sb->get_dbh_for('source');
+my $replica_dbh  = $sb->get_dbh_for('replica1');
 
-if ( !$master_dbh ) {
-   plan skip_all => 'Cannot connect to sandbox master';
+if ( !$source_dbh ) {
+   plan skip_all => 'Cannot connect to sandbox source';
 }
-elsif ( !$slave_dbh ) {
-   plan skip_all => 'Cannot connect to sandbox slave1';
+elsif ( !$replica_dbh ) {
+   plan skip_all => 'Cannot connect to sandbox replica1';
 }
 
 # 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,u=msandbox,p=msandbox';
+my $source_dsn = 'h=127.1,P=12345,u=msandbox,p=msandbox';
 my @args       = (qw(--set-vars innodb_lock_wait_timeout=3));
 my $output;
 my $exit_status;
@@ -42,11 +42,11 @@ my $sample  = "t/pt-online-schema-change/samples/";
 # https://bugs.launchpad.net/percona-toolkit/+bug/1336734
 # pt-online-schema-change 2.2.17 adds --null-to-not-null feature
 # ############################################################################
-$sb->load_file('master', "$sample/bug-1336734.sql");
+$sb->load_file('source', "$sample/bug-1336734.sql");
 
 ($output, $exit_status) = full_output(
    sub { pt_online_schema_change::main(@args, 
-      "$master_dsn,D=test,t=lp1336734",
+      "$source_dsn,D=test,t=lp1336734",
       "--execute",
       "--null-to-not-null",
       # notice we are not using a DEFAULT value, to also
@@ -56,7 +56,7 @@ $sb->load_file('master', "$sample/bug-1336734.sql");
       qw(--chunk-size 2 --print)) },
 );
 
-my $test_rows = $master_dbh->selectall_arrayref("SELECT id, name FROM test.lp1336734 ORDER BY id");
+my $test_rows = $source_dbh->selectall_arrayref("SELECT id, name FROM test.lp1336734 ORDER BY id");
 ok (!$exit_status,
     "--null-to-not-null exit status = 0"
 );
@@ -87,11 +87,11 @@ is_deeply(
 # https://bugs.launchpad.net/percona-toolkit/+bug/994002
 # pt-online-schema-change 2.1.1 doesn't choose the PRIMARY KEY
 # ############################################################################
-$sb->load_file('master', "$sample/pk-bug-994002.sql");
+$sb->load_file('source', "$sample/pk-bug-994002.sql");
 
 ($output, $exit_status) = full_output(
    sub { pt_online_schema_change::main(@args,
-      "$master_dsn,D=test,t=t",
+      "$source_dsn,D=test,t=t",
       "--alter", "add column (foo int)",
       qw(--chunk-size 2 --dry-run --print)) },
 );
@@ -112,11 +112,11 @@ unlike(
 # ############################################################################
 # https://bugs.launchpad.net/percona-toolkit/+bug/1002448
 # ############################################################################
-$sb->load_file('master', "$sample/bug-1002448.sql");
+$sb->load_file('source', "$sample/bug-1002448.sql");
 
 ($output, $exit_status) = full_output(
     sub { pt_online_schema_change::main(@args,
-            "$master_dsn,D=test1002448,t=table_name",
+            "$source_dsn,D=test1002448,t=table_name",
             "--alter", "add column (foo int)",
             qw(--chunk-size 2 --dry-run --print)) },
 );
@@ -131,13 +131,13 @@ unlike(
 # ############################################################################
 # https://bugs.launchpad.net/percona-toolkit/+bug/1003315
 # ############################################################################
-$sb->load_file('master', "$sample/bug-1003315.sql");
+$sb->load_file('source', "$sample/bug-1003315.sql");
 
 # Have to use full_output here, because the error message may happen during
 # cleanup, and so won't be caught by output().
 ($output, $exit_status) = full_output(
     sub { pt_online_schema_change::main(@args,
-            "$master_dsn,D=test1003315,t=A",
+            "$source_dsn,D=test1003315,t=A",
             "--alter", "ENGINE=InnoDB",
             "--alter-foreign-keys-method", "auto",
             "--dry-run",
@@ -224,20 +224,20 @@ like(
 # ############################################################################
 my $orig_tbl = 'very_very_very_very_very_very_very_very_very_long_table_name';  
 
-$master_dbh->do(q{DROP DATABASE IF EXISTS `bug_1041372`});
-$master_dbh->do(q{CREATE DATABASE `bug_1041372`});
+$source_dbh->do(q{DROP DATABASE IF EXISTS `bug_1041372`});
+$source_dbh->do(q{CREATE DATABASE `bug_1041372`});
 
 for my $i ( 0..4 ) {
    my $tbl = $orig_tbl . ("a" x $i);
-   $master_dbh->do(qq{create table `bug_1041372`.$tbl (a INT NOT NULL AUTO_INCREMENT PRIMARY KEY )});
-   $master_dbh->do(qq{insert into `bug_1041372`.$tbl values (1), (2), (3), (4), (5)});
+   $source_dbh->do(qq{create table `bug_1041372`.$tbl (a INT NOT NULL AUTO_INCREMENT PRIMARY KEY )});
+   $source_dbh->do(qq{insert into `bug_1041372`.$tbl values (1), (2), (3), (4), (5)});
 
-   $sb->wait_for_slaves();
+   $sb->wait_for_replicas();
 
    ($output) = full_output(sub {
       pt_online_schema_change::main(@args,
           '--alter', "ADD COLUMN ptosc INT",
-          '--execute', "$master_dsn,D=bug_1041372,t=$tbl")
+          '--execute', "$source_dsn,D=bug_1041372,t=$tbl")
    });
 
    like(
@@ -247,20 +247,20 @@ for my $i ( 0..4 ) {
    );
 }
 
-my $triggers = $master_dbh->selectall_arrayref(qq{SHOW TRIGGERS FROM `bug_1041372`});
+my $triggers = $source_dbh->selectall_arrayref(qq{SHOW TRIGGERS FROM `bug_1041372`});
 is_deeply(
    $triggers,
    [],
    "No triggers left for long table names"
 ) or diag(Dumper($triggers));
 
-$master_dbh->do(q{DROP DATABASE IF EXISTS `bug_1041372`});
+$source_dbh->do(q{DROP DATABASE IF EXISTS `bug_1041372`});
 
 # ############################################################################
 # https://bugs.launchpad.net/percona-toolkit/+bug/1062324
 # pt-online-schema-change sets bad DELETE trigger when changing Primary Key
 # ############################################################################
-$sb->load_file('master', "$sample/del-trg-bug-1062324.sql");
+$sb->load_file('source', "$sample/del-trg-bug-1062324.sql");
 
 {
    # pt-osc has no --no-drop-triggers option, so we hijack its sub.
@@ -271,7 +271,7 @@ $sb->load_file('master', "$sample/del-trg-bug-1062324.sql");
    # and leave the triggers.
    ($output, $exit_status) = full_output(
       sub { pt_online_schema_change::main(@args,
-         "$master_dsn,D=test,t=t1",
+         "$source_dsn,D=test,t=t1",
          "--alter", "drop key 2bpk, drop key c3, drop primary key, drop c1, add primary key (c2, c3(4)), add key (c3(4))",
          qw(--no-check-alter --execute --no-drop-new-table --no-swap-tables)) },
    );
@@ -280,7 +280,7 @@ $sb->load_file('master', "$sample/del-trg-bug-1062324.sql");
    # query to throw "ERROR 1054 (42S22): Unknown column 'test._t1_new.c1'
    # in 'where clause'".
    eval {
-      $master_dbh->do("DELETE FROM test.t1 WHERE c1=1");
+      $source_dbh->do("DELETE FROM test.t1 WHERE c1=1");
    };
    is(
       $EVAL_ERROR,
@@ -295,7 +295,7 @@ $sb->load_file('master', "$sample/del-trg-bug-1062324.sql");
 
       # The original row was (c1,c2,c3) = (1,1,1).  We deleted where c1=1,
       # so the row where c2=1 AND c3=1 should no longer exist.
-      my $row = $master_dbh->selectrow_arrayref("SELECT * FROM test._t1_new WHERE c2=1 AND c3=1");
+      my $row = $source_dbh->selectrow_arrayref("SELECT * FROM test._t1_new WHERE c2=1 AND c3=1");
       is(
          $row,
          undef,
@@ -305,17 +305,17 @@ $sb->load_file('master', "$sample/del-trg-bug-1062324.sql");
 
    # Another instance of this bug:
    # https://bugs.launchpad.net/percona-toolkit/+bug/1103672
-   $sb->load_file('master', "$sample/del-trg-bug-1103672.sql");
+   $sb->load_file('source', "$sample/del-trg-bug-1103672.sql");
 
    ($output, $exit_status) = full_output(
       sub { pt_online_schema_change::main(@args,
-         "$master_dsn,D=test,t=t1",
+         "$source_dsn,D=test,t=t1",
          "--alter", "drop primary key, add column _id int unsigned not null primary key auto_increment FIRST",
          qw(--no-check-alter --execute --no-drop-new-table --no-swap-tables)) },
    );
 
    eval {
-      $master_dbh->do("DELETE FROM test.t1 WHERE id=1");
+      $source_dbh->do("DELETE FROM test.t1 WHERE id=1");
    };
    is(
       $EVAL_ERROR,
@@ -323,7 +323,7 @@ $sb->load_file('master', "$sample/del-trg-bug-1062324.sql");
       "No delete trigger error after altering PK (bug 1103672)"
    ) or diag($output);
 
-   $row = $master_dbh->selectrow_arrayref("SELECT * FROM test._t1_new WHERE id=1");
+   $row = $source_dbh->selectrow_arrayref("SELECT * FROM test._t1_new WHERE id=1");
    is(
       $row,
       undef,
@@ -335,11 +335,11 @@ $sb->load_file('master', "$sample/del-trg-bug-1062324.sql");
 # Something like http://bugs.mysql.com/bug.php?id=45694 means we should not
 # use LOCK IN SHARE MODE with MySQL 5.0.
 # #############################################################################
-$sb->load_file('master', "$sample/basic_no_fks_innodb.sql");
+$sb->load_file('source', "$sample/basic_no_fks_innodb.sql");
 
 ($output, $exit_status) = full_output(
     sub { pt_online_schema_change::main(@args,
-            "$master_dsn,D=pt_osc,t=t",
+            "$source_dsn,D=pt_osc,t=t",
             "--alter", "add column (foo int)",
             qw(--execute --print))
    },
@@ -364,17 +364,17 @@ else {
 # https://bugs.launchpad.net/percona-toolkit/+bug/1171653
 # 
 # ############################################################################
-$sb->load_file('master', "$sample/utf8_charset_tbl.sql");
+$sb->load_file('source', "$sample/utf8_charset_tbl.sql");
 
 ($output, $exit_status) = full_output(
     sub { pt_online_schema_change::main(@args,
-      "$master_dsn,D=test1171653,t=t",
+      "$source_dsn,D=test1171653,t=t",
       "--alter", "drop column foo",
       qw(--execute --print))
    },
 );
 
-my $row = $master_dbh->selectrow_arrayref("SHOW CREATE TABLE test1171653.t");
+my $row = $source_dbh->selectrow_arrayref("SHOW CREATE TABLE test1171653.t");
 
 like(
    $row->[1],
@@ -397,13 +397,13 @@ like(
 # for the first time.  So to test this code path, we need to
 # cause a MySQL warning while copying rows.
 
-$sb->load_file('master', "$sample/basic_no_fks_innodb.sql");
+$sb->load_file('source', "$sample/basic_no_fks_innodb.sql");
 #This string will be too long after we modify the table so it will cause a warning about the value being truncated in the new table.  The other column values are a single character. Note: if STRICT_TRANS or STRICT_ALL is set , an error is raised instead of a warning. STRICT_TRANS is default in 5.7+
-$master_dbh->do("INSERT INTO pt_osc.t VALUES (null, 'This string will be too long.', NOW())");
+$source_dbh->do("INSERT INTO pt_osc.t VALUES (null, 'This string will be too long.', NOW())");
 
 ($output, $exit_status) = full_output(
     sub { pt_online_schema_change::main(@args,
-      "$master_dsn,D=pt_osc,t=t",
+      "$source_dsn,D=pt_osc,t=t",
       "--alter", "modify c varchar(8)",
       qw(--execute --print))
    },
@@ -434,11 +434,11 @@ like(
 # child tables in own schema
 # #############################################################################
 
-$sb->load_file('master', "$sample/bug-1315130_cleanup.sql");
-$sb->load_file('master', "$sample/bug-1315130.sql");
+$sb->load_file('source', "$sample/bug-1315130_cleanup.sql");
+$sb->load_file('source', "$sample/bug-1315130.sql");
 
 $output = output(
-   sub { pt_online_schema_change::main(@args, "$master_dsn,D=bug_1315130_a,t=parent_table",
+   sub { pt_online_schema_change::main(@args, "$source_dsn,D=bug_1315130_a,t=parent_table",
          '--dry-run', 
          '--alter', "add column c varchar(16)",
          '--alter-foreign-keys-method', 'auto'),
@@ -451,7 +451,7 @@ $output = output(
          "Identify child tables in other schemas and ignore child tables from same schema referencing same named parent in other schema.",
    );
 # clear databases with their foreign keys
-$sb->load_file('master', "$sample/bug-1315130_cleanup.sql");  
+$sb->load_file('source', "$sample/bug-1315130_cleanup.sql");  
 
 # #############################################################################
 # Issue 1315130
@@ -459,11 +459,11 @@ $sb->load_file('master', "$sample/bug-1315130_cleanup.sql");
 # child tables in own schema
 # #############################################################################
 
-$sb->load_file('master', "$sample/bug-1315130_cleanup.sql");
-$sb->load_file('master', "$sample/bug-1315130.sql");
+$sb->load_file('source', "$sample/bug-1315130_cleanup.sql");
+$sb->load_file('source', "$sample/bug-1315130.sql");
 
 $output = output(
-   sub { pt_online_schema_change::main(@args, "$master_dsn,D=bug_1315130_a,t=parent_table",
+   sub { pt_online_schema_change::main(@args, "$source_dsn,D=bug_1315130_a,t=parent_table",
          '--dry-run', 
          '--alter', "add column c varchar(16)",
          '--alter-foreign-keys-method', 'auto', '--only-same-schema-fks'),
@@ -476,7 +476,7 @@ like(
       "Ignore child tables in other schemas.",
 );
 # clear databases with their foreign keys
-$sb->load_file('master', "$sample/bug-1315130_cleanup.sql");  
+$sb->load_file('source', "$sample/bug-1315130_cleanup.sql");  
 
 
 # #############################################################################
@@ -485,8 +485,8 @@ $sb->load_file('master', "$sample/bug-1315130_cleanup.sql");
 # (happens on HASH indexes)
 # #############################################################################
 
-$sb->load_file('master', "$sample/bug-1340728_cleanup.sql");
-$sb->load_file('master', "$sample/bug-1340728.sql");
+$sb->load_file('source', "$sample/bug-1340728_cleanup.sql");
+$sb->load_file('source', "$sample/bug-1340728.sql");
 
 # insert a few thousand rows (else test isn't valid)
 # will make a big string to do an extended insert because it's much faster
@@ -498,12 +498,12 @@ for (my $i = 0; $i < $rows; $i++) {
 }
 $big_insert .= "(NULL, 'xx')";
 
-$master_dbh->do($big_insert);
-# This big test causes slave lag error on slow boxes
-$sb->wait_for_slaves();
+$source_dbh->do($big_insert);
+# This big test causes replica lag error on slow boxes
+$sb->wait_for_replicas();
 
 $output = output(
-   sub { pt_online_schema_change::main(@args, "$master_dsn,D=bug_1340728,t=test",
+   sub { pt_online_schema_change::main(@args, "$source_dsn,D=bug_1340728,t=test",
          '--execute', 
          '--alter', "ADD COLUMN c INT",
          '--nocheck-plan',
@@ -517,7 +517,7 @@ $output = output(
          "--nocheck-plan ignores plans without index",
    );
 # clear databases 
-$sb->load_file('master', "$sample/bug-1340728_cleanup.sql");  
+$sb->load_file('source', "$sample/bug-1340728_cleanup.sql");  
 
 
 # #############################################################################
@@ -528,7 +528,7 @@ $sb->load_file('master', "$sample/bug-1340728_cleanup.sql");
 # #############################################################################
 
 ($output, $exit_status) = full_output(
-   sub { pt_online_schema_change::main(@args, "$master_dsn,D=sakila,t=actor",
+   sub { pt_online_schema_change::main(@args, "$source_dsn,D=sakila,t=actor",
          '--execute', 
          '--alter-foreign-keys-method=drop_swap',
          '--alter', "GIBBERISH",
@@ -549,9 +549,9 @@ like(
 # ############################################################################
 
 # first we create a table with a valid default date
-$sb->load_file('master', "$sample/sql_mode_issue_lp1506748.sql");
+$sb->load_file('source', "$sample/sql_mode_issue_lp1506748.sql");
 
-my $modes = new SqlModes($master_dbh, global =>1);
+my $modes = new SqlModes($source_dbh, global =>1);
 
 # We clear all modes. In this state, setting an invalid default date generates
 # an error.
@@ -563,7 +563,7 @@ $modes->set_mode_string('');
 # the commas. (must be explained in docs)
 ($output, $exit_status) = full_output(
    sub { pt_online_schema_change::main(@args, 
-      "$master_dsn,D=test,t=lp1506748",
+      "$source_dsn,D=test,t=lp1506748",
       "--execute",
       "--set-vars", "sql_mode=\'STRICT_ALL_TABLES\\,ALLOW_INVALID_DATES\'",
       "--alter", "MODIFY COLUMN birthday DATE DEFAULT '1970-02-31'",
@@ -573,7 +573,7 @@ $modes->set_mode_string('');
 ok ((!$exit_status && $output =~ /success/i) , "--set-vars sql_mode=\\'a\\\\,b\\' works" ) 
    or diag("[$output][$exit_status]");
 
-$master_dbh->do("drop database test");
+$source_dbh->do("drop database test");
 $modes->restore_original_modes();
 
 # ############################################################################
@@ -584,14 +584,14 @@ $modes->restore_original_modes();
 # We will run pt-osc more than 10 times using --no-drop-old-table and expect 
 # no errors.
 
-$sb->load_file('master', "$sample/simple_test_table.sql");
+$sb->load_file('source', "$sample/simple_test_table.sql");
 
 my $errors    = 0;
 my $successes = 0;
 for (1..12) {
    ($output, $exit_status) = full_output(
       sub { pt_online_schema_change::main(@args, 
-         "$master_dsn,D=test,t=test",
+         "$source_dsn,D=test,t=test",
          "--execute",
          "--no-drop-old-table",
          "--alter", "ENGINE=InnoDB",
@@ -607,11 +607,11 @@ for (1..12) {
 
 ok ( (!$errors && $successes == 12), "Issue #1526105 - no-drop-old-table fails after 10 tries" );
 
-$master_dbh->do("DROP DATABASE IF EXISTS test");
+$source_dbh->do("DROP DATABASE IF EXISTS test");
 
-$sb->load_file('master', "$sample/bug-1613915.sql");
+$sb->load_file('source', "$sample/bug-1613915.sql");
 $output = output(
-   sub { pt_online_schema_change::main(@args, "$master_dsn,D=test,t=o1",
+   sub { pt_online_schema_change::main(@args, "$source_dsn,D=test,t=o1",
          '--execute', 
          '--alter', "ADD COLUMN c INT",
          '--chunk-size', '10',
@@ -625,7 +625,7 @@ like(
       "bug-1613915 enum field in primary key",
 );
 
-$rows = $master_dbh->selectrow_arrayref(
+$rows = $source_dbh->selectrow_arrayref(
    "SELECT COUNT(*) FROM test.o1");
 is(
    $rows->[0],
@@ -633,15 +633,15 @@ is(
    "bug-1613915 correct rows count"
 ) or diag(Dumper($rows));
 
-$master_dbh->do("DROP DATABASE IF EXISTS test");
+$source_dbh->do("DROP DATABASE IF EXISTS test");
 
 
 
 
 
-$sb->load_file('master', "$sample/bug-1613915.sql");
+$sb->load_file('source', "$sample/bug-1613915.sql");
 $output = output(
-   sub { pt_online_schema_change::main(@args, "$master_dsn,D=test,t=o1",
+   sub { pt_online_schema_change::main(@args, "$source_dsn,D=test,t=o1",
          '--execute', 
          '--alter', "ADD COLUMN c INT COMMENT 'change \"plus\" more than one word'",
          '--chunk-size', '10', '--no-check-alter',
@@ -655,7 +655,7 @@ like(
       "recognize comments",
 );
 
-$rows = $master_dbh->selectrow_arrayref(
+$rows = $source_dbh->selectrow_arrayref(
    "SELECT COUNT(*) FROM test.o1");
 is(
    $rows->[0],
@@ -663,51 +663,51 @@ is(
    "recognize comments fields count"
 ) or diag(Dumper($rows));
 
-$rows = $master_dbh->selectrow_arrayref("SHOW CREATE TABLE test.o1");
+$rows = $source_dbh->selectrow_arrayref("SHOW CREATE TABLE test.o1");
 like(
       $rows->[1],
       qr/COMMENT 'change "plus" more than one word'/,
       "recognize comments",
 );
 
-$master_dbh->do("DROP DATABASE IF EXISTS test");
+$source_dbh->do("DROP DATABASE IF EXISTS test");
 
-# Test for --skip-check-slave-lag
+# Test for --skip-check-replica-lag
 # Use the same files from previous test because for this test we are going to
 # run a nonop so, any file will work
 SKIP: {
    skip 'Not for PXC' if ( $sb->is_cluster_mode );
 
-   $master_dbh->do("DROP DATABASE IF EXISTS test");
+   $source_dbh->do("DROP DATABASE IF EXISTS test");
 
-   $sb->load_file('master', "$sample/bug-1613915.sql");
+   $sb->load_file('source', "$sample/bug-1613915.sql");
    $output = output(
-      sub { pt_online_schema_change::main(@args, "$master_dsn,D=test,t=o1",
+      sub { pt_online_schema_change::main(@args, "$source_dsn,D=test,t=o1",
             '--execute', 
             '--alter', "ENGINE=INNODB",
-            '--skip-check-slave-lag', "h=127.0.0.1,P=".$sb->port_for('slave1'),
+            '--skip-check-replica-lag', "h=127.0.0.1,P=".$sb->port_for('replica1'),
             ),
          },
    );
 
-   my $skipping_str = "Skipping.*".$sb->port_for('slave1');
+   my $skipping_str = "Skipping.*".$sb->port_for('replica1');
    like(
          $output,
          qr/$skipping_str/s,
-         "--skip-check-slave-lag",
+         "--skip-check-replica-lag",
    );
 
-   # Test for skip-check-slave-lag and empty replica port
+   # Test for skip-check-replica-lag and empty replica port
    # Use the same data than the previous test
-   $master_dbh->do("DROP DATABASE IF EXISTS test");
+   $source_dbh->do("DROP DATABASE IF EXISTS test");
 
-   $sb->load_file('master', "$sample/bug-1613915.sql");
+   $sb->load_file('source', "$sample/bug-1613915.sql");
    $output = output(
-      sub { pt_online_schema_change::main(@args, "$master_dsn,D=test,t=o1",
+      sub { pt_online_schema_change::main(@args, "$source_dsn,D=test,t=o1",
             '--execute', 
             '--alter', "ADD COLUMN c INT",
             '--chunk-size', '10',
-            '--skip-check-slave-lag', "h=127.0.0.1",
+            '--skip-check-replica-lag', "h=127.0.0.1",
          ),
       },
       stderr => 1,
@@ -716,7 +716,7 @@ SKIP: {
    unlike(
       $output,
       qr/Use of uninitialized value.*/,
-      'No syntax error if port is missed in --skip-check-slave-lag DSN',
+      'No syntax error if port is missed in --skip-check-replica-lag DSN',
    ) or diag($output);
 
 }
@@ -724,6 +724,6 @@ SKIP: {
 # #############################################################################
 # 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;
diff --git a/t/pt-online-schema-change/case-insensitive.t b/t/pt-online-schema-change/case-insensitive.t
index 9aa026e14..c1515ba66 100644
--- a/t/pt-online-schema-change/case-insensitive.t
+++ b/t/pt-online-schema-change/case-insensitive.t
@@ -19,10 +19,10 @@ require VersionParser;
 
 my $dp         = new DSNParser(opts=>$dsn_opts);
 my $sb         = new Sandbox(basedir => '/tmp', DSNParser => $dp);
-my $master_dbh = $sb->get_dbh_for('master');
+my $source_dbh = $sb->get_dbh_for('source');
 
-if ( !$master_dbh ) {
-   plan skip_all => 'Cannot connect to sandbox master';
+if ( !$source_dbh ) {
+   plan skip_all => 'Cannot connect to sandbox source';
 }
 
 my @args   = qw(--set-vars innodb_lock_wait_timeout=3);
@@ -31,18 +31,18 @@ my $dsn    = "h=127.1,P=12345,u=msandbox,p=msandbox";
 my $exit   = 0;
 my $sample = "t/pt-online-schema-change/samples";
 
-my $lower_case_table_names = $master_dbh->selectrow_array('SELECT @@lower_case_table_names');
+my $lower_case_table_names = $source_dbh->selectrow_array('SELECT @@lower_case_table_names');
 
 if ( $lower_case_table_names == 0) {
    # Preparing test setup on Linux
    diag(`$trunk/sandbox/stop-sandbox 12348 >/dev/null`);
-   diag(`EXTRA_DEFAULTS_FILE="$trunk/t/pt-online-schema-change/samples/lower_case_table_names_1.cnf" $trunk/sandbox/start-sandbox master 12348 >/dev/null`);
+   diag(`EXTRA_DEFAULTS_FILE="$trunk/t/pt-online-schema-change/samples/lower_case_table_names_1.cnf" $trunk/sandbox/start-sandbox source 12348 >/dev/null`);
 
-   $master_dbh = $sb->get_dbh_for('master1');
+   $source_dbh = $sb->get_dbh_for('source1');
    $dsn    = "h=127.1,P=12348,u=msandbox,p=msandbox";
-   $sb->load_file('master1', "$sample/basic_no_fks_innodb.sql");
+   $sb->load_file('source1', "$sample/basic_no_fks_innodb.sql");
 } else {
-   $sb->load_file('master', "$sample/basic_no_fks_innodb.sql");
+   $sb->load_file('source', "$sample/basic_no_fks_innodb.sql");
 }
 
 ($output, $exit) = full_output(
@@ -56,7 +56,7 @@ like(
    "Table is altered using capital name 'T'"
 ) or diag($output);
 
-my $ddl = $master_dbh->selectrow_arrayref("show create table pt_osc.T");
+my $ddl = $source_dbh->selectrow_arrayref("show create table pt_osc.T");
 unlike(
    $ddl->[1],
    qr/^\s+["`]d["`]/m,
@@ -73,7 +73,7 @@ is(
 # Done.
 # #############################################################################
 diag(`$trunk/sandbox/stop-sandbox 12348 >/dev/null`);
-$master_dbh = $sb->get_dbh_for('master');
-$sb->wipe_clean($master_dbh);
+$source_dbh = $sb->get_dbh_for('source');
+$sb->wipe_clean($source_dbh);
 ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox");
 done_testing;
diff --git a/t/pt-online-schema-change/charset.t b/t/pt-online-schema-change/charset.t
index ca3c54973..763cabebe 100644
--- a/t/pt-online-schema-change/charset.t
+++ b/t/pt-online-schema-change/charset.t
@@ -19,14 +19,14 @@ require "$trunk/bin/pt-online-schema-change";
 
 my $dp = new DSNParser(opts=>$dsn_opts);
 my $sb = new Sandbox(basedir => '/tmp', DSNParser => $dp);
-my $master_dbh = $sb->get_dbh_for('master');
-my $slave_dbh  = $sb->get_dbh_for('slave1');
+my $source_dbh = $sb->get_dbh_for('source');
+my $replica_dbh  = $sb->get_dbh_for('replica1');
 
-if ( !$master_dbh ) {
-   plan skip_all => 'Cannot connect to sandbox master';
+if ( !$source_dbh ) {
+   plan skip_all => 'Cannot connect to sandbox source';
 }
-elsif ( !$slave_dbh ) {
-   plan skip_all => 'Cannot connect to sandbox slave1';
+elsif ( !$replica_dbh ) {
+   plan skip_all => 'Cannot connect to sandbox replica1';
 }
 elsif ($sb->is_cluster_mode) {
     plan skip_all => 'Not for PXC';
@@ -35,7 +35,7 @@ elsif ($sb->is_cluster_mode) {
 # 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,u=msandbox,p=msandbox';
+my $source_dsn = 'h=127.1,P=12345,u=msandbox,p=msandbox';
 my @args       = (qw(--set-vars innodb_lock_wait_timeout=3));
 my $sample     = "t/pt-online-schema-change/samples/";
 my $plugin     = "$trunk/$sample/plugins";
@@ -46,11 +46,11 @@ my $exit_status;
 # https://bugs.launchpad.net/percona-toolkit/+bug/1171653
 # 
 # ############################################################################
-$sb->load_file('master', "$sample/basic_no_fks.sql");
+$sb->load_file('source', "$sample/basic_no_fks.sql");
 
 ($output, $exit_status) = full_output(
    sub { pt_online_schema_change::main(@args,
-      "$master_dsn,D=pt_osc,t=t",
+      "$source_dsn,D=pt_osc,t=t",
       "--alter", "CHARACTER SET utf8, MODIFY c CHAR(128) CHARACTER SET utf8",
       '--plugin', "$plugin/show_create_new_table.pm",
       qw(--quiet --execute)) },
@@ -67,6 +67,6 @@ like(
 # #############################################################################
 # 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;
diff --git a/t/pt-online-schema-change/check_alter.t b/t/pt-online-schema-change/check_alter.t
index da412ef41..a27ebde35 100644
--- a/t/pt-online-schema-change/check_alter.t
+++ b/t/pt-online-schema-change/check_alter.t
@@ -19,20 +19,20 @@ require "$trunk/bin/pt-online-schema-change";
 
 my $dp = new DSNParser(opts=>$dsn_opts);
 my $sb = new Sandbox(basedir => '/tmp', DSNParser => $dp);
-my $master_dbh = $sb->get_dbh_for('master');
-my $slave_dbh  = $sb->get_dbh_for('slave1');
+my $source_dbh = $sb->get_dbh_for('source');
+my $replica_dbh  = $sb->get_dbh_for('replica1');
 
-if ( !$master_dbh ) {
-   plan skip_all => 'Cannot connect to sandbox master';
+if ( !$source_dbh ) {
+   plan skip_all => 'Cannot connect to sandbox source';
 }
-elsif ( !$slave_dbh ) {
-   plan skip_all => 'Cannot connect to sandbox slave1';
+elsif ( !$replica_dbh ) {
+   plan skip_all => 'Cannot connect to sandbox replica1';
 }
 
 # 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,u=msandbox,p=msandbox';
+my $source_dsn = 'h=127.1,P=12345,u=msandbox,p=msandbox';
 my @args       = (qw(--set-vars innodb_lock_wait_timeout=3));
 my $output;
 my $exit_status;
@@ -42,11 +42,11 @@ my $sample  = "t/pt-online-schema-change/samples/";
 # DROP PRIMARY KEY
 # #############################################################################
 
-$sb->load_file('master', "$sample/del-trg-bug-1103672.sql");
+$sb->load_file('source', "$sample/del-trg-bug-1103672.sql");
 
 ($output, $exit_status) = full_output(
    sub { pt_online_schema_change::main(@args,
-      "$master_dsn,D=test,t=t1",
+      "$source_dsn,D=test,t=t1",
       "--alter", "drop primary key, add column _id int unsigned not null primary key auto_increment FIRST",
       qw(--execute)),
    },
@@ -61,6 +61,6 @@ like(
 # #############################################################################
 # 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;
diff --git a/t/pt-online-schema-change/cleanup.t b/t/pt-online-schema-change/cleanup.t
index 050b99124..ec5e334bf 100644
--- a/t/pt-online-schema-change/cleanup.t
+++ b/t/pt-online-schema-change/cleanup.t
@@ -24,11 +24,11 @@ $Data::Dumper::Quotekeys = 0;
 
 my $dp         = new DSNParser(opts=>$dsn_opts);
 my $sb         = new Sandbox(basedir => '/tmp', DSNParser => $dp);
-my $dbh1 = $sb->get_dbh_for('master');
-my $dbh2 = $sb->get_dbh_for('master');
+my $dbh1 = $sb->get_dbh_for('source');
+my $dbh2 = $sb->get_dbh_for('source');
 
 if ( !$dbh1 || !$dbh2 ) {
-   plan skip_all => 'Cannot connect to sandbox master';
+   plan skip_all => 'Cannot connect to sandbox source';
 }
 elsif ( $sandbox_version lt '5.5' ) {
    plan skip_all => "Metadata locks require MySQL 5.5 and newer";
@@ -38,14 +38,14 @@ elsif ($sb->is_cluster_mode) {
 }
 
 my $output;
-my $master_dsn = $sb->dsn_for('master');
+my $source_dsn = $sb->dsn_for('source');
 my $sample     = "t/pt-online-schema-change/samples";
 my $plugin     = "$trunk/$sample/plugins";
 my $exit;
 my $rows;
 
 # Loads pt_osc.t with cols id (pk), c (unique index),, d.
-$sb->load_file('master', "$sample/basic_no_fks_innodb.sql");
+$sb->load_file('source', "$sample/basic_no_fks_innodb.sql");
 
 # #############################################################################
 # Meta-block on create_triggers.
@@ -53,7 +53,7 @@ $sb->load_file('master', "$sample/basic_no_fks_innodb.sql");
 
 ($output) = full_output(
    sub { pt_online_schema_change::main(
-      "$master_dsn,D=pt_osc,t=t",
+      "$source_dsn,D=pt_osc,t=t",
       qw(--statistics --execute --tries drop_triggers:1:0.01),
       qw(--set-vars lock_wait_timeout=1 --print --no-swap-tables),
       '--plugin', "$plugin/make_drop_trigger_fail.pm",
diff --git a/t/pt-online-schema-change/issue-1638293.t b/t/pt-online-schema-change/issue-1638293.t
index fbe07a761..7c774b63b 100644
--- a/t/pt-online-schema-change/issue-1638293.t
+++ b/t/pt-online-schema-change/issue-1638293.t
@@ -26,14 +26,14 @@ if ( !$sb->is_cluster_mode ) {
    plan skip_all => 'Only for PXC',
 }
 
-my ($master_dbh, $master_dsn) = $sb->start_sandbox(
-   server => 'cmaster',
-   type   => 'master',
+my ($source_dbh, $source_dsn) = $sb->start_sandbox(
+   server => 'csource',
+   type   => 'source',
    env    => q/BINLOG_FORMAT="ROW"/,
 );
 
-if ( !$master_dbh ) {
-   plan skip_all => 'Cannot connect to sandbox master';
+if ( !$source_dbh ) {
+   plan skip_all => 'Cannot connect to sandbox source';
 }
 
 # The sandbox servers run with lock_wait_timeout=3 and it's not dynamic
@@ -45,20 +45,20 @@ my $exit_status;
 my $sample  = "t/pt-online-schema-change/samples/";
 
 # This is the same test we have for bug-1613915 but using DATA-DIR
-$sb->load_file('cmaster', "$sample/bug-1613915.sql");
+$sb->load_file('csource', "$sample/bug-1613915.sql");
 my $dir = tempdir( CLEANUP => 1 );
-my $cmaster_port=$sb->port_for('cmaster');
+my $csource_port=$sb->port_for('csource');
 
 if ($sandbox_version ge '8.0') {
-    diag(`/tmp/$cmaster_port/stop >/dev/null`);
-	diag(`echo "innodb_directories='$dir'" >> /tmp/$cmaster_port/my.sandbox.cnf`);
-    diag(`/tmp/$cmaster_port/start > /dev/null`);
+    diag(`/tmp/$csource_port/stop >/dev/null`);
+	diag(`echo "innodb_directories='$dir'" >> /tmp/$csource_port/my.sandbox.cnf`);
+    diag(`/tmp/$csource_port/start > /dev/null`);
 }
 
-$master_dbh = $sb->get_dbh_for('cmaster');
+$source_dbh = $sb->get_dbh_for('csource');
 
 $output = output(
-   sub { pt_online_schema_change::main(@args, "$master_dsn,D=test,t=o1",
+   sub { pt_online_schema_change::main(@args, "$source_dsn,D=test,t=o1",
          '--execute', 
          '--alter', "ADD COLUMN c INT",
          '--chunk-size', '10',
@@ -73,7 +73,7 @@ like(
       "bug-1613915 enum field in primary key",
 );
 
-my $rows = $master_dbh->selectrow_arrayref(
+my $rows = $source_dbh->selectrow_arrayref(
    "SELECT COUNT(*) FROM test.o1");
 is(
    $rows->[0],
@@ -81,12 +81,12 @@ is(
    "bug-1613915 correct rows count"
 ) or diag(Dumper($rows));
 
-$master_dbh->do("DROP DATABASE IF EXISTS test");
+$source_dbh->do("DROP DATABASE IF EXISTS test");
 
 # #############################################################################
 # Done.
 # #############################################################################
-$sb->wipe_clean($master_dbh);
-$sb->stop_sandbox(qw(cmaster)); 
+$sb->wipe_clean($source_dbh);
+$sb->stop_sandbox(qw(csource)); 
 ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox");
 done_testing;
diff --git a/t/pt-online-schema-change/issue-1646713.t b/t/pt-online-schema-change/issue-1646713.t
index 574f8b4d4..149e507fb 100644
--- a/t/pt-online-schema-change/issue-1646713.t
+++ b/t/pt-online-schema-change/issue-1646713.t
@@ -26,14 +26,18 @@ require "$trunk/bin/pt-online-schema-change";
 my $dp = new DSNParser(opts=>$dsn_opts);
 my $sb = new Sandbox(basedir => '/tmp', DSNParser => $dp);
 
-our ($master_dbh, $master_dsn) = $sb->start_sandbox(
-   server => 'master',
-   type   => 'master',
+if ( $sandbox_version ge '8.4') {
+   plan skip_all => 'PXC 8.4 does not exist yet';
+}
+
+our ($source_dbh, $source_dsn) = $sb->start_sandbox(
+   server => 'source',
+   type   => 'source',
    env    => q/FORK="pxc" BINLOG_FORMAT="ROW"/,
 );
 
-if ( !$master_dbh ) {
-   plan skip_all => 'Cannot connect to sandbox master';
+if ( !$source_dbh ) {
+   plan skip_all => 'Cannot connect to sandbox source';
 }
 
 plan tests => 2;
@@ -46,18 +50,18 @@ my $output;
 my $exit_status;
 my $sample  = "t/pt-online-schema-change/samples/";
 
-$sb->load_file('master', "$sample/issue-1646713.sql");
+$sb->load_file('source', "$sample/issue-1646713.sql");
 my $num_rows = 1000;
-my $master_port = 12345;
+my $source_port = 12345;
 
-$master_dbh->do("FLUSH TABLES");
-$sb->wait_for_slaves();
+$source_dbh->do("FLUSH TABLES");
+$sb->wait_for_replicas();
 
 sub start_thread {
    my ($dsn_opts, $sleep_time) = @_;
    my $dp = new DSNParser(opts=>$dsn_opts);
    my $sb = new Sandbox(basedir => '/tmp', DSNParser => $dp);
-   my $dbh = $sb->get_dbh_for('master');
+   my $dbh = $sb->get_dbh_for('source');
    diag("Thread started: Sleeping $sleep_time seconds before updating the PK field for row with id=1 in test.sbtest");
    # We need to lock the tables to prevent osc to really start before we are able to write the row to the table
    $dbh->do("LOCK TABLES `test`.`o1` WRITE");
@@ -74,7 +78,7 @@ threads->yield();
 diag("Starting osc. A row will be updated in a different thread.");
 my $dir = tempdir( CLEANUP => 1 );
 $output = output(
-   sub { pt_online_schema_change::main(@args, "$master_dsn,D=test,t=o1",
+   sub { pt_online_schema_change::main(@args, "$source_dsn,D=test,t=o1",
          '--execute', 
          '--alter', "ADD COLUMN c INT",
          '--chunk-size', '1',
@@ -89,7 +93,7 @@ like(
       "bug-1646713 duplicate rows in _t_new for UPDATE t set pk=0 where pk=1",
 );
 
-my $rows = $master_dbh->selectrow_arrayref(
+my $rows = $source_dbh->selectrow_arrayref(
    "SELECT COUNT(*) FROM `test`.`o1` WHERE id=0");
 is(
    $rows->[0],
@@ -99,12 +103,12 @@ is(
 
 threads->exit();
 
-$master_dbh->do("DROP DATABASE IF EXISTS test");
+$source_dbh->do("DROP DATABASE IF EXISTS test");
 
 # #############################################################################
 # Done.
 # #############################################################################
-$sb->wipe_clean($master_dbh);
-$sb->stop_sandbox(qw(master)); 
+$sb->wipe_clean($source_dbh);
+$sb->stop_sandbox(qw(source)); 
 ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox");
 done_testing;
diff --git a/t/pt-online-schema-change/long_fk_constraints.t b/t/pt-online-schema-change/long_fk_constraints.t
index d0f60a745..ec7c3b30d 100644
--- a/t/pt-online-schema-change/long_fk_constraints.t
+++ b/t/pt-online-schema-change/long_fk_constraints.t
@@ -19,17 +19,24 @@ require "$trunk/bin/pt-online-schema-change";
 
 my $dp = new DSNParser(opts=>$dsn_opts);
 my $sb = new Sandbox(basedir => '/tmp', DSNParser => $dp);
-my $master_dbh = $sb->get_dbh_for('master');
+my $source_dbh = $sb->get_dbh_for('source');
 
-if ( !$master_dbh ) {
-   plan skip_all => 'Cannot connect to sandbox master';
+if ( !$source_dbh ) {
+   plan skip_all => 'Cannot connect to sandbox source';
+}
+
+my $old_restrict_fk_on_non_standard_key;
+
+if ( $sandbox_version ge '8.4' ){
+   $old_restrict_fk_on_non_standard_key = ($source_dbh->selectrow_array('SELECT @@RESTRICT_FK_ON_NON_STANDARD_KEY'))[0];
+   $source_dbh->do('SET GLOBAL RESTRICT_FK_ON_NON_STANDARD_KEY = 0');
 }
 
 # 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.
-$master_dbh->do('SET @@collation_server="latin1_swedish_ci"');
-my $master_dsn = 'h=127.1,P=12345,u=msandbox,p=msandbox,charset=utf8';
+$source_dbh->do('SET @@collation_server="latin1_swedish_ci"');
+my $source_dsn = 'h=127.1,P=12345,u=msandbox,p=msandbox,charset=utf8';
 my @args       = (qw(--set-vars innodb_lock_wait_timeout=3 --alter-foreign-keys-method rebuild_constraints));
 my $output;
 my $exit_status;
@@ -40,13 +47,13 @@ my $sample  = "t/pt-online-schema-change/samples/";
 # Adding _ to constraints can create issues with constraint name length
 # ############################################################################
 
-$sb->load_file('master', "$sample/long_fk_constraints.sql");
+$sb->load_file('source', "$sample/long_fk_constraints.sql");
 
 # run once: we expect constraint names to be prefixed with one underscore
 # if they havre't one, and to remove 2 if they have 2
 ($output, $exit_status) = full_output(
    sub { pt_online_schema_change::main(@args,
-      "$master_dsn,D=bug1215587,t=Table1",
+      "$source_dsn,D=bug1215587,t=Table1",
       "--alter", "ENGINE=InnoDB",
       "--charset", "utf8",
       qw(--execute)) },
@@ -60,7 +67,7 @@ my $query = <<_SQL;
      and CONSTRAINT_NAME LIKE '%fkey%' 
 ORDER BY TABLE_NAME, CONSTRAINT_NAME
 _SQL
-my $constraints = $master_dbh->selectall_arrayref($query); 
+my $constraints = $source_dbh->selectall_arrayref($query); 
 
 # why we need to sort? Depending on the MySQL version and the characters set, the ORDER BY clause
 # in the query will return different values so, it is better to rely on our own sorted results.
@@ -79,6 +86,10 @@ is_deeply(
 # #############################################################################
 # Done.
 # #############################################################################
-$sb->wipe_clean($master_dbh);
+if ( $sandbox_version ge '8.4' ){
+   $source_dbh->do("SET GLOBAL RESTRICT_FK_ON_NON_STANDARD_KEY = $old_restrict_fk_on_non_standard_key");
+}
+
+$sb->wipe_clean($source_dbh);
 ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox");
 done_testing;
diff --git a/t/pt-online-schema-change/metadata_locks.t b/t/pt-online-schema-change/metadata_locks.t
index 60143789a..8bef895c0 100644
--- a/t/pt-online-schema-change/metadata_locks.t
+++ b/t/pt-online-schema-change/metadata_locks.t
@@ -24,11 +24,11 @@ $Data::Dumper::Quotekeys = 0;
 
 my $dp         = new DSNParser(opts=>$dsn_opts);
 my $sb         = new Sandbox(basedir => '/tmp', DSNParser => $dp);
-my $dbh1 = $sb->get_dbh_for('master');
-my $dbh2 = $sb->get_dbh_for('master');
+my $dbh1 = $sb->get_dbh_for('source');
+my $dbh2 = $sb->get_dbh_for('source');
 
 if ( !$dbh1 || !$dbh2 ) {
-   plan skip_all => 'Cannot connect to sandbox master';
+   plan skip_all => 'Cannot connect to sandbox source';
 }
 elsif ( $sandbox_version lt '5.5' ) {
    plan skip_all => "Metadata locks require MySQL 5.5 and newer";
@@ -38,14 +38,14 @@ elsif ($sb->is_cluster_mode) {
 }
 
 my $output;
-my $master_dsn = $sb->dsn_for('master');
+my $source_dsn = $sb->dsn_for('source');
 my $sample     = "t/pt-online-schema-change/samples";
 my $plugin     = "$trunk/$sample/plugins";
 my $exit;
 my $rows;
 
 # Loads pt_osc.t with cols id (pk), c (unique index),, d.
-$sb->load_file('master', "$sample/basic_no_fks_innodb.sql");
+$sb->load_file('source', "$sample/basic_no_fks_innodb.sql");
 
 # #############################################################################
 # Meta-block on create_triggers.
@@ -53,7 +53,7 @@ $sb->load_file('master', "$sample/basic_no_fks_innodb.sql");
 
 ($output) = full_output(
    sub { pt_online_schema_change::main(
-      "$master_dsn,D=pt_osc,t=t",
+      "$source_dsn,D=pt_osc,t=t",
       qw(--statistics --execute --tries create_triggers:2:0.1),
       qw(--set-vars lock_wait_timeout=1),
       '--plugin', "$plugin/block_create_triggers.pm",
@@ -79,7 +79,7 @@ like(
 
 ($output) = full_output(
    sub { pt_online_schema_change::main(
-      "$master_dsn,D=pt_osc,t=t",
+      "$source_dsn,D=pt_osc,t=t",
       qw(--statistics --execute --tries swap_tables:2:0.1),
       qw(--set-vars lock_wait_timeout=1),
       '--plugin', "$plugin/block_swap_tables.pm",
diff --git a/t/pt-online-schema-change/no_drop_no_swap.t b/t/pt-online-schema-change/no_drop_no_swap.t
index a87b200b0..5569dfa93 100644
--- a/t/pt-online-schema-change/no_drop_no_swap.t
+++ b/t/pt-online-schema-change/no_drop_no_swap.t
@@ -24,22 +24,22 @@ $Data::Dumper::Quotekeys = 0;
 
 my $dp         = new DSNParser(opts=>$dsn_opts);
 my $sb         = new Sandbox(basedir => '/tmp', DSNParser => $dp);
-my $dbh1 = $sb->get_dbh_for('master');
-my $dbh2 = $sb->get_dbh_for('master');
+my $dbh1 = $sb->get_dbh_for('source');
+my $dbh2 = $sb->get_dbh_for('source');
 
 if ( !$dbh1 || !$dbh2 ) {
-   plan skip_all => 'Cannot connect to sandbox master';
+   plan skip_all => 'Cannot connect to sandbox source';
 }
 
 my $output;
-my $master_dsn = $sb->dsn_for('master');
+my $source_dsn = $sb->dsn_for('source');
 my $sample     = "t/pt-online-schema-change/samples";
 my $plugin     = "$trunk/$sample/plugins";
 my $exit;
 my $rows;
 
 # Loads pt_osc.t with cols id (pk), c (unique index),, d.
-$sb->load_file('master', "$sample/basic_no_fks_innodb.sql");
+$sb->load_file('source', "$sample/basic_no_fks_innodb.sql");
 
 # #############################################################################
 # --no-swap-tables --no-drop-triggers
@@ -47,7 +47,7 @@ $sb->load_file('master', "$sample/basic_no_fks_innodb.sql");
 
 $output = output(
    sub { pt_online_schema_change::main(
-      "$master_dsn,D=pt_osc,t=t",
+      "$source_dsn,D=pt_osc,t=t",
       '--alter', 'DROP COLUMN d',
       qw(--execute --no-swap-tables --no-drop-new-table --no-drop-triggers))
    },
@@ -71,11 +71,11 @@ is_deeply(
 # #############################################################################
 # --no-swap-tables --no-drop-triggers implies --no-drop-new-table
 # #############################################################################
-$sb->load_file('master', "$sample/basic_no_fks_innodb.sql");
+$sb->load_file('source', "$sample/basic_no_fks_innodb.sql");
 
 ($output, $exit) = full_output(
    sub { pt_online_schema_change::main(
-      "$master_dsn,D=pt_osc,t=t",
+      "$source_dsn,D=pt_osc,t=t",
       '--alter', 'ADD COLUMN t INT',
       qw(--execute --no-swap-tables --no-drop-triggers))
    }
diff --git a/t/pt-online-schema-change/plugin.t b/t/pt-online-schema-change/plugin.t
index d86b49b00..ec8a00ab1 100644
--- a/t/pt-online-schema-change/plugin.t
+++ b/t/pt-online-schema-change/plugin.t
@@ -22,21 +22,21 @@ $Data::Dumper::Quotekeys = 0;
 
 my $dp         = new DSNParser(opts=>$dsn_opts);
 my $sb         = new Sandbox(basedir => '/tmp', DSNParser => $dp);
-my $dbh = $sb->get_dbh_for('master');
+my $dbh = $sb->get_dbh_for('source');
 
 if ( !$dbh ) {
-   plan skip_all => 'Cannot connect to sandbox master';
+   plan skip_all => 'Cannot connect to sandbox source';
 }
 
 my $output;
-my $master_dsn = $sb->dsn_for('master');
+my $source_dsn = $sb->dsn_for('source');
 my $sample     = "t/pt-online-schema-change/samples";
 my $plugin     = "$trunk/$sample/plugins";
 my $exit;
 my $rows;
 
 # Loads pt_osc.t with cols id (pk), c (unique index),, d.
-$sb->load_file('master', "$sample/basic_no_fks_innodb.sql");
+$sb->load_file('source', "$sample/basic_no_fks_innodb.sql");
 
 # #############################################################################
 # all_hooks.pm
@@ -44,7 +44,7 @@ $sb->load_file('master', "$sample/basic_no_fks_innodb.sql");
 
 ($output) = full_output(
    sub { pt_online_schema_change::main(
-      "$master_dsn,D=pt_osc,t=t",
+      "$source_dsn,D=pt_osc,t=t",
       '--plugin', "$plugin/all_hooks.pm",
       qw(--statistics --execute),
    )},
@@ -56,7 +56,7 @@ my @called = $output =~ m/^PLUGIN \S+$/gm;
 is_deeply(
    \@called,
    [
-      'PLUGIN get_slave_lag',
+      'PLUGIN get_replica_lag',
       'PLUGIN init',
       'PLUGIN before_create_new_table',
       'PLUGIN after_create_new_table',
diff --git a/t/pt-online-schema-change/plugin_before_die.t b/t/pt-online-schema-change/plugin_before_die.t
index fbf6e941e..91a4fe8d4 100644
--- a/t/pt-online-schema-change/plugin_before_die.t
+++ b/t/pt-online-schema-change/plugin_before_die.t
@@ -19,16 +19,16 @@ require "$trunk/bin/pt-online-schema-change";
 
 my $dp = new DSNParser(opts=>$dsn_opts);
 my $sb = new Sandbox(basedir => '/tmp', DSNParser => $dp);
-my $master_dbh = $sb->get_dbh_for('master');
+my $source_dbh = $sb->get_dbh_for('source');
 
-if ( !$master_dbh ) {
-   plan skip_all => 'Cannot connect to sandbox master';
+if ( !$source_dbh ) {
+   plan skip_all => 'Cannot connect to sandbox source';
 }
 
 # 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,u=msandbox,p=msandbox';
+my $source_dsn = 'h=127.1,P=12345,u=msandbox,p=msandbox';
 my @args       = (qw(--set-vars innodb_lock_wait_timeout=3));
 my $sample     = "t/pt-online-schema-change/samples/";
 my $plugin     = "$trunk/$sample/plugins";
@@ -39,7 +39,7 @@ my $exit_status;
 # https://bugs.launchpad.net/percona-toolkit/+bug/1171653
 # 
 # ############################################################################
-$sb->load_file('master', "$sample/basic_no_fks.sql");
+$sb->load_file('source', "$sample/basic_no_fks.sql");
 
 # Should be greater than chunk-size and big enough, so plugin will trigger few times
 my $num_rows = 5000;
@@ -48,7 +48,7 @@ diag(`util/mysql_random_data_load --host=127.0.0.1 --port=12345 --user=msandbox
 
 ($output, $exit_status) = full_output(
    sub { pt_online_schema_change::main(@args,
-      "$master_dsn,D=pt_osc,t=t",
+      "$source_dsn,D=pt_osc,t=t",
       "--alter", "CHARACTER SET utf9",
       '--plugin', "$plugin/before_die.pm",
       '--execute') },
@@ -68,7 +68,7 @@ like(
 
 ($output, $exit_status) = full_output(
    sub { pt_online_schema_change::main(@args,
-      "$master_dsn,D=pt_osc,t=t",
+      "$source_dsn,D=pt_osc,t=t",
       "--alter", "ENGINE=InnoDB",
       '--plugin', "$plugin/before_die_after_nibble.pm",
       '--execute') },
@@ -88,7 +88,7 @@ like(
 
 ($output, $exit_status) = full_output(
    sub { pt_online_schema_change::main(@args,
-      "$master_dsn,D=pt_osc,t=t",
+      "$source_dsn,D=pt_osc,t=t",
       "--alter", "ENGINE=InnoDB",
       '--plugin', "$plugin/before_die_after_create.pm",
       '--execute') },
@@ -109,6 +109,6 @@ like(
 # #############################################################################
 # 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;
diff --git a/t/pt-online-schema-change/preserve_triggers.t b/t/pt-online-schema-change/preserve_triggers.t
index b81ab8ab4..1b30f95bf 100644
--- a/t/pt-online-schema-change/preserve_triggers.t
+++ b/t/pt-online-schema-change/preserve_triggers.t
@@ -27,14 +27,14 @@ $Data::Dumper::Quotekeys = 0;
 
 my $dp         = new DSNParser(opts=>$dsn_opts);
 my $sb         = new Sandbox(basedir => '/tmp', DSNParser => $dp);
-my $master_dbh = $sb->get_dbh_for('master');
-my $slave_dbh  = $sb->get_dbh_for('slave1');
+my $source_dbh = $sb->get_dbh_for('source');
+my $replica_dbh  = $sb->get_dbh_for('replica1');
 
-if ( !$master_dbh ) {
-   plan skip_all => 'Cannot connect to sandbox master';
+if ( !$source_dbh ) {
+   plan skip_all => 'Cannot connect to sandbox source';
 }
-elsif ( !$slave_dbh ) {
-   plan skip_all => 'Cannot connect to sandbox slave';
+elsif ( !$replica_dbh ) {
+   plan skip_all => 'Cannot connect to sandbox replica';
 }
 
 my $q      = new Quoter();
@@ -66,12 +66,12 @@ sub test_alter_table {
    my $delete_triggers = $args{delete_triggers} || '';
 
    if ( my $file = $args{file} ) {
-      $sb->load_file('master', "$sample/$file");
-      $master_dbh->do("USE `$db`");
-      $slave_dbh->do("USE `$db`");
+      $sb->load_file('source', "$sample/$file");
+      $source_dbh->do("USE `$db`");
+      $replica_dbh->do("USE `$db`");
    }
 
-   my $ddl        = $tp->get_create_table($master_dbh, $db, $tbl);
+   my $ddl        = $tp->get_create_table($source_dbh, $db, $tbl);
    my $tbl_struct = $tp->parse($ddl);
 
    my $cols = '*';
@@ -81,13 +81,13 @@ sub test_alter_table {
       die "I need a drop_col argument" unless $col;
       $cols = join(', ', grep { $_ ne $col } @{$tbl_struct->{cols}});
    }
-   my $orig_rows = $master_dbh->selectall_arrayref(
+   my $orig_rows = $source_dbh->selectall_arrayref(
       "SELECT $cols FROM $table ORDER BY `$pk_col`");
 
-   my $orig_tbls = $master_dbh->selectall_arrayref(
+   my $orig_tbls = $source_dbh->selectall_arrayref(
       "SHOW TABLES FROM `$db`");
 
-   my $orig_max_id = $master_dbh->selectall_arrayref(
+   my $orig_max_id = $source_dbh->selectall_arrayref(
       "SELECT MAX(`$pk_col`) FROM `$db`.`$tbl`");
 
    my $triggers_sql = "SELECT TRIGGER_SCHEMA, TRIGGER_NAME, DEFINER, ACTION_STATEMENT, SQL_MODE, "
@@ -95,7 +95,7 @@ sub test_alter_table {
                     . "  FROM INFORMATION_SCHEMA.TRIGGERS "
                     . " WHERE TRIGGER_SCHEMA = '$db' " 
                     .  "  AND EVENT_OBJECT_TABLE = '$tbl'";
-   my $orig_triggers = $master_dbh->selectall_arrayref($triggers_sql);
+   my $orig_triggers = $source_dbh->selectall_arrayref($triggers_sql);
 
    my ($orig_auto_inc) = $ddl =~ m/\s+AUTO_INCREMENT=(\d+)\s+/;
 
@@ -104,7 +104,7 @@ sub test_alter_table {
    if ( $fk_method ) {
       foreach my $tbl ( @$orig_tbls ) {
          my $fks = $tp->get_fks(
-            $tp->get_create_table($master_dbh, $db, $tbl->[0]));
+            $tp->get_create_table($source_dbh, $db, $tbl->[0]));
          push @orig_fks, $fks;
       }
    }
@@ -128,7 +128,7 @@ sub test_alter_table {
       stderr => 1,
    );
 
-   my $new_ddl = $tp->get_create_table($master_dbh, $db, $tbl);
+   my $new_ddl = $tp->get_create_table($source_dbh, $db, $tbl);
    my $new_tbl_struct = $tp->parse($new_ddl);
    my $fail    = 0;
 
@@ -139,7 +139,7 @@ sub test_alter_table {
    ) or $fail = 1;
 
    # There should be no new or missing tables.
-   my $new_tbls = $master_dbh->selectall_arrayref("SHOW TABLES FROM `$db`");
+   my $new_tbls = $source_dbh->selectall_arrayref("SHOW TABLES FROM `$db`");
    is_deeply(
       $new_tbls,
       $orig_tbls,
@@ -147,7 +147,7 @@ sub test_alter_table {
    ) or $fail = 1;
 
    # Rows in the original and new table should be identical.
-   my $new_rows = $master_dbh->selectall_arrayref("SELECT $cols FROM $table ORDER BY `$pk_col`");
+   my $new_rows = $source_dbh->selectall_arrayref("SELECT $cols FROM $table ORDER BY `$pk_col`");
    is_deeply(
       $new_rows,
       $orig_rows,
@@ -155,7 +155,7 @@ sub test_alter_table {
    ) or $fail = 1;
 
    if ( grep { $_ eq '--preserve-triggers' } @$cmds && !$delete_triggers) {
-      my $new_triggers = $master_dbh->selectall_arrayref($triggers_sql);
+      my $new_triggers = $source_dbh->selectall_arrayref($triggers_sql);
       is_deeply(
          $new_triggers,
          $orig_triggers,
@@ -164,7 +164,7 @@ sub test_alter_table {
    }
 
    if ( grep { $_ eq '--no-drop-new-table' } @$cmds ) {
-      $new_rows = $master_dbh->selectall_arrayref(
+      $new_rows = $source_dbh->selectall_arrayref(
          "SELECT $cols FROM `$db`.`$new_tbl` ORDER BY `$pk_col`");
       is_deeply(
          $new_rows,
@@ -173,7 +173,7 @@ sub test_alter_table {
       ) or $fail = 1;
    }
 
-   my $new_max_id = $master_dbh->selectall_arrayref(
+   my $new_max_id = $source_dbh->selectall_arrayref(
       "SELECT MAX(`$pk_col`) FROM `$db`.`$tbl`");
    is(
       $orig_max_id->[0]->[0],
@@ -224,7 +224,7 @@ sub test_alter_table {
    elsif ( $test_type eq 'new_engine' ) {
       my $new_engine = lc($args{new_engine});
       die "I need a new_engine argument" unless $new_engine;
-      my $rows = $master_dbh->selectall_hashref(
+      my $rows = $source_dbh->selectall_hashref(
          "SHOW TABLE STATUS FROM `$db`", "name");
       is(
          lc($rows->{$tbl}->{engine}),
@@ -240,7 +240,7 @@ sub test_alter_table {
 
       foreach my $tbl ( @$orig_tbls ) {
          my $fks = $tp->get_fks(
-            $tp->get_create_table($master_dbh, $db, $tbl->[0]));
+            $tp->get_create_table($source_dbh, $db, $tbl->[0]));
 
          # The tool does not use the same/original fk name,
          # it appends a single _.  So we need to strip this
@@ -286,7 +286,7 @@ sub test_alter_table {
       # a parent row that's being referenced by a child.
       my $sql = "DELETE FROM $table WHERE $pk_col=1 LIMIT 1";
       eval {
-         $master_dbh->do($sql);
+         $source_dbh->do($sql);
       };
       like(
          $EVAL_ERROR,
@@ -336,7 +336,7 @@ SKIP: {
     );
     
     
-    $sb->load_file('master', "$sample/after_triggers.sql");
+    $sb->load_file('source', "$sample/after_triggers.sql");
 
     ($output, $exit) = full_output(
        sub { pt_online_schema_change::main(@args,
@@ -372,7 +372,7 @@ SKIP: {
        "--preserve-triggers --no-swap-tables exit status",
     );
     
-    $sb->load_file('master', "$sample/after_triggers.sql");
+    $sb->load_file('source', "$sample/after_triggers.sql");
 
     ($output, $exit) = full_output(
        sub { pt_online_schema_change::main(@args,
@@ -388,7 +388,7 @@ SKIP: {
           "--preserve-triggers --no-drop-old-table exit status",
     );
 
-    my $rows = $master_dbh->selectall_arrayref("SHOW TABLES LIKE '%t1%'");
+    my $rows = $source_dbh->selectall_arrayref("SHOW TABLES LIKE '%t1%'");
     is_deeply(
           $rows,
           [ [ '_t1_old' ], [ 't1' ] ],
@@ -446,29 +446,29 @@ SKIP: {
 }
 
 diag("Reloading sakila");
-my $master_port = $sb->port_for('master');
-system "$trunk/sandbox/load-sakila-db $master_port";
+my $source_port = $sb->port_for('source');
+system "$trunk/sandbox/load-sakila-db $source_port";
 
-if ($sandbox_version ge '8.0') {
-    $sb->do_as_root("master", q/CREATE USER 'slave_user'@'%' IDENTIFIED WITH mysql_native_password BY 'slave_password'/);
+if ($sandbox_version eq '8.0') {
+    $sb->do_as_root("source", q/CREATE USER 'replica_user'@'%' IDENTIFIED WITH mysql_native_password BY 'replica_password'/);
 } else {
-    $sb->do_as_root("master", q/CREATE USER 'slave_user'@'%' IDENTIFIED BY 'slave_password'/);
+    $sb->do_as_root("source", q/CREATE USER 'replica_user'@'%' IDENTIFIED BY 'replica_password'/);
 }
-$sb->do_as_root("master", q/GRANT REPLICATION SLAVE ON *.* TO 'slave_user'@'%'/);
-$sb->do_as_root("master", q/set sql_log_bin=0/);
-$sb->do_as_root("master", q/DROP USER 'slave_user'/);
-$sb->do_as_root("master", q/set sql_log_bin=1/);
-
-# Need to wait for both slaves here to avoid deadlock
-$sb->wait_for_slaves(slave => 'slave1');
-$sb->wait_for_slaves(slave => 'slave2');
+$sb->do_as_root("source", q/GRANT REPLICATION SLAVE ON *.* TO 'replica_user'@'%'/);
+$sb->do_as_root("source", q/set sql_log_bin=0/);
+$sb->do_as_root("source", q/DROP USER 'replica_user'/);
+$sb->do_as_root("source", q/set sql_log_bin=1/);
+
+# Need to wait for both replicas here to avoid deadlock
+$sb->wait_for_replicas(replica => 'replica1');
+$sb->wait_for_replicas(replica => 'replica2');
 # #############################################################################
 # Done.
 # #############################################################################
-$sb->wipe_clean($master_dbh);
-# Need to wait for both slaves here to avoid deadlock
-$sb->wait_for_slaves(slave => 'slave1');
-$sb->wait_for_slaves(slave => 'slave2');
+$sb->wipe_clean($source_dbh);
+# Need to wait for both replicas here to avoid deadlock
+$sb->wait_for_replicas(replica => 'replica1');
+$sb->wait_for_replicas(replica => 'replica2');
 ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox");
 #
 done_testing;
diff --git a/t/pt-online-schema-change/privs.t b/t/pt-online-schema-change/privs.t
index 8fb6509b7..50953cbc3 100644
--- a/t/pt-online-schema-change/privs.t
+++ b/t/pt-online-schema-change/privs.t
@@ -11,9 +11,9 @@ use warnings FATAL => 'all';
 use English qw(-no_match_vars);
 use Test::More;
 
-if ( !$ENV{SLOW_TESTS} ) {
-   plan skip_all => "pt-online-schema-change/privs.t is a top 5 slowest file; set SLOW_TESTS=1 to enable it.";
-}
+#if ( !$ENV{SLOW_TESTS} ) {
+#   plan skip_all => "pt-online-schema-change/privs.t is a top 5 slowest file; set SLOW_TESTS=1 to enable it.";
+#}
 
 use Data::Dumper;
 use PerconaTest;
@@ -22,27 +22,27 @@ require "$trunk/bin/pt-online-schema-change";
 
 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 ( !$slave2_dbh ) {
-   plan skip_all => 'Cannot connect to sandbox slave2';
+elsif ( !$replica2_dbh ) {
+   plan skip_all => 'Cannot connect to sandbox replica2';
 }
-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,p=msandbox';
+my $source_dsn = 'h=127.1,P=12345,p=msandbox';
 my @args       = (qw(--set-vars innodb_lock_wait_timeout=3));
 my $row;
 my $output;
@@ -50,20 +50,20 @@ my $exit_status;
 my $sample  = "t/pt-online-schema-change/samples/";
 
 # ############################################################################
-# --recursion-method=none to avoid SHOW SLAVE HOSTS
+# --recursion-method=none to avoid SHOW REPLICAS
 # https://bugs.launchpad.net/percona-toolkit/+bug/987694
 # ############################################################################
 diag(`/tmp/12345/use -u root < $trunk/$sample/osc-user.sql`);
-PerconaTest::wait_for_table($slave1_dbh, "mysql.tables_priv", "user='osc_user'");
+PerconaTest::wait_for_table($replica1_dbh, "mysql.tables_priv", "user='osc_user'");
 
-$sb->load_file('master', "$sample/basic_no_fks_innodb.sql");
+$sb->load_file('source', "$sample/basic_no_fks_innodb.sql");
 
 ($output, $exit_status) = full_output(
    sub { $exit_status = pt_online_schema_change::main(@args,
-      "$master_dsn,u=osc_user,D=pt_osc,t=t", '--alter', 'drop column id',
+      "$source_dsn,u=osc_user,D=pt_osc,t=t,s=1", '--alter', 'drop column id',
       qw(--execute),
       # Comment out this line and the tests fail because osc_user
-      # doesn't have privs to SHOW SLAVE HOSTS.  This proves that
+      # doesn't have privs to SHOW REPLICAS.  This proves that
       # --recursion-method none is working.
       qw(--recursion-method none)
    ) },
@@ -74,18 +74,18 @@ is(
    $exit_status,
    0,
    "Limited user (bug 987694): 0 exit"
-);
+ ) or diag($exit_status);
 
 like(
    $output,
    qr/Successfully altered `pt_osc`.`t`/,
    "Limited user (bug 987694): altered table"
-);
+) or diag($output);
 
 diag(`/tmp/12345/use -u root -e "drop user 'osc_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] || '') ne 'osc_user' } @$rows;
    }
 );
@@ -93,6 +93,6 @@ 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;
diff --git a/t/pt-online-schema-change/pt-1455.t b/t/pt-online-schema-change/pt-1455.t
index c65711108..c79bf88fb 100644
--- a/t/pt-online-schema-change/pt-1455.t
+++ b/t/pt-online-schema-change/pt-1455.t
@@ -38,11 +38,11 @@ if ($sb->is_cluster_mode) {
     plan tests => 3;
 }                                  
 
-my $master_dbh = $sb->get_dbh_for("master");
-my $master_dsn = $sb->dsn_for("master");
+my $source_dbh = $sb->get_dbh_for("source");
+my $source_dsn = $sb->dsn_for("source");
 
-my $slave1_dbh = $sb->get_dbh_for("slave1");
-my $slave1_dsn = $sb->dsn_for("slave1");
+my $replica1_dbh = $sb->get_dbh_for("replica1");
+my $replica1_dsn = $sb->dsn_for("replica1");
 
 # 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
@@ -51,29 +51,39 @@ my @args = (qw(--set-vars innodb_lock_wait_timeout=3));
 my $output;
 my $exit_status;
 
-# We need to reset master, because otherwise later RESET SLAVE call
+# We need to reset source, because otherwise later RESET REPLICA call
 # will let sandbox to re-apply all previous events, executed on the sandbox.
-$master_dbh->do("RESET MASTER");
-diag("Setting replication filters on slave 2");
-$sb->load_file('slave2', "t/pt-online-schema-change/samples/pt-1455_slave.sql", undef, no_wait => 1);
-diag("Setting replication filters on slave 1");
-$sb->load_file('slave1', "t/pt-online-schema-change/samples/pt-1455_slave.sql", undef, no_wait => 1);
-diag("Setting replication filters on master");
-$sb->load_file('master', "t/pt-online-schema-change/samples/pt-1455_master.sql");
+$source_dbh->do("RESET ${source_reset}");
+
+if ( $sandbox_version ge '8.4' ) {
+    diag("Setting replication filters on replica 2");
+    $sb->load_file('replica2', "t/pt-online-schema-change/samples/pt-1455_replica.sql", undef, no_wait => 1);
+    diag("Setting replication filters on replica 1");
+    $sb->load_file('replica1', "t/pt-online-schema-change/samples/pt-1455_replica.sql", undef, no_wait => 1);
+    
+}
+else {
+    diag("Setting replication filters on replica 2");
+    $sb->load_file('replica2', "t/pt-online-schema-change/samples/pt-1455_slave.sql", undef, no_wait => 1);
+    diag("Setting replication filters on replica 1");
+    $sb->load_file('replica1', "t/pt-online-schema-change/samples/pt-1455_slave.sql", undef, no_wait => 1);
+}
+diag("Setting replication filters on source");
+$sb->load_file('source', "t/pt-online-schema-change/samples/pt-1455_source.sql");
 diag("replication filters set");
 
 my $num_rows = 1000;
-my $master_port = 12345;
+my $source_port = 12345;
 
 diag("Loading $num_rows into the table. This might take some time.");
-diag(`util/mysql_random_data_load --host=127.0.0.1 --port=$master_port --user=msandbox --password=msandbox employees t1 $num_rows`);
+diag(`util/mysql_random_data_load --host=127.0.0.1 --port=$source_port --user=msandbox --password=msandbox employees t1 $num_rows`);
 diag("$num_rows rows loaded. Starting tests.");
 
-$master_dbh->do("FLUSH TABLES");
-$sb->wait_for_slaves();
+$source_dbh->do("FLUSH TABLES");
+$sb->wait_for_replicas();
 
 ($output, $exit_status) = full_output(
-    sub { pt_online_schema_change::main(@args, "$master_dsn,D=employees,t=t1",
+    sub { pt_online_schema_change::main(@args, "$source_dsn,D=employees,t=t1",
             '--execute', '--no-check-replication-filters', 
             '--alter', "engine=innodb",
         ),
@@ -92,18 +102,25 @@ like(
     qr/Successfully altered/s,
     "PT-1455 Got successfully altered message.",
 );
-$master_dbh->do("RESET MASTER");
-$master_dbh->do("DROP DATABASE IF EXISTS employees");
-
-diag("Resetting replication filters on slave 2");
-$sb->load_file('slave2', "t/pt-online-schema-change/samples/pt-1455_reset_slave.sql", undef, no_wait => 1);
-diag("Resetting replication filters on slave 1");
-$sb->load_file('slave1', "t/pt-online-schema-change/samples/pt-1455_reset_slave.sql", undef, no_wait => 1);
-$sb->wait_for_slaves();
+$source_dbh->do("RESET ${source_reset}");
+$source_dbh->do("DROP DATABASE IF EXISTS employees");
+
+diag("Resetting replication filters on replica 2");
+if ( $sandbox_version ge '8.4' ) {
+    $sb->load_file('replica2', "t/pt-online-schema-change/samples/pt-1455_reset_replica.sql", undef, no_wait => 1);
+    diag("Resetting replication filters on replica 1");
+    $sb->load_file('replica1', "t/pt-online-schema-change/samples/pt-1455_reset_replica.sql", undef, no_wait => 1);
+}
+else {
+    $sb->load_file('replica2', "t/pt-online-schema-change/samples/pt-1455_reset_slave.sql", undef, no_wait => 1);
+    diag("Resetting replication filters on replica 1");
+    $sb->load_file('replica1', "t/pt-online-schema-change/samples/pt-1455_reset_slave.sql", undef, no_wait => 1);
+}
+$sb->wait_for_replicas();
 
 # #############################################################################
 # 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;
diff --git a/t/pt-online-schema-change/pt-1528.t b/t/pt-online-schema-change/pt-1528.t
index 52cd3ee6c..34b2ee10c 100644
--- a/t/pt-online-schema-change/pt-1528.t
+++ b/t/pt-online-schema-change/pt-1528.t
@@ -32,8 +32,8 @@ require "$trunk/bin/pt-online-schema-change";
 my $dp = new DSNParser(opts=>$dsn_opts);
 my $sb = new Sandbox(basedir => '/tmp', DSNParser => $dp);
 
-my $dbh = $sb->get_dbh_for('master');
-my $dsn = $sb->dsn_for("master");
+my $dbh = $sb->get_dbh_for('source');
+my $dsn = $sb->dsn_for("source");
 
 # 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
@@ -42,7 +42,7 @@ my @args = (qw(--set-vars innodb_lock_wait_timeout=3));
 my $output;
 my $exit_status;
 
-$sb->load_file('master', "t/pt-online-schema-change/samples/pt-1528.sql");
+$sb->load_file('source', "t/pt-online-schema-change/samples/pt-1528.sql");
 
 my $rows_before = $dbh->selectall_hashref("SELECT * FROM test.brokenutf8alter", "id");
 
diff --git a/t/pt-online-schema-change/pt-153.t b/t/pt-online-schema-change/pt-153.t
index 756c2bd73..91266938e 100644
--- a/t/pt-online-schema-change/pt-153.t
+++ b/t/pt-online-schema-change/pt-153.t
@@ -25,11 +25,11 @@ require "$trunk/bin/pt-online-schema-change";
 
 my $dp = new DSNParser(opts=>$dsn_opts);
 my $sb = new Sandbox(basedir => '/tmp', DSNParser => $dp);
-my $master_dbh = $sb->get_dbh_for('master');
-my $master_dsn = 'h=127.1,P=12345,u=msandbox,p=msandbox';
+my $source_dbh = $sb->get_dbh_for('source');
+my $source_dsn = 'h=127.1,P=12345,u=msandbox,p=msandbox';
 
-if ( !$master_dbh ) {
-   plan skip_all => 'Cannot connect to sandbox master';
+if ( !$source_dbh ) {
+   plan skip_all => 'Cannot connect to sandbox source';
 }
 
 # The sandbox servers run with lock_wait_timeout=3 and it's not dynamic
@@ -40,10 +40,10 @@ my $output;
 my $exit_status;
 my $sample  = "t/pt-online-schema-change/samples/";
 
-$sb->load_file('master', "$sample/pt-153.sql");
+$sb->load_file('source', "$sample/pt-153.sql");
 
 ($output, $exit_status) = full_output(
-   sub { pt_online_schema_change::main(@args, "$master_dsn,D=test,t=t1",
+   sub { pt_online_schema_change::main(@args, "$source_dsn,D=test,t=t1",
          '--execute', 
          '--alter', "ADD UNIQUE INDEX c1 (f2, f3)",
          ),
@@ -63,7 +63,7 @@ like(
 );
 
 ($output, $exit_status) = full_output(
-   sub { pt_online_schema_change::main(@args, "$master_dsn,D=test,t=t1",
+   sub { pt_online_schema_change::main(@args, "$source_dsn,D=test,t=t1",
          '--execute', 
          '--alter', "ADD UNIQUE INDEX c1 (f2, f3), PRIMARY KEY (f3), UNIQUE KEY k2 (f3)",
          ),
@@ -88,11 +88,11 @@ like(
       "PT-153 Adding multiple unique indexes -> multime example queries.",
 );
 
-$master_dbh->do("DROP DATABASE IF EXISTS test");
+$source_dbh->do("DROP DATABASE IF EXISTS test");
 
 # #############################################################################
 # 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;
diff --git a/t/pt-online-schema-change/pt-1574.t b/t/pt-online-schema-change/pt-1574.t
index 2248c5d3c..6b3c4644b 100644
--- a/t/pt-online-schema-change/pt-1574.t
+++ b/t/pt-online-schema-change/pt-1574.t
@@ -32,8 +32,8 @@ require "$trunk/bin/pt-online-schema-change";
 my $dp = new DSNParser(opts=>$dsn_opts);
 my $sb = new Sandbox(basedir => '/tmp', DSNParser => $dp);
 
-my $dbh = $sb->get_dbh_for('master');
-my $dsn = $sb->dsn_for("master");
+my $dbh = $sb->get_dbh_for('source');
+my $dsn = $sb->dsn_for("source");
 
 # 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
@@ -42,7 +42,7 @@ my @args = (qw(--set-vars innodb_lock_wait_timeout=3));
 my $output;
 my $exit_status;
 
-$sb->load_file('master', "t/pt-online-schema-change/samples/pt-1574.sql");
+$sb->load_file('source', "t/pt-online-schema-change/samples/pt-1574.sql");
 
 ($output, $exit_status) = full_output(
     sub { pt_online_schema_change::main(@args, "$dsn,D=test,t=t1",
diff --git a/t/pt-online-schema-change/pt-169.t b/t/pt-online-schema-change/pt-169.t
index 719a51ff2..0562f17df 100644
--- a/t/pt-online-schema-change/pt-169.t
+++ b/t/pt-online-schema-change/pt-169.t
@@ -24,14 +24,14 @@ require "$trunk/bin/pt-online-schema-change";
 
 my $dp = new DSNParser(opts=>$dsn_opts);
 my $sb = new Sandbox(basedir => '/tmp', DSNParser => $dp);
-my $master_dbh = $sb->get_dbh_for('master');
-my $master_dsn = 'h=127.1,P=12345,u=msandbox,p=msandbox';
+my $source_dbh = $sb->get_dbh_for('source');
+my $source_dsn = 'h=127.1,P=12345,u=msandbox,p=msandbox';
 
-if ( !$master_dbh ) {
-   plan skip_all => 'Cannot connect to sandbox master';
+if ( !$source_dbh ) {
+   plan skip_all => 'Cannot connect to sandbox source';
 }
 
-my $vp = VersionParser->new($master_dbh);
+my $vp = VersionParser->new($source_dbh);
 
 if ($vp->cmp('8.0') > -1 && $vp->cmp('8.0.14') < 0 && $vp->flavor() !~ m/maria/i) {
     plan skip_all => 'Drop swap does not work with MySQL 8.0 - 8.0.13';
@@ -48,10 +48,10 @@ my $exit_status;
 my $sample  = "t/pt-online-schema-change/samples/";
 my $ERROR_UPDATING_FKS = 15; # from pt-online-schema-change line 8453
 
-$sb->load_file('master', "$sample/pt-169.sql");
+$sb->load_file('source', "$sample/pt-169.sql");
 
 ($output, $exit_status) = full_output(
-   sub { pt_online_schema_change::main(@args, "$master_dsn,D=test,t=users",
+   sub { pt_online_schema_change::main(@args, "$source_dsn,D=test,t=users",
          '--execute', '--alter', 'CHANGE COLUMN id id BIGINT UNSIGNED NOT NULL FIRST', 
          '--set-vars', 'foreign_key_checks=0',
          '--alter-foreign-keys-method', 'drop_swap',  '--no-check-alter')
@@ -68,18 +68,18 @@ is(
 # 2
 # Since drop_swap has failed, the clueanup process should be skipped and the new table
 # shouldn't be deleted
-my $row = $master_dbh->selectrow_hashref("select count(*) AS how_many from test._users_new");
+my $row = $source_dbh->selectrow_hashref("select count(*) AS how_many from test._users_new");
 is (
     $row->{how_many},
     1,
     "Correct number of rows",
 ) or diag($row);
 
-$master_dbh->do("DROP DATABASE IF EXISTS test");
+$source_dbh->do("DROP DATABASE IF EXISTS test");
 
 # #############################################################################
 # 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;
diff --git a/t/pt-online-schema-change/pt-1717-history.t b/t/pt-online-schema-change/pt-1717-history.t
index 44cd33555..6c38d8f04 100644
--- a/t/pt-online-schema-change/pt-1717-history.t
+++ b/t/pt-online-schema-change/pt-1717-history.t
@@ -20,14 +20,14 @@ use Data::Dumper;
 
 my $dp         = new DSNParser(opts=>$dsn_opts);
 my $sb         = new Sandbox(basedir => '/tmp', DSNParser => $dp);
-my $master_dbh = $sb->get_dbh_for('master');
-my $slave_dbh  = $sb->get_dbh_for('slave1');
+my $source_dbh = $sb->get_dbh_for('source');
+my $replica_dbh  = $sb->get_dbh_for('replica1');
 
-if ( !$master_dbh ) {
-   plan skip_all => 'Cannot connect to sandbox master';
+if ( !$source_dbh ) {
+   plan skip_all => 'Cannot connect to sandbox source';
 }
-elsif ( !$slave_dbh ) {
-   plan skip_all => 'Cannot connect to sandbox slave';
+elsif ( !$replica_dbh ) {
+   plan skip_all => 'Cannot connect to sandbox replica';
 }
 
 my @args   = qw(--set-vars innodb_lock_wait_timeout=3);
@@ -36,7 +36,7 @@ my $dsn    = "h=127.1,P=12345,u=msandbox,p=msandbox";
 my $exit   = 0;
 my $sample = "t/pt-online-schema-change/samples";
 
-$sb->load_file('master', "$sample/basic_no_fks_innodb.sql");
+$sb->load_file('source', "$sample/basic_no_fks_innodb.sql");
 
 ($output, $exit) = full_output(
    sub { pt_online_schema_change::main(@args, "$dsn,D=pt_osc,t=t",
@@ -327,7 +327,7 @@ is(
 # 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;
diff --git a/t/pt-online-schema-change/pt-1717-resume.t b/t/pt-online-schema-change/pt-1717-resume.t
index 3337d4de8..ecd18e70b 100644
--- a/t/pt-online-schema-change/pt-1717-resume.t
+++ b/t/pt-online-schema-change/pt-1717-resume.t
@@ -36,12 +36,12 @@ if ($sb->is_cluster_mode) {
     plan skip_all => 'Not for PXC';
 }
 
-my $master_dbh = $sb->get_dbh_for('master');
-my $slave_dbh1 = $sb->get_dbh_for('slave1');
-my $slave_dbh2 = $sb->get_dbh_for('slave2');
-my $master_dsn = 'h=127.0.0.1,P=12345,u=msandbox,p=msandbox';
-my $slave_dsn1 = 'h=127.0.0.1,P=12346,u=msandbox,p=msandbox';
-my $slave_dsn2 = 'h=127.0.0.1,P=12347,u=msandbox,p=msandbox';
+my $source_dbh = $sb->get_dbh_for('source');
+my $replica_dbh1 = $sb->get_dbh_for('replica1');
+my $replica_dbh2 = $sb->get_dbh_for('replica2');
+my $source_dsn = 'h=127.0.0.1,P=12345,u=msandbox,p=msandbox';
+my $replica_dsn1 = 'h=127.0.0.1,P=12346,u=msandbox,p=msandbox';
+my $replica_dsn2 = 'h=127.0.0.1,P=12347,u=msandbox,p=msandbox';
 my $sample     = "t/pt-online-schema-change/samples";
 my $plugin     = "$trunk/$sample/plugins";
 
@@ -77,7 +77,7 @@ sub run_broken_job {
    }
 
    sleep($max_lag + $max_lag/2);
-   # stop slave 12347
+   # stop replica 12347
    diag(`/tmp/12347/stop >/dev/null`);
    sleep 1;
 
@@ -91,38 +91,38 @@ sub run_broken_job {
 }
 
 sub set_delay {
-   $sb->wait_for_slaves();
+   $sb->wait_for_replicas();
 
-   diag("Setting slave delay to $delay seconds");
+   diag("Setting replica delay to $delay seconds");
    diag(`/tmp/12345/use -N test -e "DROP TABLE IF EXISTS pt1717_back"`);
 
-   $slave_dbh1->do('STOP SLAVE');
-   $slave_dbh1->do("CHANGE MASTER TO MASTER_DELAY=$delay");
-   $slave_dbh1->do('START SLAVE');
+   $replica_dbh1->do("STOP ${replica_name}");
+   $replica_dbh1->do("CHANGE ${source_change} TO ${source_name}_DELAY=$delay");
+   $replica_dbh1->do("START ${replica_name}");
 
-   # Run a full table scan query to ensure the slave is behind the master
+   # Run a full table scan query to ensure the replica is behind the source
    # There is no query cache in MySQL 8.0+
-   reset_query_cache($master_dbh, $master_dbh);
-   # Update one row so slave is delayed
-   $master_dbh->do('UPDATE `test`.`pt1717` SET f2 = f2 + 1 LIMIT 1');
-   $master_dbh->do('UPDATE `test`.`pt1717` SET f2 = f2 + 1 WHERE f1 = ""');
+   reset_query_cache($source_dbh, $source_dbh);
+   # Update one row so replica is delayed
+   $source_dbh->do('UPDATE `test`.`pt1717` SET f2 = f2 + 1 LIMIT 1');
+   $source_dbh->do('UPDATE `test`.`pt1717` SET f2 = f2 + 1 WHERE f1 = ""');
 
    # Creating copy of table pt1717, so we can compare data later
    diag(`/tmp/12345/use -N test -e "CREATE TABLE pt1717_back like pt1717"`);
    diag(`/tmp/12345/use -N test -e "INSERT INTO pt1717_back SELECT * FROM pt1717"`);
 }
 
-# 1) Set the slave delay to 0 just in case we are re-running the tests without restarting the sandbox.
+# 1) Set the replica delay to 0 just in case we are re-running the tests without restarting the sandbox.
 # 2) Load sample data
-# 3) Set the slave delay to 30 seconds to be able to see the 'waiting' message.
-diag("Setting slave delay to 0 seconds");
-$slave_dbh1->do('STOP SLAVE');
-$master_dbh->do("RESET MASTER");
-$slave_dbh1->do('RESET SLAVE');
-$slave_dbh1->do('START SLAVE');
+# 3) Set the replica delay to 30 seconds to be able to see the 'waiting' message.
+diag("Setting replica delay to 0 seconds");
+$replica_dbh1->do("STOP ${replica_name}");
+$source_dbh->do("RESET ${source_reset}");
+$replica_dbh1->do("RESET ${replica_name}");
+$replica_dbh1->do("START ${replica_name}");
 
 diag('Loading test data');
-$sb->load_file('master', "t/pt-online-schema-change/samples/pt-1717.sql");
+$sb->load_file('source', "t/pt-online-schema-change/samples/pt-1717.sql");
 
 # Should be greater than chunk-size and big enough, so pt-osc will wait for delay
 my $num_rows = 5000;
@@ -134,10 +134,10 @@ diag("Starting tests...");
 
 set_delay();
 
-# We need to sleep, otherwise pt-osc can finish before slave is delayed
+# We need to sleep, otherwise pt-osc can finish before replica is delayed
 sleep($max_lag);
 
-my $args = "$master_dsn,D=test,t=pt1717 --execute --chunk-size ${chunk_size} --max-lag $max_lag --alter 'engine=INNODB' --pid $tmp_file_name --progress time,5 --no-drop-new-table --no-drop-triggers --history";
+my $args = "$source_dsn,D=test,t=pt1717 --execute --chunk-size ${chunk_size} --max-lag $max_lag --alter 'engine=INNODB' --pid $tmp_file_name --progress time,5 --no-drop-new-table --no-drop-triggers --history";
 
 $output = run_broken_job($args);
 
@@ -148,7 +148,7 @@ like(
 ) or diag($output);
 
 diag(`/tmp/12347/start >/dev/null`);
-$sb->wait_for_slaves();
+$sb->wait_for_replicas();
 
 $output = `/tmp/12345/use -N -e "select job_id, upper_boundary from percona.pt_osc_history"`;
 my ($job_id, $upper_boundary) = split(/\s+/, $output);
@@ -164,7 +164,7 @@ ok(
 my @args = (qw(--execute --chunk-size=10 --history));
 
 ($output, $exit) = full_output(
-   sub { pt_online_schema_change::main(@args, "$master_dsn,D=test,t=pt1717",
+   sub { pt_online_schema_change::main(@args, "$source_dsn,D=test,t=pt1717",
          '--alter', 'engine=INNODB', '--execute', "--resume=${job_id}",
          '--chunk-index=f2'
          ) }
@@ -183,7 +183,7 @@ like(
 ) or diag($output);
 
 ($output, $exit) = full_output(
-   sub { pt_online_schema_change::main(@args, "$master_dsn,D=test,t=pt1717",
+   sub { pt_online_schema_change::main(@args, "$source_dsn,D=test,t=pt1717",
          '--max-lag', $max_lag,
          '--resume', $job_id,
          '--alter', 'engine=INNODB',
@@ -209,7 +209,7 @@ ok(
 ) or diag("New table checksum: '${new_table_checksum}', original content checksum: '${old_table_checksum}'");
 
 # Tests for chunk-index and chunk-index-columns options
-$args = "$master_dsn,D=test,t=pt1717 --alter engine=innodb --execute --history --chunk-size=10 --no-drop-new-table --no-drop-triggers --reverse-triggers --chunk-index=f2";
+$args = "$source_dsn,D=test,t=pt1717 --alter engine=innodb --execute --history --chunk-size=10 --no-drop-new-table --no-drop-triggers --reverse-triggers --chunk-index=f2";
 
 set_delay();
 $output = run_broken_job($args);
@@ -219,7 +219,7 @@ $output =~ /History saved. Job id: (\d+)/ms;
 $job_id = $1;
 
 ($output, $exit) = full_output(
-   sub { pt_online_schema_change::main(@args, "$master_dsn,D=test,t=pt1717",
+   sub { pt_online_schema_change::main(@args, "$source_dsn,D=test,t=pt1717",
          '--alter', 'engine=innodb', '--execute', "--resume=${job_id}",
          ) }
 );
@@ -237,7 +237,7 @@ like(
 ) or diag($output);
 
 ($output, $exit) = full_output(
-   sub { pt_online_schema_change::main(@args, "$master_dsn,D=test,t=pt1717",
+   sub { pt_online_schema_change::main(@args, "$source_dsn,D=test,t=pt1717",
          '--alter', 'engine=innodb', '--execute', "--resume=${job_id}",
          '--chunk-index=f1'
          ) }
@@ -256,7 +256,7 @@ like(
 ) or diag($output);
 
 ($output, $exit) = full_output(
-   sub { pt_online_schema_change::main(@args, "$master_dsn,D=test,t=pt1717",
+   sub { pt_online_schema_change::main(@args, "$source_dsn,D=test,t=pt1717",
          '--alter', 'engine=innodb', '--execute', "--resume=${job_id}",
          '--chunk-index=f2', '--chunk-index-columns=1'
          ) }
@@ -299,7 +299,7 @@ is(
 );
 
 ($output, $exit) = full_output(
-   sub { pt_online_schema_change::main(@args, "$master_dsn,D=test,t=pt1717",
+   sub { pt_online_schema_change::main(@args, "$source_dsn,D=test,t=pt1717",
          '--alter', 'engine=innodb', '--execute', "--resume=${job_id}",
          '--chunk-size=4',
          '--chunk-index=f2'
@@ -347,7 +347,7 @@ ok(
 `/tmp/12345/use test -N -e "UPDATE percona.pt_osc_history SET done = 'no' where job_id='${job_id}'"`;
 
 ($output, $exit) = full_output(
-   sub { pt_online_schema_change::main(@args, "$master_dsn,D=test,t=pt1717",
+   sub { pt_online_schema_change::main(@args, "$source_dsn,D=test,t=pt1717",
          '--alter', 'engine=innodb', '--execute', "--resume=${job_id}",
          '--chunk-size=4',
          '--chunk-index=f2'
@@ -371,7 +371,7 @@ $output =~ /New table `test`.`([_]+pt1717_new)` not found, restart operation fro
 `/tmp/12345/use test -N -e "CREATE TABLE $1 LIKE pt1717"`;
 
 ($output, $exit) = full_output(
-   sub { pt_online_schema_change::main(@args, "$master_dsn,D=test,t=pt1717",
+   sub { pt_online_schema_change::main(@args, "$source_dsn,D=test,t=pt1717",
          '--alter', 'engine=innodb', '--execute', "--resume=${job_id}",
          '--chunk-size=4',
          '--chunk-index=f2'
@@ -394,16 +394,16 @@ like(
 # Done.
 # #############################################################################
 diag("Cleaning");
-$slave_dbh2 = $sb->get_dbh_for('slave2');
-diag("Setting slave delay to 0 seconds");
-$slave_dbh1->do('STOP SLAVE');
-$slave_dbh2->do('STOP SLAVE');
-$master_dbh->do('RESET MASTER');
-$slave_dbh1->do('RESET MASTER');
-$slave_dbh1->do('RESET SLAVE');
-$slave_dbh2->do('RESET SLAVE');
-$slave_dbh1->do('START SLAVE');
-$slave_dbh2->do('START SLAVE');
+$replica_dbh2 = $sb->get_dbh_for('replica2');
+diag("Setting replica delay to 0 seconds");
+$replica_dbh1->do("STOP ${replica_name}");
+$replica_dbh2->do("STOP ${replica_name}");
+$source_dbh->do("RESET ${source_reset}");
+$replica_dbh1->do("RESET ${source_reset}");
+$replica_dbh1->do("RESET ${replica_name}");
+$replica_dbh2->do("RESET ${replica_name}");
+$replica_dbh1->do("START ${replica_name}");
+$replica_dbh2->do("START ${replica_name}");
 
 diag(`mv $cnf.bak $cnf`);
 
@@ -411,9 +411,9 @@ diag(`/tmp/12347/stop >/dev/null`);
 diag(`/tmp/12347/start >/dev/null`);
 
 diag("Dropping test database");
-$master_dbh->do("DROP DATABASE IF EXISTS test");
-$sb->wait_for_slaves();
+$source_dbh->do("DROP DATABASE IF EXISTS test");
+$sb->wait_for_replicas();
 
-$sb->wipe_clean($master_dbh);
+$sb->wipe_clean($source_dbh);
 ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox");
 done_testing;
diff --git a/t/pt-online-schema-change/pt-1751.t b/t/pt-online-schema-change/pt-1751.t
index 4d9cb92b9..72bd4d7af 100644
--- a/t/pt-online-schema-change/pt-1751.t
+++ b/t/pt-online-schema-change/pt-1751.t
@@ -20,14 +20,14 @@ use Data::Dumper;
 
 my $dp         = new DSNParser(opts=>$dsn_opts);
 my $sb         = new Sandbox(basedir => '/tmp', DSNParser => $dp);
-my $master_dbh = $sb->get_dbh_for('master');
-my $slave_dbh  = $sb->get_dbh_for('slave1');
+my $source_dbh = $sb->get_dbh_for('source');
+my $replica_dbh  = $sb->get_dbh_for('replica1');
 
-if ( !$master_dbh ) {
-   plan skip_all => 'Cannot connect to sandbox master';
+if ( !$source_dbh ) {
+   plan skip_all => 'Cannot connect to sandbox source';
 }
-elsif ( !$slave_dbh ) {
-   plan skip_all => 'Cannot connect to sandbox slave';
+elsif ( !$replica_dbh ) {
+   plan skip_all => 'Cannot connect to sandbox replica';
 }
 
 my @args   = qw(--set-vars innodb_lock_wait_timeout=3);
@@ -36,7 +36,7 @@ my $dsn    = "h=127.1,P=12345,u=msandbox,p=msandbox";
 my $exit   = 0;
 my $sample = "t/pt-online-schema-change/samples";
 
-$sb->load_file('master', "$sample/basic_no_fks_innodb.sql");
+$sb->load_file('source', "$sample/basic_no_fks_innodb.sql");
 
 # #############################################################################
 # --where does not run without --no-drop-new-table and --no-swap-tables
@@ -127,7 +127,7 @@ is(
    'Rows, satisfying --where condition are not copied'
 ) or diag($output);
 
-$sb->load_file('master', "$sample/basic_no_fks_innodb.sql");
+$sb->load_file('source', "$sample/basic_no_fks_innodb.sql");
 
 $output = output(
    sub { pt_online_schema_change::main(@args, "$dsn,D=pt_osc,t=t",
@@ -157,7 +157,7 @@ is(
 
 # Same test with chunk size = 1
 
-$sb->load_file('master', "$sample/basic_no_fks_innodb.sql");
+$sb->load_file('source', "$sample/basic_no_fks_innodb.sql");
 
 $output = output(
    sub { pt_online_schema_change::main(@args, "$dsn,D=pt_osc,t=t",
@@ -186,7 +186,7 @@ is(
    'Rows, satisfying --where condition are not copied'
 ) or diag($output);
 
-$sb->load_file('master', "$sample/basic_no_fks_innodb.sql");
+$sb->load_file('source', "$sample/basic_no_fks_innodb.sql");
 
 $output = output(
    sub { pt_online_schema_change::main(@args, "$dsn,D=pt_osc,t=t",
@@ -219,7 +219,7 @@ is(
 # Option --where and foreign keys
 # #############################################################################
 
-$sb->load_file('master', "$sample/basic_with_fks.sql");
+$sb->load_file('source', "$sample/basic_with_fks.sql");
 
 $output = output(
    sub { pt_online_schema_change::main(@args, "$dsn,D=pt_osc,t=city",
@@ -261,7 +261,7 @@ is(
    'Table address not modified'
 ) or diag($output);
 
-$sb->load_file('master', "$sample/basic_with_fks.sql");
+$sb->load_file('source', "$sample/basic_with_fks.sql");
 
 $output = output(
    sub { pt_online_schema_change::main(@args, "$dsn,D=pt_osc,t=city",
@@ -303,7 +303,7 @@ is(
    'Table address not modified'
 ) or diag($output);
 
-$sb->load_file('master', "$sample/basic_with_fks.sql");
+$sb->load_file('source', "$sample/basic_with_fks.sql");
 
 $output = output(
    sub { pt_online_schema_change::main(@args, "$dsn,D=pt_osc,t=city",
@@ -345,7 +345,7 @@ is(
    'Table address not modified'
 ) or diag($output);
 
-$sb->load_file('master', "$sample/basic_with_fks.sql");
+$sb->load_file('source', "$sample/basic_with_fks.sql");
 
 $output = output(
    sub { pt_online_schema_change::main(@args, "$dsn,D=pt_osc,t=city",
@@ -387,7 +387,7 @@ is(
    'Table address not modified'
 ) or diag($output);
 
-$sb->load_file('master', "$sample/basic_with_fks.sql");
+$sb->load_file('source', "$sample/basic_with_fks.sql");
 
 ($output, $exit) = full_output(
    sub { pt_online_schema_change::main(@args, "$dsn,D=pt_osc,t=city",
@@ -415,7 +415,7 @@ is(
    'Table address not modified'
 ) or diag($output);
 
-$sb->load_file('master', "$sample/basic_with_fks.sql");
+$sb->load_file('source', "$sample/basic_with_fks.sql");
 
 ($output, $exit) = full_output(
    sub { pt_online_schema_change::main(@args, "$dsn,D=pt_osc,t=city",
@@ -440,7 +440,7 @@ is(
 # 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;
diff --git a/t/pt-online-schema-change/pt-1760.t b/t/pt-online-schema-change/pt-1760.t
index 3b8580514..32d7b70f0 100644
--- a/t/pt-online-schema-change/pt-1760.t
+++ b/t/pt-online-schema-change/pt-1760.t
@@ -33,31 +33,36 @@ if ($sb->is_cluster_mode) {
     plan skip_all => 'Not for PXC';
 }
 
-my $master_dbh = $sb->get_dbh_for('master');
-my $slave_dbh1 = $sb->get_dbh_for('slave1');
-my $slave_dbh2 = $sb->get_dbh_for('slave2');
-my $master_dsn = 'h=127.0.0.1,P=12345,u=msandbox,p=msandbox';
-my $slave_dsn1 = 'h=127.0.0.1,P=12346,u=msandbox,p=msandbox';
-my $slave_dsn2 = 'h=127.0.0.1,P=12347,u=msandbox,p=msandbox';
+my $source_dbh = $sb->get_dbh_for('source');
+my $replica_dbh1 = $sb->get_dbh_for('replica1');
+my $replica_dbh2 = $sb->get_dbh_for('replica2');
+my $source_dsn = 'h=127.0.0.1,P=12345,u=msandbox,p=msandbox';
+my $replica_dsn1 = 'h=127.0.0.1,P=12346,u=msandbox,p=msandbox';
+my $replica_dsn2 = 'h=127.0.0.1,P=12347,u=msandbox,p=msandbox';
 my $sample = "t/pt-online-schema-change/samples";
-my ($orig_master_info_repository) = $slave_dbh1->selectrow_array(q{SELECT @@master_info_repository});
-my ($orig_relay_log_info_repository) = $slave_dbh1->selectrow_array(q{SELECT @@relay_log_info_repository});
+my ($orig_master_info_repository, $orig_relay_log_info_repository);
+if ( $sandbox_version < '8.4' ) {
+   ($orig_master_info_repository) = $replica_dbh1->selectrow_array(q{SELECT @@master_info_repository});
+   ($orig_relay_log_info_repository) = $replica_dbh1->selectrow_array(q{SELECT @@relay_log_info_repository});
+}
 
-$slave_dbh1->do("stop slave");
-$slave_dbh1->do("reset slave all");
-$slave_dbh1->do("SET GLOBAL master_info_repository='TABLE'");
-$slave_dbh1->do("SET GLOBAL relay_log_info_repository='TABLE'");
-$slave_dbh1->do("CHANGE MASTER TO MASTER_HOST='127.0.0.1', MASTER_PORT=12345, MASTER_USER = 'msandbox', MASTER_PASSWORD='msandbox' FOR CHANNEL 'channel1';");
-$slave_dbh1->do("start slave");
+$replica_dbh1->do("stop ${replica_name}");
+$replica_dbh1->do("reset ${replica_name} all");
+if ( $sandbox_version < '8.4' ) {
+   $replica_dbh1->do("SET GLOBAL master_info_repository='TABLE'");
+   $replica_dbh1->do("SET GLOBAL relay_log_info_repository='TABLE'");
+}
+$replica_dbh1->do("CHANGE ${source_change} TO ${source_name}_HOST='127.0.0.1', ${source_name}_PORT=12345, ${source_name}_USER = 'msandbox', ${source_name}_PASSWORD='msandbox' FOR CHANNEL 'channel1';");
+$replica_dbh1->do("start ${replica_name}");
 
 diag('Loading test data');
-$sb->load_file('master', "t/pt-online-schema-change/samples/slave_lag.sql");
+$sb->load_file('source', "t/pt-online-schema-change/samples/replica_lag.sql");
 my $num_rows = 5000;
 diag("Loading $num_rows into the table. This might take some time.");
 diag(`util/mysql_random_data_load --host=127.0.0.1 --port=12345 --user=msandbox --password=msandbox test pt178 $num_rows`);
 
 my $output = output(
-   sub { pt_online_schema_change::main("$master_dsn,D=test,t=pt178",
+   sub { pt_online_schema_change::main("$source_dsn,D=test,t=pt178,s=1",
          '--execute', 
          '--alter', "force",
          '--recurse', '1',
@@ -75,15 +80,17 @@ like(
 # #############################################################################
 # Done.
 # #############################################################################
-$slave_dbh1->do('STOP SLAVE');
-$master_dbh->do("RESET MASTER");
-$slave_dbh1->do('RESET SLAVE ALL');
-$slave_dbh1->do("SET GLOBAL master_info_repository='${orig_master_info_repository}'");
-$slave_dbh1->do("SET GLOBAL relay_log_info_repository='${orig_relay_log_info_repository}'");
-$slave_dbh1->do("CHANGE MASTER TO MASTER_HOST='127.0.0.1', MASTER_PORT=12345, MASTER_USER = 'msandbox', MASTER_PASSWORD='msandbox';");
-$slave_dbh1->do('START SLAVE');
-
-$sb->wipe_clean($master_dbh);
+$replica_dbh1->do("STOP ${replica_name}");
+$source_dbh->do("RESET ${source_reset}");
+$replica_dbh1->do("RESET ${replica_name} ALL");
+if ( $sandbox_version < '8.4' ) {
+   $replica_dbh1->do("SET GLOBAL master_info_repository='${orig_master_info_repository}'");
+   $replica_dbh1->do("SET GLOBAL relay_log_info_repository='${orig_relay_log_info_repository}'");
+}
+$replica_dbh1->do("CHANGE ${source_change} TO ${source_name}_HOST='127.0.0.1', ${source_name}_PORT=12345, ${source_name}_USER = 'msandbox', ${source_name}_PASSWORD='msandbox';");
+$replica_dbh1->do("START ${replica_name}");
+
+$sb->wipe_clean($source_dbh);
 ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox");
 done_testing;
 
diff --git a/t/pt-online-schema-change/pt-1853.t b/t/pt-online-schema-change/pt-1853.t
index 79b89cb7a..43d0f096d 100644
--- a/t/pt-online-schema-change/pt-1853.t
+++ b/t/pt-online-schema-change/pt-1853.t
@@ -27,8 +27,8 @@ plan tests => 3;
 
 my $dp = new DSNParser(opts=>$dsn_opts);
 my $sb = new Sandbox(basedir => '/tmp', DSNParser => $dp);
-my $master_dbh = $sb->get_dbh_for("master");
-my $master_dsn = $sb->dsn_for("master");
+my $source_dbh = $sb->get_dbh_for("source");
+my $source_dsn = $sb->dsn_for("source");
 
 # 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
@@ -37,10 +37,10 @@ my @args = (qw(--set-vars innodb_lock_wait_timeout=3));
 my $output;
 my $exit_status;
 
-$sb->load_file('master', "t/pt-online-schema-change/samples/pt-1853.sql");
+$sb->load_file('source', "t/pt-online-schema-change/samples/pt-1853.sql");
 
 ($output, $exit_status) = full_output(
-    sub { pt_online_schema_change::main(@args, "$master_dsn,D=test,t=jointit",
+    sub { pt_online_schema_change::main(@args, "$source_dsn,D=test,t=jointit",
             '--execute', 
             '--alter', "engine=innodb",
             '--alter-foreign-keys-method', 'rebuild_constraints'
@@ -56,7 +56,7 @@ isnt(
 );
 
 ($output, $exit_status) = full_output(
-    sub { pt_online_schema_change::main(@args, "$master_dsn,D=test,t=jointit",
+    sub { pt_online_schema_change::main(@args, "$source_dsn,D=test,t=jointit",
             '--execute', 
             '--alter', "engine=innodb",
             '--alter-foreign-keys-method', 'rebuild_constraints',
@@ -75,6 +75,6 @@ isnt(
 # #############################################################################
 # 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;
diff --git a/t/pt-online-schema-change/pt-186.t b/t/pt-online-schema-change/pt-186.t
index 322196a7d..801c20276 100644
--- a/t/pt-online-schema-change/pt-186.t
+++ b/t/pt-online-schema-change/pt-186.t
@@ -25,11 +25,11 @@ require "$trunk/bin/pt-online-schema-change";
 
 my $dp = new DSNParser(opts=>$dsn_opts);
 my $sb = new Sandbox(basedir => '/tmp', DSNParser => $dp);
-my $master_dbh = $sb->get_dbh_for('master');
-my $master_dsn = 'h=127.1,P=12345,u=msandbox,p=msandbox';
+my $source_dbh = $sb->get_dbh_for('source');
+my $source_dsn = 'h=127.1,P=12345,u=msandbox,p=msandbox';
 
-if ( !$master_dbh ) {
-   plan skip_all => 'Cannot connect to sandbox master';
+if ( !$source_dbh ) {
+   plan skip_all => 'Cannot connect to sandbox source';
 }
 
 # The sandbox servers run with lock_wait_timeout=3 and it's not dynamic
@@ -40,12 +40,12 @@ my $output;
 my $exit_status;
 my $sample  = "t/pt-online-schema-change/samples/";
 
-$sb->load_file('master', "$sample/pt-186.sql");
+$sb->load_file('source', "$sample/pt-186.sql");
 
-my $ori_rows = $master_dbh->selectall_arrayref('SELECT * FROM test.t1');
+my $ori_rows = $source_dbh->selectall_arrayref('SELECT * FROM test.t1');
 
 ($output, $exit_status) = full_output(
-   sub { pt_online_schema_change::main(@args, "$master_dsn,D=test,t=t1",
+   sub { pt_online_schema_change::main(@args, "$source_dsn,D=test,t=t1",
          '--execute', '--no-check-alter', 
          '--alter', 'CHANGE COLUMN `Last_referenced` `c11` INT NOT NULL default 99'
          ),
@@ -58,7 +58,7 @@ is(
       "--alter rename columns with uppercase names -> exit status 0",
 );
 
-my $structure = $master_dbh->selectall_arrayref('DESCRIBE test.t1');
+my $structure = $source_dbh->selectall_arrayref('DESCRIBE test.t1');
 my $want = [ 'c11', 'int(11)', 'NO', 'MUL', '99', '' ];
 if ($sandbox_version ge '8.0') {
     $want = [ 'c11', 'int', 'NO', 'MUL', '99', '' ];
@@ -70,7 +70,7 @@ is_deeply(
     '--alter rename columns with uppercase names -> Column was renamed'
 );
 
-my $new_rows = $master_dbh->selectall_arrayref('SELECT * FROM test.t1');
+my $new_rows = $source_dbh->selectall_arrayref('SELECT * FROM test.t1');
 
 is_deeply(
        $ori_rows,
@@ -79,11 +79,11 @@ is_deeply(
  );
  
 
-$master_dbh->do("DROP DATABASE IF EXISTS test");
+$source_dbh->do("DROP DATABASE IF EXISTS test");
 
 # #############################################################################
 # 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;
diff --git a/t/pt-online-schema-change/pt-1914.t b/t/pt-online-schema-change/pt-1914.t
index 6d5b645bc..2d5d8be18 100644
--- a/t/pt-online-schema-change/pt-1914.t
+++ b/t/pt-online-schema-change/pt-1914.t
@@ -27,14 +27,14 @@ $Data::Dumper::Quotekeys = 0;
 
 my $dp         = new DSNParser(opts=>$dsn_opts);
 my $sb         = new Sandbox(basedir => '/tmp', DSNParser => $dp);
-my $master_dbh = $sb->get_dbh_for('master');
-my $slave_dbh  = $sb->get_dbh_for('slave1');
+my $source_dbh = $sb->get_dbh_for('source');
+my $replica_dbh  = $sb->get_dbh_for('replica1');
 
-if ( !$master_dbh ) {
-    plan skip_all => 'Cannot connect to sandbox master';
+if ( !$source_dbh ) {
+    plan skip_all => 'Cannot connect to sandbox source';
 }
-elsif ( !$slave_dbh ) {
-    plan skip_all => 'Cannot connect to sandbox slave';
+elsif ( !$replica_dbh ) {
+    plan skip_all => 'Cannot connect to sandbox replica';
 }
 
 my $q      = new Quoter();
@@ -66,12 +66,12 @@ sub test_alter_table {
     my $delete_triggers = $args{delete_triggers} || '';
 
     if ( my $file = $args{file} ) {
-        $sb->load_file('master', "$sample/$file");
-        $master_dbh->do("USE `$db`");
-        $slave_dbh->do("USE `$db`");
+        $sb->load_file('source', "$sample/$file");
+        $source_dbh->do("USE `$db`");
+        $replica_dbh->do("USE `$db`");
     }
 
-    my $ddl        = $tp->get_create_table($master_dbh, $db, $tbl);
+    my $ddl        = $tp->get_create_table($source_dbh, $db, $tbl);
     my $tbl_struct = $tp->parse($ddl);
 
     my $cols = '*';
@@ -81,13 +81,13 @@ sub test_alter_table {
         die "I need a drop_col argument" unless $col;
         $cols = join(', ', grep { $_ ne $col } @{$tbl_struct->{cols}});
     }
-    my $orig_rows = $master_dbh->selectall_arrayref(
+    my $orig_rows = $source_dbh->selectall_arrayref(
         "SELECT $cols FROM $table ORDER BY `$pk_col`");
 
-    my $orig_tbls = $master_dbh->selectall_arrayref(
+    my $orig_tbls = $source_dbh->selectall_arrayref(
         "SHOW TABLES FROM `$db`");
 
-    my $orig_max_id = $master_dbh->selectall_arrayref(
+    my $orig_max_id = $source_dbh->selectall_arrayref(
         "SELECT MAX(`$pk_col`) FROM `$db`.`$tbl`");
 
     my $triggers_sql = "SELECT TRIGGER_SCHEMA, TRIGGER_NAME, DEFINER, ACTION_STATEMENT, SQL_MODE, "
@@ -97,7 +97,7 @@ sub test_alter_table {
     .  "  AND EVENT_OBJECT_TABLE = '$tbl'";
 
 
-    my $orig_triggers = $master_dbh->selectall_arrayref($triggers_sql);
+    my $orig_triggers = $source_dbh->selectall_arrayref($triggers_sql);
 
     my ($orig_auto_inc) = $ddl =~ m/\s+AUTO_INCREMENT=(\d+)\s+/;
 
@@ -106,7 +106,7 @@ sub test_alter_table {
     if ( $fk_method ) {
         foreach my $tbl ( @$orig_tbls ) {
             my $fks = $tp->get_fks(
-                $tp->get_create_table($master_dbh, $db, $tbl->[0]));
+                $tp->get_create_table($source_dbh, $db, $tbl->[0]));
             push @orig_fks, $fks;
         }
     }
@@ -130,7 +130,7 @@ sub test_alter_table {
         stderr => 1,
     );
 
-    my $new_ddl = $tp->get_create_table($master_dbh, $db, $tbl);
+    my $new_ddl = $tp->get_create_table($source_dbh, $db, $tbl);
     my $new_tbl_struct = $tp->parse($new_ddl);
     my $fail    = 0;
 
@@ -141,7 +141,7 @@ sub test_alter_table {
     ) or $fail = 1;
 
     # There should be no new or missing tables.
-    my $new_tbls = $master_dbh->selectall_arrayref("SHOW TABLES FROM `$db`");
+    my $new_tbls = $source_dbh->selectall_arrayref("SHOW TABLES FROM `$db`");
     is_deeply(
         $new_tbls,
         $orig_tbls,
@@ -149,7 +149,7 @@ sub test_alter_table {
     ) or $fail = 1;
 
     # Rows in the original and new table should be identical.
-    my $new_rows = $master_dbh->selectall_arrayref("SELECT $cols FROM $table ORDER BY `$pk_col`");
+    my $new_rows = $source_dbh->selectall_arrayref("SELECT $cols FROM $table ORDER BY `$pk_col`");
     is_deeply(
         $new_rows,
         $orig_rows,
@@ -157,7 +157,7 @@ sub test_alter_table {
     ) or $fail = 1;
 
     if ( grep { $_ eq '--preserve-triggers' } @$cmds && !$delete_triggers) {
-        my $new_triggers = $master_dbh->selectall_arrayref($triggers_sql);
+        my $new_triggers = $source_dbh->selectall_arrayref($triggers_sql);
         is_deeply(
             $new_triggers,
             $orig_triggers,
@@ -166,7 +166,7 @@ sub test_alter_table {
     }
 
     if ( grep { $_ eq '--no-drop-new-table' } @$cmds ) {
-        $new_rows = $master_dbh->selectall_arrayref(
+        $new_rows = $source_dbh->selectall_arrayref(
             "SELECT $cols FROM `$db`.`$new_tbl` ORDER BY `$pk_col`");
         is_deeply(
             $new_rows,
@@ -175,7 +175,7 @@ sub test_alter_table {
         ) or $fail = 1;
     }
 
-    my $new_max_id = $master_dbh->selectall_arrayref(
+    my $new_max_id = $source_dbh->selectall_arrayref(
         "SELECT MAX(`$pk_col`) FROM `$db`.`$tbl`");
     is(
         $orig_max_id->[0]->[0],
@@ -226,7 +226,7 @@ sub test_alter_table {
     elsif ( $test_type eq 'new_engine' ) {
         my $new_engine = lc($args{new_engine});
         die "I need a new_engine argument" unless $new_engine;
-        my $rows = $master_dbh->selectall_hashref(
+        my $rows = $source_dbh->selectall_hashref(
             "SHOW TABLE STATUS FROM `$db`", "name");
         is(
             lc($rows->{$tbl}->{engine}),
@@ -242,7 +242,7 @@ sub test_alter_table {
 
         foreach my $tbl ( @$orig_tbls ) {
             my $fks = $tp->get_fks(
-                $tp->get_create_table($master_dbh, $db, $tbl->[0]));
+                $tp->get_create_table($source_dbh, $db, $tbl->[0]));
 
             # The tool does not use the same/original fk name,
             # it appends a single _.  So we need to strip this
@@ -285,7 +285,7 @@ sub test_alter_table {
         warn $output;
     }
 
-    my $new_triggers = $master_dbh->selectall_arrayref($triggers_sql);
+    my $new_triggers = $source_dbh->selectall_arrayref($triggers_sql);
     is_deeply(
         $orig_triggers,
         $new_triggers,
@@ -313,7 +313,7 @@ test_alter_table(
     ],
 );
 
-$rows = $master_dbh->selectall_arrayref( "SELECT * FROM test.aaa");
+$rows = $source_dbh->selectall_arrayref( "SELECT * FROM test.aaa");
 my $want = [
     [ 1, 'a', 1, undef ],
     [ 2, 'b', 2, undef ],
@@ -332,6 +332,6 @@ is_deeply(
 # #############################################################################
 # 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;
diff --git a/t/pt-online-schema-change/pt-1919.t b/t/pt-online-schema-change/pt-1919.t
index 014863efd..97e353a7f 100644
--- a/t/pt-online-schema-change/pt-1919.t
+++ b/t/pt-online-schema-change/pt-1919.t
@@ -27,14 +27,14 @@ $Data::Dumper::Quotekeys = 0;
 
 my $dp         = new DSNParser(opts=>$dsn_opts);
 my $sb         = new Sandbox(basedir => '/tmp', DSNParser => $dp);
-my $master_dbh = $sb->get_dbh_for('master');
-my $slave_dbh  = $sb->get_dbh_for('slave1');
+my $source_dbh = $sb->get_dbh_for('source');
+my $replica_dbh  = $sb->get_dbh_for('replica1');
 
-if ( !$master_dbh ) {
-   plan skip_all => 'Cannot connect to sandbox master';
+if ( !$source_dbh ) {
+   plan skip_all => 'Cannot connect to sandbox source';
 }
-elsif ( !$slave_dbh ) {
-   plan skip_all => 'Cannot connect to sandbox slave';
+elsif ( !$replica_dbh ) {
+   plan skip_all => 'Cannot connect to sandbox replica';
 }
 elsif ($sb->is_cluster_mode) {
     plan skip_all => 'Not for PXC';
@@ -69,12 +69,12 @@ sub test_alter_table {
    my $delete_triggers = $args{delete_triggers} || '';
 
    if ( my $file = $args{file} ) {
-      $sb->load_file('master', "$sample/$file");
-      $master_dbh->do("USE `$db`");
-      $slave_dbh->do("USE `$db`");
+      $sb->load_file('source', "$sample/$file");
+      $source_dbh->do("USE `$db`");
+      $replica_dbh->do("USE `$db`");
    }
 
-   my $ddl        = $tp->get_create_table($master_dbh, $db, $tbl);
+   my $ddl        = $tp->get_create_table($source_dbh, $db, $tbl);
    my $tbl_struct = $tp->parse($ddl);
 
    my $cols = '*';
@@ -84,13 +84,13 @@ sub test_alter_table {
       die "I need a drop_col argument" unless $col;
       $cols = join(', ', grep { $_ ne $col } @{$tbl_struct->{cols}});
    }
-   my $orig_rows = $master_dbh->selectall_arrayref(
+   my $orig_rows = $source_dbh->selectall_arrayref(
       "SELECT $cols FROM $table ORDER BY `$pk_col`");
 
-   my $orig_tbls = $master_dbh->selectall_arrayref(
+   my $orig_tbls = $source_dbh->selectall_arrayref(
       "SHOW TABLES FROM `$db`");
 
-   my $orig_max_id = $master_dbh->selectall_arrayref(
+   my $orig_max_id = $source_dbh->selectall_arrayref(
       "SELECT MAX(`$pk_col`) FROM `$db`.`$tbl`");
 
    my $triggers_sql = "SELECT TRIGGER_SCHEMA, TRIGGER_NAME, DEFINER, ACTION_STATEMENT, SQL_MODE, "
@@ -100,7 +100,7 @@ sub test_alter_table {
                     .  "  AND EVENT_OBJECT_TABLE = '$tbl'";
 
 
-   my $orig_triggers = $master_dbh->selectall_arrayref($triggers_sql);
+   my $orig_triggers = $source_dbh->selectall_arrayref($triggers_sql);
 
    my ($orig_auto_inc) = $ddl =~ m/\s+AUTO_INCREMENT=(\d+)\s+/;
 
@@ -109,7 +109,7 @@ sub test_alter_table {
    if ( $fk_method ) {
       foreach my $tbl ( @$orig_tbls ) {
          my $fks = $tp->get_fks(
-            $tp->get_create_table($master_dbh, $db, $tbl->[0]));
+            $tp->get_create_table($source_dbh, $db, $tbl->[0]));
          push @orig_fks, $fks;
       }
    }
@@ -133,7 +133,7 @@ sub test_alter_table {
       stderr => 1,
    );
 
-   my $new_ddl = $tp->get_create_table($master_dbh, $db, $tbl);
+   my $new_ddl = $tp->get_create_table($source_dbh, $db, $tbl);
    my $new_tbl_struct = $tp->parse($new_ddl);
    my $fail    = 0;
 
@@ -144,7 +144,7 @@ sub test_alter_table {
    ) or $fail = 1;
 
    # There should be no new or missing tables.
-   my $new_tbls = $master_dbh->selectall_arrayref("SHOW TABLES FROM `$db`");
+   my $new_tbls = $source_dbh->selectall_arrayref("SHOW TABLES FROM `$db`");
    is_deeply(
       $new_tbls,
       $orig_tbls,
@@ -152,7 +152,7 @@ sub test_alter_table {
    ) or $fail = 1;
 
    # Rows in the original and new table should be identical.
-   my $new_rows = $master_dbh->selectall_arrayref("SELECT $cols FROM $table ORDER BY `$pk_col`");
+   my $new_rows = $source_dbh->selectall_arrayref("SELECT $cols FROM $table ORDER BY `$pk_col`");
    is_deeply(
       $new_rows,
       $orig_rows,
@@ -160,7 +160,7 @@ sub test_alter_table {
    ) or $fail = 1;
 
    if ( grep { $_ eq '--preserve-triggers' } @$cmds && !$delete_triggers) {
-      my $new_triggers = $master_dbh->selectall_arrayref($triggers_sql);
+      my $new_triggers = $source_dbh->selectall_arrayref($triggers_sql);
       is_deeply(
          $new_triggers,
          $orig_triggers,
@@ -169,7 +169,7 @@ sub test_alter_table {
    }
 
    if ( grep { $_ eq '--no-drop-new-table' } @$cmds ) {
-      $new_rows = $master_dbh->selectall_arrayref(
+      $new_rows = $source_dbh->selectall_arrayref(
          "SELECT $cols FROM `$db`.`$new_tbl` ORDER BY `$pk_col`");
       is_deeply(
          $new_rows,
@@ -178,7 +178,7 @@ sub test_alter_table {
       ) or $fail = 1;
    }
 
-   my $new_max_id = $master_dbh->selectall_arrayref(
+   my $new_max_id = $source_dbh->selectall_arrayref(
       "SELECT MAX(`$pk_col`) FROM `$db`.`$tbl`");
    is(
       $orig_max_id->[0]->[0],
@@ -229,7 +229,7 @@ sub test_alter_table {
    elsif ( $test_type eq 'new_engine' ) {
       my $new_engine = lc($args{new_engine});
       die "I need a new_engine argument" unless $new_engine;
-      my $rows = $master_dbh->selectall_hashref(
+      my $rows = $source_dbh->selectall_hashref(
          "SHOW TABLE STATUS FROM `$db`", "name");
       is(
          lc($rows->{$tbl}->{engine}),
@@ -245,7 +245,7 @@ sub test_alter_table {
 
       foreach my $tbl ( @$orig_tbls ) {
          my $fks = $tp->get_fks(
-            $tp->get_create_table($master_dbh, $db, $tbl->[0]));
+            $tp->get_create_table($source_dbh, $db, $tbl->[0]));
 
          # The tool does not use the same/original fk name,
          # it appends a single _.  So we need to strip this
@@ -291,7 +291,7 @@ sub test_alter_table {
       # a parent row that's being referenced by a child.
       my $sql = "DELETE FROM $table WHERE $pk_col=1 LIMIT 1";
       eval {
-         $master_dbh->do($sql);
+         $source_dbh->do($sql);
       };
       like(
          $EVAL_ERROR,
@@ -307,7 +307,7 @@ sub test_alter_table {
       warn $output;
    }
 
-   my $new_triggers = $master_dbh->selectall_arrayref($triggers_sql);
+   my $new_triggers = $source_dbh->selectall_arrayref($triggers_sql);
    is_deeply(
        $orig_triggers,
        $new_triggers,
@@ -320,13 +320,13 @@ sub test_alter_table {
 SKIP: {
     skip 'Sandbox MySQL version should be >= 5.7' unless $sandbox_version ge '5.7';
     # drop_swap won't work with MySQL 8.0+
-    my $vp = VersionParser->new($master_dbh);
+    my $vp = VersionParser->new($source_dbh);
 
     if ($vp->cmp('8.0') > -1 && $vp->cmp('8.0.14') < 0 && $vp->flavor() !~ m/maria/i) {
 	    skip 'Drop swap does not work with MySQL 8.0 - 8.0.13';
     }
 
-    $sb->load_file('master', "$sample/pt-1919.sql");
+    $sb->load_file('source', "$sample/pt-1919.sql");
 
     test_alter_table(
         name        => "Basic FK auto --execute",
@@ -351,7 +351,7 @@ SKIP: {
 # #############################################################################
 # 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;
diff --git a/t/pt-online-schema-change/pt-196.t b/t/pt-online-schema-change/pt-196.t
index 9e9e4172f..c4cd9a34d 100644
--- a/t/pt-online-schema-change/pt-196.t
+++ b/t/pt-online-schema-change/pt-196.t
@@ -25,11 +25,11 @@ require "$trunk/bin/pt-online-schema-change";
 
 my $dp = new DSNParser(opts=>$dsn_opts);
 my $sb = new Sandbox(basedir => '/tmp', DSNParser => $dp);
-my $master_dbh = $sb->get_dbh_for('master');
-my $master_dsn = 'h=127.1,P=12345,u=msandbox,p=msandbox';
+my $source_dbh = $sb->get_dbh_for('source');
+my $source_dsn = 'h=127.1,P=12345,u=msandbox,p=msandbox';
 
-if ( !$master_dbh ) {
-   plan skip_all => 'Cannot connect to sandbox master';
+if ( !$source_dbh ) {
+   plan skip_all => 'Cannot connect to sandbox source';
 }
 
 # The sandbox servers run with lock_wait_timeout=3 and it's not dynamic
@@ -40,11 +40,11 @@ my $output;
 my $exit_status;
 my $sample  = "t/pt-online-schema-change/samples/";
 
-$sb->load_file('master', "$sample/pt-196.sql");
+$sb->load_file('source', "$sample/pt-196.sql");
 
 
 ($output, $exit_status) = full_output(
-   sub { pt_online_schema_change::main(@args, "$master_dsn,D=test,t=test",
+   sub { pt_online_schema_change::main(@args, "$source_dsn,D=test,t=test",
          '--execute', '--alter', 'DROP COLUMN test', ),
       },
 );
@@ -55,11 +55,11 @@ is(
       "--alter rename columns with uppercase names -> exit status 0",
 );
 
-$master_dbh->do("DROP DATABASE IF EXISTS test");
+$source_dbh->do("DROP DATABASE IF EXISTS test");
 
 # #############################################################################
 # 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;
diff --git a/t/pt-online-schema-change/pt-200.t b/t/pt-online-schema-change/pt-200.t
index 5670146f0..643cc5449 100644
--- a/t/pt-online-schema-change/pt-200.t
+++ b/t/pt-online-schema-change/pt-200.t
@@ -25,11 +25,11 @@ require "$trunk/bin/pt-online-schema-change";
 
 my $dp = new DSNParser(opts=>$dsn_opts);
 my $sb = new Sandbox(basedir => '/tmp', DSNParser => $dp);
-my $master_dbh = $sb->get_dbh_for('master');
-my $master_dsn = 'h=127.1,P=12345,u=msandbox,p=msandbox';
+my $source_dbh = $sb->get_dbh_for('source');
+my $source_dsn = 'h=127.1,P=12345,u=msandbox,p=msandbox';
 
-if ( !$master_dbh ) {
-   plan skip_all => 'Cannot connect to sandbox master';
+if ( !$source_dbh ) {
+   plan skip_all => 'Cannot connect to sandbox source';
 }
 
 # The sandbox servers run with lock_wait_timeout=3 and it's not dynamic
@@ -40,10 +40,10 @@ my $output;
 my $exit_status;
 my $sample  = "t/pt-online-schema-change/samples/";
 
-$sb->load_file('master', "$sample/pt-153.sql");
+$sb->load_file('source', "$sample/pt-153.sql");
 
 ($output, $exit_status) = full_output(
-   sub { pt_online_schema_change::main(@args, "$master_dsn,D=test,t=t1",
+   sub { pt_online_schema_change::main(@args, "$source_dsn,D=test,t=t1",
          '--execute', 
          '--alter', "ADD COLUMN unique_id BIGINT UNSIGNED NOT NULL DEFAULT 0, ADD INDEX(unique_id)",
          ),
@@ -62,11 +62,11 @@ like(
       "PT-200 Adding field having 'unique' in the name",
 );
 
-$master_dbh->do("DROP DATABASE IF EXISTS test");
+$source_dbh->do("DROP DATABASE IF EXISTS test");
 
 # #############################################################################
 # 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;
diff --git a/t/pt-online-schema-change/pt-202.t b/t/pt-online-schema-change/pt-202.t
index d02643fdd..a8e9fb934 100644
--- a/t/pt-online-schema-change/pt-202.t
+++ b/t/pt-online-schema-change/pt-202.t
@@ -23,11 +23,11 @@ require "$trunk/bin/pt-online-schema-change";
 
 my $dp = new DSNParser(opts=>$dsn_opts);
 my $sb = new Sandbox(basedir => '/tmp', DSNParser => $dp);
-my $master_dbh = $sb->get_dbh_for('master');
-my $master_dsn = 'h=127.1,P=12345,u=msandbox,p=msandbox';
+my $source_dbh = $sb->get_dbh_for('source');
+my $source_dsn = 'h=127.1,P=12345,u=msandbox,p=msandbox';
 
-if ( !$master_dbh ) {
-   plan skip_all => 'Cannot connect to sandbox master';
+if ( !$source_dbh ) {
+   plan skip_all => 'Cannot connect to sandbox source';
 }
 
 if ($sandbox_version lt '5.7') {
@@ -44,10 +44,10 @@ my $output;
 my $exit_status;
 my $sample  = "t/pt-online-schema-change/samples/";
 
-$sb->load_file('master', "$sample/pt-202.sql");
+$sb->load_file('source', "$sample/pt-202.sql");
 
 ($output, $exit_status) = full_output(
-   sub { pt_online_schema_change::main(@args, "$master_dsn,D=test,t=t1",
+   sub { pt_online_schema_change::main(@args, "$source_dsn,D=test,t=t1",
          '--execute', 
          '--alter', "ADD COLUMN `Column4` VARCHAR(45) NULL AFTER `Column3`",
          ),
@@ -66,11 +66,11 @@ like(
       "PT-202 Altering table having generated columns success",
 );
 
-$master_dbh->do("DROP DATABASE IF EXISTS test");
+$source_dbh->do("DROP DATABASE IF EXISTS test");
 
 # #############################################################################
 # 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;
diff --git a/t/pt-online-schema-change/pt-2048.t b/t/pt-online-schema-change/pt-2048.t
index 23e4d8dc4..0cfbf2de6 100644
--- a/t/pt-online-schema-change/pt-2048.t
+++ b/t/pt-online-schema-change/pt-2048.t
@@ -20,15 +20,15 @@ require "$trunk/bin/pt-online-schema-change";
 my $dp = new DSNParser(opts=>$dsn_opts);
 my $sb = new Sandbox(basedir => '/tmp', DSNParser => $dp);
 
-my $dbh = $sb->get_dbh_for('master');
-my $slave_dbh = $sb->get_dbh_for('slave1');
-my $dsn = $sb->dsn_for("master");
+my $dbh = $sb->get_dbh_for('source');
+my $replica_dbh = $sb->get_dbh_for('replica1');
+my $dsn = $sb->dsn_for("source");
 
 if ( !$dbh ) {
-   plan skip_all => 'Cannot connect to sandbox master';
+   plan skip_all => 'Cannot connect to sandbox source';
 }
-elsif ( !$slave_dbh ) {
-   plan skip_all => 'Cannot connect to sandbox slave';
+elsif ( !$replica_dbh ) {
+   plan skip_all => 'Cannot connect to sandbox replica';
 }
 else {
    plan tests => 2;
@@ -41,9 +41,9 @@ my @args = (qw(--set-vars innodb_lock_wait_timeout=3));
 my $output;
 my $exit_status;
 
-$sb->load_file('master', "t/pt-online-schema-change/samples/pt-2048.sql");
+$sb->load_file('source', "t/pt-online-schema-change/samples/pt-2048.sql");
 
-my $rows_before = $slave_dbh->selectrow_arrayref("select total_connections from performance_schema.users where user like 'msandbox';");
+my $rows_before = $replica_dbh->selectrow_arrayref("select total_connections from performance_schema.users where user like 'msandbox';");
 
 ($output, $exit_status) = full_output(
     sub { pt_online_schema_change::main(@args, "$dsn,D=test,t=joinit",
@@ -53,7 +53,7 @@ my $rows_before = $slave_dbh->selectrow_arrayref("select total_connections from
     stderr => 1,
 );
 
-my $rows_after = $slave_dbh->selectrow_arrayref("select total_connections from performance_schema.users where user like 'msandbox';");
+my $rows_after = $replica_dbh->selectrow_arrayref("select total_connections from performance_schema.users where user like 'msandbox';");
 
 cmp_ok(
    $rows_after->[0] - $rows_before->[0], '<', 10, 
diff --git a/t/pt-online-schema-change/pt-205.t b/t/pt-online-schema-change/pt-205.t
index a4cfb8a70..63f010f99 100644
--- a/t/pt-online-schema-change/pt-205.t
+++ b/t/pt-online-schema-change/pt-205.t
@@ -23,11 +23,11 @@ require "$trunk/bin/pt-online-schema-change";
 
 my $dp = new DSNParser(opts=>$dsn_opts);
 my $sb = new Sandbox(basedir => '/tmp', DSNParser => $dp);
-my $master_dbh = $sb->get_dbh_for('master');
-my $master_dsn = 'h=127.1,P=12345,u=msandbox,p=msandbox';
+my $source_dbh = $sb->get_dbh_for('source');
+my $source_dsn = 'h=127.1,P=12345,u=msandbox,p=msandbox';
 
-if ( !$master_dbh ) {
-   plan skip_all => 'Cannot connect to sandbox master';
+if ( !$source_dbh ) {
+   plan skip_all => 'Cannot connect to sandbox source';
 }
 
 if ($sandbox_version lt '5.7') {
@@ -35,7 +35,7 @@ if ($sandbox_version lt '5.7') {
 }
 
 
-if (!$sb->has_engine('master', 'rocksdb')) {
+if (!$sb->has_engine('source', 'rocksdb')) {
    plan skip_all => "RocksDB engine is not available";
 }
 
@@ -48,10 +48,10 @@ my @args       = (qw(--set-vars innodb_lock_wait_timeout=3));
 my $output;
 my $exit_status;
 
-$sb->load_file('master', "t/pt-online-schema-change/samples/pt-205.sql");
+$sb->load_file('source', "t/pt-online-schema-change/samples/pt-205.sql");
 
 ($output, $exit_status) = full_output(
-   sub { pt_online_schema_change::main(@args, "$master_dsn,D=test,t=t1",
+   sub { pt_online_schema_change::main(@args, "$source_dsn,D=test,t=t1",
          '--execute', 
          '--alter', "Engine=RocksDB",
          ),
@@ -70,11 +70,11 @@ like(
       "PT-205 Altering engine to RocksDB error message",
 );
 
-$master_dbh->do("DROP DATABASE IF EXISTS test");
+$source_dbh->do("DROP DATABASE IF EXISTS test");
 
 # #############################################################################
 # 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;
diff --git a/t/pt-online-schema-change/pt-207.t b/t/pt-online-schema-change/pt-207.t
index 15a421b66..d721fca45 100644
--- a/t/pt-online-schema-change/pt-207.t
+++ b/t/pt-online-schema-change/pt-207.t
@@ -23,18 +23,18 @@ require "$trunk/bin/pt-online-schema-change";
 
 my $dp = new DSNParser(opts=>$dsn_opts);
 my $sb = new Sandbox(basedir => '/tmp', DSNParser => $dp);
-my $master_dbh = $sb->get_dbh_for('master');
-my $master_dsn = 'h=127.1,P=12345,u=msandbox,p=msandbox';
+my $source_dbh = $sb->get_dbh_for('source');
+my $source_dsn = 'h=127.1,P=12345,u=msandbox,p=msandbox';
 
-if ( !$master_dbh ) {
-   plan skip_all => 'Cannot connect to sandbox master';
+if ( !$source_dbh ) {
+   plan skip_all => 'Cannot connect to sandbox source';
 }
 
 if ($sandbox_version lt '5.7') {
    plan skip_all => "RocksDB is only available on Percona Server 5.7.19+";
 }
 
-my $rows = $master_dbh->selectall_arrayref('SHOW ENGINES', {Slice=>{}});
+my $rows = $source_dbh->selectall_arrayref('SHOW ENGINES', {Slice=>{}});
 my $rocksdb_enabled;
 for my $row (@$rows) {
     if ($row->{engine} eq 'ROCKSDB') {
@@ -56,10 +56,10 @@ my @args       = (qw(--set-vars innodb_lock_wait_timeout=3));
 my $output;
 my $exit_status;
 
-$sb->load_file('master', "t/pt-online-schema-change/samples/pt-207.sql");
+$sb->load_file('source', "t/pt-online-schema-change/samples/pt-207.sql");
 
 ($output, $exit_status) = full_output(
-   sub { pt_online_schema_change::main(@args, "$master_dsn,D=test,t=t1",
+   sub { pt_online_schema_change::main(@args, "$source_dsn,D=test,t=t1",
          '--execute', 
          '--alter', "ADD INDEX (f3)",
          ),
@@ -78,11 +78,11 @@ like(
       "PT-207 Message cannot add index with invalid collation to a RocksDB table",
 );
 
-$master_dbh->do("DROP DATABASE IF EXISTS test");
+$source_dbh->do("DROP DATABASE IF EXISTS test");
 
 # #############################################################################
 # 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;
diff --git a/t/pt-online-schema-change/pt-209.t b/t/pt-online-schema-change/pt-209.t
index 72512541d..585e34ee7 100644
--- a/t/pt-online-schema-change/pt-209.t
+++ b/t/pt-online-schema-change/pt-209.t
@@ -23,18 +23,18 @@ require "$trunk/bin/pt-online-schema-change";
 
 my $dp = new DSNParser(opts=>$dsn_opts);
 my $sb = new Sandbox(basedir => '/tmp', DSNParser => $dp);
-my $master_dbh = $sb->get_dbh_for('master');
-my $master_dsn = 'h=127.1,P=12345,u=msandbox,p=msandbox';
+my $source_dbh = $sb->get_dbh_for('source');
+my $source_dsn = 'h=127.1,P=12345,u=msandbox,p=msandbox';
 
-if ( !$master_dbh ) {
-   plan skip_all => 'Cannot connect to sandbox master';
+if ( !$source_dbh ) {
+   plan skip_all => 'Cannot connect to sandbox source';
 }
 
 if ($sandbox_version lt '5.7') {
    plan skip_all => "RocksDB is only available on Percona Server 5.7.19+";
 }
 
-my $rows = $master_dbh->selectall_arrayref('SHOW ENGINES', {Slice=>{}});
+my $rows = $source_dbh->selectall_arrayref('SHOW ENGINES', {Slice=>{}});
 my $rocksdb_enabled;
 for my $row (@$rows) {
     if ($row->{engine} eq 'ROCKSDB') {
@@ -57,10 +57,10 @@ my $output;
 my $exit_status;
 my $sample  = "t/pt-online-schema-change/samples/";
 
-$sb->load_file('master', "$sample/pt-209.sql");
+$sb->load_file('source', "$sample/pt-209.sql");
 
 ($output, $exit_status) = full_output(
-   sub { pt_online_schema_change::main(@args, "$master_dsn,D=test,t=t1",
+   sub { pt_online_schema_change::main(@args, "$source_dsn,D=test,t=t1",
          '--execute', 
          '--alter', "ADD CONSTRAINT fk_some_id FOREIGN KEY (some_id) REFERENCES some(id)`",
          ),
@@ -79,11 +79,11 @@ like(
       "PT-209 Message cannot add FKs to a RocksDB table",
 );
 
-$master_dbh->do("DROP DATABASE IF EXISTS test");
+$source_dbh->do("DROP DATABASE IF EXISTS test");
 
 # #############################################################################
 # 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;
diff --git a/t/pt-online-schema-change/pt-2119.t b/t/pt-online-schema-change/pt-2119.t
index 3bccab4b4..46e51713b 100644
--- a/t/pt-online-schema-change/pt-2119.t
+++ b/t/pt-online-schema-change/pt-2119.t
@@ -19,13 +19,13 @@ require "$trunk/bin/pt-online-schema-change";
 
 my $dp = new DSNParser(opts=>$dsn_opts);
 my $sb = new Sandbox(basedir => '/tmp', DSNParser => $dp);
-my $master_dbh = $sb->get_dbh_for('master');
+my $source_dbh = $sb->get_dbh_for('source');
 
-if ( !$master_dbh ) {
-   plan skip_all => 'Cannot connect to sandbox master';
+if ( !$source_dbh ) {
+   plan skip_all => 'Cannot connect to sandbox source';
 }
 
-my $vp = VersionParser->new($master_dbh);
+my $vp = VersionParser->new($source_dbh);
 
 if ( $vp->cmp('8.0.14') < 0 || $vp->cmp('8.0.17') >= 0 || $vp->flavor() =~ m/maria/i ) {
    plan skip_all => 'Test requires versions between 8.0.14 and 8.0.17';
@@ -34,18 +34,18 @@ if ( $vp->cmp('8.0.14') < 0 || $vp->cmp('8.0.17') >= 0 || $vp->flavor() =~ m/mar
 # 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,u=msandbox,p=msandbox';
+my $source_dsn = 'h=127.1,P=12345,u=msandbox,p=msandbox';
 my @args       = (qw(--set-vars innodb_lock_wait_timeout=3));
 my $sample     = "t/pt-online-schema-change/samples/";
 my $plugin     = "$trunk/$sample/plugins";
 my $output;
 my $exit_status;
 
-$sb->load_file('master', "$sample/pt-2119.sql");
+$sb->load_file('source', "$sample/pt-2119.sql");
 
 ($output, $exit_status) = full_output(
    sub { pt_online_schema_change::main(@args,
-      "$master_dsn,D=pt_osc,t=t",
+      "$source_dsn,D=pt_osc,t=t",
       "--alter", "ENGINE=InnoDB",
       '--execute') },
 );
@@ -64,7 +64,7 @@ like(
 
 ($output, $exit_status) = full_output(
    sub { pt_online_schema_change::main(@args,
-      "$master_dsn,D=pt_osc,t=person",
+      "$source_dsn,D=pt_osc,t=person",
       "--alter", "ENGINE=InnoDB",
       '--execute') },
 );
@@ -83,7 +83,7 @@ like(
 
 ($output, $exit_status) = full_output(
    sub { pt_online_schema_change::main(@args,
-      "$master_dsn,D=pt_osc,t=test_table",
+      "$source_dsn,D=pt_osc,t=test_table",
       "--alter", "ENGINE=InnoDB",
       '--execute') },
 );
@@ -102,6 +102,6 @@ like(
 # #############################################################################
 # 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;
diff --git a/t/pt-online-schema-change/pt-2168-cancel.t b/t/pt-online-schema-change/pt-2168-cancel.t
index e0d9f64e1..d9844679e 100644
--- a/t/pt-online-schema-change/pt-2168-cancel.t
+++ b/t/pt-online-schema-change/pt-2168-cancel.t
@@ -33,16 +33,16 @@ if ($sb->is_cluster_mode) {
     plan skip_all => 'Not for PXC';
 }
 
-# We need third slave to redirect pt-osc in case of one or standard disconnects
-diag(`$trunk/sandbox/start-sandbox slave 12348 12345`);
-
-my $master_dbh = $sb->get_dbh_for('master');
-my $slave_dbh1 = $sb->get_dbh_for('slave1');
-my $slave_dbh2 = $sb->get_dbh_for('slave2');
-my $slave_dbh3 = $sb->get_dbh_for('master1');
-my $master_dsn = 'h=127.0.0.1,P=12345,u=msandbox,p=msandbox';
-my $slave_dsn1 = 'h=127.0.0.1,P=12346,u=msandbox,p=msandbox';
-my $slave_dsn2 = 'h=127.0.0.1,P=12347,u=msandbox,p=msandbox';
+# We need third replica to redirect pt-osc in case of one or standard disconnects
+diag(`$trunk/sandbox/start-sandbox replica 12348 12345`);
+
+my $source_dbh = $sb->get_dbh_for('source');
+my $replica_dbh1 = $sb->get_dbh_for('replica1');
+my $replica_dbh2 = $sb->get_dbh_for('replica2');
+my $replica_dbh3 = $sb->get_dbh_for('source1');
+my $source_dsn = 'h=127.0.0.1,P=12345,u=msandbox,p=msandbox';
+my $replica_dsn1 = 'h=127.0.0.1,P=12346,u=msandbox,p=msandbox';
+my $replica_dsn2 = 'h=127.0.0.1,P=12347,u=msandbox,p=msandbox';
 my $sample = "t/pt-online-schema-change/samples";
 
 # We need sync_relay_log=1 to keep changes after replica restart
@@ -58,7 +58,7 @@ sleep 1;
 diag(`/tmp/12347/start >/dev/null`);
 
 # DSN table for further tests
-$sb->load_file('master', "$sample/create_dsns.sql");
+$sb->load_file('source', "$sample/create_dsns.sql");
 
 sub reset_query_cache {
     my @dbhs = @_;
@@ -68,62 +68,62 @@ sub reset_query_cache {
     }
 }
 
-# 1) Set the slave delay to 0 just in case we are re-running the tests without restarting the sandbox.
+# 1) Set the replica delay to 0 just in case we are re-running the tests without restarting the sandbox.
 # 2) Load sample data
-# 3) Set the slave delay to 30 seconds to be able to see the 'waiting' message.
-diag("Setting slave delay to 0 seconds");
-$sb->wait_for_slaves(slave => 'master1');
-$slave_dbh1->do('STOP SLAVE');
-$slave_dbh3->do('STOP SLAVE');
-$master_dbh->do("RESET MASTER");
-$slave_dbh1->do('RESET SLAVE');
-$slave_dbh1->do('START SLAVE');
-$slave_dbh3->do('RESET SLAVE');
-$slave_dbh3->do('START SLAVE');
+# 3) Set the replica delay to 30 seconds to be able to see the 'waiting' message.
+diag("Setting replica delay to 0 seconds");
+$sb->wait_for_replicas(replica => 'source1');
+$replica_dbh1->do("STOP ${replica_name}");
+$replica_dbh3->do("STOP ${replica_name}");
+$source_dbh->do("RESET ${source_reset}");
+$replica_dbh1->do("RESET ${replica_name}");
+$replica_dbh1->do("START ${replica_name}");
+$replica_dbh3->do("RESET ${replica_name}");
+$replica_dbh3->do("START ${replica_name}");
 
 diag('Loading test data');
-$sb->load_file('master', "t/pt-online-schema-change/samples/slave_lag.sql");
+$sb->load_file('source', "t/pt-online-schema-change/samples/replica_lag.sql");
 
 # Should be greater than chunk-size and big enough, so pt-osc will wait for delay
 my $num_rows = 5000;
 diag("Loading $num_rows into the table. This might take some time.");
 diag(`util/mysql_random_data_load --host=127.0.0.1 --port=12345 --user=msandbox --password=msandbox test pt178 $num_rows`);
 
-$sb->wait_for_slaves();
-$sb->wait_for_slaves(slave => 'master1');
+$sb->wait_for_replicas();
+$sb->wait_for_replicas(replica => 'source1');
 
 # Plan for tests
-# 1. Basic test: start tool on some huge table, stop slave, wait few seconds, start slave. Check if tool restarted with option and failed with error without. 
-# 2. Delayed slaves
+# 1. Basic test: start tool on some huge table, stop replica, wait few seconds, start replica. Check if tool restarted with option and failed with error without. 
+# 2. Delayed replicas
 # 3. Places to test:
 #  - get_dbh
 #  - SELECT @@SERVER_ID
-# 4. Slave never returns
+# 4. Replica never returns
 #  - die after timeout
-#  - inject new slave
+#  - inject new replica
 #  - ignore after timeout
 
 
-diag("Setting slave delay to $delay seconds");
+diag("Setting replica delay to $delay seconds");
 
-$slave_dbh1->do('STOP SLAVE');
-$slave_dbh1->do("CHANGE MASTER TO MASTER_DELAY=$delay");
-$slave_dbh1->do('START SLAVE');
+$replica_dbh1->do("STOP ${replica_name}");
+$replica_dbh1->do("CHANGE ${source_change} TO ${source_name}_DELAY=$delay");
+$replica_dbh1->do("START ${replica_name}");
 
-# Run a full table scan query to ensure the slave is behind the master
+# Run a full table scan query to ensure the replica is behind the source
 # There is no query cache in MySQL 8.0+
-reset_query_cache($master_dbh, $master_dbh);
-# Update one row so slave is delayed
-$master_dbh->do('UPDATE `test`.`pt178` SET f2 = f2 + 1 LIMIT 1');
-$master_dbh->do('UPDATE `test`.`pt178` SET f2 = f2 + 1 WHERE f1 = ""');
+reset_query_cache($source_dbh, $source_dbh);
+# Update one row so replica is delayed
+$source_dbh->do('UPDATE `test`.`pt178` SET f2 = f2 + 1 LIMIT 1');
+$source_dbh->do('UPDATE `test`.`pt178` SET f2 = f2 + 1 WHERE f1 = ""');
 
 diag("Starting tests...");
 
 my $max_lag = $delay / 2;
-# We need to sleep, otherwise pt-osc can finish before slave is delayed
+# We need to sleep, otherwise pt-osc can finish before replica is delayed
 sleep($max_lag);
 
-my $args = "$master_dsn,D=test,t=pt178 --recursion-method=dsn=D=test_recursion_method,t=dsns,h=127.0.0.1,P=12345,u=msandbox,p=msandbox --execute --chunk-size 10 --max-lag $max_lag --alter 'engine=INNODB' --pid $tmp_file_name --progress time,5 --nofail-on-stopped-replication";
+my $args = "$source_dsn,D=test,t=pt178 --recursion-method=dsn=D=test_recursion_method,t=dsns,h=127.0.0.1,P=12345,u=msandbox,p=msandbox --execute --chunk-size 10 --max-lag $max_lag --alter 'engine=INNODB' --pid $tmp_file_name --progress time,5 --nofail-on-stopped-replication";
 
    my ($fh, $filename) = tempfile();
    my $pid = fork();
@@ -135,10 +135,10 @@ my $args = "$master_dsn,D=test,t=pt178 --recursion-method=dsn=D=test_recursion_m
    }
 
    sleep($max_lag + $max_lag/2);
-   # restart slave 12347
+   # restart replica 12347
    diag(`/tmp/12347/stop >/dev/null`);
    sleep 1;
-   $master_dbh->do("UPDATE test_recursion_method.dsns SET dsn='D=test_recursion_method,t=dsns,P=12348,h=127.0.0.1,u=root,p=msandbox' WHERE id=2");
+   $source_dbh->do("UPDATE test_recursion_method.dsns SET dsn='D=test_recursion_method,t=dsns,P=12348,h=127.0.0.1,u=root,p=msandbox' WHERE id=2");
 
    waitpid($pid, 0);
    my $output = do {
@@ -150,7 +150,7 @@ like(
    $output,
    qr/Successfully altered `test`.`pt178`/s,
    "pt-osc completes successfully when one of replicas is stopped, option --nofail-on-stopped-replication is specified, and another replica was specified in the dsns table as a replacement",
-);
+) or diag($output);
 
 diag(`/tmp/12347/start >/dev/null`);
 # #############################################################################
@@ -158,16 +158,16 @@ diag(`/tmp/12347/start >/dev/null`);
 # #############################################################################
 diag("Cleaning");
 diag(`$trunk/sandbox/stop-sandbox 12348`);
-$slave_dbh2 = $sb->get_dbh_for('slave2');
-diag("Setting slave delay to 0 seconds");
-$slave_dbh1->do('STOP SLAVE');
-$slave_dbh2->do('STOP SLAVE');
-$master_dbh->do("RESET MASTER");
-$slave_dbh1->do('RESET SLAVE');
-$slave_dbh2->do('RESET SLAVE');
-$slave_dbh1->do('START SLAVE');
-$slave_dbh2->do('START SLAVE');
-#$slave_dbh2->do("uninstall plugin simple_rewrite_plugin");
+$replica_dbh2 = $sb->get_dbh_for('replica2');
+diag("Setting replica delay to 0 seconds");
+$replica_dbh1->do("STOP ${replica_name}");
+$replica_dbh2->do("STOP ${replica_name}");
+$source_dbh->do("RESET ${source_reset}");
+$replica_dbh1->do("RESET ${replica_name}");
+$replica_dbh2->do("RESET ${replica_name}");
+$replica_dbh1->do("START ${replica_name}");
+$replica_dbh2->do("START ${replica_name}");
+#$replica_dbh2->do("uninstall plugin simple_rewrite_plugin");
 
 diag(`mv $cnf.bak $cnf`);
 
@@ -175,11 +175,11 @@ diag(`/tmp/12347/stop >/dev/null`);
 diag(`/tmp/12347/start >/dev/null`);
 
 diag("Dropping test databases");
-$master_dbh->do("DROP DATABASE test_recursion_method");
-$master_dbh->do("DROP DATABASE IF EXISTS test");
-$sb->wait_for_slaves();
+$source_dbh->do("DROP DATABASE test_recursion_method");
+$source_dbh->do("DROP DATABASE IF EXISTS test");
+$sb->wait_for_replicas();
 
-$sb->wipe_clean($master_dbh);
+$sb->wipe_clean($source_dbh);
 ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox");
 
 diag(`/tmp/12345/stop >/dev/null`);
diff --git a/t/pt-online-schema-change/pt-2168.t b/t/pt-online-schema-change/pt-2168.t
index 3b6064770..64123e468 100644
--- a/t/pt-online-schema-change/pt-2168.t
+++ b/t/pt-online-schema-change/pt-2168.t
@@ -33,12 +33,12 @@ if ($sb->is_cluster_mode) {
     plan skip_all => 'Not for PXC';
 }
 
-my $master_dbh = $sb->get_dbh_for('master');
-my $slave_dbh1 = $sb->get_dbh_for('slave1');
-my $slave_dbh2 = $sb->get_dbh_for('slave2');
-my $master_dsn = 'h=127.0.0.1,P=12345,u=msandbox,p=msandbox';
-my $slave_dsn1 = 'h=127.0.0.1,P=12346,u=msandbox,p=msandbox';
-my $slave_dsn2 = 'h=127.0.0.1,P=12347,u=msandbox,p=msandbox';
+my $source_dbh = $sb->get_dbh_for('source');
+my $replica_dbh1 = $sb->get_dbh_for('replica1');
+my $replica_dbh2 = $sb->get_dbh_for('replica2');
+my $source_dsn = 'h=127.0.0.1,P=12345,u=msandbox,p=msandbox';
+my $replica_dsn1 = 'h=127.0.0.1,P=12346,u=msandbox,p=msandbox';
+my $replica_dsn2 = 'h=127.0.0.1,P=12347,u=msandbox,p=msandbox';
 my $sample = "t/pt-online-schema-change/samples";
 
 # We need sync_relay_log=1 to keep changes after replica restart
@@ -61,17 +61,17 @@ sub reset_query_cache {
     }
 }
 
-# 1) Set the slave delay to 0 just in case we are re-running the tests without restarting the sandbox.
+# 1) Set the replica delay to 0 just in case we are re-running the tests without restarting the sandbox.
 # 2) Load sample data
-# 3) Set the slave delay to 30 seconds to be able to see the 'waiting' message.
-diag("Setting slave delay to 0 seconds");
-$slave_dbh1->do('STOP SLAVE');
-$master_dbh->do("RESET MASTER");
-$slave_dbh1->do('RESET SLAVE');
-$slave_dbh1->do('START SLAVE');
+# 3) Set the replica delay to 30 seconds to be able to see the 'waiting' message.
+diag("Setting replica delay to 0 seconds");
+$replica_dbh1->do("STOP ${replica_name}");
+$source_dbh->do("RESET ${source_reset}");
+$replica_dbh1->do("RESET ${replica_name}");
+$replica_dbh1->do("START ${replica_name}");
 
 diag('Loading test data');
-$sb->load_file('master', "t/pt-online-schema-change/samples/slave_lag.sql");
+$sb->load_file('source', "t/pt-online-schema-change/samples/replica_lag.sql");
 
 # Should be greater than chunk-size and big enough, so pt-osc will wait for delay
 my $num_rows = 5000;
@@ -79,40 +79,40 @@ diag("Loading $num_rows into the table. This might take some time.");
 diag(`util/mysql_random_data_load --host=127.0.0.1 --port=12345 --user=msandbox --password=msandbox test pt178 $num_rows`);
 
 # DSN table for further tests
-$sb->load_file('master', "$sample/create_dsns.sql");
+$sb->load_file('source', "$sample/create_dsns.sql");
 
-$sb->wait_for_slaves();
+$sb->wait_for_replicas();
 
 # Plan for tests
-# 1. Basic test: start tool on some huge table, stop slave, wait few seconds, start slave. Check if tool restarted with option and failed with error without. 
-# 2. Delayed slaves
+# 1. Basic test: start tool on some huge table, stop replica, wait few seconds, start replica. Check if tool restarted with option and failed with error without. 
+# 2. Delayed replicas
 # 3. Places to test:
 #  - get_dbh
 #  - SELECT @@SERVER_ID
-# 4. Slave never returns
+# 4. Replica never returns
 #  - die after timeout
-#  - inject new slave
+#  - inject new replica
 #  - ignore after timeout
 
 
-diag("Setting slave delay to $delay seconds");
+diag("Setting replica delay to $delay seconds");
 
-$slave_dbh1->do('STOP SLAVE');
-$slave_dbh1->do("CHANGE MASTER TO MASTER_DELAY=$delay");
-$slave_dbh1->do('START SLAVE');
+$replica_dbh1->do("STOP ${replica_name}");
+$replica_dbh1->do("CHANGE ${source_change} TO ${source_name}_DELAY=$delay");
+$replica_dbh1->do("START ${replica_name}");
 
-# Run a full table scan query to ensure the slave is behind the master
+# Run a full table scan query to ensure the replica is behind the source
 # There is no query cache in MySQL 8.0+
-reset_query_cache($master_dbh, $master_dbh);
-# Update one row so slave is delayed
-$master_dbh->do('UPDATE `test`.`pt178` SET f2 = f2 + 1 LIMIT 1');
-$master_dbh->do('UPDATE `test`.`pt178` SET f2 = f2 + 1 WHERE f1 = ""');
+reset_query_cache($source_dbh, $source_dbh);
+# Update one row so replica is delayed
+$source_dbh->do('UPDATE `test`.`pt178` SET f2 = f2 + 1 LIMIT 1');
+$source_dbh->do('UPDATE `test`.`pt178` SET f2 = f2 + 1 WHERE f1 = ""');
 
-# This is the base test, just to ensure that without using --check-slave-lag nor --skip-check-slave-lag
-# pt-online-schema-change will wait on the slave at port 12346
+# This is the base test, just to ensure that without using --check-replica-lag nor --skip-check-replica-lag
+# pt-online-schema-change will wait on the replica at port 12346
 
 my $max_lag = $delay / 2;
-# We need to sleep, otherwise pt-osc can finish before slave is delayed
+# We need to sleep, otherwise pt-osc can finish before replica is delayed
 sleep($max_lag);
 
 # Basic test: we check if pt-osc fails if replica restarted while it is running with default options
@@ -130,7 +130,7 @@ sub base_test {
    }
 
    sleep($max_lag + $max_lag/2);
-   # restart slave 12347
+   # restart replica 12347
    diag(`/tmp/12347/stop >/dev/null`);
    sleep 1;
    diag(`/tmp/12347/start >/dev/null`);
@@ -159,7 +159,7 @@ sub crash_test {
    }
 
    sleep($max_lag + 10);
-   # restart slave 12347
+   # restart replica 12347
    diag(`/tmp/12347/start >/dev/null`);
 
    waitpid($pid, 0);
@@ -176,11 +176,11 @@ sub crash_test {
 sub error_test {
    my ($test, $pattern, $query) = @_;
 
-   $slave_dbh2->do("SET GLOBAL simple_rewrite_plugin_action='rewrite'");
-   $slave_dbh2->do("SET GLOBAL simple_rewrite_plugin_pattern='$pattern'");
-   $slave_dbh2->do("SET GLOBAL simple_rewrite_plugin_query='$query'");
+   $replica_dbh2->do("SET GLOBAL simple_rewrite_plugin_action='rewrite'");
+   $replica_dbh2->do("SET GLOBAL simple_rewrite_plugin_pattern='$pattern'");
+   $replica_dbh2->do("SET GLOBAL simple_rewrite_plugin_query='$query'");
 
-   my $args = "$master_dsn,D=test,t=pt178,A=utf8 --recursion-method=dsn=D=test_recursion_method,t=dsns,h=127.0.0.1,P=12345,u=msandbox,p=msandbox --execute --chunk-size 10 --max-lag $max_lag --alter 'engine=INNODB' --pid $tmp_file_name --progress time,5";
+   my $args = "$source_dsn,D=test,t=pt178,A=utf8 --recursion-method=dsn=D=test_recursion_method,t=dsns,h=127.0.0.1,P=12345,u=msandbox,p=msandbox --execute --chunk-size 10 --max-lag $max_lag --alter 'engine=INNODB' --pid $tmp_file_name --progress time,5";
 
    my $output = `$trunk/bin/pt-online-schema-change $args 2>&1`;
 
@@ -190,7 +190,7 @@ sub error_test {
       "pt-osc fails with error if replica returns error when $test",
    );
 
-   $args = "$master_dsn,D=test,t=pt178,A=utf8 --recursion-method=dsn=D=test_recursion_method,t=dsns,h=127.0.0.1,P=12345,u=msandbox,p=msandbox --execute --chunk-size 10 --max-lag $max_lag --alter 'engine=INNODB' --pid $tmp_file_name --progress time,5 --nofail-on-stopped-replication";
+   $args = "$source_dsn,D=test,t=pt178,A=utf8 --recursion-method=dsn=D=test_recursion_method,t=dsns,h=127.0.0.1,P=12345,u=msandbox,p=msandbox --execute --chunk-size 10 --max-lag $max_lag --alter 'engine=INNODB' --pid $tmp_file_name --progress time,5 --nofail-on-stopped-replication";
 
    $output = `$trunk/bin/pt-online-schema-change $args 2>&1`;
 
@@ -200,12 +200,12 @@ sub error_test {
       "pt-osc fails with error if replica returns error when $test and option --nofail-on-stopped-replication is specified",
    );
 
-   $slave_dbh2->do("SET GLOBAL simple_rewrite_plugin_pattern=''");
-   $slave_dbh2 = $sb->get_dbh_for('slave2');
-   $slave_dbh2->do("SET GLOBAL simple_rewrite_plugin_pattern='$pattern'");
-   $slave_dbh2->do("SET GLOBAL simple_rewrite_plugin_action='abort'");
+   $replica_dbh2->do("SET GLOBAL simple_rewrite_plugin_pattern=''");
+   $replica_dbh2 = $sb->get_dbh_for('replica2');
+   $replica_dbh2->do("SET GLOBAL simple_rewrite_plugin_pattern='$pattern'");
+   $replica_dbh2->do("SET GLOBAL simple_rewrite_plugin_action='abort'");
 
-   $args = "$master_dsn,D=test,t=pt178,A=utf8 --recursion-method=dsn=D=test_recursion_method,t=dsns,h=127.0.0.1,P=12345,u=msandbox,p=msandbox --execute --chunk-size 10 --max-lag $max_lag --alter 'engine=INNODB' --pid $tmp_file_name --progress time,5";
+   $args = "$source_dsn,D=test,t=pt178,A=utf8 --recursion-method=dsn=D=test_recursion_method,t=dsns,h=127.0.0.1,P=12345,u=msandbox,p=msandbox --execute --chunk-size 10 --max-lag $max_lag --alter 'engine=INNODB' --pid $tmp_file_name --progress time,5";
 
    $output = crash_test($args);
 
@@ -215,11 +215,11 @@ sub error_test {
       "pt-osc fails with error if replica disconnects when $test",
    );
 
-   $slave_dbh2 = $sb->get_dbh_for('slave2');
-   $slave_dbh2->do("SET GLOBAL simple_rewrite_plugin_pattern='$pattern'");
-   $slave_dbh2->do("SET GLOBAL simple_rewrite_plugin_action='abort'");
+   $replica_dbh2 = $sb->get_dbh_for('replica2');
+   $replica_dbh2->do("SET GLOBAL simple_rewrite_plugin_pattern='$pattern'");
+   $replica_dbh2->do("SET GLOBAL simple_rewrite_plugin_action='abort'");
 
-   $args = "$master_dsn,D=test,t=pt178,A=utf8 --recursion-method=dsn=D=test_recursion_method,t=dsns,h=127.0.0.1,P=12345,u=msandbox,p=msandbox --execute --chunk-size 10 --max-lag $max_lag --alter 'engine=INNODB' --pid $tmp_file_name --progress time,5 --nofail-on-stopped-replication";
+   $args = "$source_dsn,D=test,t=pt178,A=utf8 --recursion-method=dsn=D=test_recursion_method,t=dsns,h=127.0.0.1,P=12345,u=msandbox,p=msandbox --execute --chunk-size 10 --max-lag $max_lag --alter 'engine=INNODB' --pid $tmp_file_name --progress time,5 --nofail-on-stopped-replication";
 
    $output = crash_test($args);
 
@@ -229,13 +229,13 @@ sub error_test {
       "pt-osc finishes succesfully if replica disconnects when $test and option --nofail-on-stopped-replication is specified",
    );
 
-   $slave_dbh2 = $sb->get_dbh_for('slave2');
-   $slave_dbh2->do("SET GLOBAL simple_rewrite_plugin_action='rewrite'");
+   $replica_dbh2 = $sb->get_dbh_for('replica2');
+   $replica_dbh2->do("SET GLOBAL simple_rewrite_plugin_action='rewrite'");
 }
 
-diag("Starting base tests. This is going to take some time due to the delay in the slave");
+diag("Starting base tests. This is going to take some time due to the delay in the replica");
 
-my $output = base_test("$master_dsn,D=test,t=pt178 --execute --chunk-size 10 --max-lag $max_lag --alter 'engine=INNODB' --pid $tmp_file_name --progress time,5");
+my $output = base_test("$source_dsn,D=test,t=pt178 --execute --chunk-size 10 --max-lag $max_lag --alter 'engine=INNODB' --pid $tmp_file_name --progress time,5");
 
 unlike(
    $output,
@@ -244,7 +244,7 @@ unlike(
 );
 
 # pt-osc doesn't fail if replica is restarted and option --nofail-on-stopped-replication specified
-$output = base_test("$master_dsn,D=test,t=pt178 --execute --chunk-size 10 --max-lag $max_lag --alter 'engine=INNODB' --pid $tmp_file_name --progress time,5 --nofail-on-stopped-replication");
+$output = base_test("$source_dsn,D=test,t=pt178 --execute --chunk-size 10 --max-lag $max_lag --alter 'engine=INNODB' --pid $tmp_file_name --progress time,5 --nofail-on-stopped-replication");
 
 like(
    $output,
@@ -252,7 +252,7 @@ like(
    "pt-osc completes successfully when one of replicas is restarted and option --nofail-on-stopped-replication is specified",
 );
 
-$output = base_test("$master_dsn,D=test,t=pt178 --recursion-method=dsn=D=test_recursion_method,t=dsns,h=127.0.0.1,P=12345,u=msandbox,p=msandbox --execute --chunk-size 10 --max-lag $max_lag --alter 'engine=INNODB' --pid $tmp_file_name --progress time,5");
+$output = base_test("$source_dsn,D=test,t=pt178 --recursion-method=dsn=D=test_recursion_method,t=dsns,h=127.0.0.1,P=12345,u=msandbox,p=msandbox --execute --chunk-size 10 --max-lag $max_lag --alter 'engine=INNODB' --pid $tmp_file_name --progress time,5");
 
 unlike(
    $output,
@@ -260,7 +260,7 @@ unlike(
    "pt-osc fails with recursion-method=dsn when one of replicas is restarted",
 );
 
-$output = base_test("$master_dsn,D=test,t=pt178 --recursion-method=dsn=D=test_recursion_method,t=dsns,h=127.0.0.1,P=12345,u=msandbox,p=msandbox --execute --chunk-size 10 --max-lag $max_lag --alter 'engine=INNODB' --pid $tmp_file_name --progress time,5 --nofail-on-stopped-replication");
+$output = base_test("$source_dsn,D=test,t=pt178 --recursion-method=dsn=D=test_recursion_method,t=dsns,h=127.0.0.1,P=12345,u=msandbox,p=msandbox --execute --chunk-size 10 --max-lag $max_lag --alter 'engine=INNODB' --pid $tmp_file_name --progress time,5 --nofail-on-stopped-replication");
 
 like(
    $output,
@@ -268,7 +268,7 @@ like(
    "pt-osc completes successfully with recursion-method=dsn when one of replicas is restarted and option --nofail-on-stopped-replication is specified",
 );
 
-# Errors that happen while pt-osc executes SQL while checking slave availability.
+# Errors that happen while pt-osc executes SQL while checking replica availability.
 # We check few scenarios.
 # - Error not related to connection: pt-osc aborted regardless option --nofail-on-stopped-replication
 # - Error, related to connection: pt-osc behavior depends on option --nofail-on-stopped-replication
@@ -276,25 +276,25 @@ like(
 diag("Starting replica lost and error tests");
 
 SKIP: {
-   $slave_dbh2 = $sb->get_dbh_for('slave2');
-   eval { $slave_dbh2->do("install plugin simple_rewrite_plugin soname 'simple_rewrite_plugin.so'") };
+   $replica_dbh2 = $sb->get_dbh_for('replica2');
+   eval { $replica_dbh2->do("install plugin simple_rewrite_plugin soname 'simple_rewrite_plugin.so'") };
    if ( $EVAL_ERROR && $EVAL_ERROR !~ m/Function 'simple_rewrite_plugin' already exists/) {
       skip 'These tests require simple_rewrite_plugin. You can get it from https://github.com/svetasmirnova/simple_rewrite_plugin';
    }
 
-   my @res = $slave_dbh2->selectrow_array("select count(*) from information_schema.plugins where plugin_name='simple_rewrite_plugin' and PLUGIN_STATUS='ACTIVE'");
+   my @res = $replica_dbh2->selectrow_array("select count(*) from information_schema.plugins where plugin_name='simple_rewrite_plugin' and PLUGIN_STATUS='ACTIVE'");
    if ( $res[0] != 1 ) {
       skip 'These tests require simple_rewrite_plugin in active status';
    }
 
    # get_dbh sets character set connection
-   $master_dbh->do("UPDATE test_recursion_method.dsns SET dsn='D=test_recursion_method,t=dsns,P=12346,h=127.0.0.1,u=root,p=msandbox,A=utf8' WHERE id=1");
-   $master_dbh->do("UPDATE test_recursion_method.dsns SET dsn='D=test_recursion_method,t=dsns,P=12347,h=127.0.0.1,u=root,p=msandbox,A=utf8' WHERE id=2");
+   $source_dbh->do("UPDATE test_recursion_method.dsns SET dsn='D=test_recursion_method,t=dsns,P=12346,h=127.0.0.1,u=root,p=msandbox,A=utf8' WHERE id=1");
+   $source_dbh->do("UPDATE test_recursion_method.dsns SET dsn='D=test_recursion_method,t=dsns,P=12347,h=127.0.0.1,u=root,p=msandbox,A=utf8' WHERE id=2");
 
    error_test("setting character set", '.*(SET NAMES) "?([[:alnum:]]+)"?.*', '$1 $2$2');
 
-   $master_dbh->do("UPDATE test_recursion_method.dsns SET dsn='D=test_recursion_method,t=dsns,P=12346,h=127.0.0.1,u=root,p=msandbox' WHERE id=1");
-   $master_dbh->do("UPDATE test_recursion_method.dsns SET dsn='D=test_recursion_method,t=dsns,P=12347,h=127.0.0.1,u=root,p=msandbox' WHERE id=2");
+   $source_dbh->do("UPDATE test_recursion_method.dsns SET dsn='D=test_recursion_method,t=dsns,P=12346,h=127.0.0.1,u=root,p=msandbox' WHERE id=1");
+   $source_dbh->do("UPDATE test_recursion_method.dsns SET dsn='D=test_recursion_method,t=dsns,P=12347,h=127.0.0.1,u=root,p=msandbox' WHERE id=2");
 
    # get_dbh selects SQL mode
    error_test("selecting SQL mode", 'SELECT @@SQL_MODE', 'SELEC @@SQL_MODE');
@@ -313,26 +313,26 @@ SKIP: {
       error_test("setting character set utf8mb4", "SET NAMES \\'utf8mb4\\'", "SET NAMES \\'utf8mb4utf8mb4\\'");
    }
 
-   # recurse_to_slaves asks for SERVER_ID
+   # recurse_to_replicas asks for SERVER_ID
    error_test("selecting server id", 'SELECT @@SERVER_ID.*', 'SELEC @@SERVER_ID');
 
-   $slave_dbh2 = $sb->get_dbh_for('slave2');
-   $slave_dbh2->do("uninstall plugin simple_rewrite_plugin");
+   $replica_dbh2 = $sb->get_dbh_for('replica2');
+   $replica_dbh2->do("uninstall plugin simple_rewrite_plugin");
 }
 
 # #############################################################################
 # Done.
 # #############################################################################
 diag("Cleaning");
-$slave_dbh2 = $sb->get_dbh_for('slave2');
-diag("Setting slave delay to 0 seconds");
-$slave_dbh1->do('STOP SLAVE');
-$slave_dbh2->do('STOP SLAVE');
-$master_dbh->do("RESET MASTER");
-$slave_dbh1->do('RESET SLAVE');
-$slave_dbh2->do('RESET SLAVE');
-$slave_dbh1->do('START SLAVE');
-$slave_dbh2->do('START SLAVE');
+$replica_dbh2 = $sb->get_dbh_for('replica2');
+diag("Setting replica delay to 0 seconds");
+$replica_dbh1->do("STOP ${replica_name}");
+$replica_dbh2->do("STOP ${replica_name}");
+$source_dbh->do("RESET ${source_reset}");
+$replica_dbh1->do("RESET ${replica_name}");
+$replica_dbh2->do("RESET ${replica_name}");
+$replica_dbh1->do("START ${replica_name}");
+$replica_dbh2->do("START ${replica_name}");
 
 diag(`mv $cnf.bak $cnf`);
 
@@ -340,9 +340,9 @@ diag(`/tmp/12347/stop >/dev/null`);
 diag(`/tmp/12347/start >/dev/null`);
 
 diag("Dropping test database");
-$master_dbh->do("DROP DATABASE IF EXISTS test");
-$sb->wait_for_slaves();
+$source_dbh->do("DROP DATABASE IF EXISTS test");
+$sb->wait_for_replicas();
 
-$sb->wipe_clean($master_dbh);
+$sb->wipe_clean($source_dbh);
 ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox");
 done_testing;
diff --git a/t/pt-online-schema-change/pt-2231.t b/t/pt-online-schema-change/pt-2231.t
index 4ff53406c..195865517 100644
--- a/t/pt-online-schema-change/pt-2231.t
+++ b/t/pt-online-schema-change/pt-2231.t
@@ -17,33 +17,33 @@ require "$trunk/bin/pt-online-schema-change";
 
 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 ( !$slave1_dbh ) {
-   plan skip_all => 'Cannot connect to sandbox slave2';
+elsif ( !$replica1_dbh ) {
+   plan skip_all => 'Cannot connect to sandbox replica2';
 }
 else {
    plan tests => 2;
 }
 
-$sb->load_file('master', "t/pt-online-schema-change/samples/basic_no_fks.sql");
+$sb->load_file('source', "t/pt-online-schema-change/samples/basic_no_fks.sql");
 
-$sb->wait_for_slaves();
+$sb->wait_for_replicas();
 
 # Save original PTDEBUG env because we modify it below.
 my $dbg = $ENV{PTDEBUG};
 
 $ENV{PTDEBUG} = 1;
 
-my $output = `$trunk/bin/pt-online-schema-change h=localhost,S=/tmp/12345/mysql_sandbox12345.sock,D=pt_osc,t=t --user=msandbox --password=msandbox --slave-user=msandbox --slave-password=msandbox --alter "FORCE" --recursion-method=processlist --no-check-replication-filters --no-check-alter --no-check-plan --chunk-index=PRIMARY --no-version-check --execute 2>&1`;
+my $output = `$trunk/bin/pt-online-schema-change h=localhost,S=/tmp/12345/mysql_sandbox12345.sock,D=pt_osc,t=t --user=msandbox --password=msandbox --replica-user=msandbox --replica-password=msandbox --alter "FORCE" --recursion-method=processlist --no-check-replication-filters --no-check-alter --no-check-plan --chunk-index=PRIMARY --no-version-check --execute 2>&1`;
 
 unlike(
    $output,
@@ -58,6 +58,6 @@ $ENV{PTDEBUG} = $dbg || 0;
 # #############################################################################
 # Done.
 # #############################################################################
-$sb->wipe_clean($master_dbh);
+$sb->wipe_clean($source_dbh);
 ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox");
 exit;
diff --git a/t/pt-online-schema-change/pt-2241.t b/t/pt-online-schema-change/pt-2241.t
index 9e2c63179..7c4e99ad4 100644
--- a/t/pt-online-schema-change/pt-2241.t
+++ b/t/pt-online-schema-change/pt-2241.t
@@ -35,12 +35,12 @@ require "$trunk/bin/pt-online-schema-change";
 
 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 $master_dsn = 'h=127.0.0.1,P=12345,u=msandbox,p=msandbox';
-my $slave_dsn1 = 'h=127.0.0.1,P=12346,u=msandbox,p=msandbox';
-my $slave_dsn2 = 'h=127.0.0.1,P=12347,u=msandbox,p=msandbox';
+my $source_dbh = $sb->get_dbh_for('source');
+my $replica1_dbh = $sb->get_dbh_for('replica1');
+my $replica2_dbh = $sb->get_dbh_for('replica2');
+my $source_dsn = 'h=127.0.0.1,P=12345,u=msandbox,p=msandbox';
+my $replica_dsn1 = 'h=127.0.0.1,P=12346,u=msandbox,p=msandbox';
+my $replica_dsn2 = 'h=127.0.0.1,P=12347,u=msandbox,p=msandbox';
 
 
 sub reset_query_cache {
@@ -54,56 +54,56 @@ sub reset_query_cache {
 
 
 diag('Loading test data');
-$sb->load_file('master', "t/pt-online-schema-change/samples/pt-2241.sql");
+$sb->load_file('source', "t/pt-online-schema-change/samples/pt-2241.sql");
 # Should be greater than chunk-size and big enough, so pt-osc will wait for delay
 my $num_rows = 5000;
 diag("Loading $num_rows into the table. This might take some time.");
 diag(`util/mysql_random_data_load --host=127.0.0.1 --port=12345 --user=msandbox --password=msandbox test pt2241 $num_rows`);
 
-$sb->wait_for_slaves();
-diag("Setting slaves delay to $delay seconds");
+$sb->wait_for_replicas();
+diag("Setting replicas delay to $delay seconds");
 
-$slave1_dbh->do('STOP SLAVE');
-$slave1_dbh->do("CHANGE MASTER TO MASTER_DELAY=$delay");
-$slave1_dbh->do('START SLAVE');
-$slave2_dbh->do('STOP SLAVE');
-$slave2_dbh->do("CHANGE MASTER TO MASTER_DELAY=$delay");
-$slave2_dbh->do('START SLAVE');
+$replica1_dbh->do("STOP ${replica_name}");
+$replica1_dbh->do("CHANGE ${source_change} TO ${source_name}_DELAY=$delay");
+$replica1_dbh->do("START ${replica_name}");
+$replica2_dbh->do("STOP ${replica_name}");
+$replica2_dbh->do("CHANGE ${source_change} TO ${source_name}_DELAY=$delay");
+$replica2_dbh->do("START ${replica_name}");
 
-# using --skip-check-slave-lag
-# Run a full table scan query to ensure the slave is behind the master
-reset_query_cache($master_dbh, $master_dbh);
-# Update one row so slave is delayed
-$master_dbh->do('UPDATE `test`.`pt2241` SET tcol2 = tcol2 + 1 LIMIT 1');
-$master_dbh->do('UPDATE `test`.`pt2241` SET tcol2 = tcol2 + 1 WHERE tcol1 = ""');
+# using --skip-check-replica-lag
+# Run a full table scan query to ensure the replica is behind the source
+reset_query_cache($source_dbh, $source_dbh);
+# Update one row so replica is delayed
+$source_dbh->do('UPDATE `test`.`pt2241` SET tcol2 = tcol2 + 1 LIMIT 1');
+$source_dbh->do('UPDATE `test`.`pt2241` SET tcol2 = tcol2 + 1 WHERE tcol1 = ""');
 
-# We need to sleep, otherwise pt-osc can finish before slave is delayed
+# We need to sleep, otherwise pt-osc can finish before replica is delayed
 my $max_lag = $delay / 2;
 sleep($max_lag);
-my $args = "$master_dsn,D=test,t=pt2241 --execute --chunk-size 1 --max-lag $max_lag --alter 'ENGINE=InnoDB' "
-      . "--skip-check-slave-lag h=127.0.0.1,P=12346,u=msandbox,p=msandbox,D=test,t=pt2241 --skip-check-slave-lag h=127.0.0.1,P=12347,u=msandbox,p=msandbox,D=test,t=pt2241 --pid $tmp_file_name --progress time,5";
+my $args = "$source_dsn,D=test,t=pt2241 --execute --chunk-size 1 --max-lag $max_lag --alter 'ENGINE=InnoDB' "
+      . "--skip-check-replica-lag h=127.0.0.1,P=12346,u=msandbox,p=msandbox,D=test,t=pt2241 --skip-check-replica-lag h=127.0.0.1,P=12347,u=msandbox,p=msandbox,D=test,t=pt2241 --pid $tmp_file_name --progress time,5";
 
-diag("Starting --skip-check-slave-lag test. This is going to take some time due to the delay in the slave");
+diag("Starting --skip-check-replica-lag test. This is going to take some time due to the delay in the replica");
 my $output = `$trunk/bin/pt-online-schema-change $args 2>&1`;
 
 unlike(
       $output,
       qr/Replica lag is \d+ seconds on .*  Waiting/s,
-      "--skip-check-slave-lag is really skipping the slave",
+      "--skip-check-replica-lag is really skipping the replica",
 );
 
 # #############################################################################
 # Done.
 # #############################################################################
-diag("Setting slave delay to 0 seconds");
-$slave1_dbh->do('STOP SLAVE');
-$slave2_dbh->do('STOP SLAVE');
-$master_dbh->do("RESET MASTER");
-$slave1_dbh->do('RESET SLAVE');
-$slave1_dbh->do('START SLAVE');
-$slave2_dbh->do('RESET SLAVE');
-$slave2_dbh->do('START SLAVE');
-
-$sb->wipe_clean($master_dbh);
+diag("Setting replica delay to 0 seconds");
+$replica1_dbh->do("STOP ${replica_name}");
+$replica2_dbh->do("STOP ${replica_name}");
+$source_dbh->do("RESET ${source_reset}");
+$replica1_dbh->do("RESET ${replica_name}");
+$replica1_dbh->do("START ${replica_name}");
+$replica2_dbh->do("RESET ${replica_name}");
+$replica2_dbh->do("START ${replica_name}");
+
+$sb->wipe_clean($source_dbh);
 ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox");
 done_testing;
diff --git a/t/pt-online-schema-change/pt-2258.t b/t/pt-online-schema-change/pt-2258.t
index 13d022a86..858c44a91 100644
--- a/t/pt-online-schema-change/pt-2258.t
+++ b/t/pt-online-schema-change/pt-2258.t
@@ -19,16 +19,16 @@ require "$trunk/bin/pt-online-schema-change";
 
 my $dp = new DSNParser(opts=>$dsn_opts);
 my $sb = new Sandbox(basedir => '/tmp', DSNParser => $dp);
-my $master_dbh = $sb->get_dbh_for('master');
+my $source_dbh = $sb->get_dbh_for('source');
 
-if ( !$master_dbh ) {
-   plan skip_all => 'Cannot connect to sandbox master';
+if ( !$source_dbh ) {
+   plan skip_all => 'Cannot connect to sandbox source';
 }
 
 # 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,u=msandbox,p=msandbox';
+my $source_dsn = 'h=127.1,P=12345,u=msandbox,p=msandbox';
 my @args       = (qw(--set-vars innodb_lock_wait_timeout=3));
 my $sample     = "t/pt-online-schema-change/samples/";
 my $plugin     = "$trunk/$sample/plugins";
@@ -39,7 +39,7 @@ my $exit_status;
 # https://bugs.launchpad.net/percona-toolkit/+bug/1171653
 # 
 # ############################################################################
-$sb->load_file('master', "$sample/basic_no_fks.sql");
+$sb->load_file('source', "$sample/basic_no_fks.sql");
 
 # Should be greater than chunk-size and big enough, so plugin will trigger few times
 my $num_rows = 5000;
@@ -48,7 +48,7 @@ diag(`util/mysql_random_data_load --host=127.0.0.1 --port=12345 --user=msandbox
 
 ($output, $exit_status) = full_output(
    sub { pt_online_schema_change::main(@args,
-      "$master_dsn,D=pt_osc,t=t",
+      "$source_dsn,D=pt_osc,t=t",
       "--alter", "CHARACTER SET utf8, MODIFY c CHAR(128) CHARACTER SET utf8",
       '--plugin', "$plugin/on_copy_rows_after_nibble.pm",
       '--execute') },
@@ -87,6 +87,6 @@ like(
 # #############################################################################
 # 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;
diff --git a/t/pt-online-schema-change/pt-2268.t b/t/pt-online-schema-change/pt-2268.t
index aeb5c005e..23d2b92f4 100644
--- a/t/pt-online-schema-change/pt-2268.t
+++ b/t/pt-online-schema-change/pt-2268.t
@@ -20,15 +20,15 @@ require "$trunk/bin/pt-online-schema-change";
 my $dp = new DSNParser(opts=>$dsn_opts);
 my $sb = new Sandbox(basedir => '/tmp', DSNParser => $dp);
 
-my $dbh = $sb->get_dbh_for('master');
-my $slave_dbh = $sb->get_dbh_for('slave1');
-my $dsn = $sb->dsn_for("master");
+my $dbh = $sb->get_dbh_for('source');
+my $replica_dbh = $sb->get_dbh_for('replica1');
+my $dsn = $sb->dsn_for("source");
 
 if ( !$dbh ) {
-   plan skip_all => 'Cannot connect to sandbox master';
+   plan skip_all => 'Cannot connect to sandbox source';
 }
-elsif ( !$slave_dbh ) {
-   plan skip_all => 'Cannot connect to sandbox slave';
+elsif ( !$replica_dbh ) {
+   plan skip_all => 'Cannot connect to sandbox replica';
 }
 else {
    plan tests => 2;
@@ -41,7 +41,7 @@ my @args = (qw(--set-vars innodb_lock_wait_timeout=3));
 my $output;
 my $exit_status;
 
-$sb->load_file('master', "t/pt-online-schema-change/samples/pt-2048.sql");
+$sb->load_file('source', "t/pt-online-schema-change/samples/pt-2048.sql");
 
 my $orig_id;
 my $sql = 'SELECT @@server_id';
diff --git a/t/pt-online-schema-change/pt-229.t b/t/pt-online-schema-change/pt-229.t
index 02aa720a4..ad901d465 100644
--- a/t/pt-online-schema-change/pt-229.t
+++ b/t/pt-online-schema-change/pt-229.t
@@ -28,11 +28,11 @@ require "$trunk/bin/pt-online-schema-change";
 my $dp = new DSNParser(opts=>$dsn_opts);
 my $sb = new Sandbox(basedir => '/tmp', DSNParser => $dp);
 
-my $master_dbh = $sb->get_dbh_for('node1');
-my $master_dsn = $sb->dsn_for('node1');
+my $source_dbh = $sb->get_dbh_for('node1');
+my $source_dsn = $sb->dsn_for('node1');
 
-if ( !$master_dbh ) {
-    plan skip_all => 'Cannot connect to sandbox master';
+if ( !$source_dbh ) {
+    plan skip_all => 'Cannot connect to sandbox source';
 }
 
 # The sandbox servers run with lock_wait_timeout=3 and it's not dynamic
@@ -42,13 +42,13 @@ my @args = (qw(--set-vars innodb_lock_wait_timeout=3));
 my $output;
 my $exit_status;
 
-$sb->load_file('master', "t/pt-online-schema-change/samples/pt-229.sql");
+$sb->load_file('source', "t/pt-online-schema-change/samples/pt-229.sql");
 
 my $num_rows = 40000;
 diag("Loading $num_rows into the table. This might take some time.");
 diag(`util/mysql_random_data_load --host=127.0.0.1 --port=12345 --user=msandbox --password=msandbox test test_a $num_rows`);
 diag("$num_rows rows loaded. Starting tests.");
-$master_dbh->do("FLUSH TABLES");
+$source_dbh->do("FLUSH TABLES");
 
 my $threads = [];
 
@@ -101,7 +101,7 @@ threads->yield();
 
 diag("Starting osc. Random rows will be updated in other threads.");
 ($output, $exit_status) = full_output(
-    sub { pt_online_schema_change::main(@args, "$master_dsn,D=test,t=test_a",
+    sub { pt_online_schema_change::main(@args, "$source_dsn,D=test,t=test_a",
             '--execute', 
             '--alter', "ADD COLUMN zzz INT",
         ),
@@ -121,7 +121,7 @@ like(
     "PT-229 Got successfully altered message.",
 );
 
-my $rows = $master_dbh->selectrow_arrayref('SHOW CREATE TABLE test.test_a');
+my $rows = $source_dbh->selectrow_arrayref('SHOW CREATE TABLE test.test_a');
 like(
     @$rows[1],
     ($sandbox_version ge '8.0') ? qr/  `zzz` int DEFAULT NULL,/im :
@@ -129,7 +129,7 @@ like(
     "PT-229 New field was added",
 );
 
-$rows = $master_dbh->selectrow_arrayref('SELECT COUNT(*) FROM test.test_a');
+$rows = $source_dbh->selectrow_arrayref('SELECT COUNT(*) FROM test.test_a');
 is(
     @$rows[0],
     $num_rows,
@@ -142,11 +142,11 @@ for (@$threads) {
     $s->down(); # Wait until all threads are really stopped
 }
 
-$master_dbh->do("DROP DATABASE IF EXISTS test");
+$source_dbh->do("DROP DATABASE IF EXISTS test");
 
 # #############################################################################
 # 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;
diff --git a/t/pt-online-schema-change/pt-244.t b/t/pt-online-schema-change/pt-244.t
index 68b6514c0..2b3ea84df 100644
--- a/t/pt-online-schema-change/pt-244.t
+++ b/t/pt-online-schema-change/pt-244.t
@@ -32,27 +32,27 @@ require "$trunk/bin/pt-online-schema-change";
 my $dp = new DSNParser(opts=>$dsn_opts);
 my $sb = new Sandbox(basedir => '/tmp', DSNParser => $dp);
 
-my $master3_port   = 2900;
-my $master_basedir = "/tmp/$master3_port";
+my $source3_port   = 2900;
+my $source_basedir = "/tmp/$source3_port";
 
-diag(`$trunk/sandbox/stop-sandbox $master3_port >/dev/null`);
-diag(`$trunk/sandbox/start-sandbox master $master3_port >/dev/null`);
+diag(`$trunk/sandbox/stop-sandbox $source3_port >/dev/null`);
+diag(`$trunk/sandbox/start-sandbox source $source3_port >/dev/null`);
 
 my $new_dir='/tmp/tdir';
 diag(`rm -rf $new_dir`);
 diag(`mkdir -p $new_dir`);
 
 if ($sandbox_version ge '8.0') {
-    diag(`/tmp/$master3_port/stop >/dev/null`);
-    diag(`echo "innodb_directories='$new_dir'" >> /tmp/$master3_port/my.sandbox.cnf`);
-    diag(`/tmp/$master3_port/start >/dev/null`);
+    diag(`/tmp/$source3_port/stop >/dev/null`);
+    diag(`echo "innodb_directories='$new_dir'" >> /tmp/$source3_port/my.sandbox.cnf`);
+    diag(`/tmp/$source3_port/start >/dev/null`);
 }
 
-my $dbh3 = $sb->get_dbh_for("master3");
-my $dsn3 = $sb->dsn_for("master3");
+my $dbh3 = $sb->get_dbh_for("source3");
+my $dsn3 = $sb->dsn_for("source3");
 
 if ( !$dbh3 ) {
-    plan skip_all => 'Cannot connect to sandbox master';
+    plan skip_all => 'Cannot connect to sandbox source';
 }
 
 # The sandbox servers run with lock_wait_timeout=3 and it's not dynamic
@@ -63,11 +63,11 @@ my $output;
 my $exit_status;
 
 diag("1");
-$sb->load_file('master3', "t/pt-online-schema-change/samples/pt-244.sql");
+$sb->load_file('source3', "t/pt-online-schema-change/samples/pt-244.sql");
 
 my $num_rows = 1000;
 diag("Loading $num_rows into the table. This might take some time.");
-diag(`util/mysql_random_data_load --host=127.0.0.1 --port=$master3_port --user=msandbox --password=msandbox test t3 $num_rows`);
+diag(`util/mysql_random_data_load --host=127.0.0.1 --port=$source3_port --user=msandbox --password=msandbox test t3 $num_rows`);
 diag("$num_rows rows loaded. Starting tests.");
 
 $dbh3->do("FLUSH TABLES");
@@ -120,6 +120,6 @@ $dbh3->do("DROP DATABASE IF EXISTS test");
 # Done.
 # #############################################################################
 $sb->wipe_clean($dbh3);
-diag(`$trunk/sandbox/stop-sandbox $master3_port >/dev/null`);
+diag(`$trunk/sandbox/stop-sandbox $source3_port >/dev/null`);
 ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox");
 done_testing;
diff --git a/t/pt-online-schema-change/pt_1757.t b/t/pt-online-schema-change/pt_1757.t
index d5840de59..4bba59955 100644
--- a/t/pt-online-schema-change/pt_1757.t
+++ b/t/pt-online-schema-change/pt_1757.t
@@ -32,10 +32,10 @@ require "$trunk/bin/pt-online-schema-change";
 my $dp = new DSNParser(opts=>$dsn_opts);
 my $sb = new Sandbox(basedir => '/tmp', DSNParser => $dp);
 
-my $dbh = $sb->get_dbh_for('master');
-my $dsn = $sb->dsn_for("master");
+my $dbh = $sb->get_dbh_for('source');
+my $dsn = $sb->dsn_for("source");
 
-my $slave_dbh = $sb->get_dbh_for('slave1');
+my $replica_dbh = $sb->get_dbh_for('replica1');
 
 # 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
@@ -43,16 +43,16 @@ my $slave_dbh = $sb->get_dbh_for('slave1');
 my @args = (qw(--set-vars innodb_lock_wait_timeout=3));
 my $output;
 my $exit_status;
-my $master_port = $sb->port_for('master');
+my $source_port = $sb->port_for('source');
 my $num_rows = 5000;
 
-$sb->load_file('master', "t/pt-online-schema-change/samples/pt-1757.sql");
-diag(`util/mysql_random_data_load --host=127.0.0.1 --port=$master_port --user=msandbox --password=msandbox test t1 $num_rows`);
+$sb->load_file('source', "t/pt-online-schema-change/samples/pt-1757.sql");
+diag(`util/mysql_random_data_load --host=127.0.0.1 --port=$source_port --user=msandbox --password=msandbox test t1 $num_rows`);
 
 
 # Let's alter the stats to force this scenario:
-# 1) On master, we are going to put 100 as the number of rows in the table. This will make osc to try to run in one chunk
-# 2) On the slave, we are going to put the real number of rows. This will cause a fallback to nibble and pt-osc should call
+# 1) On source, we are going to put 100 as the number of rows in the table. This will make osc to try to run in one chunk
+# 2) On the replica, we are going to put the real number of rows. This will cause a fallback to nibble and pt-osc should call
 # NibbleIterator->switch_to_nibble()
 
 $dbh->do('SET @@SESSION.sql_log_bin=0');
@@ -60,10 +60,10 @@ $dbh->do('update mysql.innodb_table_stats set n_rows=100 where table_name="t1"')
 $dbh->do('update mysql.innodb_index_stats set stat_value=100 where stat_description in("id") and table_name="t1"');
 $dbh->do('SET @@SESSION.sql_log_bin=1');
 
-$slave_dbh->do('SET @@SESSION.sql_log_bin=0');
-$slave_dbh->do("update mysql.innodb_table_stats set n_rows=$num_rows where table_name='t1'");
-$slave_dbh->do("update mysql.innodb_index_stats set stat_value=$num_rows where stat_description in('id') and table_name='t1'");
-$slave_dbh->do('SET @@SESSION.sql_log_bin=1');
+$replica_dbh->do('SET @@SESSION.sql_log_bin=0');
+$replica_dbh->do("update mysql.innodb_table_stats set n_rows=$num_rows where table_name='t1'");
+$replica_dbh->do("update mysql.innodb_index_stats set stat_value=$num_rows where stat_description in('id') and table_name='t1'");
+$replica_dbh->do('SET @@SESSION.sql_log_bin=1');
 
 ($output, $exit_status) = full_output(
     sub { pt_online_schema_change::main(@args, "$dsn,D=test,t=t1",
diff --git a/t/pt-online-schema-change/pxc.t b/t/pt-online-schema-change/pxc.t
index a216dfc7b..4f6dd9e6c 100644
--- a/t/pt-online-schema-change/pxc.t
+++ b/t/pt-online-schema-change/pxc.t
@@ -13,8 +13,8 @@ use Test::More;
 use Data::Dumper;
 
 # 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;
 
@@ -134,43 +134,43 @@ is_deeply(
 ) or BAIL_OUT("Failed to restore wsrep_OSU_method=TOI");
 
 # #############################################################################
-# master -> cluster, run on master on table with foreign keys.
+# source -> cluster, run on source on table with foreign keys.
 # #############################################################################
 
-# CAREFUL: The master and the cluster are different, so don't do stuff
-# on the master that will conflict with stuff already done on the cluster.
-# And since we're using RBR, we have to do a lot of stuff on the master
+# CAREFUL: The source and the cluster are different, so don't do stuff
+# on the source that will conflict with stuff already done on the cluster.
+# And since we're using RBR, we have to do a lot of stuff on the source
 # again, manually, because REPLACE and INSERT IGNORE don't work in RBR
 # like they do SBR.
 
-my ($master_dbh, $master_dsn) = $sb->start_sandbox(
-   server => 'cmaster',
-   type   => 'master',
+my ($source_dbh, $source_dsn) = $sb->start_sandbox(
+   server => 'csource',
+   type   => 'source',
    env    => q/BINLOG_FORMAT="ROW"/,
 );
 
-$sb->set_as_slave('node1', 'cmaster');
+$sb->set_as_replica('node1', 'csource');
 
-$sb->load_file('cmaster', "$sample/basic_with_fks.sql", undef, no_wait => 1);
+$sb->load_file('csource', "$sample/basic_with_fks.sql", undef, no_wait => 1);
 
-$master_dbh->do('SET @@binlog_format:="STATEMENT"');
-$master_dbh->do("REPLACE INTO percona_test.sentinel (id, ping) VALUES (1, '')");
-$sb->wait_for_slaves(master => 'cmaster', slave => 'node1');
+$source_dbh->do('SET @@binlog_format:="STATEMENT"');
+$source_dbh->do("REPLACE INTO percona_test.sentinel (id, ping) VALUES (1, '')");
+$sb->wait_for_replicas(source => 'csource', replica => 'node1');
 
 ($output, $exit) = full_output(
    sub { pt_online_schema_change::main(
-      "$master_dsn,D=pt_osc,t=city",
+      "$source_dsn,D=pt_osc,t=city",
       qw(--print --execute --alter-foreign-keys-method drop_swap),
       '--alter', 'DROP COLUMN last_update'
    )},
    stderr => 1,
 );
 
-my $rows = $node1->selectrow_hashref("SHOW SLAVE STATUS");
+my $rows = $node1->selectrow_hashref("SHOW ${replica_name} STATUS");
 is(
    $rows->{last_error},
    "",
-   "Alter table with foreign keys on master replicating to cluster"
+   "Alter table with foreign keys on source replicating to cluster"
 ) or diag(Dumper($rows), $output);
 
 is(
@@ -179,9 +179,9 @@ is(
    "... exit 0"
 ) or diag($output);
 
-$sb->stop_sandbox(qw(cmaster));
-$node1->do("STOP SLAVE");
-$node1->do("RESET SLAVE");
+$sb->stop_sandbox(qw(csource));
+$node1->do("STOP ${replica_name}");
+$node1->do("RESET ${replica_name}");
 
 # #############################################################################
 # Done.
diff --git a/t/pt-online-schema-change/rename_columns.t b/t/pt-online-schema-change/rename_columns.t
index e60501c57..dbd09e4ac 100644
--- a/t/pt-online-schema-change/rename_columns.t
+++ b/t/pt-online-schema-change/rename_columns.t
@@ -19,20 +19,20 @@ require "$trunk/bin/pt-online-schema-change";
 
 my $dp = new DSNParser(opts=>$dsn_opts);
 my $sb = new Sandbox(basedir => '/tmp', DSNParser => $dp);
-my $master_dbh = $sb->get_dbh_for('master');
-my $slave_dbh  = $sb->get_dbh_for('slave1');
+my $source_dbh = $sb->get_dbh_for('source');
+my $replica_dbh  = $sb->get_dbh_for('replica1');
 
-if ( !$master_dbh ) {
-   plan skip_all => 'Cannot connect to sandbox master';
+if ( !$source_dbh ) {
+   plan skip_all => 'Cannot connect to sandbox source';
 }
-elsif ( !$slave_dbh ) {
-   plan skip_all => 'Cannot connect to sandbox slave1';
+elsif ( !$replica_dbh ) {
+   plan skip_all => 'Cannot connect to sandbox replica1';
 }
 
 # 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,u=msandbox,p=msandbox';
+my $source_dsn = 'h=127.1,P=12345,u=msandbox,p=msandbox';
 my @args       = (qw(--set-vars innodb_lock_wait_timeout=3));
 my $output;
 my $exit_status;
@@ -43,11 +43,11 @@ my $sample  = "t/pt-online-schema-change/samples/";
 # pt-online-schema-change loses data when renaming columns
 # ############################################################################
 
-$sb->load_file('master', "$sample/data-loss-bug-1068562.sql");
+$sb->load_file('source', "$sample/data-loss-bug-1068562.sql");
 
 ($output, $exit_status) = full_output(
    sub { pt_online_schema_change::main(@args,
-      "$master_dsn,D=bug1068562,t=simon",
+      "$source_dsn,D=bug1068562,t=simon",
       "--alter", "change old_column_name new_column_name varchar(255) NULL",
       qw(--execute)) },
 );
@@ -65,12 +65,12 @@ like(
 
 ($output, $exit_status) = full_output(
    sub { pt_online_schema_change::main(@args,
-      "$master_dsn,D=bug1068562,t=simon",
+      "$source_dsn,D=bug1068562,t=simon",
       "--alter", "change old_column_name new_column_name varchar(255) NULL",
       qw(--execute --no-check-alter)) },
 );
 
-my $rows = $master_dbh->selectall_arrayref("SELECT * FROM bug1068562.simon ORDER BY id");
+my $rows = $source_dbh->selectall_arrayref("SELECT * FROM bug1068562.simon ORDER BY id");
 
 is_deeply(
    $rows,
@@ -82,11 +82,11 @@ is_deeply(
 # Now try with sakila.city.
 # #############################################################################
 
-my $orig = $master_dbh->selectall_arrayref(q{SELECT city FROM sakila.city});
+my $orig = $source_dbh->selectall_arrayref(q{SELECT city FROM sakila.city});
 
 ($output, $exit_status) = full_output(
    sub { pt_online_schema_change::main(@args,
-      "$master_dsn,D=sakila,t=city",
+      "$source_dsn,D=sakila,t=city",
       "--alter", "change column `city` `some_cities` varchar(50) NOT NULL",
       qw(--execute --alter-foreign-keys-method auto --no-check-alter)) },
 );
@@ -97,7 +97,7 @@ is(
    "sakila.city: Exit status 0",
 ) or diag($output);
 
-my $mod = $master_dbh->selectall_arrayref(q{SELECT some_cities FROM sakila.city});
+my $mod = $source_dbh->selectall_arrayref(q{SELECT some_cities FROM sakila.city});
 
 is_deeply(
    $orig,
@@ -107,12 +107,12 @@ is_deeply(
 
 ($output, $exit_status) = full_output(
    sub { pt_online_schema_change::main(@args,
-      "$master_dsn,D=sakila,t=city",
+      "$source_dsn,D=sakila,t=city",
       "--alter", "change column `some_cities` city varchar(50) NOT NULL",
       qw(--execute --alter-foreign-keys-method auto --no-check-alter)) },
 );
 
-my $mod2 = $master_dbh->selectall_arrayref(q{SELECT city FROM sakila.city});
+my $mod2 = $source_dbh->selectall_arrayref(q{SELECT city FROM sakila.city});
 
 is_deeply(
    $orig,
@@ -126,19 +126,19 @@ is_deeply(
 # #############################################################################
 
 diag("Reloading sakila");
-my $master_port = $sb->port_for('master');
-system "$trunk/sandbox/load-sakila-db $master_port";
-$sb->wait_for_slaves();
+my $source_port = $sb->port_for('source');
+system "$trunk/sandbox/load-sakila-db $source_port";
+$sb->wait_for_replicas();
 
-$orig = $master_dbh->selectall_arrayref(q{SELECT first_name, last_name FROM sakila.staff});
+$orig = $source_dbh->selectall_arrayref(q{SELECT first_name, last_name FROM sakila.staff});
 
 ($output, $exit_status) = full_output(
    sub { pt_online_schema_change::main(@args,
-      "$master_dsn,D=sakila,t=staff",
+      "$source_dsn,D=sakila,t=staff",
       "--alter", "change column first_name first_name_mod varchar(45) NOT NULL, change column last_name last_name_mod varchar(45) NOT NULL",
       qw(--execute --alter-foreign-keys-method rebuild_constraints --no-check-alter --chunk-size 20000)) },
 );
-$mod = $master_dbh->selectall_arrayref(q{SELECT first_name_mod, last_name_mod FROM sakila.staff});
+$mod = $source_dbh->selectall_arrayref(q{SELECT first_name_mod, last_name_mod FROM sakila.staff});
 
 is_deeply(
    $orig,
@@ -148,12 +148,12 @@ is_deeply(
 
 ($output, $exit_status) = full_output(
    sub { pt_online_schema_change::main(@args,
-      "$master_dsn,D=sakila,t=staff",
+      "$source_dsn,D=sakila,t=staff",
       "--alter", "change column first_name_mod first_name varchar(45) NOT NULL, change column last_name_mod last_name varchar(45) NOT NULL",
       qw(--execute --alter-foreign-keys-method auto --no-check-alter --chunk-size 20000)) },
 );
 
-$mod2 = $master_dbh->selectall_arrayref(q{SELECT first_name, last_name FROM sakila.staff});
+$mod2 = $source_dbh->selectall_arrayref(q{SELECT first_name, last_name FROM sakila.staff});
 is_deeply(
    $orig,
    $mod2,
@@ -167,7 +167,7 @@ is_deeply(
 
 ($output, $exit_status) = full_output(
    sub { pt_online_schema_change::main(@args,
-      "$master_dsn,D=sakila,t=staff",
+      "$source_dsn,D=sakila,t=staff",
       "--alter", "change column first_name first_name_mod varchar(45) NOT NULL, change column last_name last_name_mod varchar(45) NOT NULL",
       qw(--dry-run --alter-foreign-keys-method auto)) },
 );
@@ -188,7 +188,7 @@ like(
 
 ($output, $exit_status) = full_output(
    sub { pt_online_schema_change::main(@args,
-      "$master_dsn,D=sakila,t=staff",
+      "$source_dsn,D=sakila,t=staff",
       "--alter", "change column first_name first_name varchar(45) NOT NULL",
       qw(--execute --alter-foreign-keys-method auto)) },
 );
@@ -202,6 +202,6 @@ unlike(
 # #############################################################################
 # 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;
diff --git a/t/pt-online-schema-change/rename_fk_constraints.t b/t/pt-online-schema-change/rename_fk_constraints.t
index a2780b909..6088813dd 100644
--- a/t/pt-online-schema-change/rename_fk_constraints.t
+++ b/t/pt-online-schema-change/rename_fk_constraints.t
@@ -19,22 +19,28 @@ require "$trunk/bin/pt-online-schema-change";
 
 my $dp = new DSNParser(opts=>$dsn_opts);
 my $sb = new Sandbox(basedir => '/tmp', DSNParser => $dp);
-my $master_dbh = $sb->get_dbh_for('master');
+my $source_dbh = $sb->get_dbh_for('source');
 
-my $vp = VersionParser->new($master_dbh);
+my $vp = VersionParser->new($source_dbh);
 
 if ($vp->cmp('8.0') > -1 && $vp->cmp('8.0.14') < 0 && $vp->flavor() !~ m/maria/i) {
    plan skip_all => 'Cannot run this test under the current MySQL version';
 }
 
-if ( !$master_dbh ) {
-   plan skip_all => 'Cannot connect to sandbox master';
+if ( !$source_dbh  && $vp->flavor() !~ m/maria/i) {
+   plan skip_all => 'Cannot connect to sandbox source';
 }
 
+my $old_restrict_fk_on_non_standard_key;
+
+if ( $sandbox_version ge '8.4' ){
+   $old_restrict_fk_on_non_standard_key = ($source_dbh->selectrow_array('SELECT @@RESTRICT_FK_ON_NON_STANDARD_KEY'))[0];
+   $source_dbh->do('SET GLOBAL RESTRICT_FK_ON_NON_STANDARD_KEY = 0');
+}
 # 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,u=msandbox,p=msandbox';
+my $source_dsn = 'h=127.1,P=12345,u=msandbox,p=msandbox';
 my @args       = (qw(--set-vars innodb_lock_wait_timeout=3 --alter-foreign-keys-method rebuild_constraints));
 my $output;
 my $exit_status;
@@ -45,13 +51,13 @@ my $sample  = "t/pt-online-schema-change/samples/";
 # Adding _ to constraints can create issues with constraint name length
 # ############################################################################
 
-$sb->load_file('master', "$sample/bug-1215587.sql");
+$sb->load_file('source', "$sample/bug-1215587.sql");
 
 # run once: we expect constraint names to be prefixed with one underscore
 # if they havre't one, and to remove 2 if they have 2
 ($output, $exit_status) = full_output(
    sub { pt_online_schema_change::main(@args,
-      "$master_dsn,D=bug1215587,t=Table1",
+      "$source_dsn,D=bug1215587,t=Table1",
       "--alter", "ENGINE=InnoDB",
       qw(--execute)) },
 );
@@ -65,7 +71,7 @@ my $query = <<__SQL;
 ORDER BY TABLE_NAME, CONSTRAINT_NAME 
 __SQL
 
-my $constraints = $master_dbh->selectall_arrayref($query); 
+my $constraints = $source_dbh->selectall_arrayref($query); 
 # why we need to sort? Depending on the MySQL version and the characters set, the ORDER BY clause
 # in the query will return different values so, it is better to rely on our own sorted results.
 my @sorted_constraints = sort { @$a[0].@$a[1] cmp @$b[0].@$b[1] } @$constraints;
@@ -85,12 +91,12 @@ is_deeply(
 # if they havre't one, and to remove 2 if they have 2
 ($output, $exit_status) = full_output(
    sub { pt_online_schema_change::main(@args,
-      "$master_dsn,D=bug1215587,t=Table1",
+      "$source_dsn,D=bug1215587,t=Table1",
       "--alter", "ENGINE=InnoDB",
       qw(--execute)) },
 );
 
-$constraints = $master_dbh->selectall_arrayref("SELECT TABLE_NAME, CONSTRAINT_NAME FROM information_schema.KEY_COLUMN_USAGE WHERE table_schema='bug1215587' and (TABLE_NAME='Table1' OR TABLE_NAME='Table2') and CONSTRAINT_NAME LIKE '%fkey%' ORDER BY TABLE_NAME, CONSTRAINT_NAME"); 
+$constraints = $source_dbh->selectall_arrayref("SELECT TABLE_NAME, CONSTRAINT_NAME FROM information_schema.KEY_COLUMN_USAGE WHERE table_schema='bug1215587' and (TABLE_NAME='Table1' OR TABLE_NAME='Table2') and CONSTRAINT_NAME LIKE '%fkey%' ORDER BY TABLE_NAME, CONSTRAINT_NAME"); 
 @sorted_constraints = sort { @$a[0].@$a[1] cmp @$b[0].@$b[1] } @$constraints; # read above why we need to sort
 
 is_deeply(
@@ -107,12 +113,12 @@ is_deeply(
 # run third time: we expect constraints to be the same as we started (toggled back)
 ($output, $exit_status) = full_output(
    sub { pt_online_schema_change::main(@args,
-      "$master_dsn,D=bug1215587,t=Table1",
+      "$source_dsn,D=bug1215587,t=Table1",
       "--alter", "ENGINE=InnoDB",
       qw(--execute)) },
 );
 
-$constraints = $master_dbh->selectall_arrayref("SELECT TABLE_NAME, CONSTRAINT_NAME FROM information_schema.KEY_COLUMN_USAGE WHERE table_schema='bug1215587' and (TABLE_NAME='Table1' OR TABLE_NAME='Table2') and CONSTRAINT_NAME LIKE '%fkey%' ORDER BY TABLE_NAME, CONSTRAINT_NAME"); 
+$constraints = $source_dbh->selectall_arrayref("SELECT TABLE_NAME, CONSTRAINT_NAME FROM information_schema.KEY_COLUMN_USAGE WHERE table_schema='bug1215587' and (TABLE_NAME='Table1' OR TABLE_NAME='Table2') and CONSTRAINT_NAME LIKE '%fkey%' ORDER BY TABLE_NAME, CONSTRAINT_NAME"); 
 @sorted_constraints = sort { @$a[0].@$a[1] cmp @$b[0].@$b[1] } @$constraints; # read above why we need to sort
 
 is_deeply(
@@ -129,6 +135,10 @@ is_deeply(
 # #############################################################################
 # Done.
 # #############################################################################
-$sb->wipe_clean($master_dbh);
+if ( $sandbox_version ge '8.4' ){
+   $source_dbh->do("SET GLOBAL RESTRICT_FK_ON_NON_STANDARD_KEY = $old_restrict_fk_on_non_standard_key");
+}
+
+$sb->wipe_clean($source_dbh);
 ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox");
 done_testing;
diff --git a/t/pt-online-schema-change/rename_self_ref_fk_constraints.t b/t/pt-online-schema-change/rename_self_ref_fk_constraints.t
index 0d27e9a38..ed1be965a 100644
--- a/t/pt-online-schema-change/rename_self_ref_fk_constraints.t
+++ b/t/pt-online-schema-change/rename_self_ref_fk_constraints.t
@@ -19,16 +19,16 @@ require "$trunk/bin/pt-online-schema-change";
 
 my $dp = new DSNParser(opts=>$dsn_opts);
 my $sb = new Sandbox(basedir => '/tmp', DSNParser => $dp);
-my $master_dbh = $sb->get_dbh_for('master');
+my $source_dbh = $sb->get_dbh_for('source');
 
-if ( !$master_dbh ) {
-   plan skip_all => 'Cannot connect to sandbox master';
+if ( !$source_dbh ) {
+   plan skip_all => 'Cannot connect to sandbox source';
 }
 
 # 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,u=msandbox,p=msandbox';
+my $source_dsn = 'h=127.1,P=12345,u=msandbox,p=msandbox';
 my @args       = (qw(--set-vars innodb_lock_wait_timeout=3 --alter-foreign-keys-method rebuild_constraints));
 my $output;
 my $exit_status;
@@ -39,14 +39,14 @@ my $exit_status;
 # ############################################################################
 
 diag("Before loading sql");
-$sb->load_file('master', "t/pt-online-schema-change/samples/bug-1632522.sql");
+$sb->load_file('source', "t/pt-online-schema-change/samples/bug-1632522.sql");
 diag("after loading sql");
 
 # run once: we expect the constraint name to be appended with one underscore
 # but the self-referencing constraint will have 2 underscore
 ($output, $exit_status) = full_output(
    sub { pt_online_schema_change::main(@args,
-      "$master_dsn,D=bug1632522,t=test_table",
+      "$source_dsn,D=bug1632522,t=test_table",
       "--alter", "ENGINE=InnoDB",
       qw(--execute)) },
 );
@@ -59,7 +59,7 @@ my $query = <<"END";
      AND CONSTRAINT_NAME LIKE '%fk_%' 
 ORDER BY TABLE_NAME, CONSTRAINT_NAME
 END
-my $constraints = $master_dbh->selectall_arrayref($query);
+my $constraints = $source_dbh->selectall_arrayref($query);
 
 is_deeply(
    $constraints,
@@ -75,7 +75,7 @@ is_deeply(
 # if they havre't one, and to remove 2 if they have 2
 ($output, $exit_status) = full_output(
    sub { pt_online_schema_change::main(@args,
-      "$master_dsn,D=bug1632522,t=test_table",
+      "$source_dsn,D=bug1632522,t=test_table",
       "--alter", "ENGINE=InnoDB",
       qw(--execute)) },
 );
@@ -88,7 +88,7 @@ $query = <<"END";
      AND CONSTRAINT_NAME LIKE '%fk_%' 
 ORDER BY TABLE_NAME, CONSTRAINT_NAME
 END
-$constraints = $master_dbh->selectall_arrayref($query);
+$constraints = $source_dbh->selectall_arrayref($query);
 
 
 is_deeply(
@@ -104,7 +104,7 @@ is_deeply(
 # run third time: we expect constraints to be the same as we started (toggled back)
 ($output, $exit_status) = full_output(
    sub { pt_online_schema_change::main(@args,
-      "$master_dsn,D=bug1632522,t=test_table",
+      "$source_dsn,D=bug1632522,t=test_table",
       "--alter", "ENGINE=InnoDB",
       qw(--execute)) },
 );
@@ -117,7 +117,7 @@ $query = <<"END";
      and CONSTRAINT_NAME LIKE '%fk_%' 
 ORDER BY TABLE_NAME, CONSTRAINT_NAME
 END
-$constraints = $master_dbh->selectall_arrayref($query);
+$constraints = $source_dbh->selectall_arrayref($query);
 
 
 is_deeply(
@@ -133,6 +133,6 @@ is_deeply(
 # #############################################################################
 # 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;
diff --git a/t/pt-online-schema-change/rename_self_ref_fk_constraints_pt_1802.t b/t/pt-online-schema-change/rename_self_ref_fk_constraints_pt_1802.t
index 150f96182..261302758 100644
--- a/t/pt-online-schema-change/rename_self_ref_fk_constraints_pt_1802.t
+++ b/t/pt-online-schema-change/rename_self_ref_fk_constraints_pt_1802.t
@@ -19,16 +19,16 @@ require "$trunk/bin/pt-online-schema-change";
 
 my $dp = new DSNParser(opts=>$dsn_opts);
 my $sb = new Sandbox(basedir => '/tmp', DSNParser => $dp);
-my $master_dbh = $sb->get_dbh_for('master');
+my $source_dbh = $sb->get_dbh_for('source');
 
-if ( !$master_dbh ) {
-   plan skip_all => 'Cannot connect to sandbox master';
+if ( !$source_dbh ) {
+   plan skip_all => 'Cannot connect to sandbox source';
 }
 
 # 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,u=msandbox,p=msandbox';
+my $source_dsn = 'h=127.1,P=12345,u=msandbox,p=msandbox';
 my @args       = (qw(--set-vars innodb_lock_wait_timeout=3 --alter-foreign-keys-method rebuild_constraints));
 my $output;
 my $exit_status;
@@ -39,14 +39,14 @@ my $exit_status;
 # ############################################################################
 
 diag("Before loading sql");
-$sb->load_file('master', "t/pt-online-schema-change/samples/bug-1632522.sql");
+$sb->load_file('source', "t/pt-online-schema-change/samples/bug-1632522.sql");
 diag("after loading sql");
 
 # run once: we expect the constraint name to be appended with one underscore
 # but the self-referencing constraint will have 2 underscore
 ($output, $exit_status) = full_output(
    sub { pt_online_schema_change::main(@args,
-      "$master_dsn,D=bug1632522,t=test_table",
+      "$source_dsn,D=bug1632522,t=test_table",
       "--alter", "ENGINE=InnoDB",
       qw(--execute)) },
 );
@@ -59,7 +59,7 @@ my $query = <<"END";
      AND CONSTRAINT_NAME LIKE '%fk_%' 
 ORDER BY TABLE_NAME, CONSTRAINT_NAME
 END
-my $constraints = $master_dbh->selectall_arrayref($query);
+my $constraints = $source_dbh->selectall_arrayref($query);
 my @constraints = sort { @$a[0].@$a[1] cmp @$b[0].@$b[1] } @$constraints;
 
 is_deeply(
@@ -76,7 +76,7 @@ is_deeply(
 # if they havre't one, and to remove 2 if they have 2
 ($output, $exit_status) = full_output(
    sub { pt_online_schema_change::main(@args,
-      "$master_dsn,D=bug1632522,t=test_table",
+      "$source_dsn,D=bug1632522,t=test_table",
       "--alter", "ENGINE=InnoDB",
       qw(--execute)) },
 );
@@ -89,7 +89,7 @@ $query = <<"END";
      AND CONSTRAINT_NAME LIKE '%fk_%' 
 ORDER BY TABLE_NAME, CONSTRAINT_NAME
 END
-$constraints = $master_dbh->selectall_arrayref($query);
+$constraints = $source_dbh->selectall_arrayref($query);
 
 @constraints = sort { @$a[0].@$a[1] cmp @$b[0].@$b[1] } @$constraints;
 
@@ -106,7 +106,7 @@ is_deeply(
 # run third time: we expect constraints to be the same as we started (toggled back)
 ($output, $exit_status) = full_output(
    sub { pt_online_schema_change::main(@args,
-      "$master_dsn,D=bug1632522,t=test_table",
+      "$source_dsn,D=bug1632522,t=test_table",
       "--alter", "ENGINE=InnoDB",
       qw(--execute)) },
 );
@@ -119,7 +119,7 @@ $query = <<"END";
      and CONSTRAINT_NAME LIKE '%fk_%' 
 ORDER BY TABLE_NAME, CONSTRAINT_NAME
 END
-$constraints = $master_dbh->selectall_arrayref($query);
+$constraints = $source_dbh->selectall_arrayref($query);
 
 
 is_deeply(
@@ -135,6 +135,6 @@ is_deeply(
 # #############################################################################
 # 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;
diff --git a/t/pt-online-schema-change/samples/create_dsns.sql b/t/pt-online-schema-change/samples/create_dsns.sql
index da857432f..6c9d5baf6 100644
--- a/t/pt-online-schema-change/samples/create_dsns.sql
+++ b/t/pt-online-schema-change/samples/create_dsns.sql
@@ -8,6 +8,6 @@ CREATE TABLE `dsns` (
   PRIMARY KEY (`id`)
 ) ENGINE=InnoDB AUTO_INCREMENT=3 DEFAULT CHARSET=latin1;
 
-INSERT INTO `dsns` VALUES (1, 12345, "D=test_recursion_method,t=dsns,P=12346,h=127.0.0.1,u=root,p=msandbox");
-INSERT INTO `dsns` VALUES (2, 12345, "D=test_recursion_method,t=dsns,P=12347,h=127.0.0.1,u=root,p=msandbox");
+INSERT INTO `dsns` VALUES (1, 12345, "D=test_recursion_method,t=dsns,P=12346,h=127.0.0.1,u=root,p=msandbox,s=1");
+INSERT INTO `dsns` VALUES (2, 12345, "D=test_recursion_method,t=dsns,P=12347,h=127.0.0.1,u=root,p=msandbox,s=1");
 
diff --git a/t/pt-online-schema-change/samples/plugins/all_hooks.pm b/t/pt-online-schema-change/samples/plugins/all_hooks.pm
index d97ee48ab..8d9077c55 100644
--- a/t/pt-online-schema-change/samples/plugins/all_hooks.pm
+++ b/t/pt-online-schema-change/samples/plugins/all_hooks.pm
@@ -113,4 +113,11 @@ sub get_slave_lag {
    return sub { return 0; };
 }
 
+sub get_replica_lag {
+   my ($self, %args) = @_;
+   print "PLUGIN get_replica_lag\n";
+
+   return sub { return 0; };
+}
+
 1;
diff --git a/t/pt-online-schema-change/samples/pt-1455_replica.sql b/t/pt-online-schema-change/samples/pt-1455_replica.sql
new file mode 100644
index 000000000..2e5881d9d
--- /dev/null
+++ b/t/pt-online-schema-change/samples/pt-1455_replica.sql
@@ -0,0 +1,6 @@
+STOP REPLICA;
+CHANGE REPLICATION FILTER REPLICATE_IGNORE_DB = (`ignored_db`);
+CHANGE REPLICATION FILTER REPLICATE_IGNORE_TABLE = (`idb1`.`it1`, `idb1`.`it2`);
+CHANGE REPLICATION FILTER REPLICATE_WILD_IGNORE_TABLE = ('employees.eit%');
+RESET REPLICA;
+START REPLICA;
diff --git a/t/pt-online-schema-change/samples/pt-1455_reset_replica.sql b/t/pt-online-schema-change/samples/pt-1455_reset_replica.sql
new file mode 100644
index 000000000..0c78eb399
--- /dev/null
+++ b/t/pt-online-schema-change/samples/pt-1455_reset_replica.sql
@@ -0,0 +1,6 @@
+STOP REPLICA;
+CHANGE REPLICATION FILTER REPLICATE_IGNORE_DB = ();
+CHANGE REPLICATION FILTER REPLICATE_IGNORE_TABLE = ();
+CHANGE REPLICATION FILTER REPLICATE_WILD_IGNORE_TABLE = ();
+RESET REPLICA;
+START REPLICA;
diff --git a/t/pt-online-schema-change/samples/pt-1455_master.sql b/t/pt-online-schema-change/samples/pt-1455_source.sql
similarity index 100%
rename from t/pt-online-schema-change/samples/pt-1455_master.sql
rename to t/pt-online-schema-change/samples/pt-1455_source.sql
diff --git a/t/pt-online-schema-change/samples/slave_lag.sql b/t/pt-online-schema-change/samples/replica_lag.sql
similarity index 100%
rename from t/pt-online-schema-change/samples/slave_lag.sql
rename to t/pt-online-schema-change/samples/replica_lag.sql
diff --git a/t/pt-online-schema-change/samples/stats-execute-8.4.txt b/t/pt-online-schema-change/samples/stats-execute-8.4.txt
new file mode 100644
index 000000000..a6b9120b0
--- /dev/null
+++ b/t/pt-online-schema-change/samples/stats-execute-8.4.txt
@@ -0,0 +1,30 @@
+No replicas found.  See --recursion-method if host h=127.1,P=12345 has replicas.
+Not checking replica lag because no replicas were found and --check-replica-lag was not specified.
+Operation, tries, wait:
+  analyze_table, 10, 1
+  copy_rows, 10, 0.25
+  create_triggers, 10, 1
+  drop_triggers, 10, 1
+  swap_tables, 10, 1
+  update_foreign_keys, 10, 1
+Altering `bug_1045317`.`bits`...
+TS Dropping triggers...
+TS Dropped triggers OK.
+# Event              Count
+# ================== =====
+# INSERT                 1
+# mysql_warning_1592     1
+Successfully altered `bug_1045317`.`bits`.
+Creating new table...
+Created new table bug_1045317._bits_new OK.
+Altering new table...
+Altered `bug_1045317`.`_bits_new` OK.
+TS Creating triggers...
+TS Created triggers OK.
+TS Copying approximately 3 rows...
+TS Copied rows OK.
+TS Analyzing new table...
+TS Swapping tables...
+TS Swapped original and new tables OK.
+TS Dropping old table...
+TS Dropped old table `bug_1045317`.`_bits_old` OK.
diff --git a/t/pt-online-schema-change/sanity_checks.t b/t/pt-online-schema-change/sanity_checks.t
index 87d9d2a5b..da36f9061 100644
--- a/t/pt-online-schema-change/sanity_checks.t
+++ b/t/pt-online-schema-change/sanity_checks.t
@@ -22,11 +22,11 @@ $Data::Dumper::Quotekeys = 0;
 
 my $dp         = new DSNParser(opts=>$dsn_opts);
 my $sb         = new Sandbox(basedir => '/tmp', DSNParser => $dp);
-my $master_dbh = $sb->get_dbh_for('master');
-my $slave_dbh  = $sb->get_dbh_for('slave1');
+my $source_dbh = $sb->get_dbh_for('source');
+my $replica_dbh  = $sb->get_dbh_for('replica1');
 
-if ( !$master_dbh ) {
-   plan skip_all => 'Cannot connect to sandbox master';
+if ( !$source_dbh ) {
+   plan skip_all => 'Cannot connect to sandbox source';
 }
 
 my $q      = new Quoter();
@@ -63,12 +63,12 @@ like( $output,
    "Original table must exist"
 );
 
-$sb->load_file('master', "$sample/basic_no_fks_innodb.sql");
-$master_dbh->do("USE pt_osc");
-$slave_dbh->do("USE pt_osc");
+$sb->load_file('source', "$sample/basic_no_fks_innodb.sql");
+$source_dbh->do("USE pt_osc");
+$replica_dbh->do("USE pt_osc");
 
 # The orig table cannot have any triggers.
-$master_dbh->do("CREATE TRIGGER pt_osc.pt_osc_test AFTER DELETE ON pt_osc.t FOR EACH ROW DELETE FROM pt_osc.t WHERE 0");
+$source_dbh->do("CREATE TRIGGER pt_osc.pt_osc_test AFTER DELETE ON pt_osc.t FOR EACH ROW DELETE FROM pt_osc.t WHERE 0");
 ($output, undef) = full_output(
    sub { pt_online_schema_change::main(@args,
          "$dsn,D=pt_osc,t=t", qw(--dry-run)) },
@@ -78,11 +78,11 @@ like( $output,
    qr/`pt_osc`.`t` has triggers/,
    "Original table cannot have triggers"
 );
-$master_dbh->do('DROP TRIGGER pt_osc.pt_osc_test');
+$source_dbh->do('DROP TRIGGER pt_osc.pt_osc_test');
 
 # The new table must have a pk or unique index so the delete trigger is safe.
-$master_dbh->do("ALTER TABLE pt_osc.t DROP COLUMN id");
-$master_dbh->do("ALTER TABLE pt_osc.t DROP INDEX c");
+$source_dbh->do("ALTER TABLE pt_osc.t DROP COLUMN id");
+$source_dbh->do("ALTER TABLE pt_osc.t DROP INDEX c");
 ($output, undef) = full_output(
    sub { pt_online_schema_change::main(@args,
          "$dsn,D=pt_osc,t=t", qw(--dry-run)) },
@@ -97,13 +97,13 @@ like( $output,
 # Checks for the new table.
 # #############################################################################
 
-$sb->load_file('master', "$sample/basic_no_fks_innodb.sql");
-$master_dbh->do("USE pt_osc");
-$slave_dbh->do("USE pt_osc");
+$sb->load_file('source', "$sample/basic_no_fks_innodb.sql");
+$source_dbh->do("USE pt_osc");
+$replica_dbh->do("USE pt_osc");
 
 for my $i ( 1..10 ) {
    my $table = ('_' x $i) . 't_new';
-   $master_dbh->do("create table $table (id int)");
+   $source_dbh->do("create table $table (id int)");
 }
 
 my $x;
@@ -121,6 +121,6 @@ like(
 # #############################################################################
 # 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;
diff --git a/t/pt-online-schema-change/skip_innodb.t b/t/pt-online-schema-change/skip_innodb.t
index 8d63bc465..351ef061d 100644
--- a/t/pt-online-schema-change/skip_innodb.t
+++ b/t/pt-online-schema-change/skip_innodb.t
@@ -20,22 +20,22 @@ if ( $sandbox_version ge '5.6' ) {
 }
 
 diag(`$trunk/sandbox/stop-sandbox 12348 >/dev/null`);
-diag(`SKIP_INNODB=1 $trunk/sandbox/start-sandbox master 12348 >/dev/null`);
+diag(`SKIP_INNODB=1 $trunk/sandbox/start-sandbox source 12348 >/dev/null`);
 
 my $dp = new DSNParser(opts=>$dsn_opts);
 my $sb = new Sandbox(basedir => '/tmp', DSNParser => $dp);
-my $master_dbh = $sb->get_dbh_for('master1');
+my $source_dbh = $sb->get_dbh_for('source1');
 
-if ( !$master_dbh ) {
-   plan skip_all => 'Cannot connect to sandbox master 12348';
+if ( !$source_dbh ) {
+   plan skip_all => 'Cannot connect to sandbox source 12348';
 }
 
-my $master_dsn = 'h=127.1,P=12348,u=msandbox,p=msandbox';
+my $source_dsn = 'h=127.1,P=12348,u=msandbox,p=msandbox';
 my @args       = (qw(--set-vars innodb_lock_wait_timeout=3), '--max-load', ''); 
 
 my ($output, $retval) = full_output(
    sub { pt_online_schema_change::main(@args,
-      "$master_dsn,D=mysql,t=user", "--alter", "add column (foo int)",
+      "$source_dsn,D=mysql,t=user", "--alter", "add column (foo int)",
       qw(--dry-run)) },
 );
 
diff --git a/t/pt-online-schema-change/slave_lag.t b/t/pt-online-schema-change/slave_lag.t
index b68889309..78c603040 100644
--- a/t/pt-online-schema-change/slave_lag.t
+++ b/t/pt-online-schema-change/slave_lag.t
@@ -38,10 +38,10 @@ if ($sb->is_cluster_mode) {
 } else {
     plan tests => 6;
 }                                  
-my $master_dbh = $sb->get_dbh_for('master');
-my $slave_dbh = $sb->get_dbh_for('slave1');
-my $master_dsn = 'h=127.0.0.1,P=12345,u=msandbox,p=msandbox';
-my $slave_dsn = 'h=127.0.0.1,P=12346,u=msandbox,p=msandbox';
+my $source_dbh = $sb->get_dbh_for('source');
+my $replica_dbh = $sb->get_dbh_for('replica1');
+my $source_dsn = 'h=127.0.0.1,P=12345,u=msandbox,p=msandbox';
+my $replica_dsn = 'h=127.0.0.1,P=12346,u=msandbox,p=msandbox';
 
 sub reset_query_cache {
     my @dbhs = @_;
@@ -51,89 +51,89 @@ sub reset_query_cache {
     }
 }
 
-# 1) Set the slave delay to 0 just in case we are re-running the tests without restarting the sandbox.
+# 1) Set the replica delay to 0 just in case we are re-running the tests without restarting the sandbox.
 # 2) Load sample data
-# 3) Set the slave delay to 30 seconds to be able to see the 'waiting' message.
-diag("Setting slave delay to 0 seconds");
-$slave_dbh->do('STOP SLAVE');
-$master_dbh->do("RESET MASTER");
-$slave_dbh->do('RESET SLAVE');
-$slave_dbh->do('START SLAVE');
+# 3) Set the replica delay to 30 seconds to be able to see the 'waiting' message.
+diag("Setting replica delay to 0 seconds");
+$replica_dbh->do("STOP ${replica_name}");
+$source_dbh->do("RESET ${source_reset}");
+$replica_dbh->do("RESET ${replica_name}");
+$replica_dbh->do("START ${replica_name}");
 
 diag('Loading test data');
-$sb->load_file('master', "t/pt-online-schema-change/samples/slave_lag.sql");
+$sb->load_file('source', "t/pt-online-schema-change/samples/replica_lag.sql");
 
 # Should be greater than chunk-size and big enough, so pt-osc will wait for delay
 my $num_rows = 5000;
 diag("Loading $num_rows into the table. This might take some time.");
 diag(`util/mysql_random_data_load --host=127.0.0.1 --port=12345 --user=msandbox --password=msandbox test pt178 $num_rows`);
 
-$sb->wait_for_slaves();
-diag("Setting slave delay to $delay seconds");
+$sb->wait_for_replicas();
+diag("Setting replica delay to $delay seconds");
 
-$slave_dbh->do('STOP SLAVE');
-$slave_dbh->do("CHANGE MASTER TO MASTER_DELAY=$delay");
-$slave_dbh->do('START SLAVE');
+$replica_dbh->do("STOP ${replica_name}");
+$replica_dbh->do("CHANGE ${source_change} TO ${source_name}_DELAY=$delay");
+$replica_dbh->do("START ${replica_name}");
 
-# Run a full table scan query to ensure the slave is behind the master
+# Run a full table scan query to ensure the replica is behind the source
 # There is no query cache in MySQL 8.0+
-reset_query_cache($master_dbh, $master_dbh);
-# Update one row so slave is delayed
-$master_dbh->do('UPDATE `test`.`pt178` SET f2 = f2 + 1 LIMIT 1');
-$master_dbh->do('UPDATE `test`.`pt178` SET f2 = f2 + 1 WHERE f1 = ""');
+reset_query_cache($source_dbh, $source_dbh);
+# Update one row so replica is delayed
+$source_dbh->do('UPDATE `test`.`pt178` SET f2 = f2 + 1 LIMIT 1');
+$source_dbh->do('UPDATE `test`.`pt178` SET f2 = f2 + 1 WHERE f1 = ""');
 
-# This is the base test, just to ensure that without using --check-slave-lag nor --skip-check-slave-lag
-# pt-online-schema-change will wait on the slave at port 12346
+# This is the base test, just to ensure that without using --check-replica-lag nor --skip-check-replica-lag
+# pt-online-schema-change will wait on the replica at port 12346
 
 my $max_lag = $delay / 2;
-# We need to sleep, otherwise pt-osc can finish before slave is delayed
+# We need to sleep, otherwise pt-osc can finish before replica is delayed
 sleep($max_lag);
 
-my $args = "$master_dsn,D=test,t=pt178 --execute --chunk-size 10 --max-lag $max_lag --alter 'ENGINE=InnoDB' --pid $tmp_file_name --progress time,5";
-diag("Starting base test. This is going to take some time due to the delay in the slave");
+my $args = "$source_dsn,D=test,t=pt178 --execute --chunk-size 10 --max-lag $max_lag --alter 'ENGINE=InnoDB' --pid $tmp_file_name --progress time,5";
+diag("Starting base test. This is going to take some time due to the delay in the replica");
 diag("pid: $tmp_file_name");
 my $output = `$trunk/bin/pt-online-schema-change $args 2>&1`;
 like(
       $output,
       qr/Replica lag is \d+ seconds on .*  Waiting/s,
-      "Base test waits on the correct slave",
+      "Base test waits on the correct replica",
 );
 
-# Repeat the test now using --check-slave-lag
-$args = "$master_dsn,D=test,t=pt178 --execute --chunk-size 1 --max-lag $max_lag --alter 'ENGINE=InnoDB' "
-      . "--check-slave-lag h=127.0.0.1,P=12346,u=msandbox,p=msandbox,D=test,t=sbtest --pid $tmp_file_name --progress time,5";
+# Repeat the test now using --check-replica-lag
+$args = "$source_dsn,D=test,t=pt178 --execute --chunk-size 1 --max-lag $max_lag --alter 'ENGINE=InnoDB' "
+      . "--check-replica-lag h=127.0.0.1,P=12346,u=msandbox,p=msandbox,D=test,t=sbtest --pid $tmp_file_name --progress time,5";
 
-# Run a full table scan query to ensure the slave is behind the master
-reset_query_cache($master_dbh, $master_dbh);
-# Update one row so slave is delayed
-$master_dbh->do('UPDATE `test`.`pt178` SET f2 = f2 + 1 LIMIT 1');
-$master_dbh->do('UPDATE `test`.`pt178` SET f2 = f2 + 1 WHERE f1 = ""');
+# Run a full table scan query to ensure the replica is behind the source
+reset_query_cache($source_dbh, $source_dbh);
+# Update one row so replica is delayed
+$source_dbh->do('UPDATE `test`.`pt178` SET f2 = f2 + 1 LIMIT 1');
+$source_dbh->do('UPDATE `test`.`pt178` SET f2 = f2 + 1 WHERE f1 = ""');
 
-# We need to sleep, otherwise pt-osc can finish before slave is delayed
+# We need to sleep, otherwise pt-osc can finish before replica is delayed
 sleep($max_lag);
-diag("Starting --check-slave-lag test. This is going to take some time due to the delay in the slave");
+diag("Starting --check-replica-lag test. This is going to take some time due to the delay in the replica");
 $output = `$trunk/bin/pt-online-schema-change $args 2>&1`;
 
 like(
       $output,
       qr/Replica lag is \d+ seconds on .*  Waiting/s,
-      "--check-slave-lag waits on the correct slave",
+      "--check-replica-lag waits on the correct replica",
 );
 
-# Repeat the test new adding and removing a slave during the process
-$args = "$master_dsn,D=test,t=pt178 --execute --chunk-size 1 --max-lag $max_lag --alter 'ENGINE=InnoDB' "
+# Repeat the test new adding and removing a replica during the process
+$args = "$source_dsn,D=test,t=pt178 --execute --chunk-size 1 --max-lag $max_lag --alter 'ENGINE=InnoDB' "
       . "--recursion-method=dsn=D=test,t=dynamic_replicas --recurse 0 --pid $tmp_file_name --progress time,5";
 
-$master_dbh->do('CREATE TABLE `test`.`dynamic_replicas` (id INTEGER PRIMARY KEY, dsn VARCHAR(255) )');
-$master_dbh->do("INSERT INTO `test`.`dynamic_replicas` (id, dsn) VALUES (1, '$slave_dsn')");
+$source_dbh->do('CREATE TABLE `test`.`dynamic_replicas` (id INTEGER PRIMARY KEY, dsn VARCHAR(255) )');
+$source_dbh->do("INSERT INTO `test`.`dynamic_replicas` (id, dsn) VALUES (1, '$replica_dsn')");
 
-# Run a full table scan query to ensure the slave is behind the master
-reset_query_cache($master_dbh, $master_dbh);
-# Update one row so slave is delayed
-$master_dbh->do('UPDATE `test`.`pt178` SET f2 = f2 + 1 LIMIT 1');
-$master_dbh->do('UPDATE `test`.`pt178` SET f2 = f2 + 1 WHERE f1 = ""');
+# Run a full table scan query to ensure the replica is behind the source
+reset_query_cache($source_dbh, $source_dbh);
+# Update one row so replica is delayed
+$source_dbh->do('UPDATE `test`.`pt178` SET f2 = f2 + 1 LIMIT 1');
+$source_dbh->do('UPDATE `test`.`pt178` SET f2 = f2 + 1 WHERE f1 = ""');
 
-# We need to sleep, otherwise pt-osc can finish before slave is delayed
+# We need to sleep, otherwise pt-osc can finish before replica is delayed
 sleep($max_lag);
 diag("Starting --recursion-method with changes during the process");
 my ($fh, $filename) = tempfile();
@@ -146,7 +146,7 @@ if (!$pid) {
 }
 
 sleep($max_lag + 10);
-$master_dbh->do("DELETE FROM `test`.`dynamic_replicas` WHERE id = 1;");
+$source_dbh->do("DELETE FROM `test`.`dynamic_replicas` WHERE id = 1;");
 waitpid($pid, 0);
 $output = do {
       local $/ = undef;
@@ -157,49 +157,49 @@ unlink $filename;
 
 like(
       $output,
-      qr/Slave set to watch has changed/s,
-      "--recursion-method=dsn updates the slave list",
+      qr/${replica_name} set to watch has changed/is,
+      "--recursion-method=dsn updates the replica list",
 );
 
 like(
       $output,
-      qr/Replica lag is \d+ seconds on .*  Waiting/s,
+      qr/${replica_name} lag is \d+ seconds on .*  Waiting/is,
       "--recursion-method waits on a replica",
 );
 
-# Repeat the test now using --skip-check-slave-lag
-# Run a full table scan query to ensure the slave is behind the master
-reset_query_cache($master_dbh, $master_dbh);
-# Update one row so slave is delayed
-$master_dbh->do('UPDATE `test`.`pt178` SET f2 = f2 + 1 LIMIT 1');
-$master_dbh->do('UPDATE `test`.`pt178` SET f2 = f2 + 1 WHERE f1 = ""');
+# Repeat the test now using --skip-check-replica-lag
+# Run a full table scan query to ensure the replica is behind the source
+reset_query_cache($source_dbh, $source_dbh);
+# Update one row so replica is delayed
+$source_dbh->do('UPDATE `test`.`pt178` SET f2 = f2 + 1 LIMIT 1');
+$source_dbh->do('UPDATE `test`.`pt178` SET f2 = f2 + 1 WHERE f1 = ""');
 
-# We need to sleep, otherwise pt-osc can finish before slave is delayed
+# We need to sleep, otherwise pt-osc can finish before replica is delayed
 sleep($max_lag);
-$args = "$master_dsn,D=test,t=pt178 --execute --chunk-size 1 --max-lag $max_lag --alter 'ENGINE=InnoDB' "
-      . "--skip-check-slave-lag h=127.0.0.1,P=12346,u=msandbox,p=msandbox,D=test,t=sbtest --pid $tmp_file_name --progress time,5";
+$args = "$source_dsn,D=test,t=pt178 --execute --chunk-size 1 --max-lag $max_lag --alter 'ENGINE=InnoDB' "
+      . "--skip-check-replica-lag h=127.0.0.1,P=12346,u=msandbox,p=msandbox,D=test,t=sbtest --pid $tmp_file_name --progress time,5";
 
-diag("Starting --skip-check-slave-lag test. This is going to take some time due to the delay in the slave");
+diag("Starting --skip-check-replica-lag test. This is going to take some time due to the delay in the replica");
 $output = `$trunk/bin/pt-online-schema-change $args 2>&1`;
 
 unlike(
       $output,
       qr/Replica lag is \d+ seconds on .*:12346.  Waiting/s,
-      "--skip-check-slave-lag is really skipping the slave",
+      "--skip-check-replica-lag is really skipping the replica",
 );
 
-diag("Setting slave delay to 0 seconds");
-$slave_dbh->do('STOP SLAVE');
-$master_dbh->do("RESET MASTER");
-$slave_dbh->do('RESET SLAVE');
-$slave_dbh->do('START SLAVE');
+diag("Setting replica delay to 0 seconds");
+$replica_dbh->do("STOP ${replica_name}");
+$source_dbh->do("RESET ${source_reset}");
+$replica_dbh->do("RESET ${replica_name}");
+$replica_dbh->do("START ${replica_name}");
 
-$master_dbh->do("DROP DATABASE IF EXISTS test");
-$sb->wait_for_slaves();
+$source_dbh->do("DROP DATABASE IF EXISTS test");
+$sb->wait_for_replicas();
 
 # #############################################################################
 # 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;
diff --git a/t/pt-table-checksum/pt-1616.t b/t/pt-table-checksum/pt-1616.t
index 7808d5bfd..a19ddae50 100644
--- a/t/pt-table-checksum/pt-1616.t
+++ b/t/pt-table-checksum/pt-1616.t
@@ -11,9 +11,9 @@ use warnings FATAL => 'all';
 use English qw(-no_match_vars);
 use Test::More;
 
-if ( !$ENV{SLOW_TESTS} ) { 
-   plan skip_all => "pt-table-checksum/replication_filters.t is one of the top slowest files; set SLOW_TESTS=1 to enable it.";
-}
+#if ( !$ENV{SLOW_TESTS} ) { 
+#   plan skip_all => "pt-table-checksum/replication_filters.t is one of the top slowest files; set SLOW_TESTS=1 to enable it.";
+#}
 
 use PerconaTest;
 use Sandbox;
diff --git a/t/pt-table-checksum/replication_filters.t b/t/pt-table-checksum/replication_filters.t
index 675c4d849..cfda31f58 100644
--- a/t/pt-table-checksum/replication_filters.t
+++ b/t/pt-table-checksum/replication_filters.t
@@ -11,9 +11,9 @@ use warnings FATAL => 'all';
 use English qw(-no_match_vars);
 use Test::More;
 
-if ( !$ENV{SLOW_TESTS} ) {
-   plan skip_all => "pt-table-checksum/replication_filters.t is a top 5 slowest file; set SLOW_TESTS=1 to enable it.";
-}
+#if ( !$ENV{SLOW_TESTS} ) {
+#   plan skip_all => "pt-table-checksum/replication_filters.t is a top 5 slowest file; set SLOW_TESTS=1 to enable it.";
+#}
 
 
 # Hostnames make testing less accurate.  Tests need to see
diff --git a/t/pt-table-checksum/throttle.t b/t/pt-table-checksum/throttle.t
index 3ee6aa58a..99904dd05 100644
--- a/t/pt-table-checksum/throttle.t
+++ b/t/pt-table-checksum/throttle.t
@@ -11,9 +11,9 @@ use warnings FATAL => 'all';
 use English qw(-no_match_vars);
 use Test::More;
 
-if ( !$ENV{SLOW_TESTS} ) {
-   plan skip_all => "pt-table-checksum/throttle.t is a top 5 slowest file; set SLOW_TESTS=1 to enable it.";
-}
+#if ( !$ENV{SLOW_TESTS} ) {
+#   plan skip_all => "pt-table-checksum/throttle.t is a top 5 slowest file; set SLOW_TESTS=1 to enable it.";
+#}
 
 $ENV{PERCONA_TOOLKIT_TEST_USE_DSN_NAMES} = 1;
 

From 067391ba3f27b3d46d08855fc1f258e4b536fbf1 Mon Sep 17 00:00:00 2001
From: Sveta Smirnova <sveta.smirnova@percona.com>
Date: Tue, 30 Jul 2024 18:35:36 +0300
Subject: [PATCH 08/31] PT-2340 - Support MySQL 8.4

- Updated modules and tests for pt-query-digest, pt-show-grants, pt-slave-delay, pt-slave-find, pt-slave-restart, pt-stalk, pt-summary
---
 bin/pt-query-digest                           | 536 +++++++++------
 bin/pt-show-grants                            |   2 +-
 bin/pt-slave-delay                            |   2 +-
 bin/pt-slave-find                             | 554 +++++++++------
 bin/pt-slave-restart                          | 648 +++++++++++-------
 bin/pt-stalk                                  |  13 +-
 bin/pt-summary                                |   4 +-
 t/pt-query-digest/bugs.t                      |   5 +-
 t/pt-query-digest/collect_and_report_cycles.t |   5 +-
 t/pt-query-digest/daemon.t                    |   5 +-
 t/pt-query-digest/explain.t                   |   7 +-
 t/pt-query-digest/explain_partitions.t        |   6 +-
 t/pt-query-digest/history.t                   |   7 +-
 t/pt-query-digest/issue_1186.t                |   5 +-
 t/pt-query-digest/issue_360.t                 |   5 +-
 t/pt-query-digest/processlist.t               |   5 +-
 t/pt-query-digest/pt-2264.t                   |   5 +-
 t/pt-query-digest/review.t                    |   9 +-
 t/pt-query-digest/run_time.t                  |   5 +-
 t/pt-query-digest/since_until.t               |   7 +-
 t/pt-query-digest/standard_options.t          |   5 +-
 t/pt-show-grants/all_grants.t                 |  30 +-
 t/pt-show-grants/basics.t                     |  11 +-
 t/pt-show-grants/issue_445.t                  |   5 +-
 t/pt-show-grants/pt-2190.t                    |   4 +-
 t/pt-show-grants/pt-2247.t                    |   4 +-
 t/pt-show-grants/samples/column-grants-84.txt |   6 +
 .../samples/column-grants-combined-84.txt     |   6 +
 .../samples/column-grants-separate-84.txt     |   7 +
 .../column-grants-separate-revoke-84.txt      |  12 +
 t/pt-slave-delay/auto_restart.t               |   8 +-
 t/pt-slave-delay/basics.t                     |   6 +-
 t/pt-slave-delay/issue_1169.t                 |   2 +-
 t/pt-slave-delay/standard_options.t           |   4 +-
 t/pt-slave-find/pt-slave-find.t               |  73 +-
 t/pt-slave-restart/gtid.t                     | 117 ++--
 t/pt-slave-restart/gtid_parallelreplication.t |  24 +-
 t/pt-slave-restart/pt-slave-restart.t         |  62 +-
 t/pt-stalk/plugin.t                           |   5 +-
 t/pt-stalk/pt-stalk-replication.t             |  13 +-
 t/pt-stalk/pt-stalk.t                         |  73 +-
 41 files changed, 1362 insertions(+), 950 deletions(-)
 create mode 100644 t/pt-show-grants/samples/column-grants-84.txt
 create mode 100644 t/pt-show-grants/samples/column-grants-combined-84.txt
 create mode 100644 t/pt-show-grants/samples/column-grants-separate-84.txt
 create mode 100644 t/pt-show-grants/samples/column-grants-separate-revoke-84.txt

diff --git a/bin/pt-query-digest b/bin/pt-query-digest
index 9274c5e62..45a0b6d06 100755
--- a/bin/pt-query-digest
+++ b/bin/pt-query-digest
@@ -943,7 +943,7 @@ sub get_cxn_params {
       $dsn = 'DBI:mysql:' . ( $info->{D} || '' ) . ';'
          . join(';', map  { "$opts{$_}->{dsn}=$info->{$_}" }
                      grep { defined $info->{$_} }
-                     qw(F h P S A))
+                     qw(F h P S A s))
          . ';mysql_read_default_group=client'
          . ($info->{L} ? ';mysql_local_infile=1' : '');
    }
@@ -3812,7 +3812,7 @@ use constant {
    COM_BINLOG_DUMP         => '12',
    COM_TABLE_DUMP          => '13',
    COM_CONNECT_OUT         => '14',
-   COM_REGISTER_SLAVE      => '15',
+   COM_REGISTER_REPLICA    => '15',
    COM_STMT_PREPARE        => '16',
    COM_STMT_EXECUTE        => '17',
    COM_STMT_SEND_LONG_DATA => '18',
@@ -3846,7 +3846,7 @@ my %com_for = (
    '12' => 'COM_BINLOG_DUMP',
    '13' => 'COM_TABLE_DUMP',
    '14' => 'COM_CONNECT_OUT',
-   '15' => 'COM_REGISTER_SLAVE',
+   '15' => 'COM_REGISTER_REPLICA',
    '16' => 'COM_STMT_PREPARE',
    '17' => 'COM_STMT_EXECUTE',
    '18' => 'COM_STMT_SEND_LONG_DATA',
@@ -10553,7 +10553,7 @@ sub new {
    return bless $self, $class;
 }
 
-sub get_slaves {
+sub get_replicas {
    my ($self, %args) = @_;
    my @required_args = qw(make_cxn);
    foreach my $arg ( @required_args ) {
@@ -10561,11 +10561,11 @@ sub get_slaves {
    }
    my ($make_cxn) = @args{@required_args};
 
-   my $slaves  = [];
+   my $replicas  = [];
    my $dp      = $self->{DSNParser};
    my $methods = $self->_resolve_recursion_methods($args{dsn});
 
-   return $slaves unless @$methods;
+   return $replicas unless @$methods;
 
    if ( grep { m/processlist|hosts/i } @$methods ) {
       my @required_args = qw(dbh dsn);
@@ -10575,26 +10575,26 @@ sub get_slaves {
       my ($dbh, $dsn) = @args{@required_args};
       my $o = $self->{OptionParser};
 
-      $self->recurse_to_slaves(
-         {  dbh            => $dbh,
-            dsn            => $dsn,
-            slave_user     => $o->got('slave-user') ? $o->get('slave-user') : '',
-            slave_password => $o->got('slave-password') ? $o->get('slave-password') : '',
-            slaves         => $args{slaves},
+      $self->recurse_to_replicas(
+         {  dbh              => $dbh,
+            dsn              => $dsn,
+            replica_user     => $o->got('replica-user') ? $o->get('replica-user') : '',
+            replica_password => $o->got('replica-password') ? $o->get('replica-password') : '',
+            replicas         => $args{replicas},
             callback  => sub {
                my ( $dsn, $dbh, $level, $parent ) = @_;
                return unless $level;
-               PTDEBUG && _d('Found slave:', $dp->as_string($dsn));
-               my $slave_dsn = $dsn;
-               if ($o->got('slave-user')) {
-                  $slave_dsn->{u} = $o->get('slave-user');
-                  PTDEBUG && _d("Using slave user ".$o->get('slave-user')." on ".$slave_dsn->{h}.":".$slave_dsn->{P});
+               PTDEBUG && _d('Found replica:', $dp->as_string($dsn));
+               my $replica_dsn = $dsn;
+               if ($o->got('replica-user')) {
+                  $replica_dsn->{u} = $o->get('replica-user');
+                  PTDEBUG && _d("Using replica user ".$o->get('replica-user')." on ".$replica_dsn->{h}.":".$replica_dsn->{P});
                }
-               if ($o->got('slave-password')) {
-                  $slave_dsn->{p} = $o->get('slave-password');
-                  PTDEBUG && _d("Slave password set");
+               if ($o->got('replica-password')) {
+                  $replica_dsn->{p} = $o->get('replica-password');
+                  PTDEBUG && _d("Replica password set");
                }
-               push @$slaves, $make_cxn->(dsn => $slave_dsn, dbh => $dbh, parent => $parent);
+               push @$replicas, $make_cxn->(dsn => $replica_dsn, dbh => $dbh, parent => $parent);
                return;
             },
             wait_no_die => $args{'wait_no_die'},
@@ -10602,20 +10602,20 @@ sub get_slaves {
       );
    } elsif ( $methods->[0] =~ m/^dsn=/i ) {
       (my $dsn_table_dsn = join ",", @$methods) =~ s/^dsn=//i;
-      $slaves = $self->get_cxn_from_dsn_table(
+      $replicas = $self->get_cxn_from_dsn_table(
          %args,
          dsn_table_dsn => $dsn_table_dsn,
          wait_no_die => $args{'wait_no_die'},
       );
    }
    elsif ( $methods->[0] =~ m/none/i ) {
-      PTDEBUG && _d('Not getting to slaves');
+      PTDEBUG && _d('Not getting to replicas');
    }
    else {
       die "Unexpected recursion methods: @$methods";
    }
 
-   return $slaves;
+   return $replicas;
 }
 
 sub _resolve_recursion_methods {
@@ -10633,31 +10633,31 @@ sub _resolve_recursion_methods {
    }
 }
 
-sub recurse_to_slaves {
+sub recurse_to_replicas {
    my ( $self, $args, $level ) = @_;
    $level ||= 0;
    my $dp = $self->{DSNParser};
    my $recurse = $args->{recurse} || $self->{OptionParser}->get('recurse');
    my $dsn = $args->{dsn};
-   my $slave_user = $args->{slave_user} || '';
-   my $slave_password = $args->{slave_password} || '';
+   my $replica_user = $args->{replica_user} || '';
+   my $replica_password = $args->{replica_password} || '';
 
    my $methods = $self->_resolve_recursion_methods($dsn);
    PTDEBUG && _d('Recursion methods:', @$methods);
    if ( lc($methods->[0]) eq 'none' ) {
-      PTDEBUG && _d('Not recursing to slaves');
+      PTDEBUG && _d('Not recursing to replicas');
       return;
    }
 
-   my $slave_dsn = $dsn;
-   if ($slave_user) {
-      $slave_dsn->{u} = $slave_user;
-      PTDEBUG && _d("Using slave user $slave_user on "
-         . $slave_dsn->{h} . ":" . ( $slave_dsn->{P} ? $slave_dsn->{P} : ""));
+   my $replica_dsn = $dsn;
+   if ($replica_user) {
+      $replica_dsn->{u} = $replica_user;
+      PTDEBUG && _d("Using replica user $replica_user on "
+         . $replica_dsn->{h} . ":" . ( $replica_dsn->{P} ? $replica_dsn->{P} : ""));
    }
-   if ($slave_password) {
-      $slave_dsn->{p} = $slave_password;
-      PTDEBUG && _d("Slave password set");
+   if ($replica_password) {
+      $replica_dsn->{p} = $replica_password;
+      PTDEBUG && _d("Replica password set");
    }
 
    my $dbh = $args->{dbh};
@@ -10665,12 +10665,12 @@ sub recurse_to_slaves {
    my $get_dbh = sub {
          eval {
             $dbh = $dp->get_dbh(
-               $dp->get_cxn_params($slave_dsn), { AutoCommit => 1 }
+               $dp->get_cxn_params($replica_dsn), { AutoCommit => 1 }
             );
-            PTDEBUG && _d('Connected to', $dp->as_string($slave_dsn));
+            PTDEBUG && _d('Connected to', $dp->as_string($replica_dsn));
          };
          if ( $EVAL_ERROR ) {
-            print STDERR "Cannot connect to ", $dp->as_string($slave_dsn), ": ", $EVAL_ERROR, "\n"
+            print STDERR "Cannot connect to ", $dp->as_string($replica_dsn), ": ", $EVAL_ERROR, "\n"
                or die "Cannot print: $OS_ERROR";
             return;
          }
@@ -10678,10 +10678,10 @@ sub recurse_to_slaves {
 
    DBH: {
       if ( !defined $dbh ) {
-         foreach my $known_slave ( @{$args->{slaves}} ) {
-            if ($known_slave->{dsn}->{h} eq $slave_dsn->{h} and
-                $known_slave->{dsn}->{P} eq $slave_dsn->{P} ) {
-               $dbh = $known_slave->{dbh};
+         foreach my $known_replica ( @{$args->{replicas}} ) {
+            if ($known_replica->{dsn}->{h} eq $replica_dsn->{h} and
+                $known_replica->{dsn}->{P} eq $replica_dsn->{P} ) {
+               $dbh = $known_replica->{dbh};
                last DBH;
             }
          }
@@ -10699,7 +10699,7 @@ sub recurse_to_slaves {
 	   if ( $EVAL_ERROR ) {
 		   if ( $args->{wait_no_die} ) {
 			   print STDERR "Error getting server id: ", $EVAL_ERROR,
-               "\nRetrying query for server ", $slave_dsn->{h}, ":", $slave_dsn->{P}, "\n";
+               "\nRetrying query for server ", $replica_dsn->{h}, ":", $replica_dsn->{P}, "\n";
             sleep 1;
             $dbh->disconnect();
             $get_dbh->();
@@ -10709,12 +10709,12 @@ sub recurse_to_slaves {
       }
    } until (defined $id);
    PTDEBUG && _d('Working on server ID', $id);
-   my $master_thinks_i_am = $dsn->{server_id};
+   my $source_thinks_i_am = $dsn->{server_id};
    if ( !defined $id
-       || ( defined $master_thinks_i_am && $master_thinks_i_am != $id )
+       || ( defined $source_thinks_i_am && $source_thinks_i_am != $id )
        || $args->{server_ids_seen}->{$id}++
    ) {
-      PTDEBUG && _d('Server ID seen, or not what master said');
+      PTDEBUG && _d('Server ID seen, or not what source said');
       if ( $args->{skip_callback} ) {
          $args->{skip_callback}->($dsn, $dbh, $level, $args->{parent});
       }
@@ -10725,51 +10725,51 @@ sub recurse_to_slaves {
 
    if ( !defined $recurse || $level < $recurse ) {
 
-      my @slaves =
-         grep { !$_->{master_id} || $_->{master_id} == $id } # Only my slaves.
-         $self->find_slave_hosts($dp, $dbh, $dsn, $methods);
+      my @replicas =
+         grep { !$_->{source_id} || $_->{source_id} == $id } # Only my replicas.
+         $self->find_replica_hosts($dp, $dbh, $dsn, $methods);
 
-      foreach my $slave ( @slaves ) {
+      foreach my $replica ( @replicas ) {
          PTDEBUG && _d('Recursing from',
-            $dp->as_string($dsn), 'to', $dp->as_string($slave));
-         $self->recurse_to_slaves(
-            { %$args, dsn => $slave, dbh => undef, parent => $dsn, slave_user => $slave_user, $slave_password => $slave_password }, $level + 1 );
+            $dp->as_string($dsn), 'to', $dp->as_string($replica));
+         $self->recurse_to_replicas(
+            { %$args, dsn => $replica, dbh => undef, parent => $dsn, replica_user => $replica_user, $replica_password => $replica_password }, $level + 1 );
       }
    }
 }
 
-sub find_slave_hosts {
+sub find_replica_hosts {
    my ( $self, $dsn_parser, $dbh, $dsn, $methods ) = @_;
 
-   PTDEBUG && _d('Looking for slaves on', $dsn_parser->as_string($dsn),
+   PTDEBUG && _d('Looking for replicas on', $dsn_parser->as_string($dsn),
       'using methods', @$methods);
 
-   my @slaves;
+   my @replicas;
    METHOD:
    foreach my $method ( @$methods ) {
-      my $find_slaves = "_find_slaves_by_$method";
-      PTDEBUG && _d('Finding slaves with', $find_slaves);
-      @slaves = $self->$find_slaves($dsn_parser, $dbh, $dsn);
-      last METHOD if @slaves;
+      my $find_replicas = "_find_replicas_by_$method";
+      PTDEBUG && _d('Finding replicas with', $find_replicas);
+      @replicas = $self->$find_replicas($dsn_parser, $dbh, $dsn);
+      last METHOD if @replicas;
    }
 
-   PTDEBUG && _d('Found', scalar(@slaves), 'slaves');
-   return @slaves;
+   PTDEBUG && _d('Found', scalar(@replicas), 'replicas');
+   return @replicas;
 }
 
-sub _find_slaves_by_processlist {
+sub _find_replicas_by_processlist {
    my ( $self, $dsn_parser, $dbh, $dsn ) = @_;
-   my @connected_slaves = $self->get_connected_slaves($dbh);
-   my @slaves = $self->_process_slaves_list($dsn_parser, $dsn, \@connected_slaves);
-   return @slaves;
+   my @connected_replicas = $self->get_connected_replicas($dbh);
+   my @replicas = $self->_process_replicas_list($dsn_parser, $dsn, \@connected_replicas);
+   return @replicas;
 }
 
-sub _process_slaves_list {
-   my ($self, $dsn_parser, $dsn, $connected_slaves) = @_;
-   my @slaves = map  {
-      my $slave        = $dsn_parser->parse("h=$_", $dsn);
-      $slave->{source} = 'processlist';
-      $slave;
+sub _process_replicas_list {
+   my ($self, $dsn_parser, $dsn, $connected_replicas) = @_;
+   my @replicas = map  {
+      my $replica        = $dsn_parser->parse("h=$_", $dsn);
+      $replica->{source} = 'processlist';
+      $replica;
    }
    grep { $_ }
    map  {
@@ -10781,22 +10781,28 @@ sub _process_slaves_list {
           $host = '['.$host.']';
       }
       $host;
-   } @$connected_slaves;
+   } @$connected_replicas;
 
-   return @slaves;
+   return @replicas;
 }
 
-sub _find_slaves_by_hosts {
+sub _find_replicas_by_hosts {
    my ( $self, $dsn_parser, $dbh, $dsn ) = @_;
 
-   my @slaves;
-   my $sql = 'SHOW SLAVE HOSTS';
+   my @replicas;
+
+   my $vp = VersionParser->new($dbh);
+   my $sql = 'SHOW REPLICAS';
+   if ( $vp < '8.1' || $vp->flavor() =~ m/maria/ ) {
+      $sql = 'SHOW SLAVE HOSTS';
+   }
+   
    PTDEBUG && _d($dbh, $sql);
-   @slaves = @{$dbh->selectall_arrayref($sql, { Slice => {} })};
+   @replicas = @{$dbh->selectall_arrayref($sql, { Slice => {} })};
 
-   if ( @slaves ) {
-      PTDEBUG && _d('Found some SHOW SLAVE HOSTS info');
-      @slaves = map {
+   if ( @replicas ) {
+      PTDEBUG && _d('Found some SHOW REPLICAS info');
+      @replicas = map {
          my %hash;
          @hash{ map { lc $_ } keys %$_ } = values %$_;
          my $spec = "h=$hash{host},P=$hash{port}"
@@ -10804,16 +10810,16 @@ sub _find_slaves_by_hosts {
             . ( $hash{password} ? ",p=$hash{password}" : '');
          my $dsn           = $dsn_parser->parse($spec, $dsn);
          $dsn->{server_id} = $hash{server_id};
-         $dsn->{master_id} = $hash{master_id};
+         $dsn->{source_id} = $hash{source_id};
          $dsn->{source}    = 'hosts';
          $dsn;
-      } @slaves;
+      } @replicas;
    }
 
-   return @slaves;
+   return @replicas;
 }
 
-sub get_connected_slaves {
+sub get_connected_replicas {
    my ( $self, $dbh ) = @_;
 
    my $show = "SHOW GRANTS FOR ";
@@ -10859,79 +10865,103 @@ sub get_connected_slaves {
    @{$dbh->selectall_arrayref($sql, { Slice => {} })};
 }
 
-sub is_master_of {
-   my ( $self, $master, $slave ) = @_;
-   my $master_status = $self->get_master_status($master)
-      or die "The server specified as a master is not a master";
-   my $slave_status  = $self->get_slave_status($slave)
-      or die "The server specified as a slave is not a slave";
-   my @connected     = $self->get_connected_slaves($master)
-      or die "The server specified as a master has no connected slaves";
-   my (undef, $port) = $master->selectrow_array("SHOW VARIABLES LIKE 'port'");
+sub is_source_of {
+   my ( $self, $source, $replica ) = @_;
+
+   my $replica_version = VersionParser->new($replica);
+   my $source_name = 'source';
+   my $source_port = 'source_port';
+   if ( $replica_version < '8.1' || $replica_version->flavor() =~ m/maria/ ) {
+      $source_name = 'master';
+      $source_port = 'master_port';
+   }
+
+   my $source_status = $self->get_source_status($source)
+      or die "The server specified as a source is not a source";
+   my $replica_status  = $self->get_replica_status($replica)
+      or die "The server specified as a replica is not a replica";
+   my @connected     = $self->get_connected_replicas($source)
+      or die "The server specified as a source has no connected replicas";
+   my (undef, $port) = $source->selectrow_array("SHOW VARIABLES LIKE 'port'");
 
-   if ( $port != $slave_status->{master_port} ) {
-      die "The slave is connected to $slave_status->{master_port} "
-         . "but the master's port is $port";
+   if ( $port != $replica_status->{$source_port} ) {
+      die "The replica is connected to $replica_status->{$source_port} "
+         . "but the source's port is $port";
    }
 
-   if ( !grep { $slave_status->{master_user} eq $_->{user} } @connected ) {
-      die "I don't see any slave I/O thread connected with user "
-         . $slave_status->{master_user};
+   if ( !grep { $replica_status->{source_user} eq $_->{user} } @connected ) {
+      die "I don't see any replica I/O thread connected with user "
+         . $replica_status->{source_user};
    }
 
-   if ( ($slave_status->{slave_io_state} || '')
-      eq 'Waiting for master to send event' )
+   if ( ($replica_status->{replica_io_state} || '')
+      eq 'Waiting for ${source_name} to send event' )
    {
-      my ( $master_log_name, $master_log_num )
-         = $master_status->{file} =~ m/^(.*?)\.0*([1-9][0-9]*)$/;
-      my ( $slave_log_name, $slave_log_num )
-         = $slave_status->{master_log_file} =~ m/^(.*?)\.0*([1-9][0-9]*)$/;
-      if ( $master_log_name ne $slave_log_name
-         || abs($master_log_num - $slave_log_num) > 1 )
+      my ( $source_log_name, $source_log_num )
+         = $source_status->{file} =~ m/^(.*?)\.0*([1-9][0-9]*)$/;
+      my ( $replica_log_name, $replica_log_num )
+         = $replica_status->{source_log_file} =~ m/^(.*?)\.0*([1-9][0-9]*)$/;
+      if ( $source_log_name ne $replica_log_name
+         || abs($source_log_num - $replica_log_num) > 1 )
       {
-         die "The slave thinks it is reading from "
-            . "$slave_status->{master_log_file},  but the "
-            . "master is writing to $master_status->{file}";
+         die "The replica thinks it is reading from "
+            . "$replica_status->{source_log_file},  but the "
+            . "source is writing to $source_status->{file}";
       }
    }
    return 1;
 }
 
-sub get_master_dsn {
+sub get_source_dsn {
    my ( $self, $dbh, $dsn, $dsn_parser ) = @_;
-   my $master = $self->get_slave_status($dbh) or return undef;
-   my $spec   = "h=$master->{master_host},P=$master->{master_port}";
+
+   my $vp = VersionParser->new($dbh);
+   my $source_host = 'source_host';
+   my $source_port = 'source_port';
+   if ( $vp < '8.1' || $vp->flavor() =~ m/maria/ ) {
+      $source_host = 'master_host';
+      $source_port = 'master_port';
+   }
+
+   my $source = $self->get_replica_status($dbh) or return undef;
+   my $spec   = "h=$source->{${source_host}},P=$source->{${source_port}}";
    return       $dsn_parser->parse($spec, $dsn);
 }
 
-sub get_slave_status {
+sub get_replica_status {
    my ( $self, $dbh ) = @_;
 
-   if ( !$self->{not_a_slave}->{$dbh} ) {
-      my $sth = $self->{sths}->{$dbh}->{SLAVE_STATUS}
-            ||= $dbh->prepare('SHOW SLAVE STATUS');
-      PTDEBUG && _d($dbh, 'SHOW SLAVE STATUS');
+   my $server_version = VersionParser->new($dbh);
+   my $replica_name = 'replica';
+   if ( $server_version < '8.1' || $server_version->flavor() =~ m/maria/ ) {
+      $replica_name = 'slave';
+   }
+
+   if ( !$self->{not_a_replica}->{$dbh} ) {
+      my $sth = $self->{sths}->{$dbh}->{REPLICA_STATUS}
+            ||= $dbh->prepare("SHOW ${replica_name} STATUS");
+      PTDEBUG && _d($dbh, "SHOW ${replica_name} STATUS");
       $sth->execute();
-      my ($sss_rows) = $sth->fetchall_arrayref({}); # Show Slave Status rows
+      my ($sss_rows) = $sth->fetchall_arrayref({}); # Show Replica Status rows
 
       my $ss;
       if ( $sss_rows && @$sss_rows ) {
           if (scalar @$sss_rows > 1) {
               if (!$self->{channel}) {
-                  die 'This server returned more than one row for SHOW SLAVE STATUS but "channel" was not specified on the command line';
+                  die 'This server returned more than one row for SHOW REPLICA STATUS but "channel" was not specified on the command line';
               }
-              my $slave_use_channels;
+              my $replica_use_channels;
               for my $row (@$sss_rows) {
                   $row = { map { lc($_) => $row->{$_} } keys %$row }; # lowercase the keys
                   if ($row->{channel_name}) {
-                      $slave_use_channels = 1;
+                      $replica_use_channels = 1;
                   }
                   if ($row->{channel_name} eq $self->{channel}) {
                       $ss = $row;
                       last;
                   }
               }
-              if (!$ss && $slave_use_channels) {
+              if (!$ss && $replica_use_channels) {
                  die 'This server is using replication channels but "channel" was not specified on the command line';
               }
           } else {
@@ -10951,28 +10981,34 @@ sub get_slave_status {
           }
       }
 
-      PTDEBUG && _d('This server returns nothing for SHOW SLAVE STATUS');
-      $self->{not_a_slave}->{$dbh}++;
+      PTDEBUG && _d('This server returns nothing for SHOW REPLICA STATUS');
+      $self->{not_a_replica}->{$dbh}++;
   }
 }
 
-sub get_master_status {
+sub get_source_status {
    my ( $self, $dbh ) = @_;
 
-   if ( $self->{not_a_master}->{$dbh} ) {
-      PTDEBUG && _d('Server on dbh', $dbh, 'is not a master');
+   if ( $self->{not_a_source}->{$dbh} ) {
+      PTDEBUG && _d('Server on dbh', $dbh, 'is not a source');
       return;
    }
 
+   my $vp = VersionParser->new($dbh);
+   my $source_name = 'binary log';
+   if ( $vp < '8.1' || $vp->flavor() =~ m/maria/ ) {
+      $source_name = 'master';
+   }
+
    my $sth;
    if ( $self->{sths}->{$dbh} && $dbh && $self->{sths}->{$dbh} == $dbh ) {
-      $sth = $self->{sths}->{$dbh}->{MASTER_STATUS}
-         ||= $dbh->prepare('SHOW MASTER STATUS');
+      $sth = $self->{sths}->{$dbh}->{SOURCE_STATUS}
+         ||= $dbh->prepare("SHOW ${source_name} STATUS");
    }
    else {
-      $sth = $dbh->prepare('SHOW MASTER STATUS');
+      $sth = $dbh->prepare("SHOW ${source_name} STATUS");
    }
-   PTDEBUG && _d($dbh, 'SHOW MASTER STATUS');
+   PTDEBUG && _d($dbh, "SHOW ${source_name} STATUS");
    $sth->execute();
    my ($ms) = @{$sth->fetchall_arrayref({})};
    PTDEBUG && _d(
@@ -10980,42 +11016,46 @@ sub get_master_status {
           : '');
 
    if ( !$ms || scalar keys %$ms < 2 ) {
-      PTDEBUG && _d('Server on dbh', $dbh, 'does not seem to be a master');
-      $self->{not_a_master}->{$dbh}++;
+      PTDEBUG && _d('Server on dbh', $dbh, 'does not seem to be a source');
+      $self->{not_a_source}->{$dbh}++;
    }
 
   return { map { lc($_) => $ms->{$_} } keys %$ms }; # lowercase the keys
 }
 
-sub wait_for_master {
+sub wait_for_source {
    my ( $self, %args ) = @_;
-   my @required_args = qw(master_status slave_dbh);
+   my @required_args = qw(source_status replica_dbh);
    foreach my $arg ( @required_args ) {
       die "I need a $arg argument" unless $args{$arg};
    }
-   my ($master_status, $slave_dbh) = @args{@required_args};
+   my ($source_status, $replica_dbh) = @args{@required_args};
    my $timeout       = $args{timeout} || 60;
 
    my $result;
    my $waited;
-   if ( $master_status ) {
-      my $slave_status;
+   if ( $source_status ) {
+      my $replica_status;
       eval {
-          $slave_status = $self->get_slave_status($slave_dbh);
+          $replica_status = $self->get_replica_status($replica_dbh);
       };
       if ($EVAL_ERROR) {
           return {
               result => undef,
               waited => 0,
-              error  =>'Wait for master: this is a multi-master slave but "channel" was not specified on the command line',
+              error  =>'Wait for source: this is a multi-source replica but "channel" was not specified on the command line',
           };
       }
-      my $server_version = VersionParser->new($slave_dbh);
-      my $channel_sql = $server_version > '5.6' && $self->{channel} ? ", '$self->{channel}'" : '';
-      my $sql = "SELECT MASTER_POS_WAIT('$master_status->{file}', $master_status->{position}, $timeout $channel_sql)";
-      PTDEBUG && _d($slave_dbh, $sql);
+      my $vp = VersionParser->new($replica_dbh);
+      my $source_name = 'source';
+      if ( $vp < '8.1' || $vp->flavor() =~ m/maria/ ) {
+         $source_name = 'master';
+      }
+      my $channel_sql = $vp > '5.6' && $self->{channel} ? ", '$self->{channel}'" : '';
+      my $sql = "SELECT ${source_name}_POS_WAIT('$source_status->{file}', $source_status->{position}, $timeout $channel_sql)";
+      PTDEBUG && _d($replica_dbh, $sql);
       my $start = time;
-      ($result) = $slave_dbh->selectrow_array($sql);
+      ($result) = $replica_dbh->selectrow_array($sql);
 
       $waited = time - $start;
 
@@ -11023,7 +11063,7 @@ sub wait_for_master {
       PTDEBUG && _d("Waited", $waited, "seconds");
    }
    else {
-      PTDEBUG && _d('Not waiting: this server is not a master');
+      PTDEBUG && _d('Not waiting: this server is not a source');
    }
 
    return {
@@ -11032,75 +11072,96 @@ sub wait_for_master {
    };
 }
 
-sub stop_slave {
+sub stop_replica {
    my ( $self, $dbh ) = @_;
-   my $sth = $self->{sths}->{$dbh}->{STOP_SLAVE}
-         ||= $dbh->prepare('STOP SLAVE');
+   my $vp = VersionParser->new($dbh);
+   my $replica_name = 'replica';
+   if ( $vp < '8.1' || $vp->flavor() =~ m/maria/ ) {
+      $replica_name = 'slave';
+   }
+   my $sth = $self->{sths}->{$dbh}->{STOP_REPLICA}
+         ||= $dbh->prepare("STOP ${replica_name}");
    PTDEBUG && _d($dbh, $sth->{Statement});
    $sth->execute();
 }
 
-sub start_slave {
+sub start_replica {
    my ( $self, $dbh, $pos ) = @_;
+
+   my $vp = VersionParser->new($dbh);
+   my $source_name = 'source';
+   my $replica_name = 'replica';
+   if ( $vp < '8.1' || $vp->flavor() =~ m/maria/ ) {
+      $source_name = 'master';
+      $replica_name = 'slave';
+   }
+
    if ( $pos ) {
-      my $sql = "START SLAVE UNTIL MASTER_LOG_FILE='$pos->{file}', "
-              . "MASTER_LOG_POS=$pos->{position}";
+      my $sql = "START ${replica_name} UNTIL ${source_name}_LOG_FILE='$pos->{file}', "
+              . "${source_name}_LOG_POS=$pos->{position}";
       PTDEBUG && _d($dbh, $sql);
       $dbh->do($sql);
    }
    else {
-      my $sth = $self->{sths}->{$dbh}->{START_SLAVE}
-            ||= $dbh->prepare('START SLAVE');
+      my $sth = $self->{sths}->{$dbh}->{START_REPLICA}
+            ||= $dbh->prepare("START ${replica_name}");
       PTDEBUG && _d($dbh, $sth->{Statement});
       $sth->execute();
    }
 }
 
-sub catchup_to_master {
-   my ( $self, $slave, $master, $timeout ) = @_;
-   $self->stop_slave($master);
-   $self->stop_slave($slave);
-   my $slave_status  = $self->get_slave_status($slave);
-   my $slave_pos     = $self->repl_posn($slave_status);
-   my $master_status = $self->get_master_status($master);
-   my $master_pos    = $self->repl_posn($master_status);
-   PTDEBUG && _d('Master position:', $self->pos_to_string($master_pos),
-      'Slave position:', $self->pos_to_string($slave_pos));
+sub catchup_to_source {
+   my ( $self, $replica, $source, $timeout ) = @_;
+   $self->stop_replica($source);
+   $self->stop_replica($replica);
+   my $replica_status  = $self->get_replica_status($replica);
+   my $replica_pos     = $self->repl_posn($replica_status);
+   my $source_status = $self->get_source_status($source);
+   my $source_pos    = $self->repl_posn($source_status);
+   PTDEBUG && _d('Source position:', $self->pos_to_string($source_pos),
+      'Replica position:', $self->pos_to_string($replica_pos));
 
    my $result;
-   if ( $self->pos_cmp($slave_pos, $master_pos) < 0 ) {
-      PTDEBUG && _d('Waiting for slave to catch up to master');
-      $self->start_slave($slave, $master_pos);
+   if ( $self->pos_cmp($replica_pos, $source_pos) < 0 ) {
+      PTDEBUG && _d('Waiting for replica to catch up to source');
+      $self->start_replica($replica, $source_pos);
 
-      $result = $self->wait_for_master(
-            master_status => $master_status,
-            slave_dbh     => $slave,
+      $result = $self->wait_for_source(
+            source_status => $source_status,
+            replica_dbh   => $replica,
             timeout       => $timeout,
-            master_status => $master_status
+            source_status => $source_status
       );
       if ($result->{error}) {
           die $result->{error};
       }
       if ( !defined $result->{result} ) {
-         $slave_status = $self->get_slave_status($slave);
-         if ( !$self->slave_is_running($slave_status) ) {
-            PTDEBUG && _d('Master position:',
-               $self->pos_to_string($master_pos),
-               'Slave position:', $self->pos_to_string($slave_pos));
-            $slave_pos = $self->repl_posn($slave_status);
-            if ( $self->pos_cmp($slave_pos, $master_pos) != 0 ) {
-               die "MASTER_POS_WAIT() returned NULL but slave has not "
-                  . "caught up to master";
+         $replica_status = $self->get_replica_status($replica);
+            
+         my $vp = VersionParser->new($replica);
+         my $replica_name = 'replica';
+         if ( $vp < '8.1' || $vp->flavor() =~ m/maria/ ) {
+            $replica_name = 'slave';
+         }
+
+         if ( !$self->replica_is_running($replica_status, $replica_name) ) {
+            PTDEBUG && _d('Source position:',
+               $self->pos_to_string($source_pos),
+               'Replica position:', $self->pos_to_string($replica_pos));
+            $replica_pos = $self->repl_posn($replica_status);
+            if ( $self->pos_cmp($replica_pos, $source_pos) != 0 ) {
+               die "SOURCE_POS_WAIT() returned NULL but replica has not "
+                  . "caught up to source";
             }
-            PTDEBUG && _d('Slave is caught up to master and stopped');
+            PTDEBUG && _d('Replica is caught up to source and stopped');
          }
          else {
-            die "Slave has not caught up to master and it is still running";
+            die "Replica has not caught up to source and it is still running";
          }
       }
    }
    else {
-      PTDEBUG && _d("Slave is already caught up to master");
+      PTDEBUG && _d("Replica is already caught up to source");
    }
 
    return $result;
@@ -11108,26 +11169,38 @@ sub catchup_to_master {
 
 sub catchup_to_same_pos {
    my ( $self, $s1_dbh, $s2_dbh ) = @_;
-   $self->stop_slave($s1_dbh);
-   $self->stop_slave($s2_dbh);
-   my $s1_status = $self->get_slave_status($s1_dbh);
-   my $s2_status = $self->get_slave_status($s2_dbh);
+   $self->stop_replica($s1_dbh);
+   $self->stop_replica($s2_dbh);
+   my $s1_status = $self->get_replica_status($s1_dbh);
+   my $s2_status = $self->get_replica_status($s2_dbh);
    my $s1_pos    = $self->repl_posn($s1_status);
    my $s2_pos    = $self->repl_posn($s2_status);
    if ( $self->pos_cmp($s1_pos, $s2_pos) < 0 ) {
-      $self->start_slave($s1_dbh, $s2_pos);
+      $self->start_replica($s1_dbh, $s2_pos);
    }
    elsif ( $self->pos_cmp($s2_pos, $s1_pos) < 0 ) {
-      $self->start_slave($s2_dbh, $s1_pos);
+      $self->start_replica($s2_dbh, $s1_pos);
    }
 
-   $s1_status = $self->get_slave_status($s1_dbh);
-   $s2_status = $self->get_slave_status($s2_dbh);
+   $s1_status = $self->get_replica_status($s1_dbh);
+   $s2_status = $self->get_replica_status($s2_dbh);
    $s1_pos    = $self->repl_posn($s1_status);
    $s2_pos    = $self->repl_posn($s2_status);
 
-   if ( $self->slave_is_running($s1_status)
-     || $self->slave_is_running($s2_status)
+   my $vp1 = VersionParser->new($s1_dbh);
+   my $replica1_name = 'replica';
+   if ( $vp1 < '8.1' || $vp1->flavor() =~ m/maria/ ) {
+      $replica1_name = 'slave';
+   }
+
+   my $vp2 = VersionParser->new($s2_dbh);
+   my $replica2_name = 'replica';
+   if ( $vp2 < '8.1' || $vp2->flavor() =~ m/maria/ ) {
+      $replica2_name = 'slave';
+   }
+
+   if ( $self->replica_is_running($s1_status, $replica1_name)
+     || $self->replica_is_running($s2_status, $replica2_name)
      || $self->pos_cmp($s1_pos, $s2_pos) != 0)
    {
       die "The servers aren't both stopped at the same position";
@@ -11135,14 +11208,21 @@ sub catchup_to_same_pos {
 
 }
 
-sub slave_is_running {
-   my ( $self, $slave_status ) = @_;
-   return ($slave_status->{slave_sql_running} || 'No') eq 'Yes';
+sub replica_is_running {
+   my ( $self, $replica_status, $replica_name ) = @_;
+   return ($replica_status->{"${replica_name}_sql_running"} || 'No') eq 'Yes';
 }
 
-sub has_slave_updates {
+sub has_replica_updates {
    my ( $self, $dbh ) = @_;
-   my $sql = q{SHOW VARIABLES LIKE 'log_slave_updates'};
+   
+   my $vp = VersionParser->new($dbh);
+   my $replica_name = 'replica';
+   if ( $vp < '8.1' || $vp->flavor() =~ m/maria/ ) {
+      $replica_name = 'slave';
+   }
+
+   my $sql = qq{SHOW VARIABLES LIKE 'log_${replica_name}_updates'};
    PTDEBUG && _d($dbh, $sql);
    my ($name, $value) = $dbh->selectrow_array($sql);
    return $value && $value =~ m/^(1|ON)$/;
@@ -11156,6 +11236,12 @@ sub repl_posn {
          position => $status->{position},
       };
    }
+   elsif ( exists $status->{relay_source_log_file} && exists $status->{exec_source_log_pos} ) {
+      return {
+         file     => $status->{relay_source_log_file},
+         position => $status->{exec_source_log_pos},
+      };
+   }
    else {
       return {
          file     => $status->{relay_master_log_file},
@@ -11164,11 +11250,18 @@ sub repl_posn {
    }
 }
 
-sub get_slave_lag {
+sub get_replica_lag {
    my ( $self, $dbh ) = @_;
-   my $stat = $self->get_slave_status($dbh);
-   return unless $stat;  # server is not a slave
-   return $stat->{seconds_behind_master};
+   
+   my $vp = VersionParser->new($dbh);
+   my $source_name = 'source';
+   if ( $vp < '8.1' || $vp->flavor() =~ m/maria/ ) {
+      $source_name = 'master';
+   }
+
+   my $stat = $self->get_replica_status($dbh);
+   return unless $stat;  # server is not a replica
+   return $stat->{"seconds_behind_${source_name}"};
 }
 
 sub pos_cmp {
@@ -11179,9 +11272,9 @@ sub pos_cmp {
 sub short_host {
    my ( $self, $dsn ) = @_;
    my ($host, $port);
-   if ( $dsn->{master_host} ) {
-      $host = $dsn->{master_host};
-      $port = $dsn->{master_port};
+   if ( $dsn->{source_host} ) {
+      $host = $dsn->{source_host};
+      $port = $dsn->{source_port};
    }
    else {
       $host = $dsn->{h};
@@ -11196,7 +11289,7 @@ sub is_replication_thread {
 
    my $type = lc($args{type} || 'all');
    die "Invalid type: $type"
-      unless $type =~ m/^binlog_dump|slave_io|slave_sql|all$/i;
+      unless $type =~ m/^binlog_dump|slave_io|slave_sql|replica_io|replica_sql|all$/i;
 
    my $match = 0;
    if ( $type =~ m/binlog_dump|all/i ) {
@@ -11205,7 +11298,7 @@ sub is_replication_thread {
    }
    if ( !$match ) {
       if ( ($query->{User} || $query->{user} || '') eq "system user" ) {
-         PTDEBUG && _d("Slave replication thread");
+         PTDEBUG && _d("Replica replication thread");
          if ( $type ne 'all' ) {
             my $state = $query->{State} || $query->{state} || '';
 
@@ -11214,15 +11307,16 @@ sub is_replication_thread {
                $match = 1;
             }
             else {
-               my ($slave_sql) = $state =~ m/
+               my ($replica_sql) = $state =~ m/
                   ^(Waiting\sfor\sthe\snext\sevent
                    |Reading\sevent\sfrom\sthe\srelay\slog
                    |Has\sread\sall\srelay\slog;\swaiting
                    |Making\stemp\sfile
-                   |Waiting\sfor\sslave\smutex\son\sexit)/xi;
+                   |Waiting\sfor\sslave\smutex\son\sexit
+                   |Waiting\sfor\sreplica\smutex\son\sexit)/xi;
 
-               $match = $type eq 'slave_sql' &&  $slave_sql ? 1
-                      : $type eq 'slave_io'  && !$slave_sql ? 1
+               $match = $type eq 'replica_sql' &&  $replica_sql ? 1
+                      : $type eq 'replica_io'  && !$replica_sql ? 1
                       :                                       0;
             }
          }
@@ -11263,9 +11357,15 @@ sub get_replication_filters {
    }
    my ($dbh) = @args{@required_args};
 
+   my $vp = VersionParser->new($dbh);
+   my $replica_name = 'replica';
+   if ( $vp < '8.1' || $vp->flavor() =~ m/maria/ ) {
+      $replica_name = 'slave';
+   }
+
    my %filters = ();
 
-   my $status = $self->get_master_status($dbh);
+   my $status = $self->get_source_status($dbh);
    if ( $status ) {
       map { $filters{$_} = $status->{$_} }
       grep { defined $status->{$_} && $status->{$_} ne '' }
@@ -11275,7 +11375,7 @@ sub get_replication_filters {
       );
    }
 
-   $status = $self->get_slave_status($dbh);
+   $status = $self->get_replica_status($dbh);
    if ( $status ) {
       map { $filters{$_} = $status->{$_} }
       grep { defined $status->{$_} && $status->{$_} ne '' }
@@ -11288,10 +11388,10 @@ sub get_replication_filters {
          replicate_wild_ignore_table
       );
 
-      my $sql = "SHOW VARIABLES LIKE 'slave_skip_errors'";
+      my $sql = "SHOW VARIABLES LIKE '${replica_name}_skip_errors'";
       PTDEBUG && _d($dbh, $sql);
       my $row = $dbh->selectrow_arrayref($sql);
-      $filters{slave_skip_errors} = $row->[1] if $row->[1] && $row->[1] ne 'OFF';
+      $filters{replica_skip_errors} = $row->[1] if $row->[1] && $row->[1] ne 'OFF';
    }
 
    return \%filters;
diff --git a/bin/pt-show-grants b/bin/pt-show-grants
index 4e4f3425e..04a595a30 100755
--- a/bin/pt-show-grants
+++ b/bin/pt-show-grants
@@ -1309,7 +1309,7 @@ sub get_cxn_params {
       $dsn = 'DBI:mysql:' . ( $info->{D} || '' ) . ';'
          . join(';', map  { "$opts{$_}->{dsn}=$info->{$_}" }
                      grep { defined $info->{$_} }
-                     qw(F h P S A))
+                     qw(F h P S A s))
          . ';mysql_read_default_group=client'
          . ($info->{L} ? ';mysql_local_infile=1' : '');
    }
diff --git a/bin/pt-slave-delay b/bin/pt-slave-delay
index b8c379756..52193b038 100755
--- a/bin/pt-slave-delay
+++ b/bin/pt-slave-delay
@@ -2030,7 +2030,7 @@ sub get_cxn_params {
       $dsn = 'DBI:mysql:' . ( $info->{D} || '' ) . ';'
          . join(';', map  { "$opts{$_}->{dsn}=$info->{$_}" }
                      grep { defined $info->{$_} }
-                     qw(F h P S A))
+                     qw(F h P S A s))
          . ';mysql_read_default_group=client'
          . ($info->{L} ? ';mysql_local_infile=1' : '');
    }
diff --git a/bin/pt-slave-find b/bin/pt-slave-find
index aaef1242b..294a5ea59 100755
--- a/bin/pt-slave-find
+++ b/bin/pt-slave-find
@@ -1965,7 +1965,7 @@ sub get_cxn_params {
       $dsn = 'DBI:mysql:' . ( $info->{D} || '' ) . ';'
          . join(';', map  { "$opts{$_}->{dsn}=$info->{$_}" }
                      grep { defined $info->{$_} }
-                     qw(F h P S A))
+                     qw(F h P S A s))
          . ';mysql_read_default_group=client'
          . ($info->{L} ? ';mysql_local_infile=1' : '');
    }
@@ -2284,7 +2284,7 @@ sub new {
    return bless $self, $class;
 }
 
-sub get_slaves {
+sub get_replicas {
    my ($self, %args) = @_;
    my @required_args = qw(make_cxn);
    foreach my $arg ( @required_args ) {
@@ -2292,11 +2292,11 @@ sub get_slaves {
    }
    my ($make_cxn) = @args{@required_args};
 
-   my $slaves  = [];
+   my $replicas  = [];
    my $dp      = $self->{DSNParser};
    my $methods = $self->_resolve_recursion_methods($args{dsn});
 
-   return $slaves unless @$methods;
+   return $replicas unless @$methods;
 
    if ( grep { m/processlist|hosts/i } @$methods ) {
       my @required_args = qw(dbh dsn);
@@ -2306,26 +2306,26 @@ sub get_slaves {
       my ($dbh, $dsn) = @args{@required_args};
       my $o = $self->{OptionParser};
 
-      $self->recurse_to_slaves(
-         {  dbh            => $dbh,
-            dsn            => $dsn,
-            slave_user     => $o->got('slave-user') ? $o->get('slave-user') : '',
-            slave_password => $o->got('slave-password') ? $o->get('slave-password') : '',
-            slaves         => $args{slaves},
+      $self->recurse_to_replicas(
+         {  dbh              => $dbh,
+            dsn              => $dsn,
+            replica_user     => $o->got('replica-user') ? $o->get('replica-user') : '',
+            replica_password => $o->got('replica-password') ? $o->get('replica-password') : '',
+            replicas         => $args{replicas},
             callback  => sub {
                my ( $dsn, $dbh, $level, $parent ) = @_;
                return unless $level;
-               PTDEBUG && _d('Found slave:', $dp->as_string($dsn));
-               my $slave_dsn = $dsn;
-               if ($o->got('slave-user')) {
-                  $slave_dsn->{u} = $o->get('slave-user');
-                  PTDEBUG && _d("Using slave user ".$o->get('slave-user')." on ".$slave_dsn->{h}.":".$slave_dsn->{P});
+               PTDEBUG && _d('Found replica:', $dp->as_string($dsn));
+               my $replica_dsn = $dsn;
+               if ($o->got('replica-user')) {
+                  $replica_dsn->{u} = $o->get('replica-user');
+                  PTDEBUG && _d("Using replica user ".$o->get('replica-user')." on ".$replica_dsn->{h}.":".$replica_dsn->{P});
                }
-               if ($o->got('slave-password')) {
-                  $slave_dsn->{p} = $o->get('slave-password');
-                  PTDEBUG && _d("Slave password set");
+               if ($o->got('replica-password')) {
+                  $replica_dsn->{p} = $o->get('replica-password');
+                  PTDEBUG && _d("Replica password set");
                }
-               push @$slaves, $make_cxn->(dsn => $slave_dsn, dbh => $dbh, parent => $parent);
+               push @$replicas, $make_cxn->(dsn => $replica_dsn, dbh => $dbh, parent => $parent);
                return;
             },
             wait_no_die => $args{'wait_no_die'},
@@ -2333,20 +2333,20 @@ sub get_slaves {
       );
    } elsif ( $methods->[0] =~ m/^dsn=/i ) {
       (my $dsn_table_dsn = join ",", @$methods) =~ s/^dsn=//i;
-      $slaves = $self->get_cxn_from_dsn_table(
+      $replicas = $self->get_cxn_from_dsn_table(
          %args,
          dsn_table_dsn => $dsn_table_dsn,
          wait_no_die => $args{'wait_no_die'},
       );
    }
    elsif ( $methods->[0] =~ m/none/i ) {
-      PTDEBUG && _d('Not getting to slaves');
+      PTDEBUG && _d('Not getting to replicas');
    }
    else {
       die "Unexpected recursion methods: @$methods";
    }
 
-   return $slaves;
+   return $replicas;
 }
 
 sub _resolve_recursion_methods {
@@ -2364,31 +2364,31 @@ sub _resolve_recursion_methods {
    }
 }
 
-sub recurse_to_slaves {
+sub recurse_to_replicas {
    my ( $self, $args, $level ) = @_;
    $level ||= 0;
    my $dp = $self->{DSNParser};
    my $recurse = $args->{recurse} || $self->{OptionParser}->get('recurse');
    my $dsn = $args->{dsn};
-   my $slave_user = $args->{slave_user} || '';
-   my $slave_password = $args->{slave_password} || '';
+   my $replica_user = $args->{replica_user} || '';
+   my $replica_password = $args->{replica_password} || '';
 
    my $methods = $self->_resolve_recursion_methods($dsn);
    PTDEBUG && _d('Recursion methods:', @$methods);
    if ( lc($methods->[0]) eq 'none' ) {
-      PTDEBUG && _d('Not recursing to slaves');
+      PTDEBUG && _d('Not recursing to replicas');
       return;
    }
 
-   my $slave_dsn = $dsn;
-   if ($slave_user) {
-      $slave_dsn->{u} = $slave_user;
-      PTDEBUG && _d("Using slave user $slave_user on "
-         . $slave_dsn->{h} . ":" . ( $slave_dsn->{P} ? $slave_dsn->{P} : ""));
+   my $replica_dsn = $dsn;
+   if ($replica_user) {
+      $replica_dsn->{u} = $replica_user;
+      PTDEBUG && _d("Using replica user $replica_user on "
+         . $replica_dsn->{h} . ":" . ( $replica_dsn->{P} ? $replica_dsn->{P} : ""));
    }
-   if ($slave_password) {
-      $slave_dsn->{p} = $slave_password;
-      PTDEBUG && _d("Slave password set");
+   if ($replica_password) {
+      $replica_dsn->{p} = $replica_password;
+      PTDEBUG && _d("Replica password set");
    }
 
    my $dbh = $args->{dbh};
@@ -2396,12 +2396,12 @@ sub recurse_to_slaves {
    my $get_dbh = sub {
          eval {
             $dbh = $dp->get_dbh(
-               $dp->get_cxn_params($slave_dsn), { AutoCommit => 1 }
+               $dp->get_cxn_params($replica_dsn), { AutoCommit => 1 }
             );
-            PTDEBUG && _d('Connected to', $dp->as_string($slave_dsn));
+            PTDEBUG && _d('Connected to', $dp->as_string($replica_dsn));
          };
          if ( $EVAL_ERROR ) {
-            print STDERR "Cannot connect to ", $dp->as_string($slave_dsn), ": ", $EVAL_ERROR, "\n"
+            print STDERR "Cannot connect to ", $dp->as_string($replica_dsn), ": ", $EVAL_ERROR, "\n"
                or die "Cannot print: $OS_ERROR";
             return;
          }
@@ -2409,10 +2409,10 @@ sub recurse_to_slaves {
 
    DBH: {
       if ( !defined $dbh ) {
-         foreach my $known_slave ( @{$args->{slaves}} ) {
-            if ($known_slave->{dsn}->{h} eq $slave_dsn->{h} and
-                $known_slave->{dsn}->{P} eq $slave_dsn->{P} ) {
-               $dbh = $known_slave->{dbh};
+         foreach my $known_replica ( @{$args->{replicas}} ) {
+            if ($known_replica->{dsn}->{h} eq $replica_dsn->{h} and
+                $known_replica->{dsn}->{P} eq $replica_dsn->{P} ) {
+               $dbh = $known_replica->{dbh};
                last DBH;
             }
          }
@@ -2430,7 +2430,7 @@ sub recurse_to_slaves {
 	   if ( $EVAL_ERROR ) {
 		   if ( $args->{wait_no_die} ) {
 			   print STDERR "Error getting server id: ", $EVAL_ERROR,
-               "\nRetrying query for server ", $slave_dsn->{h}, ":", $slave_dsn->{P}, "\n";
+               "\nRetrying query for server ", $replica_dsn->{h}, ":", $replica_dsn->{P}, "\n";
             sleep 1;
             $dbh->disconnect();
             $get_dbh->();
@@ -2440,12 +2440,12 @@ sub recurse_to_slaves {
       }
    } until (defined $id);
    PTDEBUG && _d('Working on server ID', $id);
-   my $master_thinks_i_am = $dsn->{server_id};
+   my $source_thinks_i_am = $dsn->{server_id};
    if ( !defined $id
-       || ( defined $master_thinks_i_am && $master_thinks_i_am != $id )
+       || ( defined $source_thinks_i_am && $source_thinks_i_am != $id )
        || $args->{server_ids_seen}->{$id}++
    ) {
-      PTDEBUG && _d('Server ID seen, or not what master said');
+      PTDEBUG && _d('Server ID seen, or not what source said');
       if ( $args->{skip_callback} ) {
          $args->{skip_callback}->($dsn, $dbh, $level, $args->{parent});
       }
@@ -2456,51 +2456,51 @@ sub recurse_to_slaves {
 
    if ( !defined $recurse || $level < $recurse ) {
 
-      my @slaves =
-         grep { !$_->{master_id} || $_->{master_id} == $id } # Only my slaves.
-         $self->find_slave_hosts($dp, $dbh, $dsn, $methods);
+      my @replicas =
+         grep { !$_->{source_id} || $_->{source_id} == $id } # Only my replicas.
+         $self->find_replica_hosts($dp, $dbh, $dsn, $methods);
 
-      foreach my $slave ( @slaves ) {
+      foreach my $replica ( @replicas ) {
          PTDEBUG && _d('Recursing from',
-            $dp->as_string($dsn), 'to', $dp->as_string($slave));
-         $self->recurse_to_slaves(
-            { %$args, dsn => $slave, dbh => undef, parent => $dsn, slave_user => $slave_user, $slave_password => $slave_password }, $level + 1 );
+            $dp->as_string($dsn), 'to', $dp->as_string($replica));
+         $self->recurse_to_replicas(
+            { %$args, dsn => $replica, dbh => undef, parent => $dsn, replica_user => $replica_user, $replica_password => $replica_password }, $level + 1 );
       }
    }
 }
 
-sub find_slave_hosts {
+sub find_replica_hosts {
    my ( $self, $dsn_parser, $dbh, $dsn, $methods ) = @_;
 
-   PTDEBUG && _d('Looking for slaves on', $dsn_parser->as_string($dsn),
+   PTDEBUG && _d('Looking for replicas on', $dsn_parser->as_string($dsn),
       'using methods', @$methods);
 
-   my @slaves;
+   my @replicas;
    METHOD:
    foreach my $method ( @$methods ) {
-      my $find_slaves = "_find_slaves_by_$method";
-      PTDEBUG && _d('Finding slaves with', $find_slaves);
-      @slaves = $self->$find_slaves($dsn_parser, $dbh, $dsn);
-      last METHOD if @slaves;
+      my $find_replicas = "_find_replicas_by_$method";
+      PTDEBUG && _d('Finding replicas with', $find_replicas);
+      @replicas = $self->$find_replicas($dsn_parser, $dbh, $dsn);
+      last METHOD if @replicas;
    }
 
-   PTDEBUG && _d('Found', scalar(@slaves), 'slaves');
-   return @slaves;
+   PTDEBUG && _d('Found', scalar(@replicas), 'replicas');
+   return @replicas;
 }
 
-sub _find_slaves_by_processlist {
+sub _find_replicas_by_processlist {
    my ( $self, $dsn_parser, $dbh, $dsn ) = @_;
-   my @connected_slaves = $self->get_connected_slaves($dbh);
-   my @slaves = $self->_process_slaves_list($dsn_parser, $dsn, \@connected_slaves);
-   return @slaves;
+   my @connected_replicas = $self->get_connected_replicas($dbh);
+   my @replicas = $self->_process_replicas_list($dsn_parser, $dsn, \@connected_replicas);
+   return @replicas;
 }
 
-sub _process_slaves_list {
-   my ($self, $dsn_parser, $dsn, $connected_slaves) = @_;
-   my @slaves = map  {
-      my $slave        = $dsn_parser->parse("h=$_", $dsn);
-      $slave->{source} = 'processlist';
-      $slave;
+sub _process_replicas_list {
+   my ($self, $dsn_parser, $dsn, $connected_replicas) = @_;
+   my @replicas = map  {
+      my $replica        = $dsn_parser->parse("h=$_", $dsn);
+      $replica->{source} = 'processlist';
+      $replica;
    }
    grep { $_ }
    map  {
@@ -2512,22 +2512,28 @@ sub _process_slaves_list {
           $host = '['.$host.']';
       }
       $host;
-   } @$connected_slaves;
+   } @$connected_replicas;
 
-   return @slaves;
+   return @replicas;
 }
 
-sub _find_slaves_by_hosts {
+sub _find_replicas_by_hosts {
    my ( $self, $dsn_parser, $dbh, $dsn ) = @_;
 
-   my @slaves;
-   my $sql = 'SHOW SLAVE HOSTS';
+   my @replicas;
+
+   my $vp = VersionParser->new($dbh);
+   my $sql = 'SHOW REPLICAS';
+   if ( $vp < '8.1' || $vp->flavor() =~ m/maria/ ) {
+      $sql = 'SHOW SLAVE HOSTS';
+   }
+   
    PTDEBUG && _d($dbh, $sql);
-   @slaves = @{$dbh->selectall_arrayref($sql, { Slice => {} })};
+   @replicas = @{$dbh->selectall_arrayref($sql, { Slice => {} })};
 
-   if ( @slaves ) {
-      PTDEBUG && _d('Found some SHOW SLAVE HOSTS info');
-      @slaves = map {
+   if ( @replicas ) {
+      PTDEBUG && _d('Found some SHOW REPLICAS info');
+      @replicas = map {
          my %hash;
          @hash{ map { lc $_ } keys %$_ } = values %$_;
          my $spec = "h=$hash{host},P=$hash{port}"
@@ -2535,16 +2541,16 @@ sub _find_slaves_by_hosts {
             . ( $hash{password} ? ",p=$hash{password}" : '');
          my $dsn           = $dsn_parser->parse($spec, $dsn);
          $dsn->{server_id} = $hash{server_id};
-         $dsn->{master_id} = $hash{master_id};
+         $dsn->{source_id} = $hash{source_id};
          $dsn->{source}    = 'hosts';
          $dsn;
-      } @slaves;
+      } @replicas;
    }
 
-   return @slaves;
+   return @replicas;
 }
 
-sub get_connected_slaves {
+sub get_connected_replicas {
    my ( $self, $dbh ) = @_;
 
    my $show = "SHOW GRANTS FOR ";
@@ -2590,79 +2596,103 @@ sub get_connected_slaves {
    @{$dbh->selectall_arrayref($sql, { Slice => {} })};
 }
 
-sub is_master_of {
-   my ( $self, $master, $slave ) = @_;
-   my $master_status = $self->get_master_status($master)
-      or die "The server specified as a master is not a master";
-   my $slave_status  = $self->get_slave_status($slave)
-      or die "The server specified as a slave is not a slave";
-   my @connected     = $self->get_connected_slaves($master)
-      or die "The server specified as a master has no connected slaves";
-   my (undef, $port) = $master->selectrow_array("SHOW VARIABLES LIKE 'port'");
+sub is_source_of {
+   my ( $self, $source, $replica ) = @_;
+
+   my $replica_version = VersionParser->new($replica);
+   my $source_name = 'source';
+   my $source_port = 'source_port';
+   if ( $replica_version < '8.1' || $replica_version->flavor() =~ m/maria/ ) {
+      $source_name = 'master';
+      $source_port = 'master_port';
+   }
+
+   my $source_status = $self->get_source_status($source)
+      or die "The server specified as a source is not a source";
+   my $replica_status  = $self->get_replica_status($replica)
+      or die "The server specified as a replica is not a replica";
+   my @connected     = $self->get_connected_replicas($source)
+      or die "The server specified as a source has no connected replicas";
+   my (undef, $port) = $source->selectrow_array("SHOW VARIABLES LIKE 'port'");
 
-   if ( $port != $slave_status->{master_port} ) {
-      die "The slave is connected to $slave_status->{master_port} "
-         . "but the master's port is $port";
+   if ( $port != $replica_status->{$source_port} ) {
+      die "The replica is connected to $replica_status->{$source_port} "
+         . "but the source's port is $port";
    }
 
-   if ( !grep { $slave_status->{master_user} eq $_->{user} } @connected ) {
-      die "I don't see any slave I/O thread connected with user "
-         . $slave_status->{master_user};
+   if ( !grep { $replica_status->{source_user} eq $_->{user} } @connected ) {
+      die "I don't see any replica I/O thread connected with user "
+         . $replica_status->{source_user};
    }
 
-   if ( ($slave_status->{slave_io_state} || '')
-      eq 'Waiting for master to send event' )
+   if ( ($replica_status->{replica_io_state} || '')
+      eq 'Waiting for ${source_name} to send event' )
    {
-      my ( $master_log_name, $master_log_num )
-         = $master_status->{file} =~ m/^(.*?)\.0*([1-9][0-9]*)$/;
-      my ( $slave_log_name, $slave_log_num )
-         = $slave_status->{master_log_file} =~ m/^(.*?)\.0*([1-9][0-9]*)$/;
-      if ( $master_log_name ne $slave_log_name
-         || abs($master_log_num - $slave_log_num) > 1 )
+      my ( $source_log_name, $source_log_num )
+         = $source_status->{file} =~ m/^(.*?)\.0*([1-9][0-9]*)$/;
+      my ( $replica_log_name, $replica_log_num )
+         = $replica_status->{source_log_file} =~ m/^(.*?)\.0*([1-9][0-9]*)$/;
+      if ( $source_log_name ne $replica_log_name
+         || abs($source_log_num - $replica_log_num) > 1 )
       {
-         die "The slave thinks it is reading from "
-            . "$slave_status->{master_log_file},  but the "
-            . "master is writing to $master_status->{file}";
+         die "The replica thinks it is reading from "
+            . "$replica_status->{source_log_file},  but the "
+            . "source is writing to $source_status->{file}";
       }
    }
    return 1;
 }
 
-sub get_master_dsn {
+sub get_source_dsn {
    my ( $self, $dbh, $dsn, $dsn_parser ) = @_;
-   my $master = $self->get_slave_status($dbh) or return undef;
-   my $spec   = "h=$master->{master_host},P=$master->{master_port}";
+
+   my $vp = VersionParser->new($dbh);
+   my $source_host = 'source_host';
+   my $source_port = 'source_port';
+   if ( $vp < '8.1' || $vp->flavor() =~ m/maria/ ) {
+      $source_host = 'master_host';
+      $source_port = 'master_port';
+   }
+
+   my $source = $self->get_replica_status($dbh) or return undef;
+   my $spec   = "h=$source->{${source_host}},P=$source->{${source_port}}";
    return       $dsn_parser->parse($spec, $dsn);
 }
 
-sub get_slave_status {
+sub get_replica_status {
    my ( $self, $dbh ) = @_;
 
-   if ( !$self->{not_a_slave}->{$dbh} ) {
-      my $sth = $self->{sths}->{$dbh}->{SLAVE_STATUS}
-            ||= $dbh->prepare('SHOW SLAVE STATUS');
-      PTDEBUG && _d($dbh, 'SHOW SLAVE STATUS');
+   my $server_version = VersionParser->new($dbh);
+   my $replica_name = 'replica';
+   if ( $server_version < '8.1' || $server_version->flavor() =~ m/maria/ ) {
+      $replica_name = 'slave';
+   }
+
+   if ( !$self->{not_a_replica}->{$dbh} ) {
+      my $sth = $self->{sths}->{$dbh}->{REPLICA_STATUS}
+            ||= $dbh->prepare("SHOW ${replica_name} STATUS");
+      PTDEBUG && _d($dbh, "SHOW ${replica_name} STATUS");
       $sth->execute();
-      my ($sss_rows) = $sth->fetchall_arrayref({}); # Show Slave Status rows
+      my ($sss_rows) = $sth->fetchall_arrayref({}); # Show Replica Status rows
 
       my $ss;
       if ( $sss_rows && @$sss_rows ) {
           if (scalar @$sss_rows > 1) {
               if (!$self->{channel}) {
-                  die 'This server returned more than one row for SHOW SLAVE STATUS but "channel" was not specified on the command line';
+                  die 'This server returned more than one row for SHOW REPLICA STATUS but "channel" was not specified on the command line';
               }
-              my $slave_use_channels;
+              my $replica_use_channels;
               for my $row (@$sss_rows) {
                   $row = { map { lc($_) => $row->{$_} } keys %$row }; # lowercase the keys
                   if ($row->{channel_name}) {
-                      $slave_use_channels = 1;
+                      $replica_use_channels = 1;
                   }
                   if ($row->{channel_name} eq $self->{channel}) {
                       $ss = $row;
                       last;
                   }
               }
-              if (!$ss && $slave_use_channels) {
+              if (!$ss && $replica_use_channels) {
                  die 'This server is using replication channels but "channel" was not specified on the command line';
               }
           } else {
@@ -2682,28 +2712,34 @@ sub get_slave_status {
           }
       }
 
-      PTDEBUG && _d('This server returns nothing for SHOW SLAVE STATUS');
-      $self->{not_a_slave}->{$dbh}++;
+      PTDEBUG && _d('This server returns nothing for SHOW REPLICA STATUS');
+      $self->{not_a_replica}->{$dbh}++;
   }
 }
 
-sub get_master_status {
+sub get_source_status {
    my ( $self, $dbh ) = @_;
 
-   if ( $self->{not_a_master}->{$dbh} ) {
-      PTDEBUG && _d('Server on dbh', $dbh, 'is not a master');
+   if ( $self->{not_a_source}->{$dbh} ) {
+      PTDEBUG && _d('Server on dbh', $dbh, 'is not a source');
       return;
    }
 
+   my $vp = VersionParser->new($dbh);
+   my $source_name = 'binary log';
+   if ( $vp < '8.1' || $vp->flavor() =~ m/maria/ ) {
+      $source_name = 'master';
+   }
+
    my $sth;
    if ( $self->{sths}->{$dbh} && $dbh && $self->{sths}->{$dbh} == $dbh ) {
-      $sth = $self->{sths}->{$dbh}->{MASTER_STATUS}
-         ||= $dbh->prepare('SHOW MASTER STATUS');
+      $sth = $self->{sths}->{$dbh}->{SOURCE_STATUS}
+         ||= $dbh->prepare("SHOW ${source_name} STATUS");
    }
    else {
-      $sth = $dbh->prepare('SHOW MASTER STATUS');
+      $sth = $dbh->prepare("SHOW ${source_name} STATUS");
    }
-   PTDEBUG && _d($dbh, 'SHOW MASTER STATUS');
+   PTDEBUG && _d($dbh, "SHOW ${source_name} STATUS");
    $sth->execute();
    my ($ms) = @{$sth->fetchall_arrayref({})};
    PTDEBUG && _d(
@@ -2711,42 +2747,46 @@ sub get_master_status {
           : '');
 
    if ( !$ms || scalar keys %$ms < 2 ) {
-      PTDEBUG && _d('Server on dbh', $dbh, 'does not seem to be a master');
-      $self->{not_a_master}->{$dbh}++;
+      PTDEBUG && _d('Server on dbh', $dbh, 'does not seem to be a source');
+      $self->{not_a_source}->{$dbh}++;
    }
 
   return { map { lc($_) => $ms->{$_} } keys %$ms }; # lowercase the keys
 }
 
-sub wait_for_master {
+sub wait_for_source {
    my ( $self, %args ) = @_;
-   my @required_args = qw(master_status slave_dbh);
+   my @required_args = qw(source_status replica_dbh);
    foreach my $arg ( @required_args ) {
       die "I need a $arg argument" unless $args{$arg};
    }
-   my ($master_status, $slave_dbh) = @args{@required_args};
+   my ($source_status, $replica_dbh) = @args{@required_args};
    my $timeout       = $args{timeout} || 60;
 
    my $result;
    my $waited;
-   if ( $master_status ) {
-      my $slave_status;
+   if ( $source_status ) {
+      my $replica_status;
       eval {
-          $slave_status = $self->get_slave_status($slave_dbh);
+          $replica_status = $self->get_replica_status($replica_dbh);
       };
       if ($EVAL_ERROR) {
           return {
               result => undef,
               waited => 0,
-              error  =>'Wait for master: this is a multi-master slave but "channel" was not specified on the command line',
+              error  =>'Wait for source: this is a multi-source replica but "channel" was not specified on the command line',
           };
       }
-      my $server_version = VersionParser->new($slave_dbh);
-      my $channel_sql = $server_version > '5.6' && $self->{channel} ? ", '$self->{channel}'" : '';
-      my $sql = "SELECT MASTER_POS_WAIT('$master_status->{file}', $master_status->{position}, $timeout $channel_sql)";
-      PTDEBUG && _d($slave_dbh, $sql);
+      my $vp = VersionParser->new($replica_dbh);
+      my $source_name = 'source';
+      if ( $vp < '8.1' || $vp->flavor() =~ m/maria/ ) {
+         $source_name = 'master';
+      }
+      my $channel_sql = $vp > '5.6' && $self->{channel} ? ", '$self->{channel}'" : '';
+      my $sql = "SELECT ${source_name}_POS_WAIT('$source_status->{file}', $source_status->{position}, $timeout $channel_sql)";
+      PTDEBUG && _d($replica_dbh, $sql);
       my $start = time;
-      ($result) = $slave_dbh->selectrow_array($sql);
+      ($result) = $replica_dbh->selectrow_array($sql);
 
       $waited = time - $start;
 
@@ -2754,7 +2794,7 @@ sub wait_for_master {
       PTDEBUG && _d("Waited", $waited, "seconds");
    }
    else {
-      PTDEBUG && _d('Not waiting: this server is not a master');
+      PTDEBUG && _d('Not waiting: this server is not a source');
    }
 
    return {
@@ -2763,75 +2803,96 @@ sub wait_for_master {
    };
 }
 
-sub stop_slave {
+sub stop_replica {
    my ( $self, $dbh ) = @_;
-   my $sth = $self->{sths}->{$dbh}->{STOP_SLAVE}
-         ||= $dbh->prepare('STOP SLAVE');
+   my $vp = VersionParser->new($dbh);
+   my $replica_name = 'replica';
+   if ( $vp < '8.1' || $vp->flavor() =~ m/maria/ ) {
+      $replica_name = 'slave';
+   }
+   my $sth = $self->{sths}->{$dbh}->{STOP_REPLICA}
+         ||= $dbh->prepare("STOP ${replica_name}");
    PTDEBUG && _d($dbh, $sth->{Statement});
    $sth->execute();
 }
 
-sub start_slave {
+sub start_replica {
    my ( $self, $dbh, $pos ) = @_;
+
+   my $vp = VersionParser->new($dbh);
+   my $source_name = 'source';
+   my $replica_name = 'replica';
+   if ( $vp < '8.1' || $vp->flavor() =~ m/maria/ ) {
+      $source_name = 'master';
+      $replica_name = 'slave';
+   }
+
    if ( $pos ) {
-      my $sql = "START SLAVE UNTIL MASTER_LOG_FILE='$pos->{file}', "
-              . "MASTER_LOG_POS=$pos->{position}";
+      my $sql = "START ${replica_name} UNTIL ${source_name}_LOG_FILE='$pos->{file}', "
+              . "${source_name}_LOG_POS=$pos->{position}";
       PTDEBUG && _d($dbh, $sql);
       $dbh->do($sql);
    }
    else {
-      my $sth = $self->{sths}->{$dbh}->{START_SLAVE}
-            ||= $dbh->prepare('START SLAVE');
+      my $sth = $self->{sths}->{$dbh}->{START_REPLICA}
+            ||= $dbh->prepare("START ${replica_name}");
       PTDEBUG && _d($dbh, $sth->{Statement});
       $sth->execute();
    }
 }
 
-sub catchup_to_master {
-   my ( $self, $slave, $master, $timeout ) = @_;
-   $self->stop_slave($master);
-   $self->stop_slave($slave);
-   my $slave_status  = $self->get_slave_status($slave);
-   my $slave_pos     = $self->repl_posn($slave_status);
-   my $master_status = $self->get_master_status($master);
-   my $master_pos    = $self->repl_posn($master_status);
-   PTDEBUG && _d('Master position:', $self->pos_to_string($master_pos),
-      'Slave position:', $self->pos_to_string($slave_pos));
+sub catchup_to_source {
+   my ( $self, $replica, $source, $timeout ) = @_;
+   $self->stop_replica($source);
+   $self->stop_replica($replica);
+   my $replica_status  = $self->get_replica_status($replica);
+   my $replica_pos     = $self->repl_posn($replica_status);
+   my $source_status = $self->get_source_status($source);
+   my $source_pos    = $self->repl_posn($source_status);
+   PTDEBUG && _d('Source position:', $self->pos_to_string($source_pos),
+      'Replica position:', $self->pos_to_string($replica_pos));
 
    my $result;
-   if ( $self->pos_cmp($slave_pos, $master_pos) < 0 ) {
-      PTDEBUG && _d('Waiting for slave to catch up to master');
-      $self->start_slave($slave, $master_pos);
+   if ( $self->pos_cmp($replica_pos, $source_pos) < 0 ) {
+      PTDEBUG && _d('Waiting for replica to catch up to source');
+      $self->start_replica($replica, $source_pos);
 
-      $result = $self->wait_for_master(
-            master_status => $master_status,
-            slave_dbh     => $slave,
+      $result = $self->wait_for_source(
+            source_status => $source_status,
+            replica_dbh   => $replica,
             timeout       => $timeout,
-            master_status => $master_status
+            source_status => $source_status
       );
       if ($result->{error}) {
           die $result->{error};
       }
       if ( !defined $result->{result} ) {
-         $slave_status = $self->get_slave_status($slave);
-         if ( !$self->slave_is_running($slave_status) ) {
-            PTDEBUG && _d('Master position:',
-               $self->pos_to_string($master_pos),
-               'Slave position:', $self->pos_to_string($slave_pos));
-            $slave_pos = $self->repl_posn($slave_status);
-            if ( $self->pos_cmp($slave_pos, $master_pos) != 0 ) {
-               die "MASTER_POS_WAIT() returned NULL but slave has not "
-                  . "caught up to master";
+         $replica_status = $self->get_replica_status($replica);
+            
+         my $vp = VersionParser->new($replica);
+         my $replica_name = 'replica';
+         if ( $vp < '8.1' || $vp->flavor() =~ m/maria/ ) {
+            $replica_name = 'slave';
+         }
+
+         if ( !$self->replica_is_running($replica_status, $replica_name) ) {
+            PTDEBUG && _d('Source position:',
+               $self->pos_to_string($source_pos),
+               'Replica position:', $self->pos_to_string($replica_pos));
+            $replica_pos = $self->repl_posn($replica_status);
+            if ( $self->pos_cmp($replica_pos, $source_pos) != 0 ) {
+               die "SOURCE_POS_WAIT() returned NULL but replica has not "
+                  . "caught up to source";
             }
-            PTDEBUG && _d('Slave is caught up to master and stopped');
+            PTDEBUG && _d('Replica is caught up to source and stopped');
          }
          else {
-            die "Slave has not caught up to master and it is still running";
+            die "Replica has not caught up to source and it is still running";
          }
       }
    }
    else {
-      PTDEBUG && _d("Slave is already caught up to master");
+      PTDEBUG && _d("Replica is already caught up to source");
    }
 
    return $result;
@@ -2839,26 +2900,38 @@ sub catchup_to_master {
 
 sub catchup_to_same_pos {
    my ( $self, $s1_dbh, $s2_dbh ) = @_;
-   $self->stop_slave($s1_dbh);
-   $self->stop_slave($s2_dbh);
-   my $s1_status = $self->get_slave_status($s1_dbh);
-   my $s2_status = $self->get_slave_status($s2_dbh);
+   $self->stop_replica($s1_dbh);
+   $self->stop_replica($s2_dbh);
+   my $s1_status = $self->get_replica_status($s1_dbh);
+   my $s2_status = $self->get_replica_status($s2_dbh);
    my $s1_pos    = $self->repl_posn($s1_status);
    my $s2_pos    = $self->repl_posn($s2_status);
    if ( $self->pos_cmp($s1_pos, $s2_pos) < 0 ) {
-      $self->start_slave($s1_dbh, $s2_pos);
+      $self->start_replica($s1_dbh, $s2_pos);
    }
    elsif ( $self->pos_cmp($s2_pos, $s1_pos) < 0 ) {
-      $self->start_slave($s2_dbh, $s1_pos);
+      $self->start_replica($s2_dbh, $s1_pos);
    }
 
-   $s1_status = $self->get_slave_status($s1_dbh);
-   $s2_status = $self->get_slave_status($s2_dbh);
+   $s1_status = $self->get_replica_status($s1_dbh);
+   $s2_status = $self->get_replica_status($s2_dbh);
    $s1_pos    = $self->repl_posn($s1_status);
    $s2_pos    = $self->repl_posn($s2_status);
 
-   if ( $self->slave_is_running($s1_status)
-     || $self->slave_is_running($s2_status)
+   my $vp1 = VersionParser->new($s1_dbh);
+   my $replica1_name = 'replica';
+   if ( $vp1 < '8.1' || $vp1->flavor() =~ m/maria/ ) {
+      $replica1_name = 'slave';
+   }
+
+   my $vp2 = VersionParser->new($s2_dbh);
+   my $replica2_name = 'replica';
+   if ( $vp2 < '8.1' || $vp2->flavor() =~ m/maria/ ) {
+      $replica2_name = 'slave';
+   }
+
+   if ( $self->replica_is_running($s1_status, $replica1_name)
+     || $self->replica_is_running($s2_status, $replica2_name)
      || $self->pos_cmp($s1_pos, $s2_pos) != 0)
    {
       die "The servers aren't both stopped at the same position";
@@ -2866,14 +2939,21 @@ sub catchup_to_same_pos {
 
 }
 
-sub slave_is_running {
-   my ( $self, $slave_status ) = @_;
-   return ($slave_status->{slave_sql_running} || 'No') eq 'Yes';
+sub replica_is_running {
+   my ( $self, $replica_status, $replica_name ) = @_;
+   return ($replica_status->{"${replica_name}_sql_running"} || 'No') eq 'Yes';
 }
 
-sub has_slave_updates {
+sub has_replica_updates {
    my ( $self, $dbh ) = @_;
-   my $sql = q{SHOW VARIABLES LIKE 'log_slave_updates'};
+   
+   my $vp = VersionParser->new($dbh);
+   my $replica_name = 'replica';
+   if ( $vp < '8.1' || $vp->flavor() =~ m/maria/ ) {
+      $replica_name = 'slave';
+   }
+
+   my $sql = qq{SHOW VARIABLES LIKE 'log_${replica_name}_updates'};
    PTDEBUG && _d($dbh, $sql);
    my ($name, $value) = $dbh->selectrow_array($sql);
    return $value && $value =~ m/^(1|ON)$/;
@@ -2887,6 +2967,12 @@ sub repl_posn {
          position => $status->{position},
       };
    }
+   elsif ( exists $status->{relay_source_log_file} && exists $status->{exec_source_log_pos} ) {
+      return {
+         file     => $status->{relay_source_log_file},
+         position => $status->{exec_source_log_pos},
+      };
+   }
    else {
       return {
          file     => $status->{relay_master_log_file},
@@ -2895,11 +2981,18 @@ sub repl_posn {
    }
 }
 
-sub get_slave_lag {
+sub get_replica_lag {
    my ( $self, $dbh ) = @_;
-   my $stat = $self->get_slave_status($dbh);
-   return unless $stat;  # server is not a slave
-   return $stat->{seconds_behind_master};
+   
+   my $vp = VersionParser->new($dbh);
+   my $source_name = 'source';
+   if ( $vp < '8.1' || $vp->flavor() =~ m/maria/ ) {
+      $source_name = 'master';
+   }
+
+   my $stat = $self->get_replica_status($dbh);
+   return unless $stat;  # server is not a replica
+   return $stat->{"seconds_behind_${source_name}"};
 }
 
 sub pos_cmp {
@@ -2910,9 +3003,9 @@ sub pos_cmp {
 sub short_host {
    my ( $self, $dsn ) = @_;
    my ($host, $port);
-   if ( $dsn->{master_host} ) {
-      $host = $dsn->{master_host};
-      $port = $dsn->{master_port};
+   if ( $dsn->{source_host} ) {
+      $host = $dsn->{source_host};
+      $port = $dsn->{source_port};
    }
    else {
       $host = $dsn->{h};
@@ -2927,7 +3020,7 @@ sub is_replication_thread {
 
    my $type = lc($args{type} || 'all');
    die "Invalid type: $type"
-      unless $type =~ m/^binlog_dump|slave_io|slave_sql|all$/i;
+      unless $type =~ m/^binlog_dump|slave_io|slave_sql|replica_io|replica_sql|all$/i;
 
    my $match = 0;
    if ( $type =~ m/binlog_dump|all/i ) {
@@ -2936,7 +3029,7 @@ sub is_replication_thread {
    }
    if ( !$match ) {
       if ( ($query->{User} || $query->{user} || '') eq "system user" ) {
-         PTDEBUG && _d("Slave replication thread");
+         PTDEBUG && _d("Replica replication thread");
          if ( $type ne 'all' ) {
             my $state = $query->{State} || $query->{state} || '';
 
@@ -2945,15 +3038,16 @@ sub is_replication_thread {
                $match = 1;
             }
             else {
-               my ($slave_sql) = $state =~ m/
+               my ($replica_sql) = $state =~ m/
                   ^(Waiting\sfor\sthe\snext\sevent
                    |Reading\sevent\sfrom\sthe\srelay\slog
                    |Has\sread\sall\srelay\slog;\swaiting
                    |Making\stemp\sfile
-                   |Waiting\sfor\sslave\smutex\son\sexit)/xi;
+                   |Waiting\sfor\sslave\smutex\son\sexit
+                   |Waiting\sfor\sreplica\smutex\son\sexit)/xi;
 
-               $match = $type eq 'slave_sql' &&  $slave_sql ? 1
-                      : $type eq 'slave_io'  && !$slave_sql ? 1
+               $match = $type eq 'replica_sql' &&  $replica_sql ? 1
+                      : $type eq 'replica_io'  && !$replica_sql ? 1
                       :                                       0;
             }
          }
@@ -2994,9 +3088,15 @@ sub get_replication_filters {
    }
    my ($dbh) = @args{@required_args};
 
+   my $vp = VersionParser->new($dbh);
+   my $replica_name = 'replica';
+   if ( $vp < '8.1' || $vp->flavor() =~ m/maria/ ) {
+      $replica_name = 'slave';
+   }
+
    my %filters = ();
 
-   my $status = $self->get_master_status($dbh);
+   my $status = $self->get_source_status($dbh);
    if ( $status ) {
       map { $filters{$_} = $status->{$_} }
       grep { defined $status->{$_} && $status->{$_} ne '' }
@@ -3006,7 +3106,7 @@ sub get_replication_filters {
       );
    }
 
-   $status = $self->get_slave_status($dbh);
+   $status = $self->get_replica_status($dbh);
    if ( $status ) {
       map { $filters{$_} = $status->{$_} }
       grep { defined $status->{$_} && $status->{$_} ne '' }
@@ -3019,10 +3119,10 @@ sub get_replication_filters {
          replicate_wild_ignore_table
       );
 
-      my $sql = "SHOW VARIABLES LIKE 'slave_skip_errors'";
+      my $sql = "SHOW VARIABLES LIKE '${replica_name}_skip_errors'";
       PTDEBUG && _d($dbh, $sql);
       my $row = $dbh->selectrow_arrayref($sql);
-      $filters{slave_skip_errors} = $row->[1] if $row->[1] && $row->[1] ne 'OFF';
+      $filters{replica_skip_errors} = $row->[1] if $row->[1] && $row->[1] ne 'OFF';
    }
 
    return \%filters;
@@ -4007,7 +4107,7 @@ sub main {
       DSNParser    => $dp,
       Quoter       => "Quoter",
    );
-   $ms->recurse_to_slaves(
+   $ms->recurse_to_replicas(
       {  dbh      => $dbh,
          dsn      => $master_dsn,
          callback => sub {
@@ -4123,12 +4223,20 @@ sub print_node_summary {
       return;
    }
    $dbh->{FetchHashKeyName} = 'NAME_lc';
+   
+   my $vp = VersionParser->new($dbh);
+   my $source_name = 'source';
+   my $replica_name = 'replica';
+   if ( $vp < '8.1' || $vp->flavor() =~ m/maria/ ) {
+      $source_name = 'master';
+      $replica_name = 'slave';
+   }
 
    # Build the summary line by line, then join and print the lines.
    my @lines;
    my $vars  = $dbh->selectall_hashref("SHOW VARIABLES", 'variable_name');
    my $stats = $dbh->selectall_hashref("SHOW STATUS", 'variable_name');
-   my $ss    = $dbh->selectrow_hashref("SHOW SLAVE STATUS");
+   my $ss    = $dbh->selectrow_hashref("SHOW ${replica_name} STATUS");
    my $proc  = $dbh->selectall_hashref("SHOW PROCESSLIST", 'id');
 
    push @lines, ['Version',   $vars->{version}->{value}];
@@ -4163,8 +4271,8 @@ sub print_node_summary {
    my $slave_status = '';
    if ( $ss ) {
       $slave_status = sprintf("%s seconds behind, %s, %s",
-         defined $ss->{seconds_behind_master} ? $ss->{seconds_behind_master} : '',
-         $ss->{slave_io_running}  eq 'Yes' && $ss->{slave_sql_running} eq 'Yes' ? 'running' : 'not running',
+         defined $ss->{"seconds_behind_${source_name}"} ? $ss->{"seconds_behind_${source_name}"} : '',
+         $ss->{"${replica_name}_io_running"}  eq 'Yes' && $ss->{"${replica_name}_sql_running"} eq 'Yes' ? 'running' : 'not running',
           $ss->{last_errno} ? "error $ss->{last_errno}" : "no errors",
       );
    }
@@ -4563,6 +4671,12 @@ dsn: user; copy: yes
 
 User for login if not current user.
 
+=item * s
+
+dsn: mysql_ssl; copy: yes
+
+Create SSL connection
+
 =back
 
 =head1 ENVIRONMENT
diff --git a/bin/pt-slave-restart b/bin/pt-slave-restart
index 861398a64..987749161 100755
--- a/bin/pt-slave-restart
+++ b/bin/pt-slave-restart
@@ -2376,7 +2376,7 @@ sub get_cxn_params {
       $dsn = 'DBI:mysql:' . ( $info->{D} || '' ) . ';'
          . join(';', map  { "$opts{$_}->{dsn}=$info->{$_}" }
                      grep { defined $info->{$_} }
-                     qw(F h P S A))
+                     qw(F h P S A s))
          . ';mysql_read_default_group=client'
          . ($info->{L} ? ';mysql_local_infile=1' : '');
    }
@@ -2695,7 +2695,7 @@ sub new {
    return bless $self, $class;
 }
 
-sub get_slaves {
+sub get_replicas {
    my ($self, %args) = @_;
    my @required_args = qw(make_cxn);
    foreach my $arg ( @required_args ) {
@@ -2703,11 +2703,11 @@ sub get_slaves {
    }
    my ($make_cxn) = @args{@required_args};
 
-   my $slaves  = [];
+   my $replicas  = [];
    my $dp      = $self->{DSNParser};
    my $methods = $self->_resolve_recursion_methods($args{dsn});
 
-   return $slaves unless @$methods;
+   return $replicas unless @$methods;
 
    if ( grep { m/processlist|hosts/i } @$methods ) {
       my @required_args = qw(dbh dsn);
@@ -2717,26 +2717,26 @@ sub get_slaves {
       my ($dbh, $dsn) = @args{@required_args};
       my $o = $self->{OptionParser};
 
-      $self->recurse_to_slaves(
-         {  dbh            => $dbh,
-            dsn            => $dsn,
-            slave_user     => $o->got('slave-user') ? $o->get('slave-user') : '',
-            slave_password => $o->got('slave-password') ? $o->get('slave-password') : '',
-            slaves         => $args{slaves},
+      $self->recurse_to_replicas(
+         {  dbh              => $dbh,
+            dsn              => $dsn,
+            replica_user     => $o->got('replica-user') ? $o->get('replica-user') : '',
+            replica_password => $o->got('replica-password') ? $o->get('replica-password') : '',
+            replicas         => $args{replicas},
             callback  => sub {
                my ( $dsn, $dbh, $level, $parent ) = @_;
                return unless $level;
-               PTDEBUG && _d('Found slave:', $dp->as_string($dsn));
-               my $slave_dsn = $dsn;
-               if ($o->got('slave-user')) {
-                  $slave_dsn->{u} = $o->get('slave-user');
-                  PTDEBUG && _d("Using slave user ".$o->get('slave-user')." on ".$slave_dsn->{h}.":".$slave_dsn->{P});
+               PTDEBUG && _d('Found replica:', $dp->as_string($dsn));
+               my $replica_dsn = $dsn;
+               if ($o->got('replica-user')) {
+                  $replica_dsn->{u} = $o->get('replica-user');
+                  PTDEBUG && _d("Using replica user ".$o->get('replica-user')." on ".$replica_dsn->{h}.":".$replica_dsn->{P});
                }
-               if ($o->got('slave-password')) {
-                  $slave_dsn->{p} = $o->get('slave-password');
-                  PTDEBUG && _d("Slave password set");
+               if ($o->got('replica-password')) {
+                  $replica_dsn->{p} = $o->get('replica-password');
+                  PTDEBUG && _d("Replica password set");
                }
-               push @$slaves, $make_cxn->(dsn => $slave_dsn, dbh => $dbh, parent => $parent);
+               push @$replicas, $make_cxn->(dsn => $replica_dsn, dbh => $dbh, parent => $parent);
                return;
             },
             wait_no_die => $args{'wait_no_die'},
@@ -2744,20 +2744,20 @@ sub get_slaves {
       );
    } elsif ( $methods->[0] =~ m/^dsn=/i ) {
       (my $dsn_table_dsn = join ",", @$methods) =~ s/^dsn=//i;
-      $slaves = $self->get_cxn_from_dsn_table(
+      $replicas = $self->get_cxn_from_dsn_table(
          %args,
          dsn_table_dsn => $dsn_table_dsn,
          wait_no_die => $args{'wait_no_die'},
       );
    }
    elsif ( $methods->[0] =~ m/none/i ) {
-      PTDEBUG && _d('Not getting to slaves');
+      PTDEBUG && _d('Not getting to replicas');
    }
    else {
       die "Unexpected recursion methods: @$methods";
    }
 
-   return $slaves;
+   return $replicas;
 }
 
 sub _resolve_recursion_methods {
@@ -2775,31 +2775,31 @@ sub _resolve_recursion_methods {
    }
 }
 
-sub recurse_to_slaves {
+sub recurse_to_replicas {
    my ( $self, $args, $level ) = @_;
    $level ||= 0;
    my $dp = $self->{DSNParser};
    my $recurse = $args->{recurse} || $self->{OptionParser}->get('recurse');
    my $dsn = $args->{dsn};
-   my $slave_user = $args->{slave_user} || '';
-   my $slave_password = $args->{slave_password} || '';
+   my $replica_user = $args->{replica_user} || '';
+   my $replica_password = $args->{replica_password} || '';
 
    my $methods = $self->_resolve_recursion_methods($dsn);
    PTDEBUG && _d('Recursion methods:', @$methods);
    if ( lc($methods->[0]) eq 'none' ) {
-      PTDEBUG && _d('Not recursing to slaves');
+      PTDEBUG && _d('Not recursing to replicas');
       return;
    }
 
-   my $slave_dsn = $dsn;
-   if ($slave_user) {
-      $slave_dsn->{u} = $slave_user;
-      PTDEBUG && _d("Using slave user $slave_user on "
-         . $slave_dsn->{h} . ":" . ( $slave_dsn->{P} ? $slave_dsn->{P} : ""));
+   my $replica_dsn = $dsn;
+   if ($replica_user) {
+      $replica_dsn->{u} = $replica_user;
+      PTDEBUG && _d("Using replica user $replica_user on "
+         . $replica_dsn->{h} . ":" . ( $replica_dsn->{P} ? $replica_dsn->{P} : ""));
    }
-   if ($slave_password) {
-      $slave_dsn->{p} = $slave_password;
-      PTDEBUG && _d("Slave password set");
+   if ($replica_password) {
+      $replica_dsn->{p} = $replica_password;
+      PTDEBUG && _d("Replica password set");
    }
 
    my $dbh = $args->{dbh};
@@ -2807,12 +2807,12 @@ sub recurse_to_slaves {
    my $get_dbh = sub {
          eval {
             $dbh = $dp->get_dbh(
-               $dp->get_cxn_params($slave_dsn), { AutoCommit => 1 }
+               $dp->get_cxn_params($replica_dsn), { AutoCommit => 1 }
             );
-            PTDEBUG && _d('Connected to', $dp->as_string($slave_dsn));
+            PTDEBUG && _d('Connected to', $dp->as_string($replica_dsn));
          };
          if ( $EVAL_ERROR ) {
-            print STDERR "Cannot connect to ", $dp->as_string($slave_dsn), ": ", $EVAL_ERROR, "\n"
+            print STDERR "Cannot connect to ", $dp->as_string($replica_dsn), ": ", $EVAL_ERROR, "\n"
                or die "Cannot print: $OS_ERROR";
             return;
          }
@@ -2820,10 +2820,10 @@ sub recurse_to_slaves {
 
    DBH: {
       if ( !defined $dbh ) {
-         foreach my $known_slave ( @{$args->{slaves}} ) {
-            if ($known_slave->{dsn}->{h} eq $slave_dsn->{h} and
-                $known_slave->{dsn}->{P} eq $slave_dsn->{P} ) {
-               $dbh = $known_slave->{dbh};
+         foreach my $known_replica ( @{$args->{replicas}} ) {
+            if ($known_replica->{dsn}->{h} eq $replica_dsn->{h} and
+                $known_replica->{dsn}->{P} eq $replica_dsn->{P} ) {
+               $dbh = $known_replica->{dbh};
                last DBH;
             }
          }
@@ -2841,7 +2841,7 @@ sub recurse_to_slaves {
 	   if ( $EVAL_ERROR ) {
 		   if ( $args->{wait_no_die} ) {
 			   print STDERR "Error getting server id: ", $EVAL_ERROR,
-               "\nRetrying query for server ", $slave_dsn->{h}, ":", $slave_dsn->{P}, "\n";
+               "\nRetrying query for server ", $replica_dsn->{h}, ":", $replica_dsn->{P}, "\n";
             sleep 1;
             $dbh->disconnect();
             $get_dbh->();
@@ -2851,12 +2851,12 @@ sub recurse_to_slaves {
       }
    } until (defined $id);
    PTDEBUG && _d('Working on server ID', $id);
-   my $master_thinks_i_am = $dsn->{server_id};
+   my $source_thinks_i_am = $dsn->{server_id};
    if ( !defined $id
-       || ( defined $master_thinks_i_am && $master_thinks_i_am != $id )
+       || ( defined $source_thinks_i_am && $source_thinks_i_am != $id )
        || $args->{server_ids_seen}->{$id}++
    ) {
-      PTDEBUG && _d('Server ID seen, or not what master said');
+      PTDEBUG && _d('Server ID seen, or not what source said');
       if ( $args->{skip_callback} ) {
          $args->{skip_callback}->($dsn, $dbh, $level, $args->{parent});
       }
@@ -2867,51 +2867,51 @@ sub recurse_to_slaves {
 
    if ( !defined $recurse || $level < $recurse ) {
 
-      my @slaves =
-         grep { !$_->{master_id} || $_->{master_id} == $id } # Only my slaves.
-         $self->find_slave_hosts($dp, $dbh, $dsn, $methods);
+      my @replicas =
+         grep { !$_->{source_id} || $_->{source_id} == $id } # Only my replicas.
+         $self->find_replica_hosts($dp, $dbh, $dsn, $methods);
 
-      foreach my $slave ( @slaves ) {
+      foreach my $replica ( @replicas ) {
          PTDEBUG && _d('Recursing from',
-            $dp->as_string($dsn), 'to', $dp->as_string($slave));
-         $self->recurse_to_slaves(
-            { %$args, dsn => $slave, dbh => undef, parent => $dsn, slave_user => $slave_user, $slave_password => $slave_password }, $level + 1 );
+            $dp->as_string($dsn), 'to', $dp->as_string($replica));
+         $self->recurse_to_replicas(
+            { %$args, dsn => $replica, dbh => undef, parent => $dsn, replica_user => $replica_user, $replica_password => $replica_password }, $level + 1 );
       }
    }
 }
 
-sub find_slave_hosts {
+sub find_replica_hosts {
    my ( $self, $dsn_parser, $dbh, $dsn, $methods ) = @_;
 
-   PTDEBUG && _d('Looking for slaves on', $dsn_parser->as_string($dsn),
+   PTDEBUG && _d('Looking for replicas on', $dsn_parser->as_string($dsn),
       'using methods', @$methods);
 
-   my @slaves;
+   my @replicas;
    METHOD:
    foreach my $method ( @$methods ) {
-      my $find_slaves = "_find_slaves_by_$method";
-      PTDEBUG && _d('Finding slaves with', $find_slaves);
-      @slaves = $self->$find_slaves($dsn_parser, $dbh, $dsn);
-      last METHOD if @slaves;
+      my $find_replicas = "_find_replicas_by_$method";
+      PTDEBUG && _d('Finding replicas with', $find_replicas);
+      @replicas = $self->$find_replicas($dsn_parser, $dbh, $dsn);
+      last METHOD if @replicas;
    }
 
-   PTDEBUG && _d('Found', scalar(@slaves), 'slaves');
-   return @slaves;
+   PTDEBUG && _d('Found', scalar(@replicas), 'replicas');
+   return @replicas;
 }
 
-sub _find_slaves_by_processlist {
+sub _find_replicas_by_processlist {
    my ( $self, $dsn_parser, $dbh, $dsn ) = @_;
-   my @connected_slaves = $self->get_connected_slaves($dbh);
-   my @slaves = $self->_process_slaves_list($dsn_parser, $dsn, \@connected_slaves);
-   return @slaves;
+   my @connected_replicas = $self->get_connected_replicas($dbh);
+   my @replicas = $self->_process_replicas_list($dsn_parser, $dsn, \@connected_replicas);
+   return @replicas;
 }
 
-sub _process_slaves_list {
-   my ($self, $dsn_parser, $dsn, $connected_slaves) = @_;
-   my @slaves = map  {
-      my $slave        = $dsn_parser->parse("h=$_", $dsn);
-      $slave->{source} = 'processlist';
-      $slave;
+sub _process_replicas_list {
+   my ($self, $dsn_parser, $dsn, $connected_replicas) = @_;
+   my @replicas = map  {
+      my $replica        = $dsn_parser->parse("h=$_", $dsn);
+      $replica->{source} = 'processlist';
+      $replica;
    }
    grep { $_ }
    map  {
@@ -2923,22 +2923,28 @@ sub _process_slaves_list {
           $host = '['.$host.']';
       }
       $host;
-   } @$connected_slaves;
+   } @$connected_replicas;
 
-   return @slaves;
+   return @replicas;
 }
 
-sub _find_slaves_by_hosts {
+sub _find_replicas_by_hosts {
    my ( $self, $dsn_parser, $dbh, $dsn ) = @_;
 
-   my @slaves;
-   my $sql = 'SHOW SLAVE HOSTS';
+   my @replicas;
+
+   my $vp = VersionParser->new($dbh);
+   my $sql = 'SHOW REPLICAS';
+   if ( $vp < '8.1' || $vp->flavor() =~ m/maria/ ) {
+      $sql = 'SHOW SLAVE HOSTS';
+   }
+   
    PTDEBUG && _d($dbh, $sql);
-   @slaves = @{$dbh->selectall_arrayref($sql, { Slice => {} })};
+   @replicas = @{$dbh->selectall_arrayref($sql, { Slice => {} })};
 
-   if ( @slaves ) {
-      PTDEBUG && _d('Found some SHOW SLAVE HOSTS info');
-      @slaves = map {
+   if ( @replicas ) {
+      PTDEBUG && _d('Found some SHOW REPLICAS info');
+      @replicas = map {
          my %hash;
          @hash{ map { lc $_ } keys %$_ } = values %$_;
          my $spec = "h=$hash{host},P=$hash{port}"
@@ -2946,16 +2952,16 @@ sub _find_slaves_by_hosts {
             . ( $hash{password} ? ",p=$hash{password}" : '');
          my $dsn           = $dsn_parser->parse($spec, $dsn);
          $dsn->{server_id} = $hash{server_id};
-         $dsn->{master_id} = $hash{master_id};
+         $dsn->{source_id} = $hash{source_id};
          $dsn->{source}    = 'hosts';
          $dsn;
-      } @slaves;
+      } @replicas;
    }
 
-   return @slaves;
+   return @replicas;
 }
 
-sub get_connected_slaves {
+sub get_connected_replicas {
    my ( $self, $dbh ) = @_;
 
    my $show = "SHOW GRANTS FOR ";
@@ -3001,79 +3007,103 @@ sub get_connected_slaves {
    @{$dbh->selectall_arrayref($sql, { Slice => {} })};
 }
 
-sub is_master_of {
-   my ( $self, $master, $slave ) = @_;
-   my $master_status = $self->get_master_status($master)
-      or die "The server specified as a master is not a master";
-   my $slave_status  = $self->get_slave_status($slave)
-      or die "The server specified as a slave is not a slave";
-   my @connected     = $self->get_connected_slaves($master)
-      or die "The server specified as a master has no connected slaves";
-   my (undef, $port) = $master->selectrow_array("SHOW VARIABLES LIKE 'port'");
+sub is_source_of {
+   my ( $self, $source, $replica ) = @_;
+
+   my $replica_version = VersionParser->new($replica);
+   my $source_name = 'source';
+   my $source_port = 'source_port';
+   if ( $replica_version < '8.1' || $replica_version->flavor() =~ m/maria/ ) {
+      $source_name = 'master';
+      $source_port = 'master_port';
+   }
+
+   my $source_status = $self->get_source_status($source)
+      or die "The server specified as a source is not a source";
+   my $replica_status  = $self->get_replica_status($replica)
+      or die "The server specified as a replica is not a replica";
+   my @connected     = $self->get_connected_replicas($source)
+      or die "The server specified as a source has no connected replicas";
+   my (undef, $port) = $source->selectrow_array("SHOW VARIABLES LIKE 'port'");
 
-   if ( $port != $slave_status->{master_port} ) {
-      die "The slave is connected to $slave_status->{master_port} "
-         . "but the master's port is $port";
+   if ( $port != $replica_status->{$source_port} ) {
+      die "The replica is connected to $replica_status->{$source_port} "
+         . "but the source's port is $port";
    }
 
-   if ( !grep { $slave_status->{master_user} eq $_->{user} } @connected ) {
-      die "I don't see any slave I/O thread connected with user "
-         . $slave_status->{master_user};
+   if ( !grep { $replica_status->{source_user} eq $_->{user} } @connected ) {
+      die "I don't see any replica I/O thread connected with user "
+         . $replica_status->{source_user};
    }
 
-   if ( ($slave_status->{slave_io_state} || '')
-      eq 'Waiting for master to send event' )
+   if ( ($replica_status->{replica_io_state} || '')
+      eq 'Waiting for ${source_name} to send event' )
    {
-      my ( $master_log_name, $master_log_num )
-         = $master_status->{file} =~ m/^(.*?)\.0*([1-9][0-9]*)$/;
-      my ( $slave_log_name, $slave_log_num )
-         = $slave_status->{master_log_file} =~ m/^(.*?)\.0*([1-9][0-9]*)$/;
-      if ( $master_log_name ne $slave_log_name
-         || abs($master_log_num - $slave_log_num) > 1 )
+      my ( $source_log_name, $source_log_num )
+         = $source_status->{file} =~ m/^(.*?)\.0*([1-9][0-9]*)$/;
+      my ( $replica_log_name, $replica_log_num )
+         = $replica_status->{source_log_file} =~ m/^(.*?)\.0*([1-9][0-9]*)$/;
+      if ( $source_log_name ne $replica_log_name
+         || abs($source_log_num - $replica_log_num) > 1 )
       {
-         die "The slave thinks it is reading from "
-            . "$slave_status->{master_log_file},  but the "
-            . "master is writing to $master_status->{file}";
+         die "The replica thinks it is reading from "
+            . "$replica_status->{source_log_file},  but the "
+            . "source is writing to $source_status->{file}";
       }
    }
    return 1;
 }
 
-sub get_master_dsn {
+sub get_source_dsn {
    my ( $self, $dbh, $dsn, $dsn_parser ) = @_;
-   my $master = $self->get_slave_status($dbh) or return undef;
-   my $spec   = "h=$master->{master_host},P=$master->{master_port}";
+
+   my $vp = VersionParser->new($dbh);
+   my $source_host = 'source_host';
+   my $source_port = 'source_port';
+   if ( $vp < '8.1' || $vp->flavor() =~ m/maria/ ) {
+      $source_host = 'master_host';
+      $source_port = 'master_port';
+   }
+
+   my $source = $self->get_replica_status($dbh) or return undef;
+   my $spec   = "h=$source->{${source_host}},P=$source->{${source_port}}";
    return       $dsn_parser->parse($spec, $dsn);
 }
 
-sub get_slave_status {
+sub get_replica_status {
    my ( $self, $dbh ) = @_;
 
-   if ( !$self->{not_a_slave}->{$dbh} ) {
-      my $sth = $self->{sths}->{$dbh}->{SLAVE_STATUS}
-            ||= $dbh->prepare('SHOW SLAVE STATUS');
-      PTDEBUG && _d($dbh, 'SHOW SLAVE STATUS');
+   my $server_version = VersionParser->new($dbh);
+   my $replica_name = 'replica';
+   if ( $server_version < '8.1' || $server_version->flavor() =~ m/maria/ ) {
+      $replica_name = 'slave';
+   }
+
+   if ( !$self->{not_a_replica}->{$dbh} ) {
+      my $sth = $self->{sths}->{$dbh}->{REPLICA_STATUS}
+            ||= $dbh->prepare("SHOW ${replica_name} STATUS");
+      PTDEBUG && _d($dbh, "SHOW ${replica_name} STATUS");
       $sth->execute();
-      my ($sss_rows) = $sth->fetchall_arrayref({}); # Show Slave Status rows
+      my ($sss_rows) = $sth->fetchall_arrayref({}); # Show Replica Status rows
 
       my $ss;
       if ( $sss_rows && @$sss_rows ) {
           if (scalar @$sss_rows > 1) {
               if (!$self->{channel}) {
-                  die 'This server returned more than one row for SHOW SLAVE STATUS but "channel" was not specified on the command line';
+                  die 'This server returned more than one row for SHOW REPLICA STATUS but "channel" was not specified on the command line';
               }
-              my $slave_use_channels;
+              my $replica_use_channels;
               for my $row (@$sss_rows) {
                   $row = { map { lc($_) => $row->{$_} } keys %$row }; # lowercase the keys
                   if ($row->{channel_name}) {
-                      $slave_use_channels = 1;
+                      $replica_use_channels = 1;
                   }
                   if ($row->{channel_name} eq $self->{channel}) {
                       $ss = $row;
                       last;
                   }
               }
-              if (!$ss && $slave_use_channels) {
+              if (!$ss && $replica_use_channels) {
                  die 'This server is using replication channels but "channel" was not specified on the command line';
               }
           } else {
@@ -3093,28 +3123,34 @@ sub get_slave_status {
           }
       }
 
-      PTDEBUG && _d('This server returns nothing for SHOW SLAVE STATUS');
-      $self->{not_a_slave}->{$dbh}++;
+      PTDEBUG && _d('This server returns nothing for SHOW REPLICA STATUS');
+      $self->{not_a_replica}->{$dbh}++;
   }
 }
 
-sub get_master_status {
+sub get_source_status {
    my ( $self, $dbh ) = @_;
 
-   if ( $self->{not_a_master}->{$dbh} ) {
-      PTDEBUG && _d('Server on dbh', $dbh, 'is not a master');
+   if ( $self->{not_a_source}->{$dbh} ) {
+      PTDEBUG && _d('Server on dbh', $dbh, 'is not a source');
       return;
    }
 
+   my $vp = VersionParser->new($dbh);
+   my $source_name = 'binary log';
+   if ( $vp < '8.1' || $vp->flavor() =~ m/maria/ ) {
+      $source_name = 'master';
+   }
+
    my $sth;
    if ( $self->{sths}->{$dbh} && $dbh && $self->{sths}->{$dbh} == $dbh ) {
-      $sth = $self->{sths}->{$dbh}->{MASTER_STATUS}
-         ||= $dbh->prepare('SHOW MASTER STATUS');
+      $sth = $self->{sths}->{$dbh}->{SOURCE_STATUS}
+         ||= $dbh->prepare("SHOW ${source_name} STATUS");
    }
    else {
-      $sth = $dbh->prepare('SHOW MASTER STATUS');
+      $sth = $dbh->prepare("SHOW ${source_name} STATUS");
    }
-   PTDEBUG && _d($dbh, 'SHOW MASTER STATUS');
+   PTDEBUG && _d($dbh, "SHOW ${source_name} STATUS");
    $sth->execute();
    my ($ms) = @{$sth->fetchall_arrayref({})};
    PTDEBUG && _d(
@@ -3122,42 +3158,46 @@ sub get_master_status {
           : '');
 
    if ( !$ms || scalar keys %$ms < 2 ) {
-      PTDEBUG && _d('Server on dbh', $dbh, 'does not seem to be a master');
-      $self->{not_a_master}->{$dbh}++;
+      PTDEBUG && _d('Server on dbh', $dbh, 'does not seem to be a source');
+      $self->{not_a_source}->{$dbh}++;
    }
 
   return { map { lc($_) => $ms->{$_} } keys %$ms }; # lowercase the keys
 }
 
-sub wait_for_master {
+sub wait_for_source {
    my ( $self, %args ) = @_;
-   my @required_args = qw(master_status slave_dbh);
+   my @required_args = qw(source_status replica_dbh);
    foreach my $arg ( @required_args ) {
       die "I need a $arg argument" unless $args{$arg};
    }
-   my ($master_status, $slave_dbh) = @args{@required_args};
+   my ($source_status, $replica_dbh) = @args{@required_args};
    my $timeout       = $args{timeout} || 60;
 
    my $result;
    my $waited;
-   if ( $master_status ) {
-      my $slave_status;
+   if ( $source_status ) {
+      my $replica_status;
       eval {
-          $slave_status = $self->get_slave_status($slave_dbh);
+          $replica_status = $self->get_replica_status($replica_dbh);
       };
       if ($EVAL_ERROR) {
           return {
               result => undef,
               waited => 0,
-              error  =>'Wait for master: this is a multi-master slave but "channel" was not specified on the command line',
+              error  =>'Wait for source: this is a multi-source replica but "channel" was not specified on the command line',
           };
       }
-      my $server_version = VersionParser->new($slave_dbh);
-      my $channel_sql = $server_version > '5.6' && $self->{channel} ? ", '$self->{channel}'" : '';
-      my $sql = "SELECT MASTER_POS_WAIT('$master_status->{file}', $master_status->{position}, $timeout $channel_sql)";
-      PTDEBUG && _d($slave_dbh, $sql);
+      my $vp = VersionParser->new($replica_dbh);
+      my $source_name = 'source';
+      if ( $vp < '8.1' || $vp->flavor() =~ m/maria/ ) {
+         $source_name = 'master';
+      }
+      my $channel_sql = $vp > '5.6' && $self->{channel} ? ", '$self->{channel}'" : '';
+      my $sql = "SELECT ${source_name}_POS_WAIT('$source_status->{file}', $source_status->{position}, $timeout $channel_sql)";
+      PTDEBUG && _d($replica_dbh, $sql);
       my $start = time;
-      ($result) = $slave_dbh->selectrow_array($sql);
+      ($result) = $replica_dbh->selectrow_array($sql);
 
       $waited = time - $start;
 
@@ -3165,7 +3205,7 @@ sub wait_for_master {
       PTDEBUG && _d("Waited", $waited, "seconds");
    }
    else {
-      PTDEBUG && _d('Not waiting: this server is not a master');
+      PTDEBUG && _d('Not waiting: this server is not a source');
    }
 
    return {
@@ -3174,75 +3214,96 @@ sub wait_for_master {
    };
 }
 
-sub stop_slave {
+sub stop_replica {
    my ( $self, $dbh ) = @_;
-   my $sth = $self->{sths}->{$dbh}->{STOP_SLAVE}
-         ||= $dbh->prepare('STOP SLAVE');
+   my $vp = VersionParser->new($dbh);
+   my $replica_name = 'replica';
+   if ( $vp < '8.1' || $vp->flavor() =~ m/maria/ ) {
+      $replica_name = 'slave';
+   }
+   my $sth = $self->{sths}->{$dbh}->{STOP_REPLICA}
+         ||= $dbh->prepare("STOP ${replica_name}");
    PTDEBUG && _d($dbh, $sth->{Statement});
    $sth->execute();
 }
 
-sub start_slave {
+sub start_replica {
    my ( $self, $dbh, $pos ) = @_;
+
+   my $vp = VersionParser->new($dbh);
+   my $source_name = 'source';
+   my $replica_name = 'replica';
+   if ( $vp < '8.1' || $vp->flavor() =~ m/maria/ ) {
+      $source_name = 'master';
+      $replica_name = 'slave';
+   }
+
    if ( $pos ) {
-      my $sql = "START SLAVE UNTIL MASTER_LOG_FILE='$pos->{file}', "
-              . "MASTER_LOG_POS=$pos->{position}";
+      my $sql = "START ${replica_name} UNTIL ${source_name}_LOG_FILE='$pos->{file}', "
+              . "${source_name}_LOG_POS=$pos->{position}";
       PTDEBUG && _d($dbh, $sql);
       $dbh->do($sql);
    }
    else {
-      my $sth = $self->{sths}->{$dbh}->{START_SLAVE}
-            ||= $dbh->prepare('START SLAVE');
+      my $sth = $self->{sths}->{$dbh}->{START_REPLICA}
+            ||= $dbh->prepare("START ${replica_name}");
       PTDEBUG && _d($dbh, $sth->{Statement});
       $sth->execute();
    }
 }
 
-sub catchup_to_master {
-   my ( $self, $slave, $master, $timeout ) = @_;
-   $self->stop_slave($master);
-   $self->stop_slave($slave);
-   my $slave_status  = $self->get_slave_status($slave);
-   my $slave_pos     = $self->repl_posn($slave_status);
-   my $master_status = $self->get_master_status($master);
-   my $master_pos    = $self->repl_posn($master_status);
-   PTDEBUG && _d('Master position:', $self->pos_to_string($master_pos),
-      'Slave position:', $self->pos_to_string($slave_pos));
+sub catchup_to_source {
+   my ( $self, $replica, $source, $timeout ) = @_;
+   $self->stop_replica($source);
+   $self->stop_replica($replica);
+   my $replica_status  = $self->get_replica_status($replica);
+   my $replica_pos     = $self->repl_posn($replica_status);
+   my $source_status = $self->get_source_status($source);
+   my $source_pos    = $self->repl_posn($source_status);
+   PTDEBUG && _d('Source position:', $self->pos_to_string($source_pos),
+      'Replica position:', $self->pos_to_string($replica_pos));
 
    my $result;
-   if ( $self->pos_cmp($slave_pos, $master_pos) < 0 ) {
-      PTDEBUG && _d('Waiting for slave to catch up to master');
-      $self->start_slave($slave, $master_pos);
+   if ( $self->pos_cmp($replica_pos, $source_pos) < 0 ) {
+      PTDEBUG && _d('Waiting for replica to catch up to source');
+      $self->start_replica($replica, $source_pos);
 
-      $result = $self->wait_for_master(
-            master_status => $master_status,
-            slave_dbh     => $slave,
+      $result = $self->wait_for_source(
+            source_status => $source_status,
+            replica_dbh   => $replica,
             timeout       => $timeout,
-            master_status => $master_status
+            source_status => $source_status
       );
       if ($result->{error}) {
           die $result->{error};
       }
       if ( !defined $result->{result} ) {
-         $slave_status = $self->get_slave_status($slave);
-         if ( !$self->slave_is_running($slave_status) ) {
-            PTDEBUG && _d('Master position:',
-               $self->pos_to_string($master_pos),
-               'Slave position:', $self->pos_to_string($slave_pos));
-            $slave_pos = $self->repl_posn($slave_status);
-            if ( $self->pos_cmp($slave_pos, $master_pos) != 0 ) {
-               die "MASTER_POS_WAIT() returned NULL but slave has not "
-                  . "caught up to master";
+         $replica_status = $self->get_replica_status($replica);
+            
+         my $vp = VersionParser->new($replica);
+         my $replica_name = 'replica';
+         if ( $vp < '8.1' || $vp->flavor() =~ m/maria/ ) {
+            $replica_name = 'slave';
+         }
+
+         if ( !$self->replica_is_running($replica_status, $replica_name) ) {
+            PTDEBUG && _d('Source position:',
+               $self->pos_to_string($source_pos),
+               'Replica position:', $self->pos_to_string($replica_pos));
+            $replica_pos = $self->repl_posn($replica_status);
+            if ( $self->pos_cmp($replica_pos, $source_pos) != 0 ) {
+               die "SOURCE_POS_WAIT() returned NULL but replica has not "
+                  . "caught up to source";
             }
-            PTDEBUG && _d('Slave is caught up to master and stopped');
+            PTDEBUG && _d('Replica is caught up to source and stopped');
          }
          else {
-            die "Slave has not caught up to master and it is still running";
+            die "Replica has not caught up to source and it is still running";
          }
       }
    }
    else {
-      PTDEBUG && _d("Slave is already caught up to master");
+      PTDEBUG && _d("Replica is already caught up to source");
    }
 
    return $result;
@@ -3250,26 +3311,38 @@ sub catchup_to_master {
 
 sub catchup_to_same_pos {
    my ( $self, $s1_dbh, $s2_dbh ) = @_;
-   $self->stop_slave($s1_dbh);
-   $self->stop_slave($s2_dbh);
-   my $s1_status = $self->get_slave_status($s1_dbh);
-   my $s2_status = $self->get_slave_status($s2_dbh);
+   $self->stop_replica($s1_dbh);
+   $self->stop_replica($s2_dbh);
+   my $s1_status = $self->get_replica_status($s1_dbh);
+   my $s2_status = $self->get_replica_status($s2_dbh);
    my $s1_pos    = $self->repl_posn($s1_status);
    my $s2_pos    = $self->repl_posn($s2_status);
    if ( $self->pos_cmp($s1_pos, $s2_pos) < 0 ) {
-      $self->start_slave($s1_dbh, $s2_pos);
+      $self->start_replica($s1_dbh, $s2_pos);
    }
    elsif ( $self->pos_cmp($s2_pos, $s1_pos) < 0 ) {
-      $self->start_slave($s2_dbh, $s1_pos);
+      $self->start_replica($s2_dbh, $s1_pos);
    }
 
-   $s1_status = $self->get_slave_status($s1_dbh);
-   $s2_status = $self->get_slave_status($s2_dbh);
+   $s1_status = $self->get_replica_status($s1_dbh);
+   $s2_status = $self->get_replica_status($s2_dbh);
    $s1_pos    = $self->repl_posn($s1_status);
    $s2_pos    = $self->repl_posn($s2_status);
 
-   if ( $self->slave_is_running($s1_status)
-     || $self->slave_is_running($s2_status)
+   my $vp1 = VersionParser->new($s1_dbh);
+   my $replica1_name = 'replica';
+   if ( $vp1 < '8.1' || $vp1->flavor() =~ m/maria/ ) {
+      $replica1_name = 'slave';
+   }
+
+   my $vp2 = VersionParser->new($s2_dbh);
+   my $replica2_name = 'replica';
+   if ( $vp2 < '8.1' || $vp2->flavor() =~ m/maria/ ) {
+      $replica2_name = 'slave';
+   }
+
+   if ( $self->replica_is_running($s1_status, $replica1_name)
+     || $self->replica_is_running($s2_status, $replica2_name)
      || $self->pos_cmp($s1_pos, $s2_pos) != 0)
    {
       die "The servers aren't both stopped at the same position";
@@ -3277,14 +3350,21 @@ sub catchup_to_same_pos {
 
 }
 
-sub slave_is_running {
-   my ( $self, $slave_status ) = @_;
-   return ($slave_status->{slave_sql_running} || 'No') eq 'Yes';
+sub replica_is_running {
+   my ( $self, $replica_status, $replica_name ) = @_;
+   return ($replica_status->{"${replica_name}_sql_running"} || 'No') eq 'Yes';
 }
 
-sub has_slave_updates {
+sub has_replica_updates {
    my ( $self, $dbh ) = @_;
-   my $sql = q{SHOW VARIABLES LIKE 'log_slave_updates'};
+   
+   my $vp = VersionParser->new($dbh);
+   my $replica_name = 'replica';
+   if ( $vp < '8.1' || $vp->flavor() =~ m/maria/ ) {
+      $replica_name = 'slave';
+   }
+
+   my $sql = qq{SHOW VARIABLES LIKE 'log_${replica_name}_updates'};
    PTDEBUG && _d($dbh, $sql);
    my ($name, $value) = $dbh->selectrow_array($sql);
    return $value && $value =~ m/^(1|ON)$/;
@@ -3298,6 +3378,12 @@ sub repl_posn {
          position => $status->{position},
       };
    }
+   elsif ( exists $status->{relay_source_log_file} && exists $status->{exec_source_log_pos} ) {
+      return {
+         file     => $status->{relay_source_log_file},
+         position => $status->{exec_source_log_pos},
+      };
+   }
    else {
       return {
          file     => $status->{relay_master_log_file},
@@ -3306,11 +3392,18 @@ sub repl_posn {
    }
 }
 
-sub get_slave_lag {
+sub get_replica_lag {
    my ( $self, $dbh ) = @_;
-   my $stat = $self->get_slave_status($dbh);
-   return unless $stat;  # server is not a slave
-   return $stat->{seconds_behind_master};
+   
+   my $vp = VersionParser->new($dbh);
+   my $source_name = 'source';
+   if ( $vp < '8.1' || $vp->flavor() =~ m/maria/ ) {
+      $source_name = 'master';
+   }
+
+   my $stat = $self->get_replica_status($dbh);
+   return unless $stat;  # server is not a replica
+   return $stat->{"seconds_behind_${source_name}"};
 }
 
 sub pos_cmp {
@@ -3321,9 +3414,9 @@ sub pos_cmp {
 sub short_host {
    my ( $self, $dsn ) = @_;
    my ($host, $port);
-   if ( $dsn->{master_host} ) {
-      $host = $dsn->{master_host};
-      $port = $dsn->{master_port};
+   if ( $dsn->{source_host} ) {
+      $host = $dsn->{source_host};
+      $port = $dsn->{source_port};
    }
    else {
       $host = $dsn->{h};
@@ -3338,7 +3431,7 @@ sub is_replication_thread {
 
    my $type = lc($args{type} || 'all');
    die "Invalid type: $type"
-      unless $type =~ m/^binlog_dump|slave_io|slave_sql|all$/i;
+      unless $type =~ m/^binlog_dump|slave_io|slave_sql|replica_io|replica_sql|all$/i;
 
    my $match = 0;
    if ( $type =~ m/binlog_dump|all/i ) {
@@ -3347,7 +3440,7 @@ sub is_replication_thread {
    }
    if ( !$match ) {
       if ( ($query->{User} || $query->{user} || '') eq "system user" ) {
-         PTDEBUG && _d("Slave replication thread");
+         PTDEBUG && _d("Replica replication thread");
          if ( $type ne 'all' ) {
             my $state = $query->{State} || $query->{state} || '';
 
@@ -3356,15 +3449,16 @@ sub is_replication_thread {
                $match = 1;
             }
             else {
-               my ($slave_sql) = $state =~ m/
+               my ($replica_sql) = $state =~ m/
                   ^(Waiting\sfor\sthe\snext\sevent
                    |Reading\sevent\sfrom\sthe\srelay\slog
                    |Has\sread\sall\srelay\slog;\swaiting
                    |Making\stemp\sfile
-                   |Waiting\sfor\sslave\smutex\son\sexit)/xi;
+                   |Waiting\sfor\sslave\smutex\son\sexit
+                   |Waiting\sfor\sreplica\smutex\son\sexit)/xi;
 
-               $match = $type eq 'slave_sql' &&  $slave_sql ? 1
-                      : $type eq 'slave_io'  && !$slave_sql ? 1
+               $match = $type eq 'replica_sql' &&  $replica_sql ? 1
+                      : $type eq 'replica_io'  && !$replica_sql ? 1
                       :                                       0;
             }
          }
@@ -3405,9 +3499,15 @@ sub get_replication_filters {
    }
    my ($dbh) = @args{@required_args};
 
+   my $vp = VersionParser->new($dbh);
+   my $replica_name = 'replica';
+   if ( $vp < '8.1' || $vp->flavor() =~ m/maria/ ) {
+      $replica_name = 'slave';
+   }
+
    my %filters = ();
 
-   my $status = $self->get_master_status($dbh);
+   my $status = $self->get_source_status($dbh);
    if ( $status ) {
       map { $filters{$_} = $status->{$_} }
       grep { defined $status->{$_} && $status->{$_} ne '' }
@@ -3417,7 +3517,7 @@ sub get_replication_filters {
       );
    }
 
-   $status = $self->get_slave_status($dbh);
+   $status = $self->get_replica_status($dbh);
    if ( $status ) {
       map { $filters{$_} = $status->{$_} }
       grep { defined $status->{$_} && $status->{$_} ne '' }
@@ -3430,10 +3530,10 @@ sub get_replication_filters {
          replicate_wild_ignore_table
       );
 
-      my $sql = "SHOW VARIABLES LIKE 'slave_skip_errors'";
+      my $sql = "SHOW VARIABLES LIKE '${replica_name}_skip_errors'";
       PTDEBUG && _d($dbh, $sql);
       my $row = $dbh->selectrow_arrayref($sql);
-      $filters{slave_skip_errors} = $row->[1] if $row->[1] && $row->[1] ne 'OFF';
+      $filters{replica_skip_errors} = $row->[1] if $row->[1] && $row->[1] ne 'OFF';
    }
 
    return \%filters;
@@ -5216,31 +5316,43 @@ sub main {
    }
 
    # ########################################################################
-   # Start monitoring the slave.
+   # Set source and replica names.
+   # ########################################################################
+
+   my $vp = VersionParser->new($dbh);
+   my $source_name = 'source';
+   my $replica_name = 'replica';
+   if ( $vp < '8.1' || $vp->flavor() =~ m/maria/ ) {
+      $source_name = 'master';
+      $replica_name = 'slave';
+   }
+
+   # ########################################################################
+   # Start monitoring the replica.
    # ########################################################################
    my $exit_status = 0;
    my @servers_to_watch;
 
-   # Despite the name, recursing to slaves actually begins at the specified
-   # server, so the named server may also be watched, if it's a slave.
+   # Despite the name, recursing to replicas actually begins at the specified
+   # server, so the named server may also be watched, if it's a replica.
    my $ms = new MasterSlave(
       OptionParser => $o,
       DSNParser    => $dp,
       Quoter       => $q,
    );
-   $ms->recurse_to_slaves(
+   $ms->recurse_to_replicas(
       {  dbh      => $dbh,
          dsn      => $dsn,
          callback => sub {
             my ( $dsn, $dbh, $level ) = @_;
             # Test whether we want to watch this server.
             eval {
-               my $stat = $ms->get_slave_status($dbh);
+               my $stat = $ms->get_replica_status($dbh);
                if ( $stat ) {
                   push @servers_to_watch, { dsn => $dsn, dbh => $dbh };
                }
                else {
-                  die "could not find slave status on this server\n";
+                  die "could not find ${replica_name} status on this server\n";
                }
             };
             if ( $EVAL_ERROR ) {
@@ -5312,11 +5424,20 @@ sub watch_server {
    PTDEBUG && _d('Watching server', $dp->as_string($dsn),
       'forked:', $was_forked);
 
-   my $start_sql = VersionParser->new($dbh) >= '4.0.5'
-                 ? 'START SLAVE' : 'SLAVE START';
+   my $vp = VersionParser->new($dbh);
+   my $source_name   = 'source';
+   my $source_change = 'replication source';
+   my $replica_name  = 'replica';
+   if ( $vp < '8.1' || $vp->flavor() =~ m/maria/ ) {
+      $source_name   = 'master';
+      $source_change = 'master';
+      $replica_name  = 'slave';
+   }
+
+   my $start_sql = $vp >= '4.0.5' ? "START ${replica_name}" : 'SLAVE START';
    if ( $o->get('until-master') ) {
       my ( $file, $pos ) = split(',', $o->get('until-master'));
-      $start_sql .= " UNTIL MASTER_LOG_FILE = '$file', MASTER_LOG_POS = $pos";
+      $start_sql .= " UNTIL ${source_name}_LOG_FILE = '$file', ${source_name}_LOG_POS = $pos";
    }
    elsif ( $o->get('until-relay') ) {
       my ( $file, $pos ) = split(',', $o->get('until-relay'));
@@ -5324,13 +5445,13 @@ sub watch_server {
    }
 
    my $start = $dbh->prepare($start_sql);
-   my $stop  = $dbh->prepare('STOP SLAVE');
+   my $stop  = $dbh->prepare("STOP ${replica_name}");
 
    # ########################################################################
    # Detect if GTID is enabled. Skipping an event is done differently.
    # ########################################################################
    # When MySQL 5.6.5 or higher is used and gtid is enabled, skipping a
-   # transaction is not possible with SQL_SLAVE_SKIP_COUNTER
+   # transaction is not possible with SQL_REPLICA_SKIP_COUNTER
    my $skip_event;
    my $have_gtid = 0;
    # We also check if version is lower than 10.0.0 because MariaDB has different
@@ -5344,14 +5465,14 @@ sub watch_server {
    }
    PTDEBUG && _d('Have GTID:', $have_gtid);
 
-   # If GTID is enabled, slave_parallel_workers should be == 0.
+   # If GTID is enabled, replica_parallel_workers should be == 0.
    # It's currently not possible to know what GTID event the failed trx is.
    if ( $have_gtid ) {
       my $threads = $dbh->selectrow_hashref(
-         'SELECT @@GLOBAL.slave_parallel_workers AS threads');
+         "SELECT \@\@GLOBAL.${replica_name}_parallel_workers AS threads");
       if ( $threads->{threads} > 0 ) {
          die "Cannot skip transactions properly because GTID is enabled "
-            . "and slave_parallel_workers > 0.  See 'GLOBAL TRANSACTION IDS' "
+            . "and ${replica_name}_parallel_workers > 0.  See 'GLOBAL TRANSACTION IDS' "
             . "in the tool's documentation.\n";
       }
    }
@@ -5374,32 +5495,33 @@ sub watch_server {
       refetch_relay_log => sub {
          my ( $stat, $dbh ) = @_;
          PTDEBUG && _d('Found relay log corruption');
-         # Can't do CHANGE MASTER TO with a running slave.
+         # Can't do CHANGE MASTER TO with a running replica.
          $stop->execute();
 
          # Cannot use ? placeholders for CHANGE MASTER values:
          # https://bugs.launchpad.net/percona-toolkit/+bug/932614
-         my $sql = "CHANGE MASTER TO "
-                 . "MASTER_LOG_FILE='$stat->{relay_master_log_file}', "
-                 . "MASTER_LOG_POS=$stat->{exec_master_log_pos}";
+         my $sql = "CHANGE ${source_change} TO "
+                 . "${source_name}_LOG_FILE='" 
+                 . $stat->{"relay_${source_name}_log_file"} . "', "
+                 . "${source_name}_LOG_POS=" . $stat->{"exec_${source_name}_log_pos"};
          PTDEBUG && _d($sql);
          $dbh->do($sql);
       },
       skip => sub {
          my ( $stat, $dbh ) = @_;
-         my $set_skip = $dbh->prepare("SET GLOBAL SQL_SLAVE_SKIP_COUNTER = "
+         my $set_skip = $dbh->prepare("SET GLOBAL SQL_${replica_name}_SKIP_COUNTER = "
                           . $o->get('skip-count'));
          $set_skip->execute();
       },
       skip_gtid => sub {
          my ( $stat, $dbh ) = @_;
 
-         # Get master_uuid from SHOW SLAVE STATUS if a UUID is not specified
-         # with --master-uuid.
-         my $gtid_uuid = $o->get('master-uuid');
+         # Get master_uuid from SHOW REPLICA STATUS if a UUID is not specified
+         # with --source-uuid.
+         my $gtid_uuid = $o->get("${source_name}-uuid");
          if ( !$gtid_uuid ) {
-            $gtid_uuid = $stat->{master_uuid};
-            die "No master_uuid" unless $gtid_uuid;  # shouldn't happen
+            $gtid_uuid = $stat->{"${source_name}_uuid"};
+            die "No ${source_name}_uuid" unless $gtid_uuid;  # shouldn't happen
          }
 
          # We need the highest transaction in the executed_gtid_set.
@@ -5407,8 +5529,8 @@ sub watch_server {
          # Notes:
          #  - does not work with parallel replication
          #  - it skips the next transaction from the master_uuid
-         #    (when a slaveB is replicating from slaveA,
-         #     the master_uuid is it's own master, slaveA)
+         #    (when a replicaB is replicating from replicaA,
+         #     the master_uuid is it's own master, replicaA)
          my ($gtid_exec_ids) = ($stat->{executed_gtid_set} || '') =~ m/$gtid_uuid([0-9-:]*)/;
          $gtid_exec_ids =~ s/:[0-9]+-/:/g;
          die "No executed GTIDs" unless $gtid_exec_ids;
@@ -5422,10 +5544,10 @@ sub watch_server {
          my $gtid_exec_last   = $gtid_exec_sorted[-1];
 
          PTDEBUG && _d("\n",
-            "GTID: master_uuid:",         $gtid_uuid, "\n",
-            "GTID: executed_gtid_set:",   $gtid_exec_ids, "\n",
-            "GTID: max for master_uuid:", $gtid_exec_sorted[-1], "\n",
-            "GTID: last executed gtid:",  $gtid_uuid, ":", $gtid_exec_last);
+            "GTID: ${source_name}_uuid:",         $gtid_uuid, "\n",
+            "GTID: executed_gtid_set:",           $gtid_exec_ids, "\n",
+            "GTID: max for ${source_name}_uuid:", $gtid_exec_sorted[-1], "\n",
+            "GTID: last executed gtid:",          $gtid_uuid, ":", $gtid_exec_last);
 
          # Set the sessions next gtid, write an empty transaction
          my $skipped = 0;
@@ -5460,15 +5582,15 @@ sub watch_server {
    my $sleep     = $o->get('sleep');
    my ($last_log, $last_pos);
 
-   my $stat = {}; # Will hold SHOW SLAVE STATUS
+   my $stat = {}; # Will hold SHOW REPLICA STATUS
    STAT:
    while ( $stat
            && (!$o->get('run-time') || time() < $exit_time)
            && !-f $o->get('sentinel') ) {
       my $increase_sleep = 1;
-      $stat = $ms->get_slave_status($dbh);
+      $stat = $ms->get_replica_status($dbh);
       if ( !$stat ) {
-         print STDERR "No SLAVE STATUS output found on ",
+         print STDERR "No ${replica_name} STATUS output found on ",
             $dp->as_string($dsn), "\n";
          next STAT;
       }
@@ -5481,20 +5603,20 @@ sub watch_server {
            || $last_log ne $stat->{relay_log_file}   # Avoid infinite loops
            || $last_pos != $stat->{relay_log_pos}
       ) {
-         $stat->{slave_sql_running} ||= 'No';
+         $stat->{"${replica_name}_sql_running"} ||= 'No';
          $stat->{last_error}        ||= '';
          $stat->{last_errno}        ||= 0;
 
-         if ( $o->get('until-master') && pos_ge($stat, 'master') ) {
-            die "Slave has advanced past " . $o->get('until-master')
+         if ( $o->get('until-master') && pos_ge($stat, $source_name, $source_name) ) {
+            die "Replica has advanced past " . $o->get('until-master')
                . " on master.\n";
          }
-         elsif ( $o->get('until-relay') && pos_ge($stat, 'relay') ) {
-            die "Slave has advanced past " . $o->get('until-relay')
+         elsif ( $o->get('until-relay') && pos_ge($stat, 'relay', $source_name) ) {
+            die "Replica has advanced past " . $o->get('until-relay')
                . " in relay logs.\n";
          }
 
-         if ( $stat->{slave_sql_running} eq 'No' ) {
+         if ( $stat->{"${replica_name}_sql_running"} eq 'No' ) {
             # Print the time, error, etc
             if ( $o->get('verbose') ) {
                my $err = '';
@@ -5549,19 +5671,19 @@ sub watch_server {
                }
             }
             else {
-               PTDEBUG && _d('The slave is stopped, but without error');
+               PTDEBUG && _d('The replica is stopped, but without error');
                $increase_sleep = 1;
             }
          }
          elsif ( $o->get('verbose') > 2 ) {
             printf("%s delayed %s sec\n", $dp->as_string($dsn),
-               (defined $stat->{seconds_behind_master} ?
-               $stat->{seconds_behind_master} : 'NULL'));
+               (defined $stat->{"seconds_behind_${source_name}"} ?
+               $stat->{"seconds_behind_${source_name}"} : 'NULL'));
          }
       }
       else {
          if ( $o->get('verbose') ) {
-            print "Not checking slave because relay log file or position has "
+            print "Not checking replica because relay log file or position has "
                . "not changed "
                . "(file " . ($last_log || '')
                . " pos "  . ($last_pos || '') . ")\n";
@@ -5600,10 +5722,10 @@ sub watch_server {
 # Determines if the $stat's log coordinates are greater than or equal to the
 # desired coordinates. $which is 'master' or 'relay'
 sub pos_ge {
-   my ( $stat, $which ) = @_;
+   my ( $stat, $which, $source_name ) = @_;
    my $fmt  = '%s/%020d';
-   my $curr = $which eq 'master'
-      ? sprintf($fmt, @{$stat}{qw(relay_master_log_file exec_master_log_pos)})
+   my $curr = $which eq $source_name
+      ? sprintf($fmt, @{$stat}{("relay_${source_name}_log_file", "exec_${source_name}_log_pos")})
       : sprintf($fmt, @{$stat}{qw(relay_log_file relay_log_pos)});
    my $stop = sprintf($fmt, split(',', $o->get("until-$which")));
    return $curr ge $stop;
@@ -6024,7 +6146,7 @@ type: int; default: 1
 
 Number of statements to skip when restarting the slave.
 
-=item --master-uuid
+=item --source-uuid
 
 type: string
 
diff --git a/bin/pt-stalk b/bin/pt-stalk
index d30c7e33d..3909a7c84 100755
--- a/bin/pt-stalk
+++ b/bin/pt-stalk
@@ -1028,7 +1028,11 @@ collect_mysql_data_loop() {
       (echo $ts; ps_prepared_statements "$d/prepared_statements.isrunnning") >> "$d/$p-prepared-statements" &
    fi
 
-   slave_status "$d/$p-slave-status" "${mysql_version}"
+   local replica_name='replica'
+   if [ "${mysql_version}" '<' "8.1" ]; then
+      replica_name="slave"
+   fi
+   replica_status "$d/$p-${replica_name}-status" "${mysql_version}"
 }
 
 collect_system_data_loop() {
@@ -1312,14 +1316,13 @@ ps_prepared_statements() {
    fi
 }
 
-slave_status() {
+replica_status() {
    local outfile=$1
    local mysql_version=$2
 
+   local sql="SHOW REPLICA STATUS\G"
    if [ "${mysql_version}" '<' "8.1" ]; then
-      local sql="SHOW SLAVE STATUS\G"
-   else
-      local sql="SHOW REPLICA STATUS\G"
+      sql="SHOW SLAVE STATUS\G"
    fi
 
    echo -e "\n$sql\n" >> $outfile
diff --git a/bin/pt-summary b/bin/pt-summary
index 0013b44ec..06cf86285 100755
--- a/bin/pt-summary
+++ b/bin/pt-summary
@@ -761,7 +761,7 @@ section () {
 }
 
 NAME_VAL_LEN=12
-name_val () {
+name_val() {
    printf "%+*s | %s\n" "${NAME_VAL_LEN}" "$1" "$2"
 }
 
@@ -787,7 +787,7 @@ shorten() {
    '
 }
 
-group_concat () {
+group_concat() {
    sed -e '{H; $!d;}' -e 'x' -e 's/\n[[:space:]]*\([[:digit:]]*\)[[:space:]]*/, \1x/g' -e 's/[[:space:]][[:space:]]*/ /g' -e 's/, //' "${1}"
 }
 
diff --git a/t/pt-query-digest/bugs.t b/t/pt-query-digest/bugs.t
index 9c222ba71..b8462b7fb 100644
--- a/t/pt-query-digest/bugs.t
+++ b/t/pt-query-digest/bugs.t
@@ -15,13 +15,14 @@ use Sandbox;
 use PerconaTest;
 
 require "$trunk/bin/pt-query-digest";
+require VersionParser;
 
 my $dp  = new DSNParser(opts=>$dsn_opts);
 my $sb  = new Sandbox(basedir => '/tmp', DSNParser => $dp);
-my $dbh = $sb->get_dbh_for('master');
+my $dbh = $sb->get_dbh_for('source');
 
 if ( !$dbh ) {
-   plan skip_all => 'Cannot connect to sandbox master';
+   plan skip_all => 'Cannot connect to sandbox source';
 }
 
 my $output  = '';
diff --git a/t/pt-query-digest/collect_and_report_cycles.t b/t/pt-query-digest/collect_and_report_cycles.t
index a221845f5..0b2d84c44 100644
--- a/t/pt-query-digest/collect_and_report_cycles.t
+++ b/t/pt-query-digest/collect_and_report_cycles.t
@@ -14,13 +14,14 @@ use Test::More;
 use PerconaTest;
 use Sandbox;
 use DSNParser;
+require VersionParser;
 
 my $dp = new DSNParser(opts=>$dsn_opts);
 my $sb = new Sandbox(basedir => '/tmp', DSNParser => $dp);
-my $dbh = $sb->get_dbh_for('master');
+my $dbh = $sb->get_dbh_for('source');
 
 if ( !$dbh ) {
-   plan skip_all => 'Cannot connect to sandbox master';
+   plan skip_all => 'Cannot connect to sandbox source';
 }
 else {
    plan tests => 4;
diff --git a/t/pt-query-digest/daemon.t b/t/pt-query-digest/daemon.t
index 689289520..b2d06b918 100644
--- a/t/pt-query-digest/daemon.t
+++ b/t/pt-query-digest/daemon.t
@@ -15,10 +15,11 @@ use Test::More tests => 7;
 use PerconaTest;
 use Sandbox;
 use DSNParser;
+require VersionParser;
 
 my $dp = new DSNParser(opts=>$dsn_opts);
 my $sb = new Sandbox(basedir => '/tmp', DSNParser => $dp);
-my $dbh = $sb->get_dbh_for('master');
+my $dbh = $sb->get_dbh_for('source');
 
 my $output;
 
@@ -41,7 +42,7 @@ like(
 # Daemonizing and pid creation
 # #########################################################################
 SKIP: {
-   skip "Cannot connect to sandbox master", 5 unless $dbh;
+   skip "Cannot connect to sandbox source", 5 unless $dbh;
 
    my $cmd = "$trunk/bin/pt-query-digest --daemonize --pid $pid_file --processlist h=127.1,P=12345,u=msandbox,p=msandbox --log /dev/null";
    `$cmd`;
diff --git a/t/pt-query-digest/explain.t b/t/pt-query-digest/explain.t
index 3f861efee..adbe54095 100644
--- a/t/pt-query-digest/explain.t
+++ b/t/pt-query-digest/explain.t
@@ -15,13 +15,14 @@ use Sandbox;
 use PerconaTest;
 
 require "$trunk/bin/pt-query-digest";
+require VersionParser;
 
 my $dp  = new DSNParser(opts=>$dsn_opts);
 my $sb  = new Sandbox(basedir => '/tmp', DSNParser => $dp);
-my $dbh = $sb->get_dbh_for('master');
+my $dbh = $sb->get_dbh_for('source');
 
 if ( !$dbh ) {
-   plan skip_all => 'Cannot connect to sandbox master';
+   plan skip_all => 'Cannot connect to sandbox source';
 }
 
 $dbh->do('drop database if exists food');
@@ -134,7 +135,7 @@ ok(
 # #############################################################################
 # Issue 1196: mk-query-digest --explain is broken
 # #############################################################################
-$sb->load_file('master', "t/pt-query-digest/samples/issue_1196.sql");
+$sb->load_file('source', "t/pt-query-digest/samples/issue_1196.sql");
 
 ok(
    no_diff(
diff --git a/t/pt-query-digest/explain_partitions.t b/t/pt-query-digest/explain_partitions.t
index 9a874fb56..0dc4f67e2 100644
--- a/t/pt-query-digest/explain_partitions.t
+++ b/t/pt-query-digest/explain_partitions.t
@@ -18,13 +18,13 @@ use Sandbox;
 
 my $dp = new DSNParser(opts=>$dsn_opts);
 my $sb = new Sandbox(basedir => '/tmp', DSNParser => $dp);
-my $dbh = $sb->get_dbh_for('master');
+my $dbh = $sb->get_dbh_for('source');
 
 if ( !$dbh ) {
-   plan skip_all => 'Cannot connect to sandbox master';
+   plan skip_all => 'Cannot connect to sandbox source';
 }
 elsif ( VersionParser->new($dbh) < '5.1' ) {
-   plan skip_all => 'Sandbox master version not >= 5.1';
+   plan skip_all => 'Sandbox source version not >= 5.1';
 }
 else {
    plan tests => 2;
diff --git a/t/pt-query-digest/history.t b/t/pt-query-digest/history.t
index 81ccce025..1f9f1dff7 100644
--- a/t/pt-query-digest/history.t
+++ b/t/pt-query-digest/history.t
@@ -14,13 +14,14 @@ use Test::More;
 use PerconaTest;
 use Sandbox;
 require "$trunk/bin/pt-query-digest";
+require VersionParser;
 
 my $dp = new DSNParser(opts=>$dsn_opts);
 my $sb = new Sandbox(basedir => '/tmp', DSNParser => $dp);
-my $dbh = $sb->get_dbh_for('master');
+my $dbh = $sb->get_dbh_for('source');
 
 if ( !$dbh ) {
-   plan skip_all => 'Cannot connect to sandbox master';
+   plan skip_all => 'Cannot connect to sandbox source';
 }
 
 sub normalize_numbers {
@@ -49,7 +50,7 @@ my $output;
 my $cmd;
 
 $sb->create_dbs($dbh, ['test']);
-$sb->load_file('master', 't/pt-query-digest/samples/query_review.sql');
+$sb->load_file('source', 't/pt-query-digest/samples/query_review.sql');
 
 # Test --create-review and --create-review-history-table
 $output = run_with("slow006.txt", '--create-history-table',
diff --git a/t/pt-query-digest/issue_1186.t b/t/pt-query-digest/issue_1186.t
index 39058f555..6418674e1 100644
--- a/t/pt-query-digest/issue_1186.t
+++ b/t/pt-query-digest/issue_1186.t
@@ -14,13 +14,14 @@ use Test::More;
 use PerconaTest;
 use Sandbox;
 use DSNParser;
+require VersionParser;
 
 my $dp = new DSNParser(opts=>$dsn_opts);
 my $sb = new Sandbox(basedir => '/tmp', DSNParser => $dp);
-my $dbh = $sb->get_dbh_for('master');
+my $dbh = $sb->get_dbh_for('source');
 
 if ( !$dbh ) {
-   plan skip_all => 'Cannot connect to sandbox master';
+   plan skip_all => 'Cannot connect to sandbox source';
 }
 else {
    plan tests => 3;
diff --git a/t/pt-query-digest/issue_360.t b/t/pt-query-digest/issue_360.t
index 6801107df..729d9b1b2 100644
--- a/t/pt-query-digest/issue_360.t
+++ b/t/pt-query-digest/issue_360.t
@@ -14,13 +14,14 @@ use Test::More;
 use PerconaTest;
 use DSNParser;
 use Sandbox;
+require VersionParser;
 
 my $dp = new DSNParser(opts=>$dsn_opts);
 my $sb = new Sandbox(basedir => '/tmp', DSNParser => $dp);
-my $dbh = $sb->get_dbh_for('master');
+my $dbh = $sb->get_dbh_for('source');
 
 if ( !$dbh ) {
-   plan skip_all => 'Cannot connect to sandbox master';
+   plan skip_all => 'Cannot connect to sandbox source';
 }
 else {
    plan tests => 3;
diff --git a/t/pt-query-digest/processlist.t b/t/pt-query-digest/processlist.t
index 925dd36d3..f4dbe8d45 100644
--- a/t/pt-query-digest/processlist.t
+++ b/t/pt-query-digest/processlist.t
@@ -14,6 +14,7 @@ use Test::More;
 use PerconaTest;
 use Sandbox;
 require "$trunk/bin/pt-query-digest";
+require VersionParser;
 
 use Data::Dumper;
 $Data::Dumper::Indent    = 1;
@@ -22,10 +23,10 @@ $Data::Dumper::Quotekeys = 0;
 
 my $dp = new DSNParser(opts=>$dsn_opts);
 my $sb = new Sandbox(basedir => '/tmp', DSNParser => $dp);
-my $dbh = $sb->get_dbh_for('master');
+my $dbh = $sb->get_dbh_for('source');
 
 if ( !$dbh ) {
-   plan skip_all => 'Cannot connect to sandbox master';
+   plan skip_all => 'Cannot connect to sandbox source';
 }
 
 my @args = qw(-F /tmp/12345/my.sandbox.cnf --processlist h=127.1 --report-format query_report);
diff --git a/t/pt-query-digest/pt-2264.t b/t/pt-query-digest/pt-2264.t
index 0cb8eef6c..0f85fa479 100644
--- a/t/pt-query-digest/pt-2264.t
+++ b/t/pt-query-digest/pt-2264.t
@@ -14,6 +14,7 @@ use Test::More;
 use PerconaTest;
 use DSNParser;
 use Sandbox;
+require VersionParser;
 
 my $dp = new DSNParser(opts=>$dsn_opts);
 my $sb = new Sandbox(basedir => '/tmp', DSNParser => $dp);
@@ -22,10 +23,10 @@ if ( $sandbox_version lt '8.0') {
    plan skip_all => "Requires MySQL 8.0 or newer";
 }
 
-my $dbh = $sb->get_dbh_for('master');
+my $dbh = $sb->get_dbh_for('source');
 
 if ( !$dbh ) {
-   plan skip_all => 'Cannot connect to sandbox master';
+   plan skip_all => 'Cannot connect to sandbox source';
 }
 else {
    plan tests => 3;
diff --git a/t/pt-query-digest/review.t b/t/pt-query-digest/review.t
index 05c8ad9d5..5d9abd6b3 100644
--- a/t/pt-query-digest/review.t
+++ b/t/pt-query-digest/review.t
@@ -15,13 +15,14 @@ use PerconaTest;
 use Sandbox;
 use SqlModes;
 require "$trunk/bin/pt-query-digest";
+require VersionParser;
 
 my $dp = new DSNParser(opts=>$dsn_opts);
 my $sb = new Sandbox(basedir => '/tmp', DSNParser => $dp);
-my $dbh = $sb->get_dbh_for('master');
+my $dbh = $sb->get_dbh_for('source');
 
 if ( !$dbh ) {
-   plan skip_all => 'Cannot connect to sandbox master';
+   plan skip_all => 'Cannot connect to sandbox source';
 }
 
 sub normalize_numbers {
@@ -47,7 +48,7 @@ my $output;
 my $cmd;
 
 $sb->create_dbs($dbh, ['test']);
-$sb->load_file('master', 't/pt-query-digest/samples/query_review.sql');
+$sb->load_file('source', 't/pt-query-digest/samples/query_review.sql');
 
 # Test --create-review
 $output = run_with("slow006.txt", qw(--create-review-table),
@@ -188,7 +189,7 @@ unlike($output, qr/Use of uninitialized value/, 'no crash due to totally missing
 # #############################################################################
 # --review --no-report
 # #############################################################################
-$sb->load_file('master', 't/pt-query-digest/samples/query_review.sql');
+$sb->load_file('source', 't/pt-query-digest/samples/query_review.sql');
 $output = run_with("slow006.txt", '--no-report',
                    '--review', "$dsn,D=test,t=query_review");
 
diff --git a/t/pt-query-digest/run_time.t b/t/pt-query-digest/run_time.t
index 140a8ae12..aeced3eba 100644
--- a/t/pt-query-digest/run_time.t
+++ b/t/pt-query-digest/run_time.t
@@ -15,13 +15,14 @@ use PerconaTest;
 use Sandbox;
 use Time::HiRes qw(sleep);
 require "$trunk/bin/pt-query-digest";
+require VersionParser;
 
 my $dp = new DSNParser(opts=>$dsn_opts);
 my $sb = new Sandbox(basedir => '/tmp', DSNParser => $dp);
-my $dbh = $sb->get_dbh_for('master');
+my $dbh = $sb->get_dbh_for('source');
 
 if ( !$dbh ) {
-   plan skip_all => 'Cannot connect to sandbox master';
+   plan skip_all => 'Cannot connect to sandbox source';
 }
 else {
    plan tests => 11;
diff --git a/t/pt-query-digest/since_until.t b/t/pt-query-digest/since_until.t
index 091495090..96b5b309f 100644
--- a/t/pt-query-digest/since_until.t
+++ b/t/pt-query-digest/since_until.t
@@ -14,10 +14,11 @@ use Test::More;
 use PerconaTest;
 use Sandbox;
 require "$trunk/bin/pt-query-digest";
+require VersionParser;
 
 my $dp = new DSNParser(opts=>$dsn_opts);
 my $sb = new Sandbox(basedir => '/tmp', DSNParser => $dp);
-my $dbh = $sb->get_dbh_for('master');
+my $dbh = $sb->get_dbh_for('source');
 
 my @args       = (qw(--report-format query_report --limit 10));
 my $sample_in  = "$trunk/t/lib/samples/slowlogs";
@@ -115,9 +116,9 @@ ok(
 );
 
 SKIP: {
-   skip 'Cannot connect to sandbox master', 2 unless $dbh;
+   skip 'Cannot connect to sandbox source', 2 unless $dbh;
 
-   my $dsn = $sb->dsn_for('master');
+   my $dsn = $sb->dsn_for('source');
 
    # The result file is correct: it's the one that has all quries from
    # slow033.txt.
diff --git a/t/pt-query-digest/standard_options.t b/t/pt-query-digest/standard_options.t
index 7a3982e1f..18093ebfa 100644
--- a/t/pt-query-digest/standard_options.t
+++ b/t/pt-query-digest/standard_options.t
@@ -14,13 +14,14 @@ use Test::More;
 use PerconaTest;
 use Sandbox;
 use DSNParser;
+require VersionParser;
 
 my $dp = new DSNParser(opts=>$dsn_opts);
 my $sb = new Sandbox(basedir => '/tmp', DSNParser => $dp);
-my $dbh = $sb->get_dbh_for('master');
+my $dbh = $sb->get_dbh_for('source');
 
 if ( !$dbh ) {
-   plan skip_all => 'Cannot connect to sandbox master';
+   plan skip_all => 'Cannot connect to sandbox source';
 }
 else {
    plan tests => 2;
diff --git a/t/pt-show-grants/all_grants.t b/t/pt-show-grants/all_grants.t
index d986dffd3..67867dea1 100644
--- a/t/pt-show-grants/all_grants.t
+++ b/t/pt-show-grants/all_grants.t
@@ -16,13 +16,14 @@ use Sandbox;
 use SqlModes;
 
 require "$trunk/bin/pt-show-grants";
+require VersionParser;
 
 my $dp = new DSNParser(opts=>$dsn_opts);
 my $sb = new Sandbox(basedir => '/tmp', DSNParser => $dp);
-my $dbh = $sb->get_dbh_for('master');
+my $dbh = $sb->get_dbh_for('source');
 
 if ( !$dbh ) {
-   plan skip_all => 'Cannot connect to sandbox master';
+   plan skip_all => 'Cannot connect to sandbox source';
 }
 else {
    plan tests => 3;
@@ -51,6 +52,20 @@ $modes->restore_original_modes;
 $output = output(
    sub { pt_show_grants::main('-F', $cnf, qw(--only bob --no-header)); }
 );
+my $expected_84 = <<'END_OUTPUT_6';
+-- Grants for 'bob'@'%'
+CREATE USER IF NOT EXISTS `bob`@`%`;
+ALTER USER `bob`@`%` IDENTIFIED WITH 'caching_sha2_password' REQUIRE NONE PASSWORD EXPIRE DEFAULT ACCOUNT UNLOCK PASSWORD HISTORY DEFAULT PASSWORD REUSE INTERVAL DEFAULT PASSWORD REQUIRE CURRENT DEFAULT;
+GRANT USAGE ON *.* TO `bob`@`%`;
+-- Grants for 'bob'@'192.168.1.1'
+CREATE USER IF NOT EXISTS `bob`@`192.168.1.1`;
+ALTER USER `bob`@`192.168.1.1` IDENTIFIED WITH 'caching_sha2_password' REQUIRE NONE PASSWORD EXPIRE DEFAULT ACCOUNT UNLOCK PASSWORD HISTORY DEFAULT PASSWORD REUSE INTERVAL DEFAULT PASSWORD REQUIRE CURRENT DEFAULT;
+GRANT USAGE ON *.* TO `bob`@`192.168.1.1`;
+-- Grants for 'bob'@'localhost'
+CREATE USER IF NOT EXISTS `bob`@`localhost`;
+ALTER USER `bob`@`localhost` IDENTIFIED WITH 'caching_sha2_password' REQUIRE NONE PASSWORD EXPIRE DEFAULT ACCOUNT UNLOCK PASSWORD HISTORY DEFAULT PASSWORD REUSE INTERVAL DEFAULT PASSWORD REQUIRE CURRENT DEFAULT;
+GRANT USAGE ON *.* TO `bob`@`localhost`;
+END_OUTPUT_6
 
 my $expected_80 = <<'END_OUTPUT_0';
 -- Grants for 'bob'@'%'
@@ -91,7 +106,7 @@ GRANT USAGE ON *.* TO 'bob'@'192.168.1.1';
 GRANT USAGE ON *.* TO 'bob'@'localhost';
 END_OUTPUT_2
 
-my $expected =  $sandbox_version < '5.7' ? $expected_56 : $sandbox_version < '8.0' ? $expected_57 : $expected_80;
+my $expected =  $sandbox_version < '5.7' ? $expected_56 : $sandbox_version < '8.0' ? $expected_57 : $sandbox_version < '8.4' ? $expected_80 : $expected_84;
 
 is(
    $output,
@@ -103,6 +118,13 @@ $output = output(
    sub { pt_show_grants::main('-F', $cnf, qw(--only bob@192.168.1.1 --no-header)); }
 );
 
+$expected_84 = <<'END_OUTPUT_7';
+-- Grants for 'bob'@'192.168.1.1'
+CREATE USER IF NOT EXISTS `bob`@`192.168.1.1`;
+ALTER USER `bob`@`192.168.1.1` IDENTIFIED WITH 'caching_sha2_password' REQUIRE NONE PASSWORD EXPIRE DEFAULT ACCOUNT UNLOCK PASSWORD HISTORY DEFAULT PASSWORD REUSE INTERVAL DEFAULT PASSWORD REQUIRE CURRENT DEFAULT;
+GRANT USAGE ON *.* TO `bob`@`192.168.1.1`;
+END_OUTPUT_7
+
 $expected_80 = <<'END_OUTPUT_5';
 -- Grants for 'bob'@'192.168.1.1'
 CREATE USER IF NOT EXISTS `bob`@`192.168.1.1`;
@@ -122,7 +144,7 @@ $expected_56 = <<'END_OUTPUT_4';
 GRANT USAGE ON *.* TO 'bob'@'192.168.1.1';
 END_OUTPUT_4
 
-$expected = $sandbox_version < '5.7' ? $expected_56 : $sandbox_version < '8.0' ? $expected_57: $expected_80;
+$expected =  $sandbox_version < '5.7' ? $expected_56 : $sandbox_version < '8.0' ? $expected_57 : $sandbox_version < '8.4' ? $expected_80 : $expected_84;
 
 is(
    $output,
diff --git a/t/pt-show-grants/basics.t b/t/pt-show-grants/basics.t
index 9416c5b08..a355345d3 100644
--- a/t/pt-show-grants/basics.t
+++ b/t/pt-show-grants/basics.t
@@ -15,13 +15,14 @@ use PerconaTest;
 use Sandbox;
 use SqlModes;
 require "$trunk/bin/pt-show-grants";
+require VersionParser;
 
 my $dp = new DSNParser(opts=>$dsn_opts);
 my $sb = new Sandbox(basedir => '/tmp', DSNParser => $dp);
-my $dbh = $sb->get_dbh_for('master');
+my $dbh = $sb->get_dbh_for('source');
 
 if ( !$dbh ) {
-   plan skip_all => 'Cannot connect to sandbox master';
+   plan skip_all => 'Cannot connect to sandbox source';
 }
 
 $sb->wipe_clean($dbh);
@@ -94,17 +95,17 @@ like(
    $output,
    qr/\d\d:\d\d:\d\d\n\z/,
    'No output when all users skipped'
-);
+) or diag($output);
 # #############################################################################
 # pt-show-grant doesn't support column-level grants
 # https://bugs.launchpad.net/percona-toolkit/+bug/866075
 # #############################################################################
-$sb->load_file('master', 't/pt-show-grants/samples/column-grants.sql');
+$sb->load_file('source', 't/pt-show-grants/samples/column-grants.sql');
 diag(`/tmp/12345/use -u root -e "CREATE USER 'sally'\@'%'"`);
 diag(`/tmp/12345/use -u root -e "GRANT SELECT(DateCreated, PckPrice, PaymentStat, SANumber) ON test.t TO 'sally'\@'%'"`);
 diag(`/tmp/12345/use -u root -e "GRANT SELECT(city_id), INSERT(city) ON sakila.city TO 'sally'\@'%'"`);
 
-my $postfix = $sandbox_version >= '8.0' ? '-80' : $sandbox_version < '5.7' ? '' : '-57';
+my $postfix = $sandbox_version >= '8.4' ? '-84' : $sandbox_version >= '8.0' ? '-80' : $sandbox_version < '5.7' ? '' : '-57';
 
 # 11
 ok(
diff --git a/t/pt-show-grants/issue_445.t b/t/pt-show-grants/issue_445.t
index 6ce9a1f4f..989b7b661 100644
--- a/t/pt-show-grants/issue_445.t
+++ b/t/pt-show-grants/issue_445.t
@@ -15,13 +15,14 @@ use PerconaTest;
 use Sandbox;
 use SqlModes;
 require "$trunk/bin/pt-show-grants";
+require VersionParser;
 
 my $dp = new DSNParser(opts=>$dsn_opts);
 my $sb = new Sandbox(basedir => '/tmp', DSNParser => $dp);
-my $dbh = $sb->get_dbh_for('master');
+my $dbh = $sb->get_dbh_for('source');
 
 if ( !$dbh ) {
-   plan skip_all => 'Cannot connect to sandbox master';
+   plan skip_all => 'Cannot connect to sandbox source';
 }
 else {
    plan tests => 5;
diff --git a/t/pt-show-grants/pt-2190.t b/t/pt-show-grants/pt-2190.t
index 828c936d2..e6afef113 100644
--- a/t/pt-show-grants/pt-2190.t
+++ b/t/pt-show-grants/pt-2190.t
@@ -19,10 +19,10 @@ require "$trunk/bin/pt-show-grants";
 
 my $dp = new DSNParser(opts=>$dsn_opts);
 my $sb = new Sandbox(basedir => '/tmp', DSNParser => $dp);
-my $dbh = $sb->get_dbh_for('master');
+my $dbh = $sb->get_dbh_for('source');
 
 if ( !$dbh ) {
-   plan skip_all => 'Cannot connect to sandbox master';
+   plan skip_all => 'Cannot connect to sandbox source';
 }
 
 if ( VersionParser->new($dbh) lt '8.0.17') {
diff --git a/t/pt-show-grants/pt-2247.t b/t/pt-show-grants/pt-2247.t
index 7c93a0390..d88c7dced 100644
--- a/t/pt-show-grants/pt-2247.t
+++ b/t/pt-show-grants/pt-2247.t
@@ -19,10 +19,10 @@ require "$trunk/bin/pt-show-grants";
 
 my $dp = new DSNParser(opts=>$dsn_opts);
 my $sb = new Sandbox(basedir => '/tmp', DSNParser => $dp);
-my $dbh = $sb->get_dbh_for('master');
+my $dbh = $sb->get_dbh_for('source');
 
 if ( !$dbh ) {
-   plan skip_all => 'Cannot connect to sandbox master';
+   plan skip_all => 'Cannot connect to sandbox source';
 }
 
 if ( VersionParser->new($dbh)->flavor !~ m/maria/i ) {
diff --git a/t/pt-show-grants/samples/column-grants-84.txt b/t/pt-show-grants/samples/column-grants-84.txt
new file mode 100644
index 000000000..17889caf2
--- /dev/null
+++ b/t/pt-show-grants/samples/column-grants-84.txt
@@ -0,0 +1,6 @@
+-- Grants for 'sally'@'%'
+CREATE USER IF NOT EXISTS `sally`@`%`;
+ALTER USER `sally`@`%` IDENTIFIED WITH 'caching_sha2_password' REQUIRE NONE PASSWORD EXPIRE DEFAULT ACCOUNT UNLOCK PASSWORD HISTORY DEFAULT PASSWORD REUSE INTERVAL DEFAULT PASSWORD REQUIRE CURRENT DEFAULT;
+GRANT INSERT (`city`), SELECT (`city_id`) ON `sakila`.`city` TO `sally`@`%`;
+GRANT SELECT (`DateCreated`, `PaymentStat`, `PckPrice`, `SANumber`) ON `test`.`t` TO `sally`@`%`;
+GRANT USAGE ON *.* TO `sally`@`%`;
diff --git a/t/pt-show-grants/samples/column-grants-combined-84.txt b/t/pt-show-grants/samples/column-grants-combined-84.txt
new file mode 100644
index 000000000..195c5fc2a
--- /dev/null
+++ b/t/pt-show-grants/samples/column-grants-combined-84.txt
@@ -0,0 +1,6 @@
+-- Grants for 'sally'@'%'
+CREATE USER IF NOT EXISTS `sally`@`%`;
+ALTER USER `sally`@`%` IDENTIFIED WITH 'caching_sha2_password' REQUIRE NONE PASSWORD EXPIRE DEFAULT ACCOUNT UNLOCK PASSWORD HISTORY DEFAULT PASSWORD REUSE INTERVAL DEFAULT PASSWORD REQUIRE CURRENT DEFAULT;
+GRANT INSERT (`city`), SELECT, SELECT (`city_id`) ON `sakila`.`city` TO `sally`@`%`;
+GRANT SELECT (`DateCreated`, `PaymentStat`, `PckPrice`, `SANumber`) ON `test`.`t` TO `sally`@`%`;
+GRANT USAGE ON *.* TO `sally`@`%`;
diff --git a/t/pt-show-grants/samples/column-grants-separate-84.txt b/t/pt-show-grants/samples/column-grants-separate-84.txt
new file mode 100644
index 000000000..b43f91210
--- /dev/null
+++ b/t/pt-show-grants/samples/column-grants-separate-84.txt
@@ -0,0 +1,7 @@
+-- Grants for 'sally'@'%'
+CREATE USER IF NOT EXISTS `sally`@`%`;
+ALTER USER `sally`@`%` IDENTIFIED WITH 'caching_sha2_password' REQUIRE NONE PASSWORD EXPIRE DEFAULT ACCOUNT UNLOCK PASSWORD HISTORY DEFAULT PASSWORD REUSE INTERVAL DEFAULT PASSWORD REQUIRE CURRENT DEFAULT;
+GRANT INSERT (`city`) ON `sakila`.`city` TO `sally`@`%`;
+GRANT SELECT (`DateCreated`, `PaymentStat`, `PckPrice`, `SANumber`) ON `test`.`t` TO `sally`@`%`;
+GRANT SELECT (`city_id`) ON `sakila`.`city` TO `sally`@`%`;
+GRANT USAGE ON *.* TO `sally`@`%`;
diff --git a/t/pt-show-grants/samples/column-grants-separate-revoke-84.txt b/t/pt-show-grants/samples/column-grants-separate-revoke-84.txt
new file mode 100644
index 000000000..ed921862f
--- /dev/null
+++ b/t/pt-show-grants/samples/column-grants-separate-revoke-84.txt
@@ -0,0 +1,12 @@
+-- Revoke statements for 'sally'@'%'
+REVOKE INSERT (`city`) ON `sakila`.`city` FROM `sally`@`%`;
+REVOKE SELECT (`DateCreated`, `PaymentStat`, `PckPrice`, `SANumber`) ON `test`.`t` FROM `sally`@`%`;
+REVOKE SELECT (`city_id`) ON `sakila`.`city` FROM `sally`@`%`;
+REVOKE USAGE ON *.* FROM `sally`@`%`;
+-- Grants for 'sally'@'%'
+CREATE USER IF NOT EXISTS `sally`@`%`;
+ALTER USER `sally`@`%` IDENTIFIED WITH 'caching_sha2_password' REQUIRE NONE PASSWORD EXPIRE DEFAULT ACCOUNT UNLOCK PASSWORD HISTORY DEFAULT PASSWORD REUSE INTERVAL DEFAULT PASSWORD REQUIRE CURRENT DEFAULT;
+GRANT INSERT (`city`) ON `sakila`.`city` TO `sally`@`%`;
+GRANT SELECT (`DateCreated`, `PaymentStat`, `PckPrice`, `SANumber`) ON `test`.`t` TO `sally`@`%`;
+GRANT SELECT (`city_id`) ON `sakila`.`city` TO `sally`@`%`;
+GRANT USAGE ON *.* TO `sally`@`%`;
diff --git a/t/pt-slave-delay/auto_restart.t b/t/pt-slave-delay/auto_restart.t
index d89382522..e255e8b50 100644
--- a/t/pt-slave-delay/auto_restart.t
+++ b/t/pt-slave-delay/auto_restart.t
@@ -19,8 +19,8 @@ require "$trunk/bin/pt-slave-delay";
 
 my $dp  = DSNParser->new(opts => $dsn_opts);
 my $sb  = Sandbox->new(basedir => '/tmp', DSNParser => $dp);
-my $master_dbh = $sb->get_dbh_for('master');
-my $dbh        = $sb->get_dbh_for('slave1');
+my $source_dbh = $sb->get_dbh_for('source');
+my $dbh        = $sb->get_dbh_for('replica1');
 
 if ($sandbox_version ge '5.7') {
    plan skip_all => 'Use SQL_DELAY';
@@ -65,7 +65,7 @@ else {
    sleep 1;
    diag(`/tmp/12346/start >/dev/null`);
    # Ensure we don't break the sandbox -- instance 12347 will be disconnected
-   # when its master gets rebooted
+   # when its source gets rebooted
    diag(`/tmp/12347/use -e "stop slave; start slave"`);
    exit;
 }
@@ -112,7 +112,7 @@ waitpid ($pid, 0);
 # #############################################################################
 # 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;
diff --git a/t/pt-slave-delay/basics.t b/t/pt-slave-delay/basics.t
index 094291ff4..a968ff6d9 100644
--- a/t/pt-slave-delay/basics.t
+++ b/t/pt-slave-delay/basics.t
@@ -17,9 +17,9 @@ require "$trunk/bin/pt-slave-delay";
 
 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 $master_dbh = $sb->get_dbh_for('source');
+my $slave1_dbh  = $sb->get_dbh_for('replica1');
+my $slave2_dbh  = $sb->get_dbh_for('replica2');
 
 if ($sandbox_version ge '5.7') {
    plan skip_all => 'Use SQL_DELAY';
diff --git a/t/pt-slave-delay/issue_1169.t b/t/pt-slave-delay/issue_1169.t
index 108f8dcd8..d45827461 100644
--- a/t/pt-slave-delay/issue_1169.t
+++ b/t/pt-slave-delay/issue_1169.t
@@ -18,7 +18,7 @@ require "$trunk/bin/pt-slave-delay";
 
 my $dp  = DSNParser->new(opts => $dsn_opts);
 my $sb  = Sandbox->new(basedir => '/tmp', DSNParser => $dp);
-my $dbh = $sb->get_dbh_for('slave1');
+my $dbh = $sb->get_dbh_for('replica1');
 
 if ($sandbox_version ge '5.7') {
    plan skip_all => 'Use SQL_DELAY';
diff --git a/t/pt-slave-delay/standard_options.t b/t/pt-slave-delay/standard_options.t
index f63c1a41e..198674fdd 100644
--- a/t/pt-slave-delay/standard_options.t
+++ b/t/pt-slave-delay/standard_options.t
@@ -17,8 +17,8 @@ require "$trunk/bin/pt-slave-delay";
 
 my $dp = new DSNParser(opts=>$dsn_opts);
 my $sb = new Sandbox(basedir => '/tmp', DSNParser => $dp);
-my $master_dbh = $sb->get_dbh_for('master');
-my $slave_dbh  = $sb->get_dbh_for('slave1');
+my $master_dbh = $sb->get_dbh_for('source');
+my $slave_dbh  = $sb->get_dbh_for('replica1');
 
 if ($sandbox_version ge '5.7') {
    plan skip_all => 'Use SQL_DELAY';
diff --git a/t/pt-slave-find/pt-slave-find.t b/t/pt-slave-find/pt-slave-find.t
index e132f6834..0134cbe69 100644
--- a/t/pt-slave-find/pt-slave-find.t
+++ b/t/pt-slave-find/pt-slave-find.t
@@ -18,54 +18,54 @@ require "$trunk/bin/pt-slave-find";
 
 my $dp = new DSNParser(opts=>$dsn_opts);
 my $sb = new Sandbox(basedir => '/tmp', DSNParser => $dp);
-my $slave1_dbh = $sb->get_dbh_for('slave1');
-my $slave2_dbh = $sb->get_dbh_for('slave2');
+my $replica1_dbh = $sb->get_dbh_for('replica1');
+my $replica2_dbh = $sb->get_dbh_for('replica2');
 
-# This test is sensitive to ghost/old slaves created/destroyed by other
-# tests.  So we stop the slaves, restart the master, and start everything
+# This test is sensitive to ghost/old replicas created/destroyed by other
+# tests.  So we stop the replicas, restart the source, and start everything
 # again.  Hopefully this will return the env to its original state.
-$slave2_dbh->do("STOP SLAVE");
-$slave1_dbh->do("STOP SLAVE");
+$replica2_dbh->do("STOP ${replica_name}");
+$replica1_dbh->do("STOP ${replica_name}");
 diag(`/tmp/12345/stop >/dev/null`);
 diag(`/tmp/12345/start >/dev/null`);
-$slave1_dbh->do("START SLAVE");
-$slave2_dbh->do("START SLAVE");
+$replica1_dbh->do("START ${replica_name}");
+$replica2_dbh->do("START ${replica_name}");
 
-my $master_dbh = $sb->get_dbh_for('master');
+my $source_dbh = $sb->get_dbh_for('source');
 
-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 slave';
+elsif ( !$replica1_dbh ) {
+   plan skip_all => 'Cannot connect to sandbox replica';
 }
-elsif ( !$slave2_dbh ) {
-   plan skip_all => 'Cannot connect to second sandbox slave';
+elsif ( !$replica2_dbh ) {
+   plan skip_all => 'Cannot connect to second sandbox replica';
 }
 else {
    plan tests => 10;
 }
 
-my @args = ('h=127.0.0.1,P=12345,u=msandbox,p=msandbox');
+my @args = ('h=127.0.0.1,P=12345,u=msandbox,p=msandbox,s=1');
 
 my $output = `$trunk/bin/pt-slave-find --help`;
 like($output, qr/Prompt for a password/, 'It compiles');
 
 # Double check that we're setup correctly.
-my $row = $slave2_dbh->selectall_arrayref('SHOW SLAVE STATUS', {Slice => {}});
+my $row = $replica2_dbh->selectall_arrayref("SHOW ${replica_name} STATUS", {Slice => {}});
 is(
-   $row->[0]->{master_port},
+   $row->[0]->{source_port},
    '12346',
-   'slave2 is slave of slave1'
+   'replica2 is replica of replica1'
 );
 
-$output = `$trunk/bin/pt-slave-find -h 127.0.0.1 -P 12345 -u msandbox -p msandbox --report-format hostname`;
+$output = `$trunk/bin/pt-slave-find -h 127.0.0.1 -P 12345 -u msandbox -p msandbox s=1 --report-format hostname`;
 my $expected = <<EOF;
 127.0.0.1:12345
 +- 127.0.0.1:12346
    +- 127.0.0.1:12347
 EOF
-is($output, $expected, 'Master with slave and slave of slave');
+is($output, $expected, 'Source with replica and replica of replica');
 
 ###############################################################################
 # Test --resolve-hostname option (we don't know the hostname of the test
@@ -79,10 +79,10 @@ like (
 ) or diag($output);
 
 # #############################################################################
-# Until MasterSlave::find_slave_hosts() is improved to overcome the problems
-# with SHOW SLAVE HOSTS, this test won't work.
+# Until MasterSlave::find_replica_hosts() is improved to overcome the problems
+# with SHOW REPLICA HOSTS, this test won't work.
 # #############################################################################
-# Make slave2 slave of master.
+# Make replica2 replica of source.
 #diag(`../../mk-slave-move/mk-slave-move --sibling-of-master h=127.1,P=12347`);
 #$output = `perl ../mk-slave-find -h 127.0.0.1 -P 12345 -u msandbox -p msandbox`;
 #$expected = <<EOF;
@@ -90,7 +90,7 @@ like (
 #+- 127.0.0.1:12346
 #+- 127.0.0.1:12347
 #EOF
-#is($output, $expected, 'Master with two slaves');
+#is($output, $expected, 'Source with two replicas');
 
 # #########################################################################
 # Issue 391: Add --pid option to all scripts
@@ -108,7 +108,7 @@ like(
 # #############################################################################
 # Summary report format.
 # #############################################################################
-my $outfile = "/tmp/mk-slave-find-output.txt";
+my $outfile = "/tmp/mk-replica-find-output.txt";
 #diag(`rm -rf $outfile >/dev/null`);
 diag(`rm -rf $outfile`);
 
@@ -126,31 +126,32 @@ $result =~ s/Uptime.*/Uptime/g;
 $result =~ s/[0-9]* seconds/0 seconds/g;
 $result =~ s/Binary logging.*/Binary logging/g;
 $result =~ s/Replication     Is a slave, has 1 slaves connected, is.*/Replication     Is a slave, has 1 slaves connected, is/g;
+$result =~ s/Replication     Is a replica, has 1 replicas connected, is.*/Replication     Is a replica, has 1 replicas connected, is/g;
 
 my $innodb_re = qr/InnoDB version\s+(.*)/;
 my (@innodb_versions) = $result =~ /$innodb_re/g;
 $result =~ s/$innodb_re/InnoDB version  BUILTIN/g;
 
-my $master_version = VersionParser->new($master_dbh);
-my $slave_version  = VersionParser->new($slave1_dbh);
-my $slave2_version = VersionParser->new($slave2_dbh);
+my $source_version = VersionParser->new($source_dbh);
+my $replica_version  = VersionParser->new($replica1_dbh);
+my $replica2_version = VersionParser->new($replica2_dbh);
 
 is(
    $innodb_versions[0],
-   $master_version->innodb_version(),
-   "pt-slave-find gets the right InnoDB version for the master"
+   $source_version->innodb_version(),
+   "pt-slave-find gets the right InnoDB version for the source"
 );
 
 is(
    $innodb_versions[1],
-   $slave_version->innodb_version(),
-   "...and for the first slave"
-);
+   $replica_version->innodb_version(),
+   "...and for the first replica"
+) or diag($output);
 
 is(
    $innodb_versions[2],
-   $slave2_version->innodb_version(),
-   "...and for the first slave"
+   $replica2_version->innodb_version(),
+   "...and for the second replica"
 );
 
 ok(
diff --git a/t/pt-slave-restart/gtid.t b/t/pt-slave-restart/gtid.t
index ab1dfada0..fab66e03d 100644
--- a/t/pt-slave-restart/gtid.t
+++ b/t/pt-slave-restart/gtid.t
@@ -10,6 +10,7 @@ use strict;
 use warnings FATAL => 'all';
 use English qw(-no_match_vars);
 use Test::More;
+use Data::Dumper;
 
 use PerconaTest;
 use Sandbox;
@@ -25,25 +26,25 @@ diag("Sandbox restarted");
 
 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 ( !$slave2_dbh ) {
-   plan skip_all => 'Cannot connect to sandbox slave2';
+elsif ( !$replica2_dbh ) {
+   plan skip_all => 'Cannot connect to sandbox replica2';
 }
 
-my $slave1_dsn = $sb->dsn_for("slave1");
-my $slave2_dsn = $sb->dsn_for("slave2");
+my $replica1_dsn = $sb->dsn_for("replica1");
+my $replica2_dsn = $sb->dsn_for("replica2");
 
-my $pid_file = "/tmp/pt-slave-restart-test-$PID.pid";
-my $log_file = "/tmp/pt-slave-restart-test-$PID.log";
+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";
 
 sub start {
@@ -76,7 +77,7 @@ sub wait_repl_broke {
    my $dbh = shift;
    return wait_until(
       sub {
-         my $row = $dbh->selectrow_hashref('show slave status');
+         my $row = $dbh->selectrow_hashref("show ${replica_name} status");
          return $row->{last_sql_errno};
       }
    );
@@ -86,7 +87,7 @@ sub wait_repl_ok {
    my $dbh = shift;
    wait_until(
       sub {
-         my $row = $dbh->selectrow_hashref('show slave status');
+         my $row = $dbh->selectrow_hashref("show ${replica_name} status");
          return $row->{last_sql_errno} == 0;
       },
       0.30,
@@ -98,26 +99,26 @@ sub wait_repl_ok {
 # Basic test to see if restart works with GTID.
 # #############################################################################
 
-$master_dbh->do('DROP DATABASE IF EXISTS test');
-$master_dbh->do('CREATE DATABASE test');
-$master_dbh->do('CREATE TABLE test.t (a INT)');
-$sb->wait_for_slaves;
+$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
-$slave1_dbh->do('DROP TABLE test.t');
-$master_dbh->do('INSERT INTO test.t SELECT 1');
-wait_repl_broke($slave1_dbh) or die "Failed to break replication";
+$replica1_dbh->do('DROP TABLE test.t');
+$source_dbh->do('INSERT INTO test.t SELECT 1');
+wait_repl_broke($replica1_dbh) or die "Failed to break replication";
 
-my $r = $slave1_dbh->selectrow_hashref('show slave status');
-like($r->{last_error}, qr/Table 'test.t' doesn't exist'/, 'slave: Replication broke');
+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
 # (it should take < 1s but tests can be really slow sometimes).
-start("$slave1_dsn") or die "Failed to start pt-slave-restart";
-wait_repl_ok($slave1_dbh);
+start("$replica1_dsn") or die "Failed to start pt-slave-restart";
+wait_repl_ok($replica1_dbh);
 
 # Check if replication is fixed.
-$r = $slave1_dbh->selectrow_hashref('show slave status');
+$r = $replica1_dbh->selectrow_hashref("show ${replica_name} status");
 like(
    $r->{last_errno},
    qr/^0$/,
@@ -128,35 +129,35 @@ like(
 stop() or die "Failed to stop pt-slave-restart";
 
 # #############################################################################
-# Test the slave of the master.
+# Test the replica of the source.
 # #############################################################################
 
-$master_dbh->do('DROP DATABASE IF EXISTS test');
-$master_dbh->do('CREATE DATABASE test');
-$master_dbh->do('CREATE TABLE test.t (a INT)');
-$sb->wait_for_slaves;
+$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
-$slave2_dbh->do('DROP TABLE test.t');
-$master_dbh->do('INSERT INTO test.t SELECT 1');
-wait_repl_broke($slave2_dbh) or die "Failed to break replication";
+$replica2_dbh->do('DROP TABLE test.t');
+$source_dbh->do('INSERT INTO test.t SELECT 1');
+wait_repl_broke($replica2_dbh) or die "Failed to break replication";
 
-# fetch the master uuid, which is the machine we need to skip an event from
-$r = $master_dbh->selectrow_hashref('select @@GLOBAL.server_uuid as uuid');
+# fetch the source uuid, which is the machine we need to skip an event from
+$r = $source_dbh->selectrow_hashref('select @@GLOBAL.server_uuid as uuid');
 my $uuid = $r->{uuid};
 
-$r = $slave2_dbh->selectrow_hashref('show slave status');
-like($r->{last_error}, qr/Table 'test.t' doesn't exist'/, 'slaveofslave: Replication broke');
+$r = $replica2_dbh->selectrow_hashref("show ${replica_name} status");
+like($r->{last_error}, qr/Table 'test.t' doesn't exist'/, 'replicaofreplica: Replication broke');
 
 # Start an instance
-start("--master-uuid=$uuid $slave2_dsn") or die;
-wait_repl_ok($slave2_dbh);
+start("--source-uuid=$uuid $replica2_dsn") or die;
+wait_repl_ok($replica2_dbh);
 
-$r = $slave2_dbh->selectrow_hashref('show slave status');
+$r = $replica2_dbh->selectrow_hashref("show ${replica_name} status");
 like(
    $r->{last_errno},
    qr/^0$/,
-   'Skips event from master on slave2'
+   'Skips event from source on replica2'
 ) or BAIL_OUT("Replication is broken");
 
 stop() or die "Failed to stop pt-slave-restart";
@@ -165,29 +166,29 @@ stop() or die "Failed to stop pt-slave-restart";
 # Test skipping 2 events in a row.
 # #############################################################################
 
-$master_dbh->do('DROP DATABASE IF EXISTS test');
-$master_dbh->do('CREATE DATABASE test');
-$master_dbh->do('CREATE TABLE test.t (a INT)');
-$sb->wait_for_slaves;
+$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
-$slave2_dbh->do('DROP TABLE test.t');
-$master_dbh->do('INSERT INTO test.t SELECT 1');
-$master_dbh->do('INSERT INTO test.t SELECT 1');
-wait_repl_broke($slave2_dbh) or die "Failed to break replication";
+$replica2_dbh->do('DROP TABLE test.t');
+$source_dbh->do('INSERT INTO test.t SELECT 1');
+$source_dbh->do('INSERT INTO test.t SELECT 1');
+wait_repl_broke($replica2_dbh) or die "Failed to break replication";
 
-# fetch the master uuid, which is the machine we need to skip an event from
-$r = $master_dbh->selectrow_hashref('select @@GLOBAL.server_uuid as uuid');
+# fetch the source uuid, which is the machine we need to skip an event from
+$r = $source_dbh->selectrow_hashref('select @@GLOBAL.server_uuid as uuid');
 $uuid = $r->{uuid};
 
-$r = $slave2_dbh->selectrow_hashref('show slave status');
-like($r->{last_error}, qr/Table 'test.t' doesn't exist'/, 'slaveofslaveskip2: Replication broke');
+$r = $replica2_dbh->selectrow_hashref("show ${replica_name} status");
+like($r->{last_error}, qr/Table 'test.t' doesn't exist'/, 'replicaofreplicaskip2: Replication broke');
 
 # Start an instance
-start("--skip-count=2 --master-uuid=$uuid $slave2_dsn") or die;
-wait_repl_ok($slave2_dbh);
+start("--skip-count=2 --source-uuid=$uuid $replica2_dsn") or die;
+wait_repl_ok($replica2_dbh);
 
-$r = $slave2_dbh->selectrow_hashref('show slave status');
+$r = $replica2_dbh->selectrow_hashref("show ${replica_name} status");
 like(
    $r->{last_errno},
    qr/^0$/,
diff --git a/t/pt-slave-restart/gtid_parallelreplication.t b/t/pt-slave-restart/gtid_parallelreplication.t
index d04c7921f..4246238d4 100644
--- a/t/pt-slave-restart/gtid_parallelreplication.t
+++ b/t/pt-slave-restart/gtid_parallelreplication.t
@@ -27,18 +27,18 @@ diag(`REPLICATION_THREADS=2 GTID=ON_PERMISSIVE $trunk/sandbox/test-env start >/d
 
 my $dp = new DSNParser(opts=>$dsn_opts);
 my $sb = new Sandbox(basedir => '/tmp', DSNParser => $dp);
-my $master_dbh  = $sb->get_dbh_for('master');
-my $slave_dbh   = $sb->get_dbh_for('slave1');
-my $slave2_dbh  = $sb->get_dbh_for('slave2');
+my $source_dbh  = $sb->get_dbh_for('source');
+my $replica_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 ( !$slave_dbh ) {
-   plan skip_all => 'Cannot connect to sandbox slave1';
+elsif ( !$replica_dbh ) {
+   plan skip_all => 'Cannot connect to sandbox replica1';
 }
-elsif ( !$slave2_dbh ) {
-   plan skip_all => 'Cannot connect to sandbox slave2';
+elsif ( !$replica2_dbh ) {
+   plan skip_all => 'Cannot connect to sandbox replica2';
 }
 
 # #############################################################################
@@ -49,14 +49,14 @@ my $output=`$trunk/bin/pt-slave-restart --run-time=1s -h 127.0.0.1 -P 12346 -u m
 
 like(
    $output,
-   qr/Cannot skip transactions properly.*slave_parallel_workers/,
+   qr/Cannot skip transactions properly.*${replica_name}_parallel_workers/,
    "pt-slave-restart exits with multiple replication threads"
-);
+) or diag($output);
 
 # #############################################################################
 # Done.
 # #############################################################################
-diag(`rm -f /tmp/pt-slave-re*`);
+diag(`rm -f /tmp/pt-replica-re*`);
 
 diag(`$trunk/sandbox/test-env stop >/dev/null`);
 diag(`$trunk/sandbox/test-env start >/dev/null`);
diff --git a/t/pt-slave-restart/pt-slave-restart.t b/t/pt-slave-restart/pt-slave-restart.t
index 265ec6784..46b7a101e 100644
--- a/t/pt-slave-restart/pt-slave-restart.t
+++ b/t/pt-slave-restart/pt-slave-restart.t
@@ -21,46 +21,46 @@ diag("Sandbox restarted");
 
 my $dp = new DSNParser(opts=>$dsn_opts);
 my $sb = new Sandbox(basedir => '/tmp', DSNParser => $dp);
-my $master_dbh = $sb->get_dbh_for('master');
-my $slave_dbh  = $sb->get_dbh_for('slave1');
+my $source_dbh = $sb->get_dbh_for('source');
+my $replica_dbh  = $sb->get_dbh_for('replica1');
 
-if ( !$master_dbh ) {
-   plan skip_all => 'Cannot connect to sandbox master';
+if ( !$source_dbh ) {
+   plan skip_all => 'Cannot connect to sandbox source';
 }
-elsif ( !$slave_dbh ) {
-   plan skip_all => 'Cannot connect to sandbox slave';
+elsif ( !$replica_dbh ) {
+   plan skip_all => 'Cannot connect to sandbox replica';
 }
 
-$master_dbh->do('DROP DATABASE IF EXISTS test');
-$master_dbh->do('CREATE DATABASE test');
-$master_dbh->do('CREATE TABLE test.t (a INT)');
-$sb->wait_for_slaves;
+$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
-$slave_dbh->do('DROP TABLE test.t');
-$master_dbh->do('INSERT INTO test.t SELECT 1');
+$replica_dbh->do('DROP TABLE test.t');
+$source_dbh->do('INSERT INTO test.t SELECT 1');
 wait_until(
    sub {
-      my $row = $slave_dbh->selectrow_hashref('show slave status');
+      my $row = $replica_dbh->selectrow_hashref("show ${replica_name} status");
       return $row->{last_sql_errno};
    }
 );
 
-my $r = $slave_dbh->selectrow_hashref('show slave status');
+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-slave-restart --max-sleep 0.25 -h 127.0.0.1 -P 12346 -u msandbox -p msandbox --daemonize --pid /tmp/pt-slave-restart.pid --log /tmp/pt-slave-restart.log`);
+diag(`$trunk/bin/pt-slave-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-slave-restart \-\-max\-sleep ' | grep -v grep | grep -v pt-slave-restart.t`;
 like($output, qr/pt-slave-restart --max/, 'It lives');
 
 unlike($output, qr/Table 'test.t' doesn't exist'/, 'It is not busted');
 
-ok(-f '/tmp/pt-slave-restart.pid', 'PID file created');
-ok(-f '/tmp/pt-slave-restart.log', 'Log file created');
+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-slave-restart.pid`;
+$output = `cat /tmp/pt-replica-restart.pid`;
 chomp($output);
 is($output, $pid, 'PID file has correct PID');
 
@@ -69,28 +69,28 @@ sleep 1;
 $output = `ps -eaf | grep pt-slave-restart | grep -v grep`;
 unlike($output, qr/pt-slave-restart --max/, 'It is dead');
 
-diag(`rm -f /tmp/pt-slave-re*`);
-ok(! -f '/tmp/pt-slave-restart.pid', 'PID file removed');
+diag(`rm -f /tmp/pt-replica-re*`);
+ok(! -f '/tmp/pt-replica-restart.pid', 'PID file removed');
 
 # #############################################################################
 # Issue 118: pt-slave-restart --error-numbers option is broken
 # #############################################################################
-$output = `$trunk/bin/pt-slave-restart --stop --sentinel /tmp/pt-slave-restartup --error-numbers=1205,1317`;
-like($output, qr{Successfully created file /tmp/pt-slave-restartup}, '--error-numbers works (issue 118)');
+$output = `$trunk/bin/pt-slave-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-slave-re*`);
+diag(`rm -f /tmp/pt-replica-re*`);
 
 # #############################################################################
 # Issue 459: mk-slave-restart --error-text is broken
 # #############################################################################
-# Bust replication again.  At this point, the master has test.t but
-# the slave does not.
-$master_dbh->do('DROP TABLE IF EXISTS test.t');
-$master_dbh->do('CREATE TABLE test.t (a INT)');
+# 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;
-$slave_dbh->do('DROP TABLE test.t');
-$master_dbh->do('INSERT INTO test.t SELECT 1');
-$output = `/tmp/12346/use -e 'show slave status'`;
+$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'/,
@@ -140,7 +140,7 @@ is(
 # #############################################################################
 # Done.
 # #############################################################################
-diag(`rm -f /tmp/pt-slave-re*`);
+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;
diff --git a/t/pt-stalk/plugin.t b/t/pt-stalk/plugin.t
index 3971d15bf..4a4fdceb4 100644
--- a/t/pt-stalk/plugin.t
+++ b/t/pt-stalk/plugin.t
@@ -15,13 +15,14 @@ use Time::HiRes qw(sleep);
 use PerconaTest;
 use DSNParser;
 use Sandbox;
+require VersionParser;
 
 my $dp = new DSNParser(opts=>$dsn_opts);
 my $sb = new Sandbox(basedir => '/tmp', DSNParser => $dp);
-my $dbh = $sb->get_dbh_for('master');
+my $dbh = $sb->get_dbh_for('source');
 
 if ( !$dbh ) {
-   plan skip_all => 'Cannot connect to sandbox master';
+   plan skip_all => 'Cannot connect to sandbox source';
 }
 
 my $cnf      = "/tmp/12345/my.sandbox.cnf";
diff --git a/t/pt-stalk/pt-stalk-replication.t b/t/pt-stalk/pt-stalk-replication.t
index 5e65d1afe..7f65b863b 100644
--- a/t/pt-stalk/pt-stalk-replication.t
+++ b/t/pt-stalk/pt-stalk-replication.t
@@ -15,14 +15,15 @@ use Time::HiRes qw(sleep);
 
 use PerconaTest;
 use DSNParser;
+require VersionParser;
 use Sandbox;
 
 my $dp = new DSNParser(opts=>$dsn_opts);
 my $sb = new Sandbox(basedir => '/tmp', DSNParser => $dp);
-my $dbh = $sb->get_dbh_for('master');
+my $dbh = $sb->get_dbh_for('source');
 
 if ( !$dbh ) {
-   plan skip_all => 'Cannot connect to sandbox master';
+   plan skip_all => 'Cannot connect to sandbox source';
 }
 
 my $cnf      = "/tmp/12345/my.sandbox.cnf";
@@ -54,16 +55,16 @@ sub wait_n_cycles {
 }
 
 # ###########################################################################
-# Test that SHOW SLAVE STATUS outputs are captured
+# Test that SHOW REPLICA STATUS outputs are captured
 # ###########################################################################
 
 my $retval = system("$trunk/bin/pt-stalk --no-stalk --run-time 1 --dest $dest --prefix nostalk --pid $pid_file --iterations 1 -- --defaults-file=$cnf --socket=/tmp/12346/mysql_sandbox12346.sock >$log_file 2>&1");
-my $output = `cat $dest/nostalk-slave-status|grep Slave_IO_Running`;
+my $output = `cat $dest/nostalk-${replica_name}-status|grep -i ${replica_name}_IO_Running`;
 
 like(
    $output,
-   qr/Slave_IO_Running: Yes/,
-   "SHOW SLAVE STATUS outputs gathered."
+   qr/${replica_name}_IO_Running: Yes/i,
+   "SHOW REPLICA STATUS outputs gathered."
 );
 
 is(
diff --git a/t/pt-stalk/pt-stalk.t b/t/pt-stalk/pt-stalk.t
index 09b87b2fb..f1cb28a3f 100644
--- a/t/pt-stalk/pt-stalk.t
+++ b/t/pt-stalk/pt-stalk.t
@@ -16,13 +16,14 @@ use Time::HiRes qw(sleep);
 use PerconaTest;
 use DSNParser;
 use Sandbox;
+require VersionParser;
 
 my $dp = new DSNParser(opts=>$dsn_opts);
 my $sb = new Sandbox(basedir => '/tmp', DSNParser => $dp);
-my $dbh = $sb->get_dbh_for('master');
+my $dbh = $sb->get_dbh_for('source');
 
 if ( !$dbh ) {
-   plan skip_all => 'Cannot connect to sandbox master';
+   plan skip_all => 'Cannot connect to sandbox source';
 }
 
 my $cnf      = "/tmp/12345/my.sandbox.cnf";
@@ -719,15 +720,15 @@ cleanup();
 
 SKIP: {
 
-   skip "Only test on mysql 5.7" if ( $sandbox_version lt '5.7' );
+   skip "Only test on mysql 5.7+" if ( $sandbox_version lt '5.7' );
 
    sub start_thread {
       # this must run in a thread because we need to have an uncommitted transaction
       my ($dsn_opts) = @_;
       my $dp = new DSNParser(opts=>$dsn_opts);
       my $sb = new Sandbox(basedir => '/tmp', DSNParser => $dp);
-      my $dbh = $sb->get_dbh_for('master');
-      $sb->load_file('master', "t/pt-stalk/samples/issue-1642751.sql");
+      my $dbh = $sb->get_dbh_for('source');
+      $sb->load_file('source', "t/pt-stalk/samples/issue-1642751.sql");
    }
    my $thr = threads->create('start_thread', $dsn_opts);
    $thr->detach();
@@ -745,13 +746,13 @@ SKIP: {
    like(
       $output,
       qr/ STATE: ACTIVE/,
-      "MySQL 5.7 ACTIVE transactions"
+      "MySQL 5.7+ ACTIVE transactions"
    );
           
    like(
       $output,
       qr/ STATE: COMMITTED/,
-      "MySQL 5.7 COMMITTED transactions"
+      "MySQL 5.7+ COMMITTED transactions"
    );
    
    cleanup();
@@ -759,57 +760,57 @@ SKIP: {
 
 SKIP: {
 
-   skip "Only test on mysql 5.7" if ( $sandbox_version lt '5.7' );
+   skip "Only test on mysql 5.7+" if ( $sandbox_version lt '5.7' );
 
-   my ($master1_dbh, $master1_dsn) = $sb->start_sandbox(
-      server => 'chan_master1',
-      type   => 'master',
+   my ($source1_dbh, $source1_dsn) = $sb->start_sandbox(
+      server => 'chan_source1',
+      type   => 'source',
    );
-   my ($master2_dbh, $master2_dsn) = $sb->start_sandbox(
-      server => 'chan_master2',
-      type   => 'master',
+   my ($source2_dbh, $source2_dsn) = $sb->start_sandbox(
+      server => 'chan_source2',
+      type   => 'source',
    );
-   my ($slave1_dbh, $slave1_dsn) = $sb->start_sandbox(
-      server => 'chan_slave1',
-      type   => 'master',
+   my ($replica1_dbh, $replica1_dsn) = $sb->start_sandbox(
+      server => 'chan_replica1',
+      type   => 'source',
    );
-   my $slave1_port = $sb->port_for('chan_slave1');
+   my $replica1_port = $sb->port_for('chan_replica1');
    
-   $sb->load_file('chan_master1', "sandbox/gtid_on.sql", undef, no_wait => 1);
-   $sb->load_file('chan_master2', "sandbox/gtid_on.sql", undef, no_wait => 1);
-   $sb->load_file('chan_slave1', "sandbox/slave_channels_t.sql", undef, no_wait => 1);
+   $sb->load_file('chan_source1', "sandbox/gtid_on.sql", undef, no_wait => 1);
+   $sb->load_file('chan_source2', "sandbox/gtid_on.sql", undef, no_wait => 1);
+   $sb->load_file('chan_replica1', "sandbox/replica_channels.sql", undef, no_wait => 1);
 
-   my $slave_cnf = "/tmp/$slave1_port/my.sandbox.cnf";
-   my $cmd = "$trunk/bin/pt-stalk --no-stalk --iterations=1 --host=127.0.0.1 --port=$slave1_port --user=msandbox "
+   my $replica_cnf = "/tmp/$replica1_port/my.sandbox.cnf";
+   my $cmd = "$trunk/bin/pt-stalk --no-stalk --iterations=1 --host=127.0.0.1 --port=$replica1_port --user=msandbox "
            . "--password=msandbox --sleep 0 --run-time=10 --dest $dest --log $log_file --iterations=1  "
-           . "--run-time=2 --pid $pid_file --defaults-file=$slave_cnf >$log_file 2>&1";
+           . "--run-time=2 --pid $pid_file --defaults-file=$replica_cnf >$log_file 2>&1";
    diag ($cmd);
    system($cmd);
    sleep 5;
    PerconaTest::kill_program(pid_file => $pid_file);
    
-   $output = `cat $dest/*-slave-status 2>/dev/null`;
+   $output = `cat $dest/*-${replica_name}-status 2>/dev/null`;
    
    like(
       $output,
       qr/SERVICE_STATE: ON/,
-      "MySQL 5.7 SLAVE STATUS"
+      "MySQL 5.7+ REPLICA STATUS"
    ) or diag ($output);
-   $sb->stop_sandbox(qw(chan_master1 chan_master2 chan_slave1));
+   $sb->stop_sandbox(qw(chan_source1 chan_source2 chan_replica1));
 }
                                                                               
 SKIP: {
    skip "Only test on mysql 5.6" if ( $sandbox_version ne '5.6' );
 
-   my $slave1_port = $sb->port_for('slave1');
-   my $cmd = "$trunk/bin/pt-stalk --no-stalk --iterations=1 --host=127.0.0.1 --port=$slave1_port --user=msandbox "
+   my $replica1_port = $sb->port_for('replica1');
+   my $cmd = "$trunk/bin/pt-stalk --no-stalk --iterations=1 --host=127.0.0.1 --port=$replica1_port --user=msandbox "
            . "--password=msandbox --sleep 0 --run-time=10 --dest $dest --log $log_file --iterations=1  "
            . "--run-time=2  --pid $pid_file --defaults-file=$cnf >$log_file 2>&1";
    system($cmd);                                                                 
    sleep 5;                                                                      
    PerconaTest::kill_program(pid_file => $pid_file);                             
                                                                                  
-   $output = `cat $dest/*-slave-status 2>/dev/null`;                             
+   $output = `cat $dest/*-${replica_name}-status 2>/dev/null`;                             
                                                                                  
    like(                                                                     
       $output,                                                               
@@ -834,8 +835,8 @@ SKIP: {
       my ($dsn_opts) = @_;
       my $dp = new DSNParser(opts=>$dsn_opts);
       my $sb = new Sandbox(basedir => '/tmp', DSNParser => $dp);
-      my $dbh = $sb->get_dbh_for('master');
-      $sb->load_file('master', "t/pt-stalk/samples/issue-1642750.sql");
+      my $dbh = $sb->get_dbh_for('source');
+      $sb->load_file('source', "t/pt-stalk/samples/issue-1642750.sql");
    }
    my $thr = threads->create('start_thread_1642750', $dsn_opts);
    $thr->detach();
@@ -878,8 +879,8 @@ sub start_thread_pt_1897_1 {
    my ($dsn_opts) = @_;
    my $dp = new DSNParser(opts=>$dsn_opts);
    my $sb = new Sandbox(basedir => '/tmp', DSNParser => $dp);
-   my $dbh = $sb->get_dbh_for('master');
-   $sb->load_file('master', "t/pt-stalk/samples/PT-1897-1.sql");
+   my $dbh = $sb->get_dbh_for('source');
+   $sb->load_file('source', "t/pt-stalk/samples/PT-1897-1.sql");
 }
 my $thr1 = threads->create('start_thread_pt_1897_1', $dsn_opts);
 $thr1->detach();
@@ -892,8 +893,8 @@ sub start_thread_pt_1897_2 {
    my ($dsn_opts) = @_;
    my $dp = new DSNParser(opts=>$dsn_opts);
    my $sb = new Sandbox(basedir => '/tmp', DSNParser => $dp);
-   my $dbh = $sb->get_dbh_for('master');
-   $sb->load_file('master', "t/pt-stalk/samples/PT-1897-2.sql");
+   my $dbh = $sb->get_dbh_for('source');
+   $sb->load_file('source', "t/pt-stalk/samples/PT-1897-2.sql");
 }
 my $thr2 = threads->create('start_thread_pt_1897_2', $dsn_opts);
 $thr2->detach();

From d02355f89b584c483352a22f5e7fab0347a9fb69 Mon Sep 17 00:00:00 2001
From: Sveta Smirnova <sveta.smirnova@percona.com>
Date: Tue, 30 Jul 2024 18:35:36 +0300
Subject: [PATCH 09/31] PT-2340 - Support MySQL 8.4

- 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
---
 bin/pt-query-digest                           |  536 ++++---
 bin/pt-show-grants                            |    2 +-
 bin/pt-slave-delay                            |    2 +-
 bin/pt-slave-find                             |  554 ++++---
 bin/pt-slave-restart                          |  648 +++++----
 bin/pt-stalk                                  |   13 +-
 bin/pt-summary                                |    4 +-
 bin/pt-table-checksum                         | 1285 +++++++++--------
 lib/PerconaTest.pm                            |    2 +-
 t/pt-query-digest/bugs.t                      |    5 +-
 t/pt-query-digest/collect_and_report_cycles.t |    5 +-
 t/pt-query-digest/daemon.t                    |    5 +-
 t/pt-query-digest/explain.t                   |    7 +-
 t/pt-query-digest/explain_partitions.t        |    6 +-
 t/pt-query-digest/history.t                   |    7 +-
 t/pt-query-digest/issue_1186.t                |    5 +-
 t/pt-query-digest/issue_360.t                 |    5 +-
 t/pt-query-digest/processlist.t               |    5 +-
 t/pt-query-digest/pt-2264.t                   |    5 +-
 t/pt-query-digest/review.t                    |    9 +-
 t/pt-query-digest/run_time.t                  |    5 +-
 t/pt-query-digest/since_until.t               |    7 +-
 t/pt-query-digest/standard_options.t          |    5 +-
 t/pt-show-grants/all_grants.t                 |   30 +-
 t/pt-show-grants/basics.t                     |   11 +-
 t/pt-show-grants/issue_445.t                  |    5 +-
 t/pt-show-grants/pt-2190.t                    |    4 +-
 t/pt-show-grants/pt-2247.t                    |    4 +-
 t/pt-show-grants/samples/column-grants-84.txt |    6 +
 .../samples/column-grants-combined-84.txt     |    6 +
 .../samples/column-grants-separate-84.txt     |    7 +
 .../column-grants-separate-revoke-84.txt      |   12 +
 t/pt-slave-delay/auto_restart.t               |    8 +-
 t/pt-slave-delay/basics.t                     |    6 +-
 t/pt-slave-delay/issue_1169.t                 |    2 +-
 t/pt-slave-delay/standard_options.t           |    4 +-
 t/pt-slave-find/pt-slave-find.t               |   73 +-
 t/pt-slave-restart/gtid.t                     |  117 +-
 t/pt-slave-restart/gtid_parallelreplication.t |   24 +-
 t/pt-slave-restart/pt-slave-restart.t         |   62 +-
 t/pt-stalk/plugin.t                           |    5 +-
 t/pt-stalk/pt-stalk-replication.t             |   13 +-
 t/pt-stalk/pt-stalk.t                         |   73 +-
 t/pt-table-checksum/basics.t                  |  126 +-
 t/pt-table-checksum/bugs.t                    |   94 +-
 t/pt-table-checksum/char_chunking.t           |   22 +-
 t/pt-table-checksum/chunk_index.t             |   26 +-
 t/pt-table-checksum/chunk_size.t              |   32 +-
 t/pt-table-checksum/create_replicate_table.t  |   42 +-
 t/pt-table-checksum/error_handling.t          |   68 +-
 t/pt-table-checksum/filters.t                 |    8 +-
 t/pt-table-checksum/float_precision.t         |   14 +-
 t/pt-table-checksum/fnv_64.t                  |   24 +-
 t/pt-table-checksum/ignore_columns.t          |   24 +-
 t/pt-table-checksum/issue_1485195.t           |   10 +-
 t/pt-table-checksum/issue_1592608.t           |   10 +-
 t/pt-table-checksum/issue_1651002.t           |   54 +-
 t/pt-table-checksum/issue_388.t               |   10 +-
 t/pt-table-checksum/issue_47.t                |   18 +-
 t/pt-table-checksum/issue_602.t               |   10 +-
 t/pt-table-checksum/plugin.t                  |   26 +-
 t/pt-table-checksum/privs.t                   |   62 +-
 t/pt-table-checksum/progress.t                |   64 +-
 t/pt-table-checksum/pt-105.t                  |   10 +-
 t/pt-table-checksum/pt-1059.t                 |   10 +-
 t/pt-table-checksum/pt-131.t                  |   14 +-
 t/pt-table-checksum/pt-136.t                  |   12 +-
 t/pt-table-checksum/pt-1616.t                 |   14 +-
 t/pt-table-checksum/pt-1637.t                 |   42 +-
 t/pt-table-checksum/pt-1728.t                 |   20 +-
 t/pt-table-checksum/pt-173.t                  |   16 +-
 t/pt-table-checksum/pt-1766.t                 |   12 +-
 t/pt-table-checksum/pt-193.t                  |   10 +-
 t/pt-table-checksum/pt-204.t                  |   12 +-
 t/pt-table-checksum/pt-225.t                  |   18 +-
 t/pt-table-checksum/pt-226.t                  |   18 +-
 t/pt-table-checksum/pxc.t                     |  178 +--
 t/pt-table-checksum/replication_filters.t     |  165 ++-
 t/pt-table-checksum/resume.t                  |  108 +-
 t/pt-table-checksum/run_time.t                |   16 +-
 t/pt-table-checksum/samples/PT-173.sql        |    4 +-
 .../samples/checksum_tbl_truncated.sql        |    4 +-
 .../samples/default-results-8.4.txt           |   50 +
 t/pt-table-checksum/samples/issue_1651002.sql |    4 +-
 .../samples/plugins/all_hooks.pm              |    6 +
 .../samples/privs-bug-916168.sql              |    4 +-
 t/pt-table-checksum/samples/pt-1616.sql       |    4 +-
 t/pt-table-checksum/samples/pt-1637.sql       |    4 +-
 .../samples/repl-table-myisam.sql             |    4 +-
 .../samples/static-chunk-size-results-8.4.txt |   22 +
 t/pt-table-checksum/settings.t                |   14 +-
 t/pt-table-checksum/skip_innodb.t             |   20 +-
 t/pt-table-checksum/standard_options.t        |   12 +-
 t/pt-table-checksum/throttle.t                |   58 +-
 94 files changed, 2926 insertions(+), 2302 deletions(-)
 create mode 100644 t/pt-show-grants/samples/column-grants-84.txt
 create mode 100644 t/pt-show-grants/samples/column-grants-combined-84.txt
 create mode 100644 t/pt-show-grants/samples/column-grants-separate-84.txt
 create mode 100644 t/pt-show-grants/samples/column-grants-separate-revoke-84.txt
 create mode 100644 t/pt-table-checksum/samples/default-results-8.4.txt
 create mode 100644 t/pt-table-checksum/samples/static-chunk-size-results-8.4.txt

diff --git a/bin/pt-query-digest b/bin/pt-query-digest
index 9274c5e62..45a0b6d06 100755
--- a/bin/pt-query-digest
+++ b/bin/pt-query-digest
@@ -943,7 +943,7 @@ sub get_cxn_params {
       $dsn = 'DBI:mysql:' . ( $info->{D} || '' ) . ';'
          . join(';', map  { "$opts{$_}->{dsn}=$info->{$_}" }
                      grep { defined $info->{$_} }
-                     qw(F h P S A))
+                     qw(F h P S A s))
          . ';mysql_read_default_group=client'
          . ($info->{L} ? ';mysql_local_infile=1' : '');
    }
@@ -3812,7 +3812,7 @@ use constant {
    COM_BINLOG_DUMP         => '12',
    COM_TABLE_DUMP          => '13',
    COM_CONNECT_OUT         => '14',
-   COM_REGISTER_SLAVE      => '15',
+   COM_REGISTER_REPLICA    => '15',
    COM_STMT_PREPARE        => '16',
    COM_STMT_EXECUTE        => '17',
    COM_STMT_SEND_LONG_DATA => '18',
@@ -3846,7 +3846,7 @@ my %com_for = (
    '12' => 'COM_BINLOG_DUMP',
    '13' => 'COM_TABLE_DUMP',
    '14' => 'COM_CONNECT_OUT',
-   '15' => 'COM_REGISTER_SLAVE',
+   '15' => 'COM_REGISTER_REPLICA',
    '16' => 'COM_STMT_PREPARE',
    '17' => 'COM_STMT_EXECUTE',
    '18' => 'COM_STMT_SEND_LONG_DATA',
@@ -10553,7 +10553,7 @@ sub new {
    return bless $self, $class;
 }
 
-sub get_slaves {
+sub get_replicas {
    my ($self, %args) = @_;
    my @required_args = qw(make_cxn);
    foreach my $arg ( @required_args ) {
@@ -10561,11 +10561,11 @@ sub get_slaves {
    }
    my ($make_cxn) = @args{@required_args};
 
-   my $slaves  = [];
+   my $replicas  = [];
    my $dp      = $self->{DSNParser};
    my $methods = $self->_resolve_recursion_methods($args{dsn});
 
-   return $slaves unless @$methods;
+   return $replicas unless @$methods;
 
    if ( grep { m/processlist|hosts/i } @$methods ) {
       my @required_args = qw(dbh dsn);
@@ -10575,26 +10575,26 @@ sub get_slaves {
       my ($dbh, $dsn) = @args{@required_args};
       my $o = $self->{OptionParser};
 
-      $self->recurse_to_slaves(
-         {  dbh            => $dbh,
-            dsn            => $dsn,
-            slave_user     => $o->got('slave-user') ? $o->get('slave-user') : '',
-            slave_password => $o->got('slave-password') ? $o->get('slave-password') : '',
-            slaves         => $args{slaves},
+      $self->recurse_to_replicas(
+         {  dbh              => $dbh,
+            dsn              => $dsn,
+            replica_user     => $o->got('replica-user') ? $o->get('replica-user') : '',
+            replica_password => $o->got('replica-password') ? $o->get('replica-password') : '',
+            replicas         => $args{replicas},
             callback  => sub {
                my ( $dsn, $dbh, $level, $parent ) = @_;
                return unless $level;
-               PTDEBUG && _d('Found slave:', $dp->as_string($dsn));
-               my $slave_dsn = $dsn;
-               if ($o->got('slave-user')) {
-                  $slave_dsn->{u} = $o->get('slave-user');
-                  PTDEBUG && _d("Using slave user ".$o->get('slave-user')." on ".$slave_dsn->{h}.":".$slave_dsn->{P});
+               PTDEBUG && _d('Found replica:', $dp->as_string($dsn));
+               my $replica_dsn = $dsn;
+               if ($o->got('replica-user')) {
+                  $replica_dsn->{u} = $o->get('replica-user');
+                  PTDEBUG && _d("Using replica user ".$o->get('replica-user')." on ".$replica_dsn->{h}.":".$replica_dsn->{P});
                }
-               if ($o->got('slave-password')) {
-                  $slave_dsn->{p} = $o->get('slave-password');
-                  PTDEBUG && _d("Slave password set");
+               if ($o->got('replica-password')) {
+                  $replica_dsn->{p} = $o->get('replica-password');
+                  PTDEBUG && _d("Replica password set");
                }
-               push @$slaves, $make_cxn->(dsn => $slave_dsn, dbh => $dbh, parent => $parent);
+               push @$replicas, $make_cxn->(dsn => $replica_dsn, dbh => $dbh, parent => $parent);
                return;
             },
             wait_no_die => $args{'wait_no_die'},
@@ -10602,20 +10602,20 @@ sub get_slaves {
       );
    } elsif ( $methods->[0] =~ m/^dsn=/i ) {
       (my $dsn_table_dsn = join ",", @$methods) =~ s/^dsn=//i;
-      $slaves = $self->get_cxn_from_dsn_table(
+      $replicas = $self->get_cxn_from_dsn_table(
          %args,
          dsn_table_dsn => $dsn_table_dsn,
          wait_no_die => $args{'wait_no_die'},
       );
    }
    elsif ( $methods->[0] =~ m/none/i ) {
-      PTDEBUG && _d('Not getting to slaves');
+      PTDEBUG && _d('Not getting to replicas');
    }
    else {
       die "Unexpected recursion methods: @$methods";
    }
 
-   return $slaves;
+   return $replicas;
 }
 
 sub _resolve_recursion_methods {
@@ -10633,31 +10633,31 @@ sub _resolve_recursion_methods {
    }
 }
 
-sub recurse_to_slaves {
+sub recurse_to_replicas {
    my ( $self, $args, $level ) = @_;
    $level ||= 0;
    my $dp = $self->{DSNParser};
    my $recurse = $args->{recurse} || $self->{OptionParser}->get('recurse');
    my $dsn = $args->{dsn};
-   my $slave_user = $args->{slave_user} || '';
-   my $slave_password = $args->{slave_password} || '';
+   my $replica_user = $args->{replica_user} || '';
+   my $replica_password = $args->{replica_password} || '';
 
    my $methods = $self->_resolve_recursion_methods($dsn);
    PTDEBUG && _d('Recursion methods:', @$methods);
    if ( lc($methods->[0]) eq 'none' ) {
-      PTDEBUG && _d('Not recursing to slaves');
+      PTDEBUG && _d('Not recursing to replicas');
       return;
    }
 
-   my $slave_dsn = $dsn;
-   if ($slave_user) {
-      $slave_dsn->{u} = $slave_user;
-      PTDEBUG && _d("Using slave user $slave_user on "
-         . $slave_dsn->{h} . ":" . ( $slave_dsn->{P} ? $slave_dsn->{P} : ""));
+   my $replica_dsn = $dsn;
+   if ($replica_user) {
+      $replica_dsn->{u} = $replica_user;
+      PTDEBUG && _d("Using replica user $replica_user on "
+         . $replica_dsn->{h} . ":" . ( $replica_dsn->{P} ? $replica_dsn->{P} : ""));
    }
-   if ($slave_password) {
-      $slave_dsn->{p} = $slave_password;
-      PTDEBUG && _d("Slave password set");
+   if ($replica_password) {
+      $replica_dsn->{p} = $replica_password;
+      PTDEBUG && _d("Replica password set");
    }
 
    my $dbh = $args->{dbh};
@@ -10665,12 +10665,12 @@ sub recurse_to_slaves {
    my $get_dbh = sub {
          eval {
             $dbh = $dp->get_dbh(
-               $dp->get_cxn_params($slave_dsn), { AutoCommit => 1 }
+               $dp->get_cxn_params($replica_dsn), { AutoCommit => 1 }
             );
-            PTDEBUG && _d('Connected to', $dp->as_string($slave_dsn));
+            PTDEBUG && _d('Connected to', $dp->as_string($replica_dsn));
          };
          if ( $EVAL_ERROR ) {
-            print STDERR "Cannot connect to ", $dp->as_string($slave_dsn), ": ", $EVAL_ERROR, "\n"
+            print STDERR "Cannot connect to ", $dp->as_string($replica_dsn), ": ", $EVAL_ERROR, "\n"
                or die "Cannot print: $OS_ERROR";
             return;
          }
@@ -10678,10 +10678,10 @@ sub recurse_to_slaves {
 
    DBH: {
       if ( !defined $dbh ) {
-         foreach my $known_slave ( @{$args->{slaves}} ) {
-            if ($known_slave->{dsn}->{h} eq $slave_dsn->{h} and
-                $known_slave->{dsn}->{P} eq $slave_dsn->{P} ) {
-               $dbh = $known_slave->{dbh};
+         foreach my $known_replica ( @{$args->{replicas}} ) {
+            if ($known_replica->{dsn}->{h} eq $replica_dsn->{h} and
+                $known_replica->{dsn}->{P} eq $replica_dsn->{P} ) {
+               $dbh = $known_replica->{dbh};
                last DBH;
             }
          }
@@ -10699,7 +10699,7 @@ sub recurse_to_slaves {
 	   if ( $EVAL_ERROR ) {
 		   if ( $args->{wait_no_die} ) {
 			   print STDERR "Error getting server id: ", $EVAL_ERROR,
-               "\nRetrying query for server ", $slave_dsn->{h}, ":", $slave_dsn->{P}, "\n";
+               "\nRetrying query for server ", $replica_dsn->{h}, ":", $replica_dsn->{P}, "\n";
             sleep 1;
             $dbh->disconnect();
             $get_dbh->();
@@ -10709,12 +10709,12 @@ sub recurse_to_slaves {
       }
    } until (defined $id);
    PTDEBUG && _d('Working on server ID', $id);
-   my $master_thinks_i_am = $dsn->{server_id};
+   my $source_thinks_i_am = $dsn->{server_id};
    if ( !defined $id
-       || ( defined $master_thinks_i_am && $master_thinks_i_am != $id )
+       || ( defined $source_thinks_i_am && $source_thinks_i_am != $id )
        || $args->{server_ids_seen}->{$id}++
    ) {
-      PTDEBUG && _d('Server ID seen, or not what master said');
+      PTDEBUG && _d('Server ID seen, or not what source said');
       if ( $args->{skip_callback} ) {
          $args->{skip_callback}->($dsn, $dbh, $level, $args->{parent});
       }
@@ -10725,51 +10725,51 @@ sub recurse_to_slaves {
 
    if ( !defined $recurse || $level < $recurse ) {
 
-      my @slaves =
-         grep { !$_->{master_id} || $_->{master_id} == $id } # Only my slaves.
-         $self->find_slave_hosts($dp, $dbh, $dsn, $methods);
+      my @replicas =
+         grep { !$_->{source_id} || $_->{source_id} == $id } # Only my replicas.
+         $self->find_replica_hosts($dp, $dbh, $dsn, $methods);
 
-      foreach my $slave ( @slaves ) {
+      foreach my $replica ( @replicas ) {
          PTDEBUG && _d('Recursing from',
-            $dp->as_string($dsn), 'to', $dp->as_string($slave));
-         $self->recurse_to_slaves(
-            { %$args, dsn => $slave, dbh => undef, parent => $dsn, slave_user => $slave_user, $slave_password => $slave_password }, $level + 1 );
+            $dp->as_string($dsn), 'to', $dp->as_string($replica));
+         $self->recurse_to_replicas(
+            { %$args, dsn => $replica, dbh => undef, parent => $dsn, replica_user => $replica_user, $replica_password => $replica_password }, $level + 1 );
       }
    }
 }
 
-sub find_slave_hosts {
+sub find_replica_hosts {
    my ( $self, $dsn_parser, $dbh, $dsn, $methods ) = @_;
 
-   PTDEBUG && _d('Looking for slaves on', $dsn_parser->as_string($dsn),
+   PTDEBUG && _d('Looking for replicas on', $dsn_parser->as_string($dsn),
       'using methods', @$methods);
 
-   my @slaves;
+   my @replicas;
    METHOD:
    foreach my $method ( @$methods ) {
-      my $find_slaves = "_find_slaves_by_$method";
-      PTDEBUG && _d('Finding slaves with', $find_slaves);
-      @slaves = $self->$find_slaves($dsn_parser, $dbh, $dsn);
-      last METHOD if @slaves;
+      my $find_replicas = "_find_replicas_by_$method";
+      PTDEBUG && _d('Finding replicas with', $find_replicas);
+      @replicas = $self->$find_replicas($dsn_parser, $dbh, $dsn);
+      last METHOD if @replicas;
    }
 
-   PTDEBUG && _d('Found', scalar(@slaves), 'slaves');
-   return @slaves;
+   PTDEBUG && _d('Found', scalar(@replicas), 'replicas');
+   return @replicas;
 }
 
-sub _find_slaves_by_processlist {
+sub _find_replicas_by_processlist {
    my ( $self, $dsn_parser, $dbh, $dsn ) = @_;
-   my @connected_slaves = $self->get_connected_slaves($dbh);
-   my @slaves = $self->_process_slaves_list($dsn_parser, $dsn, \@connected_slaves);
-   return @slaves;
+   my @connected_replicas = $self->get_connected_replicas($dbh);
+   my @replicas = $self->_process_replicas_list($dsn_parser, $dsn, \@connected_replicas);
+   return @replicas;
 }
 
-sub _process_slaves_list {
-   my ($self, $dsn_parser, $dsn, $connected_slaves) = @_;
-   my @slaves = map  {
-      my $slave        = $dsn_parser->parse("h=$_", $dsn);
-      $slave->{source} = 'processlist';
-      $slave;
+sub _process_replicas_list {
+   my ($self, $dsn_parser, $dsn, $connected_replicas) = @_;
+   my @replicas = map  {
+      my $replica        = $dsn_parser->parse("h=$_", $dsn);
+      $replica->{source} = 'processlist';
+      $replica;
    }
    grep { $_ }
    map  {
@@ -10781,22 +10781,28 @@ sub _process_slaves_list {
           $host = '['.$host.']';
       }
       $host;
-   } @$connected_slaves;
+   } @$connected_replicas;
 
-   return @slaves;
+   return @replicas;
 }
 
-sub _find_slaves_by_hosts {
+sub _find_replicas_by_hosts {
    my ( $self, $dsn_parser, $dbh, $dsn ) = @_;
 
-   my @slaves;
-   my $sql = 'SHOW SLAVE HOSTS';
+   my @replicas;
+
+   my $vp = VersionParser->new($dbh);
+   my $sql = 'SHOW REPLICAS';
+   if ( $vp < '8.1' || $vp->flavor() =~ m/maria/ ) {
+      $sql = 'SHOW SLAVE HOSTS';
+   }
+   
    PTDEBUG && _d($dbh, $sql);
-   @slaves = @{$dbh->selectall_arrayref($sql, { Slice => {} })};
+   @replicas = @{$dbh->selectall_arrayref($sql, { Slice => {} })};
 
-   if ( @slaves ) {
-      PTDEBUG && _d('Found some SHOW SLAVE HOSTS info');
-      @slaves = map {
+   if ( @replicas ) {
+      PTDEBUG && _d('Found some SHOW REPLICAS info');
+      @replicas = map {
          my %hash;
          @hash{ map { lc $_ } keys %$_ } = values %$_;
          my $spec = "h=$hash{host},P=$hash{port}"
@@ -10804,16 +10810,16 @@ sub _find_slaves_by_hosts {
             . ( $hash{password} ? ",p=$hash{password}" : '');
          my $dsn           = $dsn_parser->parse($spec, $dsn);
          $dsn->{server_id} = $hash{server_id};
-         $dsn->{master_id} = $hash{master_id};
+         $dsn->{source_id} = $hash{source_id};
          $dsn->{source}    = 'hosts';
          $dsn;
-      } @slaves;
+      } @replicas;
    }
 
-   return @slaves;
+   return @replicas;
 }
 
-sub get_connected_slaves {
+sub get_connected_replicas {
    my ( $self, $dbh ) = @_;
 
    my $show = "SHOW GRANTS FOR ";
@@ -10859,79 +10865,103 @@ sub get_connected_slaves {
    @{$dbh->selectall_arrayref($sql, { Slice => {} })};
 }
 
-sub is_master_of {
-   my ( $self, $master, $slave ) = @_;
-   my $master_status = $self->get_master_status($master)
-      or die "The server specified as a master is not a master";
-   my $slave_status  = $self->get_slave_status($slave)
-      or die "The server specified as a slave is not a slave";
-   my @connected     = $self->get_connected_slaves($master)
-      or die "The server specified as a master has no connected slaves";
-   my (undef, $port) = $master->selectrow_array("SHOW VARIABLES LIKE 'port'");
+sub is_source_of {
+   my ( $self, $source, $replica ) = @_;
+
+   my $replica_version = VersionParser->new($replica);
+   my $source_name = 'source';
+   my $source_port = 'source_port';
+   if ( $replica_version < '8.1' || $replica_version->flavor() =~ m/maria/ ) {
+      $source_name = 'master';
+      $source_port = 'master_port';
+   }
+
+   my $source_status = $self->get_source_status($source)
+      or die "The server specified as a source is not a source";
+   my $replica_status  = $self->get_replica_status($replica)
+      or die "The server specified as a replica is not a replica";
+   my @connected     = $self->get_connected_replicas($source)
+      or die "The server specified as a source has no connected replicas";
+   my (undef, $port) = $source->selectrow_array("SHOW VARIABLES LIKE 'port'");
 
-   if ( $port != $slave_status->{master_port} ) {
-      die "The slave is connected to $slave_status->{master_port} "
-         . "but the master's port is $port";
+   if ( $port != $replica_status->{$source_port} ) {
+      die "The replica is connected to $replica_status->{$source_port} "
+         . "but the source's port is $port";
    }
 
-   if ( !grep { $slave_status->{master_user} eq $_->{user} } @connected ) {
-      die "I don't see any slave I/O thread connected with user "
-         . $slave_status->{master_user};
+   if ( !grep { $replica_status->{source_user} eq $_->{user} } @connected ) {
+      die "I don't see any replica I/O thread connected with user "
+         . $replica_status->{source_user};
    }
 
-   if ( ($slave_status->{slave_io_state} || '')
-      eq 'Waiting for master to send event' )
+   if ( ($replica_status->{replica_io_state} || '')
+      eq 'Waiting for ${source_name} to send event' )
    {
-      my ( $master_log_name, $master_log_num )
-         = $master_status->{file} =~ m/^(.*?)\.0*([1-9][0-9]*)$/;
-      my ( $slave_log_name, $slave_log_num )
-         = $slave_status->{master_log_file} =~ m/^(.*?)\.0*([1-9][0-9]*)$/;
-      if ( $master_log_name ne $slave_log_name
-         || abs($master_log_num - $slave_log_num) > 1 )
+      my ( $source_log_name, $source_log_num )
+         = $source_status->{file} =~ m/^(.*?)\.0*([1-9][0-9]*)$/;
+      my ( $replica_log_name, $replica_log_num )
+         = $replica_status->{source_log_file} =~ m/^(.*?)\.0*([1-9][0-9]*)$/;
+      if ( $source_log_name ne $replica_log_name
+         || abs($source_log_num - $replica_log_num) > 1 )
       {
-         die "The slave thinks it is reading from "
-            . "$slave_status->{master_log_file},  but the "
-            . "master is writing to $master_status->{file}";
+         die "The replica thinks it is reading from "
+            . "$replica_status->{source_log_file},  but the "
+            . "source is writing to $source_status->{file}";
       }
    }
    return 1;
 }
 
-sub get_master_dsn {
+sub get_source_dsn {
    my ( $self, $dbh, $dsn, $dsn_parser ) = @_;
-   my $master = $self->get_slave_status($dbh) or return undef;
-   my $spec   = "h=$master->{master_host},P=$master->{master_port}";
+
+   my $vp = VersionParser->new($dbh);
+   my $source_host = 'source_host';
+   my $source_port = 'source_port';
+   if ( $vp < '8.1' || $vp->flavor() =~ m/maria/ ) {
+      $source_host = 'master_host';
+      $source_port = 'master_port';
+   }
+
+   my $source = $self->get_replica_status($dbh) or return undef;
+   my $spec   = "h=$source->{${source_host}},P=$source->{${source_port}}";
    return       $dsn_parser->parse($spec, $dsn);
 }
 
-sub get_slave_status {
+sub get_replica_status {
    my ( $self, $dbh ) = @_;
 
-   if ( !$self->{not_a_slave}->{$dbh} ) {
-      my $sth = $self->{sths}->{$dbh}->{SLAVE_STATUS}
-            ||= $dbh->prepare('SHOW SLAVE STATUS');
-      PTDEBUG && _d($dbh, 'SHOW SLAVE STATUS');
+   my $server_version = VersionParser->new($dbh);
+   my $replica_name = 'replica';
+   if ( $server_version < '8.1' || $server_version->flavor() =~ m/maria/ ) {
+      $replica_name = 'slave';
+   }
+
+   if ( !$self->{not_a_replica}->{$dbh} ) {
+      my $sth = $self->{sths}->{$dbh}->{REPLICA_STATUS}
+            ||= $dbh->prepare("SHOW ${replica_name} STATUS");
+      PTDEBUG && _d($dbh, "SHOW ${replica_name} STATUS");
       $sth->execute();
-      my ($sss_rows) = $sth->fetchall_arrayref({}); # Show Slave Status rows
+      my ($sss_rows) = $sth->fetchall_arrayref({}); # Show Replica Status rows
 
       my $ss;
       if ( $sss_rows && @$sss_rows ) {
           if (scalar @$sss_rows > 1) {
               if (!$self->{channel}) {
-                  die 'This server returned more than one row for SHOW SLAVE STATUS but "channel" was not specified on the command line';
+                  die 'This server returned more than one row for SHOW REPLICA STATUS but "channel" was not specified on the command line';
               }
-              my $slave_use_channels;
+              my $replica_use_channels;
               for my $row (@$sss_rows) {
                   $row = { map { lc($_) => $row->{$_} } keys %$row }; # lowercase the keys
                   if ($row->{channel_name}) {
-                      $slave_use_channels = 1;
+                      $replica_use_channels = 1;
                   }
                   if ($row->{channel_name} eq $self->{channel}) {
                       $ss = $row;
                       last;
                   }
               }
-              if (!$ss && $slave_use_channels) {
+              if (!$ss && $replica_use_channels) {
                  die 'This server is using replication channels but "channel" was not specified on the command line';
               }
           } else {
@@ -10951,28 +10981,34 @@ sub get_slave_status {
           }
       }
 
-      PTDEBUG && _d('This server returns nothing for SHOW SLAVE STATUS');
-      $self->{not_a_slave}->{$dbh}++;
+      PTDEBUG && _d('This server returns nothing for SHOW REPLICA STATUS');
+      $self->{not_a_replica}->{$dbh}++;
   }
 }
 
-sub get_master_status {
+sub get_source_status {
    my ( $self, $dbh ) = @_;
 
-   if ( $self->{not_a_master}->{$dbh} ) {
-      PTDEBUG && _d('Server on dbh', $dbh, 'is not a master');
+   if ( $self->{not_a_source}->{$dbh} ) {
+      PTDEBUG && _d('Server on dbh', $dbh, 'is not a source');
       return;
    }
 
+   my $vp = VersionParser->new($dbh);
+   my $source_name = 'binary log';
+   if ( $vp < '8.1' || $vp->flavor() =~ m/maria/ ) {
+      $source_name = 'master';
+   }
+
    my $sth;
    if ( $self->{sths}->{$dbh} && $dbh && $self->{sths}->{$dbh} == $dbh ) {
-      $sth = $self->{sths}->{$dbh}->{MASTER_STATUS}
-         ||= $dbh->prepare('SHOW MASTER STATUS');
+      $sth = $self->{sths}->{$dbh}->{SOURCE_STATUS}
+         ||= $dbh->prepare("SHOW ${source_name} STATUS");
    }
    else {
-      $sth = $dbh->prepare('SHOW MASTER STATUS');
+      $sth = $dbh->prepare("SHOW ${source_name} STATUS");
    }
-   PTDEBUG && _d($dbh, 'SHOW MASTER STATUS');
+   PTDEBUG && _d($dbh, "SHOW ${source_name} STATUS");
    $sth->execute();
    my ($ms) = @{$sth->fetchall_arrayref({})};
    PTDEBUG && _d(
@@ -10980,42 +11016,46 @@ sub get_master_status {
           : '');
 
    if ( !$ms || scalar keys %$ms < 2 ) {
-      PTDEBUG && _d('Server on dbh', $dbh, 'does not seem to be a master');
-      $self->{not_a_master}->{$dbh}++;
+      PTDEBUG && _d('Server on dbh', $dbh, 'does not seem to be a source');
+      $self->{not_a_source}->{$dbh}++;
    }
 
   return { map { lc($_) => $ms->{$_} } keys %$ms }; # lowercase the keys
 }
 
-sub wait_for_master {
+sub wait_for_source {
    my ( $self, %args ) = @_;
-   my @required_args = qw(master_status slave_dbh);
+   my @required_args = qw(source_status replica_dbh);
    foreach my $arg ( @required_args ) {
       die "I need a $arg argument" unless $args{$arg};
    }
-   my ($master_status, $slave_dbh) = @args{@required_args};
+   my ($source_status, $replica_dbh) = @args{@required_args};
    my $timeout       = $args{timeout} || 60;
 
    my $result;
    my $waited;
-   if ( $master_status ) {
-      my $slave_status;
+   if ( $source_status ) {
+      my $replica_status;
       eval {
-          $slave_status = $self->get_slave_status($slave_dbh);
+          $replica_status = $self->get_replica_status($replica_dbh);
       };
       if ($EVAL_ERROR) {
           return {
               result => undef,
               waited => 0,
-              error  =>'Wait for master: this is a multi-master slave but "channel" was not specified on the command line',
+              error  =>'Wait for source: this is a multi-source replica but "channel" was not specified on the command line',
           };
       }
-      my $server_version = VersionParser->new($slave_dbh);
-      my $channel_sql = $server_version > '5.6' && $self->{channel} ? ", '$self->{channel}'" : '';
-      my $sql = "SELECT MASTER_POS_WAIT('$master_status->{file}', $master_status->{position}, $timeout $channel_sql)";
-      PTDEBUG && _d($slave_dbh, $sql);
+      my $vp = VersionParser->new($replica_dbh);
+      my $source_name = 'source';
+      if ( $vp < '8.1' || $vp->flavor() =~ m/maria/ ) {
+         $source_name = 'master';
+      }
+      my $channel_sql = $vp > '5.6' && $self->{channel} ? ", '$self->{channel}'" : '';
+      my $sql = "SELECT ${source_name}_POS_WAIT('$source_status->{file}', $source_status->{position}, $timeout $channel_sql)";
+      PTDEBUG && _d($replica_dbh, $sql);
       my $start = time;
-      ($result) = $slave_dbh->selectrow_array($sql);
+      ($result) = $replica_dbh->selectrow_array($sql);
 
       $waited = time - $start;
 
@@ -11023,7 +11063,7 @@ sub wait_for_master {
       PTDEBUG && _d("Waited", $waited, "seconds");
    }
    else {
-      PTDEBUG && _d('Not waiting: this server is not a master');
+      PTDEBUG && _d('Not waiting: this server is not a source');
    }
 
    return {
@@ -11032,75 +11072,96 @@ sub wait_for_master {
    };
 }
 
-sub stop_slave {
+sub stop_replica {
    my ( $self, $dbh ) = @_;
-   my $sth = $self->{sths}->{$dbh}->{STOP_SLAVE}
-         ||= $dbh->prepare('STOP SLAVE');
+   my $vp = VersionParser->new($dbh);
+   my $replica_name = 'replica';
+   if ( $vp < '8.1' || $vp->flavor() =~ m/maria/ ) {
+      $replica_name = 'slave';
+   }
+   my $sth = $self->{sths}->{$dbh}->{STOP_REPLICA}
+         ||= $dbh->prepare("STOP ${replica_name}");
    PTDEBUG && _d($dbh, $sth->{Statement});
    $sth->execute();
 }
 
-sub start_slave {
+sub start_replica {
    my ( $self, $dbh, $pos ) = @_;
+
+   my $vp = VersionParser->new($dbh);
+   my $source_name = 'source';
+   my $replica_name = 'replica';
+   if ( $vp < '8.1' || $vp->flavor() =~ m/maria/ ) {
+      $source_name = 'master';
+      $replica_name = 'slave';
+   }
+
    if ( $pos ) {
-      my $sql = "START SLAVE UNTIL MASTER_LOG_FILE='$pos->{file}', "
-              . "MASTER_LOG_POS=$pos->{position}";
+      my $sql = "START ${replica_name} UNTIL ${source_name}_LOG_FILE='$pos->{file}', "
+              . "${source_name}_LOG_POS=$pos->{position}";
       PTDEBUG && _d($dbh, $sql);
       $dbh->do($sql);
    }
    else {
-      my $sth = $self->{sths}->{$dbh}->{START_SLAVE}
-            ||= $dbh->prepare('START SLAVE');
+      my $sth = $self->{sths}->{$dbh}->{START_REPLICA}
+            ||= $dbh->prepare("START ${replica_name}");
       PTDEBUG && _d($dbh, $sth->{Statement});
       $sth->execute();
    }
 }
 
-sub catchup_to_master {
-   my ( $self, $slave, $master, $timeout ) = @_;
-   $self->stop_slave($master);
-   $self->stop_slave($slave);
-   my $slave_status  = $self->get_slave_status($slave);
-   my $slave_pos     = $self->repl_posn($slave_status);
-   my $master_status = $self->get_master_status($master);
-   my $master_pos    = $self->repl_posn($master_status);
-   PTDEBUG && _d('Master position:', $self->pos_to_string($master_pos),
-      'Slave position:', $self->pos_to_string($slave_pos));
+sub catchup_to_source {
+   my ( $self, $replica, $source, $timeout ) = @_;
+   $self->stop_replica($source);
+   $self->stop_replica($replica);
+   my $replica_status  = $self->get_replica_status($replica);
+   my $replica_pos     = $self->repl_posn($replica_status);
+   my $source_status = $self->get_source_status($source);
+   my $source_pos    = $self->repl_posn($source_status);
+   PTDEBUG && _d('Source position:', $self->pos_to_string($source_pos),
+      'Replica position:', $self->pos_to_string($replica_pos));
 
    my $result;
-   if ( $self->pos_cmp($slave_pos, $master_pos) < 0 ) {
-      PTDEBUG && _d('Waiting for slave to catch up to master');
-      $self->start_slave($slave, $master_pos);
+   if ( $self->pos_cmp($replica_pos, $source_pos) < 0 ) {
+      PTDEBUG && _d('Waiting for replica to catch up to source');
+      $self->start_replica($replica, $source_pos);
 
-      $result = $self->wait_for_master(
-            master_status => $master_status,
-            slave_dbh     => $slave,
+      $result = $self->wait_for_source(
+            source_status => $source_status,
+            replica_dbh   => $replica,
             timeout       => $timeout,
-            master_status => $master_status
+            source_status => $source_status
       );
       if ($result->{error}) {
           die $result->{error};
       }
       if ( !defined $result->{result} ) {
-         $slave_status = $self->get_slave_status($slave);
-         if ( !$self->slave_is_running($slave_status) ) {
-            PTDEBUG && _d('Master position:',
-               $self->pos_to_string($master_pos),
-               'Slave position:', $self->pos_to_string($slave_pos));
-            $slave_pos = $self->repl_posn($slave_status);
-            if ( $self->pos_cmp($slave_pos, $master_pos) != 0 ) {
-               die "MASTER_POS_WAIT() returned NULL but slave has not "
-                  . "caught up to master";
+         $replica_status = $self->get_replica_status($replica);
+            
+         my $vp = VersionParser->new($replica);
+         my $replica_name = 'replica';
+         if ( $vp < '8.1' || $vp->flavor() =~ m/maria/ ) {
+            $replica_name = 'slave';
+         }
+
+         if ( !$self->replica_is_running($replica_status, $replica_name) ) {
+            PTDEBUG && _d('Source position:',
+               $self->pos_to_string($source_pos),
+               'Replica position:', $self->pos_to_string($replica_pos));
+            $replica_pos = $self->repl_posn($replica_status);
+            if ( $self->pos_cmp($replica_pos, $source_pos) != 0 ) {
+               die "SOURCE_POS_WAIT() returned NULL but replica has not "
+                  . "caught up to source";
             }
-            PTDEBUG && _d('Slave is caught up to master and stopped');
+            PTDEBUG && _d('Replica is caught up to source and stopped');
          }
          else {
-            die "Slave has not caught up to master and it is still running";
+            die "Replica has not caught up to source and it is still running";
          }
       }
    }
    else {
-      PTDEBUG && _d("Slave is already caught up to master");
+      PTDEBUG && _d("Replica is already caught up to source");
    }
 
    return $result;
@@ -11108,26 +11169,38 @@ sub catchup_to_master {
 
 sub catchup_to_same_pos {
    my ( $self, $s1_dbh, $s2_dbh ) = @_;
-   $self->stop_slave($s1_dbh);
-   $self->stop_slave($s2_dbh);
-   my $s1_status = $self->get_slave_status($s1_dbh);
-   my $s2_status = $self->get_slave_status($s2_dbh);
+   $self->stop_replica($s1_dbh);
+   $self->stop_replica($s2_dbh);
+   my $s1_status = $self->get_replica_status($s1_dbh);
+   my $s2_status = $self->get_replica_status($s2_dbh);
    my $s1_pos    = $self->repl_posn($s1_status);
    my $s2_pos    = $self->repl_posn($s2_status);
    if ( $self->pos_cmp($s1_pos, $s2_pos) < 0 ) {
-      $self->start_slave($s1_dbh, $s2_pos);
+      $self->start_replica($s1_dbh, $s2_pos);
    }
    elsif ( $self->pos_cmp($s2_pos, $s1_pos) < 0 ) {
-      $self->start_slave($s2_dbh, $s1_pos);
+      $self->start_replica($s2_dbh, $s1_pos);
    }
 
-   $s1_status = $self->get_slave_status($s1_dbh);
-   $s2_status = $self->get_slave_status($s2_dbh);
+   $s1_status = $self->get_replica_status($s1_dbh);
+   $s2_status = $self->get_replica_status($s2_dbh);
    $s1_pos    = $self->repl_posn($s1_status);
    $s2_pos    = $self->repl_posn($s2_status);
 
-   if ( $self->slave_is_running($s1_status)
-     || $self->slave_is_running($s2_status)
+   my $vp1 = VersionParser->new($s1_dbh);
+   my $replica1_name = 'replica';
+   if ( $vp1 < '8.1' || $vp1->flavor() =~ m/maria/ ) {
+      $replica1_name = 'slave';
+   }
+
+   my $vp2 = VersionParser->new($s2_dbh);
+   my $replica2_name = 'replica';
+   if ( $vp2 < '8.1' || $vp2->flavor() =~ m/maria/ ) {
+      $replica2_name = 'slave';
+   }
+
+   if ( $self->replica_is_running($s1_status, $replica1_name)
+     || $self->replica_is_running($s2_status, $replica2_name)
      || $self->pos_cmp($s1_pos, $s2_pos) != 0)
    {
       die "The servers aren't both stopped at the same position";
@@ -11135,14 +11208,21 @@ sub catchup_to_same_pos {
 
 }
 
-sub slave_is_running {
-   my ( $self, $slave_status ) = @_;
-   return ($slave_status->{slave_sql_running} || 'No') eq 'Yes';
+sub replica_is_running {
+   my ( $self, $replica_status, $replica_name ) = @_;
+   return ($replica_status->{"${replica_name}_sql_running"} || 'No') eq 'Yes';
 }
 
-sub has_slave_updates {
+sub has_replica_updates {
    my ( $self, $dbh ) = @_;
-   my $sql = q{SHOW VARIABLES LIKE 'log_slave_updates'};
+   
+   my $vp = VersionParser->new($dbh);
+   my $replica_name = 'replica';
+   if ( $vp < '8.1' || $vp->flavor() =~ m/maria/ ) {
+      $replica_name = 'slave';
+   }
+
+   my $sql = qq{SHOW VARIABLES LIKE 'log_${replica_name}_updates'};
    PTDEBUG && _d($dbh, $sql);
    my ($name, $value) = $dbh->selectrow_array($sql);
    return $value && $value =~ m/^(1|ON)$/;
@@ -11156,6 +11236,12 @@ sub repl_posn {
          position => $status->{position},
       };
    }
+   elsif ( exists $status->{relay_source_log_file} && exists $status->{exec_source_log_pos} ) {
+      return {
+         file     => $status->{relay_source_log_file},
+         position => $status->{exec_source_log_pos},
+      };
+   }
    else {
       return {
          file     => $status->{relay_master_log_file},
@@ -11164,11 +11250,18 @@ sub repl_posn {
    }
 }
 
-sub get_slave_lag {
+sub get_replica_lag {
    my ( $self, $dbh ) = @_;
-   my $stat = $self->get_slave_status($dbh);
-   return unless $stat;  # server is not a slave
-   return $stat->{seconds_behind_master};
+   
+   my $vp = VersionParser->new($dbh);
+   my $source_name = 'source';
+   if ( $vp < '8.1' || $vp->flavor() =~ m/maria/ ) {
+      $source_name = 'master';
+   }
+
+   my $stat = $self->get_replica_status($dbh);
+   return unless $stat;  # server is not a replica
+   return $stat->{"seconds_behind_${source_name}"};
 }
 
 sub pos_cmp {
@@ -11179,9 +11272,9 @@ sub pos_cmp {
 sub short_host {
    my ( $self, $dsn ) = @_;
    my ($host, $port);
-   if ( $dsn->{master_host} ) {
-      $host = $dsn->{master_host};
-      $port = $dsn->{master_port};
+   if ( $dsn->{source_host} ) {
+      $host = $dsn->{source_host};
+      $port = $dsn->{source_port};
    }
    else {
       $host = $dsn->{h};
@@ -11196,7 +11289,7 @@ sub is_replication_thread {
 
    my $type = lc($args{type} || 'all');
    die "Invalid type: $type"
-      unless $type =~ m/^binlog_dump|slave_io|slave_sql|all$/i;
+      unless $type =~ m/^binlog_dump|slave_io|slave_sql|replica_io|replica_sql|all$/i;
 
    my $match = 0;
    if ( $type =~ m/binlog_dump|all/i ) {
@@ -11205,7 +11298,7 @@ sub is_replication_thread {
    }
    if ( !$match ) {
       if ( ($query->{User} || $query->{user} || '') eq "system user" ) {
-         PTDEBUG && _d("Slave replication thread");
+         PTDEBUG && _d("Replica replication thread");
          if ( $type ne 'all' ) {
             my $state = $query->{State} || $query->{state} || '';
 
@@ -11214,15 +11307,16 @@ sub is_replication_thread {
                $match = 1;
             }
             else {
-               my ($slave_sql) = $state =~ m/
+               my ($replica_sql) = $state =~ m/
                   ^(Waiting\sfor\sthe\snext\sevent
                    |Reading\sevent\sfrom\sthe\srelay\slog
                    |Has\sread\sall\srelay\slog;\swaiting
                    |Making\stemp\sfile
-                   |Waiting\sfor\sslave\smutex\son\sexit)/xi;
+                   |Waiting\sfor\sslave\smutex\son\sexit
+                   |Waiting\sfor\sreplica\smutex\son\sexit)/xi;
 
-               $match = $type eq 'slave_sql' &&  $slave_sql ? 1
-                      : $type eq 'slave_io'  && !$slave_sql ? 1
+               $match = $type eq 'replica_sql' &&  $replica_sql ? 1
+                      : $type eq 'replica_io'  && !$replica_sql ? 1
                       :                                       0;
             }
          }
@@ -11263,9 +11357,15 @@ sub get_replication_filters {
    }
    my ($dbh) = @args{@required_args};
 
+   my $vp = VersionParser->new($dbh);
+   my $replica_name = 'replica';
+   if ( $vp < '8.1' || $vp->flavor() =~ m/maria/ ) {
+      $replica_name = 'slave';
+   }
+
    my %filters = ();
 
-   my $status = $self->get_master_status($dbh);
+   my $status = $self->get_source_status($dbh);
    if ( $status ) {
       map { $filters{$_} = $status->{$_} }
       grep { defined $status->{$_} && $status->{$_} ne '' }
@@ -11275,7 +11375,7 @@ sub get_replication_filters {
       );
    }
 
-   $status = $self->get_slave_status($dbh);
+   $status = $self->get_replica_status($dbh);
    if ( $status ) {
       map { $filters{$_} = $status->{$_} }
       grep { defined $status->{$_} && $status->{$_} ne '' }
@@ -11288,10 +11388,10 @@ sub get_replication_filters {
          replicate_wild_ignore_table
       );
 
-      my $sql = "SHOW VARIABLES LIKE 'slave_skip_errors'";
+      my $sql = "SHOW VARIABLES LIKE '${replica_name}_skip_errors'";
       PTDEBUG && _d($dbh, $sql);
       my $row = $dbh->selectrow_arrayref($sql);
-      $filters{slave_skip_errors} = $row->[1] if $row->[1] && $row->[1] ne 'OFF';
+      $filters{replica_skip_errors} = $row->[1] if $row->[1] && $row->[1] ne 'OFF';
    }
 
    return \%filters;
diff --git a/bin/pt-show-grants b/bin/pt-show-grants
index 4e4f3425e..04a595a30 100755
--- a/bin/pt-show-grants
+++ b/bin/pt-show-grants
@@ -1309,7 +1309,7 @@ sub get_cxn_params {
       $dsn = 'DBI:mysql:' . ( $info->{D} || '' ) . ';'
          . join(';', map  { "$opts{$_}->{dsn}=$info->{$_}" }
                      grep { defined $info->{$_} }
-                     qw(F h P S A))
+                     qw(F h P S A s))
          . ';mysql_read_default_group=client'
          . ($info->{L} ? ';mysql_local_infile=1' : '');
    }
diff --git a/bin/pt-slave-delay b/bin/pt-slave-delay
index b8c379756..52193b038 100755
--- a/bin/pt-slave-delay
+++ b/bin/pt-slave-delay
@@ -2030,7 +2030,7 @@ sub get_cxn_params {
       $dsn = 'DBI:mysql:' . ( $info->{D} || '' ) . ';'
          . join(';', map  { "$opts{$_}->{dsn}=$info->{$_}" }
                      grep { defined $info->{$_} }
-                     qw(F h P S A))
+                     qw(F h P S A s))
          . ';mysql_read_default_group=client'
          . ($info->{L} ? ';mysql_local_infile=1' : '');
    }
diff --git a/bin/pt-slave-find b/bin/pt-slave-find
index aaef1242b..294a5ea59 100755
--- a/bin/pt-slave-find
+++ b/bin/pt-slave-find
@@ -1965,7 +1965,7 @@ sub get_cxn_params {
       $dsn = 'DBI:mysql:' . ( $info->{D} || '' ) . ';'
          . join(';', map  { "$opts{$_}->{dsn}=$info->{$_}" }
                      grep { defined $info->{$_} }
-                     qw(F h P S A))
+                     qw(F h P S A s))
          . ';mysql_read_default_group=client'
          . ($info->{L} ? ';mysql_local_infile=1' : '');
    }
@@ -2284,7 +2284,7 @@ sub new {
    return bless $self, $class;
 }
 
-sub get_slaves {
+sub get_replicas {
    my ($self, %args) = @_;
    my @required_args = qw(make_cxn);
    foreach my $arg ( @required_args ) {
@@ -2292,11 +2292,11 @@ sub get_slaves {
    }
    my ($make_cxn) = @args{@required_args};
 
-   my $slaves  = [];
+   my $replicas  = [];
    my $dp      = $self->{DSNParser};
    my $methods = $self->_resolve_recursion_methods($args{dsn});
 
-   return $slaves unless @$methods;
+   return $replicas unless @$methods;
 
    if ( grep { m/processlist|hosts/i } @$methods ) {
       my @required_args = qw(dbh dsn);
@@ -2306,26 +2306,26 @@ sub get_slaves {
       my ($dbh, $dsn) = @args{@required_args};
       my $o = $self->{OptionParser};
 
-      $self->recurse_to_slaves(
-         {  dbh            => $dbh,
-            dsn            => $dsn,
-            slave_user     => $o->got('slave-user') ? $o->get('slave-user') : '',
-            slave_password => $o->got('slave-password') ? $o->get('slave-password') : '',
-            slaves         => $args{slaves},
+      $self->recurse_to_replicas(
+         {  dbh              => $dbh,
+            dsn              => $dsn,
+            replica_user     => $o->got('replica-user') ? $o->get('replica-user') : '',
+            replica_password => $o->got('replica-password') ? $o->get('replica-password') : '',
+            replicas         => $args{replicas},
             callback  => sub {
                my ( $dsn, $dbh, $level, $parent ) = @_;
                return unless $level;
-               PTDEBUG && _d('Found slave:', $dp->as_string($dsn));
-               my $slave_dsn = $dsn;
-               if ($o->got('slave-user')) {
-                  $slave_dsn->{u} = $o->get('slave-user');
-                  PTDEBUG && _d("Using slave user ".$o->get('slave-user')." on ".$slave_dsn->{h}.":".$slave_dsn->{P});
+               PTDEBUG && _d('Found replica:', $dp->as_string($dsn));
+               my $replica_dsn = $dsn;
+               if ($o->got('replica-user')) {
+                  $replica_dsn->{u} = $o->get('replica-user');
+                  PTDEBUG && _d("Using replica user ".$o->get('replica-user')." on ".$replica_dsn->{h}.":".$replica_dsn->{P});
                }
-               if ($o->got('slave-password')) {
-                  $slave_dsn->{p} = $o->get('slave-password');
-                  PTDEBUG && _d("Slave password set");
+               if ($o->got('replica-password')) {
+                  $replica_dsn->{p} = $o->get('replica-password');
+                  PTDEBUG && _d("Replica password set");
                }
-               push @$slaves, $make_cxn->(dsn => $slave_dsn, dbh => $dbh, parent => $parent);
+               push @$replicas, $make_cxn->(dsn => $replica_dsn, dbh => $dbh, parent => $parent);
                return;
             },
             wait_no_die => $args{'wait_no_die'},
@@ -2333,20 +2333,20 @@ sub get_slaves {
       );
    } elsif ( $methods->[0] =~ m/^dsn=/i ) {
       (my $dsn_table_dsn = join ",", @$methods) =~ s/^dsn=//i;
-      $slaves = $self->get_cxn_from_dsn_table(
+      $replicas = $self->get_cxn_from_dsn_table(
          %args,
          dsn_table_dsn => $dsn_table_dsn,
          wait_no_die => $args{'wait_no_die'},
       );
    }
    elsif ( $methods->[0] =~ m/none/i ) {
-      PTDEBUG && _d('Not getting to slaves');
+      PTDEBUG && _d('Not getting to replicas');
    }
    else {
       die "Unexpected recursion methods: @$methods";
    }
 
-   return $slaves;
+   return $replicas;
 }
 
 sub _resolve_recursion_methods {
@@ -2364,31 +2364,31 @@ sub _resolve_recursion_methods {
    }
 }
 
-sub recurse_to_slaves {
+sub recurse_to_replicas {
    my ( $self, $args, $level ) = @_;
    $level ||= 0;
    my $dp = $self->{DSNParser};
    my $recurse = $args->{recurse} || $self->{OptionParser}->get('recurse');
    my $dsn = $args->{dsn};
-   my $slave_user = $args->{slave_user} || '';
-   my $slave_password = $args->{slave_password} || '';
+   my $replica_user = $args->{replica_user} || '';
+   my $replica_password = $args->{replica_password} || '';
 
    my $methods = $self->_resolve_recursion_methods($dsn);
    PTDEBUG && _d('Recursion methods:', @$methods);
    if ( lc($methods->[0]) eq 'none' ) {
-      PTDEBUG && _d('Not recursing to slaves');
+      PTDEBUG && _d('Not recursing to replicas');
       return;
    }
 
-   my $slave_dsn = $dsn;
-   if ($slave_user) {
-      $slave_dsn->{u} = $slave_user;
-      PTDEBUG && _d("Using slave user $slave_user on "
-         . $slave_dsn->{h} . ":" . ( $slave_dsn->{P} ? $slave_dsn->{P} : ""));
+   my $replica_dsn = $dsn;
+   if ($replica_user) {
+      $replica_dsn->{u} = $replica_user;
+      PTDEBUG && _d("Using replica user $replica_user on "
+         . $replica_dsn->{h} . ":" . ( $replica_dsn->{P} ? $replica_dsn->{P} : ""));
    }
-   if ($slave_password) {
-      $slave_dsn->{p} = $slave_password;
-      PTDEBUG && _d("Slave password set");
+   if ($replica_password) {
+      $replica_dsn->{p} = $replica_password;
+      PTDEBUG && _d("Replica password set");
    }
 
    my $dbh = $args->{dbh};
@@ -2396,12 +2396,12 @@ sub recurse_to_slaves {
    my $get_dbh = sub {
          eval {
             $dbh = $dp->get_dbh(
-               $dp->get_cxn_params($slave_dsn), { AutoCommit => 1 }
+               $dp->get_cxn_params($replica_dsn), { AutoCommit => 1 }
             );
-            PTDEBUG && _d('Connected to', $dp->as_string($slave_dsn));
+            PTDEBUG && _d('Connected to', $dp->as_string($replica_dsn));
          };
          if ( $EVAL_ERROR ) {
-            print STDERR "Cannot connect to ", $dp->as_string($slave_dsn), ": ", $EVAL_ERROR, "\n"
+            print STDERR "Cannot connect to ", $dp->as_string($replica_dsn), ": ", $EVAL_ERROR, "\n"
                or die "Cannot print: $OS_ERROR";
             return;
          }
@@ -2409,10 +2409,10 @@ sub recurse_to_slaves {
 
    DBH: {
       if ( !defined $dbh ) {
-         foreach my $known_slave ( @{$args->{slaves}} ) {
-            if ($known_slave->{dsn}->{h} eq $slave_dsn->{h} and
-                $known_slave->{dsn}->{P} eq $slave_dsn->{P} ) {
-               $dbh = $known_slave->{dbh};
+         foreach my $known_replica ( @{$args->{replicas}} ) {
+            if ($known_replica->{dsn}->{h} eq $replica_dsn->{h} and
+                $known_replica->{dsn}->{P} eq $replica_dsn->{P} ) {
+               $dbh = $known_replica->{dbh};
                last DBH;
             }
          }
@@ -2430,7 +2430,7 @@ sub recurse_to_slaves {
 	   if ( $EVAL_ERROR ) {
 		   if ( $args->{wait_no_die} ) {
 			   print STDERR "Error getting server id: ", $EVAL_ERROR,
-               "\nRetrying query for server ", $slave_dsn->{h}, ":", $slave_dsn->{P}, "\n";
+               "\nRetrying query for server ", $replica_dsn->{h}, ":", $replica_dsn->{P}, "\n";
             sleep 1;
             $dbh->disconnect();
             $get_dbh->();
@@ -2440,12 +2440,12 @@ sub recurse_to_slaves {
       }
    } until (defined $id);
    PTDEBUG && _d('Working on server ID', $id);
-   my $master_thinks_i_am = $dsn->{server_id};
+   my $source_thinks_i_am = $dsn->{server_id};
    if ( !defined $id
-       || ( defined $master_thinks_i_am && $master_thinks_i_am != $id )
+       || ( defined $source_thinks_i_am && $source_thinks_i_am != $id )
        || $args->{server_ids_seen}->{$id}++
    ) {
-      PTDEBUG && _d('Server ID seen, or not what master said');
+      PTDEBUG && _d('Server ID seen, or not what source said');
       if ( $args->{skip_callback} ) {
          $args->{skip_callback}->($dsn, $dbh, $level, $args->{parent});
       }
@@ -2456,51 +2456,51 @@ sub recurse_to_slaves {
 
    if ( !defined $recurse || $level < $recurse ) {
 
-      my @slaves =
-         grep { !$_->{master_id} || $_->{master_id} == $id } # Only my slaves.
-         $self->find_slave_hosts($dp, $dbh, $dsn, $methods);
+      my @replicas =
+         grep { !$_->{source_id} || $_->{source_id} == $id } # Only my replicas.
+         $self->find_replica_hosts($dp, $dbh, $dsn, $methods);
 
-      foreach my $slave ( @slaves ) {
+      foreach my $replica ( @replicas ) {
          PTDEBUG && _d('Recursing from',
-            $dp->as_string($dsn), 'to', $dp->as_string($slave));
-         $self->recurse_to_slaves(
-            { %$args, dsn => $slave, dbh => undef, parent => $dsn, slave_user => $slave_user, $slave_password => $slave_password }, $level + 1 );
+            $dp->as_string($dsn), 'to', $dp->as_string($replica));
+         $self->recurse_to_replicas(
+            { %$args, dsn => $replica, dbh => undef, parent => $dsn, replica_user => $replica_user, $replica_password => $replica_password }, $level + 1 );
       }
    }
 }
 
-sub find_slave_hosts {
+sub find_replica_hosts {
    my ( $self, $dsn_parser, $dbh, $dsn, $methods ) = @_;
 
-   PTDEBUG && _d('Looking for slaves on', $dsn_parser->as_string($dsn),
+   PTDEBUG && _d('Looking for replicas on', $dsn_parser->as_string($dsn),
       'using methods', @$methods);
 
-   my @slaves;
+   my @replicas;
    METHOD:
    foreach my $method ( @$methods ) {
-      my $find_slaves = "_find_slaves_by_$method";
-      PTDEBUG && _d('Finding slaves with', $find_slaves);
-      @slaves = $self->$find_slaves($dsn_parser, $dbh, $dsn);
-      last METHOD if @slaves;
+      my $find_replicas = "_find_replicas_by_$method";
+      PTDEBUG && _d('Finding replicas with', $find_replicas);
+      @replicas = $self->$find_replicas($dsn_parser, $dbh, $dsn);
+      last METHOD if @replicas;
    }
 
-   PTDEBUG && _d('Found', scalar(@slaves), 'slaves');
-   return @slaves;
+   PTDEBUG && _d('Found', scalar(@replicas), 'replicas');
+   return @replicas;
 }
 
-sub _find_slaves_by_processlist {
+sub _find_replicas_by_processlist {
    my ( $self, $dsn_parser, $dbh, $dsn ) = @_;
-   my @connected_slaves = $self->get_connected_slaves($dbh);
-   my @slaves = $self->_process_slaves_list($dsn_parser, $dsn, \@connected_slaves);
-   return @slaves;
+   my @connected_replicas = $self->get_connected_replicas($dbh);
+   my @replicas = $self->_process_replicas_list($dsn_parser, $dsn, \@connected_replicas);
+   return @replicas;
 }
 
-sub _process_slaves_list {
-   my ($self, $dsn_parser, $dsn, $connected_slaves) = @_;
-   my @slaves = map  {
-      my $slave        = $dsn_parser->parse("h=$_", $dsn);
-      $slave->{source} = 'processlist';
-      $slave;
+sub _process_replicas_list {
+   my ($self, $dsn_parser, $dsn, $connected_replicas) = @_;
+   my @replicas = map  {
+      my $replica        = $dsn_parser->parse("h=$_", $dsn);
+      $replica->{source} = 'processlist';
+      $replica;
    }
    grep { $_ }
    map  {
@@ -2512,22 +2512,28 @@ sub _process_slaves_list {
           $host = '['.$host.']';
       }
       $host;
-   } @$connected_slaves;
+   } @$connected_replicas;
 
-   return @slaves;
+   return @replicas;
 }
 
-sub _find_slaves_by_hosts {
+sub _find_replicas_by_hosts {
    my ( $self, $dsn_parser, $dbh, $dsn ) = @_;
 
-   my @slaves;
-   my $sql = 'SHOW SLAVE HOSTS';
+   my @replicas;
+
+   my $vp = VersionParser->new($dbh);
+   my $sql = 'SHOW REPLICAS';
+   if ( $vp < '8.1' || $vp->flavor() =~ m/maria/ ) {
+      $sql = 'SHOW SLAVE HOSTS';
+   }
+   
    PTDEBUG && _d($dbh, $sql);
-   @slaves = @{$dbh->selectall_arrayref($sql, { Slice => {} })};
+   @replicas = @{$dbh->selectall_arrayref($sql, { Slice => {} })};
 
-   if ( @slaves ) {
-      PTDEBUG && _d('Found some SHOW SLAVE HOSTS info');
-      @slaves = map {
+   if ( @replicas ) {
+      PTDEBUG && _d('Found some SHOW REPLICAS info');
+      @replicas = map {
          my %hash;
          @hash{ map { lc $_ } keys %$_ } = values %$_;
          my $spec = "h=$hash{host},P=$hash{port}"
@@ -2535,16 +2541,16 @@ sub _find_slaves_by_hosts {
             . ( $hash{password} ? ",p=$hash{password}" : '');
          my $dsn           = $dsn_parser->parse($spec, $dsn);
          $dsn->{server_id} = $hash{server_id};
-         $dsn->{master_id} = $hash{master_id};
+         $dsn->{source_id} = $hash{source_id};
          $dsn->{source}    = 'hosts';
          $dsn;
-      } @slaves;
+      } @replicas;
    }
 
-   return @slaves;
+   return @replicas;
 }
 
-sub get_connected_slaves {
+sub get_connected_replicas {
    my ( $self, $dbh ) = @_;
 
    my $show = "SHOW GRANTS FOR ";
@@ -2590,79 +2596,103 @@ sub get_connected_slaves {
    @{$dbh->selectall_arrayref($sql, { Slice => {} })};
 }
 
-sub is_master_of {
-   my ( $self, $master, $slave ) = @_;
-   my $master_status = $self->get_master_status($master)
-      or die "The server specified as a master is not a master";
-   my $slave_status  = $self->get_slave_status($slave)
-      or die "The server specified as a slave is not a slave";
-   my @connected     = $self->get_connected_slaves($master)
-      or die "The server specified as a master has no connected slaves";
-   my (undef, $port) = $master->selectrow_array("SHOW VARIABLES LIKE 'port'");
+sub is_source_of {
+   my ( $self, $source, $replica ) = @_;
+
+   my $replica_version = VersionParser->new($replica);
+   my $source_name = 'source';
+   my $source_port = 'source_port';
+   if ( $replica_version < '8.1' || $replica_version->flavor() =~ m/maria/ ) {
+      $source_name = 'master';
+      $source_port = 'master_port';
+   }
+
+   my $source_status = $self->get_source_status($source)
+      or die "The server specified as a source is not a source";
+   my $replica_status  = $self->get_replica_status($replica)
+      or die "The server specified as a replica is not a replica";
+   my @connected     = $self->get_connected_replicas($source)
+      or die "The server specified as a source has no connected replicas";
+   my (undef, $port) = $source->selectrow_array("SHOW VARIABLES LIKE 'port'");
 
-   if ( $port != $slave_status->{master_port} ) {
-      die "The slave is connected to $slave_status->{master_port} "
-         . "but the master's port is $port";
+   if ( $port != $replica_status->{$source_port} ) {
+      die "The replica is connected to $replica_status->{$source_port} "
+         . "but the source's port is $port";
    }
 
-   if ( !grep { $slave_status->{master_user} eq $_->{user} } @connected ) {
-      die "I don't see any slave I/O thread connected with user "
-         . $slave_status->{master_user};
+   if ( !grep { $replica_status->{source_user} eq $_->{user} } @connected ) {
+      die "I don't see any replica I/O thread connected with user "
+         . $replica_status->{source_user};
    }
 
-   if ( ($slave_status->{slave_io_state} || '')
-      eq 'Waiting for master to send event' )
+   if ( ($replica_status->{replica_io_state} || '')
+      eq 'Waiting for ${source_name} to send event' )
    {
-      my ( $master_log_name, $master_log_num )
-         = $master_status->{file} =~ m/^(.*?)\.0*([1-9][0-9]*)$/;
-      my ( $slave_log_name, $slave_log_num )
-         = $slave_status->{master_log_file} =~ m/^(.*?)\.0*([1-9][0-9]*)$/;
-      if ( $master_log_name ne $slave_log_name
-         || abs($master_log_num - $slave_log_num) > 1 )
+      my ( $source_log_name, $source_log_num )
+         = $source_status->{file} =~ m/^(.*?)\.0*([1-9][0-9]*)$/;
+      my ( $replica_log_name, $replica_log_num )
+         = $replica_status->{source_log_file} =~ m/^(.*?)\.0*([1-9][0-9]*)$/;
+      if ( $source_log_name ne $replica_log_name
+         || abs($source_log_num - $replica_log_num) > 1 )
       {
-         die "The slave thinks it is reading from "
-            . "$slave_status->{master_log_file},  but the "
-            . "master is writing to $master_status->{file}";
+         die "The replica thinks it is reading from "
+            . "$replica_status->{source_log_file},  but the "
+            . "source is writing to $source_status->{file}";
       }
    }
    return 1;
 }
 
-sub get_master_dsn {
+sub get_source_dsn {
    my ( $self, $dbh, $dsn, $dsn_parser ) = @_;
-   my $master = $self->get_slave_status($dbh) or return undef;
-   my $spec   = "h=$master->{master_host},P=$master->{master_port}";
+
+   my $vp = VersionParser->new($dbh);
+   my $source_host = 'source_host';
+   my $source_port = 'source_port';
+   if ( $vp < '8.1' || $vp->flavor() =~ m/maria/ ) {
+      $source_host = 'master_host';
+      $source_port = 'master_port';
+   }
+
+   my $source = $self->get_replica_status($dbh) or return undef;
+   my $spec   = "h=$source->{${source_host}},P=$source->{${source_port}}";
    return       $dsn_parser->parse($spec, $dsn);
 }
 
-sub get_slave_status {
+sub get_replica_status {
    my ( $self, $dbh ) = @_;
 
-   if ( !$self->{not_a_slave}->{$dbh} ) {
-      my $sth = $self->{sths}->{$dbh}->{SLAVE_STATUS}
-            ||= $dbh->prepare('SHOW SLAVE STATUS');
-      PTDEBUG && _d($dbh, 'SHOW SLAVE STATUS');
+   my $server_version = VersionParser->new($dbh);
+   my $replica_name = 'replica';
+   if ( $server_version < '8.1' || $server_version->flavor() =~ m/maria/ ) {
+      $replica_name = 'slave';
+   }
+
+   if ( !$self->{not_a_replica}->{$dbh} ) {
+      my $sth = $self->{sths}->{$dbh}->{REPLICA_STATUS}
+            ||= $dbh->prepare("SHOW ${replica_name} STATUS");
+      PTDEBUG && _d($dbh, "SHOW ${replica_name} STATUS");
       $sth->execute();
-      my ($sss_rows) = $sth->fetchall_arrayref({}); # Show Slave Status rows
+      my ($sss_rows) = $sth->fetchall_arrayref({}); # Show Replica Status rows
 
       my $ss;
       if ( $sss_rows && @$sss_rows ) {
           if (scalar @$sss_rows > 1) {
               if (!$self->{channel}) {
-                  die 'This server returned more than one row for SHOW SLAVE STATUS but "channel" was not specified on the command line';
+                  die 'This server returned more than one row for SHOW REPLICA STATUS but "channel" was not specified on the command line';
               }
-              my $slave_use_channels;
+              my $replica_use_channels;
               for my $row (@$sss_rows) {
                   $row = { map { lc($_) => $row->{$_} } keys %$row }; # lowercase the keys
                   if ($row->{channel_name}) {
-                      $slave_use_channels = 1;
+                      $replica_use_channels = 1;
                   }
                   if ($row->{channel_name} eq $self->{channel}) {
                       $ss = $row;
                       last;
                   }
               }
-              if (!$ss && $slave_use_channels) {
+              if (!$ss && $replica_use_channels) {
                  die 'This server is using replication channels but "channel" was not specified on the command line';
               }
           } else {
@@ -2682,28 +2712,34 @@ sub get_slave_status {
           }
       }
 
-      PTDEBUG && _d('This server returns nothing for SHOW SLAVE STATUS');
-      $self->{not_a_slave}->{$dbh}++;
+      PTDEBUG && _d('This server returns nothing for SHOW REPLICA STATUS');
+      $self->{not_a_replica}->{$dbh}++;
   }
 }
 
-sub get_master_status {
+sub get_source_status {
    my ( $self, $dbh ) = @_;
 
-   if ( $self->{not_a_master}->{$dbh} ) {
-      PTDEBUG && _d('Server on dbh', $dbh, 'is not a master');
+   if ( $self->{not_a_source}->{$dbh} ) {
+      PTDEBUG && _d('Server on dbh', $dbh, 'is not a source');
       return;
    }
 
+   my $vp = VersionParser->new($dbh);
+   my $source_name = 'binary log';
+   if ( $vp < '8.1' || $vp->flavor() =~ m/maria/ ) {
+      $source_name = 'master';
+   }
+
    my $sth;
    if ( $self->{sths}->{$dbh} && $dbh && $self->{sths}->{$dbh} == $dbh ) {
-      $sth = $self->{sths}->{$dbh}->{MASTER_STATUS}
-         ||= $dbh->prepare('SHOW MASTER STATUS');
+      $sth = $self->{sths}->{$dbh}->{SOURCE_STATUS}
+         ||= $dbh->prepare("SHOW ${source_name} STATUS");
    }
    else {
-      $sth = $dbh->prepare('SHOW MASTER STATUS');
+      $sth = $dbh->prepare("SHOW ${source_name} STATUS");
    }
-   PTDEBUG && _d($dbh, 'SHOW MASTER STATUS');
+   PTDEBUG && _d($dbh, "SHOW ${source_name} STATUS");
    $sth->execute();
    my ($ms) = @{$sth->fetchall_arrayref({})};
    PTDEBUG && _d(
@@ -2711,42 +2747,46 @@ sub get_master_status {
           : '');
 
    if ( !$ms || scalar keys %$ms < 2 ) {
-      PTDEBUG && _d('Server on dbh', $dbh, 'does not seem to be a master');
-      $self->{not_a_master}->{$dbh}++;
+      PTDEBUG && _d('Server on dbh', $dbh, 'does not seem to be a source');
+      $self->{not_a_source}->{$dbh}++;
    }
 
   return { map { lc($_) => $ms->{$_} } keys %$ms }; # lowercase the keys
 }
 
-sub wait_for_master {
+sub wait_for_source {
    my ( $self, %args ) = @_;
-   my @required_args = qw(master_status slave_dbh);
+   my @required_args = qw(source_status replica_dbh);
    foreach my $arg ( @required_args ) {
       die "I need a $arg argument" unless $args{$arg};
    }
-   my ($master_status, $slave_dbh) = @args{@required_args};
+   my ($source_status, $replica_dbh) = @args{@required_args};
    my $timeout       = $args{timeout} || 60;
 
    my $result;
    my $waited;
-   if ( $master_status ) {
-      my $slave_status;
+   if ( $source_status ) {
+      my $replica_status;
       eval {
-          $slave_status = $self->get_slave_status($slave_dbh);
+          $replica_status = $self->get_replica_status($replica_dbh);
       };
       if ($EVAL_ERROR) {
           return {
               result => undef,
               waited => 0,
-              error  =>'Wait for master: this is a multi-master slave but "channel" was not specified on the command line',
+              error  =>'Wait for source: this is a multi-source replica but "channel" was not specified on the command line',
           };
       }
-      my $server_version = VersionParser->new($slave_dbh);
-      my $channel_sql = $server_version > '5.6' && $self->{channel} ? ", '$self->{channel}'" : '';
-      my $sql = "SELECT MASTER_POS_WAIT('$master_status->{file}', $master_status->{position}, $timeout $channel_sql)";
-      PTDEBUG && _d($slave_dbh, $sql);
+      my $vp = VersionParser->new($replica_dbh);
+      my $source_name = 'source';
+      if ( $vp < '8.1' || $vp->flavor() =~ m/maria/ ) {
+         $source_name = 'master';
+      }
+      my $channel_sql = $vp > '5.6' && $self->{channel} ? ", '$self->{channel}'" : '';
+      my $sql = "SELECT ${source_name}_POS_WAIT('$source_status->{file}', $source_status->{position}, $timeout $channel_sql)";
+      PTDEBUG && _d($replica_dbh, $sql);
       my $start = time;
-      ($result) = $slave_dbh->selectrow_array($sql);
+      ($result) = $replica_dbh->selectrow_array($sql);
 
       $waited = time - $start;
 
@@ -2754,7 +2794,7 @@ sub wait_for_master {
       PTDEBUG && _d("Waited", $waited, "seconds");
    }
    else {
-      PTDEBUG && _d('Not waiting: this server is not a master');
+      PTDEBUG && _d('Not waiting: this server is not a source');
    }
 
    return {
@@ -2763,75 +2803,96 @@ sub wait_for_master {
    };
 }
 
-sub stop_slave {
+sub stop_replica {
    my ( $self, $dbh ) = @_;
-   my $sth = $self->{sths}->{$dbh}->{STOP_SLAVE}
-         ||= $dbh->prepare('STOP SLAVE');
+   my $vp = VersionParser->new($dbh);
+   my $replica_name = 'replica';
+   if ( $vp < '8.1' || $vp->flavor() =~ m/maria/ ) {
+      $replica_name = 'slave';
+   }
+   my $sth = $self->{sths}->{$dbh}->{STOP_REPLICA}
+         ||= $dbh->prepare("STOP ${replica_name}");
    PTDEBUG && _d($dbh, $sth->{Statement});
    $sth->execute();
 }
 
-sub start_slave {
+sub start_replica {
    my ( $self, $dbh, $pos ) = @_;
+
+   my $vp = VersionParser->new($dbh);
+   my $source_name = 'source';
+   my $replica_name = 'replica';
+   if ( $vp < '8.1' || $vp->flavor() =~ m/maria/ ) {
+      $source_name = 'master';
+      $replica_name = 'slave';
+   }
+
    if ( $pos ) {
-      my $sql = "START SLAVE UNTIL MASTER_LOG_FILE='$pos->{file}', "
-              . "MASTER_LOG_POS=$pos->{position}";
+      my $sql = "START ${replica_name} UNTIL ${source_name}_LOG_FILE='$pos->{file}', "
+              . "${source_name}_LOG_POS=$pos->{position}";
       PTDEBUG && _d($dbh, $sql);
       $dbh->do($sql);
    }
    else {
-      my $sth = $self->{sths}->{$dbh}->{START_SLAVE}
-            ||= $dbh->prepare('START SLAVE');
+      my $sth = $self->{sths}->{$dbh}->{START_REPLICA}
+            ||= $dbh->prepare("START ${replica_name}");
       PTDEBUG && _d($dbh, $sth->{Statement});
       $sth->execute();
    }
 }
 
-sub catchup_to_master {
-   my ( $self, $slave, $master, $timeout ) = @_;
-   $self->stop_slave($master);
-   $self->stop_slave($slave);
-   my $slave_status  = $self->get_slave_status($slave);
-   my $slave_pos     = $self->repl_posn($slave_status);
-   my $master_status = $self->get_master_status($master);
-   my $master_pos    = $self->repl_posn($master_status);
-   PTDEBUG && _d('Master position:', $self->pos_to_string($master_pos),
-      'Slave position:', $self->pos_to_string($slave_pos));
+sub catchup_to_source {
+   my ( $self, $replica, $source, $timeout ) = @_;
+   $self->stop_replica($source);
+   $self->stop_replica($replica);
+   my $replica_status  = $self->get_replica_status($replica);
+   my $replica_pos     = $self->repl_posn($replica_status);
+   my $source_status = $self->get_source_status($source);
+   my $source_pos    = $self->repl_posn($source_status);
+   PTDEBUG && _d('Source position:', $self->pos_to_string($source_pos),
+      'Replica position:', $self->pos_to_string($replica_pos));
 
    my $result;
-   if ( $self->pos_cmp($slave_pos, $master_pos) < 0 ) {
-      PTDEBUG && _d('Waiting for slave to catch up to master');
-      $self->start_slave($slave, $master_pos);
+   if ( $self->pos_cmp($replica_pos, $source_pos) < 0 ) {
+      PTDEBUG && _d('Waiting for replica to catch up to source');
+      $self->start_replica($replica, $source_pos);
 
-      $result = $self->wait_for_master(
-            master_status => $master_status,
-            slave_dbh     => $slave,
+      $result = $self->wait_for_source(
+            source_status => $source_status,
+            replica_dbh   => $replica,
             timeout       => $timeout,
-            master_status => $master_status
+            source_status => $source_status
       );
       if ($result->{error}) {
           die $result->{error};
       }
       if ( !defined $result->{result} ) {
-         $slave_status = $self->get_slave_status($slave);
-         if ( !$self->slave_is_running($slave_status) ) {
-            PTDEBUG && _d('Master position:',
-               $self->pos_to_string($master_pos),
-               'Slave position:', $self->pos_to_string($slave_pos));
-            $slave_pos = $self->repl_posn($slave_status);
-            if ( $self->pos_cmp($slave_pos, $master_pos) != 0 ) {
-               die "MASTER_POS_WAIT() returned NULL but slave has not "
-                  . "caught up to master";
+         $replica_status = $self->get_replica_status($replica);
+            
+         my $vp = VersionParser->new($replica);
+         my $replica_name = 'replica';
+         if ( $vp < '8.1' || $vp->flavor() =~ m/maria/ ) {
+            $replica_name = 'slave';
+         }
+
+         if ( !$self->replica_is_running($replica_status, $replica_name) ) {
+            PTDEBUG && _d('Source position:',
+               $self->pos_to_string($source_pos),
+               'Replica position:', $self->pos_to_string($replica_pos));
+            $replica_pos = $self->repl_posn($replica_status);
+            if ( $self->pos_cmp($replica_pos, $source_pos) != 0 ) {
+               die "SOURCE_POS_WAIT() returned NULL but replica has not "
+                  . "caught up to source";
             }
-            PTDEBUG && _d('Slave is caught up to master and stopped');
+            PTDEBUG && _d('Replica is caught up to source and stopped');
          }
          else {
-            die "Slave has not caught up to master and it is still running";
+            die "Replica has not caught up to source and it is still running";
          }
       }
    }
    else {
-      PTDEBUG && _d("Slave is already caught up to master");
+      PTDEBUG && _d("Replica is already caught up to source");
    }
 
    return $result;
@@ -2839,26 +2900,38 @@ sub catchup_to_master {
 
 sub catchup_to_same_pos {
    my ( $self, $s1_dbh, $s2_dbh ) = @_;
-   $self->stop_slave($s1_dbh);
-   $self->stop_slave($s2_dbh);
-   my $s1_status = $self->get_slave_status($s1_dbh);
-   my $s2_status = $self->get_slave_status($s2_dbh);
+   $self->stop_replica($s1_dbh);
+   $self->stop_replica($s2_dbh);
+   my $s1_status = $self->get_replica_status($s1_dbh);
+   my $s2_status = $self->get_replica_status($s2_dbh);
    my $s1_pos    = $self->repl_posn($s1_status);
    my $s2_pos    = $self->repl_posn($s2_status);
    if ( $self->pos_cmp($s1_pos, $s2_pos) < 0 ) {
-      $self->start_slave($s1_dbh, $s2_pos);
+      $self->start_replica($s1_dbh, $s2_pos);
    }
    elsif ( $self->pos_cmp($s2_pos, $s1_pos) < 0 ) {
-      $self->start_slave($s2_dbh, $s1_pos);
+      $self->start_replica($s2_dbh, $s1_pos);
    }
 
-   $s1_status = $self->get_slave_status($s1_dbh);
-   $s2_status = $self->get_slave_status($s2_dbh);
+   $s1_status = $self->get_replica_status($s1_dbh);
+   $s2_status = $self->get_replica_status($s2_dbh);
    $s1_pos    = $self->repl_posn($s1_status);
    $s2_pos    = $self->repl_posn($s2_status);
 
-   if ( $self->slave_is_running($s1_status)
-     || $self->slave_is_running($s2_status)
+   my $vp1 = VersionParser->new($s1_dbh);
+   my $replica1_name = 'replica';
+   if ( $vp1 < '8.1' || $vp1->flavor() =~ m/maria/ ) {
+      $replica1_name = 'slave';
+   }
+
+   my $vp2 = VersionParser->new($s2_dbh);
+   my $replica2_name = 'replica';
+   if ( $vp2 < '8.1' || $vp2->flavor() =~ m/maria/ ) {
+      $replica2_name = 'slave';
+   }
+
+   if ( $self->replica_is_running($s1_status, $replica1_name)
+     || $self->replica_is_running($s2_status, $replica2_name)
      || $self->pos_cmp($s1_pos, $s2_pos) != 0)
    {
       die "The servers aren't both stopped at the same position";
@@ -2866,14 +2939,21 @@ sub catchup_to_same_pos {
 
 }
 
-sub slave_is_running {
-   my ( $self, $slave_status ) = @_;
-   return ($slave_status->{slave_sql_running} || 'No') eq 'Yes';
+sub replica_is_running {
+   my ( $self, $replica_status, $replica_name ) = @_;
+   return ($replica_status->{"${replica_name}_sql_running"} || 'No') eq 'Yes';
 }
 
-sub has_slave_updates {
+sub has_replica_updates {
    my ( $self, $dbh ) = @_;
-   my $sql = q{SHOW VARIABLES LIKE 'log_slave_updates'};
+   
+   my $vp = VersionParser->new($dbh);
+   my $replica_name = 'replica';
+   if ( $vp < '8.1' || $vp->flavor() =~ m/maria/ ) {
+      $replica_name = 'slave';
+   }
+
+   my $sql = qq{SHOW VARIABLES LIKE 'log_${replica_name}_updates'};
    PTDEBUG && _d($dbh, $sql);
    my ($name, $value) = $dbh->selectrow_array($sql);
    return $value && $value =~ m/^(1|ON)$/;
@@ -2887,6 +2967,12 @@ sub repl_posn {
          position => $status->{position},
       };
    }
+   elsif ( exists $status->{relay_source_log_file} && exists $status->{exec_source_log_pos} ) {
+      return {
+         file     => $status->{relay_source_log_file},
+         position => $status->{exec_source_log_pos},
+      };
+   }
    else {
       return {
          file     => $status->{relay_master_log_file},
@@ -2895,11 +2981,18 @@ sub repl_posn {
    }
 }
 
-sub get_slave_lag {
+sub get_replica_lag {
    my ( $self, $dbh ) = @_;
-   my $stat = $self->get_slave_status($dbh);
-   return unless $stat;  # server is not a slave
-   return $stat->{seconds_behind_master};
+   
+   my $vp = VersionParser->new($dbh);
+   my $source_name = 'source';
+   if ( $vp < '8.1' || $vp->flavor() =~ m/maria/ ) {
+      $source_name = 'master';
+   }
+
+   my $stat = $self->get_replica_status($dbh);
+   return unless $stat;  # server is not a replica
+   return $stat->{"seconds_behind_${source_name}"};
 }
 
 sub pos_cmp {
@@ -2910,9 +3003,9 @@ sub pos_cmp {
 sub short_host {
    my ( $self, $dsn ) = @_;
    my ($host, $port);
-   if ( $dsn->{master_host} ) {
-      $host = $dsn->{master_host};
-      $port = $dsn->{master_port};
+   if ( $dsn->{source_host} ) {
+      $host = $dsn->{source_host};
+      $port = $dsn->{source_port};
    }
    else {
       $host = $dsn->{h};
@@ -2927,7 +3020,7 @@ sub is_replication_thread {
 
    my $type = lc($args{type} || 'all');
    die "Invalid type: $type"
-      unless $type =~ m/^binlog_dump|slave_io|slave_sql|all$/i;
+      unless $type =~ m/^binlog_dump|slave_io|slave_sql|replica_io|replica_sql|all$/i;
 
    my $match = 0;
    if ( $type =~ m/binlog_dump|all/i ) {
@@ -2936,7 +3029,7 @@ sub is_replication_thread {
    }
    if ( !$match ) {
       if ( ($query->{User} || $query->{user} || '') eq "system user" ) {
-         PTDEBUG && _d("Slave replication thread");
+         PTDEBUG && _d("Replica replication thread");
          if ( $type ne 'all' ) {
             my $state = $query->{State} || $query->{state} || '';
 
@@ -2945,15 +3038,16 @@ sub is_replication_thread {
                $match = 1;
             }
             else {
-               my ($slave_sql) = $state =~ m/
+               my ($replica_sql) = $state =~ m/
                   ^(Waiting\sfor\sthe\snext\sevent
                    |Reading\sevent\sfrom\sthe\srelay\slog
                    |Has\sread\sall\srelay\slog;\swaiting
                    |Making\stemp\sfile
-                   |Waiting\sfor\sslave\smutex\son\sexit)/xi;
+                   |Waiting\sfor\sslave\smutex\son\sexit
+                   |Waiting\sfor\sreplica\smutex\son\sexit)/xi;
 
-               $match = $type eq 'slave_sql' &&  $slave_sql ? 1
-                      : $type eq 'slave_io'  && !$slave_sql ? 1
+               $match = $type eq 'replica_sql' &&  $replica_sql ? 1
+                      : $type eq 'replica_io'  && !$replica_sql ? 1
                       :                                       0;
             }
          }
@@ -2994,9 +3088,15 @@ sub get_replication_filters {
    }
    my ($dbh) = @args{@required_args};
 
+   my $vp = VersionParser->new($dbh);
+   my $replica_name = 'replica';
+   if ( $vp < '8.1' || $vp->flavor() =~ m/maria/ ) {
+      $replica_name = 'slave';
+   }
+
    my %filters = ();
 
-   my $status = $self->get_master_status($dbh);
+   my $status = $self->get_source_status($dbh);
    if ( $status ) {
       map { $filters{$_} = $status->{$_} }
       grep { defined $status->{$_} && $status->{$_} ne '' }
@@ -3006,7 +3106,7 @@ sub get_replication_filters {
       );
    }
 
-   $status = $self->get_slave_status($dbh);
+   $status = $self->get_replica_status($dbh);
    if ( $status ) {
       map { $filters{$_} = $status->{$_} }
       grep { defined $status->{$_} && $status->{$_} ne '' }
@@ -3019,10 +3119,10 @@ sub get_replication_filters {
          replicate_wild_ignore_table
       );
 
-      my $sql = "SHOW VARIABLES LIKE 'slave_skip_errors'";
+      my $sql = "SHOW VARIABLES LIKE '${replica_name}_skip_errors'";
       PTDEBUG && _d($dbh, $sql);
       my $row = $dbh->selectrow_arrayref($sql);
-      $filters{slave_skip_errors} = $row->[1] if $row->[1] && $row->[1] ne 'OFF';
+      $filters{replica_skip_errors} = $row->[1] if $row->[1] && $row->[1] ne 'OFF';
    }
 
    return \%filters;
@@ -4007,7 +4107,7 @@ sub main {
       DSNParser    => $dp,
       Quoter       => "Quoter",
    );
-   $ms->recurse_to_slaves(
+   $ms->recurse_to_replicas(
       {  dbh      => $dbh,
          dsn      => $master_dsn,
          callback => sub {
@@ -4123,12 +4223,20 @@ sub print_node_summary {
       return;
    }
    $dbh->{FetchHashKeyName} = 'NAME_lc';
+   
+   my $vp = VersionParser->new($dbh);
+   my $source_name = 'source';
+   my $replica_name = 'replica';
+   if ( $vp < '8.1' || $vp->flavor() =~ m/maria/ ) {
+      $source_name = 'master';
+      $replica_name = 'slave';
+   }
 
    # Build the summary line by line, then join and print the lines.
    my @lines;
    my $vars  = $dbh->selectall_hashref("SHOW VARIABLES", 'variable_name');
    my $stats = $dbh->selectall_hashref("SHOW STATUS", 'variable_name');
-   my $ss    = $dbh->selectrow_hashref("SHOW SLAVE STATUS");
+   my $ss    = $dbh->selectrow_hashref("SHOW ${replica_name} STATUS");
    my $proc  = $dbh->selectall_hashref("SHOW PROCESSLIST", 'id');
 
    push @lines, ['Version',   $vars->{version}->{value}];
@@ -4163,8 +4271,8 @@ sub print_node_summary {
    my $slave_status = '';
    if ( $ss ) {
       $slave_status = sprintf("%s seconds behind, %s, %s",
-         defined $ss->{seconds_behind_master} ? $ss->{seconds_behind_master} : '',
-         $ss->{slave_io_running}  eq 'Yes' && $ss->{slave_sql_running} eq 'Yes' ? 'running' : 'not running',
+         defined $ss->{"seconds_behind_${source_name}"} ? $ss->{"seconds_behind_${source_name}"} : '',
+         $ss->{"${replica_name}_io_running"}  eq 'Yes' && $ss->{"${replica_name}_sql_running"} eq 'Yes' ? 'running' : 'not running',
           $ss->{last_errno} ? "error $ss->{last_errno}" : "no errors",
       );
    }
@@ -4563,6 +4671,12 @@ dsn: user; copy: yes
 
 User for login if not current user.
 
+=item * s
+
+dsn: mysql_ssl; copy: yes
+
+Create SSL connection
+
 =back
 
 =head1 ENVIRONMENT
diff --git a/bin/pt-slave-restart b/bin/pt-slave-restart
index 861398a64..987749161 100755
--- a/bin/pt-slave-restart
+++ b/bin/pt-slave-restart
@@ -2376,7 +2376,7 @@ sub get_cxn_params {
       $dsn = 'DBI:mysql:' . ( $info->{D} || '' ) . ';'
          . join(';', map  { "$opts{$_}->{dsn}=$info->{$_}" }
                      grep { defined $info->{$_} }
-                     qw(F h P S A))
+                     qw(F h P S A s))
          . ';mysql_read_default_group=client'
          . ($info->{L} ? ';mysql_local_infile=1' : '');
    }
@@ -2695,7 +2695,7 @@ sub new {
    return bless $self, $class;
 }
 
-sub get_slaves {
+sub get_replicas {
    my ($self, %args) = @_;
    my @required_args = qw(make_cxn);
    foreach my $arg ( @required_args ) {
@@ -2703,11 +2703,11 @@ sub get_slaves {
    }
    my ($make_cxn) = @args{@required_args};
 
-   my $slaves  = [];
+   my $replicas  = [];
    my $dp      = $self->{DSNParser};
    my $methods = $self->_resolve_recursion_methods($args{dsn});
 
-   return $slaves unless @$methods;
+   return $replicas unless @$methods;
 
    if ( grep { m/processlist|hosts/i } @$methods ) {
       my @required_args = qw(dbh dsn);
@@ -2717,26 +2717,26 @@ sub get_slaves {
       my ($dbh, $dsn) = @args{@required_args};
       my $o = $self->{OptionParser};
 
-      $self->recurse_to_slaves(
-         {  dbh            => $dbh,
-            dsn            => $dsn,
-            slave_user     => $o->got('slave-user') ? $o->get('slave-user') : '',
-            slave_password => $o->got('slave-password') ? $o->get('slave-password') : '',
-            slaves         => $args{slaves},
+      $self->recurse_to_replicas(
+         {  dbh              => $dbh,
+            dsn              => $dsn,
+            replica_user     => $o->got('replica-user') ? $o->get('replica-user') : '',
+            replica_password => $o->got('replica-password') ? $o->get('replica-password') : '',
+            replicas         => $args{replicas},
             callback  => sub {
                my ( $dsn, $dbh, $level, $parent ) = @_;
                return unless $level;
-               PTDEBUG && _d('Found slave:', $dp->as_string($dsn));
-               my $slave_dsn = $dsn;
-               if ($o->got('slave-user')) {
-                  $slave_dsn->{u} = $o->get('slave-user');
-                  PTDEBUG && _d("Using slave user ".$o->get('slave-user')." on ".$slave_dsn->{h}.":".$slave_dsn->{P});
+               PTDEBUG && _d('Found replica:', $dp->as_string($dsn));
+               my $replica_dsn = $dsn;
+               if ($o->got('replica-user')) {
+                  $replica_dsn->{u} = $o->get('replica-user');
+                  PTDEBUG && _d("Using replica user ".$o->get('replica-user')." on ".$replica_dsn->{h}.":".$replica_dsn->{P});
                }
-               if ($o->got('slave-password')) {
-                  $slave_dsn->{p} = $o->get('slave-password');
-                  PTDEBUG && _d("Slave password set");
+               if ($o->got('replica-password')) {
+                  $replica_dsn->{p} = $o->get('replica-password');
+                  PTDEBUG && _d("Replica password set");
                }
-               push @$slaves, $make_cxn->(dsn => $slave_dsn, dbh => $dbh, parent => $parent);
+               push @$replicas, $make_cxn->(dsn => $replica_dsn, dbh => $dbh, parent => $parent);
                return;
             },
             wait_no_die => $args{'wait_no_die'},
@@ -2744,20 +2744,20 @@ sub get_slaves {
       );
    } elsif ( $methods->[0] =~ m/^dsn=/i ) {
       (my $dsn_table_dsn = join ",", @$methods) =~ s/^dsn=//i;
-      $slaves = $self->get_cxn_from_dsn_table(
+      $replicas = $self->get_cxn_from_dsn_table(
          %args,
          dsn_table_dsn => $dsn_table_dsn,
          wait_no_die => $args{'wait_no_die'},
       );
    }
    elsif ( $methods->[0] =~ m/none/i ) {
-      PTDEBUG && _d('Not getting to slaves');
+      PTDEBUG && _d('Not getting to replicas');
    }
    else {
       die "Unexpected recursion methods: @$methods";
    }
 
-   return $slaves;
+   return $replicas;
 }
 
 sub _resolve_recursion_methods {
@@ -2775,31 +2775,31 @@ sub _resolve_recursion_methods {
    }
 }
 
-sub recurse_to_slaves {
+sub recurse_to_replicas {
    my ( $self, $args, $level ) = @_;
    $level ||= 0;
    my $dp = $self->{DSNParser};
    my $recurse = $args->{recurse} || $self->{OptionParser}->get('recurse');
    my $dsn = $args->{dsn};
-   my $slave_user = $args->{slave_user} || '';
-   my $slave_password = $args->{slave_password} || '';
+   my $replica_user = $args->{replica_user} || '';
+   my $replica_password = $args->{replica_password} || '';
 
    my $methods = $self->_resolve_recursion_methods($dsn);
    PTDEBUG && _d('Recursion methods:', @$methods);
    if ( lc($methods->[0]) eq 'none' ) {
-      PTDEBUG && _d('Not recursing to slaves');
+      PTDEBUG && _d('Not recursing to replicas');
       return;
    }
 
-   my $slave_dsn = $dsn;
-   if ($slave_user) {
-      $slave_dsn->{u} = $slave_user;
-      PTDEBUG && _d("Using slave user $slave_user on "
-         . $slave_dsn->{h} . ":" . ( $slave_dsn->{P} ? $slave_dsn->{P} : ""));
+   my $replica_dsn = $dsn;
+   if ($replica_user) {
+      $replica_dsn->{u} = $replica_user;
+      PTDEBUG && _d("Using replica user $replica_user on "
+         . $replica_dsn->{h} . ":" . ( $replica_dsn->{P} ? $replica_dsn->{P} : ""));
    }
-   if ($slave_password) {
-      $slave_dsn->{p} = $slave_password;
-      PTDEBUG && _d("Slave password set");
+   if ($replica_password) {
+      $replica_dsn->{p} = $replica_password;
+      PTDEBUG && _d("Replica password set");
    }
 
    my $dbh = $args->{dbh};
@@ -2807,12 +2807,12 @@ sub recurse_to_slaves {
    my $get_dbh = sub {
          eval {
             $dbh = $dp->get_dbh(
-               $dp->get_cxn_params($slave_dsn), { AutoCommit => 1 }
+               $dp->get_cxn_params($replica_dsn), { AutoCommit => 1 }
             );
-            PTDEBUG && _d('Connected to', $dp->as_string($slave_dsn));
+            PTDEBUG && _d('Connected to', $dp->as_string($replica_dsn));
          };
          if ( $EVAL_ERROR ) {
-            print STDERR "Cannot connect to ", $dp->as_string($slave_dsn), ": ", $EVAL_ERROR, "\n"
+            print STDERR "Cannot connect to ", $dp->as_string($replica_dsn), ": ", $EVAL_ERROR, "\n"
                or die "Cannot print: $OS_ERROR";
             return;
          }
@@ -2820,10 +2820,10 @@ sub recurse_to_slaves {
 
    DBH: {
       if ( !defined $dbh ) {
-         foreach my $known_slave ( @{$args->{slaves}} ) {
-            if ($known_slave->{dsn}->{h} eq $slave_dsn->{h} and
-                $known_slave->{dsn}->{P} eq $slave_dsn->{P} ) {
-               $dbh = $known_slave->{dbh};
+         foreach my $known_replica ( @{$args->{replicas}} ) {
+            if ($known_replica->{dsn}->{h} eq $replica_dsn->{h} and
+                $known_replica->{dsn}->{P} eq $replica_dsn->{P} ) {
+               $dbh = $known_replica->{dbh};
                last DBH;
             }
          }
@@ -2841,7 +2841,7 @@ sub recurse_to_slaves {
 	   if ( $EVAL_ERROR ) {
 		   if ( $args->{wait_no_die} ) {
 			   print STDERR "Error getting server id: ", $EVAL_ERROR,
-               "\nRetrying query for server ", $slave_dsn->{h}, ":", $slave_dsn->{P}, "\n";
+               "\nRetrying query for server ", $replica_dsn->{h}, ":", $replica_dsn->{P}, "\n";
             sleep 1;
             $dbh->disconnect();
             $get_dbh->();
@@ -2851,12 +2851,12 @@ sub recurse_to_slaves {
       }
    } until (defined $id);
    PTDEBUG && _d('Working on server ID', $id);
-   my $master_thinks_i_am = $dsn->{server_id};
+   my $source_thinks_i_am = $dsn->{server_id};
    if ( !defined $id
-       || ( defined $master_thinks_i_am && $master_thinks_i_am != $id )
+       || ( defined $source_thinks_i_am && $source_thinks_i_am != $id )
        || $args->{server_ids_seen}->{$id}++
    ) {
-      PTDEBUG && _d('Server ID seen, or not what master said');
+      PTDEBUG && _d('Server ID seen, or not what source said');
       if ( $args->{skip_callback} ) {
          $args->{skip_callback}->($dsn, $dbh, $level, $args->{parent});
       }
@@ -2867,51 +2867,51 @@ sub recurse_to_slaves {
 
    if ( !defined $recurse || $level < $recurse ) {
 
-      my @slaves =
-         grep { !$_->{master_id} || $_->{master_id} == $id } # Only my slaves.
-         $self->find_slave_hosts($dp, $dbh, $dsn, $methods);
+      my @replicas =
+         grep { !$_->{source_id} || $_->{source_id} == $id } # Only my replicas.
+         $self->find_replica_hosts($dp, $dbh, $dsn, $methods);
 
-      foreach my $slave ( @slaves ) {
+      foreach my $replica ( @replicas ) {
          PTDEBUG && _d('Recursing from',
-            $dp->as_string($dsn), 'to', $dp->as_string($slave));
-         $self->recurse_to_slaves(
-            { %$args, dsn => $slave, dbh => undef, parent => $dsn, slave_user => $slave_user, $slave_password => $slave_password }, $level + 1 );
+            $dp->as_string($dsn), 'to', $dp->as_string($replica));
+         $self->recurse_to_replicas(
+            { %$args, dsn => $replica, dbh => undef, parent => $dsn, replica_user => $replica_user, $replica_password => $replica_password }, $level + 1 );
       }
    }
 }
 
-sub find_slave_hosts {
+sub find_replica_hosts {
    my ( $self, $dsn_parser, $dbh, $dsn, $methods ) = @_;
 
-   PTDEBUG && _d('Looking for slaves on', $dsn_parser->as_string($dsn),
+   PTDEBUG && _d('Looking for replicas on', $dsn_parser->as_string($dsn),
       'using methods', @$methods);
 
-   my @slaves;
+   my @replicas;
    METHOD:
    foreach my $method ( @$methods ) {
-      my $find_slaves = "_find_slaves_by_$method";
-      PTDEBUG && _d('Finding slaves with', $find_slaves);
-      @slaves = $self->$find_slaves($dsn_parser, $dbh, $dsn);
-      last METHOD if @slaves;
+      my $find_replicas = "_find_replicas_by_$method";
+      PTDEBUG && _d('Finding replicas with', $find_replicas);
+      @replicas = $self->$find_replicas($dsn_parser, $dbh, $dsn);
+      last METHOD if @replicas;
    }
 
-   PTDEBUG && _d('Found', scalar(@slaves), 'slaves');
-   return @slaves;
+   PTDEBUG && _d('Found', scalar(@replicas), 'replicas');
+   return @replicas;
 }
 
-sub _find_slaves_by_processlist {
+sub _find_replicas_by_processlist {
    my ( $self, $dsn_parser, $dbh, $dsn ) = @_;
-   my @connected_slaves = $self->get_connected_slaves($dbh);
-   my @slaves = $self->_process_slaves_list($dsn_parser, $dsn, \@connected_slaves);
-   return @slaves;
+   my @connected_replicas = $self->get_connected_replicas($dbh);
+   my @replicas = $self->_process_replicas_list($dsn_parser, $dsn, \@connected_replicas);
+   return @replicas;
 }
 
-sub _process_slaves_list {
-   my ($self, $dsn_parser, $dsn, $connected_slaves) = @_;
-   my @slaves = map  {
-      my $slave        = $dsn_parser->parse("h=$_", $dsn);
-      $slave->{source} = 'processlist';
-      $slave;
+sub _process_replicas_list {
+   my ($self, $dsn_parser, $dsn, $connected_replicas) = @_;
+   my @replicas = map  {
+      my $replica        = $dsn_parser->parse("h=$_", $dsn);
+      $replica->{source} = 'processlist';
+      $replica;
    }
    grep { $_ }
    map  {
@@ -2923,22 +2923,28 @@ sub _process_slaves_list {
           $host = '['.$host.']';
       }
       $host;
-   } @$connected_slaves;
+   } @$connected_replicas;
 
-   return @slaves;
+   return @replicas;
 }
 
-sub _find_slaves_by_hosts {
+sub _find_replicas_by_hosts {
    my ( $self, $dsn_parser, $dbh, $dsn ) = @_;
 
-   my @slaves;
-   my $sql = 'SHOW SLAVE HOSTS';
+   my @replicas;
+
+   my $vp = VersionParser->new($dbh);
+   my $sql = 'SHOW REPLICAS';
+   if ( $vp < '8.1' || $vp->flavor() =~ m/maria/ ) {
+      $sql = 'SHOW SLAVE HOSTS';
+   }
+   
    PTDEBUG && _d($dbh, $sql);
-   @slaves = @{$dbh->selectall_arrayref($sql, { Slice => {} })};
+   @replicas = @{$dbh->selectall_arrayref($sql, { Slice => {} })};
 
-   if ( @slaves ) {
-      PTDEBUG && _d('Found some SHOW SLAVE HOSTS info');
-      @slaves = map {
+   if ( @replicas ) {
+      PTDEBUG && _d('Found some SHOW REPLICAS info');
+      @replicas = map {
          my %hash;
          @hash{ map { lc $_ } keys %$_ } = values %$_;
          my $spec = "h=$hash{host},P=$hash{port}"
@@ -2946,16 +2952,16 @@ sub _find_slaves_by_hosts {
             . ( $hash{password} ? ",p=$hash{password}" : '');
          my $dsn           = $dsn_parser->parse($spec, $dsn);
          $dsn->{server_id} = $hash{server_id};
-         $dsn->{master_id} = $hash{master_id};
+         $dsn->{source_id} = $hash{source_id};
          $dsn->{source}    = 'hosts';
          $dsn;
-      } @slaves;
+      } @replicas;
    }
 
-   return @slaves;
+   return @replicas;
 }
 
-sub get_connected_slaves {
+sub get_connected_replicas {
    my ( $self, $dbh ) = @_;
 
    my $show = "SHOW GRANTS FOR ";
@@ -3001,79 +3007,103 @@ sub get_connected_slaves {
    @{$dbh->selectall_arrayref($sql, { Slice => {} })};
 }
 
-sub is_master_of {
-   my ( $self, $master, $slave ) = @_;
-   my $master_status = $self->get_master_status($master)
-      or die "The server specified as a master is not a master";
-   my $slave_status  = $self->get_slave_status($slave)
-      or die "The server specified as a slave is not a slave";
-   my @connected     = $self->get_connected_slaves($master)
-      or die "The server specified as a master has no connected slaves";
-   my (undef, $port) = $master->selectrow_array("SHOW VARIABLES LIKE 'port'");
+sub is_source_of {
+   my ( $self, $source, $replica ) = @_;
+
+   my $replica_version = VersionParser->new($replica);
+   my $source_name = 'source';
+   my $source_port = 'source_port';
+   if ( $replica_version < '8.1' || $replica_version->flavor() =~ m/maria/ ) {
+      $source_name = 'master';
+      $source_port = 'master_port';
+   }
+
+   my $source_status = $self->get_source_status($source)
+      or die "The server specified as a source is not a source";
+   my $replica_status  = $self->get_replica_status($replica)
+      or die "The server specified as a replica is not a replica";
+   my @connected     = $self->get_connected_replicas($source)
+      or die "The server specified as a source has no connected replicas";
+   my (undef, $port) = $source->selectrow_array("SHOW VARIABLES LIKE 'port'");
 
-   if ( $port != $slave_status->{master_port} ) {
-      die "The slave is connected to $slave_status->{master_port} "
-         . "but the master's port is $port";
+   if ( $port != $replica_status->{$source_port} ) {
+      die "The replica is connected to $replica_status->{$source_port} "
+         . "but the source's port is $port";
    }
 
-   if ( !grep { $slave_status->{master_user} eq $_->{user} } @connected ) {
-      die "I don't see any slave I/O thread connected with user "
-         . $slave_status->{master_user};
+   if ( !grep { $replica_status->{source_user} eq $_->{user} } @connected ) {
+      die "I don't see any replica I/O thread connected with user "
+         . $replica_status->{source_user};
    }
 
-   if ( ($slave_status->{slave_io_state} || '')
-      eq 'Waiting for master to send event' )
+   if ( ($replica_status->{replica_io_state} || '')
+      eq 'Waiting for ${source_name} to send event' )
    {
-      my ( $master_log_name, $master_log_num )
-         = $master_status->{file} =~ m/^(.*?)\.0*([1-9][0-9]*)$/;
-      my ( $slave_log_name, $slave_log_num )
-         = $slave_status->{master_log_file} =~ m/^(.*?)\.0*([1-9][0-9]*)$/;
-      if ( $master_log_name ne $slave_log_name
-         || abs($master_log_num - $slave_log_num) > 1 )
+      my ( $source_log_name, $source_log_num )
+         = $source_status->{file} =~ m/^(.*?)\.0*([1-9][0-9]*)$/;
+      my ( $replica_log_name, $replica_log_num )
+         = $replica_status->{source_log_file} =~ m/^(.*?)\.0*([1-9][0-9]*)$/;
+      if ( $source_log_name ne $replica_log_name
+         || abs($source_log_num - $replica_log_num) > 1 )
       {
-         die "The slave thinks it is reading from "
-            . "$slave_status->{master_log_file},  but the "
-            . "master is writing to $master_status->{file}";
+         die "The replica thinks it is reading from "
+            . "$replica_status->{source_log_file},  but the "
+            . "source is writing to $source_status->{file}";
       }
    }
    return 1;
 }
 
-sub get_master_dsn {
+sub get_source_dsn {
    my ( $self, $dbh, $dsn, $dsn_parser ) = @_;
-   my $master = $self->get_slave_status($dbh) or return undef;
-   my $spec   = "h=$master->{master_host},P=$master->{master_port}";
+
+   my $vp = VersionParser->new($dbh);
+   my $source_host = 'source_host';
+   my $source_port = 'source_port';
+   if ( $vp < '8.1' || $vp->flavor() =~ m/maria/ ) {
+      $source_host = 'master_host';
+      $source_port = 'master_port';
+   }
+
+   my $source = $self->get_replica_status($dbh) or return undef;
+   my $spec   = "h=$source->{${source_host}},P=$source->{${source_port}}";
    return       $dsn_parser->parse($spec, $dsn);
 }
 
-sub get_slave_status {
+sub get_replica_status {
    my ( $self, $dbh ) = @_;
 
-   if ( !$self->{not_a_slave}->{$dbh} ) {
-      my $sth = $self->{sths}->{$dbh}->{SLAVE_STATUS}
-            ||= $dbh->prepare('SHOW SLAVE STATUS');
-      PTDEBUG && _d($dbh, 'SHOW SLAVE STATUS');
+   my $server_version = VersionParser->new($dbh);
+   my $replica_name = 'replica';
+   if ( $server_version < '8.1' || $server_version->flavor() =~ m/maria/ ) {
+      $replica_name = 'slave';
+   }
+
+   if ( !$self->{not_a_replica}->{$dbh} ) {
+      my $sth = $self->{sths}->{$dbh}->{REPLICA_STATUS}
+            ||= $dbh->prepare("SHOW ${replica_name} STATUS");
+      PTDEBUG && _d($dbh, "SHOW ${replica_name} STATUS");
       $sth->execute();
-      my ($sss_rows) = $sth->fetchall_arrayref({}); # Show Slave Status rows
+      my ($sss_rows) = $sth->fetchall_arrayref({}); # Show Replica Status rows
 
       my $ss;
       if ( $sss_rows && @$sss_rows ) {
           if (scalar @$sss_rows > 1) {
               if (!$self->{channel}) {
-                  die 'This server returned more than one row for SHOW SLAVE STATUS but "channel" was not specified on the command line';
+                  die 'This server returned more than one row for SHOW REPLICA STATUS but "channel" was not specified on the command line';
               }
-              my $slave_use_channels;
+              my $replica_use_channels;
               for my $row (@$sss_rows) {
                   $row = { map { lc($_) => $row->{$_} } keys %$row }; # lowercase the keys
                   if ($row->{channel_name}) {
-                      $slave_use_channels = 1;
+                      $replica_use_channels = 1;
                   }
                   if ($row->{channel_name} eq $self->{channel}) {
                       $ss = $row;
                       last;
                   }
               }
-              if (!$ss && $slave_use_channels) {
+              if (!$ss && $replica_use_channels) {
                  die 'This server is using replication channels but "channel" was not specified on the command line';
               }
           } else {
@@ -3093,28 +3123,34 @@ sub get_slave_status {
           }
       }
 
-      PTDEBUG && _d('This server returns nothing for SHOW SLAVE STATUS');
-      $self->{not_a_slave}->{$dbh}++;
+      PTDEBUG && _d('This server returns nothing for SHOW REPLICA STATUS');
+      $self->{not_a_replica}->{$dbh}++;
   }
 }
 
-sub get_master_status {
+sub get_source_status {
    my ( $self, $dbh ) = @_;
 
-   if ( $self->{not_a_master}->{$dbh} ) {
-      PTDEBUG && _d('Server on dbh', $dbh, 'is not a master');
+   if ( $self->{not_a_source}->{$dbh} ) {
+      PTDEBUG && _d('Server on dbh', $dbh, 'is not a source');
       return;
    }
 
+   my $vp = VersionParser->new($dbh);
+   my $source_name = 'binary log';
+   if ( $vp < '8.1' || $vp->flavor() =~ m/maria/ ) {
+      $source_name = 'master';
+   }
+
    my $sth;
    if ( $self->{sths}->{$dbh} && $dbh && $self->{sths}->{$dbh} == $dbh ) {
-      $sth = $self->{sths}->{$dbh}->{MASTER_STATUS}
-         ||= $dbh->prepare('SHOW MASTER STATUS');
+      $sth = $self->{sths}->{$dbh}->{SOURCE_STATUS}
+         ||= $dbh->prepare("SHOW ${source_name} STATUS");
    }
    else {
-      $sth = $dbh->prepare('SHOW MASTER STATUS');
+      $sth = $dbh->prepare("SHOW ${source_name} STATUS");
    }
-   PTDEBUG && _d($dbh, 'SHOW MASTER STATUS');
+   PTDEBUG && _d($dbh, "SHOW ${source_name} STATUS");
    $sth->execute();
    my ($ms) = @{$sth->fetchall_arrayref({})};
    PTDEBUG && _d(
@@ -3122,42 +3158,46 @@ sub get_master_status {
           : '');
 
    if ( !$ms || scalar keys %$ms < 2 ) {
-      PTDEBUG && _d('Server on dbh', $dbh, 'does not seem to be a master');
-      $self->{not_a_master}->{$dbh}++;
+      PTDEBUG && _d('Server on dbh', $dbh, 'does not seem to be a source');
+      $self->{not_a_source}->{$dbh}++;
    }
 
   return { map { lc($_) => $ms->{$_} } keys %$ms }; # lowercase the keys
 }
 
-sub wait_for_master {
+sub wait_for_source {
    my ( $self, %args ) = @_;
-   my @required_args = qw(master_status slave_dbh);
+   my @required_args = qw(source_status replica_dbh);
    foreach my $arg ( @required_args ) {
       die "I need a $arg argument" unless $args{$arg};
    }
-   my ($master_status, $slave_dbh) = @args{@required_args};
+   my ($source_status, $replica_dbh) = @args{@required_args};
    my $timeout       = $args{timeout} || 60;
 
    my $result;
    my $waited;
-   if ( $master_status ) {
-      my $slave_status;
+   if ( $source_status ) {
+      my $replica_status;
       eval {
-          $slave_status = $self->get_slave_status($slave_dbh);
+          $replica_status = $self->get_replica_status($replica_dbh);
       };
       if ($EVAL_ERROR) {
           return {
               result => undef,
               waited => 0,
-              error  =>'Wait for master: this is a multi-master slave but "channel" was not specified on the command line',
+              error  =>'Wait for source: this is a multi-source replica but "channel" was not specified on the command line',
           };
       }
-      my $server_version = VersionParser->new($slave_dbh);
-      my $channel_sql = $server_version > '5.6' && $self->{channel} ? ", '$self->{channel}'" : '';
-      my $sql = "SELECT MASTER_POS_WAIT('$master_status->{file}', $master_status->{position}, $timeout $channel_sql)";
-      PTDEBUG && _d($slave_dbh, $sql);
+      my $vp = VersionParser->new($replica_dbh);
+      my $source_name = 'source';
+      if ( $vp < '8.1' || $vp->flavor() =~ m/maria/ ) {
+         $source_name = 'master';
+      }
+      my $channel_sql = $vp > '5.6' && $self->{channel} ? ", '$self->{channel}'" : '';
+      my $sql = "SELECT ${source_name}_POS_WAIT('$source_status->{file}', $source_status->{position}, $timeout $channel_sql)";
+      PTDEBUG && _d($replica_dbh, $sql);
       my $start = time;
-      ($result) = $slave_dbh->selectrow_array($sql);
+      ($result) = $replica_dbh->selectrow_array($sql);
 
       $waited = time - $start;
 
@@ -3165,7 +3205,7 @@ sub wait_for_master {
       PTDEBUG && _d("Waited", $waited, "seconds");
    }
    else {
-      PTDEBUG && _d('Not waiting: this server is not a master');
+      PTDEBUG && _d('Not waiting: this server is not a source');
    }
 
    return {
@@ -3174,75 +3214,96 @@ sub wait_for_master {
    };
 }
 
-sub stop_slave {
+sub stop_replica {
    my ( $self, $dbh ) = @_;
-   my $sth = $self->{sths}->{$dbh}->{STOP_SLAVE}
-         ||= $dbh->prepare('STOP SLAVE');
+   my $vp = VersionParser->new($dbh);
+   my $replica_name = 'replica';
+   if ( $vp < '8.1' || $vp->flavor() =~ m/maria/ ) {
+      $replica_name = 'slave';
+   }
+   my $sth = $self->{sths}->{$dbh}->{STOP_REPLICA}
+         ||= $dbh->prepare("STOP ${replica_name}");
    PTDEBUG && _d($dbh, $sth->{Statement});
    $sth->execute();
 }
 
-sub start_slave {
+sub start_replica {
    my ( $self, $dbh, $pos ) = @_;
+
+   my $vp = VersionParser->new($dbh);
+   my $source_name = 'source';
+   my $replica_name = 'replica';
+   if ( $vp < '8.1' || $vp->flavor() =~ m/maria/ ) {
+      $source_name = 'master';
+      $replica_name = 'slave';
+   }
+
    if ( $pos ) {
-      my $sql = "START SLAVE UNTIL MASTER_LOG_FILE='$pos->{file}', "
-              . "MASTER_LOG_POS=$pos->{position}";
+      my $sql = "START ${replica_name} UNTIL ${source_name}_LOG_FILE='$pos->{file}', "
+              . "${source_name}_LOG_POS=$pos->{position}";
       PTDEBUG && _d($dbh, $sql);
       $dbh->do($sql);
    }
    else {
-      my $sth = $self->{sths}->{$dbh}->{START_SLAVE}
-            ||= $dbh->prepare('START SLAVE');
+      my $sth = $self->{sths}->{$dbh}->{START_REPLICA}
+            ||= $dbh->prepare("START ${replica_name}");
       PTDEBUG && _d($dbh, $sth->{Statement});
       $sth->execute();
    }
 }
 
-sub catchup_to_master {
-   my ( $self, $slave, $master, $timeout ) = @_;
-   $self->stop_slave($master);
-   $self->stop_slave($slave);
-   my $slave_status  = $self->get_slave_status($slave);
-   my $slave_pos     = $self->repl_posn($slave_status);
-   my $master_status = $self->get_master_status($master);
-   my $master_pos    = $self->repl_posn($master_status);
-   PTDEBUG && _d('Master position:', $self->pos_to_string($master_pos),
-      'Slave position:', $self->pos_to_string($slave_pos));
+sub catchup_to_source {
+   my ( $self, $replica, $source, $timeout ) = @_;
+   $self->stop_replica($source);
+   $self->stop_replica($replica);
+   my $replica_status  = $self->get_replica_status($replica);
+   my $replica_pos     = $self->repl_posn($replica_status);
+   my $source_status = $self->get_source_status($source);
+   my $source_pos    = $self->repl_posn($source_status);
+   PTDEBUG && _d('Source position:', $self->pos_to_string($source_pos),
+      'Replica position:', $self->pos_to_string($replica_pos));
 
    my $result;
-   if ( $self->pos_cmp($slave_pos, $master_pos) < 0 ) {
-      PTDEBUG && _d('Waiting for slave to catch up to master');
-      $self->start_slave($slave, $master_pos);
+   if ( $self->pos_cmp($replica_pos, $source_pos) < 0 ) {
+      PTDEBUG && _d('Waiting for replica to catch up to source');
+      $self->start_replica($replica, $source_pos);
 
-      $result = $self->wait_for_master(
-            master_status => $master_status,
-            slave_dbh     => $slave,
+      $result = $self->wait_for_source(
+            source_status => $source_status,
+            replica_dbh   => $replica,
             timeout       => $timeout,
-            master_status => $master_status
+            source_status => $source_status
       );
       if ($result->{error}) {
           die $result->{error};
       }
       if ( !defined $result->{result} ) {
-         $slave_status = $self->get_slave_status($slave);
-         if ( !$self->slave_is_running($slave_status) ) {
-            PTDEBUG && _d('Master position:',
-               $self->pos_to_string($master_pos),
-               'Slave position:', $self->pos_to_string($slave_pos));
-            $slave_pos = $self->repl_posn($slave_status);
-            if ( $self->pos_cmp($slave_pos, $master_pos) != 0 ) {
-               die "MASTER_POS_WAIT() returned NULL but slave has not "
-                  . "caught up to master";
+         $replica_status = $self->get_replica_status($replica);
+            
+         my $vp = VersionParser->new($replica);
+         my $replica_name = 'replica';
+         if ( $vp < '8.1' || $vp->flavor() =~ m/maria/ ) {
+            $replica_name = 'slave';
+         }
+
+         if ( !$self->replica_is_running($replica_status, $replica_name) ) {
+            PTDEBUG && _d('Source position:',
+               $self->pos_to_string($source_pos),
+               'Replica position:', $self->pos_to_string($replica_pos));
+            $replica_pos = $self->repl_posn($replica_status);
+            if ( $self->pos_cmp($replica_pos, $source_pos) != 0 ) {
+               die "SOURCE_POS_WAIT() returned NULL but replica has not "
+                  . "caught up to source";
             }
-            PTDEBUG && _d('Slave is caught up to master and stopped');
+            PTDEBUG && _d('Replica is caught up to source and stopped');
          }
          else {
-            die "Slave has not caught up to master and it is still running";
+            die "Replica has not caught up to source and it is still running";
          }
       }
    }
    else {
-      PTDEBUG && _d("Slave is already caught up to master");
+      PTDEBUG && _d("Replica is already caught up to source");
    }
 
    return $result;
@@ -3250,26 +3311,38 @@ sub catchup_to_master {
 
 sub catchup_to_same_pos {
    my ( $self, $s1_dbh, $s2_dbh ) = @_;
-   $self->stop_slave($s1_dbh);
-   $self->stop_slave($s2_dbh);
-   my $s1_status = $self->get_slave_status($s1_dbh);
-   my $s2_status = $self->get_slave_status($s2_dbh);
+   $self->stop_replica($s1_dbh);
+   $self->stop_replica($s2_dbh);
+   my $s1_status = $self->get_replica_status($s1_dbh);
+   my $s2_status = $self->get_replica_status($s2_dbh);
    my $s1_pos    = $self->repl_posn($s1_status);
    my $s2_pos    = $self->repl_posn($s2_status);
    if ( $self->pos_cmp($s1_pos, $s2_pos) < 0 ) {
-      $self->start_slave($s1_dbh, $s2_pos);
+      $self->start_replica($s1_dbh, $s2_pos);
    }
    elsif ( $self->pos_cmp($s2_pos, $s1_pos) < 0 ) {
-      $self->start_slave($s2_dbh, $s1_pos);
+      $self->start_replica($s2_dbh, $s1_pos);
    }
 
-   $s1_status = $self->get_slave_status($s1_dbh);
-   $s2_status = $self->get_slave_status($s2_dbh);
+   $s1_status = $self->get_replica_status($s1_dbh);
+   $s2_status = $self->get_replica_status($s2_dbh);
    $s1_pos    = $self->repl_posn($s1_status);
    $s2_pos    = $self->repl_posn($s2_status);
 
-   if ( $self->slave_is_running($s1_status)
-     || $self->slave_is_running($s2_status)
+   my $vp1 = VersionParser->new($s1_dbh);
+   my $replica1_name = 'replica';
+   if ( $vp1 < '8.1' || $vp1->flavor() =~ m/maria/ ) {
+      $replica1_name = 'slave';
+   }
+
+   my $vp2 = VersionParser->new($s2_dbh);
+   my $replica2_name = 'replica';
+   if ( $vp2 < '8.1' || $vp2->flavor() =~ m/maria/ ) {
+      $replica2_name = 'slave';
+   }
+
+   if ( $self->replica_is_running($s1_status, $replica1_name)
+     || $self->replica_is_running($s2_status, $replica2_name)
      || $self->pos_cmp($s1_pos, $s2_pos) != 0)
    {
       die "The servers aren't both stopped at the same position";
@@ -3277,14 +3350,21 @@ sub catchup_to_same_pos {
 
 }
 
-sub slave_is_running {
-   my ( $self, $slave_status ) = @_;
-   return ($slave_status->{slave_sql_running} || 'No') eq 'Yes';
+sub replica_is_running {
+   my ( $self, $replica_status, $replica_name ) = @_;
+   return ($replica_status->{"${replica_name}_sql_running"} || 'No') eq 'Yes';
 }
 
-sub has_slave_updates {
+sub has_replica_updates {
    my ( $self, $dbh ) = @_;
-   my $sql = q{SHOW VARIABLES LIKE 'log_slave_updates'};
+   
+   my $vp = VersionParser->new($dbh);
+   my $replica_name = 'replica';
+   if ( $vp < '8.1' || $vp->flavor() =~ m/maria/ ) {
+      $replica_name = 'slave';
+   }
+
+   my $sql = qq{SHOW VARIABLES LIKE 'log_${replica_name}_updates'};
    PTDEBUG && _d($dbh, $sql);
    my ($name, $value) = $dbh->selectrow_array($sql);
    return $value && $value =~ m/^(1|ON)$/;
@@ -3298,6 +3378,12 @@ sub repl_posn {
          position => $status->{position},
       };
    }
+   elsif ( exists $status->{relay_source_log_file} && exists $status->{exec_source_log_pos} ) {
+      return {
+         file     => $status->{relay_source_log_file},
+         position => $status->{exec_source_log_pos},
+      };
+   }
    else {
       return {
          file     => $status->{relay_master_log_file},
@@ -3306,11 +3392,18 @@ sub repl_posn {
    }
 }
 
-sub get_slave_lag {
+sub get_replica_lag {
    my ( $self, $dbh ) = @_;
-   my $stat = $self->get_slave_status($dbh);
-   return unless $stat;  # server is not a slave
-   return $stat->{seconds_behind_master};
+   
+   my $vp = VersionParser->new($dbh);
+   my $source_name = 'source';
+   if ( $vp < '8.1' || $vp->flavor() =~ m/maria/ ) {
+      $source_name = 'master';
+   }
+
+   my $stat = $self->get_replica_status($dbh);
+   return unless $stat;  # server is not a replica
+   return $stat->{"seconds_behind_${source_name}"};
 }
 
 sub pos_cmp {
@@ -3321,9 +3414,9 @@ sub pos_cmp {
 sub short_host {
    my ( $self, $dsn ) = @_;
    my ($host, $port);
-   if ( $dsn->{master_host} ) {
-      $host = $dsn->{master_host};
-      $port = $dsn->{master_port};
+   if ( $dsn->{source_host} ) {
+      $host = $dsn->{source_host};
+      $port = $dsn->{source_port};
    }
    else {
       $host = $dsn->{h};
@@ -3338,7 +3431,7 @@ sub is_replication_thread {
 
    my $type = lc($args{type} || 'all');
    die "Invalid type: $type"
-      unless $type =~ m/^binlog_dump|slave_io|slave_sql|all$/i;
+      unless $type =~ m/^binlog_dump|slave_io|slave_sql|replica_io|replica_sql|all$/i;
 
    my $match = 0;
    if ( $type =~ m/binlog_dump|all/i ) {
@@ -3347,7 +3440,7 @@ sub is_replication_thread {
    }
    if ( !$match ) {
       if ( ($query->{User} || $query->{user} || '') eq "system user" ) {
-         PTDEBUG && _d("Slave replication thread");
+         PTDEBUG && _d("Replica replication thread");
          if ( $type ne 'all' ) {
             my $state = $query->{State} || $query->{state} || '';
 
@@ -3356,15 +3449,16 @@ sub is_replication_thread {
                $match = 1;
             }
             else {
-               my ($slave_sql) = $state =~ m/
+               my ($replica_sql) = $state =~ m/
                   ^(Waiting\sfor\sthe\snext\sevent
                    |Reading\sevent\sfrom\sthe\srelay\slog
                    |Has\sread\sall\srelay\slog;\swaiting
                    |Making\stemp\sfile
-                   |Waiting\sfor\sslave\smutex\son\sexit)/xi;
+                   |Waiting\sfor\sslave\smutex\son\sexit
+                   |Waiting\sfor\sreplica\smutex\son\sexit)/xi;
 
-               $match = $type eq 'slave_sql' &&  $slave_sql ? 1
-                      : $type eq 'slave_io'  && !$slave_sql ? 1
+               $match = $type eq 'replica_sql' &&  $replica_sql ? 1
+                      : $type eq 'replica_io'  && !$replica_sql ? 1
                       :                                       0;
             }
          }
@@ -3405,9 +3499,15 @@ sub get_replication_filters {
    }
    my ($dbh) = @args{@required_args};
 
+   my $vp = VersionParser->new($dbh);
+   my $replica_name = 'replica';
+   if ( $vp < '8.1' || $vp->flavor() =~ m/maria/ ) {
+      $replica_name = 'slave';
+   }
+
    my %filters = ();
 
-   my $status = $self->get_master_status($dbh);
+   my $status = $self->get_source_status($dbh);
    if ( $status ) {
       map { $filters{$_} = $status->{$_} }
       grep { defined $status->{$_} && $status->{$_} ne '' }
@@ -3417,7 +3517,7 @@ sub get_replication_filters {
       );
    }
 
-   $status = $self->get_slave_status($dbh);
+   $status = $self->get_replica_status($dbh);
    if ( $status ) {
       map { $filters{$_} = $status->{$_} }
       grep { defined $status->{$_} && $status->{$_} ne '' }
@@ -3430,10 +3530,10 @@ sub get_replication_filters {
          replicate_wild_ignore_table
       );
 
-      my $sql = "SHOW VARIABLES LIKE 'slave_skip_errors'";
+      my $sql = "SHOW VARIABLES LIKE '${replica_name}_skip_errors'";
       PTDEBUG && _d($dbh, $sql);
       my $row = $dbh->selectrow_arrayref($sql);
-      $filters{slave_skip_errors} = $row->[1] if $row->[1] && $row->[1] ne 'OFF';
+      $filters{replica_skip_errors} = $row->[1] if $row->[1] && $row->[1] ne 'OFF';
    }
 
    return \%filters;
@@ -5216,31 +5316,43 @@ sub main {
    }
 
    # ########################################################################
-   # Start monitoring the slave.
+   # Set source and replica names.
+   # ########################################################################
+
+   my $vp = VersionParser->new($dbh);
+   my $source_name = 'source';
+   my $replica_name = 'replica';
+   if ( $vp < '8.1' || $vp->flavor() =~ m/maria/ ) {
+      $source_name = 'master';
+      $replica_name = 'slave';
+   }
+
+   # ########################################################################
+   # Start monitoring the replica.
    # ########################################################################
    my $exit_status = 0;
    my @servers_to_watch;
 
-   # Despite the name, recursing to slaves actually begins at the specified
-   # server, so the named server may also be watched, if it's a slave.
+   # Despite the name, recursing to replicas actually begins at the specified
+   # server, so the named server may also be watched, if it's a replica.
    my $ms = new MasterSlave(
       OptionParser => $o,
       DSNParser    => $dp,
       Quoter       => $q,
    );
-   $ms->recurse_to_slaves(
+   $ms->recurse_to_replicas(
       {  dbh      => $dbh,
          dsn      => $dsn,
          callback => sub {
             my ( $dsn, $dbh, $level ) = @_;
             # Test whether we want to watch this server.
             eval {
-               my $stat = $ms->get_slave_status($dbh);
+               my $stat = $ms->get_replica_status($dbh);
                if ( $stat ) {
                   push @servers_to_watch, { dsn => $dsn, dbh => $dbh };
                }
                else {
-                  die "could not find slave status on this server\n";
+                  die "could not find ${replica_name} status on this server\n";
                }
             };
             if ( $EVAL_ERROR ) {
@@ -5312,11 +5424,20 @@ sub watch_server {
    PTDEBUG && _d('Watching server', $dp->as_string($dsn),
       'forked:', $was_forked);
 
-   my $start_sql = VersionParser->new($dbh) >= '4.0.5'
-                 ? 'START SLAVE' : 'SLAVE START';
+   my $vp = VersionParser->new($dbh);
+   my $source_name   = 'source';
+   my $source_change = 'replication source';
+   my $replica_name  = 'replica';
+   if ( $vp < '8.1' || $vp->flavor() =~ m/maria/ ) {
+      $source_name   = 'master';
+      $source_change = 'master';
+      $replica_name  = 'slave';
+   }
+
+   my $start_sql = $vp >= '4.0.5' ? "START ${replica_name}" : 'SLAVE START';
    if ( $o->get('until-master') ) {
       my ( $file, $pos ) = split(',', $o->get('until-master'));
-      $start_sql .= " UNTIL MASTER_LOG_FILE = '$file', MASTER_LOG_POS = $pos";
+      $start_sql .= " UNTIL ${source_name}_LOG_FILE = '$file', ${source_name}_LOG_POS = $pos";
    }
    elsif ( $o->get('until-relay') ) {
       my ( $file, $pos ) = split(',', $o->get('until-relay'));
@@ -5324,13 +5445,13 @@ sub watch_server {
    }
 
    my $start = $dbh->prepare($start_sql);
-   my $stop  = $dbh->prepare('STOP SLAVE');
+   my $stop  = $dbh->prepare("STOP ${replica_name}");
 
    # ########################################################################
    # Detect if GTID is enabled. Skipping an event is done differently.
    # ########################################################################
    # When MySQL 5.6.5 or higher is used and gtid is enabled, skipping a
-   # transaction is not possible with SQL_SLAVE_SKIP_COUNTER
+   # transaction is not possible with SQL_REPLICA_SKIP_COUNTER
    my $skip_event;
    my $have_gtid = 0;
    # We also check if version is lower than 10.0.0 because MariaDB has different
@@ -5344,14 +5465,14 @@ sub watch_server {
    }
    PTDEBUG && _d('Have GTID:', $have_gtid);
 
-   # If GTID is enabled, slave_parallel_workers should be == 0.
+   # If GTID is enabled, replica_parallel_workers should be == 0.
    # It's currently not possible to know what GTID event the failed trx is.
    if ( $have_gtid ) {
       my $threads = $dbh->selectrow_hashref(
-         'SELECT @@GLOBAL.slave_parallel_workers AS threads');
+         "SELECT \@\@GLOBAL.${replica_name}_parallel_workers AS threads");
       if ( $threads->{threads} > 0 ) {
          die "Cannot skip transactions properly because GTID is enabled "
-            . "and slave_parallel_workers > 0.  See 'GLOBAL TRANSACTION IDS' "
+            . "and ${replica_name}_parallel_workers > 0.  See 'GLOBAL TRANSACTION IDS' "
             . "in the tool's documentation.\n";
       }
    }
@@ -5374,32 +5495,33 @@ sub watch_server {
       refetch_relay_log => sub {
          my ( $stat, $dbh ) = @_;
          PTDEBUG && _d('Found relay log corruption');
-         # Can't do CHANGE MASTER TO with a running slave.
+         # Can't do CHANGE MASTER TO with a running replica.
          $stop->execute();
 
          # Cannot use ? placeholders for CHANGE MASTER values:
          # https://bugs.launchpad.net/percona-toolkit/+bug/932614
-         my $sql = "CHANGE MASTER TO "
-                 . "MASTER_LOG_FILE='$stat->{relay_master_log_file}', "
-                 . "MASTER_LOG_POS=$stat->{exec_master_log_pos}";
+         my $sql = "CHANGE ${source_change} TO "
+                 . "${source_name}_LOG_FILE='" 
+                 . $stat->{"relay_${source_name}_log_file"} . "', "
+                 . "${source_name}_LOG_POS=" . $stat->{"exec_${source_name}_log_pos"};
          PTDEBUG && _d($sql);
          $dbh->do($sql);
       },
       skip => sub {
          my ( $stat, $dbh ) = @_;
-         my $set_skip = $dbh->prepare("SET GLOBAL SQL_SLAVE_SKIP_COUNTER = "
+         my $set_skip = $dbh->prepare("SET GLOBAL SQL_${replica_name}_SKIP_COUNTER = "
                           . $o->get('skip-count'));
          $set_skip->execute();
       },
       skip_gtid => sub {
          my ( $stat, $dbh ) = @_;
 
-         # Get master_uuid from SHOW SLAVE STATUS if a UUID is not specified
-         # with --master-uuid.
-         my $gtid_uuid = $o->get('master-uuid');
+         # Get master_uuid from SHOW REPLICA STATUS if a UUID is not specified
+         # with --source-uuid.
+         my $gtid_uuid = $o->get("${source_name}-uuid");
          if ( !$gtid_uuid ) {
-            $gtid_uuid = $stat->{master_uuid};
-            die "No master_uuid" unless $gtid_uuid;  # shouldn't happen
+            $gtid_uuid = $stat->{"${source_name}_uuid"};
+            die "No ${source_name}_uuid" unless $gtid_uuid;  # shouldn't happen
          }
 
          # We need the highest transaction in the executed_gtid_set.
@@ -5407,8 +5529,8 @@ sub watch_server {
          # Notes:
          #  - does not work with parallel replication
          #  - it skips the next transaction from the master_uuid
-         #    (when a slaveB is replicating from slaveA,
-         #     the master_uuid is it's own master, slaveA)
+         #    (when a replicaB is replicating from replicaA,
+         #     the master_uuid is it's own master, replicaA)
          my ($gtid_exec_ids) = ($stat->{executed_gtid_set} || '') =~ m/$gtid_uuid([0-9-:]*)/;
          $gtid_exec_ids =~ s/:[0-9]+-/:/g;
          die "No executed GTIDs" unless $gtid_exec_ids;
@@ -5422,10 +5544,10 @@ sub watch_server {
          my $gtid_exec_last   = $gtid_exec_sorted[-1];
 
          PTDEBUG && _d("\n",
-            "GTID: master_uuid:",         $gtid_uuid, "\n",
-            "GTID: executed_gtid_set:",   $gtid_exec_ids, "\n",
-            "GTID: max for master_uuid:", $gtid_exec_sorted[-1], "\n",
-            "GTID: last executed gtid:",  $gtid_uuid, ":", $gtid_exec_last);
+            "GTID: ${source_name}_uuid:",         $gtid_uuid, "\n",
+            "GTID: executed_gtid_set:",           $gtid_exec_ids, "\n",
+            "GTID: max for ${source_name}_uuid:", $gtid_exec_sorted[-1], "\n",
+            "GTID: last executed gtid:",          $gtid_uuid, ":", $gtid_exec_last);
 
          # Set the sessions next gtid, write an empty transaction
          my $skipped = 0;
@@ -5460,15 +5582,15 @@ sub watch_server {
    my $sleep     = $o->get('sleep');
    my ($last_log, $last_pos);
 
-   my $stat = {}; # Will hold SHOW SLAVE STATUS
+   my $stat = {}; # Will hold SHOW REPLICA STATUS
    STAT:
    while ( $stat
            && (!$o->get('run-time') || time() < $exit_time)
            && !-f $o->get('sentinel') ) {
       my $increase_sleep = 1;
-      $stat = $ms->get_slave_status($dbh);
+      $stat = $ms->get_replica_status($dbh);
       if ( !$stat ) {
-         print STDERR "No SLAVE STATUS output found on ",
+         print STDERR "No ${replica_name} STATUS output found on ",
             $dp->as_string($dsn), "\n";
          next STAT;
       }
@@ -5481,20 +5603,20 @@ sub watch_server {
            || $last_log ne $stat->{relay_log_file}   # Avoid infinite loops
            || $last_pos != $stat->{relay_log_pos}
       ) {
-         $stat->{slave_sql_running} ||= 'No';
+         $stat->{"${replica_name}_sql_running"} ||= 'No';
          $stat->{last_error}        ||= '';
          $stat->{last_errno}        ||= 0;
 
-         if ( $o->get('until-master') && pos_ge($stat, 'master') ) {
-            die "Slave has advanced past " . $o->get('until-master')
+         if ( $o->get('until-master') && pos_ge($stat, $source_name, $source_name) ) {
+            die "Replica has advanced past " . $o->get('until-master')
                . " on master.\n";
          }
-         elsif ( $o->get('until-relay') && pos_ge($stat, 'relay') ) {
-            die "Slave has advanced past " . $o->get('until-relay')
+         elsif ( $o->get('until-relay') && pos_ge($stat, 'relay', $source_name) ) {
+            die "Replica has advanced past " . $o->get('until-relay')
                . " in relay logs.\n";
          }
 
-         if ( $stat->{slave_sql_running} eq 'No' ) {
+         if ( $stat->{"${replica_name}_sql_running"} eq 'No' ) {
             # Print the time, error, etc
             if ( $o->get('verbose') ) {
                my $err = '';
@@ -5549,19 +5671,19 @@ sub watch_server {
                }
             }
             else {
-               PTDEBUG && _d('The slave is stopped, but without error');
+               PTDEBUG && _d('The replica is stopped, but without error');
                $increase_sleep = 1;
             }
          }
          elsif ( $o->get('verbose') > 2 ) {
             printf("%s delayed %s sec\n", $dp->as_string($dsn),
-               (defined $stat->{seconds_behind_master} ?
-               $stat->{seconds_behind_master} : 'NULL'));
+               (defined $stat->{"seconds_behind_${source_name}"} ?
+               $stat->{"seconds_behind_${source_name}"} : 'NULL'));
          }
       }
       else {
          if ( $o->get('verbose') ) {
-            print "Not checking slave because relay log file or position has "
+            print "Not checking replica because relay log file or position has "
                . "not changed "
                . "(file " . ($last_log || '')
                . " pos "  . ($last_pos || '') . ")\n";
@@ -5600,10 +5722,10 @@ sub watch_server {
 # Determines if the $stat's log coordinates are greater than or equal to the
 # desired coordinates. $which is 'master' or 'relay'
 sub pos_ge {
-   my ( $stat, $which ) = @_;
+   my ( $stat, $which, $source_name ) = @_;
    my $fmt  = '%s/%020d';
-   my $curr = $which eq 'master'
-      ? sprintf($fmt, @{$stat}{qw(relay_master_log_file exec_master_log_pos)})
+   my $curr = $which eq $source_name
+      ? sprintf($fmt, @{$stat}{("relay_${source_name}_log_file", "exec_${source_name}_log_pos")})
       : sprintf($fmt, @{$stat}{qw(relay_log_file relay_log_pos)});
    my $stop = sprintf($fmt, split(',', $o->get("until-$which")));
    return $curr ge $stop;
@@ -6024,7 +6146,7 @@ type: int; default: 1
 
 Number of statements to skip when restarting the slave.
 
-=item --master-uuid
+=item --source-uuid
 
 type: string
 
diff --git a/bin/pt-stalk b/bin/pt-stalk
index d30c7e33d..3909a7c84 100755
--- a/bin/pt-stalk
+++ b/bin/pt-stalk
@@ -1028,7 +1028,11 @@ collect_mysql_data_loop() {
       (echo $ts; ps_prepared_statements "$d/prepared_statements.isrunnning") >> "$d/$p-prepared-statements" &
    fi
 
-   slave_status "$d/$p-slave-status" "${mysql_version}"
+   local replica_name='replica'
+   if [ "${mysql_version}" '<' "8.1" ]; then
+      replica_name="slave"
+   fi
+   replica_status "$d/$p-${replica_name}-status" "${mysql_version}"
 }
 
 collect_system_data_loop() {
@@ -1312,14 +1316,13 @@ ps_prepared_statements() {
    fi
 }
 
-slave_status() {
+replica_status() {
    local outfile=$1
    local mysql_version=$2
 
+   local sql="SHOW REPLICA STATUS\G"
    if [ "${mysql_version}" '<' "8.1" ]; then
-      local sql="SHOW SLAVE STATUS\G"
-   else
-      local sql="SHOW REPLICA STATUS\G"
+      sql="SHOW SLAVE STATUS\G"
    fi
 
    echo -e "\n$sql\n" >> $outfile
diff --git a/bin/pt-summary b/bin/pt-summary
index 0013b44ec..06cf86285 100755
--- a/bin/pt-summary
+++ b/bin/pt-summary
@@ -761,7 +761,7 @@ section () {
 }
 
 NAME_VAL_LEN=12
-name_val () {
+name_val() {
    printf "%+*s | %s\n" "${NAME_VAL_LEN}" "$1" "$2"
 }
 
@@ -787,7 +787,7 @@ shorten() {
    '
 }
 
-group_concat () {
+group_concat() {
    sed -e '{H; $!d;}' -e 'x' -e 's/\n[[:space:]]*\([[:digit:]]*\)[[:space:]]*/, \1x/g' -e 's/[[:space:]][[:space:]]*/ /g' -e 's/, //' "${1}"
 }
 
diff --git a/bin/pt-table-checksum b/bin/pt-table-checksum
index 976349d7b..141bc24bd 100755
--- a/bin/pt-table-checksum
+++ b/bin/pt-table-checksum
@@ -1581,7 +1581,7 @@ sub get_cxn_params {
       $dsn = 'DBI:mysql:' . ( $info->{D} || '' ) . ';'
          . join(';', map  { "$opts{$_}->{dsn}=$info->{$_}" }
                      grep { defined $info->{$_} }
-                     qw(F h P S A))
+                     qw(F h P S A s))
          . ';mysql_read_default_group=client'
          . ($info->{L} ? ';mysql_local_infile=1' : '');
    }
@@ -4052,29 +4052,29 @@ sub autodetect_nodes {
       seen_ids => $seen_ids
    );
 
-   my $new_slaves = [];
+   my $new_replicas = [];
    foreach my $node (@$new_nodes) {
-      my $node_slaves = $ms->get_slaves(
+      my $node_replicas = $ms->get_replicas(
          dbh      => $node->dbh(),
          dsn      => $node->dsn(),
          make_cxn => $make_cxn,
       );
-      push @$new_slaves, @$node_slaves;
+      push @$new_replicas, @$node_replicas;
    }
 
-   $new_slaves = $self->remove_duplicate_cxns(
-      cxns     => $new_slaves,
+   $new_replicas = $self->remove_duplicate_cxns(
+      cxns     => $new_replicas,
       seen_ids => $seen_ids
    );
 
-   my @new_slave_nodes = grep { $self->is_cluster_node($_) } @$new_slaves;
+   my @new_replica_nodes = grep { $self->is_cluster_node($_) } @$new_replicas;
 
-   my $slaves_of_slaves = $self->autodetect_nodes(
+   my $replicas_of_replicas = $self->autodetect_nodes(
          %args,
-         nodes => \@new_slave_nodes,
+         nodes => \@new_replica_nodes,
    );
 
-   my @autodetected_nodes = ( @$new_nodes, @$new_slaves, @$slaves_of_slaves );
+   my @autodetected_nodes = ( @$new_nodes, @$new_replicas, @$replicas_of_replicas );
    return \@autodetected_nodes;
 }
 
@@ -5202,7 +5202,7 @@ sub new {
    return bless $self, $class;
 }
 
-sub get_slaves {
+sub get_replicas {
    my ($self, %args) = @_;
    my @required_args = qw(make_cxn);
    foreach my $arg ( @required_args ) {
@@ -5210,11 +5210,11 @@ sub get_slaves {
    }
    my ($make_cxn) = @args{@required_args};
 
-   my $slaves  = [];
+   my $replicas  = [];
    my $dp      = $self->{DSNParser};
    my $methods = $self->_resolve_recursion_methods($args{dsn});
 
-   return $slaves unless @$methods;
+   return $replicas unless @$methods;
 
    if ( grep { m/processlist|hosts/i } @$methods ) {
       my @required_args = qw(dbh dsn);
@@ -5224,26 +5224,26 @@ sub get_slaves {
       my ($dbh, $dsn) = @args{@required_args};
       my $o = $self->{OptionParser};
 
-      $self->recurse_to_slaves(
-         {  dbh            => $dbh,
-            dsn            => $dsn,
-            slave_user     => $o->got('replica-user') ? $o->get('replica-user') : '',
-            slave_password => $o->got('replica-password') ? $o->get('replica-password') : '',
-            slaves         => $args{slaves},
+      $self->recurse_to_replicas(
+         {  dbh              => $dbh,
+            dsn              => $dsn,
+            replica_user     => $o->got('replica-user') ? $o->get('replica-user') : '',
+            replica_password => $o->got('replica-password') ? $o->get('replica-password') : '',
+            replicas         => $args{replicas},
             callback  => sub {
                my ( $dsn, $dbh, $level, $parent ) = @_;
                return unless $level;
-               PTDEBUG && _d('Found slave:', $dp->as_string($dsn));
-               my $slave_dsn = $dsn;
+               PTDEBUG && _d('Found replica:', $dp->as_string($dsn));
+               my $replica_dsn = $dsn;
                if ($o->got('replica-user')) {
-                  $slave_dsn->{u} = $o->get('replica-user');
-                  PTDEBUG && _d("Using slave user ".$o->get('replica-user')." on ".$slave_dsn->{h}.":".$slave_dsn->{P});
+                  $replica_dsn->{u} = $o->get('replica-user');
+                  PTDEBUG && _d("Using replica user ".$o->get('replica-user')." on ".$replica_dsn->{h}.":".$replica_dsn->{P});
                }
                if ($o->got('replica-password')) {
-                  $slave_dsn->{p} = $o->get('replica-password');
-                  PTDEBUG && _d("Slave password set");
+                  $replica_dsn->{p} = $o->get('replica-password');
+                  PTDEBUG && _d("Replica password set");
                }
-               push @$slaves, $make_cxn->(dsn => $slave_dsn, dbh => $dbh, parent => $parent);
+               push @$replicas, $make_cxn->(dsn => $replica_dsn, dbh => $dbh, parent => $parent);
                return;
             },
             wait_no_die => $args{'wait_no_die'},
@@ -5251,20 +5251,20 @@ sub get_slaves {
       );
    } elsif ( $methods->[0] =~ m/^dsn=/i ) {
       (my $dsn_table_dsn = join ",", @$methods) =~ s/^dsn=//i;
-      $slaves = $self->get_cxn_from_dsn_table(
+      $replicas = $self->get_cxn_from_dsn_table(
          %args,
          dsn_table_dsn => $dsn_table_dsn,
          wait_no_die => $args{'wait_no_die'},
       );
    }
    elsif ( $methods->[0] =~ m/none/i ) {
-      PTDEBUG && _d('Not getting to slaves');
+      PTDEBUG && _d('Not getting to replicas');
    }
    else {
       die "Unexpected recursion methods: @$methods";
    }
 
-   return $slaves;
+   return $replicas;
 }
 
 sub _resolve_recursion_methods {
@@ -5282,31 +5282,31 @@ sub _resolve_recursion_methods {
    }
 }
 
-sub recurse_to_slaves {
+sub recurse_to_replicas {
    my ( $self, $args, $level ) = @_;
    $level ||= 0;
    my $dp = $self->{DSNParser};
    my $recurse = $args->{recurse} || $self->{OptionParser}->get('recurse');
    my $dsn = $args->{dsn};
-   my $slave_user = $args->{slave_user} || '';
-   my $slave_password = $args->{slave_password} || '';
+   my $replica_user = $args->{replica_user} || '';
+   my $replica_password = $args->{replica_password} || '';
 
    my $methods = $self->_resolve_recursion_methods($dsn);
    PTDEBUG && _d('Recursion methods:', @$methods);
    if ( lc($methods->[0]) eq 'none' ) {
-      PTDEBUG && _d('Not recursing to slaves');
+      PTDEBUG && _d('Not recursing to replicas');
       return;
    }
 
-   my $slave_dsn = $dsn;
-   if ($slave_user) {
-      $slave_dsn->{u} = $slave_user;
-      PTDEBUG && _d("Using slave user $slave_user on "
-         . $slave_dsn->{h} . ":" . ( $slave_dsn->{P} ? $slave_dsn->{P} : ""));
+   my $replica_dsn = $dsn;
+   if ($replica_user) {
+      $replica_dsn->{u} = $replica_user;
+      PTDEBUG && _d("Using replica user $replica_user on "
+         . $replica_dsn->{h} . ":" . ( $replica_dsn->{P} ? $replica_dsn->{P} : ""));
    }
-   if ($slave_password) {
-      $slave_dsn->{p} = $slave_password;
-      PTDEBUG && _d("Slave password set");
+   if ($replica_password) {
+      $replica_dsn->{p} = $replica_password;
+      PTDEBUG && _d("Replica password set");
    }
 
    my $dbh = $args->{dbh};
@@ -5314,12 +5314,12 @@ sub recurse_to_slaves {
    my $get_dbh = sub {
          eval {
             $dbh = $dp->get_dbh(
-               $dp->get_cxn_params($slave_dsn), { AutoCommit => 1 }
+               $dp->get_cxn_params($replica_dsn), { AutoCommit => 1 }
             );
-            PTDEBUG && _d('Connected to', $dp->as_string($slave_dsn));
+            PTDEBUG && _d('Connected to', $dp->as_string($replica_dsn));
          };
          if ( $EVAL_ERROR ) {
-            print STDERR "Cannot connect to ", $dp->as_string($slave_dsn), ": ", $EVAL_ERROR, "\n"
+            print STDERR "Cannot connect to ", $dp->as_string($replica_dsn), ": ", $EVAL_ERROR, "\n"
                or die "Cannot print: $OS_ERROR";
             return;
          }
@@ -5327,10 +5327,10 @@ sub recurse_to_slaves {
 
    DBH: {
       if ( !defined $dbh ) {
-         foreach my $known_slave ( @{$args->{slaves}} ) {
-            if ($known_slave->{dsn}->{h} eq $slave_dsn->{h} and
-                $known_slave->{dsn}->{P} eq $slave_dsn->{P} ) {
-               $dbh = $known_slave->{dbh};
+         foreach my $known_replica ( @{$args->{replicas}} ) {
+            if ($known_replica->{dsn}->{h} eq $replica_dsn->{h} and
+                $known_replica->{dsn}->{P} eq $replica_dsn->{P} ) {
+               $dbh = $known_replica->{dbh};
                last DBH;
             }
          }
@@ -5348,7 +5348,7 @@ sub recurse_to_slaves {
 	   if ( $EVAL_ERROR ) {
 		   if ( $args->{wait_no_die} ) {
 			   print STDERR "Error getting server id: ", $EVAL_ERROR,
-               "\nRetrying query for server ", $slave_dsn->{h}, ":", $slave_dsn->{P}, "\n";
+               "\nRetrying query for server ", $replica_dsn->{h}, ":", $replica_dsn->{P}, "\n";
             sleep 1;
             $dbh->disconnect();
             $get_dbh->();
@@ -5358,12 +5358,12 @@ sub recurse_to_slaves {
       }
    } until (defined $id);
    PTDEBUG && _d('Working on server ID', $id);
-   my $master_thinks_i_am = $dsn->{server_id};
+   my $source_thinks_i_am = $dsn->{server_id};
    if ( !defined $id
-       || ( defined $master_thinks_i_am && $master_thinks_i_am != $id )
+       || ( defined $source_thinks_i_am && $source_thinks_i_am != $id )
        || $args->{server_ids_seen}->{$id}++
    ) {
-      PTDEBUG && _d('Server ID seen, or not what master said');
+      PTDEBUG && _d('Server ID seen, or not what source said');
       if ( $args->{skip_callback} ) {
          $args->{skip_callback}->($dsn, $dbh, $level, $args->{parent});
       }
@@ -5374,51 +5374,51 @@ sub recurse_to_slaves {
 
    if ( !defined $recurse || $level < $recurse ) {
 
-      my @slaves =
-         grep { !$_->{master_id} || $_->{master_id} == $id } # Only my slaves.
-         $self->find_slave_hosts($dp, $dbh, $dsn, $methods);
+      my @replicas =
+         grep { !$_->{source_id} || $_->{source_id} == $id } # Only my replicas.
+         $self->find_replica_hosts($dp, $dbh, $dsn, $methods);
 
-      foreach my $slave ( @slaves ) {
+      foreach my $replica ( @replicas ) {
          PTDEBUG && _d('Recursing from',
-            $dp->as_string($dsn), 'to', $dp->as_string($slave));
-         $self->recurse_to_slaves(
-            { %$args, dsn => $slave, dbh => undef, parent => $dsn, slave_user => $slave_user, $slave_password => $slave_password }, $level + 1 );
+            $dp->as_string($dsn), 'to', $dp->as_string($replica));
+         $self->recurse_to_replicas(
+            { %$args, dsn => $replica, dbh => undef, parent => $dsn, replica_user => $replica_user, $replica_password => $replica_password }, $level + 1 );
       }
    }
 }
 
-sub find_slave_hosts {
+sub find_replica_hosts {
    my ( $self, $dsn_parser, $dbh, $dsn, $methods ) = @_;
 
-   PTDEBUG && _d('Looking for slaves on', $dsn_parser->as_string($dsn),
+   PTDEBUG && _d('Looking for replicas on', $dsn_parser->as_string($dsn),
       'using methods', @$methods);
 
-   my @slaves;
+   my @replicas;
    METHOD:
    foreach my $method ( @$methods ) {
-      my $find_slaves = "_find_slaves_by_$method";
-      PTDEBUG && _d('Finding slaves with', $find_slaves);
-      @slaves = $self->$find_slaves($dsn_parser, $dbh, $dsn);
-      last METHOD if @slaves;
+      my $find_replicas = "_find_replicas_by_$method";
+      PTDEBUG && _d('Finding replicas with', $find_replicas);
+      @replicas = $self->$find_replicas($dsn_parser, $dbh, $dsn);
+      last METHOD if @replicas;
    }
 
-   PTDEBUG && _d('Found', scalar(@slaves), 'slaves');
-   return @slaves;
+   PTDEBUG && _d('Found', scalar(@replicas), 'replicas');
+   return @replicas;
 }
 
-sub _find_slaves_by_processlist {
+sub _find_replicas_by_processlist {
    my ( $self, $dsn_parser, $dbh, $dsn ) = @_;
-   my @connected_slaves = $self->get_connected_slaves($dbh);
-   my @slaves = $self->_process_slaves_list($dsn_parser, $dsn, \@connected_slaves);
-   return @slaves;
+   my @connected_replicas = $self->get_connected_replicas($dbh);
+   my @replicas = $self->_process_replicas_list($dsn_parser, $dsn, \@connected_replicas);
+   return @replicas;
 }
 
-sub _process_slaves_list {
-   my ($self, $dsn_parser, $dsn, $connected_slaves) = @_;
-   my @slaves = map  {
-      my $slave        = $dsn_parser->parse("h=$_", $dsn);
-      $slave->{source} = 'processlist';
-      $slave;
+sub _process_replicas_list {
+   my ($self, $dsn_parser, $dsn, $connected_replicas) = @_;
+   my @replicas = map  {
+      my $replica        = $dsn_parser->parse("h=$_", $dsn);
+      $replica->{source} = 'processlist';
+      $replica;
    }
    grep { $_ }
    map  {
@@ -5430,22 +5430,28 @@ sub _process_slaves_list {
           $host = '['.$host.']';
       }
       $host;
-   } @$connected_slaves;
+   } @$connected_replicas;
 
-   return @slaves;
+   return @replicas;
 }
 
-sub _find_slaves_by_hosts {
+sub _find_replicas_by_hosts {
    my ( $self, $dsn_parser, $dbh, $dsn ) = @_;
 
-   my @slaves;
-   my $sql = 'SHOW SLAVE HOSTS';
+   my @replicas;
+
+   my $vp = VersionParser->new($dbh);
+   my $sql = 'SHOW REPLICAS';
+   if ( $vp < '8.1' || $vp->flavor() =~ m/maria/ ) {
+      $sql = 'SHOW SLAVE HOSTS';
+   }
+   
    PTDEBUG && _d($dbh, $sql);
-   @slaves = @{$dbh->selectall_arrayref($sql, { Slice => {} })};
+   @replicas = @{$dbh->selectall_arrayref($sql, { Slice => {} })};
 
-   if ( @slaves ) {
-      PTDEBUG && _d('Found some SHOW SLAVE HOSTS info');
-      @slaves = map {
+   if ( @replicas ) {
+      PTDEBUG && _d('Found some SHOW REPLICAS info');
+      @replicas = map {
          my %hash;
          @hash{ map { lc $_ } keys %$_ } = values %$_;
          my $spec = "h=$hash{host},P=$hash{port}"
@@ -5453,16 +5459,16 @@ sub _find_slaves_by_hosts {
             . ( $hash{password} ? ",p=$hash{password}" : '');
          my $dsn           = $dsn_parser->parse($spec, $dsn);
          $dsn->{server_id} = $hash{server_id};
-         $dsn->{master_id} = $hash{master_id};
+         $dsn->{source_id} = $hash{source_id};
          $dsn->{source}    = 'hosts';
          $dsn;
-      } @slaves;
+      } @replicas;
    }
 
-   return @slaves;
+   return @replicas;
 }
 
-sub get_connected_slaves {
+sub get_connected_replicas {
    my ( $self, $dbh ) = @_;
 
    my $show = "SHOW GRANTS FOR ";
@@ -5508,79 +5514,103 @@ sub get_connected_slaves {
    @{$dbh->selectall_arrayref($sql, { Slice => {} })};
 }
 
-sub is_master_of {
-   my ( $self, $master, $slave ) = @_;
-   my $master_status = $self->get_master_status($master)
-      or die "The server specified as a master is not a master";
-   my $slave_status  = $self->get_slave_status($slave)
-      or die "The server specified as a slave is not a slave";
-   my @connected     = $self->get_connected_slaves($master)
-      or die "The server specified as a master has no connected slaves";
-   my (undef, $port) = $master->selectrow_array("SHOW VARIABLES LIKE 'port'");
+sub is_source_of {
+   my ( $self, $source, $replica ) = @_;
+
+   my $replica_version = VersionParser->new($replica);
+   my $source_name = 'source';
+   my $source_port = 'source_port';
+   if ( $replica_version < '8.1' || $replica_version->flavor() =~ m/maria/ ) {
+      $source_name = 'master';
+      $source_port = 'master_port';
+   }
+
+   my $source_status = $self->get_source_status($source)
+      or die "The server specified as a source is not a source";
+   my $replica_status  = $self->get_replica_status($replica)
+      or die "The server specified as a replica is not a replica";
+   my @connected     = $self->get_connected_replicas($source)
+      or die "The server specified as a source has no connected replicas";
+   my (undef, $port) = $source->selectrow_array("SHOW VARIABLES LIKE 'port'");
 
-   if ( $port != $slave_status->{master_port} ) {
-      die "The slave is connected to $slave_status->{master_port} "
-         . "but the master's port is $port";
+   if ( $port != $replica_status->{$source_port} ) {
+      die "The replica is connected to $replica_status->{$source_port} "
+         . "but the source's port is $port";
    }
 
-   if ( !grep { $slave_status->{master_user} eq $_->{user} } @connected ) {
-      die "I don't see any slave I/O thread connected with user "
-         . $slave_status->{master_user};
+   if ( !grep { $replica_status->{source_user} eq $_->{user} } @connected ) {
+      die "I don't see any replica I/O thread connected with user "
+         . $replica_status->{source_user};
    }
 
-   if ( ($slave_status->{slave_io_state} || '')
-      eq 'Waiting for master to send event' )
+   if ( ($replica_status->{replica_io_state} || '')
+      eq 'Waiting for ${source_name} to send event' )
    {
-      my ( $master_log_name, $master_log_num )
-         = $master_status->{file} =~ m/^(.*?)\.0*([1-9][0-9]*)$/;
-      my ( $slave_log_name, $slave_log_num )
-         = $slave_status->{master_log_file} =~ m/^(.*?)\.0*([1-9][0-9]*)$/;
-      if ( $master_log_name ne $slave_log_name
-         || abs($master_log_num - $slave_log_num) > 1 )
+      my ( $source_log_name, $source_log_num )
+         = $source_status->{file} =~ m/^(.*?)\.0*([1-9][0-9]*)$/;
+      my ( $replica_log_name, $replica_log_num )
+         = $replica_status->{source_log_file} =~ m/^(.*?)\.0*([1-9][0-9]*)$/;
+      if ( $source_log_name ne $replica_log_name
+         || abs($source_log_num - $replica_log_num) > 1 )
       {
-         die "The slave thinks it is reading from "
-            . "$slave_status->{master_log_file},  but the "
-            . "master is writing to $master_status->{file}";
+         die "The replica thinks it is reading from "
+            . "$replica_status->{source_log_file},  but the "
+            . "source is writing to $source_status->{file}";
       }
    }
    return 1;
 }
 
-sub get_master_dsn {
+sub get_source_dsn {
    my ( $self, $dbh, $dsn, $dsn_parser ) = @_;
-   my $master = $self->get_slave_status($dbh) or return undef;
-   my $spec   = "h=$master->{master_host},P=$master->{master_port}";
+
+   my $vp = VersionParser->new($dbh);
+   my $source_host = 'source_host';
+   my $source_port = 'source_port';
+   if ( $vp < '8.1' || $vp->flavor() =~ m/maria/ ) {
+      $source_host = 'master_host';
+      $source_port = 'master_port';
+   }
+
+   my $source = $self->get_replica_status($dbh) or return undef;
+   my $spec   = "h=$source->{${source_host}},P=$source->{${source_port}}";
    return       $dsn_parser->parse($spec, $dsn);
 }
 
-sub get_slave_status {
+sub get_replica_status {
    my ( $self, $dbh ) = @_;
 
-   if ( !$self->{not_a_slave}->{$dbh} ) {
-      my $sth = $self->{sths}->{$dbh}->{SLAVE_STATUS}
-            ||= $dbh->prepare('SHOW SLAVE STATUS');
-      PTDEBUG && _d($dbh, 'SHOW SLAVE STATUS');
+   my $server_version = VersionParser->new($dbh);
+   my $replica_name = 'replica';
+   if ( $server_version < '8.1' || $server_version->flavor() =~ m/maria/ ) {
+      $replica_name = 'slave';
+   }
+
+   if ( !$self->{not_a_replica}->{$dbh} ) {
+      my $sth = $self->{sths}->{$dbh}->{REPLICA_STATUS}
+            ||= $dbh->prepare("SHOW ${replica_name} STATUS");
+      PTDEBUG && _d($dbh, "SHOW ${replica_name} STATUS");
       $sth->execute();
-      my ($sss_rows) = $sth->fetchall_arrayref({}); # Show Slave Status rows
+      my ($sss_rows) = $sth->fetchall_arrayref({}); # Show Replica Status rows
 
       my $ss;
       if ( $sss_rows && @$sss_rows ) {
           if (scalar @$sss_rows > 1) {
               if (!$self->{channel}) {
-                  die 'This server returned more than one row for SHOW SLAVE STATUS but "channel" was not specified on the command line';
+                  die 'This server returned more than one row for SHOW REPLICA STATUS but "channel" was not specified on the command line';
               }
-              my $slave_use_channels;
+              my $replica_use_channels;
               for my $row (@$sss_rows) {
                   $row = { map { lc($_) => $row->{$_} } keys %$row }; # lowercase the keys
                   if ($row->{channel_name}) {
-                      $slave_use_channels = 1;
+                      $replica_use_channels = 1;
                   }
                   if ($row->{channel_name} eq $self->{channel}) {
                       $ss = $row;
                       last;
                   }
               }
-              if (!$ss && $slave_use_channels) {
+              if (!$ss && $replica_use_channels) {
                  die 'This server is using replication channels but "channel" was not specified on the command line';
               }
           } else {
@@ -5600,28 +5630,34 @@ sub get_slave_status {
           }
       }
 
-      PTDEBUG && _d('This server returns nothing for SHOW SLAVE STATUS');
-      $self->{not_a_slave}->{$dbh}++;
+      PTDEBUG && _d('This server returns nothing for SHOW REPLICA STATUS');
+      $self->{not_a_replica}->{$dbh}++;
   }
 }
 
-sub get_master_status {
+sub get_source_status {
    my ( $self, $dbh ) = @_;
 
-   if ( $self->{not_a_master}->{$dbh} ) {
-      PTDEBUG && _d('Server on dbh', $dbh, 'is not a master');
+   if ( $self->{not_a_source}->{$dbh} ) {
+      PTDEBUG && _d('Server on dbh', $dbh, 'is not a source');
       return;
    }
 
+   my $vp = VersionParser->new($dbh);
+   my $source_name = 'binary log';
+   if ( $vp < '8.1' || $vp->flavor() =~ m/maria/ ) {
+      $source_name = 'master';
+   }
+
    my $sth;
    if ( $self->{sths}->{$dbh} && $dbh && $self->{sths}->{$dbh} == $dbh ) {
-      $sth = $self->{sths}->{$dbh}->{MASTER_STATUS}
-         ||= $dbh->prepare('SHOW MASTER STATUS');
+      $sth = $self->{sths}->{$dbh}->{SOURCE_STATUS}
+         ||= $dbh->prepare("SHOW ${source_name} STATUS");
    }
    else {
-      $sth = $dbh->prepare('SHOW MASTER STATUS');
+      $sth = $dbh->prepare("SHOW ${source_name} STATUS");
    }
-   PTDEBUG && _d($dbh, 'SHOW MASTER STATUS');
+   PTDEBUG && _d($dbh, "SHOW ${source_name} STATUS");
    $sth->execute();
    my ($ms) = @{$sth->fetchall_arrayref({})};
    PTDEBUG && _d(
@@ -5629,42 +5665,46 @@ sub get_master_status {
           : '');
 
    if ( !$ms || scalar keys %$ms < 2 ) {
-      PTDEBUG && _d('Server on dbh', $dbh, 'does not seem to be a master');
-      $self->{not_a_master}->{$dbh}++;
+      PTDEBUG && _d('Server on dbh', $dbh, 'does not seem to be a source');
+      $self->{not_a_source}->{$dbh}++;
    }
 
   return { map { lc($_) => $ms->{$_} } keys %$ms }; # lowercase the keys
 }
 
-sub wait_for_master {
+sub wait_for_source {
    my ( $self, %args ) = @_;
-   my @required_args = qw(master_status slave_dbh);
+   my @required_args = qw(source_status replica_dbh);
    foreach my $arg ( @required_args ) {
       die "I need a $arg argument" unless $args{$arg};
    }
-   my ($master_status, $slave_dbh) = @args{@required_args};
+   my ($source_status, $replica_dbh) = @args{@required_args};
    my $timeout       = $args{timeout} || 60;
 
    my $result;
    my $waited;
-   if ( $master_status ) {
-      my $slave_status;
+   if ( $source_status ) {
+      my $replica_status;
       eval {
-          $slave_status = $self->get_slave_status($slave_dbh);
+          $replica_status = $self->get_replica_status($replica_dbh);
       };
       if ($EVAL_ERROR) {
           return {
               result => undef,
               waited => 0,
-              error  =>'Wait for master: this is a multi-master slave but "channel" was not specified on the command line',
+              error  =>'Wait for source: this is a multi-source replica but "channel" was not specified on the command line',
           };
       }
-      my $server_version = VersionParser->new($slave_dbh);
-      my $channel_sql = $server_version > '5.6' && $self->{channel} ? ", '$self->{channel}'" : '';
-      my $sql = "SELECT MASTER_POS_WAIT('$master_status->{file}', $master_status->{position}, $timeout $channel_sql)";
-      PTDEBUG && _d($slave_dbh, $sql);
+      my $vp = VersionParser->new($replica_dbh);
+      my $source_name = 'source';
+      if ( $vp < '8.1' || $vp->flavor() =~ m/maria/ ) {
+         $source_name = 'master';
+      }
+      my $channel_sql = $vp > '5.6' && $self->{channel} ? ", '$self->{channel}'" : '';
+      my $sql = "SELECT ${source_name}_POS_WAIT('$source_status->{file}', $source_status->{position}, $timeout $channel_sql)";
+      PTDEBUG && _d($replica_dbh, $sql);
       my $start = time;
-      ($result) = $slave_dbh->selectrow_array($sql);
+      ($result) = $replica_dbh->selectrow_array($sql);
 
       $waited = time - $start;
 
@@ -5672,7 +5712,7 @@ sub wait_for_master {
       PTDEBUG && _d("Waited", $waited, "seconds");
    }
    else {
-      PTDEBUG && _d('Not waiting: this server is not a master');
+      PTDEBUG && _d('Not waiting: this server is not a source');
    }
 
    return {
@@ -5681,75 +5721,96 @@ sub wait_for_master {
    };
 }
 
-sub stop_slave {
+sub stop_replica {
    my ( $self, $dbh ) = @_;
-   my $sth = $self->{sths}->{$dbh}->{STOP_SLAVE}
-         ||= $dbh->prepare('STOP SLAVE');
+   my $vp = VersionParser->new($dbh);
+   my $replica_name = 'replica';
+   if ( $vp < '8.1' || $vp->flavor() =~ m/maria/ ) {
+      $replica_name = 'slave';
+   }
+   my $sth = $self->{sths}->{$dbh}->{STOP_REPLICA}
+         ||= $dbh->prepare("STOP ${replica_name}");
    PTDEBUG && _d($dbh, $sth->{Statement});
    $sth->execute();
 }
 
-sub start_slave {
+sub start_replica {
    my ( $self, $dbh, $pos ) = @_;
+
+   my $vp = VersionParser->new($dbh);
+   my $source_name = 'source';
+   my $replica_name = 'replica';
+   if ( $vp < '8.1' || $vp->flavor() =~ m/maria/ ) {
+      $source_name = 'master';
+      $replica_name = 'slave';
+   }
+
    if ( $pos ) {
-      my $sql = "START SLAVE UNTIL MASTER_LOG_FILE='$pos->{file}', "
-              . "MASTER_LOG_POS=$pos->{position}";
+      my $sql = "START ${replica_name} UNTIL ${source_name}_LOG_FILE='$pos->{file}', "
+              . "${source_name}_LOG_POS=$pos->{position}";
       PTDEBUG && _d($dbh, $sql);
       $dbh->do($sql);
    }
    else {
-      my $sth = $self->{sths}->{$dbh}->{START_SLAVE}
-            ||= $dbh->prepare('START SLAVE');
+      my $sth = $self->{sths}->{$dbh}->{START_REPLICA}
+            ||= $dbh->prepare("START ${replica_name}");
       PTDEBUG && _d($dbh, $sth->{Statement});
       $sth->execute();
    }
 }
 
-sub catchup_to_master {
-   my ( $self, $slave, $master, $timeout ) = @_;
-   $self->stop_slave($master);
-   $self->stop_slave($slave);
-   my $slave_status  = $self->get_slave_status($slave);
-   my $slave_pos     = $self->repl_posn($slave_status);
-   my $master_status = $self->get_master_status($master);
-   my $master_pos    = $self->repl_posn($master_status);
-   PTDEBUG && _d('Master position:', $self->pos_to_string($master_pos),
-      'Slave position:', $self->pos_to_string($slave_pos));
+sub catchup_to_source {
+   my ( $self, $replica, $source, $timeout ) = @_;
+   $self->stop_replica($source);
+   $self->stop_replica($replica);
+   my $replica_status  = $self->get_replica_status($replica);
+   my $replica_pos     = $self->repl_posn($replica_status);
+   my $source_status = $self->get_source_status($source);
+   my $source_pos    = $self->repl_posn($source_status);
+   PTDEBUG && _d('Source position:', $self->pos_to_string($source_pos),
+      'Replica position:', $self->pos_to_string($replica_pos));
 
    my $result;
-   if ( $self->pos_cmp($slave_pos, $master_pos) < 0 ) {
-      PTDEBUG && _d('Waiting for slave to catch up to master');
-      $self->start_slave($slave, $master_pos);
+   if ( $self->pos_cmp($replica_pos, $source_pos) < 0 ) {
+      PTDEBUG && _d('Waiting for replica to catch up to source');
+      $self->start_replica($replica, $source_pos);
 
-      $result = $self->wait_for_master(
-            master_status => $master_status,
-            slave_dbh     => $slave,
+      $result = $self->wait_for_source(
+            source_status => $source_status,
+            replica_dbh   => $replica,
             timeout       => $timeout,
-            master_status => $master_status
+            source_status => $source_status
       );
       if ($result->{error}) {
           die $result->{error};
       }
       if ( !defined $result->{result} ) {
-         $slave_status = $self->get_slave_status($slave);
-         if ( !$self->slave_is_running($slave_status) ) {
-            PTDEBUG && _d('Master position:',
-               $self->pos_to_string($master_pos),
-               'Slave position:', $self->pos_to_string($slave_pos));
-            $slave_pos = $self->repl_posn($slave_status);
-            if ( $self->pos_cmp($slave_pos, $master_pos) != 0 ) {
-               die "MASTER_POS_WAIT() returned NULL but slave has not "
-                  . "caught up to master";
+         $replica_status = $self->get_replica_status($replica);
+            
+         my $vp = VersionParser->new($replica);
+         my $replica_name = 'replica';
+         if ( $vp < '8.1' || $vp->flavor() =~ m/maria/ ) {
+            $replica_name = 'slave';
+         }
+
+         if ( !$self->replica_is_running($replica_status, $replica_name) ) {
+            PTDEBUG && _d('Source position:',
+               $self->pos_to_string($source_pos),
+               'Replica position:', $self->pos_to_string($replica_pos));
+            $replica_pos = $self->repl_posn($replica_status);
+            if ( $self->pos_cmp($replica_pos, $source_pos) != 0 ) {
+               die "SOURCE_POS_WAIT() returned NULL but replica has not "
+                  . "caught up to source";
             }
-            PTDEBUG && _d('Slave is caught up to master and stopped');
+            PTDEBUG && _d('Replica is caught up to source and stopped');
          }
          else {
-            die "Slave has not caught up to master and it is still running";
+            die "Replica has not caught up to source and it is still running";
          }
       }
    }
    else {
-      PTDEBUG && _d("Slave is already caught up to master");
+      PTDEBUG && _d("Replica is already caught up to source");
    }
 
    return $result;
@@ -5757,26 +5818,38 @@ sub catchup_to_master {
 
 sub catchup_to_same_pos {
    my ( $self, $s1_dbh, $s2_dbh ) = @_;
-   $self->stop_slave($s1_dbh);
-   $self->stop_slave($s2_dbh);
-   my $s1_status = $self->get_slave_status($s1_dbh);
-   my $s2_status = $self->get_slave_status($s2_dbh);
+   $self->stop_replica($s1_dbh);
+   $self->stop_replica($s2_dbh);
+   my $s1_status = $self->get_replica_status($s1_dbh);
+   my $s2_status = $self->get_replica_status($s2_dbh);
    my $s1_pos    = $self->repl_posn($s1_status);
    my $s2_pos    = $self->repl_posn($s2_status);
    if ( $self->pos_cmp($s1_pos, $s2_pos) < 0 ) {
-      $self->start_slave($s1_dbh, $s2_pos);
+      $self->start_replica($s1_dbh, $s2_pos);
    }
    elsif ( $self->pos_cmp($s2_pos, $s1_pos) < 0 ) {
-      $self->start_slave($s2_dbh, $s1_pos);
+      $self->start_replica($s2_dbh, $s1_pos);
    }
 
-   $s1_status = $self->get_slave_status($s1_dbh);
-   $s2_status = $self->get_slave_status($s2_dbh);
+   $s1_status = $self->get_replica_status($s1_dbh);
+   $s2_status = $self->get_replica_status($s2_dbh);
    $s1_pos    = $self->repl_posn($s1_status);
    $s2_pos    = $self->repl_posn($s2_status);
 
-   if ( $self->slave_is_running($s1_status)
-     || $self->slave_is_running($s2_status)
+   my $vp1 = VersionParser->new($s1_dbh);
+   my $replica1_name = 'replica';
+   if ( $vp1 < '8.1' || $vp1->flavor() =~ m/maria/ ) {
+      $replica1_name = 'slave';
+   }
+
+   my $vp2 = VersionParser->new($s2_dbh);
+   my $replica2_name = 'replica';
+   if ( $vp2 < '8.1' || $vp2->flavor() =~ m/maria/ ) {
+      $replica2_name = 'slave';
+   }
+
+   if ( $self->replica_is_running($s1_status, $replica1_name)
+     || $self->replica_is_running($s2_status, $replica2_name)
      || $self->pos_cmp($s1_pos, $s2_pos) != 0)
    {
       die "The servers aren't both stopped at the same position";
@@ -5784,14 +5857,21 @@ sub catchup_to_same_pos {
 
 }
 
-sub slave_is_running {
-   my ( $self, $slave_status ) = @_;
-   return ($slave_status->{slave_sql_running} || 'No') eq 'Yes';
+sub replica_is_running {
+   my ( $self, $replica_status, $replica_name ) = @_;
+   return ($replica_status->{"${replica_name}_sql_running"} || 'No') eq 'Yes';
 }
 
-sub has_slave_updates {
+sub has_replica_updates {
    my ( $self, $dbh ) = @_;
-   my $sql = q{SHOW VARIABLES LIKE 'log_slave_updates'};
+   
+   my $vp = VersionParser->new($dbh);
+   my $replica_name = 'replica';
+   if ( $vp < '8.1' || $vp->flavor() =~ m/maria/ ) {
+      $replica_name = 'slave';
+   }
+
+   my $sql = qq{SHOW VARIABLES LIKE 'log_${replica_name}_updates'};
    PTDEBUG && _d($dbh, $sql);
    my ($name, $value) = $dbh->selectrow_array($sql);
    return $value && $value =~ m/^(1|ON)$/;
@@ -5805,6 +5885,12 @@ sub repl_posn {
          position => $status->{position},
       };
    }
+   elsif ( exists $status->{relay_source_log_file} && exists $status->{exec_source_log_pos} ) {
+      return {
+         file     => $status->{relay_source_log_file},
+         position => $status->{exec_source_log_pos},
+      };
+   }
    else {
       return {
          file     => $status->{relay_master_log_file},
@@ -5813,11 +5899,18 @@ sub repl_posn {
    }
 }
 
-sub get_slave_lag {
+sub get_replica_lag {
    my ( $self, $dbh ) = @_;
-   my $stat = $self->get_slave_status($dbh);
-   return unless $stat;  # server is not a slave
-   return $stat->{seconds_behind_master};
+   
+   my $vp = VersionParser->new($dbh);
+   my $source_name = 'source';
+   if ( $vp < '8.1' || $vp->flavor() =~ m/maria/ ) {
+      $source_name = 'master';
+   }
+
+   my $stat = $self->get_replica_status($dbh);
+   return unless $stat;  # server is not a replica
+   return $stat->{"seconds_behind_${source_name}"};
 }
 
 sub pos_cmp {
@@ -5828,9 +5921,9 @@ sub pos_cmp {
 sub short_host {
    my ( $self, $dsn ) = @_;
    my ($host, $port);
-   if ( $dsn->{master_host} ) {
-      $host = $dsn->{master_host};
-      $port = $dsn->{master_port};
+   if ( $dsn->{source_host} ) {
+      $host = $dsn->{source_host};
+      $port = $dsn->{source_port};
    }
    else {
       $host = $dsn->{h};
@@ -5845,7 +5938,7 @@ sub is_replication_thread {
 
    my $type = lc($args{type} || 'all');
    die "Invalid type: $type"
-      unless $type =~ m/^binlog_dump|slave_io|slave_sql|all$/i;
+      unless $type =~ m/^binlog_dump|slave_io|slave_sql|replica_io|replica_sql|all$/i;
 
    my $match = 0;
    if ( $type =~ m/binlog_dump|all/i ) {
@@ -5854,7 +5947,7 @@ sub is_replication_thread {
    }
    if ( !$match ) {
       if ( ($query->{User} || $query->{user} || '') eq "system user" ) {
-         PTDEBUG && _d("Slave replication thread");
+         PTDEBUG && _d("Replica replication thread");
          if ( $type ne 'all' ) {
             my $state = $query->{State} || $query->{state} || '';
 
@@ -5863,15 +5956,16 @@ sub is_replication_thread {
                $match = 1;
             }
             else {
-               my ($slave_sql) = $state =~ m/
+               my ($replica_sql) = $state =~ m/
                   ^(Waiting\sfor\sthe\snext\sevent
                    |Reading\sevent\sfrom\sthe\srelay\slog
                    |Has\sread\sall\srelay\slog;\swaiting
                    |Making\stemp\sfile
-                   |Waiting\sfor\sslave\smutex\son\sexit)/xi;
+                   |Waiting\sfor\sslave\smutex\son\sexit
+                   |Waiting\sfor\sreplica\smutex\son\sexit)/xi;
 
-               $match = $type eq 'slave_sql' &&  $slave_sql ? 1
-                      : $type eq 'slave_io'  && !$slave_sql ? 1
+               $match = $type eq 'replica_sql' &&  $replica_sql ? 1
+                      : $type eq 'replica_io'  && !$replica_sql ? 1
                       :                                       0;
             }
          }
@@ -5912,9 +6006,15 @@ sub get_replication_filters {
    }
    my ($dbh) = @args{@required_args};
 
+   my $vp = VersionParser->new($dbh);
+   my $replica_name = 'replica';
+   if ( $vp < '8.1' || $vp->flavor() =~ m/maria/ ) {
+      $replica_name = 'slave';
+   }
+
    my %filters = ();
 
-   my $status = $self->get_master_status($dbh);
+   my $status = $self->get_source_status($dbh);
    if ( $status ) {
       map { $filters{$_} = $status->{$_} }
       grep { defined $status->{$_} && $status->{$_} ne '' }
@@ -5924,7 +6024,7 @@ sub get_replication_filters {
       );
    }
 
-   $status = $self->get_slave_status($dbh);
+   $status = $self->get_replica_status($dbh);
    if ( $status ) {
       map { $filters{$_} = $status->{$_} }
       grep { defined $status->{$_} && $status->{$_} ne '' }
@@ -5937,10 +6037,10 @@ sub get_replication_filters {
          replicate_wild_ignore_table
       );
 
-      my $sql = "SHOW VARIABLES LIKE 'slave_skip_errors'";
+      my $sql = "SHOW VARIABLES LIKE '${replica_name}_skip_errors'";
       PTDEBUG && _d($dbh, $sql);
       my $row = $dbh->selectrow_arrayref($sql);
-      $filters{slave_skip_errors} = $row->[1] if $row->[1] && $row->[1] ne 'OFF';
+      $filters{replica_skip_errors} = $row->[1] if $row->[1] && $row->[1] ne 'OFF';
    }
 
    return \%filters;
@@ -6412,13 +6512,13 @@ sub find_replication_differences {
       my $sql
          = "SELECT CONCAT(db, '.', tbl) AS `table`, "
          . "chunk, chunk_index, lower_boundary, upper_boundary, "
-         . "COALESCE(this_cnt-master_cnt, 0) AS cnt_diff, "
+         . "COALESCE(this_cnt-source_cnt, 0) AS cnt_diff, "
          . "COALESCE("
-         .   "this_crc <> master_crc OR ISNULL(master_crc) <> ISNULL(this_crc), 0"
-         . ") AS crc_diff, this_cnt, master_cnt, this_crc, master_crc "
+         .   "this_crc <> source_crc OR ISNULL(source_crc) <> ISNULL(this_crc), 0"
+         . ") AS crc_diff, this_cnt, source_cnt, this_crc, source_crc "
          . "FROM $repl_table "
-         . "WHERE (master_cnt <> this_cnt OR master_crc <> this_crc "
-         .        "OR ISNULL(master_crc) <> ISNULL(this_crc)) "
+         . "WHERE (source_cnt <> this_cnt OR source_crc <> this_crc "
+         .        "OR ISNULL(source_crc) <> ISNULL(this_crc)) "
          . ($args{where} ? " AND ($args{where})" : "");
       PTDEBUG && _d($sql);
       $diffs = $dbh->selectall_arrayref($sql, { Slice => {} });
@@ -8774,7 +8874,7 @@ use Data::Dumper;
 
 sub new {
    my ( $class, %args ) = @_;
-   my @required_args = qw(oktorun get_lag sleep max_lag slaves);
+   my @required_args = qw(oktorun get_lag sleep max_lag replicas);
    foreach my $arg ( @required_args ) {
       die "I need a $arg argument" unless defined $args{$arg};
    }
@@ -8794,32 +8894,32 @@ sub wait {
    }
    my $pr = $args{Progress};
 
-   my $oktorun = $self->{oktorun};
-   my $get_lag = $self->{get_lag};
-   my $sleep   = $self->{sleep};
-   my $slaves  = $self->{slaves};
-   my $max_lag = $self->{max_lag};
+   my $oktorun  = $self->{oktorun};
+   my $get_lag  = $self->{get_lag};
+   my $sleep    = $self->{sleep};
+   my $replicas = $self->{replicas}; 
+   my $max_lag  = $self->{max_lag};
 
-   my $worst;  # most lagging slave
+   my $worst;  # most lagging replica
    my $pr_callback;
    my $pr_first_report;
 
-   my $pr_refresh_slave_list = sub {
+   my $pr_refresh_replica_list = sub {
       my ($self) = @_;
-      my ($slaves, $refresher) = ($self->{slaves}, $self->{get_slaves_cb});
-      return $slaves if ( not defined $refresher );
-      my $before = join ' ', sort map {$_->description()} @$slaves;
-      $slaves = $refresher->();
-      my $after = join ' ', sort map {$_->description()} @$slaves;
+      my ($replicas, $refresher) = ($self->{replicas}, $self->{get_replicas_cb});
+      return $replicas if ( not defined $refresher );
+      my $before = join ' ', sort map {$_->description()} @$replicas;
+      $replicas = $refresher->();
+      my $after = join ' ', sort map {$_->description()} @$replicas;
       if ($before ne $after) {
-         $self->{slaves} = $slaves;
-         printf STDERR "Slave set to watch has changed\n  Was: %s\n  Now: %s\n",
+         $self->{replicas} = $replicas;
+         printf STDERR "Replica set to watch has changed\n  Was: %s\n  Now: %s\n",
             $before, $after;
       }
-      return($self->{slaves});
+      return($self->{replicas});
    };
 
-   $slaves = $pr_refresh_slave_list->($self);
+   $replicas = $pr_refresh_replica_list->($self);
 
    if ( $pr ) {
       $pr_callback = sub {
@@ -8852,44 +8952,44 @@ sub wait {
       };
    }
 
-   my @lagged_slaves = map { {cxn=>$_, lag=>undef} } @$slaves;
-   while ( $oktorun->() && @lagged_slaves ) {
-      PTDEBUG && _d('Checking slave lag');
+   my @lagged_replicas = map { {cxn=>$_, lag=>undef} } @$replicas;
+   while ( $oktorun->() && @lagged_replicas ) {
+      PTDEBUG && _d('Checking replica lag');
 
-      $slaves = $pr_refresh_slave_list->($self);
+      $replicas = $pr_refresh_replica_list->($self);
       my $watched = 0;
-      @lagged_slaves = grep {
-         my $slave_name = $_->{cxn}->name();
-         grep {$slave_name eq $_->name()} @{$slaves // []}
-                            } @lagged_slaves;
+      @lagged_replicas = grep {
+         my $replica_name = $_->{cxn}->name();
+         grep {$replica_name eq $_->name()} @{$replicas // []}
+                            } @lagged_replicas;
 
-      for my $i ( 0..$#lagged_slaves ) {
+      for my $i ( 0..$#lagged_replicas ) {
          my $lag;
          eval {
-             $lag = $get_lag->($lagged_slaves[$i]->{cxn});
+             $lag = $get_lag->($lagged_replicas[$i]->{cxn});
          };
          if ($EVAL_ERROR) {
              die $EVAL_ERROR;
          }
-         PTDEBUG && _d($lagged_slaves[$i]->{cxn}->name(),
-            'slave lag:', $lag);
+         PTDEBUG && _d($lagged_replicas[$i]->{cxn}->name(),
+            'replica lag:', $lag);
          if ( !defined $lag || $lag > $max_lag ) {
-            $lagged_slaves[$i]->{lag} = $lag;
+            $lagged_replicas[$i]->{lag} = $lag;
          }
          else {
-            delete $lagged_slaves[$i];
+            delete $lagged_replicas[$i];
          }
       }
 
-      @lagged_slaves = grep { defined $_ } @lagged_slaves;
-      if ( @lagged_slaves ) {
-         @lagged_slaves = reverse sort {
+      @lagged_replicas = grep { defined $_ } @lagged_replicas;
+      if ( @lagged_replicas ) {
+         @lagged_replicas = reverse sort {
               defined $a->{lag} && defined $b->{lag} ? $a->{lag} <=> $b->{lag}
             : defined $a->{lag}                      ? -1
             :                                           1;
-         } @lagged_slaves;
-         $worst = $lagged_slaves[0];
-         PTDEBUG && _d(scalar @lagged_slaves, 'slaves are lagging, worst:',
+         } @lagged_replicas;
+         $worst = $lagged_replicas[0];
+         PTDEBUG && _d(scalar @lagged_replicas, 'replicas are lagging, worst:',
             $worst->{lag}, 'on', Dumper($worst->{cxn}->dsn()));
 
          if ( $pr ) {
@@ -8904,7 +9004,7 @@ sub wait {
       }
    }
 
-   PTDEBUG && _d('All slaves caught up');
+   PTDEBUG && _d('All replicas caught up');
    return;
 }
 
@@ -9659,7 +9759,7 @@ sub new {
 
 sub update {
    my ($self, $n, $t) = @_;
-   PTDEBUG && _d('Master op time:', $n, 'n /', $t, 's');
+   PTDEBUG && _d('Source op time:', $n, 'n /', $t, 's');
 
    if ( $self->{avg_n} && $self->{avg_t} ) {
       $self->{avg_n}    = ($self->{avg_n} * $self->{weight}) + $n;
@@ -10019,7 +10119,7 @@ use sigtrap 'handler', \&sig_int, 'normal-signals';
 my $oktorun      = 1;
 my $print_header = 1;
 my $exit_status  = 0;
-my $original_qrt_plugin_master_status = undef;
+my $original_qrt_plugin_source_status = undef;
 
 # "exit codes 1 - 2, 126 - 165, and 255 [1] have special meanings,
 # and should therefore be avoided for user-specified exit parameters"
@@ -10029,7 +10129,7 @@ our %PTC_EXIT_STATUS = (
    ERROR               => 1,
    ALREADY_RUNNING     => 2,
    CAUGHT_SIGNAL       => 4,
-   NO_SLAVES_FOUND     => 8,
+   NO_REPLICAS_FOUND     => 8,
    # Tool-specific flags:
    TABLE_DIFF          => 16,
    SKIP_CHUNK          => 32,
@@ -10194,7 +10294,7 @@ sub main {
    }
 
    # ########################################################################
-   # Connect to the master.
+   # Connect to the source.
    # ########################################################################
 
    my $set_on_connect = sub {
@@ -10282,7 +10382,7 @@ sub main {
 
    # Do not call "new Cxn(" directly; use this sub so that set_on_connect
    # is applied to every cxn.
-   # TODO: maybe this stuff only needs to be set on master cxn?
+   # TODO: maybe this stuff only needs to be set on source cxn?
    my $make_cxn = sub {
       my (%args) = @_;
       my $cxn = new Cxn(
@@ -10299,23 +10399,31 @@ sub main {
    };
 
    # The dbh and dsn can be used before checksumming starts, but once
-   # inside the main TABLE loop, only use the master cxn because its
+   # inside the main TABLE loop, only use the source cxn because its
    # dbh may be recreated.
-   my $master_cxn = $make_cxn->(set_vars => 1, dsn_string => shift @ARGV);
-   my $master_dbh = $master_cxn->dbh();  # just for brevity
-   my $master_dsn = $master_cxn->dsn();  # just for brevity
+   my $source_cxn = $make_cxn->(set_vars => 1, dsn_string => shift @ARGV);
+   my $source_dbh = $source_cxn->dbh();  # just for brevity
+   my $source_dsn = $source_cxn->dsn();  # just for brevity
+
+   my $vp = VersionParser->new($source_dbh);
+   my $source_name = 'source';
+   my $replica_name = 'replica';
+   if ( $vp < '8.1' || $vp->flavor() =~ m/maria/ ) {
+      $source_name = 'master';
+      $replica_name = 'replica';
+   }
 
    if ($o->get('disable-qrt-plugin')) {
        eval {
-           $master_dbh->selectrow_arrayref('SELECT @@query_response_time_session_stats' );
+           $source_dbh->selectrow_arrayref('SELECT @@query_response_time_session_stats' );
        };
        if ($EVAL_ERROR) {
-           $original_qrt_plugin_master_status = undef;
+           $original_qrt_plugin_source_status = undef;
            PTDEBUG && _d('QRT plugin is not installed: '.$EVAL_ERROR);
        } else {
-           ($original_qrt_plugin_master_status) = $master_dbh->selectrow_arrayref('SELECT @@query_response_time_stats' );
-           PTDEBUG && _d("Disabling qrt plugin on master server");
-           $master_dbh->do('SET GLOBAL query_response_time_stats = off');
+           ($original_qrt_plugin_source_status) = $source_dbh->selectrow_arrayref('SELECT @@query_response_time_stats' );
+           PTDEBUG && _d("Disabling qrt plugin on source server");
+           $source_dbh->do('SET GLOBAL query_response_time_stats = off');
        }
    }
 
@@ -10323,13 +10431,13 @@ sub main {
    my @rocksdb_ignored = grep(/^ROCKSDB$/i, @ignored_engines);
    if (!@rocksdb_ignored) {
        print STDOUT "Checking if all tables can be checksummed ...\n";
-       my $mysql_config = MySQLConfig->new(dbh => $master_dbh);
+       my $mysql_config = MySQLConfig->new(dbh => $source_dbh);
        my $has_rocksdb = $mysql_config->has_engine('ROCKSDB');
        if ($has_rocksdb) {
            my $sql = "SELECT DISTINCT `table_name`, `table_schema`, `engine` FROM `information_schema`.`tables` " .
                      " WHERE `table_schema` NOT IN ('mysql', 'information_schema', 'performance_schema') " .
                      "   AND `engine` LIKE 'ROCKSDB'";
-           my $rows = $master_dbh->selectall_arrayref($sql, {Slice=>{}});
+           my $rows = $source_dbh->selectall_arrayref($sql, {Slice=>{}});
            my $not_ignored_rocks_db_tables_count= scalar @$rows;
            if (@$rows) {
                my ($tables_list, $separator) = ('', '');
@@ -10380,17 +10488,17 @@ sub main {
    # ########################################################################
    my $cluster = Percona::XtraDB::Cluster->new();
    my %cluster_name_for;
-   $cluster_name_for{$master_cxn} = $cluster->is_cluster_node($master_cxn);
+   $cluster_name_for{$source_cxn} = $cluster->is_cluster_node($source_cxn);
 
-   if ( $cluster_name_for{$master_cxn} ) {
+   if ( $cluster_name_for{$source_cxn} ) {
       # Because of https://bugs.launchpad.net/codership-mysql/+bug/1040108
       # ptc and pt-osc check Threads_running by default for --max-load.
       # Strictly speaking, they can run on 5.5.27 as long as that bug doesn't
       # manifest itself.  If it does, however, then the tools will wait forever.
-      my $pxc_version = VersionParser->new($master_dbh);
+      my $pxc_version = VersionParser->new($source_dbh);
       if ( $pxc_version < '5.5.28' ) {
          die "Percona XtraDB Cluster 5.5.28 or newer is required to run "
-            . "this tool on a cluster, but node " . $master_cxn->name
+            . "this tool on a cluster, but node " . $source_cxn->name
             . " is running version " . $pxc_version->version
             . ".  Please upgrade the node, or run the tool on a newer node, "
             . "or contact Percona for support.\n";
@@ -10401,7 +10509,7 @@ sub main {
    # If this is not a dry run (--explain was not specified), then we're
    # going to checksum the tables, so do the necessary preparations and
    # checks.  Else, this all can be skipped because all we need for a
-   # dry run is a connection to the master.
+   # dry run is a connection to the source.
    # ########################################################################
    my $q  = new Quoter();
    my $tp = new TableParser(Quoter => $q);
@@ -10413,8 +10521,8 @@ sub main {
       channel      => $o->get('channel')
    );
 
-   my $slaves = [];    # all slaves (that we can find)
-   my $slave_lag_cxns; # slaves whose lag we'll check
+   my $replicas = [];    # all replicas (that we can find)
+   my $replica_lag_cxns; # replicas whose lag we'll check
 
    # ########################################################################
    # Create --plugin.
@@ -10428,7 +10536,7 @@ sub main {
       die "Error loading --plugin $file: $EVAL_ERROR" if $EVAL_ERROR;
       eval {
          $plugin = pt_table_checksum_plugin->new(
-            master_cxn  => $master_cxn,
+            source_cxn  => $source_cxn,
             explain     => $o->get('explain'),
             quiet       => $o->get('quiet'),
             resume      => $o->get('resume'),
@@ -10447,12 +10555,12 @@ sub main {
 
    my $repl_table = $q->quote($q->split_unquote($o->get('replicate')));
    my $fetch_sth;  # fetch chunk from repl table
-   my $update_sth; # update master_cnt and master_cnt in repl table
+   my $update_sth; # update source_cnt and source_cnt in repl table
    my $delete_sth; # delete checksums for one db.tbl from repl table
 
    if ( $o->get('truncate-replicate-table') ) {
        eval {
-           $master_dbh->do("TRUNCATE TABLE $repl_table");
+           $source_dbh->do("TRUNCATE TABLE $repl_table");
        };
        if ($EVAL_ERROR) {
            PTDEBUG && _d( "Cannot truncate replicate table $repl_table. $EVAL_ERROR");
@@ -10461,22 +10569,22 @@ sub main {
 
    if ( !$o->get('explain') ) {
       # #####################################################################
-      # Find and connect to slaves.
+      # Find and connect to replicas.
       # #####################################################################
       my $make_cxn_cluster = sub {
-         my $cxn = $make_cxn->(@_, prev_dsn => $master_cxn->dsn());
+         my $cxn = $make_cxn->(@_, prev_dsn => $source_cxn->dsn());
          $cluster_name_for{$cxn} = $cluster->is_cluster_node($cxn);
          return $cxn;
       };
 
-      $slaves = $ms->get_slaves(
-         dbh      => $master_dbh,
-         dsn      => $master_dsn,
+      $replicas = $ms->get_replicas(
+         dbh      => $source_dbh,
+         dsn      => $source_dsn,
          make_cxn => $make_cxn_cluster,
       );
 
       my %seen_ids;
-      for my $cxn ($master_cxn, @$slaves) {
+      for my $cxn ($source_cxn, @$replicas) {
          my $dbh  = $cxn->dbh();
          # get server/node unique id ( https://bugs.launchpad.net/percona-toolkit/+bug/1217466 )
          my $id = $cxn->get_id();
@@ -10484,7 +10592,7 @@ sub main {
       }
 
       if ( $autodiscover_cluster ) {
-         my @known_nodes = grep { $cluster_name_for{$_} } $master_cxn, @$slaves;
+         my @known_nodes = grep { $cluster_name_for{$_} } $source_cxn, @$replicas;
          my $new_cxns = $cluster->autodetect_nodes(
                            nodes       => \@known_nodes,
                            MasterSlave => $ms,
@@ -10492,27 +10600,27 @@ sub main {
                            make_cxn    => $make_cxn_cluster,
                            seen_ids    => \%seen_ids,
                         );
-         push @$slaves, @$new_cxns;
+         push @$replicas, @$new_cxns;
       }
 
       my $trimmed_nodes = Cxn->remove_duplicate_cxns(
-         cxns => [ $master_cxn, @$slaves ],
+         cxns => [ $source_cxn, @$replicas ],
       );
-      ($master_cxn, @$slaves) = @$trimmed_nodes;
+      ($source_cxn, @$replicas) = @$trimmed_nodes;
 
-      # If no slaves or nodes were found, and a recursion method was given
+      # If no replicas or nodes were found, and a recursion method was given
       # (implicitly or explicitly), and that method is not none, then warn
       # and continue but exit non-zero because there won't be any diffs but
-      # this could be a false-positive from having no slaves/nodes to check.
+      # this could be a false-positive from having no replicas/nodes to check.
       # https://bugs.launchpad.net/percona-toolkit/+bug/1210537
-      PTDEBUG && _d(scalar @$slaves, 'slaves found');
-      if ( !@$slaves
+      PTDEBUG && _d(scalar @$replicas, 'replicas found');
+      if ( !@$replicas
            && (($o->get('recursion-method')->[0] || '') ne 'none'
                || $autodiscover_cluster))
       {
-         $exit_status |= $PTC_EXIT_STATUS{NO_SLAVES_FOUND};
+         $exit_status |= $PTC_EXIT_STATUS{NO_REPLICAS_FOUND};
          if ( $o->get('quiet') < 2 ) {
-            my $type = $autodiscover_cluster ? 'cluster nodes' : 'slaves';
+            my $type = $autodiscover_cluster ? 'cluster nodes' : 'replicas';
             warn "Diffs cannot be detected because no $type were found.  "
                . "Please read the --recursion-method documentation for "
                . "information.\n";
@@ -10522,26 +10630,26 @@ sub main {
 
       # https://bugs.launchpad.net/percona-toolkit/+bug/938068
       if ( $o->get('check-binlog-format') ) {
-         my $master_binlog = 'STATEMENT';
-         if ( VersionParser->new($master_dbh) >= '5.1.5' ) {
-            ($master_binlog) = $master_dbh->selectrow_array(
+         my $source_binlog = 'STATEMENT';
+         if ( VersionParser->new($source_dbh) >= '5.1.5' ) {
+            ($source_binlog) = $source_dbh->selectrow_array(
                'SELECT @@binlog_format');
          }
 
          my $err = '';
-         for my $slave_cxn ( @$slaves ) {
+         for my $replica_cxn ( @$replicas ) {
             # https://bugs.launchpad.net/percona-toolkit/+bug/1080385
-            next if $cluster_name_for{$slave_cxn};
+            next if $cluster_name_for{$replica_cxn};
 
-            my $slave_binlog = 'STATEMENT';
-            if ( VersionParser->new($slave_cxn->dbh) >= '5.1.5' ) {
-               ($slave_binlog) = $slave_cxn->dbh->selectrow_array(
+            my $replica_binlog = 'STATEMENT';
+            if ( VersionParser->new($replica_cxn->dbh) >= '5.1.5' ) {
+               ($replica_binlog) = $replica_cxn->dbh->selectrow_array(
                   'SELECT @@binlog_format');
             }
 
-            if ( $master_binlog ne $slave_binlog ) {
-               $err .= "Replica " . $slave_cxn->name()
-                  . qq{ has binlog_format $slave_binlog which could cause }
+            if ( $source_binlog ne $replica_binlog ) {
+               $err .= "Replica " . $replica_cxn->name()
+                  . qq{ has binlog_format $replica_binlog which could cause }
                   . qq{pt-table-checksum to break replication.  Please read }
                   . qq{"Replicas using row-based replication" in the }
                   . qq{LIMITATIONS section of the tool's documentation.  }
@@ -10552,26 +10660,26 @@ sub main {
          die $err if $err;
       }
 
-      if ( $cluster_name_for{$master_cxn} ) {
-         if ( !@$slaves ) {
+      if ( $cluster_name_for{$source_cxn} ) {
+         if ( !@$replicas ) {
             if ( ($o->get('recursion-method')->[0] || '') ne 'none' ) {
-               die $master_cxn->name() . " is a cluster node but no other nodes "
+               die $source_cxn->name() . " is a cluster node but no other nodes "
                   . "or regular replicas were found.  Use --recursion-method=dsn "
                   . "to specify the other nodes in the cluster.\n";
             }
          }
 
-         # Make sure the master and all node are in the same cluster.
+         # Make sure the source and all node are in the same cluster.
          my @other_cluster;
-         foreach my $slave ( @$slaves ) {
-            next unless $cluster_name_for{$slave};
-            if ( $cluster_name_for{$master_cxn} ne $cluster_name_for{$slave}) {
-               push @other_cluster, $slave;
+         foreach my $replica ( @$replicas ) {
+            next unless $cluster_name_for{$replica};
+            if ( $cluster_name_for{$source_cxn} ne $cluster_name_for{$replica}) {
+               push @other_cluster, $replica;
             }
          }
          if ( @other_cluster ) {
-            die $master_cxn->name . " is in cluster "
-               . $cluster_name_for{$master_cxn} . " but these nodes are "
+            die $source_cxn->name . " is in cluster "
+               . $cluster_name_for{$source_cxn} . " but these nodes are "
                . "in other clusters:\n"
                . join("\n",
                   map {'  ' . $_->name . " is in cluster $cluster_name_for{$_}"}
@@ -10581,40 +10689,40 @@ sub main {
                . "Cluster section of the tool's documentation.\n";
          }
       }
-      elsif ( @$slaves ) {
-         # master is not a cluster node, but what about the slaves?
-         my $direct_slave;  # master -> direct_slave
-         my @slaves;        # traditional slaves
+      elsif ( @$replicas ) {
+         # source is not a cluster node, but what about the replicas?
+         my $direct_replica;  # source -> direct_replica
+         my @replicas;        # traditional replicas
          my @nodes;         # cluster nodes
-         foreach my $slave ( @$slaves ) {
-            if ( !$cluster_name_for{$slave} ) {
-               push @slaves, $slave;
+         foreach my $replica ( @$replicas ) {
+            if ( !$cluster_name_for{$replica} ) {
+               push @replicas, $replica;
                next;
             }
 
-            my $is_master_of = eval {
-               $ms->is_master_of($master_cxn->dbh, $slave->dbh);
+            my $is_source_of = eval {
+               $ms->is_source_of($source_cxn->dbh, $replica->dbh);
             };
-            if ( $EVAL_ERROR && $EVAL_ERROR =~ m/is not a slave/ ) {
-               push @nodes, $slave;
+            if ( $EVAL_ERROR && $EVAL_ERROR =~ m/is not a ${replica_name}/ ) {
+               push @nodes, $replica;
             }
-            elsif ( $is_master_of ) {
-               $direct_slave = $slave;
+            elsif ( $is_source_of ) {
+               $direct_replica = $replica;
             }
             else {
                # Another error could have happened but we don't really
-               # care.  We know for sure the slave is a node, so just
+               # care.  We know for sure the replica is a node, so just
                # presume that and carry on.
-               push @nodes, $slave;
+               push @nodes, $replica;
             }
          }
 
          my $err = '';
          if ( @nodes ) {
-            if ( $direct_slave ) {
+            if ( $direct_replica ) {
                warn "Diffs will only be detected if the cluster is "
-                  . "consistent with " . $direct_slave->name . " because "
-                  . $master_cxn->name . " is a traditional replication master "
+                  . "consistent with " . $direct_replica->name . " because "
+                  . $source_cxn->name . " is a traditional replication source "
                   . "but these replicas are cluster nodes:\n"
                   . join("\n", map { '  ' . $_->name } @nodes) . "\n"
                   . "For more information, please read the Percona XtraDB "
@@ -10622,107 +10730,107 @@ sub main {
             }
             else {
                warn "Diffs may not be detected on these cluster nodes "
-                  . "because the direct replica of " . $master_cxn->name
+                  . "because the direct replica of " . $source_cxn->name
                   . " was not found or specified:\n"
                   . join("\n", map { '  ' . $_->name } @nodes) . "\n"
                   . "For more information, please read the Percona XtraDB "
                   . "Cluster section of the tool's documentation.\n";
             }
 
-            if ( @slaves ) {
+            if ( @replicas ) {
                warn "Diffs will only be detected on these replicas if "
-                  . "they replicate from " . $master_cxn->name . ":\n"
-                  . join("\n", map { '  ' . $_->name } @slaves) . "\n"
+                  . "they replicate from " . $source_cxn->name . ":\n"
+                  . join("\n", map { '  ' . $_->name } @replicas) . "\n"
                   . "For more information, please read the Percona XtraDB "
                   . "Cluster section of the tool's documentation.\n";
             }
          }
       }
 
-      # don't touch the QRT plugin on the slave unless we asked for it
+      # don't touch the QRT plugin on the replica unless we asked for it
       # to be disabled.
       if ($o->get('disable-qrt-plugin')) {
-          for my $slave (@$slaves) {
+          for my $replica (@$replicas) {
               my $qrt_plugin_status;
               eval {
-                  ($qrt_plugin_status) = $slave->{dbh}->selectrow_arrayref('SELECT @@QUERY_RESPONSE_TIME_SESSION_STATS' );
+                  ($qrt_plugin_status) = $replica->{dbh}->selectrow_arrayref('SELECT @@QUERY_RESPONSE_TIME_SESSION_STATS' );
               };
               if ($EVAL_ERROR) {
-                  PTDEBUG && _d('QRT plugin is not installed on slave '.$slave->{dsn_name});
-                  $slave->{qrt_plugin_status} = undef;
+                  PTDEBUG && _d('QRT plugin is not installed on replica '.$replica->{dsn_name});
+                  $replica->{qrt_plugin_status} = undef;
                   next;
               }
-              $slave->{qrt_plugin_status} = $qrt_plugin_status->[0];
-              if ($slave->{qrt_plugin_status}) {
-                  PTDEBUG && _d("Disabling qrt plugin state on slave ".$slave->{dsn_name});
-                  $slave->{dbh}->do('SET GLOBAL query_response_time_stats = off');
+              $replica->{qrt_plugin_status} = $qrt_plugin_status->[0];
+              if ($replica->{qrt_plugin_status}) {
+                  PTDEBUG && _d("Disabling qrt plugin state on replica ".$replica->{dsn_name});
+                  $replica->{dbh}->do('SET GLOBAL query_response_time_stats = off');
               }
           }
       }
 
-      if ( $o->get('check-slave-lag') ) {
-         PTDEBUG && _d('Will use --check-slave-lag to check for slave lag');
+      if ( $o->get('check-replica-lag') ) {
+         PTDEBUG && _d('Will use --check-replica-lag to check for replica lag');
          my $cxn = $make_cxn->(
-            dsn_string => $o->get('check-slave-lag'),
-            prev_dsn   => $master_cxn->dsn(),
+            dsn_string => $o->get('check-replica-lag'),
+            prev_dsn   => $source_cxn->dsn(),
          );
-         $slave_lag_cxns = [ $cxn ];
+         $replica_lag_cxns = [ $cxn ];
       }
       else {
-         PTDEBUG && _d('Will check slave lag on all slaves');
-         $slave_lag_cxns = [ map { $_ } @$slaves ];
+         PTDEBUG && _d('Will check replica lag on all replicas');
+         $replica_lag_cxns = [ map { $_ } @$replicas ];
       }
 
-      # Cluster nodes aren't slaves, so SHOW SLAVE STATUS doesn't work.
+      # Cluster nodes aren't replicas, so SHOW REPLICA STATUS doesn't work.
       # Nodes shouldn't be out of sync anyway because the cluster is
       # (virtually) synchronous, so waiting for the last checksum chunk
       # to appear should be sufficient.
-      @$slave_lag_cxns = grep {
-         my $slave_cxn = $_;
-         if ( $cluster_name_for{$slave_cxn} ) {
-            warn "Not checking replica lag on " . $slave_cxn->name()
+      @$replica_lag_cxns = grep {
+         my $replica_cxn = $_;
+         if ( $cluster_name_for{$replica_cxn} ) {
+            warn "Not checking replica lag on " . $replica_cxn->name()
                . " because it is a cluster node.\n";
             0;
          }
          else {
-            PTDEBUG && _d('May check slave lag on', $slave_cxn->name());
-            $slave_cxn;
+            PTDEBUG && _d('May check replica lag on', $replica_cxn->name());
+            $replica_cxn;
          }
-      } @$slave_lag_cxns;
+      } @$replica_lag_cxns;
 
-      if ( $slave_lag_cxns && scalar @$slave_lag_cxns ) {
-         if ($o->get('skip-check-slave-lag')) {
-             my $slaves_to_skip = $o->get('skip-check-slave-lag');
-             my $filtered_slaves = [];
-             for my $slave (@$slave_lag_cxns) {
+      if ( $replica_lag_cxns && scalar @$replica_lag_cxns ) {
+         if ($o->get('skip-check-replica-lag')) {
+             my $replicas_to_skip = $o->get('skip-check-replica-lag');
+             my $filtered_replicas = [];
+             for my $replica (@$replica_lag_cxns) {
                  my $found=0;
-                 for my $slave_to_skip (@$slaves_to_skip) {
-                     my $h_eq_h = $slave->{dsn}->{h} eq $slave_to_skip->{h};
+                 for my $replica_to_skip (@$replicas_to_skip) {
+                     my $h_eq_h = $replica->{dsn}->{h} eq $replica_to_skip->{h};
                      my $p_eq_p;
-                     if (!defined($slave->{dsn}->{P}) && !defined($slave_to_skip->{P}) ) {
+                     if (!defined($replica->{dsn}->{P}) && !defined($replica_to_skip->{P}) ) {
                        PTDEBUG && _d("Both port DSNs are undefined, setting p_eq_p to true");
                        $p_eq_p = 1;
                      } else {
-                        my $skip_slave_port = defined($slave_to_skip->{P})
-                           ? $slave_to_skip->{P} : '3306';
-                        $p_eq_p = $slave->{dsn}->{P} eq $skip_slave_port;
+                        my $skip_replica_port = defined($replica_to_skip->{P})
+                           ? $replica_to_skip->{P} : '3306';
+                        $p_eq_p = $replica->{dsn}->{P} eq $skip_replica_port;
                      }
                      if ($h_eq_h && $p_eq_p) {
                          $found=1;
                      }
                  }
                  if ($found) {
-                    printf("Skipping slave %s\n", $slave->name());
+                    printf("Skipping ${replica_name} %s\n", $replica->name());
                  } else {
-                    push @$filtered_slaves, $slave;
+                    push @$filtered_replicas, $replica;
                 }
              }
-             $slave_lag_cxns = $filtered_slaves;
+             $replica_lag_cxns = $filtered_replicas;
          }
       }
 
       # #####################################################################
-      # Possibly check replication slaves and exit.
+      # Possibly check replication replicas and exit.
       # #####################################################################
       if ( $o->get('replicate-check') && $o->get('replicate-check-only') ) {
          PTDEBUG && _d('Will --replicate-check and exit');
@@ -10732,19 +10840,19 @@ sub main {
             $plugin->before_replicate_check();
          }
 
-         foreach my $slave ( @$slaves ) {
+         foreach my $replica ( @$replicas ) {
             my $diffs = $rc->find_replication_differences(
-               dbh        => $slave->dbh(),
+               dbh        => $replica->dbh(),
                repl_table => $repl_table,
             );
             PTDEBUG && _d(scalar @$diffs, 'checksum diffs on',
-               $slave->name());
+               $replica->name());
             $diffs = filter_tables_replicate_check_only($diffs, $o);
             if ( @$diffs ) {
                $exit_status |= $PTC_EXIT_STATUS{TABLE_DIFF};
                if ( $o->get('quiet') < 2 ) {
                   print_checksum_diffs(
-                     cxn   => $slave,
+                     cxn   => $replica,
                      diffs => $diffs,
                   );
                }
@@ -10764,15 +10872,15 @@ sub main {
       # Check for replication filters.
       # #####################################################################
       if ( $o->get('check-replication-filters') ) {
-         PTDEBUG && _d("Checking slave replication filters");
+         PTDEBUG && _d("Checking replica replication filters");
          my @all_repl_filters;
-         foreach my $slave ( @$slaves ) {
+         foreach my $replica ( @$replicas ) {
             my $repl_filters = $ms->get_replication_filters(
-               dbh => $slave->dbh(),
+               dbh => $replica->dbh(),
             );
             if ( keys %$repl_filters ) {
                push @all_repl_filters,
-                  { name    => $slave->name(),
+                  { name    => $replica->name(),
                     filters => $repl_filters,
                   };
             }
@@ -10797,9 +10905,9 @@ sub main {
       # #####################################################################
       eval {
          check_repl_table(
-            dbh          => $master_dbh,
+            dbh          => $source_dbh,
             repl_table   => $repl_table,
-            slaves       => $slaves,
+            replicas       => $replicas,
             have_time    => $have_time,
             OptionParser => $o,
             TableParser  => $tp,
@@ -10811,22 +10919,22 @@ sub main {
       }
 
       # #####################################################################
-      # Make a ReplicaLagWaiter to help wait for slaves after each chunk.
+      # Make a ReplicaLagWaiter to help wait for replicas after each chunk.
       # #####################################################################
       my $sleep = sub {
-         # Don't let the master dbh die while waiting for slaves because we
-         # may wait a very long time for slaves.
+         # Don't let the source dbh die while waiting for replicas because we
+         # may wait a very long time for replicas.
 
          # This is called from within the main TABLE loop, so use the
-         # master cxn; do not use $master_dbh.
-         my $dbh = $master_cxn->dbh();
+         # source cxn; do not use $source_dbh.
+         my $dbh = $source_cxn->dbh();
          if ( !$dbh || !$dbh->ping() ) {
-            PTDEBUG && _d('Lost connection to master while waiting for slave lag');
-            eval { $dbh = $master_cxn->connect() };  # connect or die trying
+            PTDEBUG && _d('Lost connection to source while waiting for replica lag');
+            eval { $dbh = $source_cxn->connect() };  # connect or die trying
             if ( $EVAL_ERROR ) {
                $oktorun = 0;  # Fatal error
                chomp $EVAL_ERROR;
-               die "Lost connection to master while waiting for replica lag "
+               die "Lost connection to source while waiting for replica lag "
                   . "($EVAL_ERROR)";
             }
          }
@@ -10836,40 +10944,40 @@ sub main {
       };
 
       my $get_lag;
-      # The plugin is able to override the slavelag check so tools like
+      # The plugin is able to override the replicalag check so tools like
       # pt-heartbeat or other replicators (Tungsten...) can be used to
       # measure replication lag
-      if ( $plugin && $plugin->can('get_slave_lag') ) {
-         $get_lag = $plugin->get_slave_lag(oktorun => \$oktorun);
+      if ( $plugin && $plugin->can('get_replica_lag') ) {
+         $get_lag = $plugin->get_replica_lag(oktorun => \$oktorun);
       } else {
          $get_lag = sub {
             my ($cxn) = @_;
             my $dbh = $cxn->dbh();
             if ( !$dbh || !$dbh->ping() ) {
-               PTDEBUG && _d('Lost connection to slave', $cxn->name(),
-                  'while waiting for slave lag');
+               PTDEBUG && _d('Lost connection to replica', $cxn->name(),
+                  'while waiting for replica lag');
                eval { $dbh = $cxn->connect() };
                if ( $EVAL_ERROR ) {
-                  PTDEBUG && _d('Failed to connect to slave', $cxn->name(),
+                  PTDEBUG && _d('Failed to connect to replica', $cxn->name(),
                      ':', $EVAL_ERROR);
                   return; # keep waiting and trying to reconnect
                }
             }
-            my $slave_lag;
+            my $replica_lag;
             eval {
-               $slave_lag = $ms->get_slave_lag($dbh);
+               $replica_lag = $ms->get_replica_lag($dbh);
             };
             if ( $EVAL_ERROR ) {
-               PTDEBUG && _d('Error getting slave lag', $cxn->name(),
+               PTDEBUG && _d('Error getting replica lag', $cxn->name(),
                   ':', $EVAL_ERROR);
                return; # keep waiting and trying to reconnect
             }
-            return $slave_lag;
+            return $replica_lag;
          };
       }
 
       $replica_lag = new ReplicaLagWaiter(
-         slaves   => $slave_lag_cxns,
+         replicas => $replica_lag_cxns,
          max_lag  => $o->get('max-lag'),
          oktorun  => sub { return $oktorun && $have_time->(); },
          get_lag  => $get_lag,
@@ -10880,7 +10988,7 @@ sub main {
       my $get_status;
       {
          my $sql = "SHOW GLOBAL STATUS LIKE ?";
-         my $sth = $master_cxn->dbh()->prepare($sql);
+         my $sth = $source_cxn->dbh()->prepare($sql);
 
          $get_status = sub {
             my ($var) = @_;
@@ -10910,7 +11018,7 @@ sub main {
 
       if ( $o->get('progress') ) {
          $replica_lag_pr = new Progress(
-            jobsize => scalar @$slaves,
+            jobsize => scalar @$replicas,
             spec    => $o->get('progress'),
             name    => "Waiting for replicas to catch up",  # not used
          );
@@ -10923,15 +11031,15 @@ sub main {
       }
 
       # #####################################################################
-      # Prepare statement handles to update the repl table on the master.
+      # Prepare statement handles to update the repl table on the source.
       # #####################################################################
-      $fetch_sth = $master_dbh->prepare(
+      $fetch_sth = $source_dbh->prepare(
          "SELECT this_crc, this_cnt FROM $repl_table "
          . "WHERE db = ? AND tbl = ? AND chunk = ?");
-      $update_sth = $master_dbh->prepare(
-         "UPDATE $repl_table SET chunk_time = ?, master_crc = ?, master_cnt = ? "
+      $update_sth = $source_dbh->prepare(
+         "UPDATE $repl_table SET chunk_time = ?, ${source_name}_crc = ?, ${source_name}_cnt = ? "
          . "WHERE db = ? AND tbl = ? AND chunk = ?");
-      $delete_sth = $master_dbh->prepare(
+      $delete_sth = $source_dbh->prepare(
          "DELETE FROM $repl_table WHERE db = ? AND tbl = ?");
    } # !$o->get('explain')
 
@@ -10942,8 +11050,8 @@ sub main {
       VersionCheck::version_check(
          force     => $o->got('version-check'),
          instances => [
-            { dbh => $master_dbh, dsn => $master_dsn },
-            map({ +{ dbh => $_->dbh(), dsn => $_->dsn() } } @$slaves)
+            { dbh => $source_dbh, dsn => $source_dsn },
+            map({ +{ dbh => $_->dbh(), dsn => $_->dsn() } } @$replicas)
          ],
       );
    }
@@ -10951,12 +11059,12 @@ sub main {
    # ########################################################################
    # Checksum args and the DMS part of the checksum query for each table.
    # ########################################################################
-   my %crc_args     = $rc->get_crc_args(dbh => $master_dbh);
+   my %crc_args     = $rc->get_crc_args(dbh => $source_dbh);
    my $checksum_dml = "REPLACE INTO $repl_table "
                     . "(db, tbl, chunk, chunk_index,"
                     . " lower_boundary, upper_boundary, this_cnt, this_crc) "
                     . "SELECT"
-                    . ($cluster->is_cluster_node($master_cxn) ? ' /*!99997*/' : '')
+                    . ($cluster->is_cluster_node($source_cxn) ? ' /*!99997*/' : '')
                     . " ?, ?, ?, ?, ?, ?,";
    my $past_cols    = " COUNT(*), '0'";
 
@@ -10966,13 +11074,13 @@ sub main {
    my $last_chunk;
    if ( $o->get('resume') ) {
       $last_chunk = last_chunk(
-         dbh        => $master_dbh,
+         dbh        => $source_dbh,
          repl_table => $repl_table,
       );
    }
 
    my $schema_iter = new SchemaIterator(
-      dbh          => $master_dbh,
+      dbh          => $source_dbh,
       resume       => $last_chunk ? $q->quote(@{$last_chunk}{qw(db tbl)})
                                   : "",
       OptionParser => $o,
@@ -11050,10 +11158,10 @@ sub main {
             $last_chunk = undef;
          }
 
-         if ( $o->get('check-slave-tables') ) {
+         if ( $o->get('check-replica-tables') ) {
             eval {
-               check_slave_tables(
-                  slaves        => $slaves,
+               check_replica_tables(
+                  replicas        => $replicas,
                   db            => $tbl->{db},
                   tbl           => $tbl->{tbl},
                   checksum_cols => $tbl->{checksum_cols},
@@ -11068,7 +11176,7 @@ sub main {
                   . "problems on these replicas:\n"
                   . $EVAL_ERROR
                   . "This can break replication.  If you understand the risks, "
-                  . "specify --no-check-slave-tables to disable this check.\n";
+                  . "specify --no-check-replica-tables to disable this check.\n";
                warn ts($msg);
                $exit_status |= $PTC_EXIT_STATUS{SKIP_TABLE};
                $oktonibble = 0;
@@ -11096,9 +11204,9 @@ sub main {
          else {
             if ( $nibble_iter->one_nibble() ) {
                my @too_large;
-               SLAVE:
-               foreach my $slave ( @$slaves ) {
-                  PTDEBUG && _d('Getting table row estimate on', $slave->name());
+               REPLICA:
+               foreach my $replica ( @$replicas ) {
+                  PTDEBUG && _d('Getting table row estimate on', $replica->name());
                   my $have_warned = 0;
                   while ( $oktorun && $have_time->() )  {
                      my $n_rows;
@@ -11107,21 +11215,21 @@ sub main {
                         # probably best to have 1 code path to determine if
                         # a given table is oversized on a given host.
                         ($n_rows) = NibbleIterator::get_row_estimate(
-                           Cxn   => $slave,
+                           Cxn   => $replica,
                            tbl   => $tbl,
                            where => $o->get('where'),
                         );
                      };
                      if ( my $e = $EVAL_ERROR ) {
-                        if ( $slave->lost_connection($e) ) {
+                        if ( $replica->lost_connection($e) ) {
                            PTDEBUG && _d($e);
-                           eval { $slave->connect() };
+                           eval { $replica->connect() };
                            if ( $EVAL_ERROR ) {
-                              PTDEBUG && _d('Failed to connect to slave', $slave->name(),
+                              PTDEBUG && _d('Failed to connect to replica', $replica->name(),
                                  ':', $EVAL_ERROR);
                               if ( !$have_warned && $o->get('quiet') < 2 ) {
                                  my $msg = "Trying to connect to replica "
-                                    . $slave->name() . " to get row count of"
+                                    . $replica->name() . " to get row count of"
                                     . " table $tbl->{db}.$tbl->{tbl}...\n";
                                  warn ts($msg);
                                  $have_warned = 1;
@@ -11132,24 +11240,24 @@ sub main {
                         }
                         die "Error getting row count estimate of table"
                            . " $tbl->{db}.$tbl->{tbl} on replica "
-                           . $slave->name() . ": $e";
+                           . $replica->name() . ": $e";
                      }
-                     PTDEBUG && _d('Table on', $slave->name(), 'has', $n_rows, 'rows');
-                     my $slave_skip_tolerance = $o->get('slave-skip-tolerance') || 1;
+                     PTDEBUG && _d('Table on', $replica->name(), 'has', $n_rows, 'rows');
+                     my $replica_skip_tolerance = $o->get('replica-skip-tolerance') || 1;
                      if ( $n_rows
-                          && $n_rows > ($tbl->{chunk_size} * $chunk_size_limit) * $slave_skip_tolerance )
+                          && $n_rows > ($tbl->{chunk_size} * $chunk_size_limit) * $replica_skip_tolerance )
                      {
-                        PTDEBUG && _d('Table too large on', $slave->name());
-                        push @too_large, [$slave->name(), $n_rows || 0];
+                        PTDEBUG && _d('Table too large on', $replica->name());
+                        push @too_large, [$replica->name(), $n_rows || 0];
                      }
-                     next SLAVE;
+                     next REPLICA;
                   }
                }
                if ( @too_large ) {
                   if ( $o->get('quiet') < 2 ) {
                      my $msg
                         = "Skipping table $tbl->{db}.$tbl->{tbl} because"
-                        . " on the master it would be checksummed in one chunk"
+                        . " on the source it would be checksummed in one chunk"
                         . " but on these replicas it has too many rows:\n";
                      foreach my $info ( @too_large ) {
                         $msg .= "  $info->[1] rows on $info->[0]\n";
@@ -11195,7 +11303,7 @@ sub main {
 
             if ( $oktonibble && $o->get('empty-replicate-table') ) {
                use_repl_db(
-                  dbh          => $master_cxn->dbh(),
+                  dbh          => $source_cxn->dbh(),
                   repl_table   => $repl_table,
                   OptionParser => $o,
                   Quoter       => $q,
@@ -11207,7 +11315,7 @@ sub main {
             # USE the correct db while checksumming this table.  The "correct"
             # db is a complicated subject; see sub for comments.
             use_repl_db(
-               dbh          => $master_cxn->dbh(),
+               dbh          => $source_cxn->dbh(),
                tbl          => $tbl, # XXX working on this table
                repl_table   => $repl_table,
                OptionParser => $o,
@@ -11344,7 +11452,7 @@ sub main {
          # Max chunk number that worked.  This may be less than the total
          # number of chunks if, for example, chunk 16 of 16 times out, but
          # chunk 15 worked.  The max chunk is used for checking for diffs
-         # on the slaves, in the done callback.
+         # on the replicas, in the done callback.
          $tbl->{max_chunk} = $chunk;
 
          # Fetch the checksum that we just executed from the replicate table.
@@ -11353,13 +11461,13 @@ sub main {
 
          $tbl->{checksum_results}->{n_rows} += $cnt || 0;
 
-         # We're working on the master, so update the checksum's master_cnt
-         # and master_crc.
+         # We're working on the source, so update the checksum's source_cnt
+         # and source_crc.
          $update_sth->execute(
             # UPDATE repl_table SET
             sprintf('%.6f', $tbl->{nibble_time}), # chunk_time
-            $crc,                                 # master_crc
-            $cnt,                                 # master_cnt
+            $crc,                                 # source_crc
+            $cnt,                                 # source_cnt
             # WHERE
             $tbl->{db},
             $tbl->{tbl},
@@ -11417,7 +11525,7 @@ sub main {
             }
          }
 
-         # Wait forever for slaves to catch up.
+         # Wait forever for replicas to catch up.
          $replica_lag_pr->start() if $replica_lag_pr;
          $replica_lag->wait(Progress => $replica_lag_pr);
 
@@ -11436,10 +11544,10 @@ sub main {
          # Don't need to do anything here if we're just --explain'ing.
          return if $o->get('explain');
 
-         # Wait for all slaves to run all checksum chunks,
+         # Wait for all replicas to run all checksum chunks,
          # then check for differences.
-         if ( $max_chunk && $o->get('replicate-check') && scalar @$slaves ) {
-            PTDEBUG && _d('Checking slave diffs');
+         if ( $max_chunk && $o->get('replicate-check') && scalar @$replicas ) {
+            PTDEBUG && _d('Checking replica diffs');
 
             my $check_pr;
             if ( $o->get('progress') ) {
@@ -11451,34 +11559,35 @@ sub main {
             }
 
             # Wait for the last checksum of this table to replicate
-            # to each slave.
+            # to each replica.
             # MySQL 8+ replication is slower than 5.7 and the old wait_for_last_checksum alone
-            # was failing. The new wait_for_slaves checks that Read_Master_Log_Pos on slaves is
-            # greater or equal Position in the master
+            # was failing. The new wait_for_replicas checks that Read_Source_Log_Pos on replicas is
+            # greater or equal Position in the source
             if (!$args{Cxn}->is_cluster_node()) {
-                wait_for_slaves(master_dbh => $args{Cxn}->dbh(), master_slave => $ms, slaves => $slaves);
+                wait_for_replicas(source_dbh => $args{Cxn}->dbh(), source_replica => $ms, replicas => $replicas);
             }
             wait_for_last_checksum(
                tbl          => $tbl,
                repl_table   => $repl_table,
-               slaves       => $slaves,
+               replicas       => $replicas,
                max_chunk    => $max_chunk,
                check_pr     => $check_pr,
                have_time    => $have_time,
                OptionParser => $o,
+               source_name  => $source_name,
             );
 
-            # Check each slave for checksum diffs.
+            # Check each replica for checksum diffs.
             my %diff_chunks;
-            foreach my $slave ( @$slaves ) {
+            foreach my $replica ( @$replicas ) {
                eval {
                   my $diffs = $rc->find_replication_differences(
-                     dbh        => $slave->dbh(),
+                     dbh        => $replica->dbh(),
                      repl_table => $repl_table,
                      where      => "db='$tbl->{db}' AND tbl='$tbl->{tbl}'",
                   );
                   PTDEBUG && _d(scalar @$diffs, 'checksum diffs on',
-                     $slave->name());
+                     $replica->name());
                   # Save unique chunks that differ.
                   # https://bugs.launchpad.net/percona-toolkit/+bug/1030031
                   if ( scalar @$diffs ) {
@@ -11499,7 +11608,7 @@ sub main {
                if ($EVAL_ERROR) {
                   if ( $o->get('quiet') < 2 ) {
                      warn ts("Error checking for checksum differences of table "
-                        . "$tbl->{db}.$tbl->{tbl} on replica " . $slave->name()
+                        . "$tbl->{db}.$tbl->{tbl} on replica " . $replica->name()
                         . ": $EVAL_ERROR\n"
                         . "Check that the replica is running and has the "
                         . "replicate table $repl_table.\n");
@@ -11529,8 +11638,8 @@ sub main {
    # --plugin hook
    if ( $plugin && $plugin->can('init') ) {
       $plugin->init(
-         slaves         => $slaves,
-         slave_lag_cxns => $slave_lag_cxns,
+         replicas         => $replicas,
+         replica_lag_cxns => $replica_lag_cxns,
          repl_table     => $repl_table,
       );
    }
@@ -11564,7 +11673,7 @@ sub main {
          # one chunk.
          my $checksum_cols = eval {
             $rc->make_chunk_checksum(
-               dbh => $master_cxn->dbh(),
+               dbh => $source_cxn->dbh(),
                tbl => $tbl,
                %crc_args
             );
@@ -11580,7 +11689,7 @@ sub main {
          my $nibble_iter;
          eval {
             $nibble_iter = new OobNibbleIterator(
-               Cxn                => $master_cxn,
+               Cxn                => $source_cxn,
                tbl                => $tbl,
                chunk_size         => $tbl->{chunk_size},
                chunk_index        => $o->get('chunk-index'),
@@ -11685,14 +11794,14 @@ sub main {
    # Restore origin QRT pligin state
    if ($o->get('disable-qrt-plugin')) {
        eval {
-           if ($original_qrt_plugin_master_status) {
-               PTDEBUG && _d("Restoring qrt plugin state on master server");
-               $master_dbh->do("SET GLOBAL query_response_time_stats = $original_qrt_plugin_master_status->[0]");
+           if ($original_qrt_plugin_source_status) {
+               PTDEBUG && _d("Restoring qrt plugin state on source server");
+               $source_dbh->do("SET GLOBAL query_response_time_stats = $original_qrt_plugin_source_status->[0]");
            }
-           for my $slave (@$slaves) {
-               if ($slave->{qrt_plugin_status}) {
-                   PTDEBUG && _d("Restoring qrt plugin state on slave ".$slave->{dsn_name});
-                   $slave->{dbh}->do("SET GLOBAL query_response_time_stats = $slave->{qrt_plugin_status}");
+           for my $replica (@$replicas) {
+               if ($replica->{qrt_plugin_status}) {
+                   PTDEBUG && _d("Restoring qrt plugin state on replica ".$replica->{dsn_name});
+                   $replica->{dbh}->do("SET GLOBAL query_response_time_stats = $replica->{qrt_plugin_status}");
                }
            }
        };
@@ -12034,12 +12143,12 @@ sub filter_tables_replicate_check_only {
 
 sub check_repl_table {
    my ( %args ) = @_;
-   my @required_args = qw(dbh repl_table slaves have_time
+   my @required_args = qw(dbh repl_table replicas have_time
                           OptionParser TableParser Quoter);
    foreach my $arg ( @required_args ) {
       die "I need a $arg argument" unless $args{$arg};
    }
-   my ($dbh, $repl_table, $slaves, $have_time, $o, $tp, $q) = @args{@required_args};
+   my ($dbh, $repl_table, $replicas, $have_time, $o, $tp, $q) = @args{@required_args};
 
    PTDEBUG && _d('Checking --replicate table', $repl_table);
 
@@ -12060,7 +12169,7 @@ sub check_repl_table {
 
    if ( $o->get('create-replicate-table') ) {
       # Even if the db already exists, do this in case it does not exist
-      # on a slave.
+      # on a replica.
       my $create_db_sql
          = "CREATE DATABASE IF NOT EXISTS "
          . $q->quote($db)
@@ -12075,26 +12184,26 @@ sub check_repl_table {
          # having privs to create it, but they still have privs to use it.
 
          if ( @db_exists ) {
-            # Repl db already exists on the master, so check if it's also
-            # on all slaves.  If not, and given that creating it failed,
-            # we'll die because we can't be sure if it's ok on all slaves.
+            # Repl db already exists on the source, so check if it's also
+            # on all replicas.  If not, and given that creating it failed,
+            # we'll die because we can't be sure if it's ok on all replicas.
             # The user can verify and disable this check if it's ok.
             my $e = $EVAL_ERROR;  # CREATE DATABASE error
-            my @slaves_missing_db;
-            foreach my $slave ( @$slaves ) {
-               PTDEBUG && _d($show_db_sql, 'on', $slave->name());
-               my @db_exists_in_slave
-                  = $slave->dbh->selectrow_array($show_db_sql);
-               if ( !@db_exists_in_slave ) {
-                  push @slaves_missing_db, $slave;
+            my @replicas_missing_db;
+            foreach my $replica ( @$replicas ) {
+               PTDEBUG && _d($show_db_sql, 'on', $replica->name());
+               my @db_exists_in_replica
+                  = $replica->dbh->selectrow_array($show_db_sql);
+               if ( !@db_exists_in_replica ) {
+                  push @replicas_missing_db, $replica;
                }
             }
-            if ( @slaves_missing_db ) {
+            if ( @replicas_missing_db ) {
                warn $e;  # CREATE DATABASE error
-               die "The --replicate database $db exists on the master but "
-                 . "$create_db_sql on the master failed (see the error above) "
+               die "The --replicate database $db exists on the source but "
+                 . "$create_db_sql on the source failed (see the error above) "
                  . "and the database does not exist on these replicas:\n"
-                 . join("\n", map { "  " . $_->name() } @slaves_missing_db)
+                 . join("\n", map { "  " . $_->name() } @replicas_missing_db)
                  . "\nThis can break replication.  If you understand "
                  . "the risks, specify --no-create-replicate-table to disable "
                  . "this check.\n";
@@ -12146,16 +12255,16 @@ sub check_repl_table {
          # having privs to create it, but they still have privs to use it.
 
          if ( $tbl_exists ) {
-            # Repl table already exists on the master, so check if it's also
-            # on all slaves.  If not, and given that creating it failed,
-            # we'll die because we can't be sure if it's ok on all slaves.
+            # Repl table already exists on the source, so check if it's also
+            # on all replicas.  If not, and given that creating it failed,
+            # we'll die because we can't be sure if it's ok on all replicas.
             # The user can verify and disable this check if it's ok.
             my $e          = $EVAL_ERROR;  # CREATE TABLE error
             my $ddl        = $tp->get_create_table($dbh, $db, $tbl);
             my $tbl_struct = $tp->parse($ddl);
             eval {
-               check_slave_tables(
-                  slaves        => $slaves,
+               check_replica_tables(
+                  replicas        => $replicas,
                   db            => $db,
                   tbl           => $tbl,
                   checksum_cols => $tbl_struct->{cols},
@@ -12166,7 +12275,7 @@ sub check_repl_table {
             };
             if ( $EVAL_ERROR ) {
                warn $e;  # CREATE TABLE error
-               die "The --replicate table $repl_table exists on the master but "
+               die "The --replicate table $repl_table exists on the source but "
                  . "but it has problems on these replicas:\n"
                  . $EVAL_ERROR
                  . "\nThis can break replication.  If you understand "
@@ -12182,14 +12291,14 @@ sub check_repl_table {
       }
    }
 
-   # Check and wait for the repl table to appear on all slaves.
+   # Check and wait for the repl table to appear on all replicas.
    # https://bugs.launchpad.net/percona-toolkit/+bug/1008778
-   if ( scalar @$slaves ) {
+   if ( scalar @$replicas ) {
       my $waiting_for;
       my $pr;
       if ( $o->get('progress') ) {
          $pr = new Progress(
-            jobsize  => scalar @$slaves,
+            jobsize  => scalar @$replicas,
             spec     => $o->get('progress'),
             callback => sub {
                print STDERR "Waiting for the --replicate table to replicate to "
@@ -12199,19 +12308,19 @@ sub check_repl_table {
          $pr->start();
       }
 
-      foreach my $slave ( @$slaves ) {
-         PTDEBUG && _d('Checking if', $slave->name(), 'has repl table');
-         $waiting_for = $slave;
-         my $slave_has_repl_table = $tp->check_table(
-               dbh => $slave->dbh(),
+      foreach my $replica ( @$replicas ) {
+         PTDEBUG && _d('Checking if', $replica->name(), 'has repl table');
+         $waiting_for = $replica;
+         my $replica_has_repl_table = $tp->check_table(
+               dbh => $replica->dbh(),
                db  => $db,
                tbl => $tbl,
          );
-         while ( !$slave_has_repl_table ) {
+         while ( !$replica_has_repl_table ) {
             $pr->update(sub { return 0; }) if $pr;
             sleep 0.5;
-            $slave_has_repl_table = $tp->check_table(
-               dbh => $slave->dbh(),
+            $replica_has_repl_table = $tp->check_table(
+               dbh => $replica->dbh(),
                db  => $db,
                tbl => $tbl,
             );
@@ -12234,70 +12343,70 @@ sub check_repl_table {
    return;  # success, repl table is ready to go
 }
 
-# Check that db.tbl exists on all slaves and has the checksum cols,
+# Check that db.tbl exists on all replicas and has the checksum cols,
 # else when we check for diffs we'll break replication by selecting
 # a nonexistent column.
-sub check_slave_tables {
+sub check_replica_tables {
    my (%args) = @_;
-   my @required_args = qw(slaves db tbl checksum_cols have_time TableParser OptionParser);
+   my @required_args = qw(replicas db tbl checksum_cols have_time TableParser OptionParser);
    foreach my $arg ( @required_args ) {
       die "I need a $arg argument" unless $args{$arg};
    }
-   my ($slaves, $db, $tbl, $checksum_cols, $have_time, $tp, $o) = @args{@required_args};
+   my ($replicas, $db, $tbl, $checksum_cols, $have_time, $tp, $o) = @args{@required_args};
 
    my @problems;
-   SLAVE:
-   foreach my $slave ( @$slaves ) {
-      my $slave_has_table = 0;
+   REPLICA:
+   foreach my $replica ( @$replicas ) {
+      my $replica_has_table = 0;
       my $have_warned     = 0;
       while ( $oktorun && $have_time->() )  {
          eval {
             # TableParser::check_table() does not die on error, it sets
             # check_table_error and return 0.
-            $slave_has_table = $tp->check_table(
-                  dbh => $slave->dbh,
+            $replica_has_table = $tp->check_table(
+                  dbh => $replica->dbh,
                   db  => $db,
                   tbl => $tbl,
             );
             die $tp->{check_table_error} if defined $tp->{check_table_error};
-            if ( !$slave_has_table ) {
+            if ( !$replica_has_table ) {
                push @problems, "Table $db.$tbl does not exist on replica "
-                  . $slave->name;
+                  . $replica->name;
             }
             else {
                # TableParser::get_create_table() will die on error.
-               my $slave_tbl_struct = $tp->parse(
-                  $tp->get_create_table($slave->dbh, $db, $tbl)
+               my $replica_tbl_struct = $tp->parse(
+                  $tp->get_create_table($replica->dbh, $db, $tbl)
                );
-               my @slave_missing_cols;
+               my @replica_missing_cols;
                foreach my $col ( @$checksum_cols ) {
-                  if ( !$slave_tbl_struct->{is_col}->{$col} ) {
-                     push @slave_missing_cols, $col;
+                  if ( !$replica_tbl_struct->{is_col}->{$col} ) {
+                     push @replica_missing_cols, $col;
                   }
                }
-               if ( @slave_missing_cols ) {
-                  push @problems, "Table $db.$tbl on replica " . $slave->name
+               if ( @replica_missing_cols ) {
+                  push @problems, "Table $db.$tbl on replica " . $replica->name
                      . " is missing these columns: "
-                     . join(", ", @slave_missing_cols);
+                     . join(", ", @replica_missing_cols);
                }
             }
          };
          if ( my $e = $EVAL_ERROR ) {
             PTDEBUG && _d($e);
-            if ( !$slave->lost_connection($e) ) {
+            if ( !$replica->lost_connection($e) ) {
                push @problems, "Error checking table $db.$tbl on replica "
-                  . $slave->name . ": $e";
-               next SLAVE;
+                  . $replica->name . ": $e";
+               next REPLICA;
             }
 
-            # Lost connection to slave. Reconnect and try again.
-            eval { $slave->connect() };
+            # Lost connection to replica. Reconnect and try again.
+            eval { $replica->connect() };
             if ( $EVAL_ERROR ) {
-               PTDEBUG && _d('Failed to connect to slave', $slave->name(),
+               PTDEBUG && _d('Failed to connect to replica', $replica->name(),
                   ':', $EVAL_ERROR);
                if ( !$have_warned && $o->get('quiet') < 2 ) {
                   my $msg = "Trying to connect to replica "
-                     . $slave->name() . " to check $db.$tbl...\n";
+                     . $replica->name() . " to check $db.$tbl...\n";
                   warn ts($msg);
                   $have_warned = 1;
                }
@@ -12306,11 +12415,11 @@ sub check_slave_tables {
             next; # try again
          } # eval error
 
-         # No error, so we successfully queried this slave.
-         next SLAVE;
+         # No error, so we successfully queried this replica.
+         next REPLICA;
 
       } # while oktorun && have_time
-   } # foreach slave
+   } # foreach replica
 
    die join("\n", @problems) . "\n" if @problems;
 
@@ -12470,6 +12579,7 @@ sub explain_statement {
 sub last_chunk {
    my (%args) = @_;
    my @required_args = qw(dbh repl_table);
+   my $source_name = $args{source_name} ? $args{source_name} : 'source';
    foreach my $arg ( @required_args ) {
       die "I need a $arg argument" unless $args{$arg};
    }
@@ -12477,7 +12587,7 @@ sub last_chunk {
    PTDEBUG && _d('Getting last chunk for --resume');
 
    my $sql = "SELECT * FROM $repl_table FORCE INDEX (ts_db_tbl) "
-           . "WHERE master_cnt IS NOT NULL "
+           . "WHERE ${source_name}_cnt IS NOT NULL "
            . "ORDER BY ts DESC, db DESC, tbl DESC LIMIT 1";
    PTDEBUG && _d($sql);
    my $sth = $dbh->prepare($sql);
@@ -12531,75 +12641,76 @@ sub have_more_chunks {
    return 1; # more chunks
 }
 
-sub wait_for_slaves {
+sub wait_for_replicas {
    my (%args) = @_;
-   my @required_args = qw(master_dbh master_slave slaves);
+   my @required_args = qw(source_dbh source_replica replicas);
    foreach my $arg ( @required_args ) {
        die "I need a $arg argument" unless $args{$arg};
    }
-   my ($master_dbh, $ms, $slaves) = @args{@required_args};
+   my ($source_dbh, $ms, $replicas) = @args{@required_args};
 
-   foreach my $slave ( @$slaves ) {
-       my $dp = $slave->{DSNParser};
-       my $mdbh = $dp->get_dbh($dp->get_cxn_params($slave->{parent}));
-       my $master_status = $ms->get_master_status($mdbh);
-       $ms->wait_for_master(master_status => $master_status, slave_dbh => $slave->dbh());
+   foreach my $replica ( @$replicas ) {
+       my $dp = $replica->{DSNParser};
+       my $mdbh = $dp->get_dbh($dp->get_cxn_params($replica->{parent}));
+       my $source_status = $ms->get_source_status($mdbh);
+       $ms->wait_for_source(source_status => $source_status, replica_dbh => $replica->dbh());
        $dp->disconnect($mdbh);
    }
 }
 
 sub wait_for_last_checksum {
    my (%args) = @_;
-   my @required_args = qw(tbl repl_table slaves max_chunk have_time OptionParser);
+   my @required_args = qw(tbl repl_table replicas max_chunk have_time OptionParser);
    foreach my $arg ( @required_args ) {
       die "I need a $arg argument" unless defined $args{$arg};
    }
-   my ($tbl, $repl_table, $slaves, $max_chunk, $have_time, $o) = @args{@required_args};
+   my ($tbl, $repl_table, $replicas, $max_chunk, $have_time, $o) = @args{@required_args};
    my $check_pr = $args{check_pr};
+   my $source_name = $args{source_name} ? $args{source_name} : 'source';
 
-   # Requiring "AND master_crc IS NOT NULL" avoids a race condition
+   # Requiring "AND source_crc IS NOT NULL" avoids a race condition
    # when the system is fast but replication is slow.  In such cases,
-   # we can select on the slave before the update for $update_sth
+   # we can select on the replica before the update for $update_sth
    # replicates; this causes a false-positive diff.
    my $sql = "SELECT MAX(chunk) FROM $repl_table "
            . "WHERE db='$tbl->{db}' AND tbl='$tbl->{tbl}' "
-           . "AND master_crc IS NOT NULL";
+           . "AND ${source_name}_crc IS NOT NULL";
    PTDEBUG && _d($sql);
 
    my $sleep_time = 0;
-   my $n_slaves   = scalar @$slaves - 1;
+   my $n_replicas   = scalar @$replicas - 1;
    my @chunks;
-   my %skip_slave;
+   my %skip_replica;
    my %have_warned;
    my $checked_all;
    while ( $oktorun && $have_time->() && (!$checked_all || (($chunks[0] || 0) < $max_chunk)) ) {
       @chunks      = ();
       $checked_all = 1;
-      for my $i ( 0..$n_slaves ) {
-         my $slave = $slaves->[$i];
-         if ( $skip_slave{$i} ) {
-            PTDEBUG && _d('Skipping slave', $slave->name(),
+      for my $i ( 0..$n_replicas ) {
+         my $replica = $replicas->[$i];
+         if ( $skip_replica{$i} ) {
+            PTDEBUG && _d('Skipping replica', $replica->name(),
                'due to previous error it caused');
             next;
          }
-         PTDEBUG && _d('Getting last checksum on', $slave->name());
+         PTDEBUG && _d('Getting last checksum on', $replica->name());
          eval {
-            my ($chunk) = $slave->dbh()->selectrow_array($sql);
-            PTDEBUG && _d($slave->name(), 'max chunk:', $chunk);
+            my ($chunk) = $replica->dbh()->selectrow_array($sql);
+            PTDEBUG && _d($replica->name(), 'max chunk:', $chunk);
             push @chunks, $chunk || 0;
          };
          if (my $e = $EVAL_ERROR) {
             PTDEBUG && _d($e);
-            if ( $slave->lost_connection($e) ) {
+            if ( $replica->lost_connection($e) ) {
                if ( !$have_warned{$i} && $o->get('quiet') < 2 ) {
-                  warn ts("Lost connection to " .  $slave->name() . " while "
+                  warn ts("Lost connection to " .  $replica->name() . " while "
                      . "waiting for the last checksum of table "
                      . "$tbl->{db}.$tbl->{tbl} to replicate. Will reconnect "
                      . "and try again. No more warnings for this replica will "
                      . "be printed.\n");
                   $have_warned{$i}++;
                }
-               eval { $slave->connect() };
+               eval { $replica->connect() };
                if ( $EVAL_ERROR ) {
                   PTDEBUG && _d($EVAL_ERROR);
                   sleep 1; # wait between failed reconnect attempts
@@ -12610,20 +12721,20 @@ sub wait_for_last_checksum {
                if ( $o->get('quiet') < 2 ) {
                   warn ts("Error waiting for the last checksum of table "
                         . "$tbl->{db}.$tbl->{tbl} to replicate to "
-                        . "replica " . $slave->name() . ": $e\n"
+                        . "replica " . $replica->name() . ": $e\n"
                         . "Check that the replica is running and has the "
                         . "replicate table $repl_table.  Checking the replica "
                         . "for checksum differences will probably cause "
                         . "another error.\n");
                }
                $tbl->{checksum_results}->{errors}++;
-               $skip_slave{$i} = 1;
+               $skip_replica{$i} = 1;
             }
             next;
          }
       }
 
-      # If we have no chunks, which can happen if the slaves
+      # If we have no chunks, which can happen if the replicas
       # were skipped due to errors, then @chunks will be empty
       # and nothing of the following applies. In fact, it
       # leads to an uninit warning because of $chunks[0]; See
@@ -12636,7 +12747,7 @@ sub wait_for_last_checksum {
          }
 
          # We shouldn't wait long here because we already waited
-         # for all slaves to catchup at least until --max-lag.
+         # for all replicas to catchup at least until --max-lag.
          $sleep_time += 0.25 if $sleep_time <= $o->get('max-lag');
          PTDEBUG && _d('Sleep', $sleep_time, 'waiting for chunks');
          sleep $sleep_time;
@@ -13246,7 +13357,7 @@ checks.  See also L<"--replicate-database">.
 
 See also L<"REPLICA CHECKS">.
 
-=item --check-slave-lag
+=item --check-replica-lag
 
 type: string; group: Throttle
 
@@ -13260,7 +13371,7 @@ a normal replica to monitor.
 
 See also L<"REPLICA CHECKS">.
 
-=item --[no]check-slave-tables
+=item --[no]check-replica-tables
 
 default: yes; group: Safety
 
@@ -13744,8 +13855,8 @@ structure (MAGIC_create_replicate):
      upper_boundary TEXT             NULL,
      this_crc       CHAR(40)     NOT NULL,
      this_cnt       INT          NOT NULL,
-     master_crc     CHAR(40)         NULL,
-     master_cnt     INT              NULL,
+     source_crc     CHAR(40)         NULL,
+     source_cnt     INT              NULL,
      ts             TIMESTAMP    NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
      PRIMARY KEY (db, tbl, chunk),
      INDEX ts_db_tbl (ts, db, tbl)
@@ -13840,7 +13951,7 @@ type: string; default: #
 The separator character used for CONCAT_WS().  This character is used to join
 the values of columns when checksumming.
 
-=item --skip-check-slave-lag
+=item --skip-check-replica-lag
 
 type: DSN; repeatable: yes
 
@@ -13888,7 +13999,7 @@ short form: -S; type: string; group: Connection
 
 Socket file to use for connection.
 
-=item --slave-skip-tolerance
+=item --replica-skip-tolerance
 
 type: float; default: 1.0
 
@@ -14061,7 +14172,7 @@ These hooks, in this order, are called if defined:
    init
    before_replicate_check
    after_replicate_check
-   get_slave_lag
+   get_replica_lag
    before_checksum_table
    after_checksum_table
 
@@ -14146,6 +14257,12 @@ dsn: user; copy: yes
 
 User for login if not current user.
 
+=item * s
+
+dsn: mysql_ssl; copy: yes
+
+Create SSL connection
+
 =back
 
 =head1 ENVIRONMENT
diff --git a/lib/PerconaTest.pm b/lib/PerconaTest.pm
index 3591240ce..720066626 100644
--- a/lib/PerconaTest.pm
+++ b/lib/PerconaTest.pm
@@ -775,7 +775,7 @@ sub get_source_binlog_pos {
       $source_name = 'master';
    }
 
-   my $sql = "SHOW ${source_name} STATUS";
+   my $sql = "SHOW ${source_status} STATUS";
    my $ms  = $dbh->selectrow_hashref($sql);
    return $ms->{position};
 }
diff --git a/t/pt-query-digest/bugs.t b/t/pt-query-digest/bugs.t
index 9c222ba71..b8462b7fb 100644
--- a/t/pt-query-digest/bugs.t
+++ b/t/pt-query-digest/bugs.t
@@ -15,13 +15,14 @@ use Sandbox;
 use PerconaTest;
 
 require "$trunk/bin/pt-query-digest";
+require VersionParser;
 
 my $dp  = new DSNParser(opts=>$dsn_opts);
 my $sb  = new Sandbox(basedir => '/tmp', DSNParser => $dp);
-my $dbh = $sb->get_dbh_for('master');
+my $dbh = $sb->get_dbh_for('source');
 
 if ( !$dbh ) {
-   plan skip_all => 'Cannot connect to sandbox master';
+   plan skip_all => 'Cannot connect to sandbox source';
 }
 
 my $output  = '';
diff --git a/t/pt-query-digest/collect_and_report_cycles.t b/t/pt-query-digest/collect_and_report_cycles.t
index a221845f5..0b2d84c44 100644
--- a/t/pt-query-digest/collect_and_report_cycles.t
+++ b/t/pt-query-digest/collect_and_report_cycles.t
@@ -14,13 +14,14 @@ use Test::More;
 use PerconaTest;
 use Sandbox;
 use DSNParser;
+require VersionParser;
 
 my $dp = new DSNParser(opts=>$dsn_opts);
 my $sb = new Sandbox(basedir => '/tmp', DSNParser => $dp);
-my $dbh = $sb->get_dbh_for('master');
+my $dbh = $sb->get_dbh_for('source');
 
 if ( !$dbh ) {
-   plan skip_all => 'Cannot connect to sandbox master';
+   plan skip_all => 'Cannot connect to sandbox source';
 }
 else {
    plan tests => 4;
diff --git a/t/pt-query-digest/daemon.t b/t/pt-query-digest/daemon.t
index 689289520..b2d06b918 100644
--- a/t/pt-query-digest/daemon.t
+++ b/t/pt-query-digest/daemon.t
@@ -15,10 +15,11 @@ use Test::More tests => 7;
 use PerconaTest;
 use Sandbox;
 use DSNParser;
+require VersionParser;
 
 my $dp = new DSNParser(opts=>$dsn_opts);
 my $sb = new Sandbox(basedir => '/tmp', DSNParser => $dp);
-my $dbh = $sb->get_dbh_for('master');
+my $dbh = $sb->get_dbh_for('source');
 
 my $output;
 
@@ -41,7 +42,7 @@ like(
 # Daemonizing and pid creation
 # #########################################################################
 SKIP: {
-   skip "Cannot connect to sandbox master", 5 unless $dbh;
+   skip "Cannot connect to sandbox source", 5 unless $dbh;
 
    my $cmd = "$trunk/bin/pt-query-digest --daemonize --pid $pid_file --processlist h=127.1,P=12345,u=msandbox,p=msandbox --log /dev/null";
    `$cmd`;
diff --git a/t/pt-query-digest/explain.t b/t/pt-query-digest/explain.t
index 3f861efee..adbe54095 100644
--- a/t/pt-query-digest/explain.t
+++ b/t/pt-query-digest/explain.t
@@ -15,13 +15,14 @@ use Sandbox;
 use PerconaTest;
 
 require "$trunk/bin/pt-query-digest";
+require VersionParser;
 
 my $dp  = new DSNParser(opts=>$dsn_opts);
 my $sb  = new Sandbox(basedir => '/tmp', DSNParser => $dp);
-my $dbh = $sb->get_dbh_for('master');
+my $dbh = $sb->get_dbh_for('source');
 
 if ( !$dbh ) {
-   plan skip_all => 'Cannot connect to sandbox master';
+   plan skip_all => 'Cannot connect to sandbox source';
 }
 
 $dbh->do('drop database if exists food');
@@ -134,7 +135,7 @@ ok(
 # #############################################################################
 # Issue 1196: mk-query-digest --explain is broken
 # #############################################################################
-$sb->load_file('master', "t/pt-query-digest/samples/issue_1196.sql");
+$sb->load_file('source', "t/pt-query-digest/samples/issue_1196.sql");
 
 ok(
    no_diff(
diff --git a/t/pt-query-digest/explain_partitions.t b/t/pt-query-digest/explain_partitions.t
index 9a874fb56..0dc4f67e2 100644
--- a/t/pt-query-digest/explain_partitions.t
+++ b/t/pt-query-digest/explain_partitions.t
@@ -18,13 +18,13 @@ use Sandbox;
 
 my $dp = new DSNParser(opts=>$dsn_opts);
 my $sb = new Sandbox(basedir => '/tmp', DSNParser => $dp);
-my $dbh = $sb->get_dbh_for('master');
+my $dbh = $sb->get_dbh_for('source');
 
 if ( !$dbh ) {
-   plan skip_all => 'Cannot connect to sandbox master';
+   plan skip_all => 'Cannot connect to sandbox source';
 }
 elsif ( VersionParser->new($dbh) < '5.1' ) {
-   plan skip_all => 'Sandbox master version not >= 5.1';
+   plan skip_all => 'Sandbox source version not >= 5.1';
 }
 else {
    plan tests => 2;
diff --git a/t/pt-query-digest/history.t b/t/pt-query-digest/history.t
index 81ccce025..1f9f1dff7 100644
--- a/t/pt-query-digest/history.t
+++ b/t/pt-query-digest/history.t
@@ -14,13 +14,14 @@ use Test::More;
 use PerconaTest;
 use Sandbox;
 require "$trunk/bin/pt-query-digest";
+require VersionParser;
 
 my $dp = new DSNParser(opts=>$dsn_opts);
 my $sb = new Sandbox(basedir => '/tmp', DSNParser => $dp);
-my $dbh = $sb->get_dbh_for('master');
+my $dbh = $sb->get_dbh_for('source');
 
 if ( !$dbh ) {
-   plan skip_all => 'Cannot connect to sandbox master';
+   plan skip_all => 'Cannot connect to sandbox source';
 }
 
 sub normalize_numbers {
@@ -49,7 +50,7 @@ my $output;
 my $cmd;
 
 $sb->create_dbs($dbh, ['test']);
-$sb->load_file('master', 't/pt-query-digest/samples/query_review.sql');
+$sb->load_file('source', 't/pt-query-digest/samples/query_review.sql');
 
 # Test --create-review and --create-review-history-table
 $output = run_with("slow006.txt", '--create-history-table',
diff --git a/t/pt-query-digest/issue_1186.t b/t/pt-query-digest/issue_1186.t
index 39058f555..6418674e1 100644
--- a/t/pt-query-digest/issue_1186.t
+++ b/t/pt-query-digest/issue_1186.t
@@ -14,13 +14,14 @@ use Test::More;
 use PerconaTest;
 use Sandbox;
 use DSNParser;
+require VersionParser;
 
 my $dp = new DSNParser(opts=>$dsn_opts);
 my $sb = new Sandbox(basedir => '/tmp', DSNParser => $dp);
-my $dbh = $sb->get_dbh_for('master');
+my $dbh = $sb->get_dbh_for('source');
 
 if ( !$dbh ) {
-   plan skip_all => 'Cannot connect to sandbox master';
+   plan skip_all => 'Cannot connect to sandbox source';
 }
 else {
    plan tests => 3;
diff --git a/t/pt-query-digest/issue_360.t b/t/pt-query-digest/issue_360.t
index 6801107df..729d9b1b2 100644
--- a/t/pt-query-digest/issue_360.t
+++ b/t/pt-query-digest/issue_360.t
@@ -14,13 +14,14 @@ use Test::More;
 use PerconaTest;
 use DSNParser;
 use Sandbox;
+require VersionParser;
 
 my $dp = new DSNParser(opts=>$dsn_opts);
 my $sb = new Sandbox(basedir => '/tmp', DSNParser => $dp);
-my $dbh = $sb->get_dbh_for('master');
+my $dbh = $sb->get_dbh_for('source');
 
 if ( !$dbh ) {
-   plan skip_all => 'Cannot connect to sandbox master';
+   plan skip_all => 'Cannot connect to sandbox source';
 }
 else {
    plan tests => 3;
diff --git a/t/pt-query-digest/processlist.t b/t/pt-query-digest/processlist.t
index 925dd36d3..f4dbe8d45 100644
--- a/t/pt-query-digest/processlist.t
+++ b/t/pt-query-digest/processlist.t
@@ -14,6 +14,7 @@ use Test::More;
 use PerconaTest;
 use Sandbox;
 require "$trunk/bin/pt-query-digest";
+require VersionParser;
 
 use Data::Dumper;
 $Data::Dumper::Indent    = 1;
@@ -22,10 +23,10 @@ $Data::Dumper::Quotekeys = 0;
 
 my $dp = new DSNParser(opts=>$dsn_opts);
 my $sb = new Sandbox(basedir => '/tmp', DSNParser => $dp);
-my $dbh = $sb->get_dbh_for('master');
+my $dbh = $sb->get_dbh_for('source');
 
 if ( !$dbh ) {
-   plan skip_all => 'Cannot connect to sandbox master';
+   plan skip_all => 'Cannot connect to sandbox source';
 }
 
 my @args = qw(-F /tmp/12345/my.sandbox.cnf --processlist h=127.1 --report-format query_report);
diff --git a/t/pt-query-digest/pt-2264.t b/t/pt-query-digest/pt-2264.t
index 0cb8eef6c..0f85fa479 100644
--- a/t/pt-query-digest/pt-2264.t
+++ b/t/pt-query-digest/pt-2264.t
@@ -14,6 +14,7 @@ use Test::More;
 use PerconaTest;
 use DSNParser;
 use Sandbox;
+require VersionParser;
 
 my $dp = new DSNParser(opts=>$dsn_opts);
 my $sb = new Sandbox(basedir => '/tmp', DSNParser => $dp);
@@ -22,10 +23,10 @@ if ( $sandbox_version lt '8.0') {
    plan skip_all => "Requires MySQL 8.0 or newer";
 }
 
-my $dbh = $sb->get_dbh_for('master');
+my $dbh = $sb->get_dbh_for('source');
 
 if ( !$dbh ) {
-   plan skip_all => 'Cannot connect to sandbox master';
+   plan skip_all => 'Cannot connect to sandbox source';
 }
 else {
    plan tests => 3;
diff --git a/t/pt-query-digest/review.t b/t/pt-query-digest/review.t
index 05c8ad9d5..5d9abd6b3 100644
--- a/t/pt-query-digest/review.t
+++ b/t/pt-query-digest/review.t
@@ -15,13 +15,14 @@ use PerconaTest;
 use Sandbox;
 use SqlModes;
 require "$trunk/bin/pt-query-digest";
+require VersionParser;
 
 my $dp = new DSNParser(opts=>$dsn_opts);
 my $sb = new Sandbox(basedir => '/tmp', DSNParser => $dp);
-my $dbh = $sb->get_dbh_for('master');
+my $dbh = $sb->get_dbh_for('source');
 
 if ( !$dbh ) {
-   plan skip_all => 'Cannot connect to sandbox master';
+   plan skip_all => 'Cannot connect to sandbox source';
 }
 
 sub normalize_numbers {
@@ -47,7 +48,7 @@ my $output;
 my $cmd;
 
 $sb->create_dbs($dbh, ['test']);
-$sb->load_file('master', 't/pt-query-digest/samples/query_review.sql');
+$sb->load_file('source', 't/pt-query-digest/samples/query_review.sql');
 
 # Test --create-review
 $output = run_with("slow006.txt", qw(--create-review-table),
@@ -188,7 +189,7 @@ unlike($output, qr/Use of uninitialized value/, 'no crash due to totally missing
 # #############################################################################
 # --review --no-report
 # #############################################################################
-$sb->load_file('master', 't/pt-query-digest/samples/query_review.sql');
+$sb->load_file('source', 't/pt-query-digest/samples/query_review.sql');
 $output = run_with("slow006.txt", '--no-report',
                    '--review', "$dsn,D=test,t=query_review");
 
diff --git a/t/pt-query-digest/run_time.t b/t/pt-query-digest/run_time.t
index 140a8ae12..aeced3eba 100644
--- a/t/pt-query-digest/run_time.t
+++ b/t/pt-query-digest/run_time.t
@@ -15,13 +15,14 @@ use PerconaTest;
 use Sandbox;
 use Time::HiRes qw(sleep);
 require "$trunk/bin/pt-query-digest";
+require VersionParser;
 
 my $dp = new DSNParser(opts=>$dsn_opts);
 my $sb = new Sandbox(basedir => '/tmp', DSNParser => $dp);
-my $dbh = $sb->get_dbh_for('master');
+my $dbh = $sb->get_dbh_for('source');
 
 if ( !$dbh ) {
-   plan skip_all => 'Cannot connect to sandbox master';
+   plan skip_all => 'Cannot connect to sandbox source';
 }
 else {
    plan tests => 11;
diff --git a/t/pt-query-digest/since_until.t b/t/pt-query-digest/since_until.t
index 091495090..96b5b309f 100644
--- a/t/pt-query-digest/since_until.t
+++ b/t/pt-query-digest/since_until.t
@@ -14,10 +14,11 @@ use Test::More;
 use PerconaTest;
 use Sandbox;
 require "$trunk/bin/pt-query-digest";
+require VersionParser;
 
 my $dp = new DSNParser(opts=>$dsn_opts);
 my $sb = new Sandbox(basedir => '/tmp', DSNParser => $dp);
-my $dbh = $sb->get_dbh_for('master');
+my $dbh = $sb->get_dbh_for('source');
 
 my @args       = (qw(--report-format query_report --limit 10));
 my $sample_in  = "$trunk/t/lib/samples/slowlogs";
@@ -115,9 +116,9 @@ ok(
 );
 
 SKIP: {
-   skip 'Cannot connect to sandbox master', 2 unless $dbh;
+   skip 'Cannot connect to sandbox source', 2 unless $dbh;
 
-   my $dsn = $sb->dsn_for('master');
+   my $dsn = $sb->dsn_for('source');
 
    # The result file is correct: it's the one that has all quries from
    # slow033.txt.
diff --git a/t/pt-query-digest/standard_options.t b/t/pt-query-digest/standard_options.t
index 7a3982e1f..18093ebfa 100644
--- a/t/pt-query-digest/standard_options.t
+++ b/t/pt-query-digest/standard_options.t
@@ -14,13 +14,14 @@ use Test::More;
 use PerconaTest;
 use Sandbox;
 use DSNParser;
+require VersionParser;
 
 my $dp = new DSNParser(opts=>$dsn_opts);
 my $sb = new Sandbox(basedir => '/tmp', DSNParser => $dp);
-my $dbh = $sb->get_dbh_for('master');
+my $dbh = $sb->get_dbh_for('source');
 
 if ( !$dbh ) {
-   plan skip_all => 'Cannot connect to sandbox master';
+   plan skip_all => 'Cannot connect to sandbox source';
 }
 else {
    plan tests => 2;
diff --git a/t/pt-show-grants/all_grants.t b/t/pt-show-grants/all_grants.t
index d986dffd3..67867dea1 100644
--- a/t/pt-show-grants/all_grants.t
+++ b/t/pt-show-grants/all_grants.t
@@ -16,13 +16,14 @@ use Sandbox;
 use SqlModes;
 
 require "$trunk/bin/pt-show-grants";
+require VersionParser;
 
 my $dp = new DSNParser(opts=>$dsn_opts);
 my $sb = new Sandbox(basedir => '/tmp', DSNParser => $dp);
-my $dbh = $sb->get_dbh_for('master');
+my $dbh = $sb->get_dbh_for('source');
 
 if ( !$dbh ) {
-   plan skip_all => 'Cannot connect to sandbox master';
+   plan skip_all => 'Cannot connect to sandbox source';
 }
 else {
    plan tests => 3;
@@ -51,6 +52,20 @@ $modes->restore_original_modes;
 $output = output(
    sub { pt_show_grants::main('-F', $cnf, qw(--only bob --no-header)); }
 );
+my $expected_84 = <<'END_OUTPUT_6';
+-- Grants for 'bob'@'%'
+CREATE USER IF NOT EXISTS `bob`@`%`;
+ALTER USER `bob`@`%` IDENTIFIED WITH 'caching_sha2_password' REQUIRE NONE PASSWORD EXPIRE DEFAULT ACCOUNT UNLOCK PASSWORD HISTORY DEFAULT PASSWORD REUSE INTERVAL DEFAULT PASSWORD REQUIRE CURRENT DEFAULT;
+GRANT USAGE ON *.* TO `bob`@`%`;
+-- Grants for 'bob'@'192.168.1.1'
+CREATE USER IF NOT EXISTS `bob`@`192.168.1.1`;
+ALTER USER `bob`@`192.168.1.1` IDENTIFIED WITH 'caching_sha2_password' REQUIRE NONE PASSWORD EXPIRE DEFAULT ACCOUNT UNLOCK PASSWORD HISTORY DEFAULT PASSWORD REUSE INTERVAL DEFAULT PASSWORD REQUIRE CURRENT DEFAULT;
+GRANT USAGE ON *.* TO `bob`@`192.168.1.1`;
+-- Grants for 'bob'@'localhost'
+CREATE USER IF NOT EXISTS `bob`@`localhost`;
+ALTER USER `bob`@`localhost` IDENTIFIED WITH 'caching_sha2_password' REQUIRE NONE PASSWORD EXPIRE DEFAULT ACCOUNT UNLOCK PASSWORD HISTORY DEFAULT PASSWORD REUSE INTERVAL DEFAULT PASSWORD REQUIRE CURRENT DEFAULT;
+GRANT USAGE ON *.* TO `bob`@`localhost`;
+END_OUTPUT_6
 
 my $expected_80 = <<'END_OUTPUT_0';
 -- Grants for 'bob'@'%'
@@ -91,7 +106,7 @@ GRANT USAGE ON *.* TO 'bob'@'192.168.1.1';
 GRANT USAGE ON *.* TO 'bob'@'localhost';
 END_OUTPUT_2
 
-my $expected =  $sandbox_version < '5.7' ? $expected_56 : $sandbox_version < '8.0' ? $expected_57 : $expected_80;
+my $expected =  $sandbox_version < '5.7' ? $expected_56 : $sandbox_version < '8.0' ? $expected_57 : $sandbox_version < '8.4' ? $expected_80 : $expected_84;
 
 is(
    $output,
@@ -103,6 +118,13 @@ $output = output(
    sub { pt_show_grants::main('-F', $cnf, qw(--only bob@192.168.1.1 --no-header)); }
 );
 
+$expected_84 = <<'END_OUTPUT_7';
+-- Grants for 'bob'@'192.168.1.1'
+CREATE USER IF NOT EXISTS `bob`@`192.168.1.1`;
+ALTER USER `bob`@`192.168.1.1` IDENTIFIED WITH 'caching_sha2_password' REQUIRE NONE PASSWORD EXPIRE DEFAULT ACCOUNT UNLOCK PASSWORD HISTORY DEFAULT PASSWORD REUSE INTERVAL DEFAULT PASSWORD REQUIRE CURRENT DEFAULT;
+GRANT USAGE ON *.* TO `bob`@`192.168.1.1`;
+END_OUTPUT_7
+
 $expected_80 = <<'END_OUTPUT_5';
 -- Grants for 'bob'@'192.168.1.1'
 CREATE USER IF NOT EXISTS `bob`@`192.168.1.1`;
@@ -122,7 +144,7 @@ $expected_56 = <<'END_OUTPUT_4';
 GRANT USAGE ON *.* TO 'bob'@'192.168.1.1';
 END_OUTPUT_4
 
-$expected = $sandbox_version < '5.7' ? $expected_56 : $sandbox_version < '8.0' ? $expected_57: $expected_80;
+$expected =  $sandbox_version < '5.7' ? $expected_56 : $sandbox_version < '8.0' ? $expected_57 : $sandbox_version < '8.4' ? $expected_80 : $expected_84;
 
 is(
    $output,
diff --git a/t/pt-show-grants/basics.t b/t/pt-show-grants/basics.t
index 9416c5b08..a355345d3 100644
--- a/t/pt-show-grants/basics.t
+++ b/t/pt-show-grants/basics.t
@@ -15,13 +15,14 @@ use PerconaTest;
 use Sandbox;
 use SqlModes;
 require "$trunk/bin/pt-show-grants";
+require VersionParser;
 
 my $dp = new DSNParser(opts=>$dsn_opts);
 my $sb = new Sandbox(basedir => '/tmp', DSNParser => $dp);
-my $dbh = $sb->get_dbh_for('master');
+my $dbh = $sb->get_dbh_for('source');
 
 if ( !$dbh ) {
-   plan skip_all => 'Cannot connect to sandbox master';
+   plan skip_all => 'Cannot connect to sandbox source';
 }
 
 $sb->wipe_clean($dbh);
@@ -94,17 +95,17 @@ like(
    $output,
    qr/\d\d:\d\d:\d\d\n\z/,
    'No output when all users skipped'
-);
+) or diag($output);
 # #############################################################################
 # pt-show-grant doesn't support column-level grants
 # https://bugs.launchpad.net/percona-toolkit/+bug/866075
 # #############################################################################
-$sb->load_file('master', 't/pt-show-grants/samples/column-grants.sql');
+$sb->load_file('source', 't/pt-show-grants/samples/column-grants.sql');
 diag(`/tmp/12345/use -u root -e "CREATE USER 'sally'\@'%'"`);
 diag(`/tmp/12345/use -u root -e "GRANT SELECT(DateCreated, PckPrice, PaymentStat, SANumber) ON test.t TO 'sally'\@'%'"`);
 diag(`/tmp/12345/use -u root -e "GRANT SELECT(city_id), INSERT(city) ON sakila.city TO 'sally'\@'%'"`);
 
-my $postfix = $sandbox_version >= '8.0' ? '-80' : $sandbox_version < '5.7' ? '' : '-57';
+my $postfix = $sandbox_version >= '8.4' ? '-84' : $sandbox_version >= '8.0' ? '-80' : $sandbox_version < '5.7' ? '' : '-57';
 
 # 11
 ok(
diff --git a/t/pt-show-grants/issue_445.t b/t/pt-show-grants/issue_445.t
index 6ce9a1f4f..989b7b661 100644
--- a/t/pt-show-grants/issue_445.t
+++ b/t/pt-show-grants/issue_445.t
@@ -15,13 +15,14 @@ use PerconaTest;
 use Sandbox;
 use SqlModes;
 require "$trunk/bin/pt-show-grants";
+require VersionParser;
 
 my $dp = new DSNParser(opts=>$dsn_opts);
 my $sb = new Sandbox(basedir => '/tmp', DSNParser => $dp);
-my $dbh = $sb->get_dbh_for('master');
+my $dbh = $sb->get_dbh_for('source');
 
 if ( !$dbh ) {
-   plan skip_all => 'Cannot connect to sandbox master';
+   plan skip_all => 'Cannot connect to sandbox source';
 }
 else {
    plan tests => 5;
diff --git a/t/pt-show-grants/pt-2190.t b/t/pt-show-grants/pt-2190.t
index 828c936d2..e6afef113 100644
--- a/t/pt-show-grants/pt-2190.t
+++ b/t/pt-show-grants/pt-2190.t
@@ -19,10 +19,10 @@ require "$trunk/bin/pt-show-grants";
 
 my $dp = new DSNParser(opts=>$dsn_opts);
 my $sb = new Sandbox(basedir => '/tmp', DSNParser => $dp);
-my $dbh = $sb->get_dbh_for('master');
+my $dbh = $sb->get_dbh_for('source');
 
 if ( !$dbh ) {
-   plan skip_all => 'Cannot connect to sandbox master';
+   plan skip_all => 'Cannot connect to sandbox source';
 }
 
 if ( VersionParser->new($dbh) lt '8.0.17') {
diff --git a/t/pt-show-grants/pt-2247.t b/t/pt-show-grants/pt-2247.t
index 7c93a0390..d88c7dced 100644
--- a/t/pt-show-grants/pt-2247.t
+++ b/t/pt-show-grants/pt-2247.t
@@ -19,10 +19,10 @@ require "$trunk/bin/pt-show-grants";
 
 my $dp = new DSNParser(opts=>$dsn_opts);
 my $sb = new Sandbox(basedir => '/tmp', DSNParser => $dp);
-my $dbh = $sb->get_dbh_for('master');
+my $dbh = $sb->get_dbh_for('source');
 
 if ( !$dbh ) {
-   plan skip_all => 'Cannot connect to sandbox master';
+   plan skip_all => 'Cannot connect to sandbox source';
 }
 
 if ( VersionParser->new($dbh)->flavor !~ m/maria/i ) {
diff --git a/t/pt-show-grants/samples/column-grants-84.txt b/t/pt-show-grants/samples/column-grants-84.txt
new file mode 100644
index 000000000..17889caf2
--- /dev/null
+++ b/t/pt-show-grants/samples/column-grants-84.txt
@@ -0,0 +1,6 @@
+-- Grants for 'sally'@'%'
+CREATE USER IF NOT EXISTS `sally`@`%`;
+ALTER USER `sally`@`%` IDENTIFIED WITH 'caching_sha2_password' REQUIRE NONE PASSWORD EXPIRE DEFAULT ACCOUNT UNLOCK PASSWORD HISTORY DEFAULT PASSWORD REUSE INTERVAL DEFAULT PASSWORD REQUIRE CURRENT DEFAULT;
+GRANT INSERT (`city`), SELECT (`city_id`) ON `sakila`.`city` TO `sally`@`%`;
+GRANT SELECT (`DateCreated`, `PaymentStat`, `PckPrice`, `SANumber`) ON `test`.`t` TO `sally`@`%`;
+GRANT USAGE ON *.* TO `sally`@`%`;
diff --git a/t/pt-show-grants/samples/column-grants-combined-84.txt b/t/pt-show-grants/samples/column-grants-combined-84.txt
new file mode 100644
index 000000000..195c5fc2a
--- /dev/null
+++ b/t/pt-show-grants/samples/column-grants-combined-84.txt
@@ -0,0 +1,6 @@
+-- Grants for 'sally'@'%'
+CREATE USER IF NOT EXISTS `sally`@`%`;
+ALTER USER `sally`@`%` IDENTIFIED WITH 'caching_sha2_password' REQUIRE NONE PASSWORD EXPIRE DEFAULT ACCOUNT UNLOCK PASSWORD HISTORY DEFAULT PASSWORD REUSE INTERVAL DEFAULT PASSWORD REQUIRE CURRENT DEFAULT;
+GRANT INSERT (`city`), SELECT, SELECT (`city_id`) ON `sakila`.`city` TO `sally`@`%`;
+GRANT SELECT (`DateCreated`, `PaymentStat`, `PckPrice`, `SANumber`) ON `test`.`t` TO `sally`@`%`;
+GRANT USAGE ON *.* TO `sally`@`%`;
diff --git a/t/pt-show-grants/samples/column-grants-separate-84.txt b/t/pt-show-grants/samples/column-grants-separate-84.txt
new file mode 100644
index 000000000..b43f91210
--- /dev/null
+++ b/t/pt-show-grants/samples/column-grants-separate-84.txt
@@ -0,0 +1,7 @@
+-- Grants for 'sally'@'%'
+CREATE USER IF NOT EXISTS `sally`@`%`;
+ALTER USER `sally`@`%` IDENTIFIED WITH 'caching_sha2_password' REQUIRE NONE PASSWORD EXPIRE DEFAULT ACCOUNT UNLOCK PASSWORD HISTORY DEFAULT PASSWORD REUSE INTERVAL DEFAULT PASSWORD REQUIRE CURRENT DEFAULT;
+GRANT INSERT (`city`) ON `sakila`.`city` TO `sally`@`%`;
+GRANT SELECT (`DateCreated`, `PaymentStat`, `PckPrice`, `SANumber`) ON `test`.`t` TO `sally`@`%`;
+GRANT SELECT (`city_id`) ON `sakila`.`city` TO `sally`@`%`;
+GRANT USAGE ON *.* TO `sally`@`%`;
diff --git a/t/pt-show-grants/samples/column-grants-separate-revoke-84.txt b/t/pt-show-grants/samples/column-grants-separate-revoke-84.txt
new file mode 100644
index 000000000..ed921862f
--- /dev/null
+++ b/t/pt-show-grants/samples/column-grants-separate-revoke-84.txt
@@ -0,0 +1,12 @@
+-- Revoke statements for 'sally'@'%'
+REVOKE INSERT (`city`) ON `sakila`.`city` FROM `sally`@`%`;
+REVOKE SELECT (`DateCreated`, `PaymentStat`, `PckPrice`, `SANumber`) ON `test`.`t` FROM `sally`@`%`;
+REVOKE SELECT (`city_id`) ON `sakila`.`city` FROM `sally`@`%`;
+REVOKE USAGE ON *.* FROM `sally`@`%`;
+-- Grants for 'sally'@'%'
+CREATE USER IF NOT EXISTS `sally`@`%`;
+ALTER USER `sally`@`%` IDENTIFIED WITH 'caching_sha2_password' REQUIRE NONE PASSWORD EXPIRE DEFAULT ACCOUNT UNLOCK PASSWORD HISTORY DEFAULT PASSWORD REUSE INTERVAL DEFAULT PASSWORD REQUIRE CURRENT DEFAULT;
+GRANT INSERT (`city`) ON `sakila`.`city` TO `sally`@`%`;
+GRANT SELECT (`DateCreated`, `PaymentStat`, `PckPrice`, `SANumber`) ON `test`.`t` TO `sally`@`%`;
+GRANT SELECT (`city_id`) ON `sakila`.`city` TO `sally`@`%`;
+GRANT USAGE ON *.* TO `sally`@`%`;
diff --git a/t/pt-slave-delay/auto_restart.t b/t/pt-slave-delay/auto_restart.t
index d89382522..e255e8b50 100644
--- a/t/pt-slave-delay/auto_restart.t
+++ b/t/pt-slave-delay/auto_restart.t
@@ -19,8 +19,8 @@ require "$trunk/bin/pt-slave-delay";
 
 my $dp  = DSNParser->new(opts => $dsn_opts);
 my $sb  = Sandbox->new(basedir => '/tmp', DSNParser => $dp);
-my $master_dbh = $sb->get_dbh_for('master');
-my $dbh        = $sb->get_dbh_for('slave1');
+my $source_dbh = $sb->get_dbh_for('source');
+my $dbh        = $sb->get_dbh_for('replica1');
 
 if ($sandbox_version ge '5.7') {
    plan skip_all => 'Use SQL_DELAY';
@@ -65,7 +65,7 @@ else {
    sleep 1;
    diag(`/tmp/12346/start >/dev/null`);
    # Ensure we don't break the sandbox -- instance 12347 will be disconnected
-   # when its master gets rebooted
+   # when its source gets rebooted
    diag(`/tmp/12347/use -e "stop slave; start slave"`);
    exit;
 }
@@ -112,7 +112,7 @@ waitpid ($pid, 0);
 # #############################################################################
 # 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;
diff --git a/t/pt-slave-delay/basics.t b/t/pt-slave-delay/basics.t
index 094291ff4..a968ff6d9 100644
--- a/t/pt-slave-delay/basics.t
+++ b/t/pt-slave-delay/basics.t
@@ -17,9 +17,9 @@ require "$trunk/bin/pt-slave-delay";
 
 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 $master_dbh = $sb->get_dbh_for('source');
+my $slave1_dbh  = $sb->get_dbh_for('replica1');
+my $slave2_dbh  = $sb->get_dbh_for('replica2');
 
 if ($sandbox_version ge '5.7') {
    plan skip_all => 'Use SQL_DELAY';
diff --git a/t/pt-slave-delay/issue_1169.t b/t/pt-slave-delay/issue_1169.t
index 108f8dcd8..d45827461 100644
--- a/t/pt-slave-delay/issue_1169.t
+++ b/t/pt-slave-delay/issue_1169.t
@@ -18,7 +18,7 @@ require "$trunk/bin/pt-slave-delay";
 
 my $dp  = DSNParser->new(opts => $dsn_opts);
 my $sb  = Sandbox->new(basedir => '/tmp', DSNParser => $dp);
-my $dbh = $sb->get_dbh_for('slave1');
+my $dbh = $sb->get_dbh_for('replica1');
 
 if ($sandbox_version ge '5.7') {
    plan skip_all => 'Use SQL_DELAY';
diff --git a/t/pt-slave-delay/standard_options.t b/t/pt-slave-delay/standard_options.t
index f63c1a41e..198674fdd 100644
--- a/t/pt-slave-delay/standard_options.t
+++ b/t/pt-slave-delay/standard_options.t
@@ -17,8 +17,8 @@ require "$trunk/bin/pt-slave-delay";
 
 my $dp = new DSNParser(opts=>$dsn_opts);
 my $sb = new Sandbox(basedir => '/tmp', DSNParser => $dp);
-my $master_dbh = $sb->get_dbh_for('master');
-my $slave_dbh  = $sb->get_dbh_for('slave1');
+my $master_dbh = $sb->get_dbh_for('source');
+my $slave_dbh  = $sb->get_dbh_for('replica1');
 
 if ($sandbox_version ge '5.7') {
    plan skip_all => 'Use SQL_DELAY';
diff --git a/t/pt-slave-find/pt-slave-find.t b/t/pt-slave-find/pt-slave-find.t
index e132f6834..0134cbe69 100644
--- a/t/pt-slave-find/pt-slave-find.t
+++ b/t/pt-slave-find/pt-slave-find.t
@@ -18,54 +18,54 @@ require "$trunk/bin/pt-slave-find";
 
 my $dp = new DSNParser(opts=>$dsn_opts);
 my $sb = new Sandbox(basedir => '/tmp', DSNParser => $dp);
-my $slave1_dbh = $sb->get_dbh_for('slave1');
-my $slave2_dbh = $sb->get_dbh_for('slave2');
+my $replica1_dbh = $sb->get_dbh_for('replica1');
+my $replica2_dbh = $sb->get_dbh_for('replica2');
 
-# This test is sensitive to ghost/old slaves created/destroyed by other
-# tests.  So we stop the slaves, restart the master, and start everything
+# This test is sensitive to ghost/old replicas created/destroyed by other
+# tests.  So we stop the replicas, restart the source, and start everything
 # again.  Hopefully this will return the env to its original state.
-$slave2_dbh->do("STOP SLAVE");
-$slave1_dbh->do("STOP SLAVE");
+$replica2_dbh->do("STOP ${replica_name}");
+$replica1_dbh->do("STOP ${replica_name}");
 diag(`/tmp/12345/stop >/dev/null`);
 diag(`/tmp/12345/start >/dev/null`);
-$slave1_dbh->do("START SLAVE");
-$slave2_dbh->do("START SLAVE");
+$replica1_dbh->do("START ${replica_name}");
+$replica2_dbh->do("START ${replica_name}");
 
-my $master_dbh = $sb->get_dbh_for('master');
+my $source_dbh = $sb->get_dbh_for('source');
 
-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 slave';
+elsif ( !$replica1_dbh ) {
+   plan skip_all => 'Cannot connect to sandbox replica';
 }
-elsif ( !$slave2_dbh ) {
-   plan skip_all => 'Cannot connect to second sandbox slave';
+elsif ( !$replica2_dbh ) {
+   plan skip_all => 'Cannot connect to second sandbox replica';
 }
 else {
    plan tests => 10;
 }
 
-my @args = ('h=127.0.0.1,P=12345,u=msandbox,p=msandbox');
+my @args = ('h=127.0.0.1,P=12345,u=msandbox,p=msandbox,s=1');
 
 my $output = `$trunk/bin/pt-slave-find --help`;
 like($output, qr/Prompt for a password/, 'It compiles');
 
 # Double check that we're setup correctly.
-my $row = $slave2_dbh->selectall_arrayref('SHOW SLAVE STATUS', {Slice => {}});
+my $row = $replica2_dbh->selectall_arrayref("SHOW ${replica_name} STATUS", {Slice => {}});
 is(
-   $row->[0]->{master_port},
+   $row->[0]->{source_port},
    '12346',
-   'slave2 is slave of slave1'
+   'replica2 is replica of replica1'
 );
 
-$output = `$trunk/bin/pt-slave-find -h 127.0.0.1 -P 12345 -u msandbox -p msandbox --report-format hostname`;
+$output = `$trunk/bin/pt-slave-find -h 127.0.0.1 -P 12345 -u msandbox -p msandbox s=1 --report-format hostname`;
 my $expected = <<EOF;
 127.0.0.1:12345
 +- 127.0.0.1:12346
    +- 127.0.0.1:12347
 EOF
-is($output, $expected, 'Master with slave and slave of slave');
+is($output, $expected, 'Source with replica and replica of replica');
 
 ###############################################################################
 # Test --resolve-hostname option (we don't know the hostname of the test
@@ -79,10 +79,10 @@ like (
 ) or diag($output);
 
 # #############################################################################
-# Until MasterSlave::find_slave_hosts() is improved to overcome the problems
-# with SHOW SLAVE HOSTS, this test won't work.
+# Until MasterSlave::find_replica_hosts() is improved to overcome the problems
+# with SHOW REPLICA HOSTS, this test won't work.
 # #############################################################################
-# Make slave2 slave of master.
+# Make replica2 replica of source.
 #diag(`../../mk-slave-move/mk-slave-move --sibling-of-master h=127.1,P=12347`);
 #$output = `perl ../mk-slave-find -h 127.0.0.1 -P 12345 -u msandbox -p msandbox`;
 #$expected = <<EOF;
@@ -90,7 +90,7 @@ like (
 #+- 127.0.0.1:12346
 #+- 127.0.0.1:12347
 #EOF
-#is($output, $expected, 'Master with two slaves');
+#is($output, $expected, 'Source with two replicas');
 
 # #########################################################################
 # Issue 391: Add --pid option to all scripts
@@ -108,7 +108,7 @@ like(
 # #############################################################################
 # Summary report format.
 # #############################################################################
-my $outfile = "/tmp/mk-slave-find-output.txt";
+my $outfile = "/tmp/mk-replica-find-output.txt";
 #diag(`rm -rf $outfile >/dev/null`);
 diag(`rm -rf $outfile`);
 
@@ -126,31 +126,32 @@ $result =~ s/Uptime.*/Uptime/g;
 $result =~ s/[0-9]* seconds/0 seconds/g;
 $result =~ s/Binary logging.*/Binary logging/g;
 $result =~ s/Replication     Is a slave, has 1 slaves connected, is.*/Replication     Is a slave, has 1 slaves connected, is/g;
+$result =~ s/Replication     Is a replica, has 1 replicas connected, is.*/Replication     Is a replica, has 1 replicas connected, is/g;
 
 my $innodb_re = qr/InnoDB version\s+(.*)/;
 my (@innodb_versions) = $result =~ /$innodb_re/g;
 $result =~ s/$innodb_re/InnoDB version  BUILTIN/g;
 
-my $master_version = VersionParser->new($master_dbh);
-my $slave_version  = VersionParser->new($slave1_dbh);
-my $slave2_version = VersionParser->new($slave2_dbh);
+my $source_version = VersionParser->new($source_dbh);
+my $replica_version  = VersionParser->new($replica1_dbh);
+my $replica2_version = VersionParser->new($replica2_dbh);
 
 is(
    $innodb_versions[0],
-   $master_version->innodb_version(),
-   "pt-slave-find gets the right InnoDB version for the master"
+   $source_version->innodb_version(),
+   "pt-slave-find gets the right InnoDB version for the source"
 );
 
 is(
    $innodb_versions[1],
-   $slave_version->innodb_version(),
-   "...and for the first slave"
-);
+   $replica_version->innodb_version(),
+   "...and for the first replica"
+) or diag($output);
 
 is(
    $innodb_versions[2],
-   $slave2_version->innodb_version(),
-   "...and for the first slave"
+   $replica2_version->innodb_version(),
+   "...and for the second replica"
 );
 
 ok(
diff --git a/t/pt-slave-restart/gtid.t b/t/pt-slave-restart/gtid.t
index ab1dfada0..fab66e03d 100644
--- a/t/pt-slave-restart/gtid.t
+++ b/t/pt-slave-restart/gtid.t
@@ -10,6 +10,7 @@ use strict;
 use warnings FATAL => 'all';
 use English qw(-no_match_vars);
 use Test::More;
+use Data::Dumper;
 
 use PerconaTest;
 use Sandbox;
@@ -25,25 +26,25 @@ diag("Sandbox restarted");
 
 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 ( !$slave2_dbh ) {
-   plan skip_all => 'Cannot connect to sandbox slave2';
+elsif ( !$replica2_dbh ) {
+   plan skip_all => 'Cannot connect to sandbox replica2';
 }
 
-my $slave1_dsn = $sb->dsn_for("slave1");
-my $slave2_dsn = $sb->dsn_for("slave2");
+my $replica1_dsn = $sb->dsn_for("replica1");
+my $replica2_dsn = $sb->dsn_for("replica2");
 
-my $pid_file = "/tmp/pt-slave-restart-test-$PID.pid";
-my $log_file = "/tmp/pt-slave-restart-test-$PID.log";
+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";
 
 sub start {
@@ -76,7 +77,7 @@ sub wait_repl_broke {
    my $dbh = shift;
    return wait_until(
       sub {
-         my $row = $dbh->selectrow_hashref('show slave status');
+         my $row = $dbh->selectrow_hashref("show ${replica_name} status");
          return $row->{last_sql_errno};
       }
    );
@@ -86,7 +87,7 @@ sub wait_repl_ok {
    my $dbh = shift;
    wait_until(
       sub {
-         my $row = $dbh->selectrow_hashref('show slave status');
+         my $row = $dbh->selectrow_hashref("show ${replica_name} status");
          return $row->{last_sql_errno} == 0;
       },
       0.30,
@@ -98,26 +99,26 @@ sub wait_repl_ok {
 # Basic test to see if restart works with GTID.
 # #############################################################################
 
-$master_dbh->do('DROP DATABASE IF EXISTS test');
-$master_dbh->do('CREATE DATABASE test');
-$master_dbh->do('CREATE TABLE test.t (a INT)');
-$sb->wait_for_slaves;
+$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
-$slave1_dbh->do('DROP TABLE test.t');
-$master_dbh->do('INSERT INTO test.t SELECT 1');
-wait_repl_broke($slave1_dbh) or die "Failed to break replication";
+$replica1_dbh->do('DROP TABLE test.t');
+$source_dbh->do('INSERT INTO test.t SELECT 1');
+wait_repl_broke($replica1_dbh) or die "Failed to break replication";
 
-my $r = $slave1_dbh->selectrow_hashref('show slave status');
-like($r->{last_error}, qr/Table 'test.t' doesn't exist'/, 'slave: Replication broke');
+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
 # (it should take < 1s but tests can be really slow sometimes).
-start("$slave1_dsn") or die "Failed to start pt-slave-restart";
-wait_repl_ok($slave1_dbh);
+start("$replica1_dsn") or die "Failed to start pt-slave-restart";
+wait_repl_ok($replica1_dbh);
 
 # Check if replication is fixed.
-$r = $slave1_dbh->selectrow_hashref('show slave status');
+$r = $replica1_dbh->selectrow_hashref("show ${replica_name} status");
 like(
    $r->{last_errno},
    qr/^0$/,
@@ -128,35 +129,35 @@ like(
 stop() or die "Failed to stop pt-slave-restart";
 
 # #############################################################################
-# Test the slave of the master.
+# Test the replica of the source.
 # #############################################################################
 
-$master_dbh->do('DROP DATABASE IF EXISTS test');
-$master_dbh->do('CREATE DATABASE test');
-$master_dbh->do('CREATE TABLE test.t (a INT)');
-$sb->wait_for_slaves;
+$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
-$slave2_dbh->do('DROP TABLE test.t');
-$master_dbh->do('INSERT INTO test.t SELECT 1');
-wait_repl_broke($slave2_dbh) or die "Failed to break replication";
+$replica2_dbh->do('DROP TABLE test.t');
+$source_dbh->do('INSERT INTO test.t SELECT 1');
+wait_repl_broke($replica2_dbh) or die "Failed to break replication";
 
-# fetch the master uuid, which is the machine we need to skip an event from
-$r = $master_dbh->selectrow_hashref('select @@GLOBAL.server_uuid as uuid');
+# fetch the source uuid, which is the machine we need to skip an event from
+$r = $source_dbh->selectrow_hashref('select @@GLOBAL.server_uuid as uuid');
 my $uuid = $r->{uuid};
 
-$r = $slave2_dbh->selectrow_hashref('show slave status');
-like($r->{last_error}, qr/Table 'test.t' doesn't exist'/, 'slaveofslave: Replication broke');
+$r = $replica2_dbh->selectrow_hashref("show ${replica_name} status");
+like($r->{last_error}, qr/Table 'test.t' doesn't exist'/, 'replicaofreplica: Replication broke');
 
 # Start an instance
-start("--master-uuid=$uuid $slave2_dsn") or die;
-wait_repl_ok($slave2_dbh);
+start("--source-uuid=$uuid $replica2_dsn") or die;
+wait_repl_ok($replica2_dbh);
 
-$r = $slave2_dbh->selectrow_hashref('show slave status');
+$r = $replica2_dbh->selectrow_hashref("show ${replica_name} status");
 like(
    $r->{last_errno},
    qr/^0$/,
-   'Skips event from master on slave2'
+   'Skips event from source on replica2'
 ) or BAIL_OUT("Replication is broken");
 
 stop() or die "Failed to stop pt-slave-restart";
@@ -165,29 +166,29 @@ stop() or die "Failed to stop pt-slave-restart";
 # Test skipping 2 events in a row.
 # #############################################################################
 
-$master_dbh->do('DROP DATABASE IF EXISTS test');
-$master_dbh->do('CREATE DATABASE test');
-$master_dbh->do('CREATE TABLE test.t (a INT)');
-$sb->wait_for_slaves;
+$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
-$slave2_dbh->do('DROP TABLE test.t');
-$master_dbh->do('INSERT INTO test.t SELECT 1');
-$master_dbh->do('INSERT INTO test.t SELECT 1');
-wait_repl_broke($slave2_dbh) or die "Failed to break replication";
+$replica2_dbh->do('DROP TABLE test.t');
+$source_dbh->do('INSERT INTO test.t SELECT 1');
+$source_dbh->do('INSERT INTO test.t SELECT 1');
+wait_repl_broke($replica2_dbh) or die "Failed to break replication";
 
-# fetch the master uuid, which is the machine we need to skip an event from
-$r = $master_dbh->selectrow_hashref('select @@GLOBAL.server_uuid as uuid');
+# fetch the source uuid, which is the machine we need to skip an event from
+$r = $source_dbh->selectrow_hashref('select @@GLOBAL.server_uuid as uuid');
 $uuid = $r->{uuid};
 
-$r = $slave2_dbh->selectrow_hashref('show slave status');
-like($r->{last_error}, qr/Table 'test.t' doesn't exist'/, 'slaveofslaveskip2: Replication broke');
+$r = $replica2_dbh->selectrow_hashref("show ${replica_name} status");
+like($r->{last_error}, qr/Table 'test.t' doesn't exist'/, 'replicaofreplicaskip2: Replication broke');
 
 # Start an instance
-start("--skip-count=2 --master-uuid=$uuid $slave2_dsn") or die;
-wait_repl_ok($slave2_dbh);
+start("--skip-count=2 --source-uuid=$uuid $replica2_dsn") or die;
+wait_repl_ok($replica2_dbh);
 
-$r = $slave2_dbh->selectrow_hashref('show slave status');
+$r = $replica2_dbh->selectrow_hashref("show ${replica_name} status");
 like(
    $r->{last_errno},
    qr/^0$/,
diff --git a/t/pt-slave-restart/gtid_parallelreplication.t b/t/pt-slave-restart/gtid_parallelreplication.t
index d04c7921f..4246238d4 100644
--- a/t/pt-slave-restart/gtid_parallelreplication.t
+++ b/t/pt-slave-restart/gtid_parallelreplication.t
@@ -27,18 +27,18 @@ diag(`REPLICATION_THREADS=2 GTID=ON_PERMISSIVE $trunk/sandbox/test-env start >/d
 
 my $dp = new DSNParser(opts=>$dsn_opts);
 my $sb = new Sandbox(basedir => '/tmp', DSNParser => $dp);
-my $master_dbh  = $sb->get_dbh_for('master');
-my $slave_dbh   = $sb->get_dbh_for('slave1');
-my $slave2_dbh  = $sb->get_dbh_for('slave2');
+my $source_dbh  = $sb->get_dbh_for('source');
+my $replica_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 ( !$slave_dbh ) {
-   plan skip_all => 'Cannot connect to sandbox slave1';
+elsif ( !$replica_dbh ) {
+   plan skip_all => 'Cannot connect to sandbox replica1';
 }
-elsif ( !$slave2_dbh ) {
-   plan skip_all => 'Cannot connect to sandbox slave2';
+elsif ( !$replica2_dbh ) {
+   plan skip_all => 'Cannot connect to sandbox replica2';
 }
 
 # #############################################################################
@@ -49,14 +49,14 @@ my $output=`$trunk/bin/pt-slave-restart --run-time=1s -h 127.0.0.1 -P 12346 -u m
 
 like(
    $output,
-   qr/Cannot skip transactions properly.*slave_parallel_workers/,
+   qr/Cannot skip transactions properly.*${replica_name}_parallel_workers/,
    "pt-slave-restart exits with multiple replication threads"
-);
+) or diag($output);
 
 # #############################################################################
 # Done.
 # #############################################################################
-diag(`rm -f /tmp/pt-slave-re*`);
+diag(`rm -f /tmp/pt-replica-re*`);
 
 diag(`$trunk/sandbox/test-env stop >/dev/null`);
 diag(`$trunk/sandbox/test-env start >/dev/null`);
diff --git a/t/pt-slave-restart/pt-slave-restart.t b/t/pt-slave-restart/pt-slave-restart.t
index 265ec6784..46b7a101e 100644
--- a/t/pt-slave-restart/pt-slave-restart.t
+++ b/t/pt-slave-restart/pt-slave-restart.t
@@ -21,46 +21,46 @@ diag("Sandbox restarted");
 
 my $dp = new DSNParser(opts=>$dsn_opts);
 my $sb = new Sandbox(basedir => '/tmp', DSNParser => $dp);
-my $master_dbh = $sb->get_dbh_for('master');
-my $slave_dbh  = $sb->get_dbh_for('slave1');
+my $source_dbh = $sb->get_dbh_for('source');
+my $replica_dbh  = $sb->get_dbh_for('replica1');
 
-if ( !$master_dbh ) {
-   plan skip_all => 'Cannot connect to sandbox master';
+if ( !$source_dbh ) {
+   plan skip_all => 'Cannot connect to sandbox source';
 }
-elsif ( !$slave_dbh ) {
-   plan skip_all => 'Cannot connect to sandbox slave';
+elsif ( !$replica_dbh ) {
+   plan skip_all => 'Cannot connect to sandbox replica';
 }
 
-$master_dbh->do('DROP DATABASE IF EXISTS test');
-$master_dbh->do('CREATE DATABASE test');
-$master_dbh->do('CREATE TABLE test.t (a INT)');
-$sb->wait_for_slaves;
+$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
-$slave_dbh->do('DROP TABLE test.t');
-$master_dbh->do('INSERT INTO test.t SELECT 1');
+$replica_dbh->do('DROP TABLE test.t');
+$source_dbh->do('INSERT INTO test.t SELECT 1');
 wait_until(
    sub {
-      my $row = $slave_dbh->selectrow_hashref('show slave status');
+      my $row = $replica_dbh->selectrow_hashref("show ${replica_name} status");
       return $row->{last_sql_errno};
    }
 );
 
-my $r = $slave_dbh->selectrow_hashref('show slave status');
+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-slave-restart --max-sleep 0.25 -h 127.0.0.1 -P 12346 -u msandbox -p msandbox --daemonize --pid /tmp/pt-slave-restart.pid --log /tmp/pt-slave-restart.log`);
+diag(`$trunk/bin/pt-slave-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-slave-restart \-\-max\-sleep ' | grep -v grep | grep -v pt-slave-restart.t`;
 like($output, qr/pt-slave-restart --max/, 'It lives');
 
 unlike($output, qr/Table 'test.t' doesn't exist'/, 'It is not busted');
 
-ok(-f '/tmp/pt-slave-restart.pid', 'PID file created');
-ok(-f '/tmp/pt-slave-restart.log', 'Log file created');
+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-slave-restart.pid`;
+$output = `cat /tmp/pt-replica-restart.pid`;
 chomp($output);
 is($output, $pid, 'PID file has correct PID');
 
@@ -69,28 +69,28 @@ sleep 1;
 $output = `ps -eaf | grep pt-slave-restart | grep -v grep`;
 unlike($output, qr/pt-slave-restart --max/, 'It is dead');
 
-diag(`rm -f /tmp/pt-slave-re*`);
-ok(! -f '/tmp/pt-slave-restart.pid', 'PID file removed');
+diag(`rm -f /tmp/pt-replica-re*`);
+ok(! -f '/tmp/pt-replica-restart.pid', 'PID file removed');
 
 # #############################################################################
 # Issue 118: pt-slave-restart --error-numbers option is broken
 # #############################################################################
-$output = `$trunk/bin/pt-slave-restart --stop --sentinel /tmp/pt-slave-restartup --error-numbers=1205,1317`;
-like($output, qr{Successfully created file /tmp/pt-slave-restartup}, '--error-numbers works (issue 118)');
+$output = `$trunk/bin/pt-slave-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-slave-re*`);
+diag(`rm -f /tmp/pt-replica-re*`);
 
 # #############################################################################
 # Issue 459: mk-slave-restart --error-text is broken
 # #############################################################################
-# Bust replication again.  At this point, the master has test.t but
-# the slave does not.
-$master_dbh->do('DROP TABLE IF EXISTS test.t');
-$master_dbh->do('CREATE TABLE test.t (a INT)');
+# 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;
-$slave_dbh->do('DROP TABLE test.t');
-$master_dbh->do('INSERT INTO test.t SELECT 1');
-$output = `/tmp/12346/use -e 'show slave status'`;
+$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'/,
@@ -140,7 +140,7 @@ is(
 # #############################################################################
 # Done.
 # #############################################################################
-diag(`rm -f /tmp/pt-slave-re*`);
+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;
diff --git a/t/pt-stalk/plugin.t b/t/pt-stalk/plugin.t
index 3971d15bf..4a4fdceb4 100644
--- a/t/pt-stalk/plugin.t
+++ b/t/pt-stalk/plugin.t
@@ -15,13 +15,14 @@ use Time::HiRes qw(sleep);
 use PerconaTest;
 use DSNParser;
 use Sandbox;
+require VersionParser;
 
 my $dp = new DSNParser(opts=>$dsn_opts);
 my $sb = new Sandbox(basedir => '/tmp', DSNParser => $dp);
-my $dbh = $sb->get_dbh_for('master');
+my $dbh = $sb->get_dbh_for('source');
 
 if ( !$dbh ) {
-   plan skip_all => 'Cannot connect to sandbox master';
+   plan skip_all => 'Cannot connect to sandbox source';
 }
 
 my $cnf      = "/tmp/12345/my.sandbox.cnf";
diff --git a/t/pt-stalk/pt-stalk-replication.t b/t/pt-stalk/pt-stalk-replication.t
index 5e65d1afe..7f65b863b 100644
--- a/t/pt-stalk/pt-stalk-replication.t
+++ b/t/pt-stalk/pt-stalk-replication.t
@@ -15,14 +15,15 @@ use Time::HiRes qw(sleep);
 
 use PerconaTest;
 use DSNParser;
+require VersionParser;
 use Sandbox;
 
 my $dp = new DSNParser(opts=>$dsn_opts);
 my $sb = new Sandbox(basedir => '/tmp', DSNParser => $dp);
-my $dbh = $sb->get_dbh_for('master');
+my $dbh = $sb->get_dbh_for('source');
 
 if ( !$dbh ) {
-   plan skip_all => 'Cannot connect to sandbox master';
+   plan skip_all => 'Cannot connect to sandbox source';
 }
 
 my $cnf      = "/tmp/12345/my.sandbox.cnf";
@@ -54,16 +55,16 @@ sub wait_n_cycles {
 }
 
 # ###########################################################################
-# Test that SHOW SLAVE STATUS outputs are captured
+# Test that SHOW REPLICA STATUS outputs are captured
 # ###########################################################################
 
 my $retval = system("$trunk/bin/pt-stalk --no-stalk --run-time 1 --dest $dest --prefix nostalk --pid $pid_file --iterations 1 -- --defaults-file=$cnf --socket=/tmp/12346/mysql_sandbox12346.sock >$log_file 2>&1");
-my $output = `cat $dest/nostalk-slave-status|grep Slave_IO_Running`;
+my $output = `cat $dest/nostalk-${replica_name}-status|grep -i ${replica_name}_IO_Running`;
 
 like(
    $output,
-   qr/Slave_IO_Running: Yes/,
-   "SHOW SLAVE STATUS outputs gathered."
+   qr/${replica_name}_IO_Running: Yes/i,
+   "SHOW REPLICA STATUS outputs gathered."
 );
 
 is(
diff --git a/t/pt-stalk/pt-stalk.t b/t/pt-stalk/pt-stalk.t
index 09b87b2fb..f1cb28a3f 100644
--- a/t/pt-stalk/pt-stalk.t
+++ b/t/pt-stalk/pt-stalk.t
@@ -16,13 +16,14 @@ use Time::HiRes qw(sleep);
 use PerconaTest;
 use DSNParser;
 use Sandbox;
+require VersionParser;
 
 my $dp = new DSNParser(opts=>$dsn_opts);
 my $sb = new Sandbox(basedir => '/tmp', DSNParser => $dp);
-my $dbh = $sb->get_dbh_for('master');
+my $dbh = $sb->get_dbh_for('source');
 
 if ( !$dbh ) {
-   plan skip_all => 'Cannot connect to sandbox master';
+   plan skip_all => 'Cannot connect to sandbox source';
 }
 
 my $cnf      = "/tmp/12345/my.sandbox.cnf";
@@ -719,15 +720,15 @@ cleanup();
 
 SKIP: {
 
-   skip "Only test on mysql 5.7" if ( $sandbox_version lt '5.7' );
+   skip "Only test on mysql 5.7+" if ( $sandbox_version lt '5.7' );
 
    sub start_thread {
       # this must run in a thread because we need to have an uncommitted transaction
       my ($dsn_opts) = @_;
       my $dp = new DSNParser(opts=>$dsn_opts);
       my $sb = new Sandbox(basedir => '/tmp', DSNParser => $dp);
-      my $dbh = $sb->get_dbh_for('master');
-      $sb->load_file('master', "t/pt-stalk/samples/issue-1642751.sql");
+      my $dbh = $sb->get_dbh_for('source');
+      $sb->load_file('source', "t/pt-stalk/samples/issue-1642751.sql");
    }
    my $thr = threads->create('start_thread', $dsn_opts);
    $thr->detach();
@@ -745,13 +746,13 @@ SKIP: {
    like(
       $output,
       qr/ STATE: ACTIVE/,
-      "MySQL 5.7 ACTIVE transactions"
+      "MySQL 5.7+ ACTIVE transactions"
    );
           
    like(
       $output,
       qr/ STATE: COMMITTED/,
-      "MySQL 5.7 COMMITTED transactions"
+      "MySQL 5.7+ COMMITTED transactions"
    );
    
    cleanup();
@@ -759,57 +760,57 @@ SKIP: {
 
 SKIP: {
 
-   skip "Only test on mysql 5.7" if ( $sandbox_version lt '5.7' );
+   skip "Only test on mysql 5.7+" if ( $sandbox_version lt '5.7' );
 
-   my ($master1_dbh, $master1_dsn) = $sb->start_sandbox(
-      server => 'chan_master1',
-      type   => 'master',
+   my ($source1_dbh, $source1_dsn) = $sb->start_sandbox(
+      server => 'chan_source1',
+      type   => 'source',
    );
-   my ($master2_dbh, $master2_dsn) = $sb->start_sandbox(
-      server => 'chan_master2',
-      type   => 'master',
+   my ($source2_dbh, $source2_dsn) = $sb->start_sandbox(
+      server => 'chan_source2',
+      type   => 'source',
    );
-   my ($slave1_dbh, $slave1_dsn) = $sb->start_sandbox(
-      server => 'chan_slave1',
-      type   => 'master',
+   my ($replica1_dbh, $replica1_dsn) = $sb->start_sandbox(
+      server => 'chan_replica1',
+      type   => 'source',
    );
-   my $slave1_port = $sb->port_for('chan_slave1');
+   my $replica1_port = $sb->port_for('chan_replica1');
    
-   $sb->load_file('chan_master1', "sandbox/gtid_on.sql", undef, no_wait => 1);
-   $sb->load_file('chan_master2', "sandbox/gtid_on.sql", undef, no_wait => 1);
-   $sb->load_file('chan_slave1', "sandbox/slave_channels_t.sql", undef, no_wait => 1);
+   $sb->load_file('chan_source1', "sandbox/gtid_on.sql", undef, no_wait => 1);
+   $sb->load_file('chan_source2', "sandbox/gtid_on.sql", undef, no_wait => 1);
+   $sb->load_file('chan_replica1', "sandbox/replica_channels.sql", undef, no_wait => 1);
 
-   my $slave_cnf = "/tmp/$slave1_port/my.sandbox.cnf";
-   my $cmd = "$trunk/bin/pt-stalk --no-stalk --iterations=1 --host=127.0.0.1 --port=$slave1_port --user=msandbox "
+   my $replica_cnf = "/tmp/$replica1_port/my.sandbox.cnf";
+   my $cmd = "$trunk/bin/pt-stalk --no-stalk --iterations=1 --host=127.0.0.1 --port=$replica1_port --user=msandbox "
            . "--password=msandbox --sleep 0 --run-time=10 --dest $dest --log $log_file --iterations=1  "
-           . "--run-time=2 --pid $pid_file --defaults-file=$slave_cnf >$log_file 2>&1";
+           . "--run-time=2 --pid $pid_file --defaults-file=$replica_cnf >$log_file 2>&1";
    diag ($cmd);
    system($cmd);
    sleep 5;
    PerconaTest::kill_program(pid_file => $pid_file);
    
-   $output = `cat $dest/*-slave-status 2>/dev/null`;
+   $output = `cat $dest/*-${replica_name}-status 2>/dev/null`;
    
    like(
       $output,
       qr/SERVICE_STATE: ON/,
-      "MySQL 5.7 SLAVE STATUS"
+      "MySQL 5.7+ REPLICA STATUS"
    ) or diag ($output);
-   $sb->stop_sandbox(qw(chan_master1 chan_master2 chan_slave1));
+   $sb->stop_sandbox(qw(chan_source1 chan_source2 chan_replica1));
 }
                                                                               
 SKIP: {
    skip "Only test on mysql 5.6" if ( $sandbox_version ne '5.6' );
 
-   my $slave1_port = $sb->port_for('slave1');
-   my $cmd = "$trunk/bin/pt-stalk --no-stalk --iterations=1 --host=127.0.0.1 --port=$slave1_port --user=msandbox "
+   my $replica1_port = $sb->port_for('replica1');
+   my $cmd = "$trunk/bin/pt-stalk --no-stalk --iterations=1 --host=127.0.0.1 --port=$replica1_port --user=msandbox "
            . "--password=msandbox --sleep 0 --run-time=10 --dest $dest --log $log_file --iterations=1  "
            . "--run-time=2  --pid $pid_file --defaults-file=$cnf >$log_file 2>&1";
    system($cmd);                                                                 
    sleep 5;                                                                      
    PerconaTest::kill_program(pid_file => $pid_file);                             
                                                                                  
-   $output = `cat $dest/*-slave-status 2>/dev/null`;                             
+   $output = `cat $dest/*-${replica_name}-status 2>/dev/null`;                             
                                                                                  
    like(                                                                     
       $output,                                                               
@@ -834,8 +835,8 @@ SKIP: {
       my ($dsn_opts) = @_;
       my $dp = new DSNParser(opts=>$dsn_opts);
       my $sb = new Sandbox(basedir => '/tmp', DSNParser => $dp);
-      my $dbh = $sb->get_dbh_for('master');
-      $sb->load_file('master', "t/pt-stalk/samples/issue-1642750.sql");
+      my $dbh = $sb->get_dbh_for('source');
+      $sb->load_file('source', "t/pt-stalk/samples/issue-1642750.sql");
    }
    my $thr = threads->create('start_thread_1642750', $dsn_opts);
    $thr->detach();
@@ -878,8 +879,8 @@ sub start_thread_pt_1897_1 {
    my ($dsn_opts) = @_;
    my $dp = new DSNParser(opts=>$dsn_opts);
    my $sb = new Sandbox(basedir => '/tmp', DSNParser => $dp);
-   my $dbh = $sb->get_dbh_for('master');
-   $sb->load_file('master', "t/pt-stalk/samples/PT-1897-1.sql");
+   my $dbh = $sb->get_dbh_for('source');
+   $sb->load_file('source', "t/pt-stalk/samples/PT-1897-1.sql");
 }
 my $thr1 = threads->create('start_thread_pt_1897_1', $dsn_opts);
 $thr1->detach();
@@ -892,8 +893,8 @@ sub start_thread_pt_1897_2 {
    my ($dsn_opts) = @_;
    my $dp = new DSNParser(opts=>$dsn_opts);
    my $sb = new Sandbox(basedir => '/tmp', DSNParser => $dp);
-   my $dbh = $sb->get_dbh_for('master');
-   $sb->load_file('master', "t/pt-stalk/samples/PT-1897-2.sql");
+   my $dbh = $sb->get_dbh_for('source');
+   $sb->load_file('source', "t/pt-stalk/samples/PT-1897-2.sql");
 }
 my $thr2 = threads->create('start_thread_pt_1897_2', $dsn_opts);
 $thr2->detach();
diff --git a/t/pt-table-checksum/basics.t b/t/pt-table-checksum/basics.t
index d909a9d82..7f9002826 100644
--- a/t/pt-table-checksum/basics.t
+++ b/t/pt-table-checksum/basics.t
@@ -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;
 
@@ -25,17 +25,17 @@ 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';
 } else {
    plan tests => 40;
@@ -43,9 +43,9 @@ elsif ( !@{$master_dbh->selectall_arrayref("show databases like 'sakila'")} ) {
 
 # 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,u=msandbox,p=msandbox';
-my $slave2_dsn = 'h=127.1,P=12347,u=msandbox,p=msandbox';
-my @args       = ($master_dsn, qw(--set-vars innodb_lock_wait_timeout=3 --ignore-tables load_data));
+my $source_dsn = 'h=127.1,P=12345,u=msandbox,p=msandbox';
+my $replica2_dsn = 'h=127.1,P=12347,u=msandbox,p=msandbox';
+my @args       = ($source_dsn, qw(--set-vars innodb_lock_wait_timeout=3 --ignore-tables load_data));
 my $row;
 my $output;
 my $exit_status;
@@ -54,9 +54,9 @@ my $outfile = '/tmp/pt-table-checksum-results';
 my $repl_db = 'percona';
 
 sub reset_repl_db {
-   $master_dbh->do("drop database if exists $repl_db");
-   $master_dbh->do("create database $repl_db");
-   $master_dbh->do("use $repl_db");
+   $source_dbh->do("drop database if exists $repl_db");
+   $source_dbh->do("create database $repl_db");
+   $source_dbh->do("use $repl_db");
 }
 
 # ############################################################################
@@ -64,7 +64,7 @@ sub reset_repl_db {
 # options on well-configured systems (which the test env cannot be).  With
 # nothing but defaults, it should create the repl table, checksum and check
 # all tables, dynamically adjust the chunk size, and throttle itself and based
-# on all slaves' lag.  We don't explicitly test throttling here; that's done
+# on all replicas' lag.  We don't explicitly test throttling here; that's done
 # in throttle.t.
 # ############################################################################
 
@@ -99,7 +99,7 @@ ok(
 # Since this varies by default, there's no use checking the checksums
 # other than to ensure that there's at least one for each table.
 # 2
-$row = $master_dbh->selectrow_arrayref("select count(*) from percona.checksums");
+$row = $source_dbh->selectrow_arrayref("select count(*) from percona.checksums");
 my $max_chunks = $sandbox_version < '5.7' ? 60 : 100;
 
 ok(
@@ -125,20 +125,20 @@ ok(
    "Static chunk size (--chunk-time 0)"
 );
 
-$row = $master_dbh->selectrow_arrayref("select count(*) from percona.checksums");
+$row = $source_dbh->selectrow_arrayref("select count(*) from percona.checksums");
 
 my $max_rows = $sandbox_version >= '8.0' ? 102 : $sandbox_version < '5.7' ? 90 : 100;
 ok(
    $row->[0] >= 75 && $row->[0] <= $max_rows,
-   'Between 75 and 90 chunks on master'
+   'Between 75 and 90 chunks on source'
 ) or diag($row->[0]);
 
 
-my $row2 = $slave1_dbh->selectrow_arrayref("select count(*) from percona.checksums");
+my $row2 = $replica1_dbh->selectrow_arrayref("select count(*) from percona.checksums");
 is(
    $row2->[0],
    $row->[0],
-   '... same number of chunks on slave'
+   '... same number of chunks on replica'
 ) or diag($row->[0], ' ', $row2->[0]);
 
 
@@ -146,9 +146,9 @@ is(
 # --[no]replicate-check and, implicitly, the tool's exit status.
 # ############################################################################
 
-# Make one row on the slave differ.
-$row = $slave1_dbh->selectrow_arrayref("select city, last_update from sakila.city where city_id=1");
-$slave1_dbh->do("update sakila.city set city='test' where city_id=1");
+# Make one row on the replica differ.
+$row = $replica1_dbh->selectrow_arrayref("select city, last_update from sakila.city where city_id=1");
+$replica1_dbh->do("update sakila.city set city='test' where city_id=1");
 
 $exit_status = pt_table_checksum::main(@args,
    qw(--quiet -t sakila.city --chunk-size 1));
@@ -168,16 +168,16 @@ is(
    "--no-replicate-check, no diff detected"
 );
 
-# Restore the row on the slave, else other tests will fail.
-$slave1_dbh->do("update sakila.city set city='$row->[0]', last_update='$row->[1]' where city_id=1");
+# Restore the row on the replica, else other tests will fail.
+$replica1_dbh->do("update sakila.city set city='$row->[0]', last_update='$row->[1]' where city_id=1");
 
 # #############################################################################
 # --[no]empty-replicate-table
 # Issue 21: --empty-replicate-table doesn't empty if previous runs leave info
 # #############################################################################
 
-$sb->wipe_clean($master_dbh);
-$sb->load_file('master', 't/pt-table-checksum/samples/issue_21.sql');
+$sb->wipe_clean($source_dbh);
+$sb->load_file('source', 't/pt-table-checksum/samples/issue_21.sql');
 
 # Run once to populate the repl table.
 pt_table_checksum::main(@args, qw(--quiet --quiet -t test.issue_21),
@@ -187,13 +187,13 @@ pt_table_checksum::main(@args, qw(--quiet --quiet -t test.issue_21),
 # --empty-replicate-table deletes all rows for each checksummed table,
 # and the second row tests that if a table isn't checksummed, then its
 # rows aren't deleted.
-$master_dbh->do("INSERT INTO percona.checksums VALUES ('test', 'issue_21', 999, 0.00, 'idx', '0', '0', '0', 0, '0', 0, NOW())");
-$master_dbh->do("INSERT INTO percona.checksums VALUES ('test', 'other_tbl', 1, 0.00, 'idx', '0', '0', '0', 0, '0', 0, NOW())");
+$source_dbh->do("INSERT INTO percona.checksums VALUES ('test', 'issue_21', 999, 0.00, 'idx', '0', '0', '0', 0, '0', 0, NOW())");
+$source_dbh->do("INSERT INTO percona.checksums VALUES ('test', 'other_tbl', 1, 0.00, 'idx', '0', '0', '0', 0, '0', 0, NOW())");
 
 pt_table_checksum::main(@args, qw(--quiet --quiet -t test.issue_21),
    qw(--chunk-time 0 --chunk-size 2));
 
-$row = $master_dbh->selectall_arrayref("SELECT tbl, chunk FROM percona.checksums WHERE db='test' ORDER BY tbl, chunk");
+$row = $source_dbh->selectall_arrayref("SELECT tbl, chunk FROM percona.checksums WHERE db='test' ORDER BY tbl, chunk");
 is_deeply(
    $row,
    [
@@ -215,8 +215,8 @@ is_deeply(
 $exit_status = pt_table_checksum::main(@args,
    qw(--quiet --quiet --chunk-time 0 --chunk-size 100 -t sakila.city));
 
-$slave1_dbh->do("update percona.checksums set this_crc='' where db='sakila' and tbl='city' and (chunk=1 or chunk=6)");
-PerconaTest::wait_for_table($slave2_dbh, "percona.checksums", "db='sakila' and tbl='city' and (chunk=1 or chunk=6) and thic_crc=''");
+$replica1_dbh->do("update percona.checksums set this_crc='' where db='sakila' and tbl='city' and (chunk=1 or chunk=6)");
+PerconaTest::wait_for_table($replica2_dbh, "percona.checksums", "db='sakila' and tbl='city' and (chunk=1 or chunk=6) and thic_crc=''");
 
 # 9
 ok(
@@ -230,7 +230,7 @@ ok(
 # ############################################################################
 # Detect infinite loop.
 # ############################################################################
-$sb->load_file('master', "t/pt-table-checksum/samples/oversize-chunks.sql");
+$sb->load_file('source', "t/pt-table-checksum/samples/oversize-chunks.sql");
 
 $output = output(
    sub { pt_table_checksum::main(@args, qw(-t osc.t --chunk-size 10)) },
@@ -296,14 +296,14 @@ is(
 ) or diag($output);
 
 # ############################################################################
-# Check slave table row est. if doing doing 1=1 on master table.
+# Check replica table row est. if doing doing 1=1 on source table.
 # ############################################################################
-$master_dbh->do('truncate table percona.checksums');
-$sb->load_file('master', "t/pt-table-checksum/samples/3tbl-resume.sql");
+$source_dbh->do('truncate table percona.checksums');
+$sb->load_file('source', "t/pt-table-checksum/samples/3tbl-resume.sql");
 
-$master_dbh->do('set sql_log_bin=0');
-$master_dbh->do('truncate table test.t1');
-$master_dbh->do('set sql_log_bin=1');
+$source_dbh->do('set sql_log_bin=0');
+$source_dbh->do('truncate table test.t1');
+$source_dbh->do('set sql_log_bin=1');
 
 $output = output(
    sub {
@@ -315,19 +315,19 @@ $output = output(
 like(
    $output,
    qr/Skipping table test.t1/,
-   "Warns about skipping large slave table"
+   "Warns about skipping large replica table"
 );
 
 is_deeply(
-   $master_dbh->selectall_arrayref("select distinct tbl from percona.checksums where db='test'"),
+   $source_dbh->selectall_arrayref("select distinct tbl from percona.checksums where db='test'"),
    [ ['t2'], ['t3'] ],
-   "Does not checksum large slave table on master"
+   "Does not checksum large replica table on source"
 );
 
 is_deeply(
-   $slave1_dbh->selectall_arrayref("select distinct tbl from percona.checksums where db='test'"),
+   $replica1_dbh->selectall_arrayref("select distinct tbl from percona.checksums where db='test'"),
    [ ['t2'], ['t3'] ],
-   "Does not checksum large slave table on slave"
+   "Does not checksum large replica table on replica"
 );
 
 is(
@@ -360,8 +360,8 @@ is(
 # https://bugs.launchpad.net/percona-toolkit/+bug/938660
 # #############################################################################
 
-# Decided _not_ to do this; we want to always check slave table size when
-# single-chunking a table on the master.
+# Decided _not_ to do this; we want to always check replica table size when
+# single-chunking a table on the source.
 
 $output = output(
    sub {
@@ -374,7 +374,7 @@ $output = output(
 like(
    $output,
    qr/Skipping table test.t1/,
-   "--chunk-size-limit=0 does not disable #-of-rows checks on slaves"
+   "--chunk-size-limit=0 does not disable #-of-rows checks on replicas"
 );
 
 # #############################################################################
@@ -403,7 +403,7 @@ $output = output(
 
 # Aaaaand this one also no longer works because of
 # https://bugs.launchpad.net/percona-toolkit/+bug/1042727
-# pt-table-checksum will keep trying to find a slave ... forever.
+# pt-table-checksum will keep trying to find a replica ... forever.
 # (notice the --runtime in the original command otherwise it loops forever)
 # So we comment out these other 2 tests
 
@@ -420,7 +420,7 @@ $output = output(
 #) or diag($output);
 
 
-# and instead check if it waits for slaves
+# and instead check if it waits for replicas
 
 # This test is no longer working
 # TODO: double check messages
@@ -431,32 +431,32 @@ $output = output(
 # ) or diag($output);
 # 
 
-# Check if no slaves were found. Bug 1087804:
-# Notice we simply execute the command but on 12347, the slaveless slave.
+# Check if no replicas were found. Bug 1087804:
+# Notice we simply execute the command but on 12347, the replicaless replica.
 $output = output(
    sub { $exit_status =  pt_table_checksum::main(
    qw(--user msandbox --pass msandbox),
-   ('--set-vars', 'innodb_lock_wait_timeout=3', '--run-time', '5', $slave2_dsn )) },
+   ('--set-vars', 'innodb_lock_wait_timeout=3', '--run-time', '5', $replica2_dsn )) },
    stderr => 1,
 );
 
 like(
    $output,
-   qr/no slaves were found/,
-   "Warns when no slave are found (bug 1087804)"
+   qr/no ${replica_name}s were found/,
+   "Warns when no replica are found (bug 1087804)"
 ) or diag($output);
 
 is(
    $exit_status,
    8,  # https://bugs.launchpad.net/percona-toolkit/+bug/944051
-   "Exit status 8 when no slaves are found (bug 1087804)"
+   "Exit status 8 when no replicas are found (bug 1087804)"
 ) or diag($output);
 
 # #############################################################################
 # Test --where.
 # #############################################################################
-$sb->load_file('master', 't/pt-table-checksum/samples/600cities.sql');
-$master_dbh->do("LOAD DATA INFILE '$trunk/t/pt-table-checksum/samples/600cities.data' INTO TABLE test.t");
+$sb->load_file('source', 't/pt-table-checksum/samples/600cities.sql');
+$source_dbh->do("LOAD DATA INFILE '$trunk/t/pt-table-checksum/samples/600cities.data' INTO TABLE test.t");
 
 $output = output(
    sub { $exit_status = pt_table_checksum::main(@args,
@@ -516,7 +516,7 @@ like(
 # #############################################################################
 # Bug 932442: column with 2 spaces
 # #############################################################################
-$sb->load_file('master', "t/pt-table-checksum/samples/2-space-col.sql");
+$sb->load_file('source', "t/pt-table-checksum/samples/2-space-col.sql");
 
 $output = output(
    sub { $exit_status = pt_table_checksum::main(@args,
@@ -539,7 +539,7 @@ is(
 # #############################################################################
 # Bug 821675: can't parse column names containing periods
 # #############################################################################
-$sb->load_file('master', "t/pt-table-checksum/samples/dot.sql");
+$sb->load_file('source', "t/pt-table-checksum/samples/dot.sql");
 
 ok(
    no_diff(
@@ -574,7 +574,7 @@ is(
 # #############################################################################
 
 # add a couple more modes to test that commas don't affect setting
-$master_dbh->do("SET sql_mode = 'NO_ZERO_DATE,ONLY_FULL_GROUP_BY,STRICT_ALL_TABLES'");
+$source_dbh->do("SET sql_mode = 'NO_ZERO_DATE,ONLY_FULL_GROUP_BY,STRICT_ALL_TABLES'");
 
 # force chunk-size because bug doesn't show up if table done in one chunk 
 $exit_status = pt_table_checksum::main(@args,
@@ -590,6 +590,6 @@ DONE:
 # #############################################################################
 # 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;
diff --git a/t/pt-table-checksum/bugs.t b/t/pt-table-checksum/bugs.t
index 4c0cdfedd..7dd38e300 100644
--- a/t/pt-table-checksum/bugs.t
+++ b/t/pt-table-checksum/bugs.t
@@ -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;
 
@@ -25,24 +25,24 @@ 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 ( !$slave2_dbh ) {
-   plan skip_all => 'Cannot connect to sandbox slave2';
+elsif ( !$replica2_dbh ) {
+   plan skip_all => 'Cannot connect to sandbox replica2';
 }
 
 # 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,u=msandbox,p=msandbox';
-my @args       = ($master_dsn, qw(--set-vars innodb_lock_wait_timeout=3));
+my $source_dsn = 'h=127.1,P=12345,u=msandbox,p=msandbox,s=1';
+my @args       = ($source_dsn, qw(--set-vars innodb_lock_wait_timeout=3));
 my $output;
 my $exit_status;
 my $sample  = "t/pt-table-checksum/samples/";
@@ -52,7 +52,7 @@ my $sample  = "t/pt-table-checksum/samples/";
 # Can't use an undefined value as an ARRAY reference at pt-table-checksum
 # line 2206
 # ############################################################################
-$sb->load_file('master', "$sample/undef-arrayref-bug-995274.sql");
+$sb->load_file('source', "$sample/undef-arrayref-bug-995274.sql");
 
 # Must chunk the table so an index is used.
 $output = output(
@@ -79,8 +79,8 @@ cmp_ok(
 # https://bugs.launchpad.net/percona-toolkit/+bug/987393
 # Empy tables cause "undefined value as an ARRAY" errors
 # #############################################################################
-$master_dbh->do("DROP DATABASE IF EXISTS percona");  # clear old checksums
-$sb->load_file('master', "$sample/empty-table-bug-987393.sql");
+$source_dbh->do("DROP DATABASE IF EXISTS percona");  # clear old checksums
+$sb->load_file('source', "$sample/empty-table-bug-987393.sql");
 
 $output = output(
    sub { $exit_status = pt_table_checksum::main(
@@ -100,7 +100,7 @@ is(
    "Bug 987393 (empty table): no errors"
 );
 
-my $rows = $master_dbh->selectall_arrayref("SELECT db, tbl, chunk, master_crc, master_cnt FROM percona.checksums ORDER BY db, tbl, chunk");
+my $rows = $source_dbh->selectall_arrayref("SELECT db, tbl, chunk, ${source_name}_crc, ${source_name}_cnt FROM percona.checksums ORDER BY db, tbl, chunk");
 is_deeply(
    $rows,
    [
@@ -116,7 +116,7 @@ is_deeply(
 # #############################################################################
 $output = output(
    sub {
-      print `$trunk/bin/pt-table-checksum $master_dsn -t sakila.country 2>&1`;
+      print `$trunk/bin/pt-table-checksum $source_dsn -t sakila.country 2>&1`;
    }
 );
 
@@ -136,16 +136,16 @@ is(
 # https://bugs.launchpad.net/percona-toolkit/+bug/1030031
 # pt-table-checksum reports wrong number of DIFFS
 # #############################################################################
-$sb->load_file('master', "$sample/a-z.sql");
-$sb->wait_for_slaves();
+$sb->load_file('source', "$sample/a-z.sql");
+$sb->wait_for_replicas();
 
-# Create 2 diffs on slave1 and 1 diff on slave2.
-$slave1_dbh->do("UPDATE test.t SET c='' WHERE id=5");  # diff on slave1 & 2
-$slave1_dbh->do("SET SQL_LOG_BIN=0");
-$slave1_dbh->do("UPDATE test.t SET c='' WHERE id=20"); # diff only on slave1
+# Create 2 diffs on replica1 and 1 diff on replica2.
+$replica1_dbh->do("UPDATE test.t SET c='' WHERE id=5");  # diff on replica1 & 2
+$replica1_dbh->do("SET SQL_LOG_BIN=0");
+$replica1_dbh->do("UPDATE test.t SET c='' WHERE id=20"); # diff only on replica1
 
-# Restore sql_log_bin on slave1 in case later tests use it.
-$slave1_dbh->do("SET SQL_LOG_BIN=1");
+# Restore sql_log_bin on replica1 in case later tests use it.
+$replica1_dbh->do("SET SQL_LOG_BIN=1");
 
 $output = output(
    sub { pt_table_checksum::main(@args, qw(-t test.t --chunk-size 10)) },
@@ -157,10 +157,10 @@ is(
    "Bug 1030031 (wrong DIFFS): 2 diffs"
 );
 
-# Restore slave2, but then give it 1 diff that's not the same chunk#
-# as slave1, so there's 3 unique chunk that differ.
-$slave2_dbh->do("UPDATE test.t SET c='e' WHERE id=5");
-$slave2_dbh->do("UPDATE test.t SET c='' WHERE id=26");
+# Restore replica2, but then give it 1 diff that's not the same chunk#
+# as replica1, so there's 3 unique chunk that differ.
+$replica2_dbh->do("UPDATE test.t SET c='e' WHERE id=5");
+$replica2_dbh->do("UPDATE test.t SET c='' WHERE id=26");
 
 $output = output(
    sub { pt_table_checksum::main(@args, qw(-t test.t --chunk-size 10)) },
@@ -210,22 +210,22 @@ like(
 {
 $output = output(
    sub { pt_table_checksum::main(@args, 
-         '--skip-check-slave-lag', "h=127.0.0.1,P=".$sb->port_for('slave1'),
+         '--skip-check-replica-lag', "h=127.0.0.1,P=".$sb->port_for('replica1'),
          ),
       },
 );
 
-my $skipping_str = "Skipping.*".$sb->port_for('slave1');
+my $skipping_str = "Skipping.*".$sb->port_for('replica1');
 like(
       $output,
       qr/$skipping_str/s,
-      "--skip-check-slave-lag",
+      "--skip-check-replica-lag",
 );
 
-# Test for skip-check-slave-lag and empty replica port
+# Test for skip-check-replica-lag and empty replica port
 $output = output(
    sub { pt_table_checksum::main(@args,
-         '--skip-check-slave-lag', "h=127.0.0.1",
+         '--skip-check-replica-lag', "h=127.0.0.1",
       ),
    },
    stderr => 1
@@ -234,7 +234,7 @@ $output = output(
 unlike(
    $output,
    qr/Use of uninitialized value.*/,
-   'No syntax error if port is missed in --skip-check-slave-lag DSN',
+   'No syntax error if port is missed in --skip-check-replica-lag DSN',
 ) or diag($output);
 }
 # #############################################################################
@@ -272,7 +272,7 @@ unlike(
 }
 
 # #############################################################################
-# pt-table-checksum doesn't warn if binlog_format=row or mixed on slaves
+# pt-table-checksum doesn't warn if binlog_format=row or mixed on replicas
 # https://bugs.launchpad.net/percona-toolkit/+bug/938068
 # #############################################################################
 
@@ -281,9 +281,9 @@ SKIP: {
       unless $sandbox_version ge '5.1';
 
    local $ENV{BINLOG_FORMAT} = 'ROW';
-   diag(`$trunk/sandbox/start-sandbox slave 12348 12345`);
+   diag(`$trunk/sandbox/start-sandbox replica 12348 12345`);
    local $ENV{BINLOG_FORMAT} = 'MIXED';
-   diag(`$trunk/sandbox/start-sandbox slave 12349 12348`);
+   diag(`$trunk/sandbox/start-sandbox replica 12349 12348`);
 
    $output = output( sub { pt_table_checksum::main(@args) }, stderr => 1 );
 
@@ -291,13 +291,13 @@ SKIP: {
    like(
       $output,
       $re,
-      "Bug 938068: doesn't warn if binlog_format=row or mixed on slaves"
+      "Bug 938068: doesn't warn if binlog_format=row or mixed on replicas"
    );
 
    is_deeply(
       [ $output =~ /$re/g ],
       [ 'ROW', 'MIXED' ],
-      "...and warns for both level 1 and level 2 slaves"
+      "...and warns for both level 1 and level 2 replicas"
    ) or diag($output);
 
    diag(`$trunk/sandbox/stop-sandbox 12349 12348`);
@@ -309,7 +309,7 @@ SKIP: {
 # #############################################################################
 
 $output = output(sub {
-   pt_table_checksum::main($master_dsn,
+   pt_table_checksum::main($source_dsn,
       qw(--recursion-method cluster -t mysql.user)
    )},
    stderr => 1,
@@ -326,11 +326,11 @@ like(
 );
 
 # #############################################################################
-# pt-table-checksum has errors when slaves have different system_time_zone 
+# pt-table-checksum has errors when replicas have different system_time_zone 
 # https://bugs.launchpad.net/percona-toolkit/+bug/1388870 
 # #############################################################################
 
-# make slave set diferent system_time_zone by changing env var TZ. 
+# make replica set diferent system_time_zone by changing env var TZ. 
 diag(`/tmp/12346/stop >/dev/null`); 
 diag(`export TZ='HST';/tmp/12346/start >/dev/null`); 
 
@@ -342,10 +342,10 @@ $output = output(
 is(
    PerconaTest::count_checksum_results($output, 'diffs'),
    0,
-   "Bug 1388870 - No false positive reported when system_tz differ on slave"
+   "Bug 1388870 - No false positive reported when system_tz differ on replica"
 );
 
-# restore slave to original system_tz 
+# restore replica to original system_tz 
 diag(`/tmp/12346/stop >/dev/null`); 
 diag(`/tmp/12346/start >/dev/null`); 
 
@@ -354,6 +354,6 @@ diag(`/tmp/12346/start >/dev/null`);
 # #############################################################################
 # 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;
diff --git a/t/pt-table-checksum/char_chunking.t b/t/pt-table-checksum/char_chunking.t
index e6836b11e..f2d176520 100644
--- a/t/pt-table-checksum/char_chunking.t
+++ b/t/pt-table-checksum/char_chunking.t
@@ -17,10 +17,10 @@ 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 $source_dbh = $sb->get_dbh_for('source');
 
-if ( !$master_dbh ) {
-   plan skip_all => 'Cannot connect to sandbox master';
+if ( !$source_dbh ) {
+   plan skip_all => 'Cannot connect to sandbox source';
 }
 else {
    plan tests => 6;
@@ -29,11 +29,11 @@ else {
 # 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.
 # And --max-load "" prevents waiting for status variables.
-my $master_dsn = 'h=127.1,P=12345,u=msandbox,p=msandbox';
-my @args       = ($master_dsn, qw(--set-vars innodb_lock_wait_timeout=3), '--max-load', ''); 
+my $source_dsn = 'h=127.1,P=12345,u=msandbox,p=msandbox';
+my @args       = ($source_dsn, qw(--set-vars innodb_lock_wait_timeout=3), '--max-load', ''); 
 
-$sb->create_dbs($master_dbh, ['test']);
-$sb->load_file('master', "t/lib/samples/char-chunking/ascii.sql", 'test');
+$sb->create_dbs($source_dbh, ['test']);
+$sb->load_file('source', "t/lib/samples/char-chunking/ascii.sql", 'test');
 #1
 ok(
    no_diff(
@@ -56,21 +56,21 @@ ok(
    "Char chunk ascii, chunk size 20"
 );
 
-my $row = $master_dbh->selectrow_arrayref("select lower_boundary, upper_boundary from percona.checksums where db='test' and tbl='ascii' and chunk=1");
+my $row = $source_dbh->selectrow_arrayref("select lower_boundary, upper_boundary from percona.checksums where db='test' and tbl='ascii' and chunk=1");
 is_deeply(
    $row,
    [ '', 'burt' ],
    "First boundaries"
 );
 
-$row = $master_dbh->selectrow_arrayref("select lower_boundary, upper_boundary from percona.checksums where db='test' and tbl='ascii' and chunk=9");
+$row = $source_dbh->selectrow_arrayref("select lower_boundary, upper_boundary from percona.checksums where db='test' and tbl='ascii' and chunk=9");
 is_deeply(
    $row,
    [ undef, '' ],
    "Lower oob boundary"
 );
 
-$row = $master_dbh->selectrow_arrayref("select lower_boundary, upper_boundary from percona.checksums where db='test' and tbl='ascii' and chunk=10");
+$row = $source_dbh->selectrow_arrayref("select lower_boundary, upper_boundary from percona.checksums where db='test' and tbl='ascii' and chunk=10");
 is_deeply(
    $row,
    [ 'ZESUS!!!', undef ],
@@ -80,6 +80,6 @@ is_deeply(
 # #############################################################################
 # Done.
 # #############################################################################
-$sb->wipe_clean($master_dbh);
+$sb->wipe_clean($source_dbh);
 ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox");
 exit;
diff --git a/t/pt-table-checksum/chunk_index.t b/t/pt-table-checksum/chunk_index.t
index dc577fa48..e503b86c0 100644
--- a/t/pt-table-checksum/chunk_index.t
+++ b/t/pt-table-checksum/chunk_index.t
@@ -17,10 +17,10 @@ require "$trunk/bin/pt-table-checksum";
 
 my $dp  = new DSNParser(opts=>$dsn_opts);
 my $sb  = new Sandbox(basedir => '/tmp', DSNParser => $dp);
-my $dbh = $sb->get_dbh_for('master');
+my $dbh = $sb->get_dbh_for('source');
 
 if ( !$dbh ) {
-   plan skip_all => 'Cannot connect to sandbox master';
+   plan skip_all => 'Cannot connect to sandbox source';
 }
 else {
    plan tests => 14;
@@ -29,12 +29,12 @@ else {
 # 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.
 # And --max-load "" prevents waiting for status variables.
-my $master_dsn = 'h=127.1,P=12345,u=msandbox,p=msandbox';
-my @args       = ($master_dsn, qw(--set-vars innodb_lock_wait_timeout=3 --explain --chunk-size 3), '--max-load', '');
+my $source_dsn = 'h=127.1,P=12345,u=msandbox,p=msandbox';
+my @args       = ($source_dsn, qw(--set-vars innodb_lock_wait_timeout=3 --explain --chunk-size 3), '--max-load', '');
 my $output;
 my $out        = "t/pt-table-checksum/samples/";
 
-$sb->load_file('master', "t/pt-table-checksum/samples/issue_519.sql");
+$sb->load_file('source', "t/pt-table-checksum/samples/issue_519.sql");
 
 ok(
    no_diff(
@@ -115,12 +115,12 @@ ok(
 # #############################################################################
 # Bug 925855: pt-table-checksum index check is case-sensitive
 # #############################################################################
-$sb->load_file('master', "t/pt-table-checksum/samples/all-uc-table.sql");
+$sb->load_file('source', "t/pt-table-checksum/samples/all-uc-table.sql");
 my $exit_status = 0;
 
 $output = output(sub {
    $exit_status = pt_table_checksum::main(
-      $master_dsn, '--max-load', '',
+      $source_dsn, '--max-load', '',
       qw(--set-vars innodb_lock_wait_timeout=3 --chunk-size 5 -t ALL_UC.T)
    ) },
    stderr => 1,
@@ -153,7 +153,7 @@ is(
 # #############################################################################
 # Bug 978432: PK is ignored
 # #############################################################################
-$sb->load_file('master', "t/pt-table-checksum/samples/not-using-pk-bug.sql");
+$sb->load_file('source', "t/pt-table-checksum/samples/not-using-pk-bug.sql");
 
 ok(
    no_diff(
@@ -176,11 +176,11 @@ ok(
 # PK but bad explain plan.
 # https://bugs.launchpad.net/percona-toolkit/+bug/1010232
 # #############################################################################
-#$sb->load_file('master', "t/pt-table-checksum/samples/bad-plan-bug-1010232.sql");
+#$sb->load_file('source', "t/pt-table-checksum/samples/bad-plan-bug-1010232.sql");
 #PerconaTest::wait_for_table($dbh, "bad_plan.t", "(c1,c2,c3,c4)=(1,1,2,100)");
 #$output = output(sub {
 #   $exit_status = pt_table_checksum::main(
-#      $master_dsn, '--max-load', '',
+#      $source_dsn, '--max-load', '',
 #      qw(--set-vars innodb_lock_wait_timeout=3 --chunk-size 10 -t bad_plan.t)
 #   ) },
 #   stderr => 1,
@@ -207,7 +207,7 @@ ok(
    no_diff(
       sub {
          pt_table_checksum::main(
-            $master_dsn, '--max-load', '',
+            $source_dsn, '--max-load', '',
             qw(--set-vars innodb_lock_wait_timeout=3 --chunk-size 5000  -t sakila.rental),
             qw(--chunk-index rental_date --chunk-index-columns 2),
             qw(--explain --explain));
@@ -220,7 +220,7 @@ ok(
 $output = output(         
    sub {
       $exit_status = pt_table_checksum::main(
-         $master_dsn, '--max-load', '',
+         $source_dsn, '--max-load', '',
          qw(--set-vars innodb_lock_wait_timeout=3 --chunk-size 1000  -t sakila.film_actor),
          qw(--chunk-index PRIMARY --chunk-index-columns 9),
       );
@@ -237,7 +237,7 @@ is(
 $output = output(         
    sub {
       $exit_status = pt_table_checksum::main(
-         $master_dsn, '--max-load', '',
+         $source_dsn, '--max-load', '',
          qw(--set-vars innodb_lock_wait_timeout=3 --chunk-size 1000 -t sakila.film_actor),
          qw(--chunk-index-columns 1 --chunk-size-limit 3),
       );
diff --git a/t/pt-table-checksum/chunk_size.t b/t/pt-table-checksum/chunk_size.t
index d5dfc740d..a50272be8 100644
--- a/t/pt-table-checksum/chunk_size.t
+++ b/t/pt-table-checksum/chunk_size.t
@@ -17,11 +17,11 @@ 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 $slave_dbh  = $sb->get_dbh_for('slave1');
+my $source_dbh = $sb->get_dbh_for('source');
+my $replica_dbh  = $sb->get_dbh_for('replica1');
 
-if ( !$master_dbh ) {
-   plan skip_all => 'Cannot connect to sandbox master';
+if ( !$source_dbh ) {
+   plan skip_all => 'Cannot connect to sandbox source';
 }
 else {
    plan tests => 8;
@@ -30,8 +30,8 @@ else {
 # 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.
 # And --max-load "" prevents waiting for status variables.
-my $master_dsn = 'h=127.1,P=12345,u=msandbox,p=msandbox';
-my @args       = ($master_dsn, qw(--set-vars innodb_lock_wait_timeout=3), '--max-load', ''); 
+my $source_dsn = 'h=127.1,P=12345,u=msandbox,p=msandbox';
+my @args       = ($source_dsn, qw(--set-vars innodb_lock_wait_timeout=3), '--max-load', ''); 
 
 my $row;
 my $output;
@@ -45,14 +45,14 @@ my $exit_status;
 
 pt_table_checksum::main(@args, qw(--quiet -t sakila.rental));
 
-$row = $master_dbh->selectrow_arrayref("select lower_boundary, upper_boundary from percona.checksums where db='sakila' and tbl='rental' and chunk=1");
+$row = $source_dbh->selectrow_arrayref("select lower_boundary, upper_boundary from percona.checksums where db='sakila' and tbl='rental' and chunk=1");
 is_deeply(
    $row,
    [1, 1001],
    "First chunk is default size"
 );
 
-$row = $master_dbh->selectrow_arrayref("select lower_boundary, upper_boundary from percona.checksums where db='sakila' and tbl='rental' and chunk=2");
+$row = $source_dbh->selectrow_arrayref("select lower_boundary, upper_boundary from percona.checksums where db='sakila' and tbl='rental' and chunk=2");
 is(
    $row->[0],
    1002,
@@ -73,7 +73,7 @@ cmp_ok(
 pt_table_checksum::main(@args, qw(--quiet --chunk-size 100 -t sakila.city));
 
 # There's 600 rows in sakila.city so there should be 6 chunks.
-$row = $master_dbh->selectall_arrayref("select lower_boundary, upper_boundary from percona.checksums where db='sakila' and tbl='city'");
+$row = $source_dbh->selectall_arrayref("select lower_boundary, upper_boundary from percona.checksums where db='sakila' and tbl='city'");
 is_deeply(
    $row,
    [
@@ -110,13 +110,13 @@ unlike(
 # Bug 921700: pt-table-checksum doesn't add --where to chunk-oversize test
 # on replicas
 # #############################################################################
-$sb->load_file('master', 't/pt-table-checksum/samples/600cities.sql');
-$master_dbh->do("LOAD DATA LOCAL INFILE '$trunk/t/pt-table-checksum/samples/600cities.data' INTO TABLE test.t");
-$master_dbh->do("SET SQL_LOG_BIN=0");
-$master_dbh->do("DELETE FROM test.t WHERE id > 100");
-$master_dbh->do("SET SQL_LOG_BIN=1");
+$sb->load_file('source', 't/pt-table-checksum/samples/600cities.sql');
+$source_dbh->do("LOAD DATA LOCAL INFILE '$trunk/t/pt-table-checksum/samples/600cities.data' INTO TABLE test.t");
+$source_dbh->do("SET SQL_LOG_BIN=0");
+$source_dbh->do("DELETE FROM test.t WHERE id > 100");
+$source_dbh->do("SET SQL_LOG_BIN=1");
 
-# Now there are 100 rows on the master and 600 on the slave.
+# Now there are 100 rows on the source and 600 on the replica.
 $output = output(
    sub { $exit_status = pt_table_checksum::main(@args,
       qw(-t test.t --chunk-size 100 --where id<=100)); },
@@ -138,6 +138,6 @@ like(
 # #############################################################################
 # Done.
 # #############################################################################
-$sb->wipe_clean($master_dbh);
+$sb->wipe_clean($source_dbh);
 ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox");
 exit;
diff --git a/t/pt-table-checksum/create_replicate_table.t b/t/pt-table-checksum/create_replicate_table.t
index bb2e79774..a14628d64 100644
--- a/t/pt-table-checksum/create_replicate_table.t
+++ b/t/pt-table-checksum/create_replicate_table.t
@@ -17,14 +17,14 @@ 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 $slave_dbh  = $sb->get_dbh_for('slave1');
+my $source_dbh = $sb->get_dbh_for('source');
+my $replica_dbh  = $sb->get_dbh_for('replica1');
 
-if ( !$master_dbh ) {
-   plan skip_all => 'Cannot connect to sandbox master';
+if ( !$source_dbh ) {
+   plan skip_all => 'Cannot connect to sandbox source';
 }
-elsif ( !$slave_dbh ) {
-   plan skip_all => 'Cannot connect to sandbox slave';
+elsif ( !$replica_dbh ) {
+   plan skip_all => 'Cannot connect to sandbox replica';
 }
 else {
    plan tests => 5;
@@ -33,14 +33,14 @@ else {
 # 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.
 # And --max-load "" prevents waiting for status variables.
-my $master_dsn = 'h=127.1,P=12345,u=msandbox,p=msandbox';
-my @args       = ($master_dsn, qw(--set-vars innodb_lock_wait_timeout=3), '--max-load', ''); 
+my $source_dsn = 'h=127.1,P=12345,u=msandbox,p=msandbox';
+my @args       = ($source_dsn, qw(--set-vars innodb_lock_wait_timeout=3), '--max-load', ''); 
 
 my $output;
 my $row;
 
-$sb->wipe_clean($master_dbh);
-#$sb->create_dbs($master_dbh, [qw(test)]);
+$sb->wipe_clean($source_dbh);
+#$sb->create_dbs($source_dbh, [qw(test)]);
 
 # Most other tests implicitly test that --create-replicate-table is on
 # by default because they use that functionality.  So here we need to
@@ -57,8 +57,8 @@ like(
    "--no-create-replicate-table dies if db doesn't exist"
 );
 
-$master_dbh->do('create database percona');
-$master_dbh->do('use percona');
+$source_dbh->do('create database percona');
+$source_dbh->do('use percona');
 eval {
    pt_table_checksum::main(@args, '--no-create-replicate-table');
 };
@@ -80,13 +80,13 @@ my $create_repl_table =
   upper_boundary text             NULL,
   this_crc       char(40)     NOT NULL,
   this_cnt       int          NOT NULL,
-  master_crc     char(40)         NULL,
-  master_cnt     int              NULL,
+  ${source_name}_crc     char(40)         NULL,
+  ${source_name}_cnt     int              NULL,
   ts             timestamp    NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   PRIMARY KEY (db, tbl, chunk)
 ) ENGINE=InnoDB;";
 
-$master_dbh->do($create_repl_table);
+$source_dbh->do($create_repl_table);
 
 $output = output(
    sub { pt_table_checksum::main(@args, '--no-create-replicate-table',
@@ -103,12 +103,12 @@ like(
 # Issue 1318: mk-tabke-checksum --create-replicate-table doesn't replicate
 # ############################################################################
 
-$sb->wipe_clean($master_dbh);
+$sb->wipe_clean($source_dbh);
 
-# Wait until the slave no longer has the percona db.
+# Wait until the replica no longer has the percona db.
 PerconaTest::wait_until(
    sub {
-      eval { $slave_dbh->do("use percona") };
+      eval { $replica_dbh->do("use percona") };
       return 1 if $EVAL_ERROR;
       return 0;
    },
@@ -117,9 +117,9 @@ PerconaTest::wait_until(
 pt_table_checksum::main(@args, qw(-t sakila.country --quiet));
 
 # Wait until the repl table replicates, or timeout.
-PerconaTest::wait_for_table($slave_dbh, 'percona.checksums');
+PerconaTest::wait_for_table($replica_dbh, 'percona.checksums');
 
-$row = $slave_dbh->selectrow_arrayref("show tables from percona");
+$row = $replica_dbh->selectrow_arrayref("show tables from percona");
 is_deeply(
    $row,
    ['checksums'],
@@ -129,6 +129,6 @@ is_deeply(
 # #############################################################################
 # Done.
 # #############################################################################
-$sb->wipe_clean($master_dbh);
+$sb->wipe_clean($source_dbh);
 ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox");
 exit;
diff --git a/t/pt-table-checksum/error_handling.t b/t/pt-table-checksum/error_handling.t
index baf881fbe..445b8f79e 100644
--- a/t/pt-table-checksum/error_handling.t
+++ b/t/pt-table-checksum/error_handling.t
@@ -20,25 +20,25 @@ 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 $source_dbh = $sb->get_dbh_for('source');
+my $replica1_dbh = $sb->get_dbh_for('replica1');
 
-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 slave';
+elsif ( !$replica1_dbh ) {
+   plan skip_all => 'Cannot connect to sandbox replica';
 }
 
 # 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.
 # And --max-load "" prevents waiting for status variables.
-my $master_dsn = 'h=127.1,P=12345,u=msandbox,p=msandbox';
-my @args       = ($master_dsn, qw(--set-vars innodb_lock_wait_timeout=3), '--max-load', ''); 
+my $source_dsn = 'h=127.1,P=12345,u=msandbox,p=msandbox';
+my @args       = ($source_dsn, qw(--set-vars innodb_lock_wait_timeout=3), '--max-load', ''); 
 my $output;
 my $exit_status;
 
-$sb->create_dbs($master_dbh, [qw(test)]);
+$sb->create_dbs($source_dbh, [qw(test)]);
 
 # #############################################################################
 # Issue 81: put some data that's too big into the boundaries table
@@ -50,10 +50,10 @@ $sb->create_dbs($master_dbh, [qw(test)]);
 # Since the idea is probably to test warning handling, we'll turn off STRICT
 # for the next two tests.
 
-my $modes = new SqlModes($master_dbh, global=>1);
+my $modes = new SqlModes($source_dbh, global=>1);
 $modes->del('STRICT_TRANS_TABLES','STRICT_ALL_TABLES');
 
-$sb->load_file('master', 't/pt-table-checksum/samples/checksum_tbl_truncated.sql');
+$sb->load_file('source', 't/pt-table-checksum/samples/checksum_tbl_truncated.sql');
 
 $output = output(
    sub { pt_table_checksum::main(@args,
@@ -80,9 +80,9 @@ $modes->restore_original_modes();
 # ############################################################################
 # Lock wait timeout
 # ############################################################################
-$master_dbh->do('use sakila');
-$master_dbh->do('begin');
-$master_dbh->do('select * from city for update');
+$source_dbh->do('use sakila');
+$source_dbh->do('begin');
+$source_dbh->do('select * from city for update');
 
 $output = output(
    sub { $exit_status = pt_table_checksum::main(@args, qw(-t sakila.city)) },
@@ -112,7 +112,7 @@ is(
 
 # Lock wait timeout for sandbox servers is 3s, so sleep 4 then commit
 # to release the lock.  That should allow the checksum query to finish.
-my ($id) = $master_dbh->selectrow_array('select connection_id()');
+my ($id) = $source_dbh->selectrow_array('select connection_id()');
 system("sleep 4 ; /tmp/12345/use -e 'KILL $id' >/dev/null");
 
 $output = output(
@@ -133,20 +133,20 @@ like(
    "Checksum retried after lock wait timeout"
 );
 
-# Reconnect to master since we just killed ourself.
-$master_dbh = $sb->get_dbh_for('master');
+# Reconnect to source since we just killed ourself.
+$source_dbh = $sb->get_dbh_for('source');
 
 # #############################################################################
-# pt-table-checksum breaks replication if a slave table is missing or different
+# pt-table-checksum breaks replication if a replica table is missing or different
 # https://bugs.launchpad.net/percona-toolkit/+bug/1009510
 # #############################################################################
 
 # Just re-using this simple table.
-$sb->load_file('master', "t/pt-table-checksum/samples/600cities.sql");
+$sb->load_file('source', "t/pt-table-checksum/samples/600cities.sql");
 
-$master_dbh->do("SET SQL_LOG_BIN=0");
-$master_dbh->do("ALTER TABLE test.t ADD COLUMN col3 int");
-$master_dbh->do("SET SQL_LOG_BIN=1");
+$source_dbh->do("SET SQL_LOG_BIN=0");
+$source_dbh->do("ALTER TABLE test.t ADD COLUMN col3 int");
+$source_dbh->do("SET SQL_LOG_BIN=1");
 
 $output = output(
    sub { $exit_status = pt_table_checksum::main(@args,
@@ -157,19 +157,19 @@ $output = output(
 like(
    $output,
    qr/Skipping table test.t/,
-   "Skip table missing column on slave (bug 1009510)"
+   "Skip table missing column on replica (bug 1009510)"
 );
 
 like(
    $output,
    qr/replica h=127.0.0.1,P=12346 is missing these columns: col3/,
-   "Checked slave1 (bug 1009510)"
+   "Checked replica1 (bug 1009510)"
 );
 
 like(
    $output,
    qr/replica h=127.0.0.1,P=12347 is missing these columns: col3/,
-   "Checked slave2 (bug 1009510)"
+   "Checked replica2 (bug 1009510)"
 );
 
 is(
@@ -187,7 +187,7 @@ $output = output(
 unlike(
    $output,
    qr/Skipping table test.t/,
-   "Doesn't skip table missing column on slave with --columns (bug 1009510)"
+   "Doesn't skip table missing column on replica with --columns (bug 1009510)"
 );
 
 is(
@@ -202,22 +202,22 @@ is(
 diag(`/tmp/12345/use -uroot -pmsandbox < $trunk/t/lib/samples/ro-checksum-user.sql 2>&1`);
 diag(`/tmp/12345/use -uroot -pmsandbox -e "GRANT REPLICATION CLIENT, REPLICATION SLAVE ON *.* TO ro_checksum_user\@'%'" 2>&1`);
 
-# Remove the --replicate table from slave1 and slave2,
-# so it's only on the master...
-$slave1_dbh->do("DROP DATABASE percona");
-$sb->wait_for_slaves;
+# Remove the --replicate table from replica1 and replica2,
+# so it's only on the source...
+$replica1_dbh->do("DROP DATABASE percona");
+$sb->wait_for_replicas;
 
 $output = output(
    sub { $exit_status = pt_table_checksum::main(
-      "h=127.1,u=ro_checksum_user,p=msandbox,P=12345",
+      "h=127.1,u=ro_checksum_user,p=msandbox,P=12345,s=1",
       qw(--set-vars innodb_lock_wait_timeout=3 -t mysql.user)) },
    stderr => 1,
 );
 
 like(
    $output,
-   qr/database percona exists on the master/,
-   "CREATE DATABASE error and db is missing on slaves (bug 1039569)"
+   qr/database percona exists on the source/,
+   "CREATE DATABASE error and db is missing on replicas (bug 1039569)"
 );
 
 diag(`/tmp/12345/use -uroot -pmsandbox -e "DROP USER ro_checksum_user\@'%'" 2>&1`);
@@ -225,6 +225,6 @@ diag(`/tmp/12345/use -uroot -pmsandbox -e "DROP USER ro_checksum_user\@'%'" 2>&1
 # #############################################################################
 # 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;
diff --git a/t/pt-table-checksum/filters.t b/t/pt-table-checksum/filters.t
index 4bfd1d6b2..812d42fe4 100644
--- a/t/pt-table-checksum/filters.t
+++ b/t/pt-table-checksum/filters.t
@@ -18,10 +18,10 @@ require "$trunk/bin/pt-table-checksum";
 
 my $dp  = new DSNParser(opts=>$dsn_opts);
 my $sb  = new Sandbox(basedir => '/tmp', DSNParser => $dp);
-my $dbh = $sb->get_dbh_for('master');
+my $dbh = $sb->get_dbh_for('source');
 
 if ( !$dbh ) {
-   plan skip_all => 'Cannot connect to sandbox master';
+   plan skip_all => 'Cannot connect to sandbox source';
 }
 else {
    plan tests => 9;
@@ -30,8 +30,8 @@ else {
 # 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.
 # And --max-load "" prevents waiting for status variables.
-my $master_dsn = 'h=127.1,P=12345,u=msandbox,p=msandbox';
-my @args       = ($master_dsn, qw(--set-vars innodb_lock_wait_timeout=3), '--max-load', ''); 
+my $source_dsn = 'h=127.1,P=12345,u=msandbox,p=msandbox';
+my @args       = ($source_dsn, qw(--set-vars innodb_lock_wait_timeout=3), '--max-load', ''); 
 
 
 # ############################################################################
diff --git a/t/pt-table-checksum/float_precision.t b/t/pt-table-checksum/float_precision.t
index def0fc5de..fdbf45a70 100644
--- a/t/pt-table-checksum/float_precision.t
+++ b/t/pt-table-checksum/float_precision.t
@@ -17,10 +17,10 @@ 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 $source_dbh = $sb->get_dbh_for('source');
 
-if ( !$master_dbh ) {
-   plan skip_all => 'Cannot connect to sandbox master';
+if ( !$source_dbh ) {
+   plan skip_all => 'Cannot connect to sandbox source';
 }
 else {
    plan tests => 7;
@@ -29,11 +29,11 @@ else {
 # 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.
 # And --max-load "" prevents waiting for status variables.
-my $master_dsn = 'h=127.1,P=12345,u=msandbox,p=msandbox';
-my @args       = ($master_dsn, qw(--set-vars innodb_lock_wait_timeout=3), '--max-load', ''); 
+my $source_dsn = 'h=127.1,P=12345,u=msandbox,p=msandbox';
+my @args       = ($source_dsn, qw(--set-vars innodb_lock_wait_timeout=3), '--max-load', ''); 
 my $output;
 
-$sb->load_file('master', "t/pt-table-checksum/samples/float_precision.sql");
+$sb->load_file('source', "t/pt-table-checksum/samples/float_precision.sql");
 
 $output = output(
    sub { pt_table_checksum::main(@args, qw(-t float_precision.t --explain)) },
@@ -83,6 +83,6 @@ like(
 # #############################################################################
 # Done.
 # #############################################################################
-$sb->wipe_clean($master_dbh);
+$sb->wipe_clean($source_dbh);
 ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox");
 exit;
diff --git a/t/pt-table-checksum/fnv_64.t b/t/pt-table-checksum/fnv_64.t
index f98fa35b9..6fb559579 100644
--- a/t/pt-table-checksum/fnv_64.t
+++ b/t/pt-table-checksum/fnv_64.t
@@ -17,25 +17,25 @@ 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 $source_dbh = $sb->get_dbh_for('source');
 
-if ( !$master_dbh ) {
-   plan skip_all => 'Cannot connect to sandbox master';
+if ( !$source_dbh ) {
+   plan skip_all => 'Cannot connect to sandbox source';
 }
 
 # 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.
 # And --max-load "" prevents waiting for status variables.
-my $master_dsn = 'h=127.1,P=12345,u=msandbox,p=msandbox';
-my @args       = ($master_dsn, qw(--set-vars innodb_lock_wait_timeout=3), '--max-load', ''); 
+my $source_dsn = 'h=127.1,P=12345,u=msandbox,p=msandbox';
+my @args       = ($source_dsn, qw(--set-vars innodb_lock_wait_timeout=3), '--max-load', ''); 
 my $sample     = "t/pt-table-checksum/samples/";
 my $row;
 my $output;
 
-$sb->create_dbs($master_dbh, [qw(test)]);
+$sb->create_dbs($source_dbh, [qw(test)]);
 
-eval { $master_dbh->do('DROP FUNCTION IF EXISTS fnv_64'); };
-eval { $master_dbh->do("CREATE FUNCTION fnv_64 RETURNS INTEGER SONAME 'libfnv_udf.so';"); };
+eval { $source_dbh->do('DROP FUNCTION IF EXISTS fnv_64'); };
+eval { $source_dbh->do("CREATE FUNCTION fnv_64 RETURNS INTEGER SONAME 'libfnv_udf.so';"); };
 if ( $EVAL_ERROR ) {
    chomp $EVAL_ERROR;
    plan skip_all => "No FNV_64 UDF lib"
@@ -48,14 +48,14 @@ else {
 # First test the the FNV function works in MySQL and gives the correct results.
 # ############################################################################
 
-($row) = $master_dbh->selectrow_array("select fnv_64(1)");
+($row) = $source_dbh->selectrow_array("select fnv_64(1)");
 is(
    $row,
    "-6320923009900088257",
    "FNV_64(1)"
 );
 
-($row) = $master_dbh->selectrow_array("select fnv_64('hello, world')");
+($row) = $source_dbh->selectrow_array("select fnv_64('hello, world')");
 is(
    $row,
    "6062351191941526764",
@@ -107,7 +107,7 @@ is(
 # #############################################################################
 # Done.
 # #############################################################################
-$master_dbh->do('DROP FUNCTION IF EXISTS fnv_64');
-$sb->wipe_clean($master_dbh);
+$source_dbh->do('DROP FUNCTION IF EXISTS fnv_64');
+$sb->wipe_clean($source_dbh);
 ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox");
 exit;
diff --git a/t/pt-table-checksum/ignore_columns.t b/t/pt-table-checksum/ignore_columns.t
index e27cf1292..1ddc1f6c5 100644
--- a/t/pt-table-checksum/ignore_columns.t
+++ b/t/pt-table-checksum/ignore_columns.t
@@ -17,14 +17,14 @@ 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 $slave_dbh  = $sb->get_dbh_for('slave1');
+my $source_dbh = $sb->get_dbh_for('source');
+my $replica_dbh  = $sb->get_dbh_for('replica1');
 
-if ( !$master_dbh ) {
-   plan skip_all => 'Cannot connect to sandbox master';
+if ( !$source_dbh ) {
+   plan skip_all => 'Cannot connect to sandbox source';
 }
-elsif ( !$slave_dbh ) {
-   plan skip_all => 'Cannot connect to sandbox slave';
+elsif ( !$replica_dbh ) {
+   plan skip_all => 'Cannot connect to sandbox replica';
 }
 else {
    plan tests => 4;
@@ -33,13 +33,13 @@ else {
 # 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.
 # And --max-load "" prevents waiting for status variables.
-my $master_dsn = 'h=127.1,P=12345,u=msandbox,p=msandbox';
-my @args       = ($master_dsn, qw(--set-vars innodb_lock_wait_timeout=3), '--max-load', ''); 
+my $source_dsn = 'h=127.1,P=12345,u=msandbox,p=msandbox';
+my @args       = ($source_dsn, qw(--set-vars innodb_lock_wait_timeout=3), '--max-load', ''); 
 my $output;
 
-$sb->create_dbs($master_dbh, [qw(test)]);
-$sb->load_file('master', 't/pt-table-checksum/samples/issue_94.sql');
-$slave_dbh->do("update test.issue_94 set c=''");
+$sb->create_dbs($source_dbh, [qw(test)]);
+$sb->load_file('source', 't/pt-table-checksum/samples/issue_94.sql');
+$replica_dbh->do("update test.issue_94 set c=''");
 
 $output = output(
    sub { pt_table_checksum::main(@args, qw(-d test --ignore-databases mysql -t issue_94)) },
@@ -75,6 +75,6 @@ unlike(
 # #############################################################################
 # Done.
 # #############################################################################
-$sb->wipe_clean($master_dbh);
+$sb->wipe_clean($source_dbh);
 ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox");
 exit;
diff --git a/t/pt-table-checksum/issue_1485195.t b/t/pt-table-checksum/issue_1485195.t
index 89929a05c..c18ff336d 100644
--- a/t/pt-table-checksum/issue_1485195.t
+++ b/t/pt-table-checksum/issue_1485195.t
@@ -18,21 +18,21 @@ require "$trunk/bin/pt-table-checksum";
 
 my $dp  = new DSNParser(opts=>$dsn_opts);
 my $sb  = new Sandbox(basedir => '/tmp', DSNParser => $dp);
-my $dbh = $sb->get_dbh_for('master');
+my $dbh = $sb->get_dbh_for('source');
 
 if ( !$dbh ) {
-   plan skip_all => 'Cannot connect to sandbox master';
+   plan skip_all => 'Cannot connect to sandbox source';
 }
 else {
    plan tests => 2;
 }
 
-$sb->load_file('master', 't/pt-table-checksum/samples/issue_1485195.sql');
+$sb->load_file('source', 't/pt-table-checksum/samples/issue_1485195.sql');
 # 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.
 # And --max-load "" prevents waiting for status variables.
-my $master_dsn = 'h=127.1,P=12345,u=msandbox,p=msandbox,D=my_binary_database';
-my @args       = ($master_dsn, qw(--replicate my_binary_database.my_table -t percona_test.checksums)); 
+my $source_dsn = 'h=127.1,P=12345,u=msandbox,p=msandbox,D=my_binary_database';
+my @args       = ($source_dsn, qw(--replicate my_binary_database.my_table -t percona_test.checksums)); 
 my $output;
 
 $output = output(
diff --git a/t/pt-table-checksum/issue_1592608.t b/t/pt-table-checksum/issue_1592608.t
index 788fac8e4..fc6b6161c 100644
--- a/t/pt-table-checksum/issue_1592608.t
+++ b/t/pt-table-checksum/issue_1592608.t
@@ -18,10 +18,10 @@ require "$trunk/bin/pt-table-checksum";
 
 my $dp  = new DSNParser(opts=>$dsn_opts);
 my $sb  = new Sandbox(basedir => '/tmp', DSNParser => $dp);
-my $dbh = $sb->get_dbh_for('master');
+my $dbh = $sb->get_dbh_for('source');
 
 if ( !$dbh ) {
-   plan skip_all => 'Cannot connect to sandbox master';
+   plan skip_all => 'Cannot connect to sandbox source';
 }
 else {
    plan tests => 2;
@@ -30,15 +30,15 @@ else {
 # 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.
 # And --max-load "" prevents waiting for status variables.
-my $master_dsn = 'h=127.1,P=12345,u=msandbox,p=msandbox,D=bug_1592608';
-my @args       = ($master_dsn, qw(--set-vars innodb_lock_wait_timeout=3), '--max-load', ''); 
+my $source_dsn = 'h=127.1,P=12345,u=msandbox,p=msandbox,D=bug_1592608';
+my @args       = ($source_dsn, qw(--set-vars innodb_lock_wait_timeout=3), '--max-load', ''); 
 my $output;
 
 # We test that checksum works with invalid dates, 
 # but for that we need to turn off MySQL's NO_ZERO_IN_DATE mode 
 my $modes = new SqlModes($dbh, global=>1);
 $modes->del('NO_ZERO_IN_DATE');
-$sb->load_file('master', 't/pt-table-checksum/samples/issue_1592608.sql');
+$sb->load_file('source', 't/pt-table-checksum/samples/issue_1592608.sql');
 # #############################################################################
 # Issue 602: mk-table-checksum issue with invalid dates
 # #############################################################################
diff --git a/t/pt-table-checksum/issue_1651002.t b/t/pt-table-checksum/issue_1651002.t
index 48de34a2b..137aad0d2 100644
--- a/t/pt-table-checksum/issue_1651002.t
+++ b/t/pt-table-checksum/issue_1651002.t
@@ -18,10 +18,10 @@ require "$trunk/bin/pt-table-checksum";
 
 my $dp  = new DSNParser(opts=>$dsn_opts);
 my $sb  = new Sandbox(basedir => '/tmp', DSNParser => $dp);
-my $dbh = $sb->get_dbh_for('master');
+my $dbh = $sb->get_dbh_for('source');
 
 if ( !$dbh ) {
-   plan skip_all => 'Cannot connect to sandbox master';
+   plan skip_all => 'Cannot connect to sandbox source';
 }
 else {
    plan tests => 2;
@@ -30,32 +30,32 @@ else {
 # 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.
 # And --max-load "" prevents waiting for status variables.
-my $master_dsn = 'h=127.1,P=12345,u=msandbox,p=msandbox,D=test';
-my @args       = ($master_dsn, qw(--replicate test.checksums -d test --slave-user slave_user --slave-password slave_password --ignore-databases mysql)); 
+my $source_dsn = 'h=127.1,P=12345,u=msandbox,p=msandbox,D=test,s=1';
+my @args       = ($source_dsn, qw(--replicate test.checksums -d test --replica-user replica_user --replica-password replica_password --ignore-databases mysql)); 
 my $output;
 
-# Create a new user that is going to be replicated on slaves.
-# After that, stop replication, delete the user from the master just to ensure that
-# on the master we are using the sandbox user, and start relication again to run
+# Create a new user that is going to be replicated on replicas.
+# After that, stop replication, delete the user from the source just to ensure that
+# on the source we are using the sandbox user, and start relication again to run
 # the tests
-if ($sandbox_version ge '8.0') {
-    $sb->do_as_root("slave1", q/CREATE USER 'slave_user'@'localhost' IDENTIFIED WITH mysql_native_password BY 'slave_password'/);
+if ($sandbox_version eq '8.0') {
+    $sb->do_as_root("replica1", q/CREATE USER 'replica_user'@'localhost' IDENTIFIED WITH mysql_native_password BY 'replica_password'/);
 } else {
-    $sb->do_as_root("slave1", q/CREATE USER 'slave_user'@'localhost' IDENTIFIED BY 'slave_password'/);
+    $sb->do_as_root("replica1", q/CREATE USER 'replica_user'@'localhost' IDENTIFIED BY 'replica_password'/);
 }
-$sb->do_as_root("slave1", q/GRANT REPLICATION CLIENT ON *.* TO 'slave_user'@'localhost'/);
-$sb->do_as_root("slave1", q/GRANT ALL ON *.* TO 'slave_user'@'localhost'/);                
-$sb->do_as_root("slave1", q/FLUSH PRIVILEGES/);                
+$sb->do_as_root("replica1", q/GRANT REPLICATION CLIENT ON *.* TO 'replica_user'@'localhost'/);
+$sb->do_as_root("replica1", q/GRANT ALL ON *.* TO 'replica_user'@'localhost'/);                
+$sb->do_as_root("replica1", q/FLUSH PRIVILEGES/);                
 
-$sb->wait_for_slaves();
+$sb->wait_for_replicas();
 
-$sb->load_file('master', 't/pt-table-checksum/samples/issue_1651002.sql');
-# Ensure we cannot connect to slaves using standard credentials
-# Since slave2 is a slave of slave1, removing the user from the slave1 will remove
-# the user also from slave2
-$sb->do_as_root("slave1", q/RENAME USER 'msandbox'@'%' TO 'msandbox_old'@'%'/);
-$sb->do_as_root("slave1", q/FLUSH PRIVILEGES/);
-$sb->do_as_root("slave1", q/FLUSH TABLES/);
+$sb->load_file('source', 't/pt-table-checksum/samples/issue_1651002.sql');
+# Ensure we cannot connect to replicas using standard credentials
+# Since replica2 is a replica of replica1, removing the user from the replica1 will remove
+# the user also from replica2
+$sb->do_as_root("replica1", q/RENAME USER 'msandbox'@'%' TO 'msandbox_old'@'%'/);
+$sb->do_as_root("replica1", q/FLUSH PRIVILEGES/);
+$sb->do_as_root("replica1", q/FLUSH TABLES/);
 
 
 $output = output(
@@ -66,20 +66,20 @@ is(
    PerconaTest::count_checksum_results($output, 'rows'),
    6,
    "Large BLOB/TEXT/BINARY Checksum"
-);
+) or diag($output);
 
 # #############################################################################
 # Done.
 # #############################################################################
 diag("Stopping the sandbox to leave a clean sandbox for the next test file");
 
-$sb->do_as_root("slave1", q/DROP USER 'slave_user'@'localhost'/);
-$sb->do_as_root("slave1", q/FLUSH PRIVILEGES/);
+$sb->do_as_root("replica1", q/DROP USER 'replica_user'@'localhost'/);
+$sb->do_as_root("replica1", q/FLUSH PRIVILEGES/);
 
 # Restore privilegs for the other test files
-$sb->do_as_root("slave1", q/RENAME USER 'msandbox_old'@'%' TO 'msandbox'@'%'/);
-$sb->do_as_root("master", q/FLUSH PRIVILEGES/);                
-$sb->do_as_root("master", q/FLUSH TABLES/);
+$sb->do_as_root("replica1", q/RENAME USER 'msandbox_old'@'%' TO 'msandbox'@'%'/);
+$sb->do_as_root("source", q/FLUSH PRIVILEGES/);                
+$sb->do_as_root("source", q/FLUSH TABLES/);
 
 $sb->wipe_clean($dbh);
 
diff --git a/t/pt-table-checksum/issue_388.t b/t/pt-table-checksum/issue_388.t
index 830c140d9..e96e479ec 100644
--- a/t/pt-table-checksum/issue_388.t
+++ b/t/pt-table-checksum/issue_388.t
@@ -17,10 +17,10 @@ require "$trunk/bin/pt-table-checksum";
 
 my $dp  = new DSNParser(opts=>$dsn_opts);
 my $sb  = new Sandbox(basedir => '/tmp', DSNParser => $dp);
-my $dbh = $sb->get_dbh_for('master');
+my $dbh = $sb->get_dbh_for('source');
 
 if ( !$dbh ) {
-   plan skip_all => 'Cannot connect to sandbox master';
+   plan skip_all => 'Cannot connect to sandbox source';
 }
 else {
    plan tests => 3;
@@ -29,8 +29,8 @@ else {
 # 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.
 # And --max-load "" prevents waiting for status variables.
-my $master_dsn = 'h=127.1,P=12345,u=msandbox,p=msandbox';
-my @args       = ($master_dsn, qw(--set-vars innodb_lock_wait_timeout=3), '--max-load', ''); 
+my $source_dsn = 'h=127.1,P=12345,u=msandbox,p=msandbox';
+my @args       = ($source_dsn, qw(--set-vars innodb_lock_wait_timeout=3), '--max-load', ''); 
 my $output;
 
 # #############################################################################
@@ -39,7 +39,7 @@ my $output;
 # #############################################################################
 
 $sb->create_dbs($dbh, [qw(test)]);
-$sb->load_file('master', 't/lib/samples/tables/issue-388.sql', 'test');
+$sb->load_file('source', 't/lib/samples/tables/issue-388.sql', 'test');
 
 $dbh->do("insert into test.foo values (null, 'john, smith')");
 
diff --git a/t/pt-table-checksum/issue_47.t b/t/pt-table-checksum/issue_47.t
index 8c7653c3a..42f929414 100644
--- a/t/pt-table-checksum/issue_47.t
+++ b/t/pt-table-checksum/issue_47.t
@@ -17,10 +17,10 @@ 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 $source_dbh = $sb->get_dbh_for('source');
 
-if ( !$master_dbh ) {
-   plan skip_all => 'Cannot connect to sandbox master';
+if ( !$source_dbh ) {
+   plan skip_all => 'Cannot connect to sandbox source';
 } elsif ($sandbox_version >= '8.0') { 
    plan skip_all => "8.0 requires fix for https://jira.percona.com/browse/PT-1805";
 } else {
@@ -30,13 +30,13 @@ if ( !$master_dbh ) {
 # 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.
 # And --max-load "" prevents waiting for status variables.
-my $master_dsn = 'h=127.1,P=12345,u=msandbox,p=msandbox';
-my @args       = ($master_dsn, qw(--set-vars innodb_lock_wait_timeout=3), '--max-load', ''); 
+my $source_dsn = 'h=127.1,P=12345,u=msandbox,p=msandbox';
+my @args       = ($source_dsn, qw(--set-vars innodb_lock_wait_timeout=3), '--max-load', ''); 
 my $output;
 my $row;
 
-$sb->create_dbs($master_dbh, [qw(test)]);
-$sb->load_file('master', 't/pt-table-checksum/samples/issue_47.sql');
+$sb->create_dbs($source_dbh, [qw(test)]);
+$sb->load_file('source', 't/pt-table-checksum/samples/issue_47.sql');
 
 # #############################################################################
 # Issue 47: TableChunker::range_num broken for very large bigint
@@ -54,7 +54,7 @@ is(
    "No error nibbling very large int"
 );
 
-$row = $master_dbh->selectall_arrayref("select lower_boundary, upper_boundary from percona.checksums where db='test' and tbl='issue_47' order by chunk");
+$row = $source_dbh->selectall_arrayref("select lower_boundary, upper_boundary from percona.checksums where db='test' and tbl='issue_47' order by chunk");
 is_deeply(
    $row,
    [
@@ -70,6 +70,6 @@ is_deeply(
 # #############################################################################
 # Done.
 # #############################################################################
-$sb->wipe_clean($master_dbh);
+$sb->wipe_clean($source_dbh);
 ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox");
 exit;
diff --git a/t/pt-table-checksum/issue_602.t b/t/pt-table-checksum/issue_602.t
index 7e04d50b8..9b50b9db7 100644
--- a/t/pt-table-checksum/issue_602.t
+++ b/t/pt-table-checksum/issue_602.t
@@ -18,10 +18,10 @@ require "$trunk/bin/pt-table-checksum";
 
 my $dp  = new DSNParser(opts=>$dsn_opts);
 my $sb  = new Sandbox(basedir => '/tmp', DSNParser => $dp);
-my $dbh = $sb->get_dbh_for('master');
+my $dbh = $sb->get_dbh_for('source');
 
 if ( !$dbh ) {
-   plan skip_all => 'Cannot connect to sandbox master';
+   plan skip_all => 'Cannot connect to sandbox source';
 }
 else {
    plan tests => 2;
@@ -30,15 +30,15 @@ else {
 # 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.
 # And --max-load "" prevents waiting for status variables.
-my $master_dsn = 'h=127.1,P=12345,u=msandbox,p=msandbox';
-my @args       = ($master_dsn, qw(--set-vars innodb_lock_wait_timeout=3), '--max-load', ''); 
+my $source_dsn = 'h=127.1,P=12345,u=msandbox,p=msandbox';
+my @args       = ($source_dsn, qw(--set-vars innodb_lock_wait_timeout=3), '--max-load', ''); 
 my $output;
 
 # We test that checksum works with invalid dates, 
 # but for that we need to turn off MySQL's NO_ZERO_IN_DATE mode 
 my $modes = new SqlModes($dbh, global=>1);
 $modes->del('NO_ZERO_IN_DATE');
-$sb->load_file('master', 't/pt-table-checksum/samples/issue_602.sql');
+$sb->load_file('source', 't/pt-table-checksum/samples/issue_602.sql');
 # #############################################################################
 # Issue 602: mk-table-checksum issue with invalid dates
 # #############################################################################
diff --git a/t/pt-table-checksum/plugin.t b/t/pt-table-checksum/plugin.t
index 23ca1958a..522da9c49 100644
--- a/t/pt-table-checksum/plugin.t
+++ b/t/pt-table-checksum/plugin.t
@@ -22,24 +22,24 @@ $Data::Dumper::Quotekeys = 0;
 
 my $dp         = new DSNParser(opts=>$dsn_opts);
 my $sb         = new Sandbox(basedir => '/tmp', DSNParser => $dp);
-my $master_dbh = $sb->get_dbh_for('master');
+my $source_dbh = $sb->get_dbh_for('source');
 
-if ( !$master_dbh ) {
-   plan skip_all => 'Cannot connect to sandbox master';
+if ( !$source_dbh ) {
+   plan skip_all => 'Cannot connect to sandbox source';
 }
 
 my $output;
-my $master_dsn = $sb->dsn_for('master');
+my $source_dsn = $sb->dsn_for('source');
 my $sample     = "t/pt-table-checksum/samples";
 my $plugin     = "$trunk/$sample/plugins";
 my $exit;
 my $rows;
 
-$master_dbh->prepare("drop database if exists percona")->execute();
-$master_dbh->prepare("create database percona")->execute();
-$master_dbh->prepare("create table if not exists percona.t ( a int primary key);")->execute();
-$master_dbh->prepare("insert into percona.t values (0),(1),(2),(3),(4),(5),(6),(7),(8),(9)")->execute();
-$master_dbh->prepare("analyze table percona.t;")->execute();
+$source_dbh->prepare("drop database if exists percona")->execute();
+$source_dbh->prepare("create database percona")->execute();
+$source_dbh->prepare("create table if not exists percona.t ( a int primary key);")->execute();
+$source_dbh->prepare("insert into percona.t values (0),(1),(2),(3),(4),(5),(6),(7),(8),(9)")->execute();
+$source_dbh->prepare("analyze table percona.t;")->execute();
 
 # #############################################################################
 # all_hooks.pm
@@ -47,7 +47,7 @@ $master_dbh->prepare("analyze table percona.t;")->execute();
 
 ($output) = full_output(
    sub { pt_table_checksum::main(
-      "$master_dsn",
+      "$source_dsn",
       '--databases', 'percona',
       '--plugin', "$plugin/all_hooks.pm",
    )},
@@ -59,7 +59,7 @@ my @called = $output =~ m/^PLUGIN \S+$/gm;
 is_deeply(
    \@called,
    [
-      'PLUGIN get_slave_lag',
+      'PLUGIN get_replica_lag',
       'PLUGIN init',
       'PLUGIN before_checksum_table',
       'PLUGIN after_checksum_table',
@@ -70,7 +70,7 @@ is_deeply(
 
 ($output) = full_output(
    sub { pt_table_checksum::main(
-      "$master_dsn",
+      "$source_dsn",
       '--replicate-check', '--replicate-check-only',
       '--databases', 'percona',
       '--plugin', "$plugin/all_hooks.pm",
@@ -93,6 +93,6 @@ is_deeply(
 # #############################################################################
 # 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;
diff --git a/t/pt-table-checksum/privs.t b/t/pt-table-checksum/privs.t
index 103bf9a9d..184b926e6 100644
--- a/t/pt-table-checksum/privs.t
+++ b/t/pt-table-checksum/privs.t
@@ -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;
diff --git a/t/pt-table-checksum/progress.t b/t/pt-table-checksum/progress.t
index 253629b1f..86bd9387f 100644
--- a/t/pt-table-checksum/progress.t
+++ b/t/pt-table-checksum/progress.t
@@ -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;
 
@@ -23,18 +23,18 @@ 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 ( !$slave2_dbh ) {
-   plan skip_all => 'Cannot connect to sandbox slave2';
+elsif ( !$replica2_dbh ) {
+   plan skip_all => 'Cannot connect to sandbox replica2';
 }
 else {
    plan tests => 5;
@@ -46,25 +46,25 @@ else {
 # --chunk-size may help prevent the tool from running too fast and finishing
 # before the TEST_WISHLIST job below finishes. (Or, it might just make things
 # worse. This is a random stab in the dark. There is a problem either way.)
-my $master_dsn = 'h=127.1,P=12345,u=msandbox,p=msandbox';
-my @args       = ($master_dsn, qw(--set-vars innodb_lock_wait_timeout=3),
+my $source_dsn = 'h=127.1,P=12345,u=msandbox,p=msandbox';
+my @args       = ($source_dsn, qw(--set-vars innodb_lock_wait_timeout=3),
                    '--chunk-size', '50'); 
 my $output;
 my $row;
 my $scripts = "$trunk/t/pt-table-checksum/scripts/";
 
 # ############################################################################
-# Tool should check all slaves' lag, so slave2, not just slave1.
+# Tool should check all replicas' lag, so replica2, not just replica1.
 # ############################################################################
 
 # Must have empty checksums table for these tests.
-$master_dbh->do('drop table if exists percona.checksums');
+$source_dbh->do('drop table if exists percona.checksums');
 
 # Must not be lagging.
-$sb->wait_for_slaves();
+$sb->wait_for_replicas();
 
 # This big fancy command waits until it sees the checksum for sakila.city
-# in the repl table on the master, then it stops slave2 for 2 seconds,
+# in the repl table on the source, then it stops replica2 for 2 seconds,
 # then starts it again.
 # TEST_WISHLIST PLUGIN_WISHLIST: do this with a plugin to the tool itself,
 # not in this unreliable fashion.
@@ -72,7 +72,7 @@ $sb->wait_for_slaves();
 # Notice there are 3 *different* wait type commands involved
 # Final integer in the line is the run-time allowed for the "outermost" wait (wait-to-exec). If it is absent it defaults to 1, which may not be enough for sakila.city# chunk to appear (at least on slow systems)
 
-system("$trunk/util/wait-to-exec '$scripts/wait-for-chunk.sh 12345 sakila city 1' '$scripts/exec-wait-exec.sh 12347 \"stop slave\" 5 \"start slave\"' 12 >/dev/null &");
+system("$trunk/util/wait-to-exec '$scripts/wait-for-chunk.sh 12345 sakila city 1' '$scripts/exec-wait-exec.sh 12347 \"stop ${replica_name}\" 5 \"start ${replica_name}\"' 12 >/dev/null &");
 
 $output = output(
    sub { pt_table_checksum::main(@args, qw(-d sakila)); },
@@ -82,45 +82,45 @@ $output = output(
 like(
    $output,
    qr/Replica h=127.0.0.1,P=12347 is stopped/,
-   "--progress for slave lag"
+   "--progress for replica lag"
 ) or diag($output);
 
 like(
    $output,
    qr/sakila.store$/m,
-   "Checksumming continues after waiting for slave lag"
+   "Checksumming continues after waiting for replica lag"
 );
 
 # This test randomly fails, we need to know the reason
 diag($output) if not is(
    PerconaTest::count_checksum_results($output, 'errors'),
    0,
-   "No errors after waiting for slave lag"
+   "No errors after waiting for replica lag"
 );
 
 # Now wait until the SQL thread is started again.
-$sb->wait_for_slaves();
+$sb->wait_for_replicas();
 
 # #############################################################################
 # Wait for --replicate table to replicate.
 # https://bugs.launchpad.net/percona-toolkit/+bug/1008778
 # #############################################################################
-$master_dbh->do("DROP DATABASE IF EXISTS percona");
+$source_dbh->do("DROP DATABASE IF EXISTS percona");
 wait_until(sub {
-   my $dbs = $slave2_dbh->selectall_arrayref("SHOW DATABASES");
+   my $dbs = $replica2_dbh->selectall_arrayref("SHOW DATABASES");
    return !grep { $_->[0] eq 'percona' } @$dbs;
 });
 
-$sb->load_file('master', "t/pt-table-checksum/samples/dsn-table.sql");
+$sb->load_file('source', "t/pt-table-checksum/samples/dsn-table.sql");
 
-$slave2_dbh->do("STOP SLAVE");
+$replica2_dbh->do("STOP ${replica_name}");
 wait_until(sub {
-   my $ss = $slave2_dbh->selectrow_hashref("SHOW SLAVE STATUS");
-   return $ss->{slave_io_running} eq 'Yes';
+   my $ss = $replica2_dbh->selectrow_hashref("SHOW ${replica_name} STATUS");
+   return $ss->{"${replica_name}_io_running"} eq 'Yes';
 });
 
 
-@args       = ($master_dsn, qw(--set-vars innodb_lock_wait_timeout=3),
+@args       = ($source_dsn, qw(--set-vars innodb_lock_wait_timeout=3),
                   '--progress', 'time,2', '--max-load', '', '--chunk-size', '500');
 
 ($output) = PerconaTest::full_output(
@@ -136,13 +136,13 @@ like(
    "--progress for --replicate table (bug 1008778)"
 );
 
-$slave2_dbh->do("START SLAVE");
+$replica2_dbh->do("START ${replica_name}");
 
-$sb->wait_for_slaves();
+$sb->wait_for_replicas();
 
 # #############################################################################
 # Done.
 # #############################################################################
-$sb->wipe_clean($master_dbh);
+$sb->wipe_clean($source_dbh);
 ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox");
 exit;
diff --git a/t/pt-table-checksum/pt-105.t b/t/pt-table-checksum/pt-105.t
index d52bd67d3..0eca206cb 100644
--- a/t/pt-table-checksum/pt-105.t
+++ b/t/pt-table-checksum/pt-105.t
@@ -22,10 +22,10 @@ require "$trunk/bin/pt-table-checksum";
 
 my $dp  = new DSNParser(opts=>$dsn_opts);
 my $sb  = new Sandbox(basedir => '/tmp', DSNParser => $dp);
-my $dbh = $sb->get_dbh_for('master');
+my $dbh = $sb->get_dbh_for('source');
 
 if ( !$dbh ) {
-   plan skip_all => 'Cannot connect to sandbox master';
+   plan skip_all => 'Cannot connect to sandbox source';
 }
 else {
    plan tests => 2;
@@ -37,7 +37,7 @@ sub start_thread {
    my ($dsn_opts, $initial_sleep_time, $sleep_time, $db_count) = @_;
    my $dp = new DSNParser(opts=>$dsn_opts);
    my $sb = new Sandbox(basedir => '/tmp', DSNParser => $dp);
-   my $dbh = $sb->get_dbh_for('master');
+   my $dbh = $sb->get_dbh_for('source');
    PTDEBUG && diag("Thread started: Sleeping $initial_sleep_time milliseconds before start dropping DBs");
    usleep($initial_sleep_time );
    for (my $i=0; $i < $db_count; $i++) {
@@ -59,8 +59,8 @@ for (my $i=0; $i < $db_count; $i++) {
 # 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.
 # And --max-load "" prevents waiting for status variables.
-my $master_dsn = 'h=127.1,P=12345,u=msandbox,p=msandbox';
-my @args       = ($master_dsn, qw(--no-check-binlog-format)); 
+my $source_dsn = 'h=127.1,P=12345,u=msandbox,p=msandbox';
+my @args       = ($source_dsn, qw(--no-check-binlog-format)); 
 my $output;
 
 $output = output(
diff --git a/t/pt-table-checksum/pt-1059.t b/t/pt-table-checksum/pt-1059.t
index 1203a0357..9b63982de 100644
--- a/t/pt-table-checksum/pt-1059.t
+++ b/t/pt-table-checksum/pt-1059.t
@@ -18,10 +18,10 @@ require "$trunk/bin/pt-table-checksum";
 
 my $dp  = new DSNParser(opts=>$dsn_opts);
 my $sb  = new Sandbox(basedir => '/tmp', DSNParser => $dp);
-my $dbh = $sb->get_dbh_for('master');
+my $dbh = $sb->get_dbh_for('source');
 
 if ( !$dbh ) {
-   plan skip_all => 'Cannot connect to sandbox master';
+   plan skip_all => 'Cannot connect to sandbox source';
 }
 else {
    plan tests => 3;
@@ -30,14 +30,14 @@ else {
 # 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.
 # And --max-load "" prevents waiting for status variables.
-my $master_dsn = 'h=127.1,P=12345,u=msandbox,p=msandbox,D=pt_1059';
-my @args       = ($master_dsn, qw(--set-vars innodb_lock_wait_timeout=3), '--max-load', ''); 
+my $source_dsn = 'h=127.1,P=12345,u=msandbox,p=msandbox,D=pt_1059';
+my @args       = ($source_dsn, qw(--set-vars innodb_lock_wait_timeout=3), '--max-load', ''); 
 my $output;
 my $exit_status;
 
 # We test that checksum works with columns and indexes
 # that contain new lines
-$sb->load_file('master', 't/pt-table-checksum/samples/pt-1059.sql');
+$sb->load_file('source', 't/pt-table-checksum/samples/pt-1059.sql');
 # #############################################################################
 # PT-1059 LP #1093972: Tools can't parse index names containing newlines
 # #############################################################################
diff --git a/t/pt-table-checksum/pt-131.t b/t/pt-table-checksum/pt-131.t
index 219d7237d..70ceea83d 100644
--- a/t/pt-table-checksum/pt-131.t
+++ b/t/pt-table-checksum/pt-131.t
@@ -18,13 +18,13 @@ require "$trunk/bin/pt-table-checksum";
 
 my $dp  = new DSNParser(opts=>$dsn_opts);
 my $sb  = new Sandbox(basedir => '/tmp', DSNParser => $dp);
-my $dbh = $sb->get_dbh_for('master');
+my $dbh = $sb->get_dbh_for('source');
 my $sb_version = VersionParser->new($dbh);
 my $rows = $dbh->selectall_hashref("SHOW VARIABLES LIKE '%version%'", ['variable_name']);
 my $remove_plugin = 0;
 
 if ( !$dbh ) {
-   plan skip_all => 'Cannot connect to sandbox master';
+   plan skip_all => 'Cannot connect to sandbox source';
 } elsif ( $sb_version < '5.7.21' || $sb_version >= '8.0' ||
       !($rows->{version_comment}->{value} =~ m/percona server/i) ) {
    plan skip_all => 'This test file needs 5.7 Percona Server, starting from 5.7.21';
@@ -36,18 +36,18 @@ eval {
       $dbh->selectrow_arrayref('SELECT @@query_response_time_session_stats' );
 };
 if ($EVAL_ERROR) {
-    $sb->load_file('master', 't/pt-table-checksum/samples/pt-131.sql');
+    $sb->load_file('source', 't/pt-table-checksum/samples/pt-131.sql');
     $remove_plugin = 1;
 }
 # The sandbox servers run with lock_wait_timeout=3 and it is not dynamic
 # so we need to specify --set-vars innodb_lock_wait_timeout=3 else the tool will die.
 # And --max-load "" prevents waiting for status variables.
-my $master_dsn = $sb->dsn_for('master');
+my $source_dsn = $sb->dsn_for('source');
 my $output;
 my $exit_status;
 $ENV{PTDEBUG} = 1;
 
-my $cmd ="PTDEBUG=1 $trunk/bin/pt-table-checksum $master_dsn --disable-qrt-plugin 2>&1";
+my $cmd ="PTDEBUG=1 $trunk/bin/pt-table-checksum $source_dsn --disable-qrt-plugin 2>&1";
 
 $output = `$cmd`;
 like (
@@ -58,7 +58,7 @@ like (
 
 like (
     $output,
-    qr/Disabling qrt plugin on master server/,
+    qr/Disabling qrt plugin on source server/,
     "QRT plugin has been disabled",
 );
 delete $ENV{PTDEBUG};
@@ -67,7 +67,7 @@ delete $ENV{PTDEBUG};
 # Done.
 # #############################################################################
 if ($remove_plugin) {
-   $sb->load_file('master', 't/pt-table-checksum/samples/pt-131-wipe.sql');
+   $sb->load_file('source', 't/pt-table-checksum/samples/pt-131-wipe.sql');
 }
 $sb->wipe_clean($dbh);
 ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox");
diff --git a/t/pt-table-checksum/pt-136.t b/t/pt-table-checksum/pt-136.t
index 6d02a8e7d..dd42a74d1 100644
--- a/t/pt-table-checksum/pt-136.t
+++ b/t/pt-table-checksum/pt-136.t
@@ -18,20 +18,20 @@ require "$trunk/bin/pt-table-checksum";
 
 my $dp  = new DSNParser(opts=>$dsn_opts);
 my $sb  = new Sandbox(basedir => '/tmp', DSNParser => $dp);
-my $dbh = $sb->get_dbh_for('master');
+my $dbh = $sb->get_dbh_for('source');
 
 if ( !$dbh ) {
-   plan skip_all => 'Cannot connect to sandbox master';
+   plan skip_all => 'Cannot connect to sandbox source';
 }
 else {
    plan tests => 2;
 }
 
 $dbh->do("DROP TABLE IF EXISTS percona.checksums");
-$sb->load_file('master', 't/pt-table-checksum/samples/pt-136.sql');
-$sb->wait_for_slaves();
-my $master_dsn = $sb->dsn_for('master');
-my @args       = ($master_dsn, '--databases', 'db1', '--no-replicate-check'); 
+$sb->load_file('source', 't/pt-table-checksum/samples/pt-136.sql');
+$sb->wait_for_replicas();
+my $source_dsn = $sb->dsn_for('source');
+my @args       = ($source_dsn, '--databases', 'db1', '--no-replicate-check'); 
 my $output;
 my $exit_status;
 
diff --git a/t/pt-table-checksum/pt-1616.t b/t/pt-table-checksum/pt-1616.t
index a19ddae50..1b9370064 100644
--- a/t/pt-table-checksum/pt-1616.t
+++ b/t/pt-table-checksum/pt-1616.t
@@ -22,17 +22,17 @@ require "$trunk/bin/pt-table-checksum";
 
 my $dp  = new DSNParser(opts=>$dsn_opts);
 my $sb  = new Sandbox(basedir => '/tmp', DSNParser => $dp);
-my $dbh = $sb->get_dbh_for('master');
+my $dbh = $sb->get_dbh_for('source');
 
 if ( !$dbh ) {
-    plan skip_all => 'Cannot connect to sandbox master';
+    plan skip_all => 'Cannot connect to sandbox source';
 }
 else {
     plan tests => 4;
 }
 
 diag("loading samples");
-$sb->load_file('master', 't/pt-table-checksum/samples/pt-1616.sql');
+$sb->load_file('source', 't/pt-table-checksum/samples/pt-1616.sql');
 
 my $num_rows = 50000;
 diag("Loading $num_rows rows into the table. This might take some time.");
@@ -56,9 +56,9 @@ $dbh->do('INSERT INTO junk.pt_test_100 (id1, id2) VALUES(UNHEX("F96DD7"), UNHEX(
 
 # 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 = $sb->dsn_for('master');
+my $source_dsn = $sb->dsn_for('source');
 
-my @args = ($master_dsn, "--set-vars", "innodb_lock_wait_timeout=50", 
+my @args = ($source_dsn, "--set-vars", "innodb_lock_wait_timeout=50", 
     "--ignore-databases", "mysql", "--no-check-binlog-format", 
     "--chunk-size", "1", 
     "--empty-replicate-table", "--run-time", "2s"
@@ -76,12 +76,12 @@ is(
     $exit_status,
     0,
     "PT-1616 pt-table-cheksum before --resume with binary fields exit status",
-);
+) or diag("$exit_status\n", $output);
 
 @args = ("--set-vars", "innodb_lock_wait_timeout=50", 
     "--ignore-databases", "mysql", "--no-check-binlog-format", 
     "--chunk-size", "1", 
-    "--resume", "--run-time", "5s", $master_dsn
+    "--resume", "--run-time", "5s", $source_dsn
 );
 
 $output = output(
diff --git a/t/pt-table-checksum/pt-1637.t b/t/pt-table-checksum/pt-1637.t
index 41382a035..794928b50 100644
--- a/t/pt-table-checksum/pt-1637.t
+++ b/t/pt-table-checksum/pt-1637.t
@@ -21,40 +21,40 @@ plan skip_all => 'Disabled until PT-2174 is fixed';
 my $dp  = new DSNParser(opts=>$dsn_opts);
 my $sb  = new Sandbox(basedir => '/tmp', DSNParser => $dp);
 
-diag ('Starting second sandbox master');
-my ($master1_dbh, $master1_dsn) = $sb->start_sandbox(
-   server => 'chan_master1',
-   type   => 'master',
+diag ('Starting second sandbox source');
+my ($source1_dbh, $source1_dsn) = $sb->start_sandbox(
+   server => 'chan_source1',
+   type   => 'source',
 );
 
-diag ('Starting second sandbox slave 1');
-my ($slave1_dbh, $slave1_dsn) = $sb->start_sandbox(
-   server => 'chan_slave1',
-   type   => 'slave',
-   master => 'chan_master1',
+diag ('Starting second sandbox replica 1');
+my ($replica1_dbh, $replica1_dsn) = $sb->start_sandbox(
+   server => 'chan_replica1',
+   type   => 'replica',
+   source => 'chan_source1',
 );
 
-diag ('Starting second sandbox slave 2');
-my ($slave2_dbh, $slave2_dsn) = $sb->start_sandbox(
-   server => 'chan_slave2',
-   type   => 'slave',
-   master => 'chan_master1',
+diag ('Starting second sandbox replica 2');
+my ($replica2_dbh, $replica2_dsn) = $sb->start_sandbox(
+   server => 'chan_replica2',
+   type   => 'replica',
+   source => 'chan_source1',
 );
 
-my $dbh = $sb->get_dbh_for('master');
+my $dbh = $sb->get_dbh_for('source');
 
 if ( !$dbh ) {
-    plan skip_all => 'Cannot connect to sandbox master';
+    plan skip_all => 'Cannot connect to sandbox source';
 }
 else {
     plan tests => 2;
 }
 
 diag("loading samples");
-$sb->load_file('chan_master1', 't/pt-table-checksum/samples/pt-1637.sql');
+$sb->load_file('chan_source1', 't/pt-table-checksum/samples/pt-1637.sql');
 
 
-my @args = ($master1_dsn, 
+my @args = ($source1_dsn, 
     "--set-vars", "innodb_lock_wait_timeout=50", 
     "--ignore-databases", "mysql", "--no-check-binlog-format", 
     "--recursion-method", "dsn=h=127.0.0.1,D=test,t=dsns",
@@ -63,7 +63,7 @@ my @args = ($master1_dsn,
 
 # 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.
-$sb->do_as_root("chan_slave1", 'stop slave IO_thread;');
+$sb->do_as_root("chan_replica1", 'stop ${replica_name} IO_thread;');
 
 my $output;
 my $exit_status;
@@ -79,10 +79,10 @@ is(
     "PT-1637 exist status 128 if replication is stopped and --fail-on-replication-stopped",
 );
 
-$sb->do_as_root("chan_slave1", 'start slave IO_thread;');
+$sb->do_as_root("chan_replica1", 'start ${replica_name} IO_thread;');
 sleep(2);
 
-$sb->stop_sandbox(qw(chan_master1 chan_slave2 chan_slave1));
+$sb->stop_sandbox(qw(chan_source1 chan_replica2 chan_replica1));
 
 # #############################################################################
 # Done.
diff --git a/t/pt-table-checksum/pt-1728.t b/t/pt-table-checksum/pt-1728.t
index d7e584f78..1723d1e3c 100644
--- a/t/pt-table-checksum/pt-1728.t
+++ b/t/pt-table-checksum/pt-1728.t
@@ -22,10 +22,10 @@ require "$trunk/bin/pt-table-checksum";
 
 my $dp  = new DSNParser(opts=>$dsn_opts);
 my $sb  = new Sandbox(basedir => '/tmp', DSNParser => $dp);
-my $dbh = $sb->get_dbh_for('master');
+my $dbh = $sb->get_dbh_for('source');
 
 if ( !$dbh ) {
-   plan skip_all => 'Cannot connect to sandbox master';
+   plan skip_all => 'Cannot connect to sandbox source';
 }
 else {
    plan tests => 2;
@@ -44,17 +44,17 @@ sub start_thread {
    my ($dsn_opts, $initial_sleep_time) = @_;
    my $dp = new DSNParser(opts=>$dsn_opts);
    my $sb = new Sandbox(basedir => '/tmp', DSNParser => $dp);
-   my $master_dbh = $sb->get_dbh_for('master');
-   my $slave_dbh = $sb->get_dbh_for('slave1');
+   my $source_dbh = $sb->get_dbh_for('source');
+   my $replica_dbh = $sb->get_dbh_for('replica1');
    diag("Sleeping");
    sleep($initial_sleep_time);
    diag("Woke up");
-   $slave_dbh->do("STOP SLAVE IO_THREAD FOR CHANNEL ''");
-   $slave_dbh->do("STOP SLAVE");
-   $master_dbh->do("TRUNCATE TABLE test.$table");
+   $replica_dbh->do("STOP ${replica_name} IO_THREAD FOR CHANNEL ''");
+   $replica_dbh->do("STOP ${replica_name}");
+   $source_dbh->do("TRUNCATE TABLE test.$table");
    # PTDEBUG && diag("Exit thread")
    sleep(2);
-   $slave_dbh->do("START SLAVE");
+   $replica_dbh->do("START ${replica_name}");
    diag("Exit thread")
 }
 # This is not a realiable sleep value. It works for a i7, hybrid HDD
@@ -66,8 +66,8 @@ diag("Starting checksum");
 # 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.
 # And --max-load "" prevents waiting for status variables.
-my $master_dsn = 'h=127.1,P=12345,u=msandbox,p=msandbox';
-my @args       = ($master_dsn, qw(--no-check-binlog-format --chunk-size 10)); 
+my $source_dsn = 'h=127.1,P=12345,u=msandbox,p=msandbox';
+my @args       = ($source_dsn, qw(--no-check-binlog-format --chunk-size 10)); 
 my $output;
 
 $output = output(
diff --git a/t/pt-table-checksum/pt-173.t b/t/pt-table-checksum/pt-173.t
index 379596047..c757a2b2a 100644
--- a/t/pt-table-checksum/pt-173.t
+++ b/t/pt-table-checksum/pt-173.t
@@ -18,21 +18,21 @@ require "$trunk/bin/pt-table-checksum";
 
 my $dp  = new DSNParser(opts=>$dsn_opts);
 my $sb  = new Sandbox(basedir => '/tmp', DSNParser => $dp);
-my $dbh = $sb->get_dbh_for('master');
+my $dbh = $sb->get_dbh_for('source');
 
 if ( !$dbh ) {
-   plan skip_all => 'Cannot connect to sandbox master';
+   plan skip_all => 'Cannot connect to sandbox source';
 }
 else {
    plan tests => 4;
 }
 
-$sb->load_file('master', 't/pt-table-checksum/samples/PT-173.sql');
+$sb->load_file('source', 't/pt-table-checksum/samples/PT-173.sql');
 # 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.
 # And --max-load "" prevents waiting for status variables.
-my $master_dsn = $sb->dsn_for('master');
-my @args       = ($master_dsn, "--resume", "--truncate-replicate-table"); 
+my $source_dsn = $sb->dsn_for('source');
+my @args       = ($source_dsn, "--resume", "--truncate-replicate-table"); 
 my $output;
 my $exit_status;
 
@@ -49,7 +49,7 @@ isnt(
 );
 
 # Test #2 
-@args       = ($master_dsn, "--truncate-replicate-table"); 
+@args       = ($source_dsn, "--truncate-replicate-table"); 
 $output = output(
    sub { $exit_status = pt_table_checksum::main(@args) },
    stderr => 1,
@@ -64,9 +64,9 @@ is(
 );
 
 # Test #3 
-$sb->load_file('master', 't/pt-table-checksum/samples/PT-173.sql');
+$sb->load_file('source', 't/pt-table-checksum/samples/PT-173.sql');
 
-@args       = ($master_dsn, "--truncate-replicate-table", "--empty-replicate-table"); 
+@args       = ($source_dsn, "--truncate-replicate-table", "--empty-replicate-table"); 
 $output = output(
    sub { $exit_status = pt_table_checksum::main(@args) },
    stderr => 1,
diff --git a/t/pt-table-checksum/pt-1766.t b/t/pt-table-checksum/pt-1766.t
index 8d77b6ad0..fc141a052 100644
--- a/t/pt-table-checksum/pt-1766.t
+++ b/t/pt-table-checksum/pt-1766.t
@@ -22,11 +22,11 @@ require "$trunk/bin/pt-table-checksum";
 
 my $dp  = new DSNParser(opts=>$dsn_opts);
 my $sb  = new Sandbox(basedir => '/tmp', DSNParser => $dp);
-my $dbh = $sb->get_dbh_for('master');
-my $slave1_dbh = $sb->get_dbh_for('slave1');
+my $dbh = $sb->get_dbh_for('source');
+my $replica1_dbh = $sb->get_dbh_for('replica1');
 
 if ( !$dbh ) {
-   plan skip_all => 'Cannot connect to sandbox master';
+   plan skip_all => 'Cannot connect to sandbox source';
 }
 else {
    plan tests => 2;
@@ -40,14 +40,14 @@ $dbh->do("CREATE DATABASE IF NOT EXISTS test");
 $dbh->do("CREATE TABLE `test`.`$table` (id INT PRIMARY KEY AUTO_INCREMENT, name VARCHAR(5)) Engine=InnoDB");
 
 diag(`util/mysql_random_data_load --host=127.0.0.1 --port=12345 --user=msandbox --password=msandbox test $table $num_rows`);
-$slave1_dbh->do("DELETE FROM `test`.`$table` WHERE 1=1");
+$replica1_dbh->do("DELETE FROM `test`.`$table` WHERE 1=1");
 
 diag("Starting checksum");
 # 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.
 # And --max-load "" prevents waiting for status variables.
-my $master_dsn = 'h=127.1,P=12345,u=msandbox,p=msandbox';
-my @args       = ($master_dsn, qw(--no-check-binlog-format --chunk-size 10));
+my $source_dsn = 'h=127.1,P=12345,u=msandbox,p=msandbox';
+my @args       = ($source_dsn, qw(--no-check-binlog-format --chunk-size 10));
 my $output;
 
 $output = output(
diff --git a/t/pt-table-checksum/pt-193.t b/t/pt-table-checksum/pt-193.t
index 34bca666a..abb671938 100644
--- a/t/pt-table-checksum/pt-193.t
+++ b/t/pt-table-checksum/pt-193.t
@@ -18,10 +18,10 @@ require "$trunk/bin/pt-table-checksum";
 
 my $dp  = new DSNParser(opts=>$dsn_opts);
 my $sb  = new Sandbox(basedir => '/tmp', DSNParser => $dp);
-my $dbh = $sb->get_dbh_for('master');
+my $dbh = $sb->get_dbh_for('source');
 
 if ( !$dbh ) {
-   plan skip_all => 'Cannot connect to sandbox master';
+   plan skip_all => 'Cannot connect to sandbox source';
 }
 else {
    plan tests => 3;
@@ -34,13 +34,13 @@ eval {
     $dbh->do("TRUNCATE TABLE percona_test.load_data");
 };
 
-$sb->load_file('master', 't/lib/samples/issue_pt-193_backtick_in_col_comments.sql');
+$sb->load_file('source', 't/lib/samples/issue_pt-193_backtick_in_col_comments.sql');
 
 # 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.
 # And --max-load "" prevents waiting for status variables.
-my $master_dsn = $sb->dsn_for('master');
-my @args       = ($master_dsn, "--set-vars", "innodb_lock_wait_timeout=50", 
+my $source_dsn = $sb->dsn_for('source');
+my @args       = ($source_dsn, "--set-vars", "innodb_lock_wait_timeout=50", 
                                "--no-check-binlog-format", "--ignore-databases", "mysql",
                                "--nocheck-replication-filters"); 
 my $output;
diff --git a/t/pt-table-checksum/pt-204.t b/t/pt-table-checksum/pt-204.t
index 09b548c01..b5ce649eb 100644
--- a/t/pt-table-checksum/pt-204.t
+++ b/t/pt-table-checksum/pt-204.t
@@ -18,23 +18,23 @@ require "$trunk/bin/pt-table-checksum";
 
 my $dp  = new DSNParser(opts=>$dsn_opts);
 my $sb  = new Sandbox(basedir => '/tmp', DSNParser => $dp);
-my $dbh = $sb->get_dbh_for('master');
+my $dbh = $sb->get_dbh_for('source');
 
 if ( !$dbh ) {
-    plan skip_all => 'Cannot connect to sandbox master';
-} elsif (!$sb->has_engine('master', 'ROCKSDB')) {
+    plan skip_all => 'Cannot connect to sandbox source';
+} elsif (!$sb->has_engine('source', 'ROCKSDB')) {
     plan skip_all => 'These tests need RocksDB';
 } else {
     plan tests => 9;
 }
 
-$sb->load_file('master', 't/pt-table-checksum/samples/pt-204.sql');
+$sb->load_file('source', 't/pt-table-checksum/samples/pt-204.sql');
 
 # 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.
 # And --max-load "" prevents waiting for status variables.
-my $master_dsn = $sb->dsn_for('master');
-my @args       = ($master_dsn, "--set-vars", "innodb_lock_wait_timeout=50", 
+my $source_dsn = $sb->dsn_for('source');
+my @args       = ($source_dsn, "--set-vars", "innodb_lock_wait_timeout=50", 
                                "--no-check-binlog-format"); 
 my ($output, $exit_status);
 
diff --git a/t/pt-table-checksum/pt-225.t b/t/pt-table-checksum/pt-225.t
index b968fcbfd..c0f24f49c 100644
--- a/t/pt-table-checksum/pt-225.t
+++ b/t/pt-table-checksum/pt-225.t
@@ -18,10 +18,10 @@ require "$trunk/bin/pt-table-checksum";
 
 my $dp  = new DSNParser(opts=>$dsn_opts);
 my $sb  = new Sandbox(basedir => '/tmp', DSNParser => $dp);
-my $dbh = $sb->get_dbh_for('master');
+my $dbh = $sb->get_dbh_for('source');
 
 if ( !$dbh ) {
-   plan skip_all => 'Cannot connect to sandbox master';
+   plan skip_all => 'Cannot connect to sandbox source';
 } elsif ($sandbox_version lt '5.7') {
    plan skip_all => "Generated columns are only available in MySQL 5.7+";
 } else {
@@ -30,20 +30,20 @@ if ( !$dbh ) {
 
 diag("loading samples");
 
-$sb->load_file('master', 't/pt-table-checksum/samples/pt-225.sql');
+$sb->load_file('source', 't/pt-table-checksum/samples/pt-225.sql');
 
 # 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.
 # And --max-load "" prevents waiting for status variables.
-my $master_dsn = $sb->dsn_for('master');
-diag("setting up the slaves");
-my $slave_dbh = $sb->get_dbh_for('slave1');
+my $source_dsn = $sb->dsn_for('source');
+diag("setting up the replicas");
+my $replica_dbh = $sb->get_dbh_for('replica1');
 # Create differences
 
-$slave_dbh->do('DELETE FROM `test`.`sbtest1` WHERE id > 15');
-$slave_dbh->do('FLUSH TABLES');
+$replica_dbh->do('DELETE FROM `test`.`sbtest1` WHERE id > 15');
+$replica_dbh->do('FLUSH TABLES');
 
-my @args       = ($master_dsn, "--set-vars", "innodb_lock_wait_timeout=50", 
+my @args       = ($source_dsn, "--set-vars", "innodb_lock_wait_timeout=50", 
                                "--ignore-databases", "mysql,sys,sakila,percona_test",
                                "--nocheck-replication-filters"); 
 my $output;
diff --git a/t/pt-table-checksum/pt-226.t b/t/pt-table-checksum/pt-226.t
index 635e6b492..e2e70063a 100644
--- a/t/pt-table-checksum/pt-226.t
+++ b/t/pt-table-checksum/pt-226.t
@@ -18,31 +18,31 @@ require "$trunk/bin/pt-table-checksum";
 
 my $dp  = new DSNParser(opts=>$dsn_opts);
 my $sb  = new Sandbox(basedir => '/tmp', DSNParser => $dp);
-my $dbh = $sb->get_dbh_for('master');
+my $dbh = $sb->get_dbh_for('source');
 
 if ( !$dbh ) {
-   plan skip_all => 'Cannot connect to sandbox master';
+   plan skip_all => 'Cannot connect to sandbox source';
 }
 else {
    plan tests => 3;
 }
 
 diag("loading samples");
-$sb->load_file('master', 't/pt-table-checksum/samples/pt-226.sql');
+$sb->load_file('source', 't/pt-table-checksum/samples/pt-226.sql');
 
 # 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.
 # And --max-load "" prevents waiting for status variables.
-my $master_dsn = $sb->dsn_for('master');
-diag("setting up the slaves");
-my $slave_dbh = $sb->get_dbh_for('slave1');
+my $source_dsn = $sb->dsn_for('source');
+diag("setting up the replicas");
+my $replica_dbh = $sb->get_dbh_for('replica1');
 # Create differences
 
-$slave_dbh->do('DELETE FROM `test`.`joinit` WHERE i > 90');
-$slave_dbh->do('FLUSH TABLES');
+$replica_dbh->do('DELETE FROM `test`.`joinit` WHERE i > 90');
+$replica_dbh->do('FLUSH TABLES');
 $dbh->do('SET GLOBAL binlog_format="ROW"');
 
-my @args       = ($master_dsn, "--set-vars", "innodb_lock_wait_timeout=50", 
+my @args       = ($source_dsn, "--set-vars", "innodb_lock_wait_timeout=50", 
                                "--ignore-databases", "mysql",
                                "--nocheck-replication-filters"); 
 my $output;
diff --git a/t/pt-table-checksum/pxc.t b/t/pt-table-checksum/pxc.t
index b4ae037a3..7632f1e6a 100644
--- a/t/pt-table-checksum/pxc.t
+++ b/t/pt-table-checksum/pxc.t
@@ -13,8 +13,8 @@ use Test::More;
 use Data::Dumper;
 
 # 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;
 
@@ -67,7 +67,7 @@ my $sample  = "t/pt-table-checksum/samples/";
 
 # This DSN table has node2 and node3 (12346 and 12347) but not node1 (12345)
 # because it was originally created for traditional setups which require only
-# slave DSNs, but the DSN table for a PXC setup can/should contain DSNs for
+# replica DSNs, but the DSN table for a PXC setup can/should contain DSNs for
 # all nodes so the user can run pxc on any node and find all the others.
 $sb->load_file('node1', "$sample/dsn-table.sql");
 $node1->do(qq/INSERT INTO dsns.dsns VALUES (1, 1, '$node1_dsn')/);
@@ -261,32 +261,32 @@ test_recursion_methods(1);
 
 
 # #############################################################################
-# cluster, node1 -> slave, run on node1
+# cluster, node1 -> replica, run on node1
 # #############################################################################
 
-my ($slave_dbh, $slave_dsn) = $sb->start_sandbox(
-   server => 'cslave1',
-   type   => 'slave',
-   master => 'node1',
+my ($replica_dbh, $replica_dsn) = $sb->start_sandbox(
+   server => 'creplica1',
+   type   => 'replica',
+   source => 'node1',
    env    => q/BINLOG_FORMAT="ROW"/,
 );
 
-# Add the slave to the DSN table.
-$node1->do(qq/INSERT INTO dsns.dsns VALUES (4, 3, '$slave_dsn')/);
+# Add the replica to the DSN table.
+$node1->do(qq/INSERT INTO dsns.dsns VALUES (4, 3, '$replica_dsn')/);
 
 # Fix what we changed earlier on node2 so the cluster is consistent.
 $node2->do("set wsrep_on=0");
 $node2->do("update test.t set c='z' where c='zebra'");
 $node2->do("set wsrep_on=1");
 
-# Wait for the slave to apply the binlogs from node1 (its master).
+# Wait for the replica to apply the binlogs from node1 (its source).
 # Then change it so it's not consistent.
-PerconaTest::wait_for_table($slave_dbh, 'test.t');
-$sb->wait_for_slaves(master => 'node1', slave => 'cslave1');
-$slave_dbh->do("update test.t set c='zebra' where c='z'");
+PerconaTest::wait_for_table($replica_dbh, 'test.t');
+$sb->wait_for_replicas(source => 'node1', replica => 'creplica1');
+$replica_dbh->do("update test.t set c='zebra' where c='z'");
 
-# Another quick test first: the tool should complain about the slave's
-# binlog format but only the slave's, not the cluster nodes:
+# Another quick test first: the tool should complain about the replica's
+# binlog format but only the replica's, not the cluster nodes:
 # https://bugs.launchpad.net/percona-toolkit/+bug/1080385
 # Cluster nodes default to ROW format because that's what Galeara
 # works best with, even though it doesn't really use binlogs.
@@ -297,11 +297,11 @@ for my $args (
 {
    my $test = shift @$args;
 
-   # Wait for the slave to apply the binlogs from node1 (its master).
+   # Wait for the replica to apply the binlogs from node1 (its source).
    # Then change it so it's not consistent.
-   PerconaTest::wait_for_table($slave_dbh, 'test.t');
-   $sb->wait_for_slaves(master => 'node1', slave => 'cslave1');
-   $slave_dbh->do("update test.t set c='zebra' where c='z'");
+   PerconaTest::wait_for_table($replica_dbh, 'test.t');
+   $sb->wait_for_replicas(source => 'node1', replica => 'creplica1');
+   $replica_dbh->do("update test.t set c='zebra' where c='z'");
 
    $output = output(
       sub { pt_table_checksum::main(@args,
@@ -313,10 +313,10 @@ for my $args (
    like(
       $output,
       qr/replica h=127(?:\Q.0.0\E)?\.1,P=12348 has binlog_format ROW/i,
-      "--check-binlog-format warns about slave's binlog format ($test)"
+      "--check-binlog-format warns about replica's binlog format ($test)"
    );
    
-   # Now really test that diffs on the slave are detected.
+   # Now really test that diffs on the replica are detected.
    $output = output(
       sub { pt_table_checksum::main(@args,
          @$args,
@@ -328,43 +328,43 @@ for my $args (
    is(
       PerconaTest::count_checksum_results($output, 'diffs'),
       1,
-      "Detects diffs on slave of cluster node1 ($test)"
+      "Detects diffs on replica of cluster node1 ($test)"
    ) or diag($output);
 
 }
 
-$slave_dbh->disconnect;
-$sb->stop_sandbox('cslave1');
+$replica_dbh->disconnect;
+$sb->stop_sandbox('creplica1');
 
 # #############################################################################
-# cluster, node2 -> slave, run on node1
+# cluster, node2 -> replica, run on node1
 #
 # Does not work because we only set binglog_format=STATEMENT on node1 which
 # does not affect other nodes, so node2 gets checksum queries in STATEMENT
 # format, executes them, but then logs the results in ROW format (since ROW
-# format is the default for cluster nodes) which doesn't work on the slave
-# (i.e. the slave doesn't execute the query).  So any diffs on the slave are
+# format is the default for cluster nodes) which doesn't work on the replica
+# (i.e. the replica doesn't execute the query).  So any diffs on the replica are
 # not detected.
 # #############################################################################
 
-($slave_dbh, $slave_dsn) = $sb->start_sandbox(
-   server => 'cslave1',
-   type   => 'slave',
-   master => 'node2',
+($replica_dbh, $replica_dsn) = $sb->start_sandbox(
+   server => 'creplica1',
+   type   => 'replica',
+   source => 'node2',
    env    => q/BINLOG_FORMAT="ROW"/,
 );
 
-# Wait for the slave to apply the binlogs from node2 (its master).
+# Wait for the replica to apply the binlogs from node2 (its source).
 # Then change it so it's not consistent.
-PerconaTest::wait_for_table($slave_dbh, 'test.t');
-$sb->wait_for_slaves(master => 'node1', slave => 'cslave1');
-$slave_dbh->do("update test.t set c='zebra' where c='z'");
+PerconaTest::wait_for_table($replica_dbh, 'test.t');
+$sb->wait_for_replicas(source => 'node1', replica => 'creplica1');
+$replica_dbh->do("update test.t set c='zebra' where c='z'");
 
-($row) = $slave_dbh->selectrow_array("select c from test.t order by c desc limit 1");
+($row) = $replica_dbh->selectrow_array("select c from test.t order by c desc limit 1");
 is(
    $row,
    "zebra",
-   "Slave is changed"
+   "Replica is changed"
 );
 
 for my $args (
@@ -385,66 +385,66 @@ for my $args (
    is(
       PerconaTest::count_checksum_results($output, 'diffs'),
       0,
-      "Limitation: does not detect diffs on slave of cluster node2 ($test)"
+      "Limitation: does not detect diffs on replica of cluster node2 ($test)"
    ) or diag($output);
 }
    
-$slave_dbh->disconnect;
-$sb->stop_sandbox('cslave1');
+$replica_dbh->disconnect;
+$sb->stop_sandbox('creplica1');
 
 # Restore the original DSN table.
 $node1->do(qq/DELETE FROM dsns.dsns WHERE id=4/);
 
 # #############################################################################
-# master -> node1 in cluster, run on master
+# source -> node1 in cluster, run on source
 # #############################################################################
 
-# CAREFUL: The master and the cluster are different, so don't do stuff
-# on the master that will conflict with stuff already done on the cluster.
-# And since we're using RBR, we have to do a lot of stuff on the master
+# CAREFUL: The source and the cluster are different, so don't do stuff
+# on the source that will conflict with stuff already done on the cluster.
+# And since we're using RBR, we have to do a lot of stuff on the source
 # again, manually, because REPLACE and INSERT IGNORE don't work in RBR
 # like they do SBR.
 
-my ($master_dbh, $master_dsn) = $sb->start_sandbox(
-   server => 'cmaster',
-   type   => 'master',
+my ($source_dbh, $source_dsn) = $sb->start_sandbox(
+   server => 'csource',
+   type   => 'source',
    env    => q/BINLOG_FORMAT="ROW"/,
 );
 
-# Since master is new, node1 shouldn't have binlog to replay.
-$sb->set_as_slave('node1', 'cmaster');
+# Since source is new, node1 shouldn't have binlog to replay.
+$sb->set_as_replica('node1', 'csource');
 
 # We have to load a-z-cluster.sql else the pk id won'ts match because nodes use
-# auto-inc offsets but the master doesn't.
-$sb->load_file('cmaster', "$sample/a-z-cluster.sql", undef, no_wait => 1);
+# auto-inc offsets but the source doesn't.
+$sb->load_file('csource', "$sample/a-z-cluster.sql", undef, no_wait => 1);
 
-# Do this stuff manually and only on the master because node1/the cluster
+# Do this stuff manually and only on the source because node1/the cluster
 # already has it, and due to RBR, we can't do it other ways.
-$master_dbh->do("SET sql_log_bin=0");
+$source_dbh->do("SET sql_log_bin=0");
 
-# This DSN table does not include 12345 (node1/slave) intentionally,
+# This DSN table does not include 12345 (node1/replica) intentionally,
 # so a later test can auto-find 12345 then warn "Diffs will only be
 # detected if the cluster is consistent with h=127.1,P=12345...".
-$master_dbh->do("CREATE DATABASE dsns");
-$master_dbh->do("CREATE TABLE dsns.dsns (
+$source_dbh->do("CREATE DATABASE dsns");
+$source_dbh->do("CREATE TABLE dsns.dsns (
   id int auto_increment primary key,
   parent_id int default null,
   dsn varchar(255) not null
 )");
-$master_dbh->do("INSERT INTO dsns.dsns VALUES
+$source_dbh->do("INSERT INTO dsns.dsns VALUES
   (2, 1,    'h=127.1,P=12346,u=msandbox,p=msandbox'),
   (3, 2,    'h=127.1,P=12347,u=msandbox,p=msandbox')");
 
-$master_dbh->do("INSERT INTO percona_test.sentinel (id, ping) VALUES (1, '')");
-$master_dbh->do("SET sql_log_bin=1");
+$source_dbh->do("INSERT INTO percona_test.sentinel (id, ping) VALUES (1, '')");
+$source_dbh->do("SET sql_log_bin=1");
 
-$sb->wait_for_slaves(master => 'cmaster', slave => 'node1');
+$sb->wait_for_replicas(source => 'csource', replica => 'node1');
 
-# Notice: no --recursion-method=dsn yet.  Since node1 is a traditional slave
-# of the master, ptc should auto-detect it, which we'll test later by making
-# the slave differ.
+# Notice: no --recursion-method=dsn yet.  Since node1 is a traditional replica
+# of the source, ptc should auto-detect it, which we'll test later by making
+# the replica differ.
 $output = output(
-   sub { pt_table_checksum::main($master_dsn,
+   sub { pt_table_checksum::main($source_dsn,
       qw(-d test))
    },
    stderr => 1,
@@ -453,19 +453,19 @@ $output = output(
 is(
    PerconaTest::count_checksum_results($output, 'errors'),
    0,
-   "master->cluster no diffs: no errors"
+   "source->cluster no diffs: no errors"
 );
 
 is(
    PerconaTest::count_checksum_results($output, 'skipped'),
    0,
-   "master->cluster no diffs: no skips"
+   "source->cluster no diffs: no skips"
 );
 
 is(
    PerconaTest::count_checksum_results($output, 'diffs'),
    0,
-   "master->cluster no diffs: no diffs"
+   "source->cluster no diffs: no diffs"
 ) or diag($output);
 
 # Make a diff on node1.  If ptc is really auto-detecting node1, then it
@@ -475,7 +475,7 @@ $node1->do("update test.t set c='zebra' where c='z'");
 $node1->do("set wsrep_on=1");
 
 $output = output(
-   sub { pt_table_checksum::main($master_dsn,
+   sub { pt_table_checksum::main($source_dsn,
       qw(-d test))
    },
    stderr => 1,
@@ -484,19 +484,19 @@ $output = output(
 is(
    PerconaTest::count_checksum_results($output, 'errors'),
    0,
-   "master->cluster 1 diff: no errors"
+   "source->cluster 1 diff: no errors"
 );
 
 is(
    PerconaTest::count_checksum_results($output, 'skipped'),
    0,
-   "master->cluster 1 diff: no skips"
+   "source->cluster 1 diff: no skips"
 );
 
 is(
    PerconaTest::count_checksum_results($output, 'diffs'),
    1,
-   "master->cluster 1 diff: 1 diff"
+   "source->cluster 1 diff: 1 diff"
 ) or diag($output);
 
 # 11-17T13:02:54      0      1       26       1       0   0.021 test.t
@@ -512,17 +512,17 @@ like(
       \S+\s+   # time
       test.t$  # table
    /xm,
-   "master->cluster 1 diff: it's in test.t"
+   "source->cluster 1 diff: it's in test.t"
 );
 
 # Use the DSN table to check for diffs on node2 and node3.  This works
-# because the diff is on node1 and node1 is the direct slave of the master,
-# so the checksum query will replicate from the master in STATEMENT format,
+# because the diff is on node1 and node1 is the direct replica of the source,
+# so the checksum query will replicate from the source in STATEMENT format,
 # node1 will execute it, find the diff, then broadcast that result to all
-# other nodes. -- Remember: the DSN table on the master has node2 and node3.
+# other nodes. -- Remember: the DSN table on the source has node2 and node3.
 $output = output(
-   sub { pt_table_checksum::main($master_dsn,
-      '--recursion-method', "dsn=$master_dsn,D=dsns,t=dsns",
+   sub { pt_table_checksum::main($source_dsn,
+      '--recursion-method', "dsn=$source_dsn,D=dsns,t=dsns",
       qw(-d test))
    },
    stderr => 1,
@@ -565,7 +565,7 @@ like(
 like(
    $output,
    qr/the direct replica of h=$ip,P=12349 was not found or specified/,
-   "Warns that direct replica of the master isn't found or specified",
+   "Warns that direct replica of the source isn't found or specified",
 );
 
 # Use the other DSN table with all three nodes.  Now the tool should
@@ -586,7 +586,7 @@ for my $args (
    $node1->do("set wsrep_on=1");
    
    $output = output(
-      sub { pt_table_checksum::main($master_dsn,
+      sub { pt_table_checksum::main($source_dsn,
          @$args,
          qw(-d test))
       },
@@ -658,7 +658,7 @@ for my $args (
    # the other DSN table with all three nodes, but it won't matter because
    # node1 is going to broadcast the false-positive that there are no diffs.
    $output = output(
-      sub { pt_table_checksum::main($master_dsn,
+      sub { pt_table_checksum::main($source_dsn,
          @$args,
          qw(-d test))
       },
@@ -674,16 +674,16 @@ for my $args (
 }
 
 # ###########################################################################
-# Be sure to stop the slave on node1, else further test will die with:
-# Failed to execute -e "change master to master_host='127.0.0.1',
-# master_user='msandbox', master_password='msandbox', master_port=12349"
+# Be sure to stop the replica on node1, else further test will die with:
+# Failed to execute -e "change source to source_host='127.0.0.1',
+# source_user='msandbox', source_password='msandbox', source_port=12349"
 # on node1: ERROR 1198 (HY000) at line 1: This operation cannot be performed
-# with a running slave; run STOP SLAVE first
+# with a running replica; run STOP REPLICA first
 # ###########################################################################
-$master_dbh->disconnect;
-$sb->stop_sandbox('cmaster');
-$node1->do("STOP SLAVE");
-$node1->do("RESET SLAVE");
+$source_dbh->disconnect;
+$sb->stop_sandbox('csource');
+$node1->do("STOP ${replica_name}");
+$node1->do("RESET ${replica_name}");
 
 # #############################################################################
 # cluster -> cluster
diff --git a/t/pt-table-checksum/replication_filters.t b/t/pt-table-checksum/replication_filters.t
index cfda31f58..8b8958e28 100644
--- a/t/pt-table-checksum/replication_filters.t
+++ b/t/pt-table-checksum/replication_filters.t
@@ -17,8 +17,8 @@ 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;
 
@@ -30,19 +30,19 @@ use Data::Dumper;
 
 my $dp = new DSNParser(opts=>$dsn_opts);
 my $sb = new Sandbox(basedir => '/tmp', DSNParser => $dp);
-my $master_dbh = $sb->get_dbh_for('master');
-my $sb_version = VersionParser->new($master_dbh);
-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 $sb_version = VersionParser->new($source_dbh);
+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 ( !$slave2_dbh ) {
-   plan skip_all => 'Cannot connect to sandbox slave2';
+elsif ( !$replica2_dbh ) {
+   plan skip_all => 'Cannot connect to sandbox replica2';
 }
 else {
    plan tests => 12;
@@ -51,26 +51,26 @@ else {
 # 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.
 # And --max-load "" prevents waiting for status variables.
-my $master_dsn = 'h=127.1,P=12345,u=msandbox,p=msandbox';
-my @args       = ($master_dsn, qw(--set-vars innodb_lock_wait_timeout=3), '--max-load', '');
+my $source_dsn = 'h=127.1,P=12345,u=msandbox,p=msandbox,s=1';
+my @args       = ($source_dsn, qw(--set-vars innodb_lock_wait_timeout=3), '--max-load', '');
 my $output;
 my $row;
 
-# You must call this sub if the master 12345 or slave1 12346 is restarted,
-# else a slave might notice that its master went away and enter the "trying
+# You must call this sub if the source 12345 or replica1 12346 is restarted,
+# else a replica might notice that its source went away and enter the "trying
 # to reconnect" state, and then replication will break as the tests continue.
-sub restart_slave_threads {
-   $slave1_dbh->do('STOP SLAVE');
-   $slave2_dbh->do('STOP SLAVE');
-   $slave1_dbh->do('START SLAVE');
-   $slave2_dbh->do('START SLAVE');
+sub restart_replica_threads {
+   $replica1_dbh->do("STOP ${replica_name}");
+   $replica2_dbh->do("STOP ${replica_name}");
+   $replica1_dbh->do("START ${replica_name}");
+   $replica2_dbh->do("START ${replica_name}");
 }
 
 # #############################################################################
-# Repl filters on all slaves, at all depths, should be found.
+# Repl filters on all replicas, at all depths, should be found.
 # #############################################################################
 
-# Add a replication filter to the slaves.
+# Add a replication filter to the replicas.
 diag('Stopping 12346 and 12347 to reconfigure them with replication filters');
 diag(`/tmp/12347/stop >/dev/null`);
 diag(`/tmp/12346/stop >/dev/null`);
@@ -79,10 +79,10 @@ for my $port ( qw(12346 12347) ) {
    diag(`echo "replicate-ignore-db=foo" >> /tmp/$port/my.sandbox.cnf`);
    diag(`/tmp/$port/start >/dev/null`);
 }
-$slave1_dbh = $sb->get_dbh_for('slave1');
-$slave2_dbh = $sb->get_dbh_for('slave2');
+$replica1_dbh = $sb->get_dbh_for('replica1');
+$replica2_dbh = $sb->get_dbh_for('replica2');
 
-my $pos = PerconaTest::get_master_binlog_pos($master_dbh);
+my $pos = PerconaTest::get_source_binlog_pos($source_dbh);
 
 $output = output(
    sub { pt_table_checksum::main(@args, qw(-t sakila.country)) },
@@ -90,7 +90,7 @@ $output = output(
 );
 
 is(
-   PerconaTest::get_master_binlog_pos($master_dbh),
+   PerconaTest::get_source_binlog_pos($source_dbh),
    $pos,
    "Did not checksum with replication filter"
 );
@@ -98,13 +98,13 @@ is(
 like(
    $output,
    qr/h=127.0.0.1,P=12346/,
-   "Warns about replication filter on slave1"
+   "Warns about replication filter on replica1"
 );
 
 like(
    $output,
    qr/h=127.0.0.1,P=12347/,
-   "Warns about replication filter on slave2"
+   "Warns about replication filter on replica2"
 );
 
 # Disable the check and run again
@@ -121,29 +121,29 @@ like(
 );
 
 cmp_ok(
-   PerconaTest::get_master_binlog_pos($master_dbh),
+   PerconaTest::get_source_binlog_pos($source_dbh),
    '>',
    $pos,
    "Did checksum with replication filter"
 );
 
-# Remove the replication filter from the slave.
-diag('Restarting the slaves again to remove the replication filters');
+# Remove the replication filter from the replica.
+diag('Restarting the replicas again to remove the replication filters');
 diag(`/tmp/12347/stop >/dev/null`);
 diag(`/tmp/12346/stop >/dev/null`);
 for my $port ( qw(12346 12347) ) {
    diag(`mv /tmp/$port/orig.cnf /tmp/$port/my.sandbox.cnf`);
    diag(`/tmp/$port/start >/dev/null`);
 }
-$slave1_dbh = $sb->get_dbh_for('slave1');
-$slave2_dbh = $sb->get_dbh_for('slave2');
+$replica1_dbh = $sb->get_dbh_for('replica1');
+$replica2_dbh = $sb->get_dbh_for('replica2');
 
 # #############################################################################
 # Issue 982: --empty-replicate-table does not work with binlog-ignore-db
 # #############################################################################
 
-# Write some results to master and slave for dbs mysql and sakila.
-$sb->wipe_clean($master_dbh);
+# Write some results to source and replica for dbs mysql and sakila.
+$sb->wipe_clean($source_dbh);
 $output = output(
    sub {
       pt_table_checksum::main(@args, qw(--chunk-time 0 --chunk-size 100),
@@ -151,17 +151,17 @@ $output = output(
    },
    stderr => 1,
 );
-PerconaTest::wait_for_table($slave1_dbh, 'percona.checksums', "db='sakila' and tbl='city' and chunk=6");
+PerconaTest::wait_for_table($replica1_dbh, 'percona.checksums', "db='sakila' and tbl='city' and chunk=6");
 
-# Add a replication filter to the master: ignore db mysql.
-$master_dbh->disconnect();
+# Add a replication filter to the source: ignore db mysql.
+$source_dbh->disconnect();
 diag('Restarting 12345 to add binlog_ignore_db filter');
 diag(`/tmp/12345/stop >/dev/null`);
 diag(`cp /tmp/12345/my.sandbox.cnf /tmp/12345/orig.cnf`);
 diag(`echo "binlog-ignore-db=mysql" >> /tmp/12345/my.sandbox.cnf`);
 diag(`/tmp/12345/start >/dev/null`);
-restart_slave_threads();
-$master_dbh = $sb->get_dbh_for('master');
+restart_replica_threads();
+$source_dbh = $sb->get_dbh_for('source');
 
 # Checksum the tables again in 1 chunk.  Since db percona isn't being
 # ignored, deleting old results in the repl table should replicate.
@@ -171,20 +171,20 @@ pt_table_checksum::main(@args, qw(--no-check-replication-filters),
    '-t', 'mysql.user,sakila.city', qw(--quiet --no-replicate-check),
    qw(--chunk-size 1000));
 
-PerconaTest::wait_for_table($slave1_dbh, 'percona.checksums', "db='sakila' and tbl='city' and chunk=1");
+PerconaTest::wait_for_table($replica1_dbh, 'percona.checksums', "db='sakila' and tbl='city' and chunk=1");
 
-$row = $slave1_dbh->selectall_arrayref("select db,tbl,chunk from percona.checksums order by db,tbl,chunk");
+$row = $replica1_dbh->selectall_arrayref("select db,tbl,chunk from percona.checksums order by db,tbl,chunk");
 is_deeply(
    $row,
    [[qw(sakila city 1)]],
    "binlog-ignore-db and --empty-replicate-table"
 ) or print STDERR Dumper($row);
 
-$master_dbh->do("use percona");
-$master_dbh->do("truncate table percona.checksums");
+$source_dbh->do("use percona");
+$source_dbh->do("truncate table percona.checksums");
 wait_until(
    sub {
-      $row=$slave1_dbh->selectall_arrayref("select * from percona.checksums");
+      $row=$replica1_dbh->selectall_arrayref("select * from percona.checksums");
       return !@$row;
    }
 );
@@ -193,16 +193,16 @@ wait_until(
 # Test --replicate-database which resulted from this issue.
 # #############################################################################
 
-# Restore original config.  Then add a binlog-do-db filter so master
+# Restore original config.  Then add a binlog-do-db filter so source
 # will only replicate statements when USE mysql is in effect.
-$master_dbh->disconnect();
-diag('Restarting master to reconfigure with binlog-do-db filter only');
+$source_dbh->disconnect();
+diag('Restarting source to reconfigure with binlog-do-db filter only');
 diag(`/tmp/12345/stop >/dev/null`);
 diag(`cp /tmp/12345/orig.cnf /tmp/12345/my.sandbox.cnf`);
 diag(`echo "binlog-do-db=mysql" >> /tmp/12345/my.sandbox.cnf`);
 diag(`/tmp/12345/start >/dev/null`);
-$master_dbh = $sb->get_dbh_for('master');
-restart_slave_threads();
+$source_dbh = $sb->get_dbh_for('source');
+restart_replica_threads();
 
 $output = output(
    sub { pt_table_checksum::main(@args, qw(--no-check-replication-filters),
@@ -213,10 +213,10 @@ $output = output(
 
 # Because we did not use --replicate-database, pt-table-checksum should
 # have done USE mysql before updating the repl table.  Thus, the
-# checksums should show up on the slave.
-PerconaTest::wait_for_table($slave1_dbh, 'percona.checksums', "db='mysql' and tbl='user' and chunk=1");
+# checksums should show up on the replica.
+PerconaTest::wait_for_table($replica1_dbh, 'percona.checksums', "db='mysql' and tbl='user' and chunk=1");
 
-$row = $slave1_dbh->selectall_arrayref("select db,tbl,chunk from percona.checksums order by db,tbl,chunk");
+$row = $replica1_dbh->selectall_arrayref("select db,tbl,chunk from percona.checksums order by db,tbl,chunk");
 is_deeply(
    $row,
    [[qw(mysql user 1)]],
@@ -224,63 +224,74 @@ is_deeply(
 ) or print STDERR Dumper($row);
 
 # Now force --replicate-database sakila and the checksums should not replicate.
-$master_dbh->do("use mysql");
-$master_dbh->do("truncate table percona.checksums");
+$source_dbh->do("use mysql");
+$source_dbh->do("truncate table percona.checksums");
 wait_until(
    sub {
-      $row=$slave1_dbh->selectall_arrayref("select * from percona.checksums");
+      $row=$replica1_dbh->selectall_arrayref("select * from percona.checksums");
       return !@$row;
    }
 );
 
-$pos = PerconaTest::get_master_binlog_pos($master_dbh);
+$pos = PerconaTest::get_source_binlog_pos($source_dbh);
 
 pt_table_checksum::main(@args, qw(--quiet --no-check-replication-filters),
   qw(-t mysql.user --replicate-database sakila --no-replicate-check));
 
-my $pos_after = PerconaTest::get_master_binlog_pos($master_dbh);
+my $pos_after = PerconaTest::get_source_binlog_pos($source_dbh);
 wait_until(
    sub {
-      $pos_after <= PerconaTest::get_slave_pos_relative_to_master($slave1_dbh);
+      $pos_after <= PerconaTest::get_replica_pos_relative_to_source($replica1_dbh);
    }
 );
 
-$row = $slave1_dbh->selectall_arrayref("select * from percona.checksums where db='mysql' AND tbl='user'");
+$row = $replica1_dbh->selectall_arrayref("select * from percona.checksums where db='mysql' AND tbl='user'");
 ok(
    !@$row,
    "binlog-do-db, with --replicate-database"
 ) or print STDERR Dumper($row);
 
 is(
-   PerconaTest::get_master_binlog_pos($master_dbh),
+   PerconaTest::get_source_binlog_pos($source_dbh),
    $pos,
-   "Master pos did not change"
+   "Source pos did not change"
 );
 
 # #############################################################################
 # Check that only the expected dbs are used.
 # #############################################################################
+# Get the source's binlog pos so we can check its binlogs for USE statements
+$row = $source_dbh->selectrow_hashref("show ${source_status} status");
+
+if ( $sandbox_version ge '8.4' ) {
+   $replica1_dbh->do("STOP REPLICA");
+   $replica1_dbh->do("CHANGE REPLICATION FILTER replicate_ignore_db=() ");
+   $replica1_dbh->do("START REPLICA");
+   $replica2_dbh->do("STOP REPLICA");
+   $replica2_dbh->do("CHANGE REPLICATION FILTER replicate_ignore_db=() ");
+   $replica1_dbh->do("START REPLICA");
+}
 
 # Restore the original config.
 diag('Restoring original sandbox server configuration');
-$master_dbh->disconnect();
+$source_dbh->disconnect();
 diag(`/tmp/12345/stop >/dev/null`);
 diag(`mv /tmp/12345/orig.cnf /tmp/12345/my.sandbox.cnf`);
 diag(`/tmp/12345/start >/dev/null`);
-# Restart the slaves so they reconnect immediately.
-restart_slave_threads();
-$master_dbh = $sb->get_dbh_for('master');
+# Restart the replicas so they reconnect immediately.
+restart_replica_threads();
+$source_dbh = $sb->get_dbh_for('source');
 
-# Get the master's binlog pos so we can check its binlogs for USE statements
-$row = $master_dbh->selectrow_hashref('show master status');
+# Get the source's binlog pos so we can check its binlogs for USE statements
+$row = $source_dbh->selectrow_hashref("show ${source_status} status");
 
 pt_table_checksum::main(@args, qw(--quiet));
-my $mysqlbinlog = `which mysqlbinlog`;
-if ( $mysqlbinlog ) {
-   chomp $mysqlbinlog;
-}
-elsif ( -x "$ENV{PERCONA_TOOLKIT_SANDBOX}/bin/mysqlbinlog" ) {
+
+my $mysqlbinlog;
+if ( -x "$ENV{PERCONA_TOOLKIT_SANDBOX}/bin/mysqlbinlog" ) {
    $mysqlbinlog = "$ENV{PERCONA_TOOLKIT_SANDBOX}/bin/mysqlbinlog";
+} elsif ( $mysqlbinlog = `which mysqlbinlog` ) {
+   chomp $mysqlbinlog;
 }
 
 $output = `$mysqlbinlog /tmp/12345/data/$row->{file} --start-position=$row->{position} | grep 'use ' | grep -v '^# Warning' | grep -v 'pseudo_replica_mode' | sort -u | sed -e 's/\`//g'`;
@@ -301,8 +312,8 @@ is(
    "USE each table's database (binlog dump)"
 );
 
-# Get the master's binlog pos so we can check its binlogs for USE statements
-$row = $master_dbh->selectrow_hashref('show master status');
+# Get the source's binlog pos so we can check its binlogs for USE statements
+$row = $source_dbh->selectrow_hashref("show ${source_status} status");
 
 pt_table_checksum::main(@args, qw(--quiet --replicate-database percona));
 
@@ -317,6 +328,6 @@ is(
 # #############################################################################
 # Done.
 # #############################################################################
-$sb->wipe_clean($master_dbh);
+$sb->wipe_clean($source_dbh);
 ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox");
 exit;
diff --git a/t/pt-table-checksum/resume.t b/t/pt-table-checksum/resume.t
index 42c12b518..7c99ae9c5 100644
--- a/t/pt-table-checksum/resume.t
+++ b/t/pt-table-checksum/resume.t
@@ -17,14 +17,14 @@ 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 $source_dbh = $sb->get_dbh_for('source');
+my $replica1_dbh = $sb->get_dbh_for('replica1');
 
-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 slave';
+elsif ( !$replica1_dbh ) {
+   plan skip_all => 'Cannot connect to sandbox replica';
 }
 else {
    plan tests => 48;
@@ -33,24 +33,24 @@ else {
 # 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.
 # And --max-load "" prevents waiting for status variables.
-my $master_dsn = 'h=127.1,P=12345,u=msandbox,p=msandbox';
-my @args       = ($master_dsn, qw(--set-vars innodb_lock_wait_timeout=3), '--max-load', ''); 
+my $source_dsn = 'h=127.1,P=12345,u=msandbox,p=msandbox';
+my @args       = ($source_dsn, qw(--set-vars innodb_lock_wait_timeout=3), '--max-load', ''); 
 my $row;
 my $output;
 
 sub load_data_infile {
    my ($file, $where) = @_;
-   $master_dbh->do('truncate table percona.checksums');
-   $master_dbh->do("LOAD DATA LOCAL INFILE '$trunk/t/pt-table-checksum/samples/checksum_results/$file' INTO TABLE percona.checksums");
+   $source_dbh->do('truncate table percona.checksums');
+   $source_dbh->do("LOAD DATA LOCAL INFILE '$trunk/t/pt-table-checksum/samples/checksum_results/$file' INTO TABLE percona.checksums");
    if ( $where ) {
-      PerconaTest::wait_for_table($slave1_dbh, 'percona.checksums', $where);
+      PerconaTest::wait_for_table($replica1_dbh, 'percona.checksums', $where);
    }
 }
 
 # Create an empty replicate table.
 pt_table_checksum::main(@args, qw(-d foo --quiet));
-PerconaTest::wait_for_table($slave1_dbh, 'percona.checksums');
-$master_dbh->do('truncate table percona.checksums');
+PerconaTest::wait_for_table($replica1_dbh, 'percona.checksums');
+$source_dbh->do('truncate table percona.checksums');
 
 my $all_sakila_tables =  [
    [qw( sakila actor        )],
@@ -79,7 +79,7 @@ $output = output(
    sub { pt_table_checksum::main(@args, qw(-d sakila --resume --chunk-size 10000)) },
 );
 
-$row = $master_dbh->selectall_arrayref('select db, tbl from percona.checksums order by db, tbl');
+$row = $source_dbh->selectall_arrayref('select db, tbl from percona.checksums order by db, tbl');
 
 is_deeply(
    $row,
@@ -92,7 +92,7 @@ is_deeply(
 # ############################################################################
 
 # Timestamps shouldn't change because no rows should be updated.
-$row = $master_dbh->selectall_arrayref('select ts from percona.checksums order by db, tbl');
+$row = $source_dbh->selectall_arrayref('select ts from percona.checksums order by db, tbl');
 
 $output = output(
    sub { pt_table_checksum::main(@args, qw(-d sakila --resume)) },
@@ -105,7 +105,7 @@ like(
 );
 
 is_deeply(
-   $master_dbh->selectall_arrayref('select ts from percona.checksums order by db, tbl'),
+   $source_dbh->selectall_arrayref('select ts from percona.checksums order by db, tbl'),
    $row,
    "Timestamps didn't change"
 );
@@ -115,9 +115,9 @@ is_deeply(
 # next table.
 # ############################################################################
 load_data_infile("sakila-done-singles", "ts='2011-10-15 13:00:16'");
-$master_dbh->do("delete from percona.checksums where ts > '2011-10-15 13:00:04'");
+$source_dbh->do("delete from percona.checksums where ts > '2011-10-15 13:00:04'");
 
-$row = $master_dbh->selectall_arrayref('select db, tbl from percona.checksums order by db, tbl');
+$row = $source_dbh->selectall_arrayref('select db, tbl from percona.checksums order by db, tbl');
 is_deeply(
    $row,
    [
@@ -133,7 +133,7 @@ $output = output(
    sub { pt_table_checksum::main(@args, qw(-d sakila --resume --chunk-size 10000)) },
 );
 
-$row = $master_dbh->selectall_arrayref('select db, tbl from percona.checksums order by db, tbl');
+$row = $source_dbh->selectall_arrayref('select db, tbl from percona.checksums order by db, tbl');
 is_deeply(
    $row,
    $all_sakila_tables,
@@ -169,7 +169,7 @@ is(
 # Resume from the middle of a table that was being chunked.
 # ############################################################################
 load_data_infile("sakila-done-1k-chunks", "ts='2011-10-15 13:00:57'");
-$master_dbh->do("delete from percona.checksums where ts > '2011-10-15 13:00:28'");
+$source_dbh->do("delete from percona.checksums where ts > '2011-10-15 13:00:28'");
 
 my $first_half = [
    [qw(sakila actor 1 200 )],
@@ -241,7 +241,7 @@ my $second_half = [
    [qw(sakila store 1 2 )],
 ];
 
-$row = $master_dbh->selectall_arrayref('select db, tbl, chunk, master_cnt from percona.checksums order by db, tbl');
+$row = $source_dbh->selectall_arrayref("select db, tbl, chunk, ${source_name}_cnt from percona.checksums order by db, tbl");
 is_deeply(
    $row,
    $first_half,
@@ -253,7 +253,7 @@ $output = output(
       qw(--chunk-time 0)) },
 );
 
-$row = $master_dbh->selectall_arrayref('select db, tbl, chunk, master_cnt from percona.checksums order by db, tbl');
+$row = $source_dbh->selectall_arrayref("select db, tbl, chunk, ${source_name}_cnt from percona.checksums order by db, tbl");
 is_deeply(
    $row,
    [
@@ -304,9 +304,9 @@ is(
 # Resume from the end of a finished table that was being chunked.
 # ############################################################################
 load_data_infile("sakila-done-1k-chunks", "ts='2011-10-15 13:00:57'");
-$master_dbh->do("delete from percona.checksums where ts > '2011-10-15 13:00:38'");
+$source_dbh->do("delete from percona.checksums where ts > '2011-10-15 13:00:38'");
 
-$row = $master_dbh->selectall_arrayref('select db, tbl, chunk, master_cnt from percona.checksums order by db, tbl');
+$row = $source_dbh->selectall_arrayref("select db, tbl, chunk, ${source_name}_cnt from percona.checksums order by db, tbl");
 is_deeply(
    $row,
    [
@@ -332,7 +332,7 @@ $output = output(
       qw(--chunk-time 0)) },
 );
 
-$row = $master_dbh->selectall_arrayref('select db, tbl, chunk, master_cnt from percona.checksums order by db, tbl');
+$row = $source_dbh->selectall_arrayref("select db, tbl, chunk, ${source_name}_cnt from percona.checksums order by db, tbl");
 is_deeply(
    $row,
    [
@@ -374,11 +374,11 @@ is(
 );
 
 # ############################################################################
-# Resume when master_crc wasn't updated.
+# Resume when source_crc wasn't updated.
 # ############################################################################
 load_data_infile("sakila-done-1k-chunks", "ts='2011-10-15 13:00:57'");
-$master_dbh->do("delete from percona.checksums where ts > '2011-10-15 13:00:50'");
-$master_dbh->do("update percona.checksums set master_crc=NULL, master_cnt=NULL, ts='2011-11-11 11:11:11' where db='sakila' and tbl='rental' and chunk=12");
+$source_dbh->do("delete from percona.checksums where ts > '2011-10-15 13:00:50'");
+$source_dbh->do("update percona.checksums set ${source_name}_crc=NULL, ${source_name}_cnt=NULL, ts='2011-11-11 11:11:11' where db='sakila' and tbl='rental' and chunk=12");
 
 # Checksum table now ends with:
 #    *************************** 49. row ***************************
@@ -391,8 +391,8 @@ $master_dbh->do("update percona.checksums set master_crc=NULL, master_cnt=NULL,
 #    upper_boundary: 11004
 #    this_crc: d2ad38b8
 #    this_cnt: 1000
-#    master_crc: d2ad38b8
-#    master_cnt: 1000
+#    source_crc: d2ad38b8
+#    source_cnt: 1000
 #    ts: 2011-10-15 13:00:49
 #    *************************** 50. row ***************************
 #    db: sakila
@@ -404,20 +404,20 @@ $master_dbh->do("update percona.checksums set master_crc=NULL, master_cnt=NULL,
 #    upper_boundary: 12004
 #    this_crc: 3b07b7a1
 #    this_cnt: 1000
-#    master_crc: NULL
-#    master_cnt: NULL
+#    source_crc: NULL
+#    source_cnt: NULL
 #    ts: 2011-11-07 10:45:20
-# This ^ last row is bad because master_crc and master_cnt are NULL,
+# This ^ last row is bad because source_crc and source_cnt are NULL,
 # which means the tool was killed before $update_sth was called.  So,
 # it should resume from chunk 11 of this table and overwrite chunk 12.
 
-my $chunk11 = $master_dbh->selectall_arrayref(q{select * from percona.checksums where db='sakila' and tbl='rental' and chunk=11});
+my $chunk11 = $source_dbh->selectall_arrayref(q{select * from percona.checksums where db='sakila' and tbl='rental' and chunk=11});
 
-my $chunk12 = $master_dbh->selectall_arrayref(q{select master_crc from percona.checksums where db='sakila' and tbl='rental' and chunk=12});
+my $chunk12 = $source_dbh->selectall_arrayref(qq{select ${source_name}_crc from percona.checksums where db='sakila' and tbl='rental' and chunk=12});
 is(
    $chunk12->[0]->[0],
    undef,
-   "Chunk 12 master_crc is null"
+   "Chunk 12 source_crc is null"
 );
 
 $output = output(
@@ -426,7 +426,7 @@ $output = output(
    trf => sub { return PerconaTest::normalize_checksum_results(@_) },
 );
 
-$row = $master_dbh->selectall_arrayref('select db, tbl, chunk, master_cnt from percona.checksums order by db, tbl');
+$row = $source_dbh->selectall_arrayref("select db, tbl, chunk, ${source_name}_cnt from percona.checksums order by db, tbl");
 is_deeply(
    $row,
    [
@@ -450,25 +450,25 @@ ERRORS DIFFS ROWS DIFF_ROWS CHUNKS SKIPPED TABLE
 );
 
 is_deeply(
-   $master_dbh->selectall_arrayref(q{select * from percona.checksums where db='sakila' and tbl='rental' and chunk=11}),
+   $source_dbh->selectall_arrayref(q{select * from percona.checksums where db='sakila' and tbl='rental' and chunk=11}),
    $chunk11,
    "Chunk 11 not updated"
 );
 
-$chunk12 = $master_dbh->selectall_arrayref(q{select master_crc, master_cnt from percona.checksums where db='sakila' and tbl='rental' and chunk=12});
+$chunk12 = $source_dbh->selectall_arrayref(qq{select ${source_name}_crc, ${source_name}_cnt from percona.checksums where db='sakila' and tbl='rental' and chunk=12});
 ok(
    defined $chunk12->[0]->[0],
-   "Chunk 12 master_crc updated"
+   "Chunk 12 source_crc updated"
 );
 
 # ############################################################################
 # Resume with --ignore-table.
 # ############################################################################
-$sb->load_file('master', "t/pt-table-checksum/samples/3tbl-resume.sql");
+$sb->load_file('source', "t/pt-table-checksum/samples/3tbl-resume.sql");
 load_data_infile("3tbl-resume", "ts='2011-11-08 00:00:24'");
 
-$master_dbh->do("delete from percona.checksums where ts > '2011-11-08 00:00:11'");
-my $before = $master_dbh->selectall_arrayref("select db, tbl, chunk, ts from percona.checksums where tbl='t1' or tbl='t2' order by db, tbl");
+$source_dbh->do("delete from percona.checksums where ts > '2011-11-08 00:00:11'");
+my $before = $source_dbh->selectall_arrayref("select db, tbl, chunk, ts from percona.checksums where tbl='t1' or tbl='t2' order by db, tbl");
 is_deeply(
    $before,
    [
@@ -503,7 +503,7 @@ ERRORS DIFFS ROWS DIFF_ROWS CHUNKS SKIPPED TABLE
    "Resumed from t3"
 );
 
-$row = $master_dbh->selectall_arrayref('select db, tbl, chunk from percona.checksums order by db, tbl');
+$row = $source_dbh->selectall_arrayref('select db, tbl, chunk from percona.checksums order by db, tbl');
 is_deeply(
    $row,
    [
@@ -532,7 +532,7 @@ is_deeply(
 );
 
 is_deeply(
-   $master_dbh->selectall_arrayref("select db, tbl, chunk, ts from percona.checksums where tbl='t1' or tbl='t2' order by db, tbl"),
+   $source_dbh->selectall_arrayref("select db, tbl, chunk, ts from percona.checksums where tbl='t1' or tbl='t2' order by db, tbl"),
    $before,
    "t1 and t2 checksums not updated"
 );
@@ -540,15 +540,15 @@ is_deeply(
 # ############################################################################
 # Resume from table that finished bounded chunks but not the 2 oob chunks.
 # ############################################################################
-$sb->load_file('master', "t/pt-table-checksum/samples/3tbl-resume.sql");
+$sb->load_file('source', "t/pt-table-checksum/samples/3tbl-resume.sql");
 load_data_infile("3tbl-resume", "ts='2011-11-08 00:00:24'");
 
 # This will truncate the checksum results after t1 chunk 6 where chunk 7
 # is the lower oob and chunk 8 is the upper oob.
-$master_dbh->do("delete from percona.checksums where ts > '2011-11-08 00:00:06'");
+$source_dbh->do("delete from percona.checksums where ts > '2011-11-08 00:00:06'");
 
 is_deeply(
-   $master_dbh->selectall_arrayref("select db, tbl, chunk, ts from percona.checksums order by db, tbl"),
+   $source_dbh->selectall_arrayref("select db, tbl, chunk, ts from percona.checksums order by db, tbl"),
    [
       [qw(test t1 1), '2011-11-08 00:00:01'],
       [qw(test t1 2), '2011-11-08 00:00:02'],
@@ -600,12 +600,12 @@ is(
 # Resume from table that finished bounded chunks and the lower oob chunk
 # but not the upper oob chunk.
 # ############################################################################
-$sb->load_file('master', "t/pt-table-checksum/samples/3tbl-resume.sql");
+$sb->load_file('source', "t/pt-table-checksum/samples/3tbl-resume.sql");
 load_data_infile("3tbl-resume", "ts='2011-11-08 00:00:24'");
-$master_dbh->do("delete from percona.checksums where ts > '2011-11-08 00:00:07'");
+$source_dbh->do("delete from percona.checksums where ts > '2011-11-08 00:00:07'");
 
 is_deeply(
-   $master_dbh->selectall_arrayref("select db, tbl, chunk, ts from percona.checksums order by db, tbl"),
+   $source_dbh->selectall_arrayref("select db, tbl, chunk, ts from percona.checksums order by db, tbl"),
    [
       [qw(test t1 1), '2011-11-08 00:00:01'],
       [qw(test t1 2), '2011-11-08 00:00:02'],
@@ -660,11 +660,11 @@ is(
 
 # See https://bugs.launchpad.net/percona-toolkit/+bug/898318
 
-$sb->load_file('master', "t/pt-table-checksum/samples/3tbl-resume.sql");
+$sb->load_file('source', "t/pt-table-checksum/samples/3tbl-resume.sql");
 load_data_infile("3tbl-resume-bar", "ts='2011-11-08 00:01:08'");
 
 is_deeply(
-   $master_dbh->selectall_arrayref("select db, tbl, chunk, ts from percona.checksums order by db, tbl"),
+   $source_dbh->selectall_arrayref("select db, tbl, chunk, ts from percona.checksums order by db, tbl"),
    [
       [qw(test	t1	1), '2011-11-08 00:02:01'],
       [qw(test	t1	2), '2011-11-08 00:02:02'],
@@ -698,6 +698,6 @@ like(
 # #############################################################################
 # Done.
 # #############################################################################
-$sb->wipe_clean($master_dbh);
+$sb->wipe_clean($source_dbh);
 ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox");
 exit;
diff --git a/t/pt-table-checksum/run_time.t b/t/pt-table-checksum/run_time.t
index c9b3a1530..192beb475 100644
--- a/t/pt-table-checksum/run_time.t
+++ b/t/pt-table-checksum/run_time.t
@@ -22,17 +22,17 @@ 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 $source_dbh = $sb->get_dbh_for('source');
 
-if ( !$master_dbh ) {
-   plan skip_all => 'Cannot connect to sandbox master';
+if ( !$source_dbh ) {
+   plan skip_all => 'Cannot connect to sandbox source';
 }
 
 # 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.
 # And --max-load "" prevents waiting for status variables.
-my $master_dsn = 'h=127.1,P=12345,u=msandbox,p=msandbox';
-my @args       = ($master_dsn, qw(--set-vars innodb_lock_wait_timeout=3), '--max-load', ''); 
+my $source_dsn = 'h=127.1,P=12345,u=msandbox,p=msandbox';
+my @args       = ($source_dsn, qw(--set-vars innodb_lock_wait_timeout=3), '--max-load', ''); 
 my $output;
 my $exit_status;
 
@@ -48,7 +48,7 @@ ok(
    "Ran in roughly --run-time 1 second"
 ) or diag("Actual run time: $t");
 
-my $rows = $master_dbh->selectall_arrayref("SELECT DISTINCT CONCAT(db, '.', tbl) FROM percona.checksums ORDER by CONCAT(db, '.', tbl)");
+my $rows = $source_dbh->selectall_arrayref("SELECT DISTINCT CONCAT(db, '.', tbl) FROM percona.checksums ORDER by CONCAT(db, '.', tbl)");
 my $sakila_finished = grep { $_->[0] eq 'sakila.store' } @$rows;
 ok(
    !$sakila_finished,
@@ -59,7 +59,7 @@ ok(
 $exit_status = pt_table_checksum::main(@args,
    qw(--resume --quiet --quiet -d sakila --chunk-size 100));
 
-$rows = $master_dbh->selectall_arrayref("SELECT DISTINCT CONCAT(db, '.', tbl) FROM percona.checksums ORDER by CONCAT(db, '.', tbl)");
+$rows = $source_dbh->selectall_arrayref("SELECT DISTINCT CONCAT(db, '.', tbl) FROM percona.checksums ORDER by CONCAT(db, '.', tbl)");
 $sakila_finished = grep { $_->[0] eq 'sakila.store' } @$rows;
 ok(
    $sakila_finished,
@@ -69,6 +69,6 @@ ok(
 # #############################################################################
 # 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;
diff --git a/t/pt-table-checksum/samples/PT-173.sql b/t/pt-table-checksum/samples/PT-173.sql
index 6884d6ed5..c13c04081 100644
--- a/t/pt-table-checksum/samples/PT-173.sql
+++ b/t/pt-table-checksum/samples/PT-173.sql
@@ -36,8 +36,8 @@ CREATE TABLE `checksums` (
   `upper_boundary` text,
   `this_crc` char(40) NOT NULL,
   `this_cnt` int(11) NOT NULL,
-  `master_crc` char(40) DEFAULT NULL,
-  `master_cnt` int(11) DEFAULT NULL,
+  `source_crc` char(40) DEFAULT NULL,
+  `source_cnt` int(11) DEFAULT NULL,
   `ts` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   PRIMARY KEY (`db`,`tbl`,`chunk`),
   KEY `ts_db_tbl` (`ts`,`db`,`tbl`)
diff --git a/t/pt-table-checksum/samples/checksum_tbl_truncated.sql b/t/pt-table-checksum/samples/checksum_tbl_truncated.sql
index 2542d4124..f749f9ead 100644
--- a/t/pt-table-checksum/samples/checksum_tbl_truncated.sql
+++ b/t/pt-table-checksum/samples/checksum_tbl_truncated.sql
@@ -10,8 +10,8 @@ CREATE TABLE truncated_checksums (
   upper_boundary char(1)      NOT NULL,  -- will cause truncation error
   this_crc       char(40)     NOT NULL,
   this_cnt       int          NOT NULL,
-  master_crc     char(40)         NULL,
-  master_cnt     int              NULL,
+  source_crc     char(40)         NULL,
+  source_cnt     int              NULL,
   ts             timestamp    NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   PRIMARY KEY (db, tbl, chunk)
 ) ENGINE=InnoDB;
diff --git a/t/pt-table-checksum/samples/default-results-8.4.txt b/t/pt-table-checksum/samples/default-results-8.4.txt
new file mode 100644
index 000000000..b6ab161b3
--- /dev/null
+++ b/t/pt-table-checksum/samples/default-results-8.4.txt
@@ -0,0 +1,50 @@
+if all tables checksummed 
+checksum ...   
+ERRORS DIFFS ROWS SKIPPED TABLE
+0 0 0 0 mysql.columns_priv
+0 0 0 0 mysql.component
+0 0 2 0 mysql.db
+0 0 0 0 mysql.default_roles
+0 1 2 0 mysql.engine_cost
+0 0 0 0 mysql.func
+0 0 53 0 mysql.help_category
+0 0 985 0 mysql.help_keyword
+0 0 2043 0 mysql.help_relation
+0 0 701 0 mysql.help_topic
+0 0 0 0 mysql.password_history
+0 0 0 0 mysql.plugin
+0 0 0 0 mysql.procs_priv
+0 1 1 0 mysql.proxies_priv
+0 0 0 0 mysql.replication_asynchronous_connection_failover
+0 0 0 0 mysql.replication_asynchronous_connection_failover_managed
+0 0 1 0 mysql.replication_group_configuration_version
+0 0 2 0 mysql.replication_group_member_actions
+0 0 0 0 mysql.role_edges
+0 1 6 0 mysql.server_cost
+0 0 0 0 mysql.servers
+0 0 2 0 mysql.tables_priv
+0 0 0 0 mysql.time_zone
+0 0 0 0 mysql.time_zone_leap_second
+0 0 0 0 mysql.time_zone_name
+0 0 0 0 mysql.time_zone_transition
+0 0 0 0 mysql.time_zone_transition_type
+0 1 5 0 mysql.user
+0 0 29 0 percona_test.checksums
+0 0 1 0 percona_test.sentinel
+0 0 200 0 sakila.actor
+0 0 603 0 sakila.address
+0 0 16 0 sakila.category
+0 0 600 0 sakila.city
+0 0 109 0 sakila.country
+0 0 599 0 sakila.customer
+0 0 1000 0 sakila.film
+0 0 5462 0 sakila.film_actor
+0 0 1000 0 sakila.film_category
+0 0 1000 0 sakila.film_text
+0 0 4581 0 sakila.inventory
+0 0 6 0 sakila.language
+0 0 16049 0 sakila.payment
+0 0 16044 0 sakila.rental
+0 0 2 0 sakila.staff
+0 0 2 0 sakila.store
+0 0 6 0 sys.sys_config
diff --git a/t/pt-table-checksum/samples/issue_1651002.sql b/t/pt-table-checksum/samples/issue_1651002.sql
index a657a1a7c..5d007b728 100644
--- a/t/pt-table-checksum/samples/issue_1651002.sql
+++ b/t/pt-table-checksum/samples/issue_1651002.sql
@@ -16,8 +16,8 @@ CREATE TABLE checksums (
    upper_boundary TEXT             NULL,
    this_crc       CHAR(40)     NOT NULL,
    this_cnt       INT          NOT NULL,
-   master_crc     CHAR(40)         NULL,
-   master_cnt     INT              NULL,
+   source_crc     CHAR(40)         NULL,
+   source_cnt     INT              NULL,
    ts             TIMESTAMP    NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
    PRIMARY KEY (db, tbl, chunk),
    INDEX ts_db_tbl (ts, db, tbl)
diff --git a/t/pt-table-checksum/samples/plugins/all_hooks.pm b/t/pt-table-checksum/samples/plugins/all_hooks.pm
index 6221ef65f..358f8649d 100644
--- a/t/pt-table-checksum/samples/plugins/all_hooks.pm
+++ b/t/pt-table-checksum/samples/plugins/all_hooks.pm
@@ -32,6 +32,12 @@ sub get_slave_lag {
    return sub { return 0; };
 }
  
+sub get_replica_lag {
+   my ($self, %args) = @_;
+   print "PLUGIN get_replica_lag\n";
+   return sub { return 0; };
+}
+ 
 sub before_checksum_table {
    my ($self, %args) = @_;
    print "PLUGIN before_checksum_table\n";
diff --git a/t/pt-table-checksum/samples/privs-bug-916168.sql b/t/pt-table-checksum/samples/privs-bug-916168.sql
index 0fcb2af49..dd633f754 100644
--- a/t/pt-table-checksum/samples/privs-bug-916168.sql
+++ b/t/pt-table-checksum/samples/privs-bug-916168.sql
@@ -14,8 +14,8 @@ CREATE TABLE `checksums` (
   `upper_boundary` text,
   `this_crc` char(40) NOT NULL,
   `this_cnt` int(11) NOT NULL,
-  `master_crc` char(40) DEFAULT NULL,
-  `master_cnt` int(11) DEFAULT NULL,
+  `source_crc` char(40) DEFAULT NULL,
+  `source_cnt` int(11) DEFAULT NULL,
   `ts` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   PRIMARY KEY (`db`,`tbl`,`chunk`),
   KEY `ts_db_tbl` (`ts`,`db`,`tbl`)
diff --git a/t/pt-table-checksum/samples/pt-1616.sql b/t/pt-table-checksum/samples/pt-1616.sql
index 1aec5f4da..fe3f2a71e 100644
--- a/t/pt-table-checksum/samples/pt-1616.sql
+++ b/t/pt-table-checksum/samples/pt-1616.sql
@@ -18,8 +18,8 @@ CREATE TABLE IF NOT EXISTS percona.checksums (
    upper_boundary TEXT             NULL,
    this_crc       CHAR(40)     NOT NULL,
    this_cnt       INT          NOT NULL,
-   master_crc     CHAR(40)         NULL,
-   master_cnt     INT              NULL,
+   source_crc     CHAR(40)         NULL,
+   source_cnt     INT              NULL,
    ts             TIMESTAMP    NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
    PRIMARY KEY (db, tbl, chunk),
    INDEX ts_db_tbl (ts, db, tbl)
diff --git a/t/pt-table-checksum/samples/pt-1637.sql b/t/pt-table-checksum/samples/pt-1637.sql
index 63fafa418..42f041e26 100644
--- a/t/pt-table-checksum/samples/pt-1637.sql
+++ b/t/pt-table-checksum/samples/pt-1637.sql
@@ -10,8 +10,8 @@ CREATE TABLE `percona`.`checksums` (
    upper_boundary TEXT             NULL,
    this_crc       CHAR(40)     NOT NULL,
    this_cnt       INT          NOT NULL,
-   master_crc     CHAR(40)         NULL,
-   master_cnt     INT              NULL,
+   source_crc     CHAR(40)         NULL,
+   source_cnt     INT              NULL,
    ts             TIMESTAMP    NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
    PRIMARY KEY (db, tbl, chunk),
    INDEX ts_db_tbl (ts, db, tbl)
diff --git a/t/pt-table-checksum/samples/repl-table-myisam.sql b/t/pt-table-checksum/samples/repl-table-myisam.sql
index c11f4a6f6..763809255 100644
--- a/t/pt-table-checksum/samples/repl-table-myisam.sql
+++ b/t/pt-table-checksum/samples/repl-table-myisam.sql
@@ -11,8 +11,8 @@ CREATE TABLE checksums (
   upper_boundary text             NULL,
   this_crc       char(40)     NOT NULL,
   this_cnt       int          NOT NULL,
-  master_crc     char(40)         NULL,
-  master_cnt     int              NULL,
+  source_crc     char(40)         NULL,
+  source_cnt     int              NULL,
   ts             timestamp    NOT NULL,
   PRIMARY KEY (db, tbl, chunk),
   INDEX ts_db_tbl (ts, db, tbl)
diff --git a/t/pt-table-checksum/samples/static-chunk-size-results-8.4.txt b/t/pt-table-checksum/samples/static-chunk-size-results-8.4.txt
new file mode 100644
index 000000000..f53f33afb
--- /dev/null
+++ b/t/pt-table-checksum/samples/static-chunk-size-results-8.4.txt
@@ -0,0 +1,22 @@
+if all tables be checksummed 
+checksum ...    
+ERRORS DIFFS ROWS CHUNKS SKIPPED TABLE
+0 0 29 1 0 percona_test.checksums
+0 0 1 1 0 percona_test.sentinel
+0 0 200 1 0 sakila.actor
+0 0 603 1 0 sakila.address
+0 0 16 1 0 sakila.category
+0 0 600 1 0 sakila.city
+0 0 109 1 0 sakila.country
+0 0 599 1 0 sakila.customer
+0 0 1000 1 0 sakila.film
+0 0 5462 8 0 sakila.film_actor
+0 0 1000 1 0 sakila.film_category
+0 0 1000 1 0 sakila.film_text
+0 0 4581 7 0 sakila.inventory
+0 0 6 1 0 sakila.language
+0 0 16049 19 0 sakila.payment
+0 0 16044 19 0 sakila.rental
+0 0 2 1 0 sakila.staff
+0 0 2 1 0 sakila.store
+0 0 6 1 0 sys.sys_config
diff --git a/t/pt-table-checksum/settings.t b/t/pt-table-checksum/settings.t
index a5827228d..400ba26d4 100644
--- a/t/pt-table-checksum/settings.t
+++ b/t/pt-table-checksum/settings.t
@@ -20,18 +20,18 @@ if ( $sandbox_version lt '5.6' ) {
 }
 
 diag(`$trunk/sandbox/stop-sandbox 12348 >/dev/null`);
-diag(`EXTRA_DEFAULTS_FILE="$trunk/t/pt-table-checksum/samples/explicit_defaults_for_timestamp.cnf" $trunk/sandbox/start-sandbox master 12348 >/dev/null`);
+diag(`EXTRA_DEFAULTS_FILE="$trunk/t/pt-table-checksum/samples/explicit_defaults_for_timestamp.cnf" $trunk/sandbox/start-sandbox source 12348 >/dev/null`);
 
 my $dp = new DSNParser(opts=>$dsn_opts);
 my $sb = new Sandbox(basedir => '/tmp', DSNParser => $dp);
-my $master_dbh = $sb->get_dbh_for('master1');
+my $source_dbh = $sb->get_dbh_for('source1');
 
-if ( !$master_dbh ) {
-   plan skip_all => 'Cannot connect to sandbox master 12348';
+if ( !$source_dbh ) {
+   plan skip_all => 'Cannot connect to sandbox source 12348';
 }
 
-my $master_dsn = 'h=127.1,P=12348,u=msandbox,p=msandbox';
-my @args       = ($master_dsn, '--max-load', ''); 
+my $source_dsn = 'h=127.1,P=12348,u=msandbox,p=msandbox';
+my @args       = ($source_dsn, '--max-load', ''); 
 my $output;
 my $retval;
 
@@ -47,7 +47,7 @@ unlike(
 );
 
 # Exit will be non-zero because of "Diffs cannot be detected because
-# no slaves were found."
+# no replicas were found."
 
 # #############################################################################
 # Done.
diff --git a/t/pt-table-checksum/skip_innodb.t b/t/pt-table-checksum/skip_innodb.t
index da2b90b10..e22365d7e 100644
--- a/t/pt-table-checksum/skip_innodb.t
+++ b/t/pt-table-checksum/skip_innodb.t
@@ -21,28 +21,28 @@ if ( $sandbox_version ge '5.6' ) {
 
 diag("Stopping/reconfiguring/restarting sandboxes 12348 and 12349");
 diag(`$trunk/sandbox/stop-sandbox 12348 >/dev/null`);
-diag(`SKIP_INNODB=1 $trunk/sandbox/start-sandbox master 12348 >/dev/null`);
+diag(`SKIP_INNODB=1 $trunk/sandbox/start-sandbox source 12348 >/dev/null`);
 
 diag(`$trunk/sandbox/stop-sandbox 12349 >/dev/null`);
-diag(`SKIP_INNODB=1 $trunk/sandbox/start-sandbox slave 12349 12348 >/dev/null`);
+diag(`SKIP_INNODB=1 $trunk/sandbox/start-sandbox replica 12349 12348 >/dev/null`);
 
 my $dp = new DSNParser(opts=>$dsn_opts);
 my $sb = new Sandbox(basedir => '/tmp', DSNParser => $dp);
-my $master_dbh = $sb->get_dbh_for('master1');
-my $slave_dbh  = $sb->get_dbh_for('master2');
+my $source_dbh = $sb->get_dbh_for('source1');
+my $replica_dbh  = $sb->get_dbh_for('source2');
 
-if ( !$master_dbh ) {
-   plan skip_all => 'Cannot connect to sandbox master 12348';
+if ( !$source_dbh ) {
+   plan skip_all => 'Cannot connect to sandbox source 12348';
 }
-elsif ( !$slave_dbh ) {
-   plan skip_all => 'Cannot connect to sandbox slave 12349';
+elsif ( !$replica_dbh ) {
+   plan skip_all => 'Cannot connect to sandbox replica 12349';
 }
 
 # 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.
 # And --max-load "" prevents waiting for status variables.
-my $master_dsn = 'h=127.1,P=12348,u=msandbox,p=msandbox';
-my @args       = ($master_dsn, qw(--set-vars innodb_lock_wait_timeout=3), '--max-load', ''); 
+my $source_dsn = 'h=127.1,P=12348,u=msandbox,p=msandbox';
+my @args       = ($source_dsn, qw(--set-vars innodb_lock_wait_timeout=3), '--max-load', ''); 
 my $output;
 my $retval;
 
diff --git a/t/pt-table-checksum/standard_options.t b/t/pt-table-checksum/standard_options.t
index 21e030c5d..2080d5062 100644
--- a/t/pt-table-checksum/standard_options.t
+++ b/t/pt-table-checksum/standard_options.t
@@ -17,14 +17,14 @@ 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 $slave_dbh  = $sb->get_dbh_for('slave1');
+my $source_dbh = $sb->get_dbh_for('source');
+my $replica_dbh  = $sb->get_dbh_for('replica1');
 
-if ( !$master_dbh ) {
-   plan skip_all => 'Cannot connect to sandbox master';
+if ( !$source_dbh ) {
+   plan skip_all => 'Cannot connect to sandbox source';
 }
-elsif ( !$slave_dbh ) {
-   plan skip_all => 'Cannot connect to sandbox slave1';
+elsif ( !$replica_dbh ) {
+   plan skip_all => 'Cannot connect to sandbox replica1';
 }
 
 # The sandbox servers run with lock_wait_timeout=3 and it's not dynamic
diff --git a/t/pt-table-checksum/throttle.t b/t/pt-table-checksum/throttle.t
index 99904dd05..97c8a4187 100644
--- a/t/pt-table-checksum/throttle.t
+++ b/t/pt-table-checksum/throttle.t
@@ -23,18 +23,18 @@ 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 ( !$slave2_dbh ) {
-   plan skip_all => 'Cannot connect to sandbox slave2';
+elsif ( !$replica2_dbh ) {
+   plan skip_all => 'Cannot connect to sandbox replica2';
 }
 else {
    plan tests => 4;
@@ -43,31 +43,31 @@ else {
 # 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.
 # And --max-load "" prevents waiting for status variables.
-my $master_dsn = 'h=127.1,P=12345,u=msandbox,p=msandbox';
-my @args       = ($master_dsn, qw(--set-vars innodb_lock_wait_timeout=3), '--max-load', '',
+my $source_dsn = 'h=127.1,P=12345,u=msandbox,p=msandbox';
+my @args       = ($source_dsn, qw(--set-vars innodb_lock_wait_timeout=3), '--max-load', '',
                   '--progress', 'time,1');
 my $output;
 my $row;
 my $exit_status;
 
-# Create the checksum table, else stopping the slave below
+# Create the checksum table, else stopping the replica below
 # will cause the tool to wait forever for the --replicate
-# table to replicate to the stopped slave.
+# table to replicate to the stopped replica.
 pt_table_checksum::main(@args, qw(-t sakila.city --quiet));
 
 # ############################################################################
-# --check-slave-lag
+# --check-replica-lag
 # ############################################################################
 
-# Stop slave1.
-$sb->wait_for_slaves();
-$slave1_dbh->do('stop slave sql_thread');
+# Stop replica1.
+$sb->wait_for_replicas();
+$replica1_dbh->do("stop ${replica_name} sql_thread");
 wait_until(sub {
-   my $ss = $slave1_dbh->selectrow_hashref("SHOW SLAVE STATUS");
-   return $ss->{slave_sql_running} eq 'Yes';
+   my $ss = $replica1_dbh->selectrow_hashref("SHOW ${replica_name} STATUS");
+   return $ss->{"${replica_name}_sql_running"} eq 'Yes';
 });
 
-# Try to checksum, but since slave1 is stopped, the tool should
+# Try to checksum, but since replica1 is stopped, the tool should
 # wait for it to stop "lagging".
 ($output) = PerconaTest::full_output(
    sub { pt_table_checksum::main(@args, qw(-t sakila.city)) },
@@ -80,31 +80,31 @@ like(
    "Waits for stopped replica"
 );
 
-# Checksum but only use slave2 to check for lag.
+# Checksum but only use replica2 to check for lag.
 $exit_status = pt_table_checksum::main(@args, qw(-t sakila.city --quiet),
-   qw(--no-replicate-check), '--check-slave-lag', 'P=12347');
+   qw(--no-replicate-check), '--check-replica-lag', 'P=12347');
 
 is(
    $exit_status,
    0,
-   "Ignores slave1 when --check-slave-lag=slave2"
+   "Ignores replica1 when --check-replica-lag=replica2"
 );
 
-$row = $master_dbh->selectall_arrayref("select * from percona.checksums where db='sakila' and tbl='city'");
+$row = $source_dbh->selectall_arrayref("select * from percona.checksums where db='sakila' and tbl='city'");
 is(
    scalar @$row,
    1,
    "Checksummed table"
 );
 
-$slave1_dbh->do('START SLAVE sql_thread');
-$slave2_dbh->do('STOP SLAVE');
-$slave2_dbh->do('START SLAVE');
-$sb->wait_for_slaves();
+$replica1_dbh->do("START ${replica_name} sql_thread");
+$replica2_dbh->do("STOP ${replica_name}");
+$replica2_dbh->do("START ${replica_name}");
+$sb->wait_for_replicas();
 
 # #############################################################################
 # Done.
 # #############################################################################
-$sb->wipe_clean($master_dbh);
+$sb->wipe_clean($source_dbh);
 ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox");
 exit;

From a38bee6d604c9b2642c0962dfdbc0788a5127560 Mon Sep 17 00:00:00 2001
From: Sveta Smirnova <sveta.smirnova@percona.com>
Date: Sat, 3 Aug 2024 17:03:48 +0300
Subject: [PATCH 10/31] PT-2340 - Support MySQL 8.4

- Updated modules and tests for pt-table-sync, pt-table-usage, pt-upgrade, pt-variable-advisor
---
 bin/pt-table-sync                             | 945 ++++++++++--------
 bin/pt-upgrade                                |   6 +-
 bin/pt-variable-advisor                       |  26 +-
 t/lib/samples/issue_616.sql                   |  12 +-
 t/pt-table-sync/basics.t                      | 107 +-
 t/pt-table-sync/bidirectional.t               |  30 +-
 t/pt-table-sync/binlog_format.t               |  62 +-
 t/pt-table-sync/bugs.t                        |  56 +-
 t/pt-table-sync/char_chunking.t               |  26 +-
 t/pt-table-sync/check_privs.t                 |  40 +-
 t/pt-table-sync/columns.t                     |  24 +-
 t/pt-table-sync/diff_where.t                  |   8 +-
 t/pt-table-sync/enum_fields.t                 |  24 +-
 t/pt-table-sync/filters.t                     |  84 +-
 t/pt-table-sync/float_precision.t             |  46 +-
 t/pt-table-sync/force_index.t                 |  30 +-
 t/pt-table-sync/hex_blob.t                    |   6 +-
 t/pt-table-sync/instrumentaiton.t             |  18 +-
 t/pt-table-sync/issue_1052.t                  |  20 +-
 t/pt-table-sync/issue_1065.t                  |  26 +-
 t/pt-table-sync/issue_218.t                   |  28 +-
 t/pt-table-sync/issue_22.t                    |  22 +-
 t/pt-table-sync/issue_262.t                   |  32 +-
 t/pt-table-sync/issue_408.t                   |  20 +-
 t/pt-table-sync/issue_560.t                   |  26 +-
 t/pt-table-sync/issue_616.t                   |  40 +-
 t/pt-table-sync/issue_627.t                   |  28 +-
 t/pt-table-sync/issue_631.t                   |  12 +-
 t/pt-table-sync/issue_634.t                   |  24 +-
 t/pt-table-sync/issue_644.t                   |  26 +-
 t/pt-table-sync/issue_804.t                   |  24 +-
 t/pt-table-sync/issue_920.t                   |   6 +-
 t/pt-table-sync/issue_96.t                    |  12 +-
 t/pt-table-sync/issue_965.t                   |   6 +-
 t/pt-table-sync/issue_996.t                   |  24 +-
 t/pt-table-sync/lock_and_rename.t             |  20 +-
 t/pt-table-sync/lock_level.t                  |  22 +-
 t/pt-table-sync/master_master.t               |  56 +-
 t/pt-table-sync/pt-1194.t                     |  56 +-
 t/pt-table-sync/pt-1205.t                     |  28 +-
 t/pt-table-sync/pt-1256.t                     |  44 +-
 t/pt-table-sync/pt-2016.t                     |  34 +-
 t/pt-table-sync/pt-2309.t                     |  44 +-
 t/pt-table-sync/pt_221.t                      |  52 +-
 t/pt-table-sync/replicate.t                   |  38 +-
 t/pt-table-sync/replicate_do_db.t             | 126 +--
 t/pt-table-sync/safety_checks.t               |  34 +-
 t/pt-table-sync/samples/bug-918056-master.sql |   4 +-
 t/pt-table-sync/samples/checksum_tbl.sql      |   4 +-
 t/pt-table-sync/samples/pt_221.sql            |   4 +-
 t/pt-table-sync/samples/upper-oob-master.sql  |   4 +-
 t/pt-table-sync/specify_column_or_index.t     |  24 +-
 t/pt-table-sync/standard_options.t            |   2 +-
 t/pt-table-sync/sync_to_differnt_db.t         |  22 +-
 t/pt-table-sync/sync_using_channels.t         |  46 +-
 t/pt-table-sync/traces.t                      |  20 +-
 t/pt-table-sync/triggers.t                    |  50 +-
 t/pt-table-sync/wait.t                        |  38 +-
 t/pt-table-sync/zero_chunk.t                  |  16 +-
 t/pt-table-usage/explain_extended.t           |   4 +-
 t/pt-upgrade/compare_hosts.t                  |   2 +-
 t/pt-upgrade/compare_results.t                |   2 +-
 t/pt-upgrade/diff_rows.t                      |   6 +-
 t/pt-upgrade/diff_warnings.t                  |   8 +-
 t/pt-upgrade/run_time.t                       |   2 +-
 t/pt-upgrade/save_results.t                   |   2 +-
 t/pt-variable-advisor/advice.t                |   6 +-
 t/pt-variable-advisor/show_variables_online.t |   4 +-
 t/pt-variable-advisor/show_variables_static.t |   2 +-
 69 files changed, 1445 insertions(+), 1307 deletions(-)

diff --git a/bin/pt-table-sync b/bin/pt-table-sync
index 83b7a6533..8df575acb 100755
--- a/bin/pt-table-sync
+++ b/bin/pt-table-sync
@@ -2198,7 +2198,7 @@ sub get_cxn_params {
       $dsn = 'DBI:mysql:' . ( $info->{D} || '' ) . ';'
          . join(';', map  { "$opts{$_}->{dsn}=$info->{$_}" }
                      grep { defined $info->{$_} }
-                     qw(F h P S A))
+                     qw(F h P S A s))
          . ';mysql_read_default_group=client'
          . ($info->{L} ? ';mysql_local_infile=1' : '');
    }
@@ -5067,13 +5067,13 @@ sub find_replication_differences {
    my $sql
       = "SELECT db, tbl, CONCAT(db, '.', tbl) AS `table`, "
       . "chunk, chunk_index, lower_boundary, upper_boundary, "
-      . "COALESCE(this_cnt-master_cnt, 0) AS cnt_diff, "
+      . "COALESCE(this_cnt-source_cnt, 0) AS cnt_diff, "
       . "COALESCE("
-      .   "this_crc <> master_crc OR ISNULL(master_crc) <> ISNULL(this_crc), 0"
-      . ") AS crc_diff, this_cnt, master_cnt, this_crc, master_crc "
+      .   "this_crc <> source_crc OR ISNULL(source_crc) <> ISNULL(this_crc), 0"
+      . ") AS crc_diff, this_cnt, source_cnt, this_crc, source_crc "
       . "FROM $table "
-      . "WHERE master_cnt <> this_cnt OR master_crc <> this_crc "
-      . "OR ISNULL(master_crc) <> ISNULL(this_crc)";
+      . "WHERE source_cnt <> this_cnt OR source_crc <> this_crc "
+      . "OR ISNULL(source_crc) <> ISNULL(this_crc)";
    PTDEBUG && _d($sql);
    my $diffs = $dbh->selectall_arrayref($sql, { Slice => {} });
    return $diffs;
@@ -6308,16 +6308,16 @@ sub lock_and_wait {
                my ( %args ) = @_;
 
                if ( $args{tryno} > 1 ) {
-                  warn "Retrying MASTER_POS_WAIT() for --wait $timeout...";
+                  warn "Retrying SOURCE_POS_WAIT() for --wait $timeout...";
                }
 
-               $wait = $ms->wait_for_master(
-                  master_status => $ms->get_master_status($src->{misc_dbh}),
-                  slave_dbh     => $dst->{dbh},
+               $wait = $ms->wait_for_source(
+                  source_status => $ms->get_source_status($src->{misc_dbh}),
+                  replica_dbh     => $dst->{dbh},
                   timeout       => $timeout,
                );
                if ( defined $wait->{result} && $wait->{result} != -1 ) {
-                  return;  # slave caught up
+                  return;  # replica caught up
                }
                die; # call fail
             },
@@ -6326,12 +6326,12 @@ sub lock_and_wait {
                if ( !defined $wait->{result} ) {
                   my $msg;
                   if ( $wait->{waited}  ) {
-                     $msg = "The slave was stopped while waiting with "
-                          . "MASTER_POS_WAIT().";
+                     $msg = "The replica was stopped while waiting with "
+                          . "SOURCE_POS_WAIT().";
                   }
                   else {
-                     $msg = "MASTER_POS_WAIT() returned NULL.  Verify that "
-                          . "the slave is running.";
+                     $msg = "SOURCE_POS_WAIT() returned NULL.  Verify that "
+                          . "the replica is running.";
                   }
                   if ( $tries - $args{tryno} ) {
                      $msg .= "  Sleeping $sleep seconds then retrying "
@@ -6345,17 +6345,17 @@ sub lock_and_wait {
                }
             },
             final_fail => sub {
-               die "Slave did not catch up to its master after $tries attempts "
-                  . "of waiting $timeout seconds with MASTER_POS_WAIT.  "
-                  . "Check that the slave is running, increase the --wait "
+               die "Replica did not catch up to its source after $tries attempts "
+                  . "of waiting $timeout seconds with SOURCE_POS_WAIT.  "
+                  . "Check that the replica is running, increase the --wait "
                   . "time, or disable this feature by specifying --wait 0.";
             },
-         );  # retry MasterSlave::wait_for_master()
+         );  # retry MasterSlave::wait_for_source()
       }
 
       if ( $args{changing_src} ) {
          PTDEBUG && _d('Not locking destination because changing source ',
-            '(syncing via replication or sync-to-master)');
+            '(syncing via replication or sync-to-source)');
       }
       else {
          if ( $args{lock} == 3 ) {
@@ -6713,7 +6713,7 @@ sub new {
    return bless $self, $class;
 }
 
-sub get_slaves {
+sub get_replicas {
    my ($self, %args) = @_;
    my @required_args = qw(make_cxn);
    foreach my $arg ( @required_args ) {
@@ -6721,11 +6721,11 @@ sub get_slaves {
    }
    my ($make_cxn) = @args{@required_args};
 
-   my $slaves  = [];
+   my $replicas  = [];
    my $dp      = $self->{DSNParser};
    my $methods = $self->_resolve_recursion_methods($args{dsn});
 
-   return $slaves unless @$methods;
+   return $replicas unless @$methods;
 
    if ( grep { m/processlist|hosts/i } @$methods ) {
       my @required_args = qw(dbh dsn);
@@ -6735,26 +6735,26 @@ sub get_slaves {
       my ($dbh, $dsn) = @args{@required_args};
       my $o = $self->{OptionParser};
 
-      $self->recurse_to_slaves(
-         {  dbh            => $dbh,
-            dsn            => $dsn,
-            slave_user     => $o->got('slave-user') ? $o->get('slave-user') : '',
-            slave_password => $o->got('slave-password') ? $o->get('slave-password') : '',
-            slaves         => $args{slaves},
+      $self->recurse_to_replicas(
+         {  dbh              => $dbh,
+            dsn              => $dsn,
+            replica_user     => $o->got('replica-user') ? $o->get('replica-user') : '',
+            replica_password => $o->got('replica-password') ? $o->get('replica-password') : '',
+            replicas         => $args{replicas},
             callback  => sub {
                my ( $dsn, $dbh, $level, $parent ) = @_;
                return unless $level;
-               PTDEBUG && _d('Found slave:', $dp->as_string($dsn));
-               my $slave_dsn = $dsn;
-               if ($o->got('slave-user')) {
-                  $slave_dsn->{u} = $o->get('slave-user');
-                  PTDEBUG && _d("Using slave user ".$o->get('slave-user')." on ".$slave_dsn->{h}.":".$slave_dsn->{P});
+               PTDEBUG && _d('Found replica:', $dp->as_string($dsn));
+               my $replica_dsn = $dsn;
+               if ($o->got('replica-user')) {
+                  $replica_dsn->{u} = $o->get('replica-user');
+                  PTDEBUG && _d("Using replica user ".$o->get('replica-user')." on ".$replica_dsn->{h}.":".$replica_dsn->{P});
                }
-               if ($o->got('slave-password')) {
-                  $slave_dsn->{p} = $o->get('slave-password');
-                  PTDEBUG && _d("Slave password set");
+               if ($o->got('replica-password')) {
+                  $replica_dsn->{p} = $o->get('replica-password');
+                  PTDEBUG && _d("Replica password set");
                }
-               push @$slaves, $make_cxn->(dsn => $slave_dsn, dbh => $dbh, parent => $parent);
+               push @$replicas, $make_cxn->(dsn => $replica_dsn, dbh => $dbh, parent => $parent);
                return;
             },
             wait_no_die => $args{'wait_no_die'},
@@ -6762,20 +6762,20 @@ sub get_slaves {
       );
    } elsif ( $methods->[0] =~ m/^dsn=/i ) {
       (my $dsn_table_dsn = join ",", @$methods) =~ s/^dsn=//i;
-      $slaves = $self->get_cxn_from_dsn_table(
+      $replicas = $self->get_cxn_from_dsn_table(
          %args,
          dsn_table_dsn => $dsn_table_dsn,
          wait_no_die => $args{'wait_no_die'},
       );
    }
    elsif ( $methods->[0] =~ m/none/i ) {
-      PTDEBUG && _d('Not getting to slaves');
+      PTDEBUG && _d('Not getting to replicas');
    }
    else {
       die "Unexpected recursion methods: @$methods";
    }
 
-   return $slaves;
+   return $replicas;
 }
 
 sub _resolve_recursion_methods {
@@ -6793,31 +6793,31 @@ sub _resolve_recursion_methods {
    }
 }
 
-sub recurse_to_slaves {
+sub recurse_to_replicas {
    my ( $self, $args, $level ) = @_;
    $level ||= 0;
    my $dp = $self->{DSNParser};
    my $recurse = $args->{recurse} || $self->{OptionParser}->get('recurse');
    my $dsn = $args->{dsn};
-   my $slave_user = $args->{slave_user} || '';
-   my $slave_password = $args->{slave_password} || '';
+   my $replica_user = $args->{replica_user} || '';
+   my $replica_password = $args->{replica_password} || '';
 
    my $methods = $self->_resolve_recursion_methods($dsn);
    PTDEBUG && _d('Recursion methods:', @$methods);
    if ( lc($methods->[0]) eq 'none' ) {
-      PTDEBUG && _d('Not recursing to slaves');
+      PTDEBUG && _d('Not recursing to replicas');
       return;
    }
 
-   my $slave_dsn = $dsn;
-   if ($slave_user) {
-      $slave_dsn->{u} = $slave_user;
-      PTDEBUG && _d("Using slave user $slave_user on "
-         . $slave_dsn->{h} . ":" . ( $slave_dsn->{P} ? $slave_dsn->{P} : ""));
+   my $replica_dsn = $dsn;
+   if ($replica_user) {
+      $replica_dsn->{u} = $replica_user;
+      PTDEBUG && _d("Using replica user $replica_user on "
+         . $replica_dsn->{h} . ":" . ( $replica_dsn->{P} ? $replica_dsn->{P} : ""));
    }
-   if ($slave_password) {
-      $slave_dsn->{p} = $slave_password;
-      PTDEBUG && _d("Slave password set");
+   if ($replica_password) {
+      $replica_dsn->{p} = $replica_password;
+      PTDEBUG && _d("Replica password set");
    }
 
    my $dbh = $args->{dbh};
@@ -6825,12 +6825,12 @@ sub recurse_to_slaves {
    my $get_dbh = sub {
          eval {
             $dbh = $dp->get_dbh(
-               $dp->get_cxn_params($slave_dsn), { AutoCommit => 1 }
+               $dp->get_cxn_params($replica_dsn), { AutoCommit => 1 }
             );
-            PTDEBUG && _d('Connected to', $dp->as_string($slave_dsn));
+            PTDEBUG && _d('Connected to', $dp->as_string($replica_dsn));
          };
          if ( $EVAL_ERROR ) {
-            print STDERR "Cannot connect to ", $dp->as_string($slave_dsn), ": ", $EVAL_ERROR, "\n"
+            print STDERR "Cannot connect to ", $dp->as_string($replica_dsn), ": ", $EVAL_ERROR, "\n"
                or die "Cannot print: $OS_ERROR";
             return;
          }
@@ -6838,10 +6838,10 @@ sub recurse_to_slaves {
 
    DBH: {
       if ( !defined $dbh ) {
-         foreach my $known_slave ( @{$args->{slaves}} ) {
-            if ($known_slave->{dsn}->{h} eq $slave_dsn->{h} and
-                $known_slave->{dsn}->{P} eq $slave_dsn->{P} ) {
-               $dbh = $known_slave->{dbh};
+         foreach my $known_replica ( @{$args->{replicas}} ) {
+            if ($known_replica->{dsn}->{h} eq $replica_dsn->{h} and
+                $known_replica->{dsn}->{P} eq $replica_dsn->{P} ) {
+               $dbh = $known_replica->{dbh};
                last DBH;
             }
          }
@@ -6859,7 +6859,7 @@ sub recurse_to_slaves {
 	   if ( $EVAL_ERROR ) {
 		   if ( $args->{wait_no_die} ) {
 			   print STDERR "Error getting server id: ", $EVAL_ERROR,
-               "\nRetrying query for server ", $slave_dsn->{h}, ":", $slave_dsn->{P}, "\n";
+               "\nRetrying query for server ", $replica_dsn->{h}, ":", $replica_dsn->{P}, "\n";
             sleep 1;
             $dbh->disconnect();
             $get_dbh->();
@@ -6869,12 +6869,12 @@ sub recurse_to_slaves {
       }
    } until (defined $id);
    PTDEBUG && _d('Working on server ID', $id);
-   my $master_thinks_i_am = $dsn->{server_id};
+   my $source_thinks_i_am = $dsn->{server_id};
    if ( !defined $id
-       || ( defined $master_thinks_i_am && $master_thinks_i_am != $id )
+       || ( defined $source_thinks_i_am && $source_thinks_i_am != $id )
        || $args->{server_ids_seen}->{$id}++
    ) {
-      PTDEBUG && _d('Server ID seen, or not what master said');
+      PTDEBUG && _d('Server ID seen, or not what source said');
       if ( $args->{skip_callback} ) {
          $args->{skip_callback}->($dsn, $dbh, $level, $args->{parent});
       }
@@ -6885,51 +6885,51 @@ sub recurse_to_slaves {
 
    if ( !defined $recurse || $level < $recurse ) {
 
-      my @slaves =
-         grep { !$_->{master_id} || $_->{master_id} == $id } # Only my slaves.
-         $self->find_slave_hosts($dp, $dbh, $dsn, $methods);
+      my @replicas =
+         grep { !$_->{source_id} || $_->{source_id} == $id } # Only my replicas.
+         $self->find_replica_hosts($dp, $dbh, $dsn, $methods);
 
-      foreach my $slave ( @slaves ) {
+      foreach my $replica ( @replicas ) {
          PTDEBUG && _d('Recursing from',
-            $dp->as_string($dsn), 'to', $dp->as_string($slave));
-         $self->recurse_to_slaves(
-            { %$args, dsn => $slave, dbh => undef, parent => $dsn, slave_user => $slave_user, $slave_password => $slave_password }, $level + 1 );
+            $dp->as_string($dsn), 'to', $dp->as_string($replica));
+         $self->recurse_to_replicas(
+            { %$args, dsn => $replica, dbh => undef, parent => $dsn, replica_user => $replica_user, $replica_password => $replica_password }, $level + 1 );
       }
    }
 }
 
-sub find_slave_hosts {
+sub find_replica_hosts {
    my ( $self, $dsn_parser, $dbh, $dsn, $methods ) = @_;
 
-   PTDEBUG && _d('Looking for slaves on', $dsn_parser->as_string($dsn),
+   PTDEBUG && _d('Looking for replicas on', $dsn_parser->as_string($dsn),
       'using methods', @$methods);
 
-   my @slaves;
+   my @replicas;
    METHOD:
    foreach my $method ( @$methods ) {
-      my $find_slaves = "_find_slaves_by_$method";
-      PTDEBUG && _d('Finding slaves with', $find_slaves);
-      @slaves = $self->$find_slaves($dsn_parser, $dbh, $dsn);
-      last METHOD if @slaves;
+      my $find_replicas = "_find_replicas_by_$method";
+      PTDEBUG && _d('Finding replicas with', $find_replicas);
+      @replicas = $self->$find_replicas($dsn_parser, $dbh, $dsn);
+      last METHOD if @replicas;
    }
 
-   PTDEBUG && _d('Found', scalar(@slaves), 'slaves');
-   return @slaves;
+   PTDEBUG && _d('Found', scalar(@replicas), 'replicas');
+   return @replicas;
 }
 
-sub _find_slaves_by_processlist {
+sub _find_replicas_by_processlist {
    my ( $self, $dsn_parser, $dbh, $dsn ) = @_;
-   my @connected_slaves = $self->get_connected_slaves($dbh);
-   my @slaves = $self->_process_slaves_list($dsn_parser, $dsn, \@connected_slaves);
-   return @slaves;
+   my @connected_replicas = $self->get_connected_replicas($dbh);
+   my @replicas = $self->_process_replicas_list($dsn_parser, $dsn, \@connected_replicas);
+   return @replicas;
 }
 
-sub _process_slaves_list {
-   my ($self, $dsn_parser, $dsn, $connected_slaves) = @_;
-   my @slaves = map  {
-      my $slave        = $dsn_parser->parse("h=$_", $dsn);
-      $slave->{source} = 'processlist';
-      $slave;
+sub _process_replicas_list {
+   my ($self, $dsn_parser, $dsn, $connected_replicas) = @_;
+   my @replicas = map  {
+      my $replica        = $dsn_parser->parse("h=$_", $dsn);
+      $replica->{source} = 'processlist';
+      $replica;
    }
    grep { $_ }
    map  {
@@ -6941,22 +6941,28 @@ sub _process_slaves_list {
           $host = '['.$host.']';
       }
       $host;
-   } @$connected_slaves;
+   } @$connected_replicas;
 
-   return @slaves;
+   return @replicas;
 }
 
-sub _find_slaves_by_hosts {
+sub _find_replicas_by_hosts {
    my ( $self, $dsn_parser, $dbh, $dsn ) = @_;
 
-   my @slaves;
-   my $sql = 'SHOW SLAVE HOSTS';
+   my @replicas;
+
+   my $vp = VersionParser->new($dbh);
+   my $sql = 'SHOW REPLICAS';
+   if ( $vp < '8.1' || $vp->flavor() =~ m/maria/ ) {
+      $sql = 'SHOW SLAVE HOSTS';
+   }
+   
    PTDEBUG && _d($dbh, $sql);
-   @slaves = @{$dbh->selectall_arrayref($sql, { Slice => {} })};
+   @replicas = @{$dbh->selectall_arrayref($sql, { Slice => {} })};
 
-   if ( @slaves ) {
-      PTDEBUG && _d('Found some SHOW SLAVE HOSTS info');
-      @slaves = map {
+   if ( @replicas ) {
+      PTDEBUG && _d('Found some SHOW REPLICAS info');
+      @replicas = map {
          my %hash;
          @hash{ map { lc $_ } keys %$_ } = values %$_;
          my $spec = "h=$hash{host},P=$hash{port}"
@@ -6964,16 +6970,16 @@ sub _find_slaves_by_hosts {
             . ( $hash{password} ? ",p=$hash{password}" : '');
          my $dsn           = $dsn_parser->parse($spec, $dsn);
          $dsn->{server_id} = $hash{server_id};
-         $dsn->{master_id} = $hash{master_id};
+         $dsn->{source_id} = $hash{source_id};
          $dsn->{source}    = 'hosts';
          $dsn;
-      } @slaves;
+      } @replicas;
    }
 
-   return @slaves;
+   return @replicas;
 }
 
-sub get_connected_slaves {
+sub get_connected_replicas {
    my ( $self, $dbh ) = @_;
 
    my $show = "SHOW GRANTS FOR ";
@@ -7019,79 +7025,103 @@ sub get_connected_slaves {
    @{$dbh->selectall_arrayref($sql, { Slice => {} })};
 }
 
-sub is_master_of {
-   my ( $self, $master, $slave ) = @_;
-   my $master_status = $self->get_master_status($master)
-      or die "The server specified as a master is not a master";
-   my $slave_status  = $self->get_slave_status($slave)
-      or die "The server specified as a slave is not a slave";
-   my @connected     = $self->get_connected_slaves($master)
-      or die "The server specified as a master has no connected slaves";
-   my (undef, $port) = $master->selectrow_array("SHOW VARIABLES LIKE 'port'");
+sub is_source_of {
+   my ( $self, $source, $replica ) = @_;
+
+   my $replica_version = VersionParser->new($replica);
+   my $source_name = 'source';
+   my $source_port = 'source_port';
+   if ( $replica_version < '8.1' || $replica_version->flavor() =~ m/maria/ ) {
+      $source_name = 'master';
+      $source_port = 'master_port';
+   }
+
+   my $source_status = $self->get_source_status($source)
+      or die "The server specified as a source is not a source";
+   my $replica_status  = $self->get_replica_status($replica)
+      or die "The server specified as a replica is not a replica";
+   my @connected     = $self->get_connected_replicas($source)
+      or die "The server specified as a source has no connected replicas";
+   my (undef, $port) = $source->selectrow_array("SHOW VARIABLES LIKE 'port'");
 
-   if ( $port != $slave_status->{master_port} ) {
-      die "The slave is connected to $slave_status->{master_port} "
-         . "but the master's port is $port";
+   if ( $port != $replica_status->{$source_port} ) {
+      die "The replica is connected to $replica_status->{$source_port} "
+         . "but the source's port is $port";
    }
 
-   if ( !grep { $slave_status->{master_user} eq $_->{user} } @connected ) {
-      die "I don't see any slave I/O thread connected with user "
-         . $slave_status->{master_user};
+   if ( !grep { $replica_status->{source_user} eq $_->{user} } @connected ) {
+      die "I don't see any replica I/O thread connected with user "
+         . $replica_status->{source_user};
    }
 
-   if ( ($slave_status->{slave_io_state} || '')
-      eq 'Waiting for master to send event' )
+   if ( ($replica_status->{replica_io_state} || '')
+      eq 'Waiting for ${source_name} to send event' )
    {
-      my ( $master_log_name, $master_log_num )
-         = $master_status->{file} =~ m/^(.*?)\.0*([1-9][0-9]*)$/;
-      my ( $slave_log_name, $slave_log_num )
-         = $slave_status->{master_log_file} =~ m/^(.*?)\.0*([1-9][0-9]*)$/;
-      if ( $master_log_name ne $slave_log_name
-         || abs($master_log_num - $slave_log_num) > 1 )
+      my ( $source_log_name, $source_log_num )
+         = $source_status->{file} =~ m/^(.*?)\.0*([1-9][0-9]*)$/;
+      my ( $replica_log_name, $replica_log_num )
+         = $replica_status->{source_log_file} =~ m/^(.*?)\.0*([1-9][0-9]*)$/;
+      if ( $source_log_name ne $replica_log_name
+         || abs($source_log_num - $replica_log_num) > 1 )
       {
-         die "The slave thinks it is reading from "
-            . "$slave_status->{master_log_file},  but the "
-            . "master is writing to $master_status->{file}";
+         die "The replica thinks it is reading from "
+            . "$replica_status->{source_log_file},  but the "
+            . "source is writing to $source_status->{file}";
       }
    }
    return 1;
 }
 
-sub get_master_dsn {
+sub get_source_dsn {
    my ( $self, $dbh, $dsn, $dsn_parser ) = @_;
-   my $master = $self->get_slave_status($dbh) or return undef;
-   my $spec   = "h=$master->{master_host},P=$master->{master_port}";
+
+   my $vp = VersionParser->new($dbh);
+   my $source_host = 'source_host';
+   my $source_port = 'source_port';
+   if ( $vp < '8.1' || $vp->flavor() =~ m/maria/ ) {
+      $source_host = 'master_host';
+      $source_port = 'master_port';
+   }
+
+   my $source = $self->get_replica_status($dbh) or return undef;
+   my $spec   = "h=$source->{${source_host}},P=$source->{${source_port}}";
    return       $dsn_parser->parse($spec, $dsn);
 }
 
-sub get_slave_status {
+sub get_replica_status {
    my ( $self, $dbh ) = @_;
 
-   if ( !$self->{not_a_slave}->{$dbh} ) {
-      my $sth = $self->{sths}->{$dbh}->{SLAVE_STATUS}
-            ||= $dbh->prepare('SHOW SLAVE STATUS');
-      PTDEBUG && _d($dbh, 'SHOW SLAVE STATUS');
+   my $server_version = VersionParser->new($dbh);
+   my $replica_name = 'replica';
+   if ( $server_version < '8.1' || $server_version->flavor() =~ m/maria/ ) {
+      $replica_name = 'slave';
+   }
+
+   if ( !$self->{not_a_replica}->{$dbh} ) {
+      my $sth = $self->{sths}->{$dbh}->{REPLICA_STATUS}
+            ||= $dbh->prepare("SHOW ${replica_name} STATUS");
+      PTDEBUG && _d($dbh, "SHOW ${replica_name} STATUS");
       $sth->execute();
-      my ($sss_rows) = $sth->fetchall_arrayref({}); # Show Slave Status rows
+      my ($sss_rows) = $sth->fetchall_arrayref({}); # Show Replica Status rows
 
       my $ss;
       if ( $sss_rows && @$sss_rows ) {
           if (scalar @$sss_rows > 1) {
               if (!$self->{channel}) {
-                  die 'This server returned more than one row for SHOW SLAVE STATUS but "channel" was not specified on the command line';
+                  die 'This server returned more than one row for SHOW REPLICA STATUS but "channel" was not specified on the command line';
               }
-              my $slave_use_channels;
+              my $replica_use_channels;
               for my $row (@$sss_rows) {
                   $row = { map { lc($_) => $row->{$_} } keys %$row }; # lowercase the keys
                   if ($row->{channel_name}) {
-                      $slave_use_channels = 1;
+                      $replica_use_channels = 1;
                   }
                   if ($row->{channel_name} eq $self->{channel}) {
                       $ss = $row;
                       last;
                   }
               }
-              if (!$ss && $slave_use_channels) {
+              if (!$ss && $replica_use_channels) {
                  die 'This server is using replication channels but "channel" was not specified on the command line';
               }
           } else {
@@ -7111,28 +7141,34 @@ sub get_slave_status {
           }
       }
 
-      PTDEBUG && _d('This server returns nothing for SHOW SLAVE STATUS');
-      $self->{not_a_slave}->{$dbh}++;
+      PTDEBUG && _d('This server returns nothing for SHOW REPLICA STATUS');
+      $self->{not_a_replica}->{$dbh}++;
   }
 }
 
-sub get_master_status {
+sub get_source_status {
    my ( $self, $dbh ) = @_;
 
-   if ( $self->{not_a_master}->{$dbh} ) {
-      PTDEBUG && _d('Server on dbh', $dbh, 'is not a master');
+   if ( $self->{not_a_source}->{$dbh} ) {
+      PTDEBUG && _d('Server on dbh', $dbh, 'is not a source');
       return;
    }
 
+   my $vp = VersionParser->new($dbh);
+   my $source_name = 'binary log';
+   if ( $vp < '8.1' || $vp->flavor() =~ m/maria/ ) {
+      $source_name = 'master';
+   }
+
    my $sth;
    if ( $self->{sths}->{$dbh} && $dbh && $self->{sths}->{$dbh} == $dbh ) {
-      $sth = $self->{sths}->{$dbh}->{MASTER_STATUS}
-         ||= $dbh->prepare('SHOW MASTER STATUS');
+      $sth = $self->{sths}->{$dbh}->{SOURCE_STATUS}
+         ||= $dbh->prepare("SHOW ${source_name} STATUS");
    }
    else {
-      $sth = $dbh->prepare('SHOW MASTER STATUS');
+      $sth = $dbh->prepare("SHOW ${source_name} STATUS");
    }
-   PTDEBUG && _d($dbh, 'SHOW MASTER STATUS');
+   PTDEBUG && _d($dbh, "SHOW ${source_name} STATUS");
    $sth->execute();
    my ($ms) = @{$sth->fetchall_arrayref({})};
    PTDEBUG && _d(
@@ -7140,42 +7176,46 @@ sub get_master_status {
           : '');
 
    if ( !$ms || scalar keys %$ms < 2 ) {
-      PTDEBUG && _d('Server on dbh', $dbh, 'does not seem to be a master');
-      $self->{not_a_master}->{$dbh}++;
+      PTDEBUG && _d('Server on dbh', $dbh, 'does not seem to be a source');
+      $self->{not_a_source}->{$dbh}++;
    }
 
   return { map { lc($_) => $ms->{$_} } keys %$ms }; # lowercase the keys
 }
 
-sub wait_for_master {
+sub wait_for_source {
    my ( $self, %args ) = @_;
-   my @required_args = qw(master_status slave_dbh);
+   my @required_args = qw(source_status replica_dbh);
    foreach my $arg ( @required_args ) {
       die "I need a $arg argument" unless $args{$arg};
    }
-   my ($master_status, $slave_dbh) = @args{@required_args};
+   my ($source_status, $replica_dbh) = @args{@required_args};
    my $timeout       = $args{timeout} || 60;
 
    my $result;
    my $waited;
-   if ( $master_status ) {
-      my $slave_status;
+   if ( $source_status ) {
+      my $replica_status;
       eval {
-          $slave_status = $self->get_slave_status($slave_dbh);
+          $replica_status = $self->get_replica_status($replica_dbh);
       };
       if ($EVAL_ERROR) {
           return {
               result => undef,
               waited => 0,
-              error  =>'Wait for master: this is a multi-master slave but "channel" was not specified on the command line',
+              error  =>'Wait for source: this is a multi-source replica but "channel" was not specified on the command line',
           };
       }
-      my $server_version = VersionParser->new($slave_dbh);
-      my $channel_sql = $server_version > '5.6' && $self->{channel} ? ", '$self->{channel}'" : '';
-      my $sql = "SELECT MASTER_POS_WAIT('$master_status->{file}', $master_status->{position}, $timeout $channel_sql)";
-      PTDEBUG && _d($slave_dbh, $sql);
+      my $vp = VersionParser->new($replica_dbh);
+      my $source_name = 'source';
+      if ( $vp < '8.1' || $vp->flavor() =~ m/maria/ ) {
+         $source_name = 'master';
+      }
+      my $channel_sql = $vp > '5.6' && $self->{channel} ? ", '$self->{channel}'" : '';
+      my $sql = "SELECT ${source_name}_POS_WAIT('$source_status->{file}', $source_status->{position}, $timeout $channel_sql)";
+      PTDEBUG && _d($replica_dbh, $sql);
       my $start = time;
-      ($result) = $slave_dbh->selectrow_array($sql);
+      ($result) = $replica_dbh->selectrow_array($sql);
 
       $waited = time - $start;
 
@@ -7183,7 +7223,7 @@ sub wait_for_master {
       PTDEBUG && _d("Waited", $waited, "seconds");
    }
    else {
-      PTDEBUG && _d('Not waiting: this server is not a master');
+      PTDEBUG && _d('Not waiting: this server is not a source');
    }
 
    return {
@@ -7192,75 +7232,96 @@ sub wait_for_master {
    };
 }
 
-sub stop_slave {
+sub stop_replica {
    my ( $self, $dbh ) = @_;
-   my $sth = $self->{sths}->{$dbh}->{STOP_SLAVE}
-         ||= $dbh->prepare('STOP SLAVE');
+   my $vp = VersionParser->new($dbh);
+   my $replica_name = 'replica';
+   if ( $vp < '8.1' || $vp->flavor() =~ m/maria/ ) {
+      $replica_name = 'slave';
+   }
+   my $sth = $self->{sths}->{$dbh}->{STOP_REPLICA}
+         ||= $dbh->prepare("STOP ${replica_name}");
    PTDEBUG && _d($dbh, $sth->{Statement});
    $sth->execute();
 }
 
-sub start_slave {
+sub start_replica {
    my ( $self, $dbh, $pos ) = @_;
+
+   my $vp = VersionParser->new($dbh);
+   my $source_name = 'source';
+   my $replica_name = 'replica';
+   if ( $vp < '8.1' || $vp->flavor() =~ m/maria/ ) {
+      $source_name = 'master';
+      $replica_name = 'slave';
+   }
+
    if ( $pos ) {
-      my $sql = "START SLAVE UNTIL MASTER_LOG_FILE='$pos->{file}', "
-              . "MASTER_LOG_POS=$pos->{position}";
+      my $sql = "START ${replica_name} UNTIL ${source_name}_LOG_FILE='$pos->{file}', "
+              . "${source_name}_LOG_POS=$pos->{position}";
       PTDEBUG && _d($dbh, $sql);
       $dbh->do($sql);
    }
    else {
-      my $sth = $self->{sths}->{$dbh}->{START_SLAVE}
-            ||= $dbh->prepare('START SLAVE');
+      my $sth = $self->{sths}->{$dbh}->{START_REPLICA}
+            ||= $dbh->prepare("START ${replica_name}");
       PTDEBUG && _d($dbh, $sth->{Statement});
       $sth->execute();
    }
 }
 
-sub catchup_to_master {
-   my ( $self, $slave, $master, $timeout ) = @_;
-   $self->stop_slave($master);
-   $self->stop_slave($slave);
-   my $slave_status  = $self->get_slave_status($slave);
-   my $slave_pos     = $self->repl_posn($slave_status);
-   my $master_status = $self->get_master_status($master);
-   my $master_pos    = $self->repl_posn($master_status);
-   PTDEBUG && _d('Master position:', $self->pos_to_string($master_pos),
-      'Slave position:', $self->pos_to_string($slave_pos));
+sub catchup_to_source {
+   my ( $self, $replica, $source, $timeout ) = @_;
+   $self->stop_replica($source);
+   $self->stop_replica($replica);
+   my $replica_status  = $self->get_replica_status($replica);
+   my $replica_pos     = $self->repl_posn($replica_status);
+   my $source_status = $self->get_source_status($source);
+   my $source_pos    = $self->repl_posn($source_status);
+   PTDEBUG && _d('Source position:', $self->pos_to_string($source_pos),
+      'Replica position:', $self->pos_to_string($replica_pos));
 
    my $result;
-   if ( $self->pos_cmp($slave_pos, $master_pos) < 0 ) {
-      PTDEBUG && _d('Waiting for slave to catch up to master');
-      $self->start_slave($slave, $master_pos);
+   if ( $self->pos_cmp($replica_pos, $source_pos) < 0 ) {
+      PTDEBUG && _d('Waiting for replica to catch up to source');
+      $self->start_replica($replica, $source_pos);
 
-      $result = $self->wait_for_master(
-            master_status => $master_status,
-            slave_dbh     => $slave,
+      $result = $self->wait_for_source(
+            source_status => $source_status,
+            replica_dbh   => $replica,
             timeout       => $timeout,
-            master_status => $master_status
+            source_status => $source_status
       );
       if ($result->{error}) {
           die $result->{error};
       }
       if ( !defined $result->{result} ) {
-         $slave_status = $self->get_slave_status($slave);
-         if ( !$self->slave_is_running($slave_status) ) {
-            PTDEBUG && _d('Master position:',
-               $self->pos_to_string($master_pos),
-               'Slave position:', $self->pos_to_string($slave_pos));
-            $slave_pos = $self->repl_posn($slave_status);
-            if ( $self->pos_cmp($slave_pos, $master_pos) != 0 ) {
-               die "MASTER_POS_WAIT() returned NULL but slave has not "
-                  . "caught up to master";
+         $replica_status = $self->get_replica_status($replica);
+            
+         my $vp = VersionParser->new($replica);
+         my $replica_name = 'replica';
+         if ( $vp < '8.1' || $vp->flavor() =~ m/maria/ ) {
+            $replica_name = 'slave';
+         }
+
+         if ( !$self->replica_is_running($replica_status, $replica_name) ) {
+            PTDEBUG && _d('Source position:',
+               $self->pos_to_string($source_pos),
+               'Replica position:', $self->pos_to_string($replica_pos));
+            $replica_pos = $self->repl_posn($replica_status);
+            if ( $self->pos_cmp($replica_pos, $source_pos) != 0 ) {
+               die "SOURCE_POS_WAIT() returned NULL but replica has not "
+                  . "caught up to source";
             }
-            PTDEBUG && _d('Slave is caught up to master and stopped');
+            PTDEBUG && _d('Replica is caught up to source and stopped');
          }
          else {
-            die "Slave has not caught up to master and it is still running";
+            die "Replica has not caught up to source and it is still running";
          }
       }
    }
    else {
-      PTDEBUG && _d("Slave is already caught up to master");
+      PTDEBUG && _d("Replica is already caught up to source");
    }
 
    return $result;
@@ -7268,26 +7329,38 @@ sub catchup_to_master {
 
 sub catchup_to_same_pos {
    my ( $self, $s1_dbh, $s2_dbh ) = @_;
-   $self->stop_slave($s1_dbh);
-   $self->stop_slave($s2_dbh);
-   my $s1_status = $self->get_slave_status($s1_dbh);
-   my $s2_status = $self->get_slave_status($s2_dbh);
+   $self->stop_replica($s1_dbh);
+   $self->stop_replica($s2_dbh);
+   my $s1_status = $self->get_replica_status($s1_dbh);
+   my $s2_status = $self->get_replica_status($s2_dbh);
    my $s1_pos    = $self->repl_posn($s1_status);
    my $s2_pos    = $self->repl_posn($s2_status);
    if ( $self->pos_cmp($s1_pos, $s2_pos) < 0 ) {
-      $self->start_slave($s1_dbh, $s2_pos);
+      $self->start_replica($s1_dbh, $s2_pos);
    }
    elsif ( $self->pos_cmp($s2_pos, $s1_pos) < 0 ) {
-      $self->start_slave($s2_dbh, $s1_pos);
+      $self->start_replica($s2_dbh, $s1_pos);
    }
 
-   $s1_status = $self->get_slave_status($s1_dbh);
-   $s2_status = $self->get_slave_status($s2_dbh);
+   $s1_status = $self->get_replica_status($s1_dbh);
+   $s2_status = $self->get_replica_status($s2_dbh);
    $s1_pos    = $self->repl_posn($s1_status);
    $s2_pos    = $self->repl_posn($s2_status);
 
-   if ( $self->slave_is_running($s1_status)
-     || $self->slave_is_running($s2_status)
+   my $vp1 = VersionParser->new($s1_dbh);
+   my $replica1_name = 'replica';
+   if ( $vp1 < '8.1' || $vp1->flavor() =~ m/maria/ ) {
+      $replica1_name = 'slave';
+   }
+
+   my $vp2 = VersionParser->new($s2_dbh);
+   my $replica2_name = 'replica';
+   if ( $vp2 < '8.1' || $vp2->flavor() =~ m/maria/ ) {
+      $replica2_name = 'slave';
+   }
+
+   if ( $self->replica_is_running($s1_status, $replica1_name)
+     || $self->replica_is_running($s2_status, $replica2_name)
      || $self->pos_cmp($s1_pos, $s2_pos) != 0)
    {
       die "The servers aren't both stopped at the same position";
@@ -7295,14 +7368,21 @@ sub catchup_to_same_pos {
 
 }
 
-sub slave_is_running {
-   my ( $self, $slave_status ) = @_;
-   return ($slave_status->{slave_sql_running} || 'No') eq 'Yes';
+sub replica_is_running {
+   my ( $self, $replica_status, $replica_name ) = @_;
+   return ($replica_status->{"${replica_name}_sql_running"} || 'No') eq 'Yes';
 }
 
-sub has_slave_updates {
+sub has_replica_updates {
    my ( $self, $dbh ) = @_;
-   my $sql = q{SHOW VARIABLES LIKE 'log_slave_updates'};
+   
+   my $vp = VersionParser->new($dbh);
+   my $replica_name = 'replica';
+   if ( $vp < '8.1' || $vp->flavor() =~ m/maria/ ) {
+      $replica_name = 'slave';
+   }
+
+   my $sql = qq{SHOW VARIABLES LIKE 'log_${replica_name}_updates'};
    PTDEBUG && _d($dbh, $sql);
    my ($name, $value) = $dbh->selectrow_array($sql);
    return $value && $value =~ m/^(1|ON)$/;
@@ -7316,6 +7396,12 @@ sub repl_posn {
          position => $status->{position},
       };
    }
+   elsif ( exists $status->{relay_source_log_file} && exists $status->{exec_source_log_pos} ) {
+      return {
+         file     => $status->{relay_source_log_file},
+         position => $status->{exec_source_log_pos},
+      };
+   }
    else {
       return {
          file     => $status->{relay_master_log_file},
@@ -7324,11 +7410,18 @@ sub repl_posn {
    }
 }
 
-sub get_slave_lag {
+sub get_replica_lag {
    my ( $self, $dbh ) = @_;
-   my $stat = $self->get_slave_status($dbh);
-   return unless $stat;  # server is not a slave
-   return $stat->{seconds_behind_master};
+   
+   my $vp = VersionParser->new($dbh);
+   my $source_name = 'source';
+   if ( $vp < '8.1' || $vp->flavor() =~ m/maria/ ) {
+      $source_name = 'master';
+   }
+
+   my $stat = $self->get_replica_status($dbh);
+   return unless $stat;  # server is not a replica
+   return $stat->{"seconds_behind_${source_name}"};
 }
 
 sub pos_cmp {
@@ -7339,9 +7432,9 @@ sub pos_cmp {
 sub short_host {
    my ( $self, $dsn ) = @_;
    my ($host, $port);
-   if ( $dsn->{master_host} ) {
-      $host = $dsn->{master_host};
-      $port = $dsn->{master_port};
+   if ( $dsn->{source_host} ) {
+      $host = $dsn->{source_host};
+      $port = $dsn->{source_port};
    }
    else {
       $host = $dsn->{h};
@@ -7356,7 +7449,7 @@ sub is_replication_thread {
 
    my $type = lc($args{type} || 'all');
    die "Invalid type: $type"
-      unless $type =~ m/^binlog_dump|slave_io|slave_sql|all$/i;
+      unless $type =~ m/^binlog_dump|slave_io|slave_sql|replica_io|replica_sql|all$/i;
 
    my $match = 0;
    if ( $type =~ m/binlog_dump|all/i ) {
@@ -7365,7 +7458,7 @@ sub is_replication_thread {
    }
    if ( !$match ) {
       if ( ($query->{User} || $query->{user} || '') eq "system user" ) {
-         PTDEBUG && _d("Slave replication thread");
+         PTDEBUG && _d("Replica replication thread");
          if ( $type ne 'all' ) {
             my $state = $query->{State} || $query->{state} || '';
 
@@ -7374,15 +7467,16 @@ sub is_replication_thread {
                $match = 1;
             }
             else {
-               my ($slave_sql) = $state =~ m/
+               my ($replica_sql) = $state =~ m/
                   ^(Waiting\sfor\sthe\snext\sevent
                    |Reading\sevent\sfrom\sthe\srelay\slog
                    |Has\sread\sall\srelay\slog;\swaiting
                    |Making\stemp\sfile
-                   |Waiting\sfor\sslave\smutex\son\sexit)/xi;
+                   |Waiting\sfor\sslave\smutex\son\sexit
+                   |Waiting\sfor\sreplica\smutex\son\sexit)/xi;
 
-               $match = $type eq 'slave_sql' &&  $slave_sql ? 1
-                      : $type eq 'slave_io'  && !$slave_sql ? 1
+               $match = $type eq 'replica_sql' &&  $replica_sql ? 1
+                      : $type eq 'replica_io'  && !$replica_sql ? 1
                       :                                       0;
             }
          }
@@ -7423,9 +7517,15 @@ sub get_replication_filters {
    }
    my ($dbh) = @args{@required_args};
 
+   my $vp = VersionParser->new($dbh);
+   my $replica_name = 'replica';
+   if ( $vp < '8.1' || $vp->flavor() =~ m/maria/ ) {
+      $replica_name = 'slave';
+   }
+
    my %filters = ();
 
-   my $status = $self->get_master_status($dbh);
+   my $status = $self->get_source_status($dbh);
    if ( $status ) {
       map { $filters{$_} = $status->{$_} }
       grep { defined $status->{$_} && $status->{$_} ne '' }
@@ -7435,7 +7535,7 @@ sub get_replication_filters {
       );
    }
 
-   $status = $self->get_slave_status($dbh);
+   $status = $self->get_replica_status($dbh);
    if ( $status ) {
       map { $filters{$_} = $status->{$_} }
       grep { defined $status->{$_} && $status->{$_} ne '' }
@@ -7448,10 +7548,10 @@ sub get_replication_filters {
          replicate_wild_ignore_table
       );
 
-      my $sql = "SHOW VARIABLES LIKE 'slave_skip_errors'";
+      my $sql = "SHOW VARIABLES LIKE '${replica_name}_skip_errors'";
       PTDEBUG && _d($dbh, $sql);
       my $row = $dbh->selectrow_arrayref($sql);
-      $filters{slave_skip_errors} = $row->[1] if $row->[1] && $row->[1] ne 'OFF';
+      $filters{replica_skip_errors} = $row->[1] if $row->[1] && $row->[1] ne 'OFF';
    }
 
    return \%filters;
@@ -10055,7 +10155,7 @@ sub main {
    my $dp = $o->DSNParser();
    $dp->prop('set-vars', $o->set_vars());
 
-   if ( $o->get('replicate') || $o->get('sync-to-master') ) {
+   if ( $o->get('replicate') || $o->get('sync-to-source') ) {
       $o->set('wait', 60) unless $o->got('wait');
    }
    if ( $o->get('wait') ) {
@@ -10088,13 +10188,13 @@ sub main {
    }
 
    if ( !@dsns
-        || (@dsns ==1 && !$o->get('replicate') && !$o->get('sync-to-master'))) {
+        || (@dsns ==1 && !$o->get('replicate') && !$o->get('sync-to-source'))) {
       $o->save_error('At least one DSN is required, and at least two are '
-         . 'required unless --sync-to-master or --replicate is specified');
+         . 'required unless --sync-to-source or --replicate is specified');
    }
 
-   if ( @dsns > 1 && $o->get('sync-to-master') && $o->get('replicate') ) {
-      $o->save_error('--sync-to-master and --replicate require only one DSN ',
+   if ( @dsns > 1 && $o->get('sync-to-source') && $o->get('replicate') ) {
+      $o->save_error('--sync-to-source and --replicate require only one DSN ',
          ' but ', scalar @dsns, ' where given');
    }
 
@@ -10106,9 +10206,9 @@ sub main {
    }
 
    if ( $o->get('bidirectional') ) {
-      if ( $o->get('replicate') || $o->get('sync-to-master') ) {
+      if ( $o->get('replicate') || $o->get('sync-to-source') ) {
          $o->save_error('--bidirectional does not work with '
-            . '--replicate or --sync-to-master');
+            . '--replicate or --sync-to-source');
       }
       if ( @dsns < 2 ) {
          $o->save_error('--bidirectional requires at least two DSNs');
@@ -10223,24 +10323,33 @@ sub main {
 
    my $exit_status = 0; # 1: internal error, 2: tables differed, 3: both
 
-   # dsn[0] is expected to be the master (i.e. the source).  So if
-   # --sync-to-master, then dsn[0] is a slave.  Find its master and
-   # make the master dsn[0] and the slave dsn[1].
-   if ( $o->get('sync-to-master') ) {
-      PTDEBUG && _d('Getting master of', $dp->as_string($dsns[0]));
+   # dsn[0] is expected to be the source (i.e. the source).  So if
+   # --sync-to-source, then dsn[0] is a replica.  Find its source and
+   # make the source dsn[0] and the replica dsn[1].
+   if ( $o->get('sync-to-source') ) {
+      PTDEBUG && _d('Getting source of', $dp->as_string($dsns[0]));
       $dsns[0]->{dbh} = get_cxn($dsns[0], %modules);
-      my $master = $ms->get_master_dsn($dsns[0]->{dbh}, $dsns[0], $dp)
-         or die "Can't determine master of " . $dp->as_string($dsns[0]);
-      unshift @dsns, $master;  # dsn[0]=master, dsn[1]=slave
+      my $source = $ms->get_source_dsn($dsns[0]->{dbh}, $dsns[0], $dp)
+         or die "Can't determine source of " . $dp->as_string($dsns[0]);
+      unshift @dsns, $source;  # dsn[0]=source, dsn[1]=replica
       $dsns[0]->{dbh} = get_cxn($dsns[0], %modules);
-      if ( $o->get('check-master') ) {
-         my $is_master_of = eval {
-            $ms->is_master_of($dsns[0]->{dbh}, $dsns[1]->{dbh});
+        
+      my $vp = VersionParser->new($dsns[1]->{dbh});
+      my $source_name = 'source';
+      my $replica_name = 'replica';
+      if ( $vp < '8.1' || $vp->flavor() =~ m/maria/ ) {
+         $source_name = 'master';
+         $replica_name = 'replica';
+      }
+
+      if ( $o->get('check-source') ) {
+         my $is_source_of = eval {
+            $ms->is_source_of($dsns[0]->{dbh}, $dsns[1]->{dbh});
          };
 
          # We should not die if replica connected via tunnel or port redirection
          if ( $EVAL_ERROR ) {
-            $EVAL_ERROR =~ m/The slave is connected to (\d+) but the master's port is \d+/;
+            $EVAL_ERROR =~ m/The ${replica_name} is connected to (\d+) but the ${source_name}'s port is \d+/;
             if ( !$1 || $1 != $dsns[0]->{P} ) {
                die $EVAL_ERROR;
             }
@@ -10365,7 +10474,7 @@ sub lock_and_rename {
    }
 
    # We don't use lock_server() here because it does the usual stuff wrt
-   # waiting for slaves to catch up to master, etc, etc.
+   # waiting for replicas to catch up to source, etc, etc.
    my $src_db_tbl = $q->quote($src->{db}, $src->{tbl});
    my $dst_db_tbl = $q->quote($dst->{db}, $dst->{tbl});
    my $tmp_db_tbl = $q->quote($src->{db}, $src->{tbl} . "_tmp_$PID");
@@ -10477,10 +10586,10 @@ sub sync_one_table {
 # Sub: sync_via_replication
 #   Sync multiple destination hosts to one source host via replication.
 #   The first DSN in $args{dsns} specifies the source host.
-#   If --sync-to-master is specified, then the source host is a master
-#   and there is only one destination host which is its slave.
+#   If --sync-to-source is specified, then the source host is a source
+#   and there is only one destination host which is its replica.
 #   Else, destination hosts are auto-discovered with
-#   <MasterSlave::recurse_to_slaves()>.
+#   <MasterSlave::recurse_to_replicas()>.
 #
 # Parameters:
 #   %args - Arguments
@@ -10534,9 +10643,9 @@ sub sync_via_replication {
    my %skip_table;
    my $exit_status = 0;
 
-   # Connect to the master and treat it as the source, then find
-   # differences on the slave and sync them.
-   if ( $o->get('sync-to-master') ) {
+   # Connect to the source and treat it as the source, then find
+   # differences on the replica and sync them.
+   if ( $o->get('sync-to-source') ) {
       my $dst = {
          dsn      => $dsns->[1],
          dbh      => $dsns->[1]->{dbh} || get_cxn($dsns->[1], %args),
@@ -10545,13 +10654,13 @@ sub sync_via_replication {
          tbl      => undef,  # set later
       };
 
-      # First, check that the master (source) has no discrepancies itself,
+      # First, check that the source (source) has no discrepancies itself,
       # and ignore tables that do.
       my $src_diffs = $checksum->find_replication_differences(
          $src->{dbh}, $o->get('replicate'));
       map { $skip_table{lc $_->{db}}->{lc $_->{tbl}}++ } @$src_diffs;
 
-      # Now check the slave for differences and sync them if necessary.
+      # Now check the replica for differences and sync them if necessary.
       my $dst_diffs = $checksum->find_replication_differences(
          $dst->{dbh}, $o->get('replicate'));
       my $diffs = filter_diffs(
@@ -10599,12 +10708,12 @@ sub sync_via_replication {
       }
 
       disconnect($dst);
-   } # sync-to-master
+   } # sync-to-source
 
-   # The DSN is the master.  Connect to each slave, find differences,
+   # The DSN is the source.  Connect to each replica, find differences,
    # then sync them.
    else {
-      $ms->recurse_to_slaves(
+      $ms->recurse_to_replicas(
          {  dbh      => $src->{dbh},
             dsn      => $src->{dsn},
             recurse  => 1,
@@ -10613,13 +10722,13 @@ sub sync_via_replication {
                my $all_diffs = $checksum->find_replication_differences(
                   $dbh, $o->get('replicate'));
                if ( !$level ) {
-                  # This is the master; don't sync any tables that are wrong
+                  # This is the source; don't sync any tables that are wrong
                   # here, for obvious reasons.
                   map { $skip_table{lc $_->{db}}->{lc $_->{tbl}}++ }
                      @$all_diffs;
                }
                else {
-                  # This is a slave.
+                  # This is a replica.
                   my $diffs = filter_diffs(
                      diffs          => $all_diffs,
                      SchemaIterator => $schema_iter,
@@ -10673,13 +10782,13 @@ sub sync_via_replication {
                   else {
                      PTDEBUG && _d('No checksum differences');
                   }
-               }  # this is a slave
+               }  # this is a replica
 
                return;
-            },  # recurse_to_slaves() callback
+            },  # recurse_to_replicas() callback
          },
       );
-   } # DSN is master
+   } # DSN is source
 
    disconnect($src);
    return $exit_status;
@@ -10959,7 +11068,7 @@ sub sync_a_table {
       }
 
       # get_change_dbh() may die if, for example, the destination is
-      # not a slave.  Perhaps its work should be part of can_sync()?
+      # not a replica.  Perhaps its work should be part of can_sync()?
       my $change_dbh = get_change_dbh(tbl_struct => $tbl_struct, %args);
       my $actions    = make_action_subs(change_dbh => $change_dbh, %args);
 
@@ -10974,7 +11083,7 @@ sub sync_a_table {
          queue      => $o->get('buffer-to-client') ? 1 : 0,
          replace    => $o->get('replace')
                        || $o->get('replicate')
-                       || $o->get('sync-to-master')
+                       || $o->get('sync-to-source')
                        || 0,
          actions    => $actions,
          Quoter     => $args{Quoter},
@@ -10994,7 +11103,7 @@ sub sync_a_table {
          buffer_in_mysql   => $o->get('buffer-in-mysql'),
          buffer_to_client  => $o->get('buffer-to-client'),
          changing_src      => $o->get('replicate')
-                              || $o->get('sync-to-master')
+                              || $o->get('sync-to-source')
                               || $o->get('bidirectional')
                               || 0,
          float_precision   => $o->get('float-precision'),
@@ -11037,12 +11146,12 @@ sub sync_a_table {
 
 # Sub: get_change_dbh
 #   Return the dbh to write to for syncing changes.  Write statements
-#   are executed on the "change dbh".  If --sync-to-master or --replicate
-#   is specified, the source (master) dbh is the "change dbh".  This means
-#   changes replicate to all slaves.  Else, the destination dbh is the
+#   are executed on the "change dbh".  If --sync-to-source or --replicate
+#   is specified, the source (source) dbh is the "change dbh".  This means
+#   changes replicate to all replicas.  Else, the destination dbh is the
 #   change dbh.  This is the case when two independent servers (or perhaps
 #   one table on the same server) are synced.  This sub implements
-#   --[no]check-slave because writing to a slave is generally a bad thing.
+#   --[no]check-replica because writing to a replica is generally a bad thing.
 #
 # Parameters:
 #   %args - Arguments
@@ -11071,24 +11180,24 @@ sub get_change_dbh {
 
    my $change_dbh = $dst->{dbh};  # The default case: making changes on dst.
 
-   if ( $o->get('sync-to-master') || $o->get('replicate') ) {
-      # Is it possible to make changes on the master (i.e. the source)?
+   if ( $o->get('sync-to-source') || $o->get('replicate') ) {
+      # Is it possible to make changes on the source (i.e. the source)?
       # Only if REPLACE will work.
       my $can_replace = grep { $_->{is_unique} } values %{$tbl_struct->{keys}};
       PTDEBUG && _d("This table's replace-ability:", $can_replace);
-      die "Can't make changes on the master because no unique index exists"
+      die "Can't make changes on the source because no unique index exists"
          unless $can_replace;
       $change_dbh = $src->{dbh};  # The alternate case.
       PTDEBUG && _d('Will make changes on source', $change_dbh);
    }
-   elsif ( $o->get('check-slave') ) {
+   elsif ( $o->get('check-replica') ) {
       # Is it safe to change data on the destination?  Only if it's *not*
-      # a slave.  We don't change tables on slaves directly.  If we are
-      # forced to change data on a slave, we require either that 1) binary
+      # a replica.  We don't change tables on replicas directly.  If we are
+      # forced to change data on a replica, we require either that 1) binary
       # logging is disabled, or 2) the check is bypassed.  By the way, just
-      # because the server is a slave doesn't mean it's not also the master
-      # of the master (master-master replication).
-      my $slave_status = $ms->get_slave_status($dst->{dbh});
+      # because the server is a replica doesn't mean it's not also the source
+      # of the source (source-source replication).
+      my $replica_status = $ms->get_replica_status($dst->{dbh});
       my (undef, $log_bin) = $dst->{dbh}->selectrow_array(
          q{SHOW VARIABLES LIKE 'log_bin'});
       my ($sql_log_bin) = $dst->{dbh}->selectrow_array(
@@ -11096,9 +11205,9 @@ sub get_change_dbh {
       PTDEBUG && _d('Variables on destination:',
          'log_bin=', (defined $log_bin ? $log_bin : 'NULL'),
          ' @@SQL_LOG_BIN=', (defined $sql_log_bin ? $sql_log_bin : 'NULL'));
-      if ( $slave_status && $sql_log_bin && ($log_bin || 'OFF') eq 'ON' ) {
+      if ( $replica_status && $sql_log_bin && ($log_bin || 'OFF') eq 'ON' ) {
          die "Can't make changes on ", $dp->as_string($dst->{dsn}),
-            " because it's a slave.  See the documentation section",
+            " because it's a replica.  See the documentation section",
             " 'REPLICATION SAFETY' for solutions to this problem.";
       }
       PTDEBUG && _d('Will make changes on destination', $change_dbh);
@@ -11246,7 +11355,7 @@ sub get_cxn {
    # This is because starting with MySQL 5.1.29, changing the format
    # requires a SUPER user.
    if ( VersionParser->new($dbh) >= '5.1.29'
-        && ($o->get('replicate') || $o->get('sync-to-master'))) {
+        && ($o->get('replicate') || $o->get('sync-to-source'))) {
       $sql = 'SELECT @@binlog_format';
       PTDEBUG && _d($dbh, $sql);
       my ($original_binlog_format) = $dbh->selectrow_array($sql);
@@ -11337,8 +11446,8 @@ sub ok_to_sync {
       tbl => $dst->{tbl},
    );
 
-   if ( lc($src->{tbl_struct}->{engine}) eq 'rocksdb' && ($o->get('sync-to-master')) ) {
-       print STDERR "Cannot sync using --sync-to-master with $dst->{db}.$dst->{tbl} ".
+   if ( lc($src->{tbl_struct}->{engine}) eq 'rocksdb' && ($o->get('sync-to-source')) ) {
+       print STDERR "Cannot sync using --sync-to-source with $dst->{db}.$dst->{tbl} ".
              "due to the limitations of the RocksDB engine.\n\n".
              "More information: https://www.percona.com/doc/percona-server/LATEST/myrocks/limitations.html\n\n";
        die "Process aborted.\n";
@@ -11367,7 +11476,7 @@ sub ok_to_sync {
 
    my $replace = $o->get('replace')
               || $o->get('replicate')
-              || $o->get('sync-to-master');
+              || $o->get('sync-to-source');
    if ( $replace && $o->get('execute') && $o->get('check-child-tables') ) {
       my $child_tables = find_child_tables(
          tbl    => $src,
@@ -11430,12 +11539,12 @@ sub get_triggers {
 }
 
 # Sub: filter_diffs
-#   Filter different slave tables according to the various schema object
+#   Filter different replica tables according to the various schema object
 #   filters.  This sub is called in <sync_via_replication()> to implement
 #   schema object filters like --databases and --tables.
 #
 # Returns:
-#   Arrayref of different slave tables that pass the filters
+#   Arrayref of different replica tables that pass the filters
 sub filter_diffs {
    my ( %args ) = @_;
    my @required_args = qw(diffs SchemaIterator skip_table);
@@ -11881,12 +11990,12 @@ Usage: pt-table-sync [OPTIONS] DSN [DSN]
 pt-table-sync synchronizes data efficiently between MySQL tables.
 
 This tool changes data, so for maximum safety, you should back up your data
-before using it.  When synchronizing a server that is a replication slave
-with the L<"--replicate"> or L<"--sync-to-master"> methods, it B<always>
-makes the changes on the replication master, B<never> the replication slave
+before using it.  When synchronizing a server that is a replication replica
+with the L<"--replicate"> or L<"--sync-to-source"> methods, it B<always>
+makes the changes on the replication source, B<never> the replication replica
 directly.  This is in general the only safe way to bring a replica back in
-sync with its master; changes to the replica are usually the source of the
-problems in the first place.  However, the changes it makes on the master
+sync with its source; changes to the replica are usually the source of the
+problems in the first place.  However, the changes it makes on the source
 should be no-op changes that set the data to their current values, and
 actually affect only the replica.
 
@@ -11898,30 +12007,30 @@ Sync all tables on host1 to host2 and host3:
 
   pt-table-sync --execute host1 host2 host3
 
-Make slave1 have the same data as its replication master:
+Make replica1 have the same data as its replication source:
 
-  pt-table-sync --execute --sync-to-master slave1
+  pt-table-sync --execute --sync-to-source replica1
 
-Resolve differences that L<pt-table-checksum> found on all slaves of master1:
+Resolve differences that L<pt-table-checksum> found on all replicas of source1:
 
-  pt-table-sync --execute --replicate percona.checksum master1
+  pt-table-sync --execute --replicate percona.checksum source1
 
-Same as above but only resolve differences on slave1:
+Same as above but only resolve differences on replica1:
 
   pt-table-sync --execute --replicate percona.checksum \
-    --sync-to-master slave1
+    --sync-to-source replica1
 
-Sync master2 in a master-master replication configuration, where master2's copy
+Sync source2 in a source-source replication configuration, where source2's copy
 of db.tbl is known or suspected to be incorrect:
 
-  pt-table-sync --execute --sync-to-master h=master2,D=db,t=tbl
+  pt-table-sync --execute --sync-to-source h=source2,D=db,t=tbl
 
-Note that in the master-master configuration, the following will NOT do what you
-want, because it will make changes directly on master2, which will then flow
-through replication and change master1's data:
+Note that in the source-source configuration, the following will NOT do what you
+want, because it will make changes directly on source2, which will then flow
+through replication and change source1's data:
 
-  # Don't do this in a master-master setup!
-  pt-table-sync --execute h=master1,D=db,t=tbl master2
+  # Don't do this in a source-source setup!
+  pt-table-sync --execute h=source1,D=db,t=tbl source2
 
 =head1 RISKS
 
@@ -11958,21 +12067,21 @@ The following is the abbreviated logic:
 
    if DSN has a t part, sync only that table:
       if 1 DSN:
-         if --sync-to-master:
-            The DSN is a slave.  Connect to its master and sync.
+         if --sync-to-source:
+            The DSN is a replica.  Connect to its source and sync.
       if more than 1 DSN:
          The first DSN is the source.  Sync each DSN in turn.
    else if --replicate:
-      if --sync-to-master:
-         The DSN is a slave.  Connect to its master, find records
+      if --sync-to-source:
+         The DSN is a replica.  Connect to its source, find records
          of differences, and fix.
       else:
-         The DSN is the master.  Find slaves and connect to each,
+         The DSN is the source.  Find replicas and connect to each,
          find records of differences, and fix.
    else:
-      if only 1 DSN and --sync-to-master:
-         The DSN is a slave.  Connect to its master, find tables and
-         filter with --databases etc, and sync each table to the master.
+      if only 1 DSN and --sync-to-source:
+         The DSN is a replica.  Connect to its source, find tables and
+         filter with --databases etc, and sync each table to the source.
       else:
          find tables, filtering with --databases etc, and sync each
          DSN to the first.
@@ -11991,34 +12100,34 @@ If you're unsure, read each tool's documentation carefully and decide for
 yourself, or consult with an expert.
 
 Regardless of whether L<"--replicate"> is used or not, you need to specify
-which hosts to sync.  There are two ways: with L<"--sync-to-master"> or
-without.  Specifying L<"--sync-to-master"> makes pt-table-sync expect
-one and only slave DSN on the command line.  The tool will automatically
-discover the slave's master and sync it so that its data is the same as
-its master.  This is accomplished by making changes on the master which
-then flow through replication and update the slave to resolve its differences.
+which hosts to sync.  There are two ways: with L<"--sync-to-source"> or
+without.  Specifying L<"--sync-to-source"> makes pt-table-sync expect
+one and only replica DSN on the command line.  The tool will automatically
+discover the replica's source and sync it so that its data is the same as
+its source.  This is accomplished by making changes on the source which
+then flow through replication and update the replica to resolve its differences.
 B<Be careful though>: although this option specifies and syncs a single
-slave, if there are other slaves on the same master, they will receive
-via replication the changes intended for the slave that you're trying to
+replica, if there are other replicas on the same source, they will receive
+via replication the changes intended for the replica that you're trying to
 sync.
 
-Alternatively, if you do not specify L<"--sync-to-master">, the first
+Alternatively, if you do not specify L<"--sync-to-source">, the first
 DSN given on the command line is the source host.  There is only ever
 one source host.  If you do not also specify L<"--replicate">, then you
 must specify at least one other DSN as the destination host.  There
 can be one or more destination hosts.  Source and destination hosts
 must be independent; they cannot be in the same replication topology.
 pt-table-sync will die with an error if it detects that a destination
-host is a slave because changes are written directly to destination hosts
-(and it's not safe to write directly to slaves).  Or, if you specify
-L<"--replicate"> (but not L<"--sync-to-master">) then pt-table-sync expects
-one and only one master DSN on the command line.  The tool will automatically
-discover all the master's slaves and sync them to the master.  This is
-the only way to sync several (all) slaves at once (because
-L<"--sync-to-master"> only specifies one slave).
+host is a replica because changes are written directly to destination hosts
+(and it's not safe to write directly to replicas).  Or, if you specify
+L<"--replicate"> (but not L<"--sync-to-source">) then pt-table-sync expects
+one and only one source DSN on the command line.  The tool will automatically
+discover all the source's replicas and sync them to the source.  This is
+the only way to sync several (all) replicas at once (because
+L<"--sync-to-source"> only specifies one replica).
 
 Each host on the command line is specified as a DSN.  The first DSN
-(or only DSN for cases like L<"--sync-to-master">) provides default values
+(or only DSN for cases like L<"--sync-to-source">) provides default values
 for other DSNs, whether those other DSNs are specified on the command line
 or auto-discovered by the tool.  So in this example,
 
@@ -12035,8 +12144,8 @@ the DSNs given on the command line.
 =item Replicas using row-based replication
 
 pt-table-sync requires statement-based replication when used with
-the L<"--sync-to-master"> or L<"--replicate"> option.
-Therefore it will set C<binlog_format=STATEMENT> on the master
+the L<"--sync-to-source"> or L<"--replicate"> option.
+Therefore it will set C<binlog_format=STATEMENT> on the source
 for its session if required.
 To do this user must have C<SUPER> privilege.
 
@@ -12083,9 +12192,9 @@ The tool rewrites queries to C<DELETE> and C<REPLACE> in this case.  This is
 automatically handled after the first index violation, so you don't have to
 worry about it.
 
-Be careful when using pt-table-sync in any master-master setup.  Master-master
+Be careful when using pt-table-sync in any source-source setup.  Source-source
 replication is inherently tricky, and it's easy to make mistakes.  You need to
-be sure you're using the tool correctly for master-master replication.  See the
+be sure you're using the tool correctly for source-source replication.  See the
 L<"SYNOPSIS"> for the overview of the correct usage.
 
 Also be careful with tables that have foreign key constraints with C<ON DELETE>
@@ -12098,34 +12207,34 @@ or unique index, it might be best to synchronize that data by another means.
 
 =head1 REPLICATION SAFETY
 
-Synchronizing a replication master and slave safely is a non-trivial problem, in
+Synchronizing a replication source and replica safely is a non-trivial problem, in
 general.  There are all sorts of issues to think about, such as other processes
-changing data, trying to change data on the slave, whether the destination and
-source are a master-master pair, and much more.
+changing data, trying to change data on the replica, whether the destination and
+source are a source-source pair, and much more.
 
-In general, the safe way to do it is to change the data on the master, and let
-the changes flow through replication to the slave like any other changes.
+In general, the safe way to do it is to change the data on the source, and let
+the changes flow through replication to the replica like any other changes.
 However, this works only if it's possible to REPLACE into the table on the
-master.  REPLACE works only if there's a unique index on the table (otherwise it
+source.  REPLACE works only if there's a unique index on the table (otherwise it
 just acts like an ordinary INSERT).
 
-If your table has unique keys, you should use the L<"--sync-to-master"> and/or
-L<"--replicate"> options to sync a slave to its master.  This will generally do
+If your table has unique keys, you should use the L<"--sync-to-source"> and/or
+L<"--replicate"> options to sync a replica to its source.  This will generally do
 the right thing.  When there is no unique key on the table, there is no choice
-but to change the data on the slave, and pt-table-sync will detect that you're
+but to change the data on the replica, and pt-table-sync will detect that you're
 trying to do so.  It will complain and die unless you specify
-C<--no-check-slave> (see L<"--[no]check-slave">).
+C<--no-check-replica> (see L<"--[no]check-replica">).
 
-If you're syncing a table without a primary or unique key on a master-master
+If you're syncing a table without a primary or unique key on a source-source
 pair, you must change the data on the destination server.  Therefore, you need
 to specify C<--no-bin-log> for safety (see L<"--[no]bin-log">).  If you don't,
 the changes you make on the destination server will replicate back to the
 source server and change the data there!
 
-The generally safe thing to do on a master-master pair is to use the
-L<"--sync-to-master"> option so you don't change the data on the destination
-server.  You will also need to specify C<--no-check-slave> to keep
-pt-table-sync from complaining that it is changing data on a slave.
+The generally safe thing to do on a source-source pair is to use the
+L<"--sync-to-source"> option so you don't change the data on the destination
+server.  You will also need to specify C<--no-check-replica> to keep
+pt-table-sync from complaining that it is changing data on a replica.
 
 =head1 ALGORITHMS
 
@@ -12209,7 +12318,7 @@ reliably there are a number of strict limitations:
   * does not handle DELETE changes
 
 For example, suppose we have three servers: c1, r1, r2.  c1 is the central
-server, a pseudo-master to the other servers (viz. r1 and r2 are not slaves
+server, a pseudo-source to the other servers (viz. r1 and r2 are not replicas
 to c1).  r1 and r2 are remote servers.  Rows in table foo are updated and
 inserted on all three servers and we want to synchronize all the changes
 between all the servers.  Table foo has columns:
@@ -12371,12 +12480,12 @@ This option is disabled when L<"--bidirectional"> is used.
 type: string
 
 Channel name used when connected to a server using replication channels.
-Suppose you have two masters, master_a at port 12345, master_b at port 1236 and
-a slave connected to both masters using channels chan_master_a and chan_master_b.
-If you want to run pt-table-sync to synchronize the slave against master_a, pt-table-sync
-won't be able to determine what's the correct master since SHOW SLAVE STATUS
-will return 2 rows. In this case, you can use --channel=chan_master_a to specify
-the channel name to use in the SHOW SLAVE STATUS command.
+Suppose you have two sources, source_a at port 12345, source_b at port 1236 and
+a replica connected to both sources using channels chan_source_a and chan_source_b.
+If you want to run pt-table-sync to synchronize the replica against source_a, pt-table-sync
+won't be able to determine what's the correct source since SHOW REPLICA STATUS
+will return 2 rows. In this case, you can use --channel=chan_source_a to specify
+the channel name to use in the SHOW REPLICA STATUS command.
 
 =item --charset
 
@@ -12393,7 +12502,7 @@ connecting to MySQL.
 default: yes
 
 Check if L<"--execute"> will adversely affect child tables.  When
-L<"--replace">, L<"--replicate">, or L<"--sync-to-master"> is specified,
+L<"--replace">, L<"--replicate">, or L<"--sync-to-source"> is specified,
 the tool may sync tables using C<REPLACE> statements.  If a table being
 synced has child tables with C<ON DELETE CASCADE>, C<ON UPDATE CASCADE>,
 or C<ON UPDATE SET NULL>, the tool prints an error and skips the table because
@@ -12406,31 +12515,31 @@ avoid affecting child tables, also specify C<--no-foreign-key-checks>
 so MySQL will not cascade any operations from the parent to child tables.
 
 This check is only preformed if L<"--execute"> and one of L<"--replace">,
-L<"--replicate">, or L<"--sync-to-master"> is specified.  L<"--print">
+L<"--replicate">, or L<"--sync-to-source"> is specified.  L<"--print">
 does not check child tables.
 
 The error message only prints the first child table found with an
 C<ON DELETE CASCADE>, C<ON UPDATE CASCADE>, or C<ON UPDATE SET NULL>
 foreign key constraint.  There could be other affected child tables.
 
-=item --[no]check-master
+=item --[no]check-source
 
 default: yes
 
-With L<"--sync-to-master">, try to verify that the detected
-master is the real master.
+With L<"--sync-to-source">, try to verify that the detected
+source is the real source.
 
-=item --[no]check-slave
+=item --[no]check-replica
 
 default: yes
 
-Check whether the destination server is a slave.
+Check whether the destination server is a replica.
 
-If the destination server is a slave, it's generally unsafe to make changes on
+If the destination server is a replica, it's generally unsafe to make changes on
 it.  However, sometimes you have to; L<"--replace"> won't work unless there's a
-unique index, for example, so you can't make changes on the master in that
+unique index, for example, so you can't make changes on the source in that
 scenario.  By default pt-table-sync will complain if you try to change data on
-a slave.  Specify C<--no-check-slave> to disable this check.  Use it at your own
+a replica.  Specify C<--no-check-replica> to disable this check.  Use it at your own
 risk.
 
 =item --[no]check-triggers
@@ -12747,11 +12856,11 @@ you're examining them.  The possible values are as follows:
   3      Lock and unlock once for every server (DSN) synced, with
          C<FLUSH TABLES WITH READ LOCK>.
 
-A replication slave is never locked if L<"--replicate"> or L<"--sync-to-master">
-is specified, since in theory locking the table on the master should prevent any
-changes from taking place.  (You are not changing data on your slave, right?)
-If L<"--wait"> is given, the master (source) is locked and then the tool waits
-for the slave to catch up to the master before continuing.
+A replication replica is never locked if L<"--replicate"> or L<"--sync-to-source">
+is specified, since in theory locking the table on the source should prevent any
+changes from taking place.  (You are not changing data on your replica, right?)
+If L<"--wait"> is given, the source (source) is locked and then the tool waits
+for the replica to catch up to the source before continuing.
 
 If C<--transaction> is specified, C<LOCK TABLES> is not used.  Instead, lock
 and unlock are implemented by beginning and committing transactions.
@@ -12804,21 +12913,21 @@ yourself if you want to sync the tables manually.
 
 type: array; default: processlist,hosts
 
-Preferred recursion method used to find slaves.
+Preferred recursion method used to find replicas.
 
 Possible methods are:
 
   METHOD       USES
   ===========  ==================
   processlist  SHOW PROCESSLIST
-  hosts        SHOW SLAVE HOSTS
-  none         Do not find slaves
+  hosts        SHOW REPLICAS
+  none         Do not find replicas
 
-The processlist method is preferred because SHOW SLAVE HOSTS is not reliable.
+The processlist method is preferred because SHOW REPLICAS is not reliable.
 However, the hosts method is required if the server uses a non-standard
 port (not 3306).  Usually pt-table-sync does the right thing and finds
-the slaves, but you may give a preferred method and it will be used first.
-If it doesn't find any slaves, the other methods will be tried.
+the replicas, but you may give a preferred method and it will be used first.
+If it doesn't find any replicas, the other methods will be tried.
 
 
 =item --replace
@@ -12837,48 +12946,48 @@ Sync tables listed as different in this table.
 Specifies that C<pt-table-sync> should examine the specified table to find data
 that differs.  The table is exactly the same as the argument of the same name to
 L<pt-table-checksum>.  That is, it contains records of which tables (and ranges
-of values) differ between the master and slave.
+of values) differ between the source and replica.
 
-For each table and range of values that shows differences between the master and
-slave, C<pt-table-checksum> will sync that table, with the appropriate C<WHERE>
-clause, to its master.
+For each table and range of values that shows differences between the source and
+replica, C<pt-table-checksum> will sync that table, with the appropriate C<WHERE>
+clause, to its source.
 
 This automatically sets L<"--wait"> to 60 and causes changes to be made on the
-master instead of the slave.
+source instead of the replica.
 
-If L<"--sync-to-master"> is specified, the tool will assume the server you
-specified is the slave, and connect to the master as usual to sync.
+If L<"--sync-to-source"> is specified, the tool will assume the server you
+specified is the replica, and connect to the source as usual to sync.
 
-Otherwise, it will try to use C<SHOW PROCESSLIST> to find slaves of the server
-you specified.  If it is unable to find any slaves via C<SHOW PROCESSLIST>, it
-will inspect C<SHOW SLAVE HOSTS> instead.  You must configure each slave's
+Otherwise, it will try to use C<SHOW PROCESSLIST> to find replicas of the server
+you specified.  If it is unable to find any replicas via C<SHOW PROCESSLIST>, it
+will inspect C<SHOW REPLICAS> instead.  You must configure each replica's
 C<report-host>, C<report-port> and other options for this to work right.  After
-finding slaves, it will inspect the specified table on each slave to find data
+finding replicas, it will inspect the specified table on each replica to find data
 that needs to be synced, and sync it.
 
-The tool examines the master's copy of the table first, assuming that the master
-is potentially a slave as well.  Any table that shows differences there will
-B<NOT> be synced on the slave(s).  For example, suppose your replication is set
+The tool examines the source's copy of the table first, assuming that the source
+is potentially a replica as well.  Any table that shows differences there will
+B<NOT> be synced on the replica(s).  For example, suppose your replication is set
 up as A->B, B->C, B->D.  Suppose you use this argument and specify server B.
 The tool will examine server B's copy of the table.  If it looks like server B's
 data in table C<test.tbl1> is different from server A's copy, the tool will not
 sync that table on servers C and D.
 
-=item --slave-user
+=item --replica-user
 
 type: string
 
-Sets the user to be used to connect to the slaves.
+Sets the user to be used to connect to the replicas.
 This parameter allows you to have a different user with less privileges on the
-slaves but that user must exist on all slaves.
+replicas but that user must exist on all replicas.
 
-=item --slave-password
+=item --replica-password
 
 type: string
 
-Sets the password to be used to connect to the slaves.
-It can be used with --slave-user and the password for the user must be the same
-on all slaves.
+Sets the password to be used to connect to the replicas.
+It can be used with --replica-user and the password for the user must be the same
+on all replicas.
 
 =item --set-vars
 
@@ -12904,13 +13013,13 @@ short form: -S; type: string
 
 Socket file to use for connection.
 
-=item --sync-to-master
+=item --sync-to-source
 
-Treat the DSN as a slave and sync it to its master.
+Treat the DSN as a replica and sync it to its source.
 
-Treat the server you specified as a slave.  Inspect C<SHOW SLAVE STATUS>,
-connect to the server's master, and treat the master as the source and the slave
-as the destination.  Causes changes to be made on the master.  Sets L<"--wait">
+Treat the server you specified as a replica.  Inspect C<SHOW REPLICA STATUS>,
+connect to the server's source, and treat the source as the source and the replica
+as the destination.  Causes changes to be made on the source.  Sets L<"--wait">
 to 60 by default, sets L<"--lock"> to 1 by default, and disables
 L<"--[no]transaction"> by default.  See also L<"--replicate">, which changes
 this option's behavior.
@@ -12927,7 +13036,7 @@ Table names may be qualified with the database name.
 
 Keep going if L<"--wait"> fails.
 
-If you specify L<"--wait"> and the slave doesn't catch up to the master's
+If you specify L<"--wait"> and the replica doesn't catch up to the source's
 position before the wait times out, the default behavior is to abort.  This
 option makes the tool keep going anyway.  B<Warning>: if you are trying to get a
 consistent comparison between the two servers, you probably don't want to keep
@@ -13023,9 +13132,9 @@ For more information, visit L<https://www.percona.com/doc/percona-toolkit/LATEST
 
 short form: -w; type: time
 
-How long to wait for slaves to catch up to their master.
+How long to wait for replicas to catch up to their source.
 
-Make the master wait for the slave to catch up in replication before comparing
+Make the source wait for the replica to catch up in replication before comparing
 the tables.  The value is the number of seconds to wait before timing out (see
 also L<"--timeout-ok">).  Sets L<"--lock"> to 1 and L<"--[no]transaction"> to 0
 by default.  If you see an error such as the following,
@@ -13038,7 +13147,7 @@ The default value of this option is influenced by other options.  To see what
 value is in effect, run with L<"--help">.
 
 To disable waiting entirely (except for locks), specify L<"--wait"> 0.  This
-helps when the slave is lagging on tables that are not being synced.
+helps when the replica is lagging on tables that are not being synced.
 
 =item --where
 
@@ -13125,6 +13234,12 @@ dsn: user; copy: yes
 
 User for login if not current user.
 
+=item * s
+
+dsn: mysql_ssl; copy: yes
+
+Create SSL connection
+
 =back
 
 =head1 ENVIRONMENT
diff --git a/bin/pt-upgrade b/bin/pt-upgrade
index bff9fb96a..dd28b2da9 100755
--- a/bin/pt-upgrade
+++ b/bin/pt-upgrade
@@ -940,7 +940,7 @@ sub get_cxn_params {
       $dsn = 'DBI:mysql:' . ( $info->{D} || '' ) . ';'
          . join(';', map  { "$opts{$_}->{dsn}=$info->{$_}" }
                      grep { defined $info->{$_} }
-                     qw(F h P S A))
+                     qw(F h P S A s))
          . ';mysql_read_default_group=client'
          . ($info->{L} ? ';mysql_local_infile=1' : '');
    }
@@ -7958,7 +7958,7 @@ use constant {
    COM_BINLOG_DUMP         => '12',
    COM_TABLE_DUMP          => '13',
    COM_CONNECT_OUT         => '14',
-   COM_REGISTER_SLAVE      => '15',
+   COM_REGISTER_REPLICA    => '15',
    COM_STMT_PREPARE        => '16',
    COM_STMT_EXECUTE        => '17',
    COM_STMT_SEND_LONG_DATA => '18',
@@ -7992,7 +7992,7 @@ my %com_for = (
    '12' => 'COM_BINLOG_DUMP',
    '13' => 'COM_TABLE_DUMP',
    '14' => 'COM_CONNECT_OUT',
-   '15' => 'COM_REGISTER_SLAVE',
+   '15' => 'COM_REGISTER_REPLICA',
    '16' => 'COM_STMT_PREPARE',
    '17' => 'COM_STMT_EXECUTE',
    '18' => 'COM_STMT_SEND_LONG_DATA',
diff --git a/bin/pt-variable-advisor b/bin/pt-variable-advisor
index 477b4fec4..50178fca8 100755
--- a/bin/pt-variable-advisor
+++ b/bin/pt-variable-advisor
@@ -2034,7 +2034,7 @@ sub get_cxn_params {
       $dsn = 'DBI:mysql:' . ( $info->{D} || '' ) . ';'
          . join(';', map  { "$opts{$_}->{dsn}=$info->{$_}" }
                      grep { defined $info->{$_} }
-                     qw(F h P S A))
+                     qw(F h P S A s))
          . ';mysql_read_default_group=client'
          . ($info->{L} ? ';mysql_local_infile=1' : '');
    }
@@ -3425,6 +3425,13 @@ sub get_rules {
          return $args{variables}->{init_slave} ? 1 : 0;
       },
    },
+   {
+      id   => 'init_replica',
+      code => sub {
+         my ( %args ) = @_;
+         return $args{variables}->{init_replica} ? 1 : 0;
+      },
+   },
    {
       id   => 'innodb_additional_mem_pool_size',
       code => sub {
@@ -3671,6 +3678,13 @@ sub get_rules {
          return _var_gt($args{variables}->{slave_net_timeout}, 60);
       },
    },
+   {
+      id   => 'replica_net_timeout',
+      code => sub {
+         my ( %args ) = @_;
+         return _var_gt($args{variables}->{replica_net_timeout}, 60);
+      },
+   },
    {
       id   => 'slave_skip_errors',
       code => sub {
@@ -3679,6 +3693,14 @@ sub get_rules {
              && $args{variables}->{slave_skip_errors} ne 'OFF' ? 1 : 0;
       },
    },
+   {
+      id   => 'replica_skip_errors',
+      code => sub {
+         my ( %args ) = @_;
+         return $args{variables}->{replica_skip_errors}
+             && $args{variables}->{replica_skip_errors} ne 'OFF' ? 1 : 0;
+      },
+   },
    {
       id   => 'sort_buffer_size-1',
       code => sub {
@@ -5538,7 +5560,7 @@ verbosity, you'll see subsequent sentences.
 
 severity: note
 
-Are you trying to write to more than one server in a dual-master or
+Are you trying to write to more than one server in a dual-source or
 ring replication configuration?  This is potentially very dangerous and in
 most cases is a serious mistake.  Most people's reasons for doing this are
 actually not valid at all.
diff --git a/t/lib/samples/issue_616.sql b/t/lib/samples/issue_616.sql
index 05e9a7273..856cd6e43 100644
--- a/t/lib/samples/issue_616.sql
+++ b/t/lib/samples/issue_616.sql
@@ -7,15 +7,15 @@ CREATE TABLE `t` (
   PRIMARY KEY  (`id`)
 );
 INSERT INTO issue_616.t VALUES
-(1,  'from master'),
-(11, 'from master'),
-(21, 'from master'),
+(1,  'from source'),
+(11, 'from source'),
+(21, 'from source'),
 (22, 'from slave'),
 (32, 'from slave'),
 (42, 'from slave'),
-(31, 'from master'),
-(41, 'from master'),
-(51, 'from master');
+(31, 'from source'),
+(41, 'from source'),
+(51, 'from source');
 SET SQL_LOG_BIN=0;
 DELETE FROM issue_616.t WHERE id IN (22,32,42);
 SET SQL_LOG_BIN=1;
diff --git a/t/pt-table-sync/basics.t b/t/pt-table-sync/basics.t
index 896fa1d4b..d77441d40 100644
--- a/t/pt-table-sync/basics.t
+++ b/t/pt-table-sync/basics.t
@@ -19,23 +19,23 @@ require "$trunk/bin/pt-table-sync";
 my $output;
 my $dp = new DSNParser(opts=>$dsn_opts);
 my $sb = new Sandbox(basedir => '/tmp', DSNParser => $dp);
-my $master_dbh = $sb->get_dbh_for('master');
-my $slave_dbh  = $sb->get_dbh_for('slave1');
+my $source_dbh = $sb->get_dbh_for('source');
+my $replica_dbh  = $sb->get_dbh_for('replica1');
 
-if ( !$master_dbh ) {
-   plan skip_all => 'Cannot connect to sandbox master';
+if ( !$source_dbh ) {
+   plan skip_all => 'Cannot connect to sandbox source';
 }
-elsif ( !$slave_dbh ) {
-   plan skip_all => 'Cannot connect to sandbox slave';
+elsif ( !$replica_dbh ) {
+   plan skip_all => 'Cannot connect to sandbox replica';
 }
 else {
    plan tests => 24;
 }
 
-$sb->create_dbs($master_dbh, [qw(test)]);
+$sb->create_dbs($source_dbh, [qw(test)]);
 
-sub query_slave {
-   return $slave_dbh->selectall_arrayref(@_, {Slice => {}});
+sub query_replica {
+   return $replica_dbh->selectall_arrayref(@_, {Slice => {}});
 }
 
 sub run {
@@ -43,8 +43,8 @@ sub run {
    my $output = output(
       sub {
          pt_table_sync::main(qw(--print --execute),
-            "h=127.1,P=12345,u=msandbox,p=msandbox,D=test,t=$src",
-            "h=127.1,P=12346,u=msandbox,p=msandbox,D=test,t=$dst",
+            "h=127.1,P=12345,u=msandbox,p=msandbox,D=test,t=$src,s=1",
+            "h=127.1,P=12346,u=msandbox,p=msandbox,D=test,t=$dst,s=1",
             ($other ? split(" ", $other) : ())
          );
       },
@@ -60,82 +60,83 @@ sub run {
 
 sub run_cmd {
    my ($src, $dst, $other) = @_;
-   my $cmd = "$trunk/bin/pt-table-sync --print --execute h=127.1,P=12345,u=msandbox,p=msandbox,D=test,t=$src h=127.1,P=12346,D=test,t=$dst $other 2>&1";
+   my $cmd = "$trunk/bin/pt-table-sync --print --execute h=127.1,P=12345,u=msandbox,p=msandbox,D=test,t=$src,s=1 h=127.1,P=12346,D=test,t=$dst,s=1 $other 2>&1";
    chomp($output=`$cmd`);
    return $output;
 }
 
 # #############################################################################
-# Test basic master-slave syncing
+# Test basic source-replica syncing
 # #############################################################################
-$sb->load_file('master', 't/pt-table-sync/samples/before.sql');
+$sb->load_file('source', 't/pt-table-sync/samples/before.sql');
 $output = run('test1', 'test2', '');
-like($output, qr/Can't make changes/, 'It dislikes changing a slave');
+like($output, qr/Can't make changes/, 'It dislikes changing a replica');
 
 $output = run('test1', 'test2', '--no-bin-log');
 is($output, "INSERT INTO `test`.`test2`(`a`, `b`) VALUES ('1', 'en');
 INSERT INTO `test`.`test2`(`a`, `b`) VALUES ('2', 'ca');", 'No alg sync');
 is_deeply(
-   query_slave('select * from test.test2'),
+   query_replica('select * from test.test2'),
    [ {   a => 1, b => 'en' }, { a => 2, b => 'ca' } ],
    'Synced OK with no alg'
 );
 
-$sb->load_file('master', 't/pt-table-sync/samples/before.sql');
+$sb->load_file('source', 't/pt-table-sync/samples/before.sql');
 $output = run('test1', 'test2', '--algorithms Stream --no-bin-log');
 is($output, "INSERT INTO `test`.`test2`(`a`, `b`) VALUES ('1', 'en');
 INSERT INTO `test`.`test2`(`a`, `b`) VALUES ('2', 'ca');", 'Basic Stream sync');
 is_deeply(
-   query_slave('select * from test.test2'),
+   query_replica('select * from test.test2'),
    [ {   a => 1, b => 'en' }, { a => 2, b => 'ca' } ],
    'Synced OK with Stream'
 );
 
-$sb->load_file('master', 't/pt-table-sync/samples/before.sql');
+$sb->load_file('source', 't/pt-table-sync/samples/before.sql');
 $output = run('test1', 'test2', '--algorithms GroupBy --no-bin-log');
 is($output, "INSERT INTO `test`.`test2`(`a`, `b`) VALUES ('1', 'en');
 INSERT INTO `test`.`test2`(`a`, `b`) VALUES ('2', 'ca');", 'Basic GroupBy sync');
 is_deeply(
-   query_slave('select * from test.test2'),
+   query_replica('select * from test.test2'),
    [ {   a => 1, b => 'en' }, { a => 2, b => 'ca' } ],
    'Synced OK with GroupBy'
 );
 
-$sb->load_file('master', 't/pt-table-sync/samples/before.sql');
+$sb->load_file('source', 't/pt-table-sync/samples/before.sql');
 $output = run('test1', 'test2', '--algorithms Chunk,GroupBy --no-bin-log');
 is($output, "INSERT INTO `test`.`test2`(`a`, `b`) VALUES ('1', 'en');
 INSERT INTO `test`.`test2`(`a`, `b`) VALUES ('2', 'ca');", 'Basic Chunk sync');
 is_deeply(
-   query_slave('select * from test.test2'),
+   query_replica('select * from test.test2'),
    [ {   a => 1, b => 'en' }, { a => 2, b => 'ca' } ],
    'Synced OK with Chunk'
 );
 
-# Create a new user that is going to be replicated on slaves.
-# After that, stop replication, delete the user from the master just to ensure that
-# on the master we are using the sandbox user, and start relication again to run
+# Create a new user that is going to be replicated on replicas.
+# After that, stop replication, delete the user from the source just to ensure that
+# on the source we are using the sandbox user, and start relication again to run
 # the tests
-$sb->do_as_root("master", q/GRANT REPLICATION SLAVE ON *.* TO 'slave_user'@'%' IDENTIFIED BY 'slave_password'/);
-$sb->do_as_root("master", q/set sql_log_bin=0/);
-$sb->do_as_root("master", q/DROP USER 'slave_user'/);
-$sb->do_as_root("master", q/set sql_log_bin=1/);
-
-$sb->load_file('master', 't/pt-table-sync/samples/before.sql');
-$output = run('test1', 'test2', '--algorithms Chunk,GroupBy --no-bin-log --slave-user slave_user --slave-password slave_password');
+$sb->do_as_root("source", q/CREATE USER 'replica_user'@'%' IDENTIFIED BY 'replica_password'/);
+$sb->do_as_root("source", q/GRANT REPLICATION SLAVE ON *.* TO 'replica_user'@'%'/);
+$sb->do_as_root("source", q/set sql_log_bin=0/);
+$sb->do_as_root("source", q/DROP USER 'replica_user'/);
+$sb->do_as_root("source", q/set sql_log_bin=1/);
+
+$sb->load_file('source', 't/pt-table-sync/samples/before.sql');
+$output = run('test1', 'test2', '--algorithms Chunk,GroupBy --no-bin-log --replica-user replica_user --replica-password replica_password');
 is($output, "INSERT INTO `test`.`test2`(`a`, `b`) VALUES ('1', 'en');
 INSERT INTO `test`.`test2`(`a`, `b`) VALUES ('2', 'ca');", 'Basic Chunk sync');
 is_deeply(
-   query_slave('select * from test.test2'),
+   query_replica('select * from test.test2'),
    [ {   a => 1, b => 'en' }, { a => 2, b => 'ca' } ],
-   'Synced OK with --slave-user'
+   'Synced OK with --replica-user'
 );
 
-$sb->load_file('master', 't/pt-table-sync/samples/before.sql');
+$sb->load_file('source', 't/pt-table-sync/samples/before.sql');
 $output = run('test1', 'test2', '--algorithms Nibble --no-bin-log');
 is($output, "INSERT INTO `test`.`test2`(`a`, `b`) VALUES ('1', 'en');
 INSERT INTO `test`.`test2`(`a`, `b`) VALUES ('2', 'ca');", 'Basic Nibble sync');
 is_deeply(
-   query_slave('select * from test.test2'),
+   query_replica('select * from test.test2'),
    [ {   a => 1, b => 'en' }, { a => 2, b => 'ca' } ],
    'Synced OK with Nibble'
 );
@@ -143,7 +144,7 @@ is_deeply(
 # Save original PTDEBUG env because we modify it below.
 my $dbg = $ENV{PTDEBUG};
 
-$sb->load_file('master', 't/pt-table-sync/samples/before.sql');
+$sb->load_file('source', 't/pt-table-sync/samples/before.sql');
 $ENV{PTDEBUG} = 1;
 $output = run_cmd('test1', 'test2', '--algorithms Nibble --no-bin-log --chunk-size 1 --transaction --lock 1');
 delete $ENV{PTDEBUG};
@@ -153,7 +154,7 @@ like(
    'Nibble with transactions and locking'
 );
 is_deeply(
-   query_slave('select * from test.test2'),
+   query_replica('select * from test.test2'),
    [ {   a => 1, b => 'en' }, { a => 2, b => 'ca' } ],
    'Synced OK with Nibble'
 );
@@ -190,13 +191,13 @@ $ENV{PTDEBUG} = $dbg || 0;
 # Fix bug 911996.
 # ###########################################################################
 
-# pt-table-checksum waits for all checksums to replicate to all slaves,
-# so no need to call $sb->wait_for_slaves() after this.
+# pt-table-checksum waits for all checksums to replicate to all replicas,
+# so no need to call $sb->wait_for_replicas() after this.
 `$trunk/bin/pt-table-checksum h=127.1,P=12345,u=msandbox,p=msandbox --max-load '' --set-vars innodb_lock_wait_timeout=3 --chunk-size 50 --chunk-index idx_actor_last_name -t sakila.actor --quiet`;
 
-$slave_dbh->do("update percona.checksums set this_crc='' where db='sakila' and tbl='actor' and chunk=3");
-$slave_dbh->do("update sakila.actor set last_name='' where actor_id=30");
-$sb->wait_for_slaves(); # wait for those ^ updates to replicate to slave2 (!2347)
+$replica_dbh->do("update percona.checksums set this_crc='' where db='sakila' and tbl='actor' and chunk=3");
+$replica_dbh->do("update sakila.actor set last_name='' where actor_id=30");
+$sb->wait_for_replicas(); # wait for those ^ updates to replicate to replica2 (!2347)
 
 $output = output(
    sub {
@@ -220,24 +221,24 @@ is(
 );
 
 # Fix bug 927771.
-$sb->load_file('master', 't/pt-table-sync/samples/bug_927771.sql');
-$slave_dbh->do("update test.t set c='z' where id>8");
+$sb->load_file('source', 't/pt-table-sync/samples/bug_927771.sql');
+$replica_dbh->do("update test.t set c='z' where id>8");
 
-# pt-table-checksum waits for all checksums to replicate to all slaves,
-# so no need to call $sb->wait_for_slaves() after this.
+# pt-table-checksum waits for all checksums to replicate to all replicas,
+# so no need to call $sb->wait_for_replicas() after this.
 `$trunk/bin/pt-table-checksum h=127.1,P=12345,u=msandbox,p=msandbox --max-load '' --set-vars innodb_lock_wait_timeout=3 --chunk-size 2 -t test.t --quiet`;
 
 $output = output(
    sub {
       pt_table_sync::main('h=127.1,P=12346,u=msandbox,p=msandbox',
           #         qw(--print --execute --replicate percona.checksums),
-         qw(--print --execute --sync-to-master),
+         qw(--print --execute --sync-to-source),
          qw(--no-foreign-key-checks))
    },
    stderr => 1,
 );
 
-$sb->wait_for_slaves();  # wait for sync to replicate
+$sb->wait_for_replicas();  # wait for sync to replicate
 
 like(
    $output,
@@ -245,7 +246,7 @@ like(
    "--replicate with uc index (bug 927771)"
 );
 
-my $rows = $slave_dbh->selectall_arrayref("select id, c from test.t where id>8 order by id");
+my $rows = $replica_dbh->selectall_arrayref("select id, c from test.t where id>8 order by id");
 
 is_deeply(
    $rows,
@@ -253,13 +254,13 @@ is_deeply(
       [9,  'i'],
       [10, 'j'],
    ],
-   "Synced slaved (bug 927771)"
+   "Synced replicad (bug 927771)"
 );
 
 # #############################################################################
 # Done.
 # #############################################################################
-$sb->wipe_clean($master_dbh);
-$sb->wipe_clean($slave_dbh);
+$sb->wipe_clean($source_dbh);
+$sb->wipe_clean($replica_dbh);
 ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox");
 exit;
diff --git a/t/pt-table-sync/bidirectional.t b/t/pt-table-sync/bidirectional.t
index 03a5a79e9..9b7e06b9d 100644
--- a/t/pt-table-sync/bidirectional.t
+++ b/t/pt-table-sync/bidirectional.t
@@ -22,19 +22,19 @@ $Data::Dumper::Quotekeys = 0;
 
 my $dp = new DSNParser(opts=>$dsn_opts);
 my $sb = new Sandbox(basedir => '/tmp', DSNParser => $dp);
-my $c1_dbh = $sb->get_dbh_for('master');
+my $c1_dbh = $sb->get_dbh_for('source');
 
-diag(`$trunk/sandbox/start-sandbox master 2900 >/dev/null`);
-my $r1_dbh = $sb->get_dbh_for('master3');
+diag(`$trunk/sandbox/start-sandbox source 2900 >/dev/null`);
+my $r1_dbh = $sb->get_dbh_for('source3');
 
-diag(`$trunk/sandbox/start-sandbox master 2901 >/dev/null`);
-my $r2_dbh = $sb->get_dbh_for('master4');
+diag(`$trunk/sandbox/start-sandbox source 2901 >/dev/null`);
+my $r2_dbh = $sb->get_dbh_for('source4');
 
 if ( !$c1_dbh ) {
-   plan skip_all => 'Cannot connect to sandbox master';
+   plan skip_all => 'Cannot connect to sandbox source';
 }
 elsif ( !$r1_dbh ) {
-   plan skip_all => 'Cannot connect to second sandbox master';
+   plan skip_all => 'Cannot connect to second sandbox source';
 
 }
 else {
@@ -49,10 +49,10 @@ $sb->wipe_clean($c1_dbh);
 $sb->wipe_clean($r1_dbh);
 
 sub load_bidi_data {
-   $sb->load_file('master', 't/pt-table-sync/samples/bidirectional/table.sql');
-   $sb->load_file('master3', 't/pt-table-sync/samples/bidirectional/table.sql');
-   $sb->load_file('master', 't/pt-table-sync/samples/bidirectional/master-data.sql');
-   $sb->load_file('master3', 't/pt-table-sync/samples/bidirectional/remote-1.sql');
+   $sb->load_file('source', 't/pt-table-sync/samples/bidirectional/table.sql');
+   $sb->load_file('source3', 't/pt-table-sync/samples/bidirectional/table.sql');
+   $sb->load_file('source', 't/pt-table-sync/samples/bidirectional/master-data.sql');
+   $sb->load_file('source3', 't/pt-table-sync/samples/bidirectional/remote-1.sql');
 }
 
 my $r1_data_synced =  [
@@ -323,14 +323,14 @@ is_deeply(
 # Test bidirectional sync with 3 servers.
 # #############################################################################
 
-# It's confusing but master4 = 2901, aka our 3rd master server.
+# It's confusing but source4 = 2901, aka our 3rd source server.
 
 SKIP: {
-   skip 'Cannot connect to third sandbox master', 9 unless $r2_dbh;
+   skip 'Cannot connect to third sandbox source', 9 unless $r2_dbh;
 
    load_bidi_data();
-   $sb->load_file('master4', 't/pt-table-sync/samples/bidirectional/table.sql');
-   $sb->load_file('master4', 't/pt-table-sync/samples/bidirectional/remote-2.sql');
+   $sb->load_file('source4', 't/pt-table-sync/samples/bidirectional/table.sql');
+   $sb->load_file('source4', 't/pt-table-sync/samples/bidirectional/remote-2.sql');
 
    $res = $r2_dbh->selectall_arrayref('select * from bidi.t order by id');
    is_deeply(
diff --git a/t/pt-table-sync/binlog_format.t b/t/pt-table-sync/binlog_format.t
index 30ca9ff45..57a2e4822 100644
--- a/t/pt-table-sync/binlog_format.t
+++ b/t/pt-table-sync/binlog_format.t
@@ -19,16 +19,16 @@ require "$trunk/bin/pt-table-sync";
 my $output;
 my $dp = new DSNParser(opts=>$dsn_opts);
 my $sb = new Sandbox(basedir => '/tmp', DSNParser => $dp);
-my $master_dbh = $sb->get_dbh_for('master');
-my $slave_dbh  = $sb->get_dbh_for('slave1');
+my $source_dbh = $sb->get_dbh_for('source');
+my $replica_dbh  = $sb->get_dbh_for('replica1');
 
-if ( !$master_dbh ) {
-   plan skip_all => 'Cannot connect to sandbox master';
+if ( !$source_dbh ) {
+   plan skip_all => 'Cannot connect to sandbox source';
 }
-elsif ( !$slave_dbh ) {
-   plan skip_all => 'Cannot connect to sandbox slave';
+elsif ( !$replica_dbh ) {
+   plan skip_all => 'Cannot connect to sandbox replica';
 }
-elsif ( VersionParser->new($master_dbh) < '5.1.5' ) {
+elsif ( VersionParser->new($source_dbh) < '5.1.5' ) {
       plan skip_all => 'Requires MySQL 5.1.5 or newer';
 }
 else {
@@ -39,32 +39,32 @@ else {
 # Issue 95: Make mk-table-sync force statement-based binlog format on 5.1
 # #############################################################################
 
-$sb->create_dbs($master_dbh, ['test']);
-$master_dbh->do('create table test.t (i int, unique index (i))');
-$master_dbh->do('insert into test.t values (1),(2)');
-$sb->wait_for_slaves();
-$slave_dbh->do('insert into test.t values (3)');  # only on the slaves
+$sb->create_dbs($source_dbh, ['test']);
+$source_dbh->do('create table test.t (i int, unique index (i))');
+$source_dbh->do('insert into test.t values (1),(2)');
+$sb->wait_for_replicas();
+$replica_dbh->do('insert into test.t values (3)');  # only on the replicas
 
 is_deeply(
-   $master_dbh->selectall_arrayref('select * from test.t order by i'),
+   $source_dbh->selectall_arrayref('select * from test.t order by i'),
    [[1],[2]],
-   'Data on master before sync'
+   'Data on source before sync'
 );
 
-# Slaves have an extra row, something to sync.
-my $rows = $slave_dbh->selectall_arrayref('select * from test.t order by i');
+# Replicas have an extra row, something to sync.
+my $rows = $replica_dbh->selectall_arrayref('select * from test.t order by i');
 is_deeply(
    $rows,
    [[1],[2],[3]],
-   'Data on slave before sync'
+   'Data on replica before sync'
 ) or print Dumper($rows);
 
-$master_dbh->do("SET GLOBAL binlog_format='ROW'");
-$master_dbh->disconnect();
-$master_dbh = $sb->get_dbh_for('master');
+$source_dbh->do("SET GLOBAL binlog_format='ROW'");
+$source_dbh->disconnect();
+$source_dbh = $sb->get_dbh_for('source');
 
 is_deeply(
-   $master_dbh->selectrow_arrayref('select @@binlog_format'),
+   $source_dbh->selectrow_arrayref('select @@binlog_format'),
    ['ROW'],
    'Set global binlog_format = ROW'
 );
@@ -72,7 +72,7 @@ is_deeply(
 is(
    output(
       sub { pt_table_sync::main("h=127.1,P=12346,u=msandbox,p=msandbox",
-         qw(--sync-to-master -t test.t --print --execute)) },
+         qw(--sync-to-source -t test.t --print --execute)) },
       trf => \&remove_traces,
    ),
    "DELETE FROM `test`.`t` WHERE `i`='3' LIMIT 1;
@@ -82,23 +82,23 @@ is(
 
 wait_until(
    sub {
-      my $rows = $slave_dbh->selectall_arrayref('select * from test.t');
+      my $rows = $replica_dbh->selectall_arrayref('select * from test.t');
       return $rows && @$rows == 2;
    }
-) or die "DELETE did not replicate to slave";
+) or die "DELETE did not replicate to replica";
 
 is_deeply(
-   $slave_dbh->selectall_arrayref('select * from test.t'),
+   $replica_dbh->selectall_arrayref('select * from test.t'),
    [[1],[2]],
-   'DELETE replicated to slave'
+   'DELETE replicated to replica'
 );
 
-$master_dbh->do("SET GLOBAL binlog_format='STATEMENT'");
-$master_dbh->disconnect();
-$master_dbh = $sb->get_dbh_for('master');
+$source_dbh->do("SET GLOBAL binlog_format='STATEMENT'");
+$source_dbh->disconnect();
+$source_dbh = $sb->get_dbh_for('source');
 
 is_deeply(
-   $master_dbh->selectrow_arrayref('select @@binlog_format'),
+   $source_dbh->selectrow_arrayref('select @@binlog_format'),
    ['STATEMENT'],
    'Set global binlog_format = STATEMENT'
 );
@@ -106,6 +106,6 @@ is_deeply(
 # #############################################################################
 # Done.
 # #############################################################################
-$sb->wipe_clean($master_dbh);
+$sb->wipe_clean($source_dbh);
 ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox");
 exit;
diff --git a/t/pt-table-sync/bugs.t b/t/pt-table-sync/bugs.t
index cf5e2d100..9ce4e9dbe 100644
--- a/t/pt-table-sync/bugs.t
+++ b/t/pt-table-sync/bugs.t
@@ -19,34 +19,34 @@ require "$trunk/bin/pt-table-sync";
 my $output;
 my $dp = new DSNParser(opts=>$dsn_opts);
 my $sb = new Sandbox(basedir => '/tmp', DSNParser => $dp);
-my $master_dbh = $sb->get_dbh_for('master');
-my $slave_dbh  = $sb->get_dbh_for('slave1');
+my $source_dbh = $sb->get_dbh_for('source');
+my $replica_dbh  = $sb->get_dbh_for('replica1');
 
-if ( !$master_dbh ) {
-   plan skip_all => 'Cannot connect to sandbox master';
+if ( !$source_dbh ) {
+   plan skip_all => 'Cannot connect to sandbox source';
 }
-elsif ( !$slave_dbh ) {
-   plan skip_all => 'Cannot connect to sandbox slave';
+elsif ( !$replica_dbh ) {
+   plan skip_all => 'Cannot connect to sandbox replica';
 }
 else {
    plan tests => 9;
 }
 
 my $sample     = "t/pt-table-sync/samples";
-my $master_dsn = "h=127.1,P=12345,u=msandbox,p=msandbox";
-my $slave_dsn  = "h=127.1,P=12346,u=msandbox,p=msandbox";
+my $source_dsn = "h=127.1,P=12345,u=msandbox,p=msandbox";
+my $replica_dsn  = "h=127.1,P=12346,u=msandbox,p=msandbox";
 
 # #############################################################################
 # 
 # #############################################################################
 
-$sb->load_file('master', "$sample/wrong-tbl-struct-bug-1003014.sql");
+$sb->load_file('source', "$sample/wrong-tbl-struct-bug-1003014.sql");
 
 # Make a diff in each table.
-$slave_dbh->do("DELETE FROM test.aaa WHERE STOP_ARCHIVE IN (5,6,7)");
-$slave_dbh->do("UPDATE test.zzz SET c='x' WHERE id IN (44,45,46)");
+$replica_dbh->do("DELETE FROM test.aaa WHERE STOP_ARCHIVE IN (5,6,7)");
+$replica_dbh->do("UPDATE test.zzz SET c='x' WHERE id IN (44,45,46)");
 
-$output = `$trunk/bin/pt-table-checksum $master_dsn --set-vars innodb_lock_wait_timeout=3 --max-load '' -d test --chunk-size 10 2>&1`;
+$output = `$trunk/bin/pt-table-checksum $source_dsn --set-vars innodb_lock_wait_timeout=3 --max-load '' -d test --chunk-size 10 2>&1`;
 
 is(
    PerconaTest::count_checksum_results($output, 'diffs'),
@@ -72,7 +72,7 @@ my $checksums = [
    [qw( test zzz 14 )],
 ];
 
-my $rows = $master_dbh->selectall_arrayref("SELECT db, tbl, chunk FROM percona.checksums ORDER BY db, tbl, chunk");
+my $rows = $source_dbh->selectall_arrayref("SELECT db, tbl, chunk FROM percona.checksums ORDER BY db, tbl, chunk");
 is_deeply(
    $rows,
    $checksums,
@@ -81,12 +81,12 @@ is_deeply(
 
 my $exit_status;
 $output = output(
-   sub { $exit_status = pt_table_sync::main($slave_dsn,
-      qw(--replicate percona.checksums --sync-to-master --print --execute),
+   sub { $exit_status = pt_table_sync::main($replica_dsn,
+      qw(--replicate percona.checksums --sync-to-source --print --execute),
       "--tables", "test.aaa,test.zzz") },
    stderr => 1,
 );
-$sb->wait_for_slaves();
+$sb->wait_for_replicas();
 
 is(
    $exit_status,
@@ -94,7 +94,7 @@ is(
    "Bug 1003014 (wrong tbl_struct): 0 exit"
 ) or diag($output);
 
-$rows = $slave_dbh->selectall_arrayref("SELECT c FROM test.zzz WHERE id IN (44,45,46)");
+$rows = $replica_dbh->selectall_arrayref("SELECT c FROM test.zzz WHERE id IN (44,45,46)");
 is_deeply(
    $rows,
    [ ['a'], ['a'], ['a'] ],
@@ -102,17 +102,17 @@ is_deeply(
 );
 
 # #########################################################################
-# Repeat the whole process without --sync-to-master so the second code path
+# Repeat the whole process without --sync-to-source so the second code path
 # in sync_via_replication() is tested.
 # #########################################################################
 
-$sb->wipe_clean($master_dbh);
-$sb->load_file('master', "$sample/wrong-tbl-struct-bug-1003014.sql");
+$sb->wipe_clean($source_dbh);
+$sb->load_file('source', "$sample/wrong-tbl-struct-bug-1003014.sql");
 
-$slave_dbh->do("DELETE FROM test.aaa WHERE STOP_ARCHIVE IN (5,6,7)");
-$slave_dbh->do("UPDATE test.zzz SET c='x' WHERE id IN (44,45,46)");
+$replica_dbh->do("DELETE FROM test.aaa WHERE STOP_ARCHIVE IN (5,6,7)");
+$replica_dbh->do("UPDATE test.zzz SET c='x' WHERE id IN (44,45,46)");
 
-$output = `$trunk/bin/pt-table-checksum $master_dsn --set-vars innodb_lock_wait_timeout=3 --max-load '' -d test --chunk-size 10 2>&1`;
+$output = `$trunk/bin/pt-table-checksum $source_dsn --set-vars innodb_lock_wait_timeout=3 --max-load '' -d test --chunk-size 10 2>&1`;
 
 is(
    PerconaTest::count_checksum_results($output, 'diffs'),
@@ -120,7 +120,7 @@ is(
    "Bug 1003014 (wrong tbl_struct): 2 diffs (just replicate)"
 ) or print STDERR $output;
 
-$rows = $master_dbh->selectall_arrayref("SELECT db, tbl, chunk FROM percona.checksums ORDER BY db, tbl, chunk");
+$rows = $source_dbh->selectall_arrayref("SELECT db, tbl, chunk FROM percona.checksums ORDER BY db, tbl, chunk");
 is_deeply(
    $rows,
    $checksums,
@@ -128,12 +128,12 @@ is_deeply(
 );
 
 $output = output(
-   sub { $exit_status = pt_table_sync::main($master_dsn,
+   sub { $exit_status = pt_table_sync::main($source_dsn,
       qw(--replicate percona.checksums --print --execute),
       "--tables", "test.aaa,test.zzz") },
    stderr => 1,
 );
-$sb->wait_for_slaves();
+$sb->wait_for_replicas();
 
 is(
    $exit_status,
@@ -141,7 +141,7 @@ is(
    "Bug 1003014 (wrong tbl_struct): 0 exit (just replicate)"
 ) or diag($output);
 
-$rows = $slave_dbh->selectall_arrayref("SELECT c FROM test.zzz WHERE id IN (44,45,46)");
+$rows = $replica_dbh->selectall_arrayref("SELECT c FROM test.zzz WHERE id IN (44,45,46)");
 is_deeply(
    $rows,
    [ ['a'], ['a'], ['a'] ],
@@ -151,6 +151,6 @@ is_deeply(
 # #############################################################################
 # Done.
 # #############################################################################
-$sb->wipe_clean($master_dbh);
+$sb->wipe_clean($source_dbh);
 ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox");
 exit;
diff --git a/t/pt-table-sync/char_chunking.t b/t/pt-table-sync/char_chunking.t
index 8b421ecb1..a0f7bc642 100644
--- a/t/pt-table-sync/char_chunking.t
+++ b/t/pt-table-sync/char_chunking.t
@@ -17,35 +17,35 @@ require "$trunk/bin/pt-table-sync";
 
 my $dp = new DSNParser(opts=>$dsn_opts);
 my $sb = new Sandbox(basedir => '/tmp', DSNParser => $dp);
-my $master_dbh = $sb->get_dbh_for('master');
-my $slave_dbh  = $sb->get_dbh_for('slave1');
+my $source_dbh = $sb->get_dbh_for('source');
+my $replica_dbh  = $sb->get_dbh_for('replica1');
 
-if ( !$master_dbh ) {
-   plan skip_all => 'Cannot connect to sandbox master';
+if ( !$source_dbh ) {
+   plan skip_all => 'Cannot connect to sandbox source';
 }
-elsif ( !$slave_dbh ) {
-   plan skip_all => 'Cannot connect to sandbox slave';
+elsif ( !$replica_dbh ) {
+   plan skip_all => 'Cannot connect to sandbox replica';
 }
 else {
    plan tests => 7;
 }
 
 my $output;
-my @args = ('h=127.1,P=12346,u=msandbox,p=msandbox', qw(--sync-to-master -t test.ascii -v -v --print --chunk-size 30));
+my @args = ('h=127.1,P=12346,u=msandbox,p=msandbox', qw(--sync-to-source -t test.ascii -v -v --print --chunk-size 30));
 
-$sb->create_dbs($master_dbh, ['test']);
-$sb->load_file('master', "t/lib/samples/char-chunking/ascii.sql", "test");
-$master_dbh->do('alter table test.ascii drop column `i`');
+$sb->create_dbs($source_dbh, ['test']);
+$sb->load_file('source', "t/lib/samples/char-chunking/ascii.sql", "test");
+$source_dbh->do('alter table test.ascii drop column `i`');
 
 wait_until(
    sub {
       my $row;
-      eval {$row = $slave_dbh->selectall_arrayref("select * from test.ascii");};
+      eval {$row = $replica_dbh->selectall_arrayref("select * from test.ascii");};
       return 1 if $row && @$row > 100;
    },
 );
 
-$slave_dbh->do('delete from test.ascii where c like "Zesus%"');
+$replica_dbh->do('delete from test.ascii where c like "Zesus%"');
 
 $output = output(
    sub { pt_table_sync::main(@args) },
@@ -85,6 +85,6 @@ like(
 # #############################################################################
 # Done.
 # #############################################################################
-$sb->wipe_clean($master_dbh);
+$sb->wipe_clean($source_dbh);
 ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox");
 exit;
diff --git a/t/pt-table-sync/check_privs.t b/t/pt-table-sync/check_privs.t
index fdfd1e24a..371c5bb7a 100644
--- a/t/pt-table-sync/check_privs.t
+++ b/t/pt-table-sync/check_privs.t
@@ -18,21 +18,21 @@ require "$trunk/bin/pt-table-sync";
 
 my $dp = new DSNParser(opts=>$dsn_opts);
 my $sb = new Sandbox(basedir => '/tmp', DSNParser => $dp);
-my $master_dbh = $sb->get_dbh_for('master');
-my $slave_dbh  = $sb->get_dbh_for('slave1');
+my $source_dbh = $sb->get_dbh_for('source');
+my $replica_dbh  = $sb->get_dbh_for('replica1');
 
-if ( !$master_dbh ) {
-   plan skip_all => 'Cannot connect to sandbox master';
+if ( !$source_dbh ) {
+   plan skip_all => 'Cannot connect to sandbox source';
 }
-elsif ( !$slave_dbh ) {
-   plan skip_all => 'Cannot connect to sandbox slave';
+elsif ( !$replica_dbh ) {
+   plan skip_all => 'Cannot connect to sandbox replica';
 }
 
-$sb->wipe_clean($master_dbh);
-$sb->wipe_clean($slave_dbh);
+$sb->wipe_clean($source_dbh);
+$sb->wipe_clean($replica_dbh);
 
 my $output;
-my @args = ('h=127.1,P=12345,u=test_907,p=msandbox', 'P=12346,u=msandbox', qw(--print --no-check-slave -d issue_907));
+my @args = ('h=127.1,P=12345,u=test_907,p=msandbox,s=1', 'P=12346,u=msandbox,s=1', qw(--print --no-check-replica -d issue_907));
 
 # #############################################################################
 # Issue 907: Add --[no]check-privileges 
@@ -40,14 +40,14 @@ my @args = ('h=127.1,P=12345,u=test_907,p=msandbox', 'P=12346,u=msandbox', qw(--
 
 #1) get the script to create the underprivileged user  
 
-$master_dbh->do('drop database if exists issue_907');
-$master_dbh->do('create database issue_907');
-$master_dbh->do('create table issue_907.t (i int)');
-PerconaTest::wait_for_table($slave_dbh, "issue_907.t");
-$slave_dbh->do('drop database if exists issue_907');
-$slave_dbh->do('create database issue_907');
-$slave_dbh->do('create table issue_907.t (i int)');
-$slave_dbh->do('insert into issue_907.t values (1)');
+$source_dbh->do('drop database if exists issue_907');
+$source_dbh->do('create database issue_907');
+$source_dbh->do('create table issue_907.t (i int)');
+PerconaTest::wait_for_table($replica_dbh, "issue_907.t");
+$replica_dbh->do('drop database if exists issue_907');
+$replica_dbh->do('create database issue_907');
+$replica_dbh->do('create table issue_907.t (i int)');
+$replica_dbh->do('insert into issue_907.t values (1)');
 
 # On 5.1 user needs SUPER to set binlog_format, which mk-table-sync does.
 `/tmp/12345/use -uroot -e "CREATE USER 'test_907'\@'localhost' IDENTIFIED BY 'msandbox'"`;
@@ -65,13 +65,13 @@ is(
 );
 
 #3) clean up user
-$master_dbh->do('DROP USER \'test_907\'@\'localhost\'');
+$source_dbh->do('DROP USER \'test_907\'@\'localhost\'');
 
 # #############################################################################
 # Done.
 # #############################################################################
-$sb->wipe_clean($master_dbh);
-$sb->wipe_clean($slave_dbh);
+$sb->wipe_clean($source_dbh);
+$sb->wipe_clean($replica_dbh);
 ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox");
 
 done_testing;
diff --git a/t/pt-table-sync/columns.t b/t/pt-table-sync/columns.t
index 486d47406..627e8ca50 100644
--- a/t/pt-table-sync/columns.t
+++ b/t/pt-table-sync/columns.t
@@ -18,27 +18,27 @@ require "$trunk/bin/pt-table-sync";
 my $output;
 my $dp = new DSNParser(opts=>$dsn_opts);
 my $sb = new Sandbox(basedir => '/tmp', DSNParser => $dp);
-my $master_dbh = $sb->get_dbh_for('master');
-my $slave_dbh  = $sb->get_dbh_for('slave1');
+my $source_dbh = $sb->get_dbh_for('source');
+my $replica_dbh  = $sb->get_dbh_for('replica1');
 
-if ( !$master_dbh ) {
-   plan skip_all => 'Cannot connect to sandbox master';
+if ( !$source_dbh ) {
+   plan skip_all => 'Cannot connect to sandbox source';
 }
-elsif ( !$slave_dbh ) {
-   plan skip_all => 'Cannot connect to sandbox slave';
+elsif ( !$replica_dbh ) {
+   plan skip_all => 'Cannot connect to sandbox replica';
 }
 else {
    plan tests => 6;
 }
 
-$sb->wipe_clean($master_dbh);
-$sb->wipe_clean($slave_dbh);
-$sb->create_dbs($master_dbh, [qw(test)]);
+$sb->wipe_clean($source_dbh);
+$sb->wipe_clean($replica_dbh);
+$sb->create_dbs($source_dbh, [qw(test)]);
 
 # #############################################################################
 # Issue 313: Add --ignore-columns (and add tests for --columns).
 # #############################################################################
-$sb->load_file('master', 't/pt-table-sync/samples/before.sql');
+$sb->load_file('source', 't/pt-table-sync/samples/before.sql');
 $output = `$trunk/bin/pt-table-sync --print h=127.1,P=12345,u=msandbox,p=msandbox,D=test,t=test3 t=test4`;
 $output = remove_traces($output);
 # This test changed because the row sql now does ORDER BY key_col (id here)
@@ -75,7 +75,7 @@ EOF
 # #############################################################################
 # Done.
 # #############################################################################
-$sb->wipe_clean($master_dbh);
-$sb->wipe_clean($slave_dbh);
+$sb->wipe_clean($source_dbh);
+$sb->wipe_clean($replica_dbh);
 ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox");
 exit;
diff --git a/t/pt-table-sync/diff_where.t b/t/pt-table-sync/diff_where.t
index e1ba8b602..2922c79b0 100644
--- a/t/pt-table-sync/diff_where.t
+++ b/t/pt-table-sync/diff_where.t
@@ -47,8 +47,8 @@ test_diff_where(
       cnt_diff       => '-1',
       crc_diff       => '1',
       lower_boundary => '7',
-      master_cnt     => '3',
-      master_crc     => '1ddd6c71',
+      source_cnt     => '3',
+      source_crc     => '1ddd6c71',
       table          => 'test.mt1',
       this_cnt       => '2',
       this_crc       => '4a57d814',
@@ -67,8 +67,8 @@ test_diff_where(
       crc_diff       => '0',
       db             => 'test',
       lower_boundary => undef,
-      master_cnt     => '0',
-      master_crc     => '0',
+      source_cnt     => '0',
+      source_crc     => '0',
       table          => 'test.history',
       tbl            => 'history',
       this_cnt       => '49',
diff --git a/t/pt-table-sync/enum_fields.t b/t/pt-table-sync/enum_fields.t
index 05ab4dd02..90a9f0e65 100644
--- a/t/pt-table-sync/enum_fields.t
+++ b/t/pt-table-sync/enum_fields.t
@@ -18,27 +18,27 @@ require "$trunk/bin/pt-table-sync";
 my $output;
 my $dp = new DSNParser(opts=>$dsn_opts);
 my $sb = new Sandbox(basedir => '/tmp', DSNParser => $dp);
-my $master_dbh = $sb->get_dbh_for('master');
-my $slave_dbh  = $sb->get_dbh_for('slave1');
+my $source_dbh = $sb->get_dbh_for('source');
+my $replica_dbh  = $sb->get_dbh_for('replica1');
 
-if ( !$master_dbh ) {
-   plan skip_all => 'Cannot connect to sandbox master';
+if ( !$source_dbh ) {
+   plan skip_all => 'Cannot connect to sandbox source';
 }
-elsif ( !$slave_dbh ) {
-   plan skip_all => 'Cannot connect to sandbox slave';
+elsif ( !$replica_dbh ) {
+   plan skip_all => 'Cannot connect to sandbox replica';
 }
 else {
    plan tests => 2;
 }
 
-$sb->load_file('master', 't/pt-table-sync/samples/enum_fields.sql');
+$sb->load_file('source', 't/pt-table-sync/samples/enum_fields.sql');
 
 # #############################################################################
 # Issue 804: mk-table-sync: can't nibble because index name isn't lower case?
 # #############################################################################
-$master_dbh->do('set sql_log_bin=0');
-$master_dbh->do(q/INSERT INTO enum_fields_db.rgb (name, hex_code) VALUES ('blue','0x0000FF')/);
-$output = `$trunk/bin/pt-table-sync --sync-to-master h=127.1,P=12346,u=msandbox,p=msandbox -d enum_fields_db --print`;
+$source_dbh->do('set sql_log_bin=0');
+$source_dbh->do(q/INSERT INTO enum_fields_db.rgb (name, hex_code) VALUES ('blue','0x0000FF')/);
+$output = `$trunk/bin/pt-table-sync --sync-to-source h=127.1,P=12346,u=msandbox,p=msandbox -d enum_fields_db --print`;
 $output = remove_traces($output);
 chomp($output);
 is(
@@ -50,7 +50,7 @@ is(
 # #############################################################################
 # Done.
 # #############################################################################
-$sb->wipe_clean($master_dbh);
-$sb->wipe_clean($slave_dbh);
+$sb->wipe_clean($source_dbh);
+$sb->wipe_clean($replica_dbh);
 ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox");
 exit;
diff --git a/t/pt-table-sync/filters.t b/t/pt-table-sync/filters.t
index 611a684c8..5928aa53f 100644
--- a/t/pt-table-sync/filters.t
+++ b/t/pt-table-sync/filters.t
@@ -18,26 +18,26 @@ require "$trunk/bin/pt-table-sync";
 
 my $dp = new DSNParser(opts=>$dsn_opts);
 my $sb = new Sandbox(basedir => '/tmp', DSNParser => $dp);
-my $master_dbh = $sb->get_dbh_for('master');
-my $slave_dbh  = $sb->get_dbh_for('slave1');
+my $source_dbh = $sb->get_dbh_for('source');
+my $replica_dbh  = $sb->get_dbh_for('replica1');
 
-if ( !$master_dbh ) {
-   plan skip_all => 'Cannot connect to sandbox master';
+if ( !$source_dbh ) {
+   plan skip_all => 'Cannot connect to sandbox source';
 }
-elsif ( !$slave_dbh ) {
-   plan skip_all => 'Cannot connect to sandbox slave';
+elsif ( !$replica_dbh ) {
+   plan skip_all => 'Cannot connect to sandbox replica';
 }
 else {
    plan tests => 18;
 }
 
-my $master_dsn = $sb->dsn_for('master');
-my $slave1_dsn = $sb->dsn_for('slave1');
+my $source_dsn = $sb->dsn_for('source');
+my $replica1_dsn = $sb->dsn_for('replica1');
 my $output;
 
 # See this SQL file because it has a number of simple dbs and tbls
 # that are used to checking schema object filters.
-$sb->load_file('master', "t/lib/samples/SchemaIterator.sql");
+$sb->load_file('source', "t/lib/samples/SchemaIterator.sql");
 
 sub test_filters {
    my (%args) = @_;
@@ -50,7 +50,7 @@ sub test_filters {
       },
    );
 
-   my $tables_used = PerconaTest::tables_used($sb->genlog('master'));
+   my $tables_used = PerconaTest::tables_used($sb->genlog('source'));
    is_deeply(
       $tables_used,
       $args{res},
@@ -65,16 +65,16 @@ sub test_filters {
 # Not really a filter, but only the specified tables should be used.
 test_filters(
    name => "Sync d1.t1 to d1.t2",
-   cmds => ["$master_dsn,D=d1,t=t1", "t=t2"],
+   cmds => ["$source_dsn,D=d1,t=t1", "t=t2"],
    res  => [qw(d1.t1 d1.t2)],
 );
 
-# Use slave1 like it's another master, ok becuase we're not actually
-# syncing anything, so --no-check-slave is required else pt-table-sync
-# won't run (because it doesn't like to sync directly to a slave).
+# Use replica1 like it's another source, ok becuase we're not actually
+# syncing anything, so --no-check-replica is required else pt-table-sync
+# won't run (because it doesn't like to sync directly to a replica).
 test_filters(
    name => "-t d1.t1",
-   cmds => [$master_dsn, $slave1_dsn, qw(--no-check-slave),
+   cmds => [$source_dsn, $replica1_dsn, qw(--no-check-replica),
             qw(-t d1.t1)],
    res  => [qw(d1.t1)],
 );
@@ -82,7 +82,7 @@ test_filters(
 # Like the previous test, but now any table called "t1".
 test_filters(
    name => "-t t1",
-   cmds => [$master_dsn, $slave1_dsn, qw(--no-check-slave),
+   cmds => [$source_dsn, $replica1_dsn, qw(--no-check-replica),
             qw(-t t1)],
    res  => [qw(d1.t1 d2.t1)],
 );
@@ -90,7 +90,7 @@ test_filters(
 # Only the given db, all its tables: there's only 1 tbl in d2.
 test_filters(
    name => "--databases d2",
-   cmds => [$master_dsn, $slave1_dsn, qw(--no-check-slave),
+   cmds => [$source_dsn, $replica1_dsn, qw(--no-check-replica),
             qw(--databases d2)],
    res  => [qw(d2.t1)],
 );
@@ -98,21 +98,21 @@ test_filters(
 # --database with --tables.
 test_filters(
    name => "--databases d1 --tables t2,t3",
-   cmds => [$master_dsn, $slave1_dsn, qw(--no-check-slave),
+   cmds => [$source_dsn, $replica1_dsn, qw(--no-check-replica),
             qw(--databases d1), "--tables", "t2,t3"],
    res  => [qw(d1.t2 d1.t3)],
 );
 
 # #############################################################################
-# Filters with --replicate and --sync-to-master.
+# Filters with --replicate and --sync-to-source.
 # #############################################################################
    
 # Checksum the filter tables.
-$master_dbh->do("DROP DATABASE IF EXISTS percona");
-$sb->wait_for_slaves();
-diag(`$trunk/bin/pt-table-checksum $master_dsn -d d1,d2,d3 --chunk-size 100 --quiet --set-vars innodb_lock_wait_timeout=3 --max-load ''`);
+$source_dbh->do("DROP DATABASE IF EXISTS percona");
+$sb->wait_for_replicas();
+diag(`$trunk/bin/pt-table-checksum $source_dsn -d d1,d2,d3 --chunk-size 100 --quiet --set-vars innodb_lock_wait_timeout=3 --max-load ''`);
 
-my $rows = $master_dbh->selectall_arrayref("SELECT CONCAT(db, '.', tbl) FROM percona.checksums ORDER BY db, tbl");
+my $rows = $source_dbh->selectall_arrayref("SELECT CONCAT(db, '.', tbl) FROM percona.checksums ORDER BY db, tbl");
 is_deeply(
    $rows,
    [
@@ -124,27 +124,27 @@ is_deeply(
    "Checksummed all tables"
 ) or diag(Dumper($rows));
 
-# Make all checksums on the slave different than the master
+# Make all checksums on the replica different than the source
 # so that pt-table-sync would sync all the tables if there
 # were no filters.
-$slave_dbh->do("UPDATE percona.checksums SET this_cnt=999 WHERE 1=1");
+$replica_dbh->do("UPDATE percona.checksums SET this_cnt=999 WHERE 1=1");
 
 # Verify that that ^ is true.
 test_filters(
-   name => "All tables are different on the slave",
-   cmds => [$master_dsn, qw(--replicate percona.checksums)],
+   name => "All tables are different on the replica",
+   cmds => [$source_dsn, qw(--replicate percona.checksums)],
    res  => [qw(d1.t1 d1.t2 d1.t3 d2.t1 percona.checksums)],
 );
 
-# Sync with --replicate, --sync-to-master, and some filters.
-# --replicate and --sync-to-master have different code paths,
+# Sync with --replicate, --sync-to-source, and some filters.
+# --replicate and --sync-to-source have different code paths,
 # but the filter results should be the same.
 foreach my $args (
-   [$master_dsn, qw(--replicate percona.checksums)],
-   [$slave1_dsn, qw(--replicate percona.checksums --sync-to-master)]
+   [$source_dsn, qw(--replicate percona.checksums)],
+   [$replica1_dsn, qw(--replicate percona.checksums --sync-to-source)]
 ) {
 
-   my $stm = $args->[-1] eq '--sync-to-master' ? ' --sync-to-master' : '';
+   my $stm = $args->[-1] eq '--sync-to-source' ? ' --sync-to-source' : '';
 
    test_filters(
       name => $stm . "--replicate --tables t1",
@@ -172,18 +172,18 @@ foreach my $args (
 # pt-table-sync --ignore-* options don't work with --replicate 
 # https://bugs.launchpad.net/percona-toolkit/+bug/1002365
 # #############################################################################
-$sb->wipe_clean($master_dbh);
-$sb->load_file("master", "t/pt-table-sync/samples/simple-tbls.sql");
+$sb->wipe_clean($source_dbh);
+$sb->load_file("source", "t/pt-table-sync/samples/simple-tbls.sql");
 
 # Create a checksum diff in a table that we're going to ignore
 # when we sync.
-$slave_dbh->do("INSERT INTO test.empty_it VALUES (null,11,11,'eleven')");
+$replica_dbh->do("INSERT INTO test.empty_it VALUES (null,11,11,'eleven')");
 
 # Create the checksums.
 diag(`$trunk/bin/pt-table-checksum h=127.1,P=12345,u=msandbox,p=msandbox -d test --quiet --quiet --set-vars innodb_lock_wait_timeout=3 --max-load ''`);
 
 # Make sure all the tables were checksummed.
-$rows = $master_dbh->selectall_arrayref("SELECT DISTINCT db, tbl FROM percona.checksums ORDER BY db, tbl");
+$rows = $source_dbh->selectall_arrayref("SELECT DISTINCT db, tbl FROM percona.checksums ORDER BY db, tbl");
 is_deeply(
    $rows,
    [ [qw(test empty_it) ],
@@ -199,7 +199,7 @@ is_deeply(
 # Sync the checksummed tables, but ignore the table with the diff we created.
 $output = output(
    sub { pt_table_sync::main("h=127.1,P=12346,u=msandbox,p=msandbox",
-      qw(--print --sync-to-master --replicate percona.checksums),
+      qw(--print --sync-to-source --replicate percona.checksums),
       "--ignore-tables", "test.empty_it") },
    stderr => 1,
 );
@@ -213,7 +213,7 @@ is(
 # Sync the checksummed tables, but ignore the database.
 $output = output(
    sub { pt_table_sync::main("h=127.1,P=12346,u=msandbox,p=msandbox",
-      qw(--print --sync-to-master --replicate percona.checksums),
+      qw(--print --sync-to-source --replicate percona.checksums),
       "--ignore-databases", "test") },
    stderr => 1,
 );
@@ -224,10 +224,10 @@ is(
    "Database ignored, nothing to sync (bug 1002365)"
 );
 
-# The same should work for just --sync-to-master.
+# The same should work for just --sync-to-source.
 $output = output(
    sub { pt_table_sync::main("h=127.1,P=12346,u=msandbox,p=msandbox",
-      qw(--print --sync-to-master),
+      qw(--print --sync-to-source),
       "--ignore-tables", "test.empty_it",
       "--ignore-databases", "percona") },
    stderr => 1,
@@ -236,12 +236,12 @@ $output = output(
 unlike(
    $output,
    qr/empty_it/,
-   "Table ignored, nothing to sync-to-master (bug 1002365)"
+   "Table ignored, nothing to sync-to-source (bug 1002365)"
 );
 
 # #############################################################################
 # Done.
 # #############################################################################
-$sb->wipe_clean($master_dbh);
+$sb->wipe_clean($source_dbh);
 ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox");
 exit;
diff --git a/t/pt-table-sync/float_precision.t b/t/pt-table-sync/float_precision.t
index e49a3e018..25d79734c 100644
--- a/t/pt-table-sync/float_precision.t
+++ b/t/pt-table-sync/float_precision.t
@@ -19,32 +19,32 @@ require "$trunk/bin/pt-table-sync";
 my $output;
 my $dp = new DSNParser(opts=>$dsn_opts);
 my $sb = new Sandbox(basedir => '/tmp', DSNParser => $dp);
-my $master_dbh = $sb->get_dbh_for('master');
-my $slave_dbh  = $sb->get_dbh_for('slave1');
+my $source_dbh = $sb->get_dbh_for('source');
+my $replica_dbh  = $sb->get_dbh_for('replica1');
 
-if ( !$master_dbh ) {
-   plan skip_all => 'Cannot connect to sandbox master';
+if ( !$source_dbh ) {
+   plan skip_all => 'Cannot connect to sandbox source';
 }
-elsif ( !$slave_dbh ) {
-   plan skip_all => 'Cannot connect to sandbox slave';
+elsif ( !$replica_dbh ) {
+   plan skip_all => 'Cannot connect to sandbox replica';
 }
 
-my $master_dsn = $sb->dsn_for('master');
-my $slave1_dsn = $sb->dsn_for('slave1');
+my $source_dsn = $sb->dsn_for('source');
+my $replica1_dsn = $sb->dsn_for('replica1');
 
 # #############################################################################
 # Issue 410: mk-table-sync doesn't have --float-precision
 # #############################################################################
 
-$sb->create_dbs($master_dbh, ['test']);
-$master_dbh->do('create table test.fl (id int not null primary key, f float(12,10), d double)');
-$master_dbh->do('insert into test.fl values (1, 1.0000012, 2.0000012)');
-$sb->wait_for_slaves();
-$slave_dbh->do('update test.fl set d = 2.0000013 where id = 1');
+$sb->create_dbs($source_dbh, ['test']);
+$source_dbh->do('create table test.fl (id int not null primary key, f float(12,10), d double)');
+$source_dbh->do('insert into test.fl values (1, 1.0000012, 2.0000012)');
+$sb->wait_for_replicas();
+$replica_dbh->do('update test.fl set d = 2.0000013 where id = 1');
 
 # The columns really are different at this point so we should
 # get a REPLACE without using --float-precision.
-$output = `$trunk/bin/pt-table-sync --sync-to-master h=127.1,P=12346,u=msandbox,p=msandbox,D=test,t=fl --print 2>&1`;
+$output = `$trunk/bin/pt-table-sync --sync-to-source h=127.1,P=12346,u=msandbox,p=msandbox,D=test,t=fl --print 2>&1`;
 $output = remove_traces($output);
 is(
    $output,
@@ -56,7 +56,7 @@ is(
 # Now use --float-precision to roundoff the differing columns.
 # We have 2.0000012
 #     vs. 2.0000013, so if we round at 6 places, they should be the same.
-$output = `$trunk/bin/pt-table-sync --sync-to-master h=127.1,P=12346,u=msandbox,p=msandbox,D=test,t=fl --print --float-precision 6 2>&1`;
+$output = `$trunk/bin/pt-table-sync --sync-to-source h=127.1,P=12346,u=msandbox,p=msandbox,D=test,t=fl --print --float-precision 6 2>&1`;
 is(
    $output,
    '',
@@ -68,19 +68,19 @@ is(
 # https://bugs.launchpad.net/percona-toolkit/+bug/1229861
 # #############################################################################
 
-$sb->load_file('master', "t/pt-table-sync/samples/sync-float.sql");
-$slave_dbh->do("INSERT INTO sync_float_1229861.t (`c1`, `c2`, `c3`, `snrmin`, `snrmax`, `snravg`) VALUES (1,1,1,29.5,33.5,31.6)");
+$sb->load_file('source', "t/pt-table-sync/samples/sync-float.sql");
+$replica_dbh->do("INSERT INTO sync_float_1229861.t (`c1`, `c2`, `c3`, `snrmin`, `snrmax`, `snravg`) VALUES (1,1,1,29.5,33.5,31.6)");
 
 $output = output(sub {
       pt_table_sync::main(
-         "$master_dsn,D=sync_float_1229861,t=t",
-         "$slave1_dsn",
-         qw(--no-check-slave --print --execute))
+         "$source_dsn,D=sync_float_1229861,t=t",
+         "$replica1_dsn",
+         qw(--no-check-replica --print --execute))
    },
    stderr => 1,
 );
 
-my $rows = $slave_dbh->selectall_arrayref("SELECT * FROM sync_float_1229861.t");
+my $rows = $replica_dbh->selectall_arrayref("SELECT * FROM sync_float_1229861.t");
 is_deeply(
    $rows,
    [],
@@ -90,7 +90,7 @@ is_deeply(
 # #############################################################################
 # Done.
 # #############################################################################
-$sb->wipe_clean($master_dbh);
-$sb->wipe_clean($slave_dbh);
+$sb->wipe_clean($source_dbh);
+$sb->wipe_clean($replica_dbh);
 ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox");
 done_testing;
diff --git a/t/pt-table-sync/force_index.t b/t/pt-table-sync/force_index.t
index 44fe11acc..12513af4a 100644
--- a/t/pt-table-sync/force_index.t
+++ b/t/pt-table-sync/force_index.t
@@ -18,40 +18,40 @@ require "$trunk/bin/pt-table-sync";
 my $output;
 my $dp = new DSNParser(opts=>$dsn_opts);
 my $sb = new Sandbox(basedir => '/tmp', DSNParser => $dp);
-my $master_dbh = $sb->get_dbh_for('master');
-my $slave_dbh  = $sb->get_dbh_for('slave1');
+my $source_dbh = $sb->get_dbh_for('source');
+my $replica_dbh  = $sb->get_dbh_for('replica1');
 
-if ( !$master_dbh ) {
-   plan skip_all => 'Cannot connect to sandbox master';
+if ( !$source_dbh ) {
+   plan skip_all => 'Cannot connect to sandbox source';
 }
-elsif ( !$slave_dbh ) {
-   plan skip_all => 'Cannot connect to sandbox slave';
+elsif ( !$replica_dbh ) {
+   plan skip_all => 'Cannot connect to sandbox replica';
 }
 else {
    plan tests => 3;
 }
 
-$sb->wipe_clean($master_dbh);
-$sb->wipe_clean($slave_dbh);
-$sb->create_dbs($master_dbh, [qw(test)]);
+$sb->wipe_clean($source_dbh);
+$sb->wipe_clean($replica_dbh);
+$sb->create_dbs($source_dbh, [qw(test)]);
 
 # ########################################################################
 # Issue 8: Add --force-index parameter to mk-table-checksum and
 # mk-table-sync
 # ########################################################################
-$sb->load_file('master', 't/pt-table-sync/samples/issue_37.sql');
-$sb->use('master', '-e \'INSERT INTO test.issue_37 VALUES (5), (6), (7), (8), (9);\'');
+$sb->load_file('source', 't/pt-table-sync/samples/issue_37.sql');
+$sb->use('source', '-e \'INSERT INTO test.issue_37 VALUES (5), (6), (7), (8), (9);\'');
 
-$output = `PTDEBUG=1 $trunk/bin/pt-table-sync h=127.0.0.1,P=12345,u=msandbox,p=msandbox P=12346 -d test -t issue_37 --algorithms Chunk --chunk-size 3 --no-check-slave --no-check-triggers --print 2>&1 | grep 'src: '`;
+$output = `PTDEBUG=1 $trunk/bin/pt-table-sync h=127.0.0.1,P=12345,u=msandbox,p=msandbox P=12346 -d test -t issue_37 --algorithms Chunk --chunk-size 3 --no-check-replica --no-check-triggers --print 2>&1 | grep 'src: '`;
 like($output, qr/FROM `test`\.`issue_37` FORCE INDEX \(`idx_a`\) WHERE/, 'Injects USE INDEX hint by default');
 
-$output = `PTDEBUG=1 $trunk/bin/pt-table-sync h=127.0.0.1,P=12345,u=msandbox,p=msandbox P=12346 -d test -t issue_37 --algorithms Chunk --chunk-size 3 --no-check-slave --no-check-triggers --no-index-hint --print 2>&1 | grep 'src: '`;
+$output = `PTDEBUG=1 $trunk/bin/pt-table-sync h=127.0.0.1,P=12345,u=msandbox,p=msandbox P=12346 -d test -t issue_37 --algorithms Chunk --chunk-size 3 --no-check-replica --no-check-triggers --no-index-hint --print 2>&1 | grep 'src: '`;
 like($output, qr/FROM `test`\.`issue_37`  WHERE/, 'No USE INDEX hint with --no-index-hint');
 
 # #############################################################################
 # Done.
 # #############################################################################
-$sb->wipe_clean($master_dbh);
-$sb->wipe_clean($slave_dbh);
+$sb->wipe_clean($source_dbh);
+$sb->wipe_clean($replica_dbh);
 ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox");
 exit;
diff --git a/t/pt-table-sync/hex_blob.t b/t/pt-table-sync/hex_blob.t
index 3342fdb06..84e2a9218 100644
--- a/t/pt-table-sync/hex_blob.t
+++ b/t/pt-table-sync/hex_blob.t
@@ -17,10 +17,10 @@ require "$trunk/bin/pt-table-sync";
 
 my $dp  = new DSNParser(opts=>$dsn_opts);
 my $sb  = new Sandbox(basedir => '/tmp', DSNParser => $dp);
-my $dbh = $sb->get_dbh_for('master');
+my $dbh = $sb->get_dbh_for('source');
 
 if ( !$dbh ) {
-   plan skip_all => 'Cannot connect to sandbox master';
+   plan skip_all => 'Cannot connect to sandbox source';
 }
 else {
    plan tests => 3;
@@ -30,7 +30,7 @@ my $output;
 my @args = (qw(-F /tmp/12345/my.sandbox.cnf --print), 'D=issue_641,t=lt',
             'D=issue_641,t=rt');
 
-$sb->load_file('master', "t/lib/samples/issue_641.sql");
+$sb->load_file('source', "t/lib/samples/issue_641.sql");
 
 # #############################################################################
 # Issue 641: Make mk-table-sync use hex for binary/blob data
diff --git a/t/pt-table-sync/instrumentaiton.t b/t/pt-table-sync/instrumentaiton.t
index 93f2ddae8..c432b9fb6 100644
--- a/t/pt-table-sync/instrumentaiton.t
+++ b/t/pt-table-sync/instrumentaiton.t
@@ -17,21 +17,21 @@ require "$trunk/bin/pt-table-sync";
 
 my $dp = new DSNParser(opts=>$dsn_opts);
 my $sb = new Sandbox(basedir => '/tmp', DSNParser => $dp);
-my $master_dbh = $sb->get_dbh_for('master');
-my $slave_dbh  = $sb->get_dbh_for('slave1');
+my $source_dbh = $sb->get_dbh_for('source');
+my $replica_dbh  = $sb->get_dbh_for('replica1');
 
-if ( !$master_dbh ) {
-   plan skip_all => 'Cannot connect to sandbox master';
+if ( !$source_dbh ) {
+   plan skip_all => 'Cannot connect to sandbox source';
 }
-elsif ( !$slave_dbh ) {
-   plan skip_all => 'Cannot connect to sandbox slave';
+elsif ( !$replica_dbh ) {
+   plan skip_all => 'Cannot connect to sandbox replica';
 }
 else {
    plan tests => 2;
 }
 
 my $output = '';
-my @args   = (qw(--verbose --print --sync-to-master), 'h=127.1,P=12346,u=msandbox,p=msandbox');
+my @args   = (qw(--verbose --print --sync-to-source), 'h=127.1,P=12346,u=msandbox,p=msandbox');
 
 # #############################################################################
 # Issue 377: Make mk-table-sync print start/end times
@@ -51,7 +51,7 @@ like(
 # #############################################################################
 # Done.
 # #############################################################################
-$sb->wipe_clean($master_dbh);
-$sb->wipe_clean($slave_dbh);
+$sb->wipe_clean($source_dbh);
+$sb->wipe_clean($replica_dbh);
 ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox");
 exit;
diff --git a/t/pt-table-sync/issue_1052.t b/t/pt-table-sync/issue_1052.t
index 44aa206ce..ad4c862d8 100644
--- a/t/pt-table-sync/issue_1052.t
+++ b/t/pt-table-sync/issue_1052.t
@@ -17,21 +17,21 @@ require "$trunk/bin/pt-table-sync";
 
 my $dp = new DSNParser(opts=>$dsn_opts);
 my $sb = new Sandbox(basedir => '/tmp', DSNParser => $dp);
-my $master_dbh = $sb->get_dbh_for('master');
-my $slave_dbh  = $sb->get_dbh_for('slave1'); 
+my $source_dbh = $sb->get_dbh_for('source');
+my $replica_dbh  = $sb->get_dbh_for('replica1'); 
 
-if ( !$master_dbh ) {
-   plan skip_all => 'Cannot connect to sandbox master';
+if ( !$source_dbh ) {
+   plan skip_all => 'Cannot connect to sandbox source';
 }
-elsif ( !$slave_dbh ) {
-   plan skip_all => 'Cannot connect to sandbox slave';
+elsif ( !$replica_dbh ) {
+   plan skip_all => 'Cannot connect to sandbox replica';
 }
 else {
    plan tests => 2;
 }
 
 my $output;
-my @args = ('--sync-to-master', 'h=127.1,P=12346,u=msandbox,p=msandbox',
+my @args = ('--sync-to-source', 'h=127.1,P=12346,u=msandbox,p=msandbox',
             qw(-d issue_1052 --print));
 
 # #############################################################################
@@ -39,12 +39,12 @@ my @args = ('--sync-to-master', 'h=127.1,P=12346,u=msandbox,p=msandbox',
 # #############################################################################
 
 # Re-using this table for this issue.  It has 100 pk rows.
-$sb->load_file('master', 't/pt-table-sync/samples/issue_1052.sql');
+$sb->load_file('source', 't/pt-table-sync/samples/issue_1052.sql');
 wait_until(
    sub {
       my $row;
       eval {
-         $row = $slave_dbh->selectrow_hashref("select * from issue_1052.t");
+         $row = $replica_dbh->selectrow_hashref("select * from issue_1052.t");
       };
       return 1 if $row;
    },
@@ -65,6 +65,6 @@ is(
 # #############################################################################
 # Done.
 # #############################################################################
-$sb->wipe_clean($master_dbh);
+$sb->wipe_clean($source_dbh);
 ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox");
 exit;
diff --git a/t/pt-table-sync/issue_1065.t b/t/pt-table-sync/issue_1065.t
index 166e0495f..e951842d0 100644
--- a/t/pt-table-sync/issue_1065.t
+++ b/t/pt-table-sync/issue_1065.t
@@ -17,33 +17,33 @@ require "$trunk/bin/pt-table-sync";
 
 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 ( !$slave1_dbh ) {
-   plan skip_all => 'Cannot connect to sandbox slave2';
+elsif ( !$replica1_dbh ) {
+   plan skip_all => 'Cannot connect to sandbox replica2';
 }
 else {
    plan tests => 2;
 }
 
 my $output;
-my @args = ('--sync-to-master', 'h=127.1,P=12346,u=msandbox,p=msandbox',
+my @args = ('--sync-to-source', 'h=127.1,P=12346,u=msandbox,p=msandbox',
             qw(-t test.it1 --print --execute --no-check-triggers));
 
 # #############################################################################
 # Issue 1065: mk-table-sync --algorithm seems to be case-sensitive
 # #############################################################################
-$sb->load_file('master', "t/pt-table-sync/samples/simple-tbls.sql");
+$sb->load_file('source', "t/pt-table-sync/samples/simple-tbls.sql");
 
-$slave1_dbh->do("delete from test.it1 where id=1 limit 1");
+$replica1_dbh->do("delete from test.it1 where id=1 limit 1");
 
 $output = output(
    sub { pt_table_sync::main(@args, qw(--algo chunk)) },
@@ -57,6 +57,6 @@ like(
 # #############################################################################
 # Done.
 # #############################################################################
-$sb->wipe_clean($master_dbh);
+$sb->wipe_clean($source_dbh);
 ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox");
 exit;
diff --git a/t/pt-table-sync/issue_218.t b/t/pt-table-sync/issue_218.t
index dd6b91328..b52df1a44 100644
--- a/t/pt-table-sync/issue_218.t
+++ b/t/pt-table-sync/issue_218.t
@@ -18,35 +18,35 @@ require "$trunk/bin/pt-table-sync";
 my $output;
 my $dp = new DSNParser(opts=>$dsn_opts);
 my $sb = new Sandbox(basedir => '/tmp', DSNParser => $dp);
-my $master_dbh = $sb->get_dbh_for('master');
-my $slave_dbh  = $sb->get_dbh_for('slave1');
+my $source_dbh = $sb->get_dbh_for('source');
+my $replica_dbh  = $sb->get_dbh_for('replica1');
 
-if ( !$master_dbh ) {
-   plan skip_all => 'Cannot connect to sandbox master';
+if ( !$source_dbh ) {
+   plan skip_all => 'Cannot connect to sandbox source';
 }
-elsif ( !$slave_dbh ) {
-   plan skip_all => 'Cannot connect to sandbox slave';
+elsif ( !$replica_dbh ) {
+   plan skip_all => 'Cannot connect to sandbox replica';
 }
 else {
    plan tests => 2;
 }
 
-$sb->wipe_clean($master_dbh);
-$sb->wipe_clean($slave_dbh);
+$sb->wipe_clean($source_dbh);
+$sb->wipe_clean($replica_dbh);
 
 # #############################################################################
 # Issue 218: Two NULL column values don't compare properly w/ Stream/GroupBy
 # #############################################################################
-$sb->create_dbs($master_dbh, [qw(issue218)]);
-$sb->use('master', '-e "CREATE TABLE issue218.t1 (i INT)"');
-$sb->use('master', '-e "INSERT INTO issue218.t1 VALUES (NULL)"');
-qx($trunk/bin/pt-table-sync --no-check-slave --print --database issue218 h=127.1,P=12345,u=msandbox,p=msandbox P=12346);
+$sb->create_dbs($source_dbh, [qw(issue218)]);
+$sb->use('source', '-e "CREATE TABLE issue218.t1 (i INT)"');
+$sb->use('source', '-e "INSERT INTO issue218.t1 VALUES (NULL)"');
+qx($trunk/bin/pt-table-sync --no-check-replica --print --database issue218 h=127.1,P=12345,u=msandbox,p=msandbox P=12346);
 ok(!$?, 'Issue 218: NULL values compare as equal');
 
 # #############################################################################
 # Done.
 # #############################################################################
-$sb->wipe_clean($master_dbh);
-$sb->wipe_clean($slave_dbh);
+$sb->wipe_clean($source_dbh);
+$sb->wipe_clean($replica_dbh);
 ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox");
 exit;
diff --git a/t/pt-table-sync/issue_22.t b/t/pt-table-sync/issue_22.t
index b68ef8fe0..422c33476 100644
--- a/t/pt-table-sync/issue_22.t
+++ b/t/pt-table-sync/issue_22.t
@@ -18,25 +18,25 @@ require "$trunk/bin/pt-table-sync";
 my $output;
 my $dp = new DSNParser(opts=>$dsn_opts);
 my $sb = new Sandbox(basedir => '/tmp', DSNParser => $dp);
-my $master_dbh = $sb->get_dbh_for('master');
+my $source_dbh = $sb->get_dbh_for('source');
 
-if ( !$master_dbh ) {
-   plan skip_all => 'Cannot connect to sandbox master';
+if ( !$source_dbh ) {
+   plan skip_all => 'Cannot connect to sandbox source';
 }
 else {
    plan tests => 4;
 }
 
-$sb->wipe_clean($master_dbh);
-$sb->create_dbs($master_dbh, [qw(test)]);
+$sb->wipe_clean($source_dbh);
+$sb->create_dbs($source_dbh, [qw(test)]);
 
 # #############################################################################
 # Issue 22: mk-table-sync fails with uninitialized value at line 2330
 # #############################################################################
-$sb->use('master', "-D test < $trunk/t/pt-table-sync/samples/issue_22.sql");
-$sb->use('master', "-D test -e \"SET SQL_LOG_BIN=0; INSERT INTO test.messages VALUES (1,2,'author','2008-09-12 00:00:00','1','0','headers','msg');\"");
-$sb->create_dbs($master_dbh, [qw(test2)]);
-$sb->use('master', "-D test2 < $trunk/t/pt-table-sync/samples/issue_22.sql");
+$sb->use('source', "-D test < $trunk/t/pt-table-sync/samples/issue_22.sql");
+$sb->use('source', "-D test -e \"SET SQL_LOG_BIN=0; INSERT INTO test.messages VALUES (1,2,'author','2008-09-12 00:00:00','1','0','headers','msg');\"");
+$sb->create_dbs($source_dbh, [qw(test2)]);
+$sb->use('source', "-D test2 < $trunk/t/pt-table-sync/samples/issue_22.sql");
 
 $output = 'foo'; # To make explicitly sure that the following command
                  # returns blank because there are no rows and not just that
@@ -44,7 +44,7 @@ $output = 'foo'; # To make explicitly sure that the following command
 $output = `/tmp/12345/use -D test2 -e 'SELECT * FROM messages'`;
 ok(!$output, 'test2.messages is empty before sync (issue 22)');
 
-$output = `$trunk/bin/pt-table-sync --no-check-slave --execute u=msandbox,p=msandbox,P=12345,h=127.1,D=test,t=messages u=msandbox,p=msandbox,P=12345,h=127.1,D=test2,t=messages 2>&1`;
+$output = `$trunk/bin/pt-table-sync --no-check-replica --execute u=msandbox,p=msandbox,P=12345,h=127.1,D=test,t=messages u=msandbox,p=msandbox,P=12345,h=127.1,D=test2,t=messages 2>&1`;
 ok(!$output, 'Synced test.messages to test2.messages on same host (issue 22)');
 
 $output     = `/tmp/12345/use -D test  -e 'SELECT * FROM messages'`;
@@ -54,6 +54,6 @@ is($output, $output2, 'test2.messages matches test.messages (issue 22)');
 # #############################################################################
 # Done.
 # #############################################################################
-$sb->wipe_clean($master_dbh);
+$sb->wipe_clean($source_dbh);
 ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox");
 exit;
diff --git a/t/pt-table-sync/issue_262.t b/t/pt-table-sync/issue_262.t
index a19e9646c..aaf56a903 100644
--- a/t/pt-table-sync/issue_262.t
+++ b/t/pt-table-sync/issue_262.t
@@ -18,31 +18,31 @@ require "$trunk/bin/pt-table-sync";
 my $output;
 my $dp = new DSNParser(opts=>$dsn_opts);
 my $sb = new Sandbox(basedir => '/tmp', DSNParser => $dp);
-my $master_dbh = $sb->get_dbh_for('master');
-my $slave_dbh  = $sb->get_dbh_for('slave1');
+my $source_dbh = $sb->get_dbh_for('source');
+my $replica_dbh  = $sb->get_dbh_for('replica1');
 
-if ( !$master_dbh ) {
-   plan skip_all => 'Cannot connect to sandbox master';
+if ( !$source_dbh ) {
+   plan skip_all => 'Cannot connect to sandbox source';
 }
-elsif ( !$slave_dbh ) {
-   plan skip_all => 'Cannot connect to sandbox slave';
+elsif ( !$replica_dbh ) {
+   plan skip_all => 'Cannot connect to sandbox replica';
 }
 else {
    plan tests => 2;
 }
 
-$sb->wipe_clean($master_dbh);
-$sb->wipe_clean($slave_dbh);
-$sb->create_dbs($master_dbh, [qw(test)]);
+$sb->wipe_clean($source_dbh);
+$sb->wipe_clean($replica_dbh);
+$sb->create_dbs($source_dbh, [qw(test)]);
 
 # #############################################################################
 # Issue 262
 # #############################################################################
-$sb->create_dbs($master_dbh, ['foo']);
-$sb->use('master', '-e "create table foo.t1 (i int)"');
-$sb->use('master', '-e "SET SQL_LOG_BIN=0; insert into foo.t1 values (1)"');
-$sb->use('slave1', '-e "truncate table foo.t1"');
-$output = `$trunk/bin/pt-table-sync --no-check-slave --print h=127.1,P=12345,u=msandbox,p=msandbox -d mysql,foo h=127.1,P=12346 2>&1`;
+$sb->create_dbs($source_dbh, ['foo']);
+$sb->use('source', '-e "create table foo.t1 (i int)"');
+$sb->use('source', '-e "SET SQL_LOG_BIN=0; insert into foo.t1 values (1)"');
+$sb->use('replica1', '-e "truncate table foo.t1"');
+$output = `$trunk/bin/pt-table-sync --no-check-replica --print h=127.1,P=12345,u=msandbox,p=msandbox -d mysql,foo h=127.1,P=12346 2>&1`;
 like(
    $output,
    qr/INSERT INTO `foo`\.`t1`\(`i`\) VALUES \('1'\)/,
@@ -52,7 +52,7 @@ like(
 # #############################################################################
 # Done.
 # #############################################################################
-$sb->wipe_clean($master_dbh);
-$sb->wipe_clean($slave_dbh);
+$sb->wipe_clean($source_dbh);
+$sb->wipe_clean($replica_dbh);
 ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox");
 exit;
diff --git a/t/pt-table-sync/issue_408.t b/t/pt-table-sync/issue_408.t
index 0dff57e5d..9fb79b052 100644
--- a/t/pt-table-sync/issue_408.t
+++ b/t/pt-table-sync/issue_408.t
@@ -18,26 +18,26 @@ require "$trunk/bin/pt-table-sync";
 my $output;
 my $dp = new DSNParser(opts=>$dsn_opts);
 my $sb = new Sandbox(basedir => '/tmp', DSNParser => $dp);
-my $master_dbh = $sb->get_dbh_for('master');
+my $source_dbh = $sb->get_dbh_for('source');
 
-diag(`$trunk/sandbox/start-sandbox master 12348 >/dev/null`);
-my $dbh2 = $sb->get_dbh_for('master1');
+diag(`$trunk/sandbox/start-sandbox source 12348 >/dev/null`);
+my $dbh2 = $sb->get_dbh_for('source1');
 
-if ( !$master_dbh ) {
-   plan skip_all => 'Cannot connect to sandbox master';
+if ( !$source_dbh ) {
+   plan skip_all => 'Cannot connect to sandbox source';
 }
 elsif ( !$dbh2 ) {
-   plan skip_all => 'Cannot connect to second sandbox master';
+   plan skip_all => 'Cannot connect to second sandbox source';
 }
 else {
    plan tests => 2;
 }
 
-$sb->wipe_clean($master_dbh);
-$sb->create_dbs($master_dbh, [qw(test)]);
+$sb->wipe_clean($source_dbh);
+$sb->create_dbs($source_dbh, [qw(test)]);
 
 # Need at least 1 table so the db will be used.
-$master_dbh->do('create table test.foo (i int)');
+$source_dbh->do('create table test.foo (i int)');
 
 # #############################################################################
 # Issue 408: DBD::mysql::st execute failed: Unknown database 'd1' at
@@ -54,7 +54,7 @@ like(
 # #############################################################################
 # Done.
 # #############################################################################
-$sb->wipe_clean($master_dbh);
+$sb->wipe_clean($source_dbh);
 diag(`/tmp/12348/stop >/dev/null`);
 diag(`rm -rf /tmp/12348 >/dev/null`);
 ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox");
diff --git a/t/pt-table-sync/issue_560.t b/t/pt-table-sync/issue_560.t
index 48b920b6b..364dab008 100644
--- a/t/pt-table-sync/issue_560.t
+++ b/t/pt-table-sync/issue_560.t
@@ -18,14 +18,14 @@ require "$trunk/bin/pt-table-sync";
 my $output;
 my $dp = new DSNParser(opts=>$dsn_opts);
 my $sb = new Sandbox(basedir => '/tmp', DSNParser => $dp);
-my $master_dbh = $sb->get_dbh_for('master');
-my $slave_dbh  = $sb->get_dbh_for('slave1');
+my $source_dbh = $sb->get_dbh_for('source');
+my $replica_dbh  = $sb->get_dbh_for('replica1');
 
-if ( !$master_dbh ) {
-   plan skip_all => 'Cannot connect to sandbox master';
+if ( !$source_dbh ) {
+   plan skip_all => 'Cannot connect to sandbox source';
 }
-elsif ( !$slave_dbh ) {
-   plan skip_all => 'Cannot connect to sandbox slave';
+elsif ( !$replica_dbh ) {
+   plan skip_all => 'Cannot connect to sandbox replica';
 }
 else {
    plan tests => 3;
@@ -34,11 +34,11 @@ else {
 # #############################################################################
 # Issue 560: mk-table-sync generates impossible WHERE
 # #############################################################################
-$sb->load_file("master", "t/pt-table-sync/samples/issue_560.sql");
+$sb->load_file("source", "t/pt-table-sync/samples/issue_560.sql");
 
-# Make slave differ.
-$slave_dbh->do('UPDATE issue_560.buddy_list SET buddy_id=0 WHERE player_id IN (333,334)');
-$slave_dbh->do('UPDATE issue_560.buddy_list SET buddy_id=0 WHERE player_id=486');
+# Make replica differ.
+$replica_dbh->do('UPDATE issue_560.buddy_list SET buddy_id=0 WHERE player_id IN (333,334)');
+$replica_dbh->do('UPDATE issue_560.buddy_list SET buddy_id=0 WHERE player_id=486');
 
 $output = `$trunk/bin/pt-table-checksum --replicate issue_560.checksum h=127.1,P=12345,u=msandbox,p=msandbox  -d issue_560 --chunk-size 50 --set-vars innodb_lock_wait_timeout=3`;
 
@@ -49,7 +49,7 @@ is(
 );
 
 $output = output(
-   sub { pt_table_sync::main('--sync-to-master', 'h=127.1,P=12346,u=msandbox,p=msandbox', qw(-d issue_560 --print -v -v  --chunk-size 50 --replicate issue_560.checksum)) },
+   sub { pt_table_sync::main('--sync-to-source', 'h=127.1,P=12346,u=msandbox,p=msandbox', qw(-d issue_560 --print -v -v  --chunk-size 50 --replicate issue_560.checksum)) },
    trf => \&remove_traces,
 );
 $output =~ s/\d\d:\d\d:\d\d/00:00:00/g;
@@ -65,7 +65,7 @@ ok(
 # #############################################################################
 # Done.
 # #############################################################################
-$sb->wipe_clean($master_dbh);
-$sb->wipe_clean($slave_dbh);
+$sb->wipe_clean($source_dbh);
+$sb->wipe_clean($replica_dbh);
 ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox");
 exit;
diff --git a/t/pt-table-sync/issue_616.t b/t/pt-table-sync/issue_616.t
index 0651b56f9..fee686136 100644
--- a/t/pt-table-sync/issue_616.t
+++ b/t/pt-table-sync/issue_616.t
@@ -18,14 +18,14 @@ require "$trunk/bin/pt-table-sync";
 my $output;
 my $dp = new DSNParser(opts=>$dsn_opts);
 my $sb = new Sandbox(basedir => '/tmp', DSNParser => $dp);
-my $master_dbh = $sb->get_dbh_for('master');
-my $slave_dbh  = $sb->get_dbh_for('slave1');
+my $source_dbh = $sb->get_dbh_for('source');
+my $replica_dbh  = $sb->get_dbh_for('replica1');
 
-if ( !$master_dbh ) {
-   plan skip_all => 'Cannot connect to sandbox master';
+if ( !$source_dbh ) {
+   plan skip_all => 'Cannot connect to sandbox source';
 }
-elsif ( !$slave_dbh ) {
-   plan skip_all => 'Cannot connect to sandbox slave';
+elsif ( !$replica_dbh ) {
+   plan skip_all => 'Cannot connect to sandbox replica';
 }
 else {
    plan tests => 3;
@@ -35,42 +35,42 @@ else {
 # Issue 616: mk-table-sync inserts NULL values instead of correct values
 # #############################################################################
 
-$sb->load_file('master', "t/lib/samples/issue_616.sql");
+$sb->load_file('source', "t/lib/samples/issue_616.sql");
 
 output(
    sub { pt_table_sync::main("h=127.1,P=12346,u=msandbox,p=msandbox",
-      qw(--sync-to-master --databases issue_616 --execute));
+      qw(--sync-to-source --databases issue_616 --execute));
    },
 );
 
-$sb->wait_for_slaves();
+$sb->wait_for_replicas();
 
 my $ok_r = [
-   [  1, 'from master' ],
-   [ 11, 'from master' ],
-   [ 21, 'from master' ],
-   [ 31, 'from master' ],
-   [ 41, 'from master' ],
-   [ 51, 'from master' ],
+   [  1, 'from source' ],
+   [ 11, 'from source' ],
+   [ 21, 'from source' ],
+   [ 31, 'from source' ],
+   [ 41, 'from source' ],
+   [ 51, 'from source' ],
 ];
 
-my $r = $master_dbh->selectall_arrayref('SELECT * FROM issue_616.t ORDER BY id');
+my $r = $source_dbh->selectall_arrayref('SELECT * FROM issue_616.t ORDER BY id');
 is_deeply(
    $r,
    $ok_r,
-   'Issue 616 synced on master'
+   'Issue 616 synced on source'
 );
       
-$r = $slave_dbh->selectall_arrayref('SELECT * FROM issue_616.t ORDER BY id');
+$r = $replica_dbh->selectall_arrayref('SELECT * FROM issue_616.t ORDER BY id');
 is_deeply(
    $r,
    $ok_r,
-   'Issue 616 synced on slave'
+   'Issue 616 synced on replica'
 );
 
 # #############################################################################
 # Done.
 # #############################################################################
-$sb->wipe_clean($master_dbh);
+$sb->wipe_clean($source_dbh);
 ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox");
 exit;
diff --git a/t/pt-table-sync/issue_627.t b/t/pt-table-sync/issue_627.t
index 411ba6eb0..4a3528453 100644
--- a/t/pt-table-sync/issue_627.t
+++ b/t/pt-table-sync/issue_627.t
@@ -18,22 +18,22 @@ require "$trunk/bin/pt-table-sync";
 my $output;
 my $dp = new DSNParser(opts=>$dsn_opts);
 my $sb = new Sandbox(basedir => '/tmp', DSNParser => $dp);
-my $master_dbh = $sb->get_dbh_for('master');
-my $slave_dbh  = $sb->get_dbh_for('slave1');
+my $source_dbh = $sb->get_dbh_for('source');
+my $replica_dbh  = $sb->get_dbh_for('replica1');
 
-if ( !$master_dbh ) {
-   plan skip_all => 'Cannot connect to sandbox master';
+if ( !$source_dbh ) {
+   plan skip_all => 'Cannot connect to sandbox source';
 }
-elsif ( !$slave_dbh ) {
-   plan skip_all => 'Cannot connect to sandbox slave';
+elsif ( !$replica_dbh ) {
+   plan skip_all => 'Cannot connect to sandbox replica';
 }
 else {
    plan tests => 2;
 }
 
-$sb->wipe_clean($master_dbh);
-$sb->wipe_clean($slave_dbh);
-$sb->create_dbs($master_dbh, [qw(test)]);
+$sb->wipe_clean($source_dbh);
+$sb->wipe_clean($replica_dbh);
+$sb->create_dbs($source_dbh, [qw(test)]);
 
 # #############################################################################
 # Issue 627: Results for mk-table-sync --replicate may be incorrect
@@ -44,15 +44,15 @@ sleep 1;
 # Make the table differ.
 # (10, '2009-09-03 14:18:00', 'k'),    -> (10, '2009-09-03 14:18:00', 'z'),
 # (100, '2009-09-06 15:01:23', 'cv');  -> (100, '2009-09-06 15:01:23', 'zz');
-$slave_dbh->do('UPDATE issue_375.t SET foo="z" WHERE id=10');
-$slave_dbh->do('UPDATE issue_375.t SET foo="zz" WHERE id=100');
+$replica_dbh->do('UPDATE issue_375.t SET foo="z" WHERE id=10');
+$replica_dbh->do('UPDATE issue_375.t SET foo="zz" WHERE id=100');
 
 # Checksum and replicate.
 diag(`$trunk/bin/pt-table-checksum --create-replicate-table --replicate issue_375.checksum h=127.1,P=12345,u=msandbox,p=msandbox -d issue_375 -t t --set-vars innodb_lock_wait_timeout=3 > /dev/null`);
 
 # And now sync using the replicated checksum results/differences.
 $output = output(
-   sub { pt_table_sync::main('--sync-to-master', 'h=127.1,P=12346,u=msandbox,p=msandbox', qw(--replicate issue_375.checksum --print)) },
+   sub { pt_table_sync::main('--sync-to-source', 'h=127.1,P=12346,u=msandbox,p=msandbox', qw(--replicate issue_375.checksum --print)) },
    trf => \&remove_traces,
 );
 is(
@@ -69,7 +69,7 @@ REPLACE INTO `issue_375`.`t`(`id`, `updated_at`, `foo`) VALUES ('100', '2009-09-
 # #############################################################################
 # Done.
 # #############################################################################
-$sb->wipe_clean($master_dbh);
-$sb->wipe_clean($slave_dbh);
+$sb->wipe_clean($source_dbh);
+$sb->wipe_clean($replica_dbh);
 ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox");
 exit;
diff --git a/t/pt-table-sync/issue_631.t b/t/pt-table-sync/issue_631.t
index a0beec983..318f13ac3 100644
--- a/t/pt-table-sync/issue_631.t
+++ b/t/pt-table-sync/issue_631.t
@@ -18,17 +18,17 @@ require "$trunk/bin/pt-table-sync";
 my $output;
 my $dp = new DSNParser(opts=>$dsn_opts);
 my $sb = new Sandbox(basedir => '/tmp', DSNParser => $dp);
-my $master_dbh = $sb->get_dbh_for('master');
+my $source_dbh = $sb->get_dbh_for('source');
 
-if ( !$master_dbh ) {
-   plan skip_all => 'Cannot connect to sandbox master';
+if ( !$source_dbh ) {
+   plan skip_all => 'Cannot connect to sandbox source';
 }
 else {
    plan tests => 3;
 }
 
-$sb->wipe_clean($master_dbh);
-$sb->create_dbs($master_dbh, [qw(test)]);
+$sb->wipe_clean($source_dbh);
+$sb->create_dbs($source_dbh, [qw(test)]);
 
 # #############################################################################
 # Issue 631: mk-table-sync GroupBy and Stream fail
@@ -66,6 +66,6 @@ ok(
 # #############################################################################
 # Done.
 # #############################################################################
-$sb->wipe_clean($master_dbh);
+$sb->wipe_clean($source_dbh);
 ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox");
 exit;
diff --git a/t/pt-table-sync/issue_634.t b/t/pt-table-sync/issue_634.t
index 1fdd00fd5..fdf5ebf7d 100644
--- a/t/pt-table-sync/issue_634.t
+++ b/t/pt-table-sync/issue_634.t
@@ -18,14 +18,14 @@ require "$trunk/bin/pt-table-sync";
 my $output;
 my $dp = new DSNParser(opts=>$dsn_opts);
 my $sb = new Sandbox(basedir => '/tmp', DSNParser => $dp);
-my $master_dbh = $sb->get_dbh_for('master');
-my $slave_dbh  = $sb->get_dbh_for('slave1');
+my $source_dbh = $sb->get_dbh_for('source');
+my $replica_dbh  = $sb->get_dbh_for('replica1');
 
-if ( !$master_dbh ) {
-   plan skip_all => 'Cannot connect to sandbox master';
+if ( !$source_dbh ) {
+   plan skip_all => 'Cannot connect to sandbox source';
 }
-elsif ( !$slave_dbh ) {
-   plan skip_all => 'Cannot connect to sandbox slave';
+elsif ( !$replica_dbh ) {
+   plan skip_all => 'Cannot connect to sandbox replica';
 }
 else {
    plan tests => 4;
@@ -34,16 +34,16 @@ else {
 # #############################################################################
 # Issue 634: Cannot nibble table because MySQL chose no index
 # #############################################################################
-$sb->load_file('master', "t/pt-table-sync/samples/issue_634.sql");
-$slave_dbh->do('insert into issue_634.t values (1)');
+$sb->load_file('source', "t/pt-table-sync/samples/issue_634.sql");
+$replica_dbh->do('insert into issue_634.t values (1)');
 
 $output = output(
    sub { pt_table_sync::main("h=127.1,P=12346,u=msandbox,p=msandbox",
-      qw(--sync-to-master -d issue_634 --print --execute --algorithms Nibble))
+      qw(--sync-to-source -d issue_634 --print --execute --algorithms Nibble))
    },
    stderr => 1,
 );
-$sb->wait_for_slaves();
+$sb->wait_for_replicas();
 
 like(
    $output,
@@ -58,7 +58,7 @@ unlike(
 );
 
 is_deeply(
-   $slave_dbh->selectall_arrayref('select * from issue_634.t'),
+   $replica_dbh->selectall_arrayref('select * from issue_634.t'),
    [],
    '1-row table was synced (issue 634)'
 );
@@ -66,6 +66,6 @@ is_deeply(
 # #############################################################################
 # Done.
 # #############################################################################
-$sb->wipe_clean($master_dbh);
+$sb->wipe_clean($source_dbh);
 ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox");
 exit;
diff --git a/t/pt-table-sync/issue_644.t b/t/pt-table-sync/issue_644.t
index a3cd23b2e..82a4a11fd 100644
--- a/t/pt-table-sync/issue_644.t
+++ b/t/pt-table-sync/issue_644.t
@@ -18,29 +18,29 @@ require "$trunk/bin/pt-table-sync";
 my $output;
 my $dp = new DSNParser(opts=>$dsn_opts);
 my $sb = new Sandbox(basedir => '/tmp', DSNParser => $dp);
-my $master_dbh = $sb->get_dbh_for('master');
-my $slave_dbh  = $sb->get_dbh_for('slave1');
+my $source_dbh = $sb->get_dbh_for('source');
+my $replica_dbh  = $sb->get_dbh_for('replica1');
 
-if ( !$master_dbh ) {
-   plan skip_all => 'Cannot connect to sandbox master';
+if ( !$source_dbh ) {
+   plan skip_all => 'Cannot connect to sandbox source';
 }
-elsif ( !$slave_dbh ) {
-   plan skip_all => 'Cannot connect to sandbox slave';
+elsif ( !$replica_dbh ) {
+   plan skip_all => 'Cannot connect to sandbox replica';
 }
 else {
    plan tests => 3;
 }
 
-$sb->wipe_clean($master_dbh);
-$sb->wipe_clean($slave_dbh);
-$sb->create_dbs($master_dbh, [qw(test)]);
+$sb->wipe_clean($source_dbh);
+$sb->wipe_clean($replica_dbh);
+$sb->create_dbs($source_dbh, [qw(test)]);
 
 # #############################################################################
 # Issue 644: Another possible infinite loop with mk-table-sync Nibble
 # #############################################################################
 diag(`/tmp/12345/use < $trunk/t/pt-table-sync/samples/issue_644.sql`);
 sleep 1;
-$output = `$trunk/bin/pt-table-sync --algo Nibble --sync-to-master h=127.1,P=12346,u=msandbox,p=msandbox -d issue_644 --print --chunk-size 2 -v`;
+$output = `$trunk/bin/pt-table-sync --algo Nibble --sync-to-source h=127.1,P=12346,u=msandbox,p=msandbox -d issue_644 --print --chunk-size 2 -v`;
 $output =~ s/\d\d:\d\d:\d\d/00:00:00/g;
 ok(
    no_diff(
@@ -52,7 +52,7 @@ ok(
 );
 
 # Thanks to issue 568, this table can be chunked on the char col.
-$output = `$trunk/bin/pt-table-sync --algo Chunk --sync-to-master h=127.1,P=12346,u=msandbox,p=msandbox -d issue_644 --print --chunk-size 2 -v`;
+$output = `$trunk/bin/pt-table-sync --algo Chunk --sync-to-source h=127.1,P=12346,u=msandbox,p=msandbox -d issue_644 --print --chunk-size 2 -v`;
 $output =~ s/\d\d:\d\d:\d\d/00:00:00/g;
 ok(
    no_diff(
@@ -66,7 +66,7 @@ ok(
 # #############################################################################
 # Done.
 # #############################################################################
-$sb->wipe_clean($master_dbh);
-$sb->wipe_clean($slave_dbh);
+$sb->wipe_clean($source_dbh);
+$sb->wipe_clean($replica_dbh);
 ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox");
 exit;
diff --git a/t/pt-table-sync/issue_804.t b/t/pt-table-sync/issue_804.t
index d9dc3d8e0..96a27b639 100644
--- a/t/pt-table-sync/issue_804.t
+++ b/t/pt-table-sync/issue_804.t
@@ -18,27 +18,27 @@ require "$trunk/bin/pt-table-sync";
 my $output;
 my $dp = new DSNParser(opts=>$dsn_opts);
 my $sb = new Sandbox(basedir => '/tmp', DSNParser => $dp);
-my $master_dbh = $sb->get_dbh_for('master');
-my $slave_dbh  = $sb->get_dbh_for('slave1');
+my $source_dbh = $sb->get_dbh_for('source');
+my $replica_dbh  = $sb->get_dbh_for('replica1');
 
-if ( !$master_dbh ) {
-   plan skip_all => 'Cannot connect to sandbox master';
+if ( !$source_dbh ) {
+   plan skip_all => 'Cannot connect to sandbox source';
 }
-elsif ( !$slave_dbh ) {
-   plan skip_all => 'Cannot connect to sandbox slave';
+elsif ( !$replica_dbh ) {
+   plan skip_all => 'Cannot connect to sandbox replica';
 }
 else {
    plan tests => 2;
 }
 
-$sb->load_file('master', 't/lib/samples/issue_804.sql');
+$sb->load_file('source', 't/lib/samples/issue_804.sql');
 
 # #############################################################################
 # Issue 804: mk-table-sync: can't nibble because index name isn't lower case?
 # #############################################################################
-$master_dbh->do('set sql_log_bin=0');
-$master_dbh->do('insert into issue_804.t values (999,999)');
-$output = `$trunk/bin/pt-table-sync --sync-to-master h=127.1,P=12346,u=msandbox,p=msandbox -d issue_804 --print --algorithms Nibble 2>&1`;
+$source_dbh->do('set sql_log_bin=0');
+$source_dbh->do('insert into issue_804.t values (999,999)');
+$output = `$trunk/bin/pt-table-sync --sync-to-source h=127.1,P=12346,u=msandbox,p=msandbox -d issue_804 --print --algorithms Nibble 2>&1`;
 $output = remove_traces($output);
 is(
    $output,
@@ -50,7 +50,7 @@ is(
 # #############################################################################
 # Done.
 # #############################################################################
-$sb->wipe_clean($master_dbh);
-$sb->wipe_clean($slave_dbh);
+$sb->wipe_clean($source_dbh);
+$sb->wipe_clean($replica_dbh);
 ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox");
 exit;
diff --git a/t/pt-table-sync/issue_920.t b/t/pt-table-sync/issue_920.t
index df0e8ed3d..9edb072ec 100644
--- a/t/pt-table-sync/issue_920.t
+++ b/t/pt-table-sync/issue_920.t
@@ -17,12 +17,12 @@ require "$trunk/bin/pt-table-sync";
 
 my $dp = new DSNParser(opts=>$dsn_opts);
 my $sb = new Sandbox(basedir => '/tmp', DSNParser => $dp);
-my $dbh = $sb->get_dbh_for('master');
+my $dbh = $sb->get_dbh_for('source');
 
 plan skip_all => 'Pending solution: waiting for the PT-2338 fix';
 
 if ( !$dbh ) {
-   plan skip_all => 'Cannot connect to sandbox master';
+   plan skip_all => 'Cannot connect to sandbox source';
 }
 else {
    plan tests => 4;
@@ -33,7 +33,7 @@ else {
 # conflict when using Chunk or Nibble.
 # #############################################################################
 $sb->wipe_clean($dbh);
-$sb->load_file('master', 't/pt-table-sync/samples/issue_920.sql');
+$sb->load_file('source', 't/pt-table-sync/samples/issue_920.sql');
 
 pt_table_sync::main(qw(--execute -F /tmp/12345/my.sandbox.cnf),
    'D=issue_920,t=PK_UK_test', 'D=issue_920,t=PK_UK_test_2');
diff --git a/t/pt-table-sync/issue_96.t b/t/pt-table-sync/issue_96.t
index 8786f8d01..0216069e3 100644
--- a/t/pt-table-sync/issue_96.t
+++ b/t/pt-table-sync/issue_96.t
@@ -18,17 +18,17 @@ require "$trunk/bin/pt-table-sync";
 my $output;
 my $dp = new DSNParser(opts=>$dsn_opts);
 my $sb = new Sandbox(basedir => '/tmp', DSNParser => $dp);
-my $master_dbh = $sb->get_dbh_for('master');
+my $source_dbh = $sb->get_dbh_for('source');
 
-if ( !$master_dbh ) {
-   plan skip_all => 'Cannot connect to sandbox master';
+if ( !$source_dbh ) {
+   plan skip_all => 'Cannot connect to sandbox source';
 }
 else {
    plan tests => 2;
 }
 
-$sb->wipe_clean($master_dbh);
-$sb->create_dbs($master_dbh, [qw(test)]);
+$sb->wipe_clean($source_dbh);
+$sb->create_dbs($source_dbh, [qw(test)]);
 
 # #############################################################################
 # Issue 96: mk-table-sync: Nibbler infinite loop
@@ -49,6 +49,6 @@ is(
 # #############################################################################
 # Done.
 # #############################################################################
-$sb->wipe_clean($master_dbh);
+$sb->wipe_clean($source_dbh);
 ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox");
 exit;
diff --git a/t/pt-table-sync/issue_965.t b/t/pt-table-sync/issue_965.t
index e387e2fa3..9427f72da 100644
--- a/t/pt-table-sync/issue_965.t
+++ b/t/pt-table-sync/issue_965.t
@@ -17,10 +17,10 @@ require "$trunk/bin/pt-table-sync";
 
 my $dp = new DSNParser(opts=>$dsn_opts);
 my $sb = new Sandbox(basedir => '/tmp', DSNParser => $dp);
-my $dbh = $sb->get_dbh_for('master');
+my $dbh = $sb->get_dbh_for('source');
 
 if ( !$dbh ) {
-   plan skip_all => 'Cannot connect to sandbox master';
+   plan skip_all => 'Cannot connect to sandbox source';
 }
 else {
    plan tests => 3;
@@ -32,7 +32,7 @@ my $output;
 # Issue 965: mk-table-sync --trim can cause impossible WHERE, invalid SQL
 # #############################################################################
 $sb->wipe_clean($dbh);
-$sb->load_file('master', 't/pt-table-sync/samples/issue_965.sql');
+$sb->load_file('source', 't/pt-table-sync/samples/issue_965.sql');
 
 $output = output(
    sub {
diff --git a/t/pt-table-sync/issue_996.t b/t/pt-table-sync/issue_996.t
index de8ba6f4c..6aa73b811 100644
--- a/t/pt-table-sync/issue_996.t
+++ b/t/pt-table-sync/issue_996.t
@@ -17,14 +17,14 @@ require "$trunk/bin/pt-table-sync";
 
 my $dp = new DSNParser(opts=>$dsn_opts);
 my $sb = new Sandbox(basedir => '/tmp', DSNParser => $dp);
-my $master_dbh = $sb->get_dbh_for('master');
-my $slave_dbh  = $sb->get_dbh_for('slave1'); 
+my $source_dbh = $sb->get_dbh_for('source');
+my $replica_dbh  = $sb->get_dbh_for('replica1'); 
 
-if ( !$master_dbh ) {
-   plan skip_all => 'Cannot connect to sandbox master';
+if ( !$source_dbh ) {
+   plan skip_all => 'Cannot connect to sandbox source';
 }
-elsif ( !$slave_dbh ) {
-   plan skip_all => 'Cannot connect to sandbox slave';
+elsif ( !$replica_dbh ) {
+   plan skip_all => 'Cannot connect to sandbox replica';
 }
 elsif ( $sandbox_version ge '8.0' ) {
    plan skip_all => 'Test fails due to https://bugs.mysql.com/bug.php?id=115017';
@@ -34,7 +34,7 @@ else {
 }
 
 my $output;
-my @args = ('--sync-to-master', 'h=127.1,P=12346,u=msandbox,p=msandbox',
+my @args = ('--sync-to-source', 'h=127.1,P=12346,u=msandbox,p=msandbox',
             qw(-d issue_375 --replicate issue_375.checksums --print));
 my $pt_table_checksum = "$trunk/bin/pt-table-checksum h=127.1,P=12345,u=msandbox,p=msandbox -d issue_375 --chunk-size 20 --chunk-size-limit 0 --set-vars innodb_lock_wait_timeout=3";
 
@@ -43,24 +43,24 @@ my $pt_table_checksum = "$trunk/bin/pt-table-checksum h=127.1,P=12345,u=msandbox
 # #############################################################################
 
 # Re-using this table for this issue.  It has 100 pk rows.
-$sb->load_file('master', 't/pt-table-sync/samples/issue_375.sql');
+$sb->load_file('source', 't/pt-table-sync/samples/issue_375.sql');
 wait_until(
    sub {
       my $row;
       eval {
-         $row = $slave_dbh->selectrow_hashref("select * from issue_375.t where id=35");
+         $row = $replica_dbh->selectrow_hashref("select * from issue_375.t where id=35");
       };
       return 1 if $row && $row->{foo} eq 'ai';
    },
 );
 
 # Make the tables differ.  These diff rows are all in chunk 1.
-$slave_dbh->do("update issue_375.t set foo='foo' where id in (21, 25, 35)");
+$replica_dbh->do("update issue_375.t set foo='foo' where id in (21, 25, 35)");
 wait_until(
    sub {
       my $row;
       eval {
-         $row = $slave_dbh->selectrow_hashref("select * from issue_375.t where id=35");
+         $row = $replica_dbh->selectrow_hashref("select * from issue_375.t where id=35");
       };
       return 1 if $row && $row->{foo} eq 'foo';
    },
@@ -107,6 +107,6 @@ diag(`rm -rf $file >/dev/null`);
 # #############################################################################
 # Done.
 # #############################################################################
-$sb->wipe_clean($master_dbh);
+$sb->wipe_clean($source_dbh);
 ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox");
 exit;
diff --git a/t/pt-table-sync/lock_and_rename.t b/t/pt-table-sync/lock_and_rename.t
index 322964c62..8304c7da2 100644
--- a/t/pt-table-sync/lock_and_rename.t
+++ b/t/pt-table-sync/lock_and_rename.t
@@ -18,17 +18,17 @@ require "$trunk/bin/pt-table-sync";
 my $output;
 my $dp = new DSNParser(opts=>$dsn_opts);
 my $sb = new Sandbox(basedir => '/tmp', DSNParser => $dp);
-my $master_dbh = $sb->get_dbh_for('master');
-my $slave_dbh  = $sb->get_dbh_for('slave1');
+my $source_dbh = $sb->get_dbh_for('source');
+my $replica_dbh  = $sb->get_dbh_for('replica1');
 
-if ( VersionParser->new($master_dbh) < '5.5' ) {
+if ( VersionParser->new($source_dbh) < '5.5' ) {
    plan skip_all => "This functionality doesn't work correctly on MySQLs earlier than 5.5";
 }
-if ( !$master_dbh ) {
-   plan skip_all => 'Cannot connect to sandbox master';
+if ( !$source_dbh ) {
+   plan skip_all => 'Cannot connect to sandbox source';
 }
-elsif ( !$slave_dbh ) {
-   plan skip_all => 'Cannot connect to sandbox slave';
+elsif ( !$replica_dbh ) {
+   plan skip_all => 'Cannot connect to sandbox replica';
 } else {
    plan tests => 3;
 }
@@ -36,8 +36,8 @@ elsif ( !$slave_dbh ) {
 # #############################################################################
 # Issue 363: lock and rename.
 # #############################################################################
-$sb->create_dbs($master_dbh, [qw(test)]);
-$sb->load_file('master', 't/pt-table-sync/samples/before.sql');
+$sb->create_dbs($source_dbh, [qw(test)]);
+$sb->load_file('source', 't/pt-table-sync/samples/before.sql');
 
 $output = `$trunk/bin/pt-table-sync --lock-and-rename h=127.1,P=12345 P=12346 2>&1`;
 like($output, qr/requires exactly two/,
@@ -56,6 +56,6 @@ like($output, qr/COMMENT='test1'/, '--lock-and-rename worked');
 # #############################################################################
 # Done.
 # #############################################################################
-$sb->wipe_clean($master_dbh);
+$sb->wipe_clean($source_dbh);
 ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox");
 exit;
diff --git a/t/pt-table-sync/lock_level.t b/t/pt-table-sync/lock_level.t
index 8aa0eae76..74659f48e 100644
--- a/t/pt-table-sync/lock_level.t
+++ b/t/pt-table-sync/lock_level.t
@@ -18,27 +18,27 @@ require "$trunk/bin/pt-table-sync";
 my $output;
 my $dp = new DSNParser(opts=>$dsn_opts);
 my $sb = new Sandbox(basedir => '/tmp', DSNParser => $dp);
-my $master_dbh = $sb->get_dbh_for('master');
-my $slave_dbh  = $sb->get_dbh_for('slave1');
+my $source_dbh = $sb->get_dbh_for('source');
+my $replica_dbh  = $sb->get_dbh_for('replica1');
 
-if ( !$master_dbh ) {
-   plan skip_all => 'Cannot connect to sandbox master';
+if ( !$source_dbh ) {
+   plan skip_all => 'Cannot connect to sandbox source';
 }
-elsif ( !$slave_dbh ) {
-   plan skip_all => 'Cannot connect to sandbox slave';
+elsif ( !$replica_dbh ) {
+   plan skip_all => 'Cannot connect to sandbox replica';
 }
 else {
    plan tests => 2;
 }
 
-$sb->wipe_clean($master_dbh);
-$sb->wipe_clean($slave_dbh);
+$sb->wipe_clean($source_dbh);
+$sb->wipe_clean($replica_dbh);
 
 # #############################################################################
 # Issue 86: mk-table-sync: lock level 3
 # #############################################################################
 
-$output = `$trunk/bin/pt-table-sync --sync-to-master h=127.1,P=12346,u=msandbox,p=msandbox,D=test,t=t --print  --lock 3 2>&1`;
+$output = `$trunk/bin/pt-table-sync --sync-to-source h=127.1,P=12346,u=msandbox,p=msandbox,D=test,t=t --print  --lock 3 2>&1`;
 unlike(
    $output,
    qr/Failed to lock server/,
@@ -48,7 +48,7 @@ unlike(
 # #############################################################################
 # Done.
 # #############################################################################
-$sb->wipe_clean($master_dbh);
-$sb->wipe_clean($slave_dbh);
+$sb->wipe_clean($source_dbh);
+$sb->wipe_clean($replica_dbh);
 ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox");
 exit;
diff --git a/t/pt-table-sync/master_master.t b/t/pt-table-sync/master_master.t
index 39001ef54..860a6c93b 100644
--- a/t/pt-table-sync/master_master.t
+++ b/t/pt-table-sync/master_master.t
@@ -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');
-
-# 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',
+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 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`);
 
 # #############################################################################
diff --git a/t/pt-table-sync/pt-1194.t b/t/pt-table-sync/pt-1194.t
index 6e49b2013..22044fe87 100644
--- a/t/pt-table-sync/pt-1194.t
+++ b/t/pt-table-sync/pt-1194.t
@@ -17,19 +17,19 @@ require "$trunk/bin/pt-table-sync";
 
 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');
 my $have_ncat = `which ncat 2>/dev/null`;
 
-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 ( !$slave1_dbh ) {
-   plan skip_all => 'Cannot connect to sandbox slave2';
+elsif ( !$replica1_dbh ) {
+   plan skip_all => 'Cannot connect to sandbox replica2';
 }
 elsif (!$have_ncat) {
    plan skip_all => 'ncat, required for this test, is not installed or not in PATH';
@@ -38,8 +38,8 @@ else {
    plan tests => 3;
 }
 
-$sb->load_file('master', "t/pt-table-sync/samples/pt-1205.sql");
-$sb->wait_for_slaves();
+$sb->load_file('source', "t/pt-table-sync/samples/pt-1205.sql");
+$sb->wait_for_replicas();
 
 # Setting up tunnels
 my $pid1 = fork();
@@ -65,42 +65,42 @@ my $ms = new MasterSlave(
                DSNParser=>$dp,
                Quoter=>$q,
             );
-my $ss = $ms->get_slave_status($slave1_dbh);
+my $ss = $ms->get_replica_status($replica1_dbh);
 
-$slave1_dbh->do('STOP SLAVE');
-$slave1_dbh->do("CHANGE MASTER TO MASTER_PORT=3333, MASTER_LOG_POS=$ss->{exec_master_log_pos}");
-$slave1_dbh->do('START SLAVE');
+$replica1_dbh->do("STOP ${replica_name}");
+$replica1_dbh->do("CHANGE ${source_change} TO ${source_name}_PORT=3333, ${source_name}_LOG_POS=" . $ss->{"exec_${source_name}_log_pos"});
+$replica1_dbh->do("START ${replica_name}");
 
-my $output = `$trunk/bin/pt-table-sync h=127.0.0.1,P=3334,u=msandbox,p=msandbox --database=test --table=t1 --sync-to-master --execute --verbose 2>&1`;
+my $output = `$trunk/bin/pt-table-sync h=127.0.0.1,P=3334,u=msandbox,p=msandbox --database=test --table=t1 --sync-to-source --execute --verbose 2>&1`;
 
 unlike(
    $output,
-   qr/The slave is connected to \d+ but the master's port is/,
+   qr/The replica is connected to \d+ but the source's port is/,
    'No error for redirected replica'
 ) or diag($output);
 
 kill -1, getpgrp($pid1);
 kill -1, getpgrp($pid2);
 
-$slave1_dbh->do('STOP SLAVE');
-$ss = $ms->get_slave_status($slave1_dbh);
-$slave1_dbh->do("CHANGE MASTER TO MASTER_PORT=12347, MASTER_LOG_POS=$ss->{exec_master_log_pos}");
-$slave1_dbh->do('START SLAVE SQL_THREAD');
+$replica1_dbh->do("STOP ${replica_name}");
+$ss = $ms->get_replica_status($replica1_dbh);
+$replica1_dbh->do("CHANGE ${source_change} TO ${source_name}_PORT=12347, ${source_name}_LOG_POS=" . $ss->{"exec_${source_name}_log_pos"});
+$replica1_dbh->do("START ${replica_name} SQL_THREAD");
 
-$output = `$trunk/bin/pt-table-sync h=127.0.0.1,P=12346,u=msandbox,p=msandbox --database=test --table=t1 --sync-to-master --execute --verbose 2>&1`;
+$output = `$trunk/bin/pt-table-sync h=127.0.0.1,P=12346,u=msandbox,p=msandbox --database=test --table=t1 --sync-to-source --execute --verbose 2>&1`;
 
 like(
    $output,
-   qr/The server specified as a master has no connected slaves/,
-   'Error printed for the wrong master'
+   qr/The server specified as a source has no connected replicas/,
+   'Error printed for the wrong source'
 ) or diag($output);
 
-$slave1_dbh->do('STOP SLAVE');
-$slave1_dbh->do("CHANGE MASTER TO MASTER_PORT=12345, MASTER_LOG_POS=$ss->{exec_master_log_pos}");
-$slave1_dbh->do('START SLAVE');
+$replica1_dbh->do("STOP ${replica_name}");
+$replica1_dbh->do("CHANGE ${source_change} TO ${source_name}_PORT=12345, ${source_name}_LOG_POS=" . $ss->{"exec_${source_name}_log_pos"});
+$replica1_dbh->do("START ${replica_name}");
 # #############################################################################
 # Done.
 # #############################################################################
-$sb->wipe_clean($master_dbh);
+$sb->wipe_clean($source_dbh);
 ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox");
 exit;
diff --git a/t/pt-table-sync/pt-1205.t b/t/pt-table-sync/pt-1205.t
index 0bd2b75a1..db1da46d7 100644
--- a/t/pt-table-sync/pt-1205.t
+++ b/t/pt-table-sync/pt-1205.t
@@ -17,34 +17,34 @@ require "$trunk/bin/pt-table-sync";
 
 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 ( !$slave1_dbh ) {
-   plan skip_all => 'Cannot connect to sandbox slave2';
+elsif ( !$replica1_dbh ) {
+   plan skip_all => 'Cannot connect to sandbox replica2';
 }
 else {
    plan tests => 3;
 }
 
-$sb->load_file('master', "t/pt-table-sync/samples/pt-1205.sql");
+$sb->load_file('source', "t/pt-table-sync/samples/pt-1205.sql");
 
-$sb->wait_for_slaves();
+$sb->wait_for_replicas();
 
-$slave1_dbh->do("DELETE FROM test.t1 LIMIT 3");
+$replica1_dbh->do("DELETE FROM test.t1 LIMIT 3");
 
 # Save original PTDEBUG env because we modify it below.
 my $dbg = $ENV{PTDEBUG};
 
 $ENV{PTDEBUG} = 1;
-my $output = `$trunk/bin/pt-table-sync h=127.0.0.1,P=12346,u=msandbox,p=msandbox,D=test,t=t1,A=utf8 --sync-to-master --execute --verbose --function=MD5 2>&1`;
+my $output = `$trunk/bin/pt-table-sync h=127.0.0.1,P=12346,u=msandbox,p=msandbox,D=test,t=t1,A=utf8 --sync-to-source --execute --verbose --function=MD5 2>&1`;
 
 unlike(
    $output,
@@ -65,6 +65,6 @@ $ENV{PTDEBUG} = $dbg || 0;
 # #############################################################################
 # Done.
 # #############################################################################
-$sb->wipe_clean($master_dbh);
+$sb->wipe_clean($source_dbh);
 ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox");
 exit;
diff --git a/t/pt-table-sync/pt-1256.t b/t/pt-table-sync/pt-1256.t
index b65114c43..25817ebae 100644
--- a/t/pt-table-sync/pt-1256.t
+++ b/t/pt-table-sync/pt-1256.t
@@ -23,18 +23,18 @@ require VersionParser;
 
 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 ( !$slave1_dbh ) {
-   plan skip_all => 'Cannot connect to sandbox slave2';
+elsif ( !$replica1_dbh ) {
+   plan skip_all => 'Cannot connect to sandbox replica2';
 }
 else {
    plan tests => 5;
@@ -42,25 +42,25 @@ else {
 
 
 my ($output, $status);
-my @args = ('--sync-to-master', 'h=127.1,P=12346,u=msandbox,p=msandbox',
+my @args = ('--sync-to-source', 'h=127.1,P=12346,u=msandbox,p=msandbox',
             qw(-t test.t1 --print --execute --charset utf8));
 
 # use lib/samples dir since the main change is in DSNParser
-$sb->load_file('master', "t/lib/samples/charset.sql");
+$sb->load_file('source', "t/lib/samples/charset.sql");
 
 my $put = encode('UTF-8','абвгд');
 my $want = 'абвгд';
 my $row;
 
-$master_dbh->do("SET NAMES 'utf8'");
-$slave1_dbh->do("SET NAMES 'utf8'");
-$slave1_dbh->do("SET NAMES 'utf8'");
+$source_dbh->do("SET NAMES 'utf8'");
+$replica1_dbh->do("SET NAMES 'utf8'");
+$replica1_dbh->do("SET NAMES 'utf8'");
 
-$master_dbh->do("INSERT INTO test.t1 VALUES (NULL, '$put')");
-$sb->wait_for_slaves();
+$source_dbh->do("INSERT INTO test.t1 VALUES (NULL, '$put')");
+$sb->wait_for_replicas();
 
-$slave1_dbh->do("DELETE FROM test.t1 WHERE id=1 LIMIT 1");
-$slave1_dbh->do("FLUSH TABLES");
+$replica1_dbh->do("DELETE FROM test.t1 WHERE id=1 LIMIT 1");
+$replica1_dbh->do("FLUSH TABLES");
 
 
 # 1
@@ -75,12 +75,12 @@ like(
 );
 
 SKIP: {
-   my $vp = VersionParser->new($master_dbh);
+   my $vp = VersionParser->new($source_dbh);
    if ($vp->cmp('8.0') > -1 && $vp->cmp('8.0.14') < 0 && $vp->flavor() !~ m/maria/i) {
       skip "Skipping in MySQL 8.0.4-rc - 8.0.13 since there is an error in the server itself", 3;
    }
    # 2
-   $row = $slave1_dbh->selectrow_hashref("SELECT f2 FROM test.t1 WHERE id = 1");
+   $row = $replica1_dbh->selectrow_hashref("SELECT f2 FROM test.t1 WHERE id = 1");
    is(
       $row->{f2},
       $want,
@@ -93,7 +93,7 @@ SKIP: {
     like($output, qr/COMMENT='test1'/, '--lock-and-rename worked');
     
     #4
-    $row = $slave1_dbh->selectrow_hashref("SELECT f2 FROM test.t2 WHERE id = 1");
+    $row = $replica1_dbh->selectrow_hashref("SELECT f2 FROM test.t2 WHERE id = 1");
     is(
         $row->{f2},
         $want,
@@ -103,6 +103,6 @@ SKIP: {
 # #############################################################################
 # Done.
 # #############################################################################
-$sb->wipe_clean($master_dbh);
+$sb->wipe_clean($source_dbh);
 ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox");
 exit;
diff --git a/t/pt-table-sync/pt-2016.t b/t/pt-table-sync/pt-2016.t
index 49d4a1df6..667688a86 100644
--- a/t/pt-table-sync/pt-2016.t
+++ b/t/pt-table-sync/pt-2016.t
@@ -22,18 +22,18 @@ require "$trunk/bin/pt-table-sync";
 
 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 ( !$slave1_dbh ) {
-   plan skip_all => 'Cannot connect to sandbox slave2';
+elsif ( !$replica1_dbh ) {
+   plan skip_all => 'Cannot connect to sandbox replica2';
 }
 else {
    plan tests => 3;
@@ -41,16 +41,16 @@ else {
 
 
 my ($output, $status);
-my @args = ('h=127.0.0.1,P=12346,u=msandbox,p=msandbox,D=test,t=test2', '--sync-to-master', 
+my @args = ('h=127.0.0.1,P=12346,u=msandbox,p=msandbox,D=test,t=test2', '--sync-to-source', 
     '--chunk-size=1', '--hex-blob', '--execute');
 
 # use lib/samples dir since the main change is in DSNParser
-$sb->load_file('master', "t/pt-table-sync/samples/pt-2016.sql");
+$sb->load_file('source', "t/pt-table-sync/samples/pt-2016.sql");
 
-$sb->wait_for_slaves();
+$sb->wait_for_replicas();
 
-$slave1_dbh->do("UPDATE test.test2 SET col3='bbb'");
-$slave1_dbh->do("FLUSH TABLES");
+$replica1_dbh->do("UPDATE test.test2 SET col3='bbb'");
+$replica1_dbh->do("FLUSH TABLES");
 
 # 1
 ($output, $status) = full_output(
@@ -69,16 +69,16 @@ my $want = {
   col2 => 'aaa',
   col3 => 'aaa'
 };
-my $row = $slave1_dbh->selectrow_hashref("SELECT col1, col2, col3 FROM test.test2");
+my $row = $replica1_dbh->selectrow_hashref("SELECT col1, col2, col3 FROM test.test2");
 is_deeply(
     $row,
     $want,
-    "PT-2016 table-sync CRC32 in key - Master was updated",
+    "PT-2016 table-sync CRC32 in key - Source was updated",
 ) or diag("Want '".($want||"")."', got '".($row->{col3}||"")."'");
 
 # #############################################################################
 # Done.
 # #############################################################################
-$sb->wipe_clean($master_dbh);
+$sb->wipe_clean($source_dbh);
 ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox");
 exit;
diff --git a/t/pt-table-sync/pt-2309.t b/t/pt-table-sync/pt-2309.t
index 0fe76baed..9c0d84c74 100644
--- a/t/pt-table-sync/pt-2309.t
+++ b/t/pt-table-sync/pt-2309.t
@@ -22,34 +22,34 @@ require "$trunk/bin/pt-table-sync";
 
 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 ( !$slave1_dbh ) {
-   plan skip_all => 'Cannot connect to sandbox slave2';
+elsif ( !$replica1_dbh ) {
+   plan skip_all => 'Cannot connect to sandbox replica2';
 }
 else {
    plan tests => 7;
 }
 
 my ($output, $status);
-my @args = ('h=127.0.0.1,P=12346,u=msandbox,p=msandbox', '--databases=pt_ts', '--sync-to-master', '--execute');
+my @args = ('h=127.0.0.1,P=12346,u=msandbox,p=msandbox', '--databases=pt_ts', '--sync-to-source', '--execute');
 
 # use lib/samples dir since the main change is in DSNParser
-$sb->load_file('master', "t/pt-table-sync/samples/pt-2309.sql");
+$sb->load_file('source', "t/pt-table-sync/samples/pt-2309.sql");
 
-$sb->wait_for_slaves();
+$sb->wait_for_replicas();
 
-$slave1_dbh->do("DELETE FROM pt_ts.test_table LIMIT 1000");
-$slave1_dbh->do("DELETE FROM pt_ts.test_table_char LIMIT 1000");
-$slave1_dbh->do("FLUSH TABLES");
+$replica1_dbh->do("DELETE FROM pt_ts.test_table LIMIT 1000");
+$replica1_dbh->do("DELETE FROM pt_ts.test_table_char LIMIT 1000");
+$replica1_dbh->do("FLUSH TABLES");
 
 # 1
 push(@args, ('--tables=test_table'));
@@ -64,10 +64,10 @@ unlike(
    'No "Cannot nibble table" error for binary data',
 ) or diag($output);
 
-$sb->wait_for_slaves();
+$sb->wait_for_replicas();
 
-my $source_rows = $master_dbh->selectrow_arrayref("SELECT COUNT(*) FROM pt_ts.test_table");
-my $replica_rows = $slave1_dbh->selectrow_arrayref("SELECT COUNT(*) FROM pt_ts.test_table");
+my $source_rows = $source_dbh->selectrow_arrayref("SELECT COUNT(*) FROM pt_ts.test_table");
+my $replica_rows = $replica1_dbh->selectrow_arrayref("SELECT COUNT(*) FROM pt_ts.test_table");
 
 is(
    $replica_rows->[0],
@@ -94,10 +94,10 @@ unlike(
    'No "Cannot nibble table" error for UUID in CHAR column',
 ) or diag($output);
 
-$sb->wait_for_slaves();
+$sb->wait_for_replicas();
 
-$source_rows = $master_dbh->selectrow_arrayref("SELECT COUNT(*) FROM pt_ts.test_table_char");
-$replica_rows = $slave1_dbh->selectrow_arrayref("SELECT COUNT(*) FROM pt_ts.test_table_char");
+$source_rows = $source_dbh->selectrow_arrayref("SELECT COUNT(*) FROM pt_ts.test_table_char");
+$replica_rows = $replica1_dbh->selectrow_arrayref("SELECT COUNT(*) FROM pt_ts.test_table_char");
 
 is(
    $replica_rows->[0],
@@ -114,6 +114,6 @@ is(
 # #############################################################################
 # Done.
 # #############################################################################
-$sb->wipe_clean($master_dbh);
+$sb->wipe_clean($source_dbh);
 ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox");
 exit;
diff --git a/t/pt-table-sync/pt_221.t b/t/pt-table-sync/pt_221.t
index ebcd00965..f70453515 100644
--- a/t/pt-table-sync/pt_221.t
+++ b/t/pt-table-sync/pt_221.t
@@ -18,32 +18,32 @@ require "$trunk/bin/pt-table-sync";
 sub set_binlog_format {
     my ($sb, $format) = @_;
 
-    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');
     
-    $slave2_dbh->do("STOP SLAVE");
-    $slave1_dbh->do("STOP SLAVE");
+    $replica2_dbh->do("STOP ${replica_name}");
+    $replica1_dbh->do("STOP ${replica_name}");
     
-    $slave2_dbh->do("SET GLOBAL binlog_format='$format'");
-    $slave1_dbh->do("SET GLOBAL binlog_format='$format'");
-    $master_dbh->do("SET GLOBAL binlog_format='$format'");
+    $replica2_dbh->do("SET GLOBAL binlog_format='$format'");
+    $replica1_dbh->do("SET GLOBAL binlog_format='$format'");
+    $source_dbh->do("SET GLOBAL binlog_format='$format'");
 
-    $slave2_dbh->do("START SLAVE");
-    $slave1_dbh->do("START SLAVE");
+    $replica2_dbh->do("START ${replica_name}");
+    $replica1_dbh->do("START ${replica_name}");
 }
 
 my $dp = new DSNParser(opts=>$dsn_opts);
 my $sb = new Sandbox(basedir => '/tmp', DSNParser => $dp, env => q/BINLOG_FORMAT="ROW"/);
 
-my $master_dbh = $sb->get_dbh_for('master');
-my $master_dsn = $sb->dsn_for('master');
-my $slave_dsn  = $sb->dsn_for('slave1');
+my $source_dbh = $sb->get_dbh_for('source');
+my $source_dsn = $sb->dsn_for('source');
+my $replica_dsn  = $sb->dsn_for('replica1');
 
 
-if ( !$master_dbh ) {
-   plan skip_all => 'Cannot connect to sandbox master';
-} elsif ($sb->has_engine('master', 'rocksdb') != 1) {
+if ( !$source_dbh ) {
+   plan skip_all => 'Cannot connect to sandbox source';
+} elsif ($sb->has_engine('source', 'rocksdb') != 1) {
    plan skip_all => 'This test needs RocksDB engine';
 } else {
    plan tests => 4;
@@ -51,12 +51,12 @@ if ( !$master_dbh ) {
 
 set_binlog_format($sb, 'ROW');
 
-$master_dbh->disconnect();
-$master_dbh = $sb->get_dbh_for('master');
+$source_dbh->disconnect();
+$source_dbh = $sb->get_dbh_for('source');
 
-$sb->load_file('master', 't/pt-table-sync/samples/pt_221.sql');
+$sb->load_file('source', 't/pt-table-sync/samples/pt_221.sql');
 
-my @args = ('--sync-to-master', $slave_dsn, qw(-t test.t1 --print --execute));
+my @args = ('--sync-to-source', $replica_dsn, qw(-t test.t1 --print --execute));
 
 my ($output, $exit) = full_output(
    sub { pt_table_sync::main(@args, qw()) },
@@ -66,18 +66,18 @@ my ($output, $exit) = full_output(
 isnt(
     $exit,
     0,
-    "PT-221 fails if using --sync-to-master with RocksDB",
+    "PT-221 fails if using --sync-to-source with RocksDB",
 );
 
 like(
     $output,
-    qr/Cannot sync using --sync-to-master with test.t1 due to the limitations of the RocksDB engine/,
-    "PT-221 Cannot use --sync-to-master with RockSDB",
+    qr/Cannot sync using --sync-to-source with test.t1 due to the limitations of the RocksDB engine/,
+    "PT-221 Cannot use --sync-to-source with RockSDB",
 );
 
-$sb->wait_for_slaves();
+$sb->wait_for_replicas();
 
-@args = ('--replicate', 'test.checksums', $master_dsn, qw(-t test.t1 --print --execute));
+@args = ('--replicate', 'test.checksums', $source_dsn, qw(-t test.t1 --print --execute));
 
 ($output, $exit) = full_output(
    sub { pt_table_sync::main(@args, qw()) },
@@ -95,7 +95,7 @@ set_binlog_format($sb, 'STATEMENT');
 # #############################################################################
 # Done.
 # #############################################################################
-$sb->wipe_clean($master_dbh);
+$sb->wipe_clean($source_dbh);
 
 
 ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox");
diff --git a/t/pt-table-sync/replicate.t b/t/pt-table-sync/replicate.t
index b9fc075c7..6ec955555 100644
--- a/t/pt-table-sync/replicate.t
+++ b/t/pt-table-sync/replicate.t
@@ -21,18 +21,18 @@ require "$trunk/bin/pt-table-sync";
 
 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 $source_dbh = $sb->get_dbh_for('source');
+my $replica1_dbh = $sb->get_dbh_for('replica1');
 
-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';
 }
 
-my $master_dsn = $sb->dsn_for('master');
-my $slave1_dsn = $sb->dsn_for('slave1');
+my $source_dsn = $sb->dsn_for('source');
+my $replica1_dsn = $sb->dsn_for('replica1');
 
 my $output;
 my $sample = "t/pt-table-sync/samples";
@@ -47,16 +47,16 @@ my $sample = "t/pt-table-sync/samples";
 # https://bugs.launchpad.net/percona-toolkit/+bug/918056
 # #############################################################################
 
-# The slave has 49 extra rows on the low end, e.g. master has rows 50+
-# but slave has rows 1-49 and 50+.  This tests syncing the lower oob chunk.
-$sb->create_dbs($master_dbh, [qw(bug918056)]);
-$sb->load_file('master', "$sample/bug-918056-master.sql", "bug918056");
-$sb->load_file('slave1', "$sample/bug-918056-slave.sql",  "bug918056");
+# The replica has 49 extra rows on the low end, e.g. source has rows 50+
+# but replica has rows 1-49 and 50+.  This tests syncing the lower oob chunk.
+$sb->create_dbs($source_dbh, [qw(bug918056)]);
+$sb->load_file('source', "$sample/bug-918056-master.sql", "bug918056");
+$sb->load_file('replica1', "$sample/bug-918056-slave.sql",  "bug918056");
 
 ok(
    no_diff(
       sub {
-         pt_table_sync::main($master_dsn, qw(--replicate percona.checksums),
+         pt_table_sync::main($source_dsn, qw(--replicate percona.checksums),
             qw(--print))
       },
       "$sample/bug-918056-print.txt",
@@ -66,13 +66,13 @@ ok(
 );
 
 # Test syncing the upper oob chunk.
-$sb->load_file('master', "$sample/upper-oob-master.sql");
-$sb->load_file('slave1', "$sample/upper-oob-slave.sql");
+$sb->load_file('source', "$sample/upper-oob-master.sql");
+$sb->load_file('replica1', "$sample/upper-oob-slave.sql");
 
 ok(
    no_diff(
       sub {
-         pt_table_sync::main($master_dsn, qw(--replicate percona.checksums),
+         pt_table_sync::main($source_dsn, qw(--replicate percona.checksums),
             qw(--print))
       },
       "$sample/upper-oob-print.txt",
@@ -84,7 +84,7 @@ ok(
 # #############################################################################
 # Done.
 # #############################################################################
-$sb->wipe_clean($master_dbh);
-$sb->wipe_clean($slave1_dbh);
+$sb->wipe_clean($source_dbh);
+$sb->wipe_clean($replica1_dbh);
 ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox");
 done_testing;
diff --git a/t/pt-table-sync/replicate_do_db.t b/t/pt-table-sync/replicate_do_db.t
index 421410f45..1f3c58c49 100644
--- a/t/pt-table-sync/replicate_do_db.t
+++ b/t/pt-table-sync/replicate_do_db.t
@@ -17,18 +17,18 @@ require "$trunk/bin/pt-table-sync";
 
 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 ( !$slave2_dbh ) {
-   plan skip_all => 'Cannot connect to sandbox slave2';
+elsif ( !$replica2_dbh ) {
+   plan skip_all => 'Cannot connect to sandbox replica2';
 }
 else {
    plan tests => 9;
@@ -44,97 +44,97 @@ else {
 # Add two new test databases with a simple table. IMPORTANT: we do this before
 # reconfiguring the server, so this gets replicated!
 foreach my $db (qw(test1 test2)) {
-   $master_dbh->do("DROP DATABASE IF EXISTS $db");
-   $master_dbh->do("CREATE DATABASE $db");
-   $master_dbh->do("CREATE TABLE $db.foo (i INT NOT NULL PRIMARY KEY)");
-   $master_dbh->do("INSERT INTO $db.foo VALUES (1),(2),(9)");
+   $source_dbh->do("DROP DATABASE IF EXISTS $db");
+   $source_dbh->do("CREATE DATABASE $db");
+   $source_dbh->do("CREATE TABLE $db.foo (i INT NOT NULL PRIMARY KEY)");
+   $source_dbh->do("INSERT INTO $db.foo VALUES (1),(2),(9)");
 }
 
-$sb->wait_for_slaves();
+$sb->wait_for_replicas();
 
-# Stop slave 12346, add replicate-do-db to its config, and restart it.
-$slave1_dbh->disconnect;
-diag('Restarting slave 12346 with replicate-do-db=test1');
+# Stop replica 12346, add replicate-do-db to its config, and restart it.
+$replica1_dbh->disconnect;
+diag('Restarting replica 12346 with replicate-do-db=test1');
 diag(`/tmp/12346/stop >/dev/null`);
 diag(`echo "replicate-do-db = test1" >> /tmp/12346/my.sandbox.cnf`);
 diag(`/tmp/12346/start >/dev/null`);
-$slave1_dbh = $sb->get_dbh_for('slave1');
-$slave2_dbh->do("stop slave");
-$slave2_dbh->do("start slave");
+$replica1_dbh = $sb->get_dbh_for('replica1');
+$replica2_dbh->do("stop ${replica_name}");
+$replica2_dbh->do("start ${replica_name}");
 
-my $r = $slave1_dbh->selectrow_hashref('show slave status');
+my $r = $replica1_dbh->selectrow_hashref("show ${replica_name} status");
 is($r->{replicate_do_db}, 'test1', 'Server reconfigured');
 
 # #############################################################################
 # IMPORTANT: anything you want to replicate must now USE test1 first!
-# IMPORTANT: $sb->wait_for_slaves won't work now!
+# IMPORTANT: $sb->wait_for_replicas won't work now!
 # #############################################################################
 
-# Make master and slave differ.  Because we USE test2, this DELETE on
-# the master won't replicate to the slave in either case.
-$master_dbh->do("USE test2");
-$master_dbh->do("DELETE FROM test1.foo WHERE i = 2");
-$master_dbh->do("DELETE FROM test2.foo WHERE i = 2");
-$master_dbh->do("COMMIT");
-
-# NOTE: $sb->wait_for_slaves() won't work! Hence we do our own way...
-$master_dbh->do('USE test1');
-$master_dbh->do('INSERT INTO test1.foo(i) VALUES(10)');
-PerconaTest::wait_for_table($slave2_dbh, "test1.foo", "i=10");
-
-# Prove that the slave (12347, not 12346) still has i=2 in test2.foo, and the
-# master doesn't. That is, both test1 and test2 are out-of-sync on the slave.
-$r = $master_dbh->selectall_arrayref('select * from test1.foo where i=2');
-is_deeply( $r, [], 'master has no test1.foo.i=2');
-$r = $master_dbh->selectall_arrayref('select * from test2.foo where i=2');
-is_deeply( $r, [], 'master has no test2.foo.i=2');
-$r = $slave2_dbh->selectall_arrayref('select * from test1.foo where i=2');
-is_deeply( $r, [[2]], 'slave2 has test1.foo.i=2');
-$r = $slave2_dbh->selectall_arrayref('select * from test2.foo where i=2'),
-is_deeply( $r, [[2]], 'slave2 has test2.foo.i=2') or diag(`/tmp/12346/use -e "show slave status\\G"; /tmp/12347/use -e "show slave status\\G"`);
+# Make source and replica differ.  Because we USE test2, this DELETE on
+# the source won't replicate to the replica in either case.
+$source_dbh->do("USE test2");
+$source_dbh->do("DELETE FROM test1.foo WHERE i = 2");
+$source_dbh->do("DELETE FROM test2.foo WHERE i = 2");
+$source_dbh->do("COMMIT");
+
+# NOTE: $sb->wait_for_replicas() won't work! Hence we do our own way...
+$source_dbh->do('USE test1');
+$source_dbh->do('INSERT INTO test1.foo(i) VALUES(10)');
+PerconaTest::wait_for_table($replica2_dbh, "test1.foo", "i=10");
+
+# Prove that the replica (12347, not 12346) still has i=2 in test2.foo, and the
+# source doesn't. That is, both test1 and test2 are out-of-sync on the replica.
+$r = $source_dbh->selectall_arrayref('select * from test1.foo where i=2');
+is_deeply( $r, [], 'source has no test1.foo.i=2');
+$r = $source_dbh->selectall_arrayref('select * from test2.foo where i=2');
+is_deeply( $r, [], 'source has no test2.foo.i=2');
+$r = $replica2_dbh->selectall_arrayref('select * from test1.foo where i=2');
+is_deeply( $r, [[2]], 'replica2 has test1.foo.i=2');
+$r = $replica2_dbh->selectall_arrayref('select * from test2.foo where i=2'),
+is_deeply( $r, [[2]], 'replica2 has test2.foo.i=2') or diag(`/tmp/12346/use -e "show ${replica_name} status\\G"; /tmp/12347/use -e "show ${replica_name} status\\G"`);
 
 # Now we sync, and if pt-table-sync USE's the db it's syncing, then test1 should
 # be in sync afterwards, and test2 shouldn't.
 
-my $procs = $master_dbh->selectcol_arrayref('show processlist');
-diag('MySQL processes on master: ', join(', ', @$procs));
+my $procs = $source_dbh->selectcol_arrayref('show processlist');
+diag('MySQL processes on source: ', join(', ', @$procs));
 
 my $output = output(
    sub { pt_table_sync::main("h=127.1,P=12346,u=msandbox,p=msandbox",
-      qw(--sync-to-master --execute --no-check-triggers),
+      qw(--sync-to-source --execute --no-check-triggers),
       "--databases", "test1,test2") },
    stderr => 1,
 );
 
-# NOTE: $sb->wait_for_slaves() won't work! Hence we do our own way...
-$master_dbh->do('USE test1');
-$master_dbh->do('INSERT INTO test1.foo(i) VALUES(11)');
-PerconaTest::wait_for_table($slave2_dbh, "test1.foo", "i=11");
+# NOTE: $sb->wait_for_replicas() won't work! Hence we do our own way...
+$source_dbh->do('USE test1');
+$source_dbh->do('INSERT INTO test1.foo(i) VALUES(11)');
+PerconaTest::wait_for_table($replica2_dbh, "test1.foo", "i=11");
 
-$procs = $master_dbh->selectcol_arrayref('show processlist');
-diag('MySQL processes on master: ', join(', ', @$procs));
+$procs = $source_dbh->selectcol_arrayref('show processlist');
+diag('MySQL processes on source: ', join(', ', @$procs));
 
-$r = $slave2_dbh->selectall_arrayref('select * from test1.foo where i=2');
-is_deeply( $r, [], 'slave2 has NO test1.foo.i=2 after sync');
-$r = $slave2_dbh->selectall_arrayref('select * from test2.foo where i=2'),
-is_deeply( $r, [[2]], 'slave2 has test2.foo.i=2 after sync') or diag(`/tmp/12346/use -e "show slave status\\G"; /tmp/12347/use -e "show slave status\\G"`);
+$r = $replica2_dbh->selectall_arrayref('select * from test1.foo where i=2');
+is_deeply( $r, [], 'replica2 has NO test1.foo.i=2 after sync');
+$r = $replica2_dbh->selectall_arrayref('select * from test2.foo where i=2'),
+is_deeply( $r, [[2]], 'replica2 has test2.foo.i=2 after sync') or diag(`/tmp/12346/use -e "show ${replica_name} status\\G"; /tmp/12347/use -e "show ${replica_name} status\\G"`);
 
-$slave1_dbh->disconnect;
+$replica1_dbh->disconnect;
 diag('Reconfiguring instance 12346 without replication filters');
 diag(`grep -v replicate.do.db /tmp/12346/my.sandbox.cnf > /tmp/new.cnf`);
 diag(`mv /tmp/new.cnf /tmp/12346/my.sandbox.cnf`);
 diag(`/tmp/12346/stop >/dev/null`);
 diag(`/tmp/12346/start >/dev/null`);
-$slave2_dbh->do("stop slave");
-$slave2_dbh->do("start slave");
+$replica2_dbh->do("stop ${replica_name}");
+$replica2_dbh->do("start ${replica_name}");
 
-$slave1_dbh = $sb->get_dbh_for('slave1');
-$r = $slave1_dbh->selectrow_hashref('show slave status');
+$replica1_dbh = $sb->get_dbh_for('replica1');
+$r = $replica1_dbh->selectrow_hashref("show ${replica_name} status");
 is($r->{replicate_do_db}, '', 'Replication filter removed');
 
 # #############################################################################
 # Done.
 # #############################################################################
-$sb->wipe_clean($master_dbh);
+$sb->wipe_clean($source_dbh);
 ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox");
 exit;
diff --git a/t/pt-table-sync/safety_checks.t b/t/pt-table-sync/safety_checks.t
index 77554a3e9..a4589d138 100644
--- a/t/pt-table-sync/safety_checks.t
+++ b/t/pt-table-sync/safety_checks.t
@@ -19,18 +19,18 @@ require "$trunk/bin/pt-table-sync";
 my $output;
 my $dp = new DSNParser(opts=>$dsn_opts);
 my $sb = new Sandbox(basedir => '/tmp', DSNParser => $dp);
-my $master_dbh = $sb->get_dbh_for('master');
-my $slave_dbh  = $sb->get_dbh_for('slave1');
+my $source_dbh = $sb->get_dbh_for('source');
+my $replica_dbh  = $sb->get_dbh_for('replica1');
 
-if ( !$master_dbh ) {
-   plan skip_all => 'Cannot connect to sandbox master';
+if ( !$source_dbh ) {
+   plan skip_all => 'Cannot connect to sandbox source';
 }
-elsif ( !$slave_dbh ) {
-   plan skip_all => 'Cannot connect to sandbox slave';
+elsif ( !$replica_dbh ) {
+   plan skip_all => 'Cannot connect to sandbox replica';
 }
 
-my $master_dsn = $sb->dsn_for('master');
-my $slave1_dsn = $sb->dsn_for('slave1');
+my $source_dsn = $sb->dsn_for('source');
+my $replica1_dsn = $sb->dsn_for('replica1');
 
 # #############################################################################
 # --[no]check-child-tables
@@ -38,16 +38,16 @@ my $slave1_dsn = $sb->dsn_for('slave1');
 # https://bugs.launchpad.net/percona-toolkit/+bug/1223458
 # #############################################################################
 
-$sb->load_file('master', 't/pt-table-sync/samples/on_del_cas.sql');
+$sb->load_file('source', 't/pt-table-sync/samples/on_del_cas.sql');
 
-$master_dbh->do("INSERT INTO on_del_cas.parent VALUES (1), (2)");
-$master_dbh->do("INSERT INTO on_del_cas.child1 VALUES (null, 1)");
-$master_dbh->do("INSERT INTO on_del_cas.child2 VALUES (null, 1)");
-$sb->wait_for_slaves();
+$source_dbh->do("INSERT INTO on_del_cas.parent VALUES (1), (2)");
+$source_dbh->do("INSERT INTO on_del_cas.child1 VALUES (null, 1)");
+$source_dbh->do("INSERT INTO on_del_cas.child2 VALUES (null, 1)");
+$sb->wait_for_replicas();
 
 $output = output(
    sub {
-      pt_table_sync::main($slave1_dsn, qw(--sync-to-master),
+      pt_table_sync::main($replica1_dsn, qw(--sync-to-source),
          qw(--execute -d on_del_cas))
    },
    stderr => 1,
@@ -59,7 +59,7 @@ like(
    "check-child-tables: error message"
 );
 
-my $rows = $slave_dbh->selectall_arrayref("select * from on_del_cas.child2");
+my $rows = $replica_dbh->selectall_arrayref("select * from on_del_cas.child2");
 is_deeply(
    $rows,
    [ [1,1] ],
@@ -68,7 +68,7 @@ is_deeply(
 
 $output = output(
    sub {
-      pt_table_sync::main($slave1_dsn, qw(--sync-to-master),
+      pt_table_sync::main($replica1_dsn, qw(--sync-to-source),
          qw(--print -d on_del_cas))
    },
    stderr => 1,
@@ -83,6 +83,6 @@ unlike(
 # #############################################################################
 # 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;
diff --git a/t/pt-table-sync/samples/bug-918056-master.sql b/t/pt-table-sync/samples/bug-918056-master.sql
index f67a0ea5d..c7c050214 100644
--- a/t/pt-table-sync/samples/bug-918056-master.sql
+++ b/t/pt-table-sync/samples/bug-918056-master.sql
@@ -48,8 +48,8 @@ CREATE TABLE `checksums` (
   `upper_boundary` text,
   `this_crc` char(40) NOT NULL,
   `this_cnt` int(11) NOT NULL,
-  `master_crc` char(40) DEFAULT NULL,
-  `master_cnt` int(11) DEFAULT NULL,
+  `source_crc` char(40) DEFAULT NULL,
+  `source_cnt` int(11) DEFAULT NULL,
   `ts` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   PRIMARY KEY (`db`,`tbl`,`chunk`),
   KEY `ts_db_tbl` (`ts`,`db`,`tbl`)
diff --git a/t/pt-table-sync/samples/checksum_tbl.sql b/t/pt-table-sync/samples/checksum_tbl.sql
index 16daac319..54f104771 100644
--- a/t/pt-table-sync/samples/checksum_tbl.sql
+++ b/t/pt-table-sync/samples/checksum_tbl.sql
@@ -9,8 +9,8 @@ CREATE TABLE checksum (
  boundaries char(64)     NOT NULL,
  this_crc   char(40)     NOT NULL,
  this_cnt   int          NOT NULL,
- master_crc char(40)         NULL,
- master_cnt int              NULL,
+ source_crc char(40)         NULL,
+ source_cnt int              NULL,
  ts         timestamp    NOT NULL,
  PRIMARY KEY (db, tbl, chunk)
 );
diff --git a/t/pt-table-sync/samples/pt_221.sql b/t/pt-table-sync/samples/pt_221.sql
index 1f6484556..13d83f0bd 100644
--- a/t/pt-table-sync/samples/pt_221.sql
+++ b/t/pt-table-sync/samples/pt_221.sql
@@ -124,8 +124,8 @@ CREATE TABLE test.checksums (
    upper_boundary TEXT             NULL,
    this_crc       CHAR(40)     NOT NULL,
    this_cnt       INT          NOT NULL,
-   master_crc     CHAR(40)         NULL,
-   master_cnt     INT              NULL,
+   source_crc     CHAR(40)         NULL,
+   source_cnt     INT              NULL,
    ts             TIMESTAMP    NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
    PRIMARY KEY (db, tbl, chunk),
    INDEX ts_db_tbl (ts, db, tbl)
diff --git a/t/pt-table-sync/samples/upper-oob-master.sql b/t/pt-table-sync/samples/upper-oob-master.sql
index 10feb36e0..1b75e5f51 100644
--- a/t/pt-table-sync/samples/upper-oob-master.sql
+++ b/t/pt-table-sync/samples/upper-oob-master.sql
@@ -131,8 +131,8 @@ CREATE TABLE `checksums` (
   `upper_boundary` text,
   `this_crc` char(40) NOT NULL,
   `this_cnt` int(11) NOT NULL,
-  `master_crc` char(40) DEFAULT NULL,
-  `master_cnt` int(11) DEFAULT NULL,
+  `source_crc` char(40) DEFAULT NULL,
+  `source_cnt` int(11) DEFAULT NULL,
   `ts` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   PRIMARY KEY (`db`,`tbl`,`chunk`),
   KEY `ts_db_tbl` (`ts`,`db`,`tbl`)
diff --git a/t/pt-table-sync/specify_column_or_index.t b/t/pt-table-sync/specify_column_or_index.t
index 70488713e..23ad16db4 100644
--- a/t/pt-table-sync/specify_column_or_index.t
+++ b/t/pt-table-sync/specify_column_or_index.t
@@ -18,28 +18,28 @@ require "$trunk/bin/pt-table-sync";
 my $output;
 my $dp = new DSNParser(opts=>$dsn_opts);
 my $sb = new Sandbox(basedir => '/tmp', DSNParser => $dp);
-my $master_dbh = $sb->get_dbh_for('master');
-my $slave_dbh  = $sb->get_dbh_for('slave1');
+my $source_dbh = $sb->get_dbh_for('source');
+my $replica_dbh  = $sb->get_dbh_for('replica1');
 
-if ( !$master_dbh ) {
-   plan skip_all => 'Cannot connect to sandbox master';
+if ( !$source_dbh ) {
+   plan skip_all => 'Cannot connect to sandbox source';
 }
-elsif ( !$slave_dbh ) {
-   plan skip_all => 'Cannot connect to sandbox slave';
+elsif ( !$replica_dbh ) {
+   plan skip_all => 'Cannot connect to sandbox replica';
 }
 else {
    plan tests => 3;
 }
 
-$sb->wipe_clean($master_dbh);
-$sb->wipe_clean($slave_dbh);
+$sb->wipe_clean($source_dbh);
+$sb->wipe_clean($replica_dbh);
 
 # #############################################################################
 # Issue 376: Permit specifying an index for pt-table-sync
 # #############################################################################
 diag(`/tmp/12345/use < $trunk/t/pt-table-sync/samples/issue_375.sql`);
 sleep 1;
-$output = `$trunk/bin/pt-table-sync --sync-to-master h=127.1,P=12346,u=msandbox,p=msandbox -d issue_375 --print -v -v  --chunk-size 50 --chunk-index updated_at`;
+$output = `$trunk/bin/pt-table-sync --sync-to-source h=127.1,P=12346,u=msandbox,p=msandbox -d issue_375 --print -v -v  --chunk-size 50 --chunk-index updated_at`;
 # We cannot rely on the exact time here, because pt-osc uses EXPLAIN to calculate rows range
 # and EXPLAIN does not guarantee accuracy of results.
 like(
@@ -48,7 +48,7 @@ like(
    '--chunk-index',
 );
 
-$output = `$trunk/bin/pt-table-sync --sync-to-master h=127.1,P=12346,u=msandbox,p=msandbox -d issue_375 --print -v -v  --chunk-size 50 --chunk-column updated_at`;
+$output = `$trunk/bin/pt-table-sync --sync-to-source h=127.1,P=12346,u=msandbox,p=msandbox -d issue_375 --print -v -v  --chunk-size 50 --chunk-column updated_at`;
 like(
    $output,
    qr/FROM `issue_375`.`t` FORCE INDEX \(`updated_at`\) WHERE \(`updated_at` > 0 AND `updated_at` < '2009-09-05 02:\d\d:\d\d'/,
@@ -58,7 +58,7 @@ like(
 # #############################################################################
 # Done.
 # #############################################################################
-$sb->wipe_clean($master_dbh);
-$sb->wipe_clean($slave_dbh);
+$sb->wipe_clean($source_dbh);
+$sb->wipe_clean($replica_dbh);
 ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox");
 exit;
diff --git a/t/pt-table-sync/standard_options.t b/t/pt-table-sync/standard_options.t
index 8786f78eb..d1bbff128 100644
--- a/t/pt-table-sync/standard_options.t
+++ b/t/pt-table-sync/standard_options.t
@@ -45,7 +45,7 @@ EOF
 # Issue 391: Add --pid option to mk-table-sync
 # #############################################################################
 `touch /tmp/mk-table-sync.pid`;
-$output = `$trunk/bin/pt-table-sync h=127.1,P=12346,u=msandbox,p=msandbox --sync-to-master --print --no-check-triggers --pid /tmp/mk-table-sync.pid 2>&1`;
+$output = `$trunk/bin/pt-table-sync h=127.1,P=12346,u=msandbox,p=msandbox --sync-to-source --print --no-check-triggers --pid /tmp/mk-table-sync.pid 2>&1`;
 like(
    $output,
    qr{PID file /tmp/mk-table-sync.pid exists},
diff --git a/t/pt-table-sync/sync_to_differnt_db.t b/t/pt-table-sync/sync_to_differnt_db.t
index 55a9c1bb6..f50b3ea2a 100644
--- a/t/pt-table-sync/sync_to_differnt_db.t
+++ b/t/pt-table-sync/sync_to_differnt_db.t
@@ -18,24 +18,24 @@ require "$trunk/bin/pt-table-sync";
 my $output;
 my $dp = new DSNParser(opts=>$dsn_opts);
 my $sb = new Sandbox(basedir => '/tmp', DSNParser => $dp);
-my $master_dbh = $sb->get_dbh_for('master');
+my $source_dbh = $sb->get_dbh_for('source');
 
-diag(`$trunk/sandbox/start-sandbox master 12348 >/dev/null`);
-my $dbh2 = $sb->get_dbh_for('master1');
+diag(`$trunk/sandbox/start-sandbox source 12348 >/dev/null`);
+my $dbh2 = $sb->get_dbh_for('source1');
 
-if ( !$master_dbh ) {
-   plan skip_all => 'Cannot connect to sandbox master';
+if ( !$source_dbh ) {
+   plan skip_all => 'Cannot connect to sandbox source';
 }
 elsif ( !$dbh2 ) {
-   plan skip_all => 'Cannot connect to second sandbox master';
+   plan skip_all => 'Cannot connect to second sandbox source';
 }
 else {
    plan tests => 3;
 }
 
-$sb->wipe_clean($master_dbh);
-$sb->create_dbs($master_dbh, [qw(test)]);
-$sb->load_file('master', 't/pt-table-sync/samples/before.sql');
+$sb->wipe_clean($source_dbh);
+$sb->create_dbs($source_dbh, [qw(test)]);
+$sb->load_file('source', 't/pt-table-sync/samples/before.sql');
 
 # #############################################################################
 # Issue 40: mk-table-sync feature: sync to different db
@@ -45,7 +45,7 @@ $dbh2->do('DROP DATABASE IF EXISTS d2');
 $dbh2->do('CREATE DATABASE d2');
 $dbh2->do('CREATE TABLE d2.test2 (a INT NOT NULL, b char(2) NOT NULL, PRIMARY KEY  (`a`,`b`) )');
 
-$output = `$trunk/bin/pt-table-sync --no-check-slave --execute h=127.1,P=12345,u=msandbox,p=msandbox,D=test,t=test1  h=127.1,P=12348,D=d2,t=test2 2>&1`;
+$output = `$trunk/bin/pt-table-sync --no-check-replica --execute h=127.1,P=12345,u=msandbox,p=msandbox,D=test,t=test1  h=127.1,P=12348,D=d2,t=test2 2>&1`;
 is(
    $output,
    '',
@@ -63,7 +63,7 @@ is(
 # #############################################################################
 # Done.
 # #############################################################################
-$sb->wipe_clean($master_dbh);
+$sb->wipe_clean($source_dbh);
 diag(`$trunk/sandbox/stop-sandbox 12348 >/dev/null`);
 ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox");
 exit;
diff --git a/t/pt-table-sync/sync_using_channels.t b/t/pt-table-sync/sync_using_channels.t
index 5c4a1d91f..8ab8674ce 100644
--- a/t/pt-table-sync/sync_using_channels.t
+++ b/t/pt-table-sync/sync_using_channels.t
@@ -17,43 +17,43 @@ require "$trunk/bin/pt-table-sync";
 
 my $dp = new DSNParser(opts=>$dsn_opts);
 my $sb = new Sandbox(basedir => '/tmp', DSNParser => $dp);
-my $master_dbh = $sb->get_dbh_for('master');
-my $slave_dbh  = $sb->get_dbh_for('slave1'); 
+my $source_dbh = $sb->get_dbh_for('source');
+my $replica_dbh  = $sb->get_dbh_for('replica1'); 
 
-if ( !$master_dbh ) {
-   plan skip_all => 'Cannot connect to sandbox master';
+if ( !$source_dbh ) {
+   plan skip_all => 'Cannot connect to sandbox source';
 }
-elsif ( !$slave_dbh ) {
-   plan skip_all => 'Cannot connect to sandbox slave';
+elsif ( !$replica_dbh ) {
+   plan skip_all => 'Cannot connect to sandbox replica';
 } elsif ($sandbox_version lt '5.7') {
    plan skip_all => 'Only on MySQL 5.7+';
 } else {
    plan tests => 2;
 }
 
-my ($master1_dbh, $master1_dsn) = $sb->start_sandbox(
-   server => 'chan_master1',
-   type   => 'master',
+my ($source1_dbh, $source1_dsn) = $sb->start_sandbox(
+   server => 'chan_source1',
+   type   => 'source',
 );
-my ($master2_dbh, $master2_dsn) = $sb->start_sandbox(
-   server => 'chan_master2',
-   type   => 'master',
+my ($source2_dbh, $source2_dsn) = $sb->start_sandbox(
+   server => 'chan_source2',
+   type   => 'source',
 );
-my ($slave1_dbh, $slave1_dsn) = $sb->start_sandbox(
-   server => 'chan_slave1',
-   type   => 'master',
+my ($replica1_dbh, $replica1_dsn) = $sb->start_sandbox(
+   server => 'chan_replica1',
+   type   => 'source',
 );
-my $slave1_port = $sb->port_for('chan_slave1');
+my $replica1_port = $sb->port_for('chan_replica1');
 
-$sb->load_file('chan_master1', "sandbox/gtid_on.sql", undef, no_wait => 1);
-$sb->load_file('chan_master2', "sandbox/gtid_on.sql", undef, no_wait => 1);
-$sb->load_file('chan_slave1', "sandbox/slave_channels.sql", undef, no_wait => 1);
+$sb->load_file('chan_source1', "sandbox/gtid_on.sql", undef, no_wait => 1);
+$sb->load_file('chan_source2', "sandbox/gtid_on.sql", undef, no_wait => 1);
+$sb->load_file('chan_replica1', "sandbox/replica_channels.sql", undef, no_wait => 1);
                                                           
-my @args = qw(--execute --no-foreign-key-checks --verbose --databases=sakila --tables=actor --sync-to-master --channel=sourcechan1);
+my @args = qw(--execute --no-foreign-key-checks --verbose --databases=sakila --tables=actor --sync-to-source --channel=sourcechan1);
 my $exit_status;
 
 my $output = output(
-   sub { $exit_status = pt_table_sync::main(@args, $slave1_dsn) },
+   sub { $exit_status = pt_table_sync::main(@args, $replica1_dsn) },
    stderr => 1,
 );
 
@@ -63,12 +63,12 @@ like (
     'Synced actor table'
 );
 
-$sb->stop_sandbox(qw(chan_master1 chan_master2 chan_slave1));
+$sb->stop_sandbox(qw(chan_source1 chan_source2 chan_replica1));
 
 
 # #############################################################################
 # Done.
 # #############################################################################
-$sb->wipe_clean($master_dbh);
+$sb->wipe_clean($source_dbh);
 ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox");
 exit;
diff --git a/t/pt-table-sync/traces.t b/t/pt-table-sync/traces.t
index a3c8c3c7c..15da5e0fe 100644
--- a/t/pt-table-sync/traces.t
+++ b/t/pt-table-sync/traces.t
@@ -21,8 +21,8 @@ require "$trunk/bin/pt-table-sync";
 
 my $dp = new DSNParser(opts=>$dsn_opts);
 my $sb = new Sandbox(basedir => '/tmp', DSNParser => $dp);
-my $master_dbh = $sb->get_dbh_for('master');
-my $slave_dbh  = $sb->get_dbh_for('slave1');
+my $source_dbh = $sb->get_dbh_for('source');
+my $replica_dbh  = $sb->get_dbh_for('replica1');
 
 my $mysqlbinlog = `which mysqlbinlog`;
 if ( $mysqlbinlog ) {
@@ -32,11 +32,11 @@ elsif ( -x "$ENV{PERCONA_TOOLKIT_SANDBOX}/bin/mysqlbinlog" ) {
    $mysqlbinlog = "$ENV{PERCONA_TOOLKIT_SANDBOX}/bin/mysqlbinlog";
 }
 
-if ( !$master_dbh ) {
-   plan skip_all => 'Cannot connect to sandbox master';
+if ( !$source_dbh ) {
+   plan skip_all => 'Cannot connect to sandbox source';
 }
-elsif ( !$slave_dbh ) {
-   plan skip_all => 'Cannot connect to sandbox slave';
+elsif ( !$replica_dbh ) {
+   plan skip_all => 'Cannot connect to sandbox replica';
 }
 elsif ( !$mysqlbinlog ) {
    plan skip_all => 'Cannot find mysqlbinlog';
@@ -48,9 +48,9 @@ else {
 # We execute the test by changing a table so pt-table-sync will find something
 # to modify.  Then we examine the binary log to find the SQL in it, and check
 # that.
-$sb->load_file('master', "t/pt-table-sync/samples/issue_533.sql");
-my $pos = $master_dbh->selectrow_hashref('show master status');
-diag("Master position: $pos->{file} / $pos->{position}");
+$sb->load_file('source', "t/pt-table-sync/samples/issue_533.sql");
+my $pos = $source_dbh->selectrow_hashref("show ${source_status} status");
+diag("Source position: $pos->{file} / $pos->{position}");
 
 my @args = ('h=127.1,P=12345,u=msandbox,p=msandbox,D=test,t=t1', 't=t2', '--execute');
 output(
@@ -74,6 +74,6 @@ like(
 # #############################################################################
 # Done.
 # #############################################################################
-$sb->wipe_clean($master_dbh);
+$sb->wipe_clean($source_dbh);
 ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox");
 exit;
diff --git a/t/pt-table-sync/triggers.t b/t/pt-table-sync/triggers.t
index 8b0681e1a..d7810682e 100644
--- a/t/pt-table-sync/triggers.t
+++ b/t/pt-table-sync/triggers.t
@@ -18,44 +18,44 @@ require "$trunk/bin/pt-table-sync";
 my $output;
 my $dp = new DSNParser(opts=>$dsn_opts);
 my $sb = new Sandbox(basedir => '/tmp', DSNParser => $dp);
-my $master_dbh = $sb->get_dbh_for('master');
-my $slave_dbh  = $sb->get_dbh_for('slave1');
+my $source_dbh = $sb->get_dbh_for('source');
+my $replica_dbh  = $sb->get_dbh_for('replica1');
 
-if ( !$master_dbh ) {
-   plan skip_all => 'Cannot connect to sandbox master';
+if ( !$source_dbh ) {
+   plan skip_all => 'Cannot connect to sandbox source';
 }
-elsif ( !$slave_dbh ) {
-   plan skip_all => 'Cannot connect to sandbox slave';
+elsif ( !$replica_dbh ) {
+   plan skip_all => 'Cannot connect to sandbox replica';
 }
-elsif ( VersionParser->new($master_dbh) < '5.0.2' ) {
+elsif ( VersionParser->new($source_dbh) < '5.0.2' ) {
    plan skip_all => 'Sever does not support triggers (< 5.0.2)';
 }
 else {
    plan tests => 11;
 }
 
-$sb->wipe_clean($master_dbh);
-$sb->wipe_clean($slave_dbh);
-$sb->create_dbs($master_dbh, [qw(test)]);
+$sb->wipe_clean($source_dbh);
+$sb->wipe_clean($replica_dbh);
+$sb->create_dbs($source_dbh, [qw(test)]);
 
 # #############################################################################
 # Issue 37: mk-table-sync should warn about triggers
 # #############################################################################
-$sb->load_file('master', 't/pt-table-sync/samples/issue_37.sql');
-$sb->use('master', '-e "SET SQL_LOG_BIN=0; INSERT INTO test.issue_37 VALUES (1), (2);"');
+$sb->load_file('source', 't/pt-table-sync/samples/issue_37.sql');
+$sb->use('source', '-e "SET SQL_LOG_BIN=0; INSERT INTO test.issue_37 VALUES (1), (2);"');
 
 `$trunk/bin/pt-table-checksum h=127.0.0.1,P=12345,u=msandbox,p=msandbox --replicate test.checksum -d test --set-vars innodb_lock_wait_timeout=3 2>&1 > /dev/null`;
 
-$output = `$trunk/bin/pt-table-sync --no-check-slave --execute u=msandbox,p=msandbox,h=127.0.0.1,P=12345,D=test,t=issue_37 h=127.1,P=12346 2>&1`;
+$output = `$trunk/bin/pt-table-sync --no-check-replica --execute u=msandbox,p=msandbox,h=127.0.0.1,P=12345,D=test,t=issue_37 h=127.1,P=12346 2>&1`;
 like($output,
    qr/Triggers are defined/,
    'Die on trigger tbl write with one table (1/4, issue 37)'
 );
 
-$output = `$trunk/bin/pt-table-sync --replicate test.checksum --sync-to-master --execute h=127.1,P=12346,u=msandbox,p=msandbox -d test -t issue_37 2>&1`;
+$output = `$trunk/bin/pt-table-sync --replicate test.checksum --sync-to-source --execute h=127.1,P=12346,u=msandbox,p=msandbox -d test -t issue_37 2>&1`;
 like($output,
    qr/Triggers are defined/,
-   'Die on trigger tbl write with --replicate --sync-to-master (2/4, issue 37)'
+   'Die on trigger tbl write with --replicate --sync-to-source (2/4, issue 37)'
 );
 
 $output = `$trunk/bin/pt-table-sync --replicate test.checksum --execute h=127.1,P=12345,u=msandbox,p=msandbox -d test -t issue_37 2>&1`;
@@ -78,7 +78,7 @@ ok(
    'Table with trigger was not written'
 );
 
-$output = `$trunk/bin/pt-table-sync --no-check-slave --execute u=msandbox,p=msandbox,h=127.0.0.1,P=12345,D=test,t=issue_37 h=127.1,P=12346 --no-check-triggers 2>&1`;
+$output = `$trunk/bin/pt-table-sync --no-check-replica --execute u=msandbox,p=msandbox,h=127.0.0.1,P=12345,D=test,t=issue_37 h=127.1,P=12346 --no-check-triggers 2>&1`;
 unlike(
    $output,
    qr/Triggers are defined/,
@@ -96,11 +96,11 @@ like(
 # #############################################################################
 
 diag('Loading file and waiting for replication');
-$sb->load_file('master', 't/pt-table-sync/samples/issue_367.sql');
+$sb->load_file('source', 't/pt-table-sync/samples/issue_367.sql');
 
-# Make slave db1.t1 and db2.t1 differ from master.
-$slave_dbh->do('INSERT INTO db1.t1 VALUES (9)');
-$slave_dbh->do('DELETE FROM db2.t1 WHERE i > 4');
+# Make replica db1.t1 and db2.t1 differ from source.
+$replica_dbh->do('INSERT INTO db1.t1 VALUES (9)');
+$replica_dbh->do('DELETE FROM db2.t1 WHERE i > 4');
 
 # Replicate checksum of db2.t1.
 $output = `$trunk/bin/pt-table-checksum h=127.1,P=12345,u=msandbox,p=msandbox --replicate db1.checksum --create-replicate-table --databases db1,db2 --set-vars innodb_lock_wait_timeout=3 2>&1`;
@@ -110,7 +110,7 @@ like(
    'Replicated checksums (issue 367)'
 );
 
-# Sync db2, which has no triggers, between master and slave using
+# Sync db2, which has no triggers, between source and replica using
 # --replicate which has entries for both db1 and db2.  db1 has a
 # trigger but since we also specify --databases db2, then db1 should
 # be ignored.
@@ -121,8 +121,8 @@ unlike(
    "Doesn't warn about trigger on db1 (issue 367)"
 );
 
-$sb->wait_for_slaves();
-my $r = $slave_dbh->selectrow_array('SELECT * FROM db2.t1 WHERE i = 5');
+$sb->wait_for_replicas();
+my $r = $replica_dbh->selectrow_array('SELECT * FROM db2.t1 WHERE i = 5');
 is(
    $r,
    '5',
@@ -132,7 +132,7 @@ is(
 # #############################################################################
 # Done.
 # #############################################################################
-$sb->wipe_clean($master_dbh);
-$sb->wipe_clean($slave_dbh);
+$sb->wipe_clean($source_dbh);
+$sb->wipe_clean($replica_dbh);
 ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox");
 exit;
diff --git a/t/pt-table-sync/wait.t b/t/pt-table-sync/wait.t
index 2d05ae2d6..9147e4858 100644
--- a/t/pt-table-sync/wait.t
+++ b/t/pt-table-sync/wait.t
@@ -17,35 +17,35 @@ require "$trunk/bin/pt-table-sync";
 
 my $dp = new DSNParser(opts=>$dsn_opts);
 my $sb = new Sandbox(basedir => '/tmp', DSNParser => $dp);
-my $master_dbh = $sb->get_dbh_for('master');
-my $slave_dbh  = $sb->get_dbh_for('slave1');
+my $source_dbh = $sb->get_dbh_for('source');
+my $replica_dbh  = $sb->get_dbh_for('replica1');
 
-if ( !$master_dbh ) {
-   plan skip_all => 'Cannot connect to sandbox master';
+if ( !$source_dbh ) {
+   plan skip_all => 'Cannot connect to sandbox source';
 }
-elsif ( !$slave_dbh ) {
-   plan skip_all => 'Cannot connect to sandbox slave';
+elsif ( !$replica_dbh ) {
+   plan skip_all => 'Cannot connect to sandbox replica';
 }
 else {
    plan tests => 5;
 }
 
 my $output;
-my @args = ('--sync-to-master', 'h=127.1,P=12346,u=msandbox,p=msandbox', qw(--print -v));
+my @args = ('--sync-to-source', 'h=127.1,P=12346,u=msandbox,p=msandbox', qw(--print -v));
 
-$sb->load_file('master', 't/pt-table-sync/samples/lag-slave.sql');
+$sb->load_file('source', 't/pt-table-sync/samples/lag-slave.sql');
 wait_until(
    sub {
       my $row;
       eval {
-         $row = $slave_dbh->selectrow_hashref("select * from test.t2");
+         $row = $replica_dbh->selectrow_hashref("select * from test.t2");
       };
       return 1 if $row && $row->{id};
    },
 );
 
-sub lag_slave {
-   my $dbh = $sb->get_dbh_for('master');
+sub lag_replica {
+   my $dbh = $sb->get_dbh_for('source');
    for (1..10) {
       $dbh->do("update test.t1 set i=sleep(3) limit 1");
    }
@@ -56,7 +56,7 @@ sub lag_slave {
 my $pid = fork();
 if ( !$pid ) {
    # child
-   lag_slave();
+   lag_replica();
    exit;
 }
 
@@ -65,11 +65,11 @@ sleep(2);
 
 # parent
 PerconaTest::wait_until(sub {
-   $slave_dbh->selectrow_hashref("show slave status")->{seconds_behind_master}
+   $replica_dbh->selectrow_hashref("show ${replica_name} status")->{"seconds_behind_${source_name}"}
 }) or do {
    kill 15, $pid;
    waitpid ($pid, 0);
-   die "Slave did not lag";
+   die "Replica did not lag";
 };
 
 my $start = time;
@@ -90,16 +90,16 @@ cmp_ok(
    $t,
    '>',
    1,
-   "Sync waited $t seconds for master"
+   "Sync waited $t seconds for source"
 );
 
 # Repeat the test with --wait 0 to test that the sync happens without delay.
 PerconaTest::wait_until(sub {
-   $slave_dbh->selectrow_hashref("show slave status")->{seconds_behind_master}
+   $replica_dbh->selectrow_hashref("show ${replica_name} status")->{"seconds_behind_${source_name}"}
 }) or do {
    kill 15, $pid;
    waitpid ($pid, 0);
-   die "Slave did not lag";
+   die "Replica did not lag";
 };
 
 $start = time;
@@ -120,7 +120,7 @@ cmp_ok(
    $t,
    '<=',
    1,
-   "Sync did not wait for master with --wait 0 ($t seconds)"
+   "Sync did not wait for source with --wait 0 ($t seconds)"
 );
 
 # #############################################################################
@@ -128,6 +128,6 @@ cmp_ok(
 # #############################################################################
 kill 15, $pid;
 waitpid ($pid, 0);
-$sb->wipe_clean($master_dbh);
+$sb->wipe_clean($source_dbh);
 ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox");
 exit;
diff --git a/t/pt-table-sync/zero_chunk.t b/t/pt-table-sync/zero_chunk.t
index 1beb24187..85adbbc99 100644
--- a/t/pt-table-sync/zero_chunk.t
+++ b/t/pt-table-sync/zero_chunk.t
@@ -17,21 +17,21 @@ require "$trunk/bin/pt-table-sync";
 
 my $dp = new DSNParser(opts=>$dsn_opts);
 my $sb = new Sandbox(basedir => '/tmp', DSNParser => $dp);
-my $master_dbh = $sb->get_dbh_for('master');
-my $slave_dbh  = $sb->get_dbh_for('slave1');
+my $source_dbh = $sb->get_dbh_for('source');
+my $replica_dbh  = $sb->get_dbh_for('replica1');
 
-if ( !$master_dbh ) {
-   plan skip_all => 'Cannot connect to sandbox master';
+if ( !$source_dbh ) {
+   plan skip_all => 'Cannot connect to sandbox source';
 }
-elsif ( !$slave_dbh ) {
-   plan skip_all => 'Cannot connect to sandbox slave';
+elsif ( !$replica_dbh ) {
+   plan skip_all => 'Cannot connect to sandbox replica';
 }
 else {
    plan tests => 3;
 }
 
 my $output;
-my @args = ('h=127.0.0.1,P=12346,u=msandbox,p=msandbox', qw(--sync-to-master -t sakila.actor -v -v --print --chunk-size 100));
+my @args = ('h=127.0.0.1,P=12346,u=msandbox,p=msandbox', qw(--sync-to-source -t sakila.actor -v -v --print --chunk-size 100));
 
 $output = output(
    sub { pt_table_sync::main(@args) },
@@ -54,6 +54,6 @@ unlike(
 # #############################################################################
 # Done.
 # #############################################################################
-$sb->wipe_clean($master_dbh);
+$sb->wipe_clean($source_dbh);
 ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox");
 exit;
diff --git a/t/pt-table-usage/explain_extended.t b/t/pt-table-usage/explain_extended.t
index 6761b3596..4761e9e86 100644
--- a/t/pt-table-usage/explain_extended.t
+++ b/t/pt-table-usage/explain_extended.t
@@ -17,10 +17,10 @@ require "$trunk/bin/pt-table-usage";
 
 my $dp  = new DSNParser(opts=>$dsn_opts);
 my $sb  = new Sandbox(basedir => '/tmp', DSNParser => $dp);
-my $dbh = $sb->get_dbh_for('master');
+my $dbh = $sb->get_dbh_for('source');
 
 if ( !$dbh ) {
-   plan skip_all => 'Cannot connect to sandbox master';
+   plan skip_all => 'Cannot connect to sandbox source';
 }
 else {
    plan tests => 4;
diff --git a/t/pt-upgrade/compare_hosts.t b/t/pt-upgrade/compare_hosts.t
index 0665711a5..7f29ec520 100644
--- a/t/pt-upgrade/compare_hosts.t
+++ b/t/pt-upgrade/compare_hosts.t
@@ -19,7 +19,7 @@ use Sandbox;
 require "$trunk/bin/pt-upgrade";
 
 # This runs immediately if the server is already running, else it starts it.
-diag(`$trunk/sandbox/start-sandbox master 12348 >/dev/null`);
+diag(`$trunk/sandbox/start-sandbox source 12348 >/dev/null`);
 
 my $dp = new DSNParser(opts=>$dsn_opts);
 my $sb = new Sandbox(basedir => '/tmp', DSNParser => $dp);
diff --git a/t/pt-upgrade/compare_results.t b/t/pt-upgrade/compare_results.t
index 4c64f06dd..85b2d9e0b 100644
--- a/t/pt-upgrade/compare_results.t
+++ b/t/pt-upgrade/compare_results.t
@@ -20,7 +20,7 @@ use Sandbox;
 require "$trunk/bin/pt-upgrade";
 
 # This runs immediately if the server is already running, else it starts it.
-diag(`$trunk/sandbox/start-sandbox master 12348 >/dev/null`);
+diag(`$trunk/sandbox/start-sandbox source 12348 >/dev/null`);
 
 my $dp = new DSNParser(opts=>$dsn_opts);
 my $sb = new Sandbox(basedir => '/tmp', DSNParser => $dp);
diff --git a/t/pt-upgrade/diff_rows.t b/t/pt-upgrade/diff_rows.t
index 0396af392..5d13256ba 100644
--- a/t/pt-upgrade/diff_rows.t
+++ b/t/pt-upgrade/diff_rows.t
@@ -21,10 +21,10 @@ require "$trunk/bin/pt-upgrade";
 
 my $dp  = new DSNParser(opts=>$dsn_opts);
 my $sb  = new Sandbox(basedir => '/tmp', DSNParser => $dp);
-my $dbh = $sb->get_dbh_for('master');
+my $dbh = $sb->get_dbh_for('source');
 
 if ( !$dbh ) {
-   plan skip_all => "Cannot connect to sandbox master";
+   plan skip_all => "Cannot connect to sandbox source";
 }
 
 sub test_diff {
@@ -219,7 +219,7 @@ test_diff (
 # pt-upgrade reports differences on NULL
 # #############################################################################
 
-$sb->load_file('master', "t/pt-upgrade/samples/007/tables.sql");
+$sb->load_file('source', "t/pt-upgrade/samples/007/tables.sql");
 
 test_diff(
    name   => 'Bug 1168434: no diff with NULL',
diff --git a/t/pt-upgrade/diff_warnings.t b/t/pt-upgrade/diff_warnings.t
index 55b587862..f0bf1e14a 100644
--- a/t/pt-upgrade/diff_warnings.t
+++ b/t/pt-upgrade/diff_warnings.t
@@ -22,14 +22,14 @@ require "$trunk/bin/pt-upgrade";
 
 my $dp   = new DSNParser(opts=>$dsn_opts);
 my $sb   = new Sandbox(basedir => '/tmp', DSNParser => $dp);
-my $dbh1 = $sb->get_dbh_for('master');
-my $dbh2 = $sb->get_dbh_for('master');
+my $dbh1 = $sb->get_dbh_for('source');
+my $dbh2 = $sb->get_dbh_for('source');
 
 if ( !$dbh1 || !$dbh2 ) {
-   plan skip_all => "Cannot connect to sandbox master";
+   plan skip_all => "Cannot connect to sandbox source";
 }
 
-$sb->load_file('master', "t/lib/samples/compare-warnings.sql");
+$sb->load_file('source', "t/lib/samples/compare-warnings.sql");
 
 sub clear_warnings {
    $dbh1->do("SELECT /* clear warnings */ 1 FROM mysql.user");
diff --git a/t/pt-upgrade/run_time.t b/t/pt-upgrade/run_time.t
index e65f2ebb1..2ed48ae71 100644
--- a/t/pt-upgrade/run_time.t
+++ b/t/pt-upgrade/run_time.t
@@ -20,7 +20,7 @@ use Sandbox;
 require "$trunk/bin/pt-upgrade";
 
 # This runs immediately if the server is already running, else it starts it.
-diag(`$trunk/sandbox/start-sandbox master 12348 >/dev/null`);
+diag(`$trunk/sandbox/start-sandbox source 12348 >/dev/null`);
 
 my $dp = new DSNParser(opts=>$dsn_opts);
 my $sb = new Sandbox(basedir => '/tmp', DSNParser => $dp);
diff --git a/t/pt-upgrade/save_results.t b/t/pt-upgrade/save_results.t
index 4feedba9f..3cf22908f 100644
--- a/t/pt-upgrade/save_results.t
+++ b/t/pt-upgrade/save_results.t
@@ -21,7 +21,7 @@ use Sandbox;
 require "$trunk/bin/pt-upgrade";
 
 # This runs immediately if the server is already running, else it starts it.
-diag(`$trunk/sandbox/start-sandbox master 12348 >/dev/null`);
+diag(`$trunk/sandbox/start-sandbox source 12348 >/dev/null`);
 
 my $dp = new DSNParser(opts=>$dsn_opts);
 my $sb = new Sandbox(basedir => '/tmp', DSNParser => $dp);
diff --git a/t/pt-variable-advisor/advice.t b/t/pt-variable-advisor/advice.t
index 9caa4dd4e..8d3a48a90 100644
--- a/t/pt-variable-advisor/advice.t
+++ b/t/pt-variable-advisor/advice.t
@@ -17,11 +17,11 @@ require "$trunk/bin/pt-variable-advisor";
 
 my $dp  = new DSNParser(opts=>$dsn_opts);
 my $sb  = new Sandbox(basedir => '/tmp', DSNParser => $dp);
-my $dbh = $sb->get_dbh_for('master');
-my $dsn = $sb->dsn_for('master');
+my $dbh = $sb->get_dbh_for('source');
+my $dsn = $sb->dsn_for('source');
 
 if ( !$dbh ) {
-   plan skip_all => "Cannot connect to sandbox master";
+   plan skip_all => "Cannot connect to sandbox source";
 }
 
 # #############################################################################
diff --git a/t/pt-variable-advisor/show_variables_online.t b/t/pt-variable-advisor/show_variables_online.t
index 587dfa1f6..8d465a81d 100644
--- a/t/pt-variable-advisor/show_variables_online.t
+++ b/t/pt-variable-advisor/show_variables_online.t
@@ -17,10 +17,10 @@ require "$trunk/bin/pt-variable-advisor";
 
 my $dp  = new DSNParser(opts=>$dsn_opts);
 my $sb  = new Sandbox(basedir => '/tmp', DSNParser => $dp);
-my $dbh = $sb->get_dbh_for('master');
+my $dbh = $sb->get_dbh_for('source');
 
 if ( !$dbh ) {
-   plan skip_all => "Cannot connect to sandbox master";
+   plan skip_all => "Cannot connect to sandbox source";
 }
 else {
    plan tests => 3;
diff --git a/t/pt-variable-advisor/show_variables_static.t b/t/pt-variable-advisor/show_variables_static.t
index 28266795e..e31669dcb 100644
--- a/t/pt-variable-advisor/show_variables_static.t
+++ b/t/pt-variable-advisor/show_variables_static.t
@@ -73,7 +73,7 @@ my ($output) = full_output(sub {
 
 like(
    $output,
-   qr/\Qdual-master or ring replication configuration?\E$/sm,
+   qr/\Qdual-source or ring replication configuration?\E$/sm,
    "Sentences are delimited by . or ?"
 );
 

From b3325374818a8379f8ceeb98c9042146d96c0294 Mon Sep 17 00:00:00 2001
From: Sveta Smirnova <sveta.smirnova@percona.com>
Date: Thu, 22 Aug 2024 14:29:53 +0300
Subject: [PATCH 11/31] PT-2340 - Support MySQL 8.4

- Fixed staff I broke for 8.0
---
 bin/pt-archiver                               |  12 +-
 bin/pt-heartbeat                              |  28 ++-
 bin/pt-kill                                   |  12 +-
 bin/pt-mysql-summary                          |   6 +-
 bin/pt-online-schema-change                   |   8 +-
 bin/pt-query-digest                           |   8 +-
 bin/pt-slave-find                             |   8 +-
 bin/pt-slave-restart                          |  10 +-
 bin/pt-table-checksum                         | 166 ++++++++++--------
 bin/pt-table-sync                             |  10 +-
 lib/MasterSlave.pm                            |   8 +-
 lib/RowChecksum.pm                            |  14 +-
 lib/bash/collect_mysql_info.sh                |   6 +-
 t/lib/MasterSlave.t                           |  10 +-
 t/lib/bash/collect_mysql_info.sh              |  11 +-
 .../SchemaIterator/all-dbs-tbls-8.0.txt       |   2 +-
 t/pt-archiver/archive_using_channels.t        |   6 +-
 t/pt-heartbeat/multi_update_mode.t            |   4 +-
 t/pt-online-schema-change/basics.t            |   4 +-
 .../samples/stats-execute-5.5.txt             |   2 +-
 .../samples/stats-execute-5.6.txt             |   2 +-
 .../samples/stats-execute-5.7.txt             |   2 +-
 .../samples/stats-execute-8.0.txt             |   2 +-
 t/pt-online-schema-change/slave_lag.t         |   8 +-
 t/pt-slave-find/pt-slave-find.t               |   5 +-
 t/pt-table-checksum/basics.t                  |   2 +-
 t/pt-table-checksum/bugs.t                    |   2 +-
 t/pt-table-checksum/issue_1485195.t           |   4 +-
 t/pt-table-checksum/replication_filters.t     |   2 +-
 t/pt-table-checksum/resume.t                  |  16 +-
 .../samples/default-results-8.0.txt           |   2 +-
 31 files changed, 222 insertions(+), 160 deletions(-)

diff --git a/bin/pt-archiver b/bin/pt-archiver
index 1131cf081..53d442a8d 100755
--- a/bin/pt-archiver
+++ b/bin/pt-archiver
@@ -3922,8 +3922,10 @@ sub _find_replicas_by_hosts {
 
    my $vp = VersionParser->new($dbh);
    my $sql = 'SHOW REPLICAS';
+   my $source_name = 'source';
    if ( $vp < '8.1' || $vp->flavor() =~ m/maria/ ) {
       $sql = 'SHOW SLAVE HOSTS';
+      $source_name='master';
    }
    
    PTDEBUG && _d($dbh, $sql);
@@ -3939,7 +3941,7 @@ sub _find_replicas_by_hosts {
             . ( $hash{password} ? ",p=$hash{password}" : '');
          my $dsn           = $dsn_parser->parse($spec, $dsn);
          $dsn->{server_id} = $hash{server_id};
-         $dsn->{source_id} = $hash{source_id};
+         $dsn->{source_id} = $hash{"${source_name}_id"};
          $dsn->{source}    = 'hosts';
          $dsn;
       } @replicas;
@@ -4018,9 +4020,9 @@ sub is_source_of {
          . "but the source's port is $port";
    }
 
-   if ( !grep { $replica_status->{source_user} eq $_->{user} } @connected ) {
+   if ( !grep { $replica_status->{"${source_name}_user"} eq $_->{user} } @connected ) {
       die "I don't see any replica I/O thread connected with user "
-         . $replica_status->{source_user};
+         . $replica_status->{"${source_name}_user"};
    }
 
    if ( ($replica_status->{replica_io_state} || '')
@@ -4063,7 +4065,7 @@ sub get_replica_status {
    my $server_version = VersionParser->new($dbh);
    my $replica_name = 'replica';
    if ( $server_version < '8.1' || $server_version->flavor() =~ m/maria/ ) {
-      $replica_name = 'replica';
+      $replica_name = 'slave';
    }
 
    if ( !$self->{not_a_replica}->{$dbh} ) {
@@ -4206,7 +4208,7 @@ sub stop_replica {
    my $vp = VersionParser->new($dbh);
    my $replica_name = 'replica';
    if ( $vp < '8.1' || $vp->flavor() =~ m/maria/ ) {
-      $replica_name = 'replica';
+      $replica_name = 'slave';
    }
    my $sth = $self->{sths}->{$dbh}->{STOP_REPLICA}
          ||= $dbh->prepare("STOP ${replica_name}");
diff --git a/bin/pt-heartbeat b/bin/pt-heartbeat
index ae6de56a7..42423ca43 100755
--- a/bin/pt-heartbeat
+++ b/bin/pt-heartbeat
@@ -383,8 +383,10 @@ sub _find_replicas_by_hosts {
 
    my $vp = VersionParser->new($dbh);
    my $sql = 'SHOW REPLICAS';
+   my $source_name = 'source';
    if ( $vp < '8.1' || $vp->flavor() =~ m/maria/ ) {
       $sql = 'SHOW SLAVE HOSTS';
+      $source_name='master';
    }
    
    PTDEBUG && _d($dbh, $sql);
@@ -400,7 +402,7 @@ sub _find_replicas_by_hosts {
             . ( $hash{password} ? ",p=$hash{password}" : '');
          my $dsn           = $dsn_parser->parse($spec, $dsn);
          $dsn->{server_id} = $hash{server_id};
-         $dsn->{source_id} = $hash{source_id};
+         $dsn->{source_id} = $hash{"${source_name}_id"};
          $dsn->{source}    = 'hosts';
          $dsn;
       } @replicas;
@@ -479,9 +481,9 @@ sub is_source_of {
          . "but the source's port is $port";
    }
 
-   if ( !grep { $replica_status->{source_user} eq $_->{user} } @connected ) {
+   if ( !grep { $replica_status->{"${source_name}_user"} eq $_->{user} } @connected ) {
       die "I don't see any replica I/O thread connected with user "
-         . $replica_status->{source_user};
+         . $replica_status->{"${source_name}_user"};
    }
 
    if ( ($replica_status->{replica_io_state} || '')
@@ -524,7 +526,7 @@ sub get_replica_status {
    my $server_version = VersionParser->new($dbh);
    my $replica_name = 'replica';
    if ( $server_version < '8.1' || $server_version->flavor() =~ m/maria/ ) {
-      $replica_name = 'replica';
+      $replica_name = 'slave';
    }
 
    if ( !$self->{not_a_replica}->{$dbh} ) {
@@ -667,7 +669,7 @@ sub stop_replica {
    my $vp = VersionParser->new($dbh);
    my $replica_name = 'replica';
    if ( $vp < '8.1' || $vp->flavor() =~ m/maria/ ) {
-      $replica_name = 'replica';
+      $replica_name = 'slave';
    }
    my $sth = $self->{sths}->{$dbh}->{STOP_REPLICA}
          ||= $dbh->prepare("STOP ${replica_name}");
@@ -6105,6 +6107,9 @@ sub main {
    @dbhs = ();
    @sths = ();
 
+   my $relay_source_log_file_col = 'relay_source_log_file';
+   my $exec_source_log_pos_col = 'exec_source_log_pos';
+
    # ########################################################################
    # Get configuration information.
    # ########################################################################
@@ -6311,6 +6316,16 @@ sub main {
    die "Heartbeat table $db_tbl does not have a ts column"
       unless $tbl_struct->{is_col}->{ts};
 
+   if ( $tbl_struct->{is_col}->{exec_master_log_file}
+      && !$tbl_struct->{is_col}->{exec_source_log_file} ) {
+      $exec_source_log_pos_col = 'exec_master_log_file';
+   }
+
+   if ( $tbl_struct->{is_col}->{exec_master_log_pos}
+      && !$tbl_struct->{is_col}->{exec_source_log_pos} ) {
+      $exec_source_log_pos_col = 'exec_master_log_pos';
+   }
+
    my $hires_ts = $tbl_struct->{type_for}->{ts} =~ m/char/i ? 1 : 0;
    PTDEBUG && _d("Hi-res ts:", ($hires_ts ? 'yes' : 'no'));
 
@@ -6429,7 +6444,7 @@ sub main {
       PTDEBUG && _d("Master status columns:", join(', ', @master_status_cols));
 
       my @slave_status_cols  = grep { $tbl_struct->{is_col}->{$_} }
-         ("relay_${source_name}_log_file", "exec_${source_name}_log_pos");
+         ($relay_source_log_file_col, $exec_source_log_pos_col);
       PTDEBUG && _d("Slave status columns:", join(', ', @slave_status_cols));
 
       # Just a shortcut so I don't have to check both arrays when creating
@@ -6486,6 +6501,7 @@ sub main {
             }
             else {
                $sql = 'SHOW SLAVE STATUS';
+               s/source/master/ for @slave_status_cols;
             }
             PTDEBUG && _d($dbh, $sql);
             my $row = $dbh->selectrow_hashref($sql);
diff --git a/bin/pt-kill b/bin/pt-kill
index 65b533065..a4762b31f 100755
--- a/bin/pt-kill
+++ b/bin/pt-kill
@@ -4199,8 +4199,10 @@ sub _find_replicas_by_hosts {
 
    my $vp = VersionParser->new($dbh);
    my $sql = 'SHOW REPLICAS';
+   my $source_name = 'source';
    if ( $vp < '8.1' || $vp->flavor() =~ m/maria/ ) {
       $sql = 'SHOW SLAVE HOSTS';
+      $source_name='master';
    }
    
    PTDEBUG && _d($dbh, $sql);
@@ -4216,7 +4218,7 @@ sub _find_replicas_by_hosts {
             . ( $hash{password} ? ",p=$hash{password}" : '');
          my $dsn           = $dsn_parser->parse($spec, $dsn);
          $dsn->{server_id} = $hash{server_id};
-         $dsn->{source_id} = $hash{source_id};
+         $dsn->{source_id} = $hash{"${source_name}_id"};
          $dsn->{source}    = 'hosts';
          $dsn;
       } @replicas;
@@ -4295,9 +4297,9 @@ sub is_source_of {
          . "but the source's port is $port";
    }
 
-   if ( !grep { $replica_status->{source_user} eq $_->{user} } @connected ) {
+   if ( !grep { $replica_status->{"${source_name}_user"} eq $_->{user} } @connected ) {
       die "I don't see any replica I/O thread connected with user "
-         . $replica_status->{source_user};
+         . $replica_status->{"${source_name}_user"};
    }
 
    if ( ($replica_status->{replica_io_state} || '')
@@ -4340,7 +4342,7 @@ sub get_replica_status {
    my $server_version = VersionParser->new($dbh);
    my $replica_name = 'replica';
    if ( $server_version < '8.1' || $server_version->flavor() =~ m/maria/ ) {
-      $replica_name = 'replica';
+      $replica_name = 'slave';
    }
 
    if ( !$self->{not_a_replica}->{$dbh} ) {
@@ -4483,7 +4485,7 @@ sub stop_replica {
    my $vp = VersionParser->new($dbh);
    my $replica_name = 'replica';
    if ( $vp < '8.1' || $vp->flavor() =~ m/maria/ ) {
-      $replica_name = 'replica';
+      $replica_name = 'slave';
    }
    my $sth = $self->{sths}->{$dbh}->{STOP_REPLICA}
          ||= $dbh->prepare("STOP ${replica_name}");
diff --git a/bin/pt-mysql-summary b/bin/pt-mysql-summary
index 569febbee..cb1fa30b9 100755
--- a/bin/pt-mysql-summary
+++ b/bin/pt-mysql-summary
@@ -981,7 +981,7 @@ collect_mysql_show_replica_hosts () {
 
    local replicas='replicas'
    if [ "$version" '<' "8.1" ]; then
-      replicas='slave hosts'
+      replicas='slave hosts';
    fi
 
    $CMD_MYSQL $EXT_ARGV -ssE -e "SHOW ${replicas}" 2>/dev/null
@@ -995,8 +995,8 @@ collect_source_logs_status () {
    local source_log='binary'
    local source_status='binary log'
    if [ "$version" '<' "8.1" ]; then
-      source_log = 'master'
-      source_status = 'master'
+      source_log='master';
+      source_status='master';
    fi
    $CMD_MYSQL $EXT_ARGV -ss -e "SHOW ${source_log} LOGS" > "$source_logs_file" 2>/dev/null
    $CMD_MYSQL $EXT_ARGV -ss -e "SHOW ${source_status} STATUS" > "$source_status_file" 2>/dev/null
diff --git a/bin/pt-online-schema-change b/bin/pt-online-schema-change
index 54d7632b6..7dd929205 100755
--- a/bin/pt-online-schema-change
+++ b/bin/pt-online-schema-change
@@ -4487,8 +4487,10 @@ sub _find_replicas_by_hosts {
 
    my $vp = VersionParser->new($dbh);
    my $sql = 'SHOW REPLICAS';
+   my $source_name = 'source';
    if ( $vp < '8.1' || $vp->flavor() =~ m/maria/ ) {
       $sql = 'SHOW SLAVE HOSTS';
+      $source_name='master';
    }
    
    PTDEBUG && _d($dbh, $sql);
@@ -4504,7 +4506,7 @@ sub _find_replicas_by_hosts {
             . ( $hash{password} ? ",p=$hash{password}" : '');
          my $dsn           = $dsn_parser->parse($spec, $dsn);
          $dsn->{server_id} = $hash{server_id};
-         $dsn->{source_id} = $hash{source_id};
+         $dsn->{source_id} = $hash{"${source_name}_id"};
          $dsn->{source}    = 'hosts';
          $dsn;
       } @replicas;
@@ -4583,9 +4585,9 @@ sub is_source_of {
          . "but the source's port is $port";
    }
 
-   if ( !grep { $replica_status->{source_user} eq $_->{user} } @connected ) {
+   if ( !grep { $replica_status->{"${source_name}_user"} eq $_->{user} } @connected ) {
       die "I don't see any replica I/O thread connected with user "
-         . $replica_status->{source_user};
+         . $replica_status->{"${source_name}_user"};
    }
 
    if ( ($replica_status->{replica_io_state} || '')
diff --git a/bin/pt-query-digest b/bin/pt-query-digest
index 45a0b6d06..e6bbfbdab 100755
--- a/bin/pt-query-digest
+++ b/bin/pt-query-digest
@@ -10793,8 +10793,10 @@ sub _find_replicas_by_hosts {
 
    my $vp = VersionParser->new($dbh);
    my $sql = 'SHOW REPLICAS';
+   my $source_name = 'source';
    if ( $vp < '8.1' || $vp->flavor() =~ m/maria/ ) {
       $sql = 'SHOW SLAVE HOSTS';
+      $source_name='master';
    }
    
    PTDEBUG && _d($dbh, $sql);
@@ -10810,7 +10812,7 @@ sub _find_replicas_by_hosts {
             . ( $hash{password} ? ",p=$hash{password}" : '');
          my $dsn           = $dsn_parser->parse($spec, $dsn);
          $dsn->{server_id} = $hash{server_id};
-         $dsn->{source_id} = $hash{source_id};
+         $dsn->{source_id} = $hash{"${source_name}_id"};
          $dsn->{source}    = 'hosts';
          $dsn;
       } @replicas;
@@ -10889,9 +10891,9 @@ sub is_source_of {
          . "but the source's port is $port";
    }
 
-   if ( !grep { $replica_status->{source_user} eq $_->{user} } @connected ) {
+   if ( !grep { $replica_status->{"${source_name}_user"} eq $_->{user} } @connected ) {
       die "I don't see any replica I/O thread connected with user "
-         . $replica_status->{source_user};
+         . $replica_status->{"${source_name}_user"};
    }
 
    if ( ($replica_status->{replica_io_state} || '')
diff --git a/bin/pt-slave-find b/bin/pt-slave-find
index 294a5ea59..0443c9ba8 100755
--- a/bin/pt-slave-find
+++ b/bin/pt-slave-find
@@ -2524,8 +2524,10 @@ sub _find_replicas_by_hosts {
 
    my $vp = VersionParser->new($dbh);
    my $sql = 'SHOW REPLICAS';
+   my $source_name = 'source';
    if ( $vp < '8.1' || $vp->flavor() =~ m/maria/ ) {
       $sql = 'SHOW SLAVE HOSTS';
+      $source_name='master';
    }
    
    PTDEBUG && _d($dbh, $sql);
@@ -2541,7 +2543,7 @@ sub _find_replicas_by_hosts {
             . ( $hash{password} ? ",p=$hash{password}" : '');
          my $dsn           = $dsn_parser->parse($spec, $dsn);
          $dsn->{server_id} = $hash{server_id};
-         $dsn->{source_id} = $hash{source_id};
+         $dsn->{source_id} = $hash{"${source_name}_id"};
          $dsn->{source}    = 'hosts';
          $dsn;
       } @replicas;
@@ -2620,9 +2622,9 @@ sub is_source_of {
          . "but the source's port is $port";
    }
 
-   if ( !grep { $replica_status->{source_user} eq $_->{user} } @connected ) {
+   if ( !grep { $replica_status->{"${source_name}_user"} eq $_->{user} } @connected ) {
       die "I don't see any replica I/O thread connected with user "
-         . $replica_status->{source_user};
+         . $replica_status->{"${source_name}_user"};
    }
 
    if ( ($replica_status->{replica_io_state} || '')
diff --git a/bin/pt-slave-restart b/bin/pt-slave-restart
index 987749161..0ac6d9025 100755
--- a/bin/pt-slave-restart
+++ b/bin/pt-slave-restart
@@ -2935,8 +2935,10 @@ sub _find_replicas_by_hosts {
 
    my $vp = VersionParser->new($dbh);
    my $sql = 'SHOW REPLICAS';
+   my $source_name = 'source';
    if ( $vp < '8.1' || $vp->flavor() =~ m/maria/ ) {
       $sql = 'SHOW SLAVE HOSTS';
+      $source_name='master';
    }
    
    PTDEBUG && _d($dbh, $sql);
@@ -2952,7 +2954,7 @@ sub _find_replicas_by_hosts {
             . ( $hash{password} ? ",p=$hash{password}" : '');
          my $dsn           = $dsn_parser->parse($spec, $dsn);
          $dsn->{server_id} = $hash{server_id};
-         $dsn->{source_id} = $hash{source_id};
+         $dsn->{source_id} = $hash{"${source_name}_id"};
          $dsn->{source}    = 'hosts';
          $dsn;
       } @replicas;
@@ -3031,9 +3033,9 @@ sub is_source_of {
          . "but the source's port is $port";
    }
 
-   if ( !grep { $replica_status->{source_user} eq $_->{user} } @connected ) {
+   if ( !grep { $replica_status->{"${source_name}_user"} eq $_->{user} } @connected ) {
       die "I don't see any replica I/O thread connected with user "
-         . $replica_status->{source_user};
+         . $replica_status->{"${source_name}_user"};
    }
 
    if ( ($replica_status->{replica_io_state} || '')
@@ -5518,7 +5520,7 @@ sub watch_server {
 
          # Get master_uuid from SHOW REPLICA STATUS if a UUID is not specified
          # with --source-uuid.
-         my $gtid_uuid = $o->get("${source_name}-uuid");
+         my $gtid_uuid = $o->get("source-uuid");
          if ( !$gtid_uuid ) {
             $gtid_uuid = $stat->{"${source_name}_uuid"};
             die "No ${source_name}_uuid" unless $gtid_uuid;  # shouldn't happen
diff --git a/bin/pt-table-checksum b/bin/pt-table-checksum
index 141bc24bd..110909bf1 100755
--- a/bin/pt-table-checksum
+++ b/bin/pt-table-checksum
@@ -5442,8 +5442,10 @@ sub _find_replicas_by_hosts {
 
    my $vp = VersionParser->new($dbh);
    my $sql = 'SHOW REPLICAS';
+   my $source_name = 'source';
    if ( $vp < '8.1' || $vp->flavor() =~ m/maria/ ) {
       $sql = 'SHOW SLAVE HOSTS';
+      $source_name='master';
    }
    
    PTDEBUG && _d($dbh, $sql);
@@ -5459,7 +5461,7 @@ sub _find_replicas_by_hosts {
             . ( $hash{password} ? ",p=$hash{password}" : '');
          my $dsn           = $dsn_parser->parse($spec, $dsn);
          $dsn->{server_id} = $hash{server_id};
-         $dsn->{source_id} = $hash{source_id};
+         $dsn->{source_id} = $hash{"${source_name}_id"};
          $dsn->{source}    = 'hosts';
          $dsn;
       } @replicas;
@@ -5538,9 +5540,9 @@ sub is_source_of {
          . "but the source's port is $port";
    }
 
-   if ( !grep { $replica_status->{source_user} eq $_->{user} } @connected ) {
+   if ( !grep { $replica_status->{"${source_name}_user"} eq $_->{user} } @connected ) {
       die "I don't see any replica I/O thread connected with user "
-         . $replica_status->{source_user};
+         . $replica_status->{"${source_name}_user"};
    }
 
    if ( ($replica_status->{replica_io_state} || '')
@@ -6499,11 +6501,11 @@ sub _make_xor_slices {
 
 sub find_replication_differences {
    my ($self, %args) = @_;
-   my @required_args = qw(dbh repl_table);
+   my @required_args = qw(dbh repl_table source_crc_name source_cnt_name);
    foreach my $arg( @required_args ) {
       die "I need a $arg argument" unless $args{$arg};
    }
-   my ($dbh, $repl_table) = @args{@required_args};
+   my ($dbh, $repl_table, $source_crc_name, $source_cnt_name) = @args{@required_args};
 
 
    my $tries = $self->{'OptionParser'}->get('replicate-check-retries') || 1;
@@ -6512,13 +6514,13 @@ sub find_replication_differences {
       my $sql
          = "SELECT CONCAT(db, '.', tbl) AS `table`, "
          . "chunk, chunk_index, lower_boundary, upper_boundary, "
-         . "COALESCE(this_cnt-source_cnt, 0) AS cnt_diff, "
+         . "COALESCE(this_cnt-${source_cnt_name}, 0) AS cnt_diff, "
          . "COALESCE("
-         .   "this_crc <> source_crc OR ISNULL(source_crc) <> ISNULL(this_crc), 0"
-         . ") AS crc_diff, this_cnt, source_cnt, this_crc, source_crc "
+         .   "this_crc <> ${source_crc_name} OR ISNULL(${source_crc_name}) <> ISNULL(this_crc), 0"
+         . ") AS crc_diff, this_cnt, ${source_cnt_name}, this_crc, ${source_crc_name} "
          . "FROM $repl_table "
-         . "WHERE (source_cnt <> this_cnt OR source_crc <> this_crc "
-         .        "OR ISNULL(source_crc) <> ISNULL(this_crc)) "
+         . "WHERE (${source_cnt_name} <> this_cnt OR ${source_crc_name} <> this_crc "
+         .        "OR ISNULL(${source_crc_name}) <> ISNULL(this_crc)) "
          . ($args{where} ? " AND ($args{where})" : "");
       PTDEBUG && _d($sql);
       $diffs = $dbh->selectall_arrayref($sql, { Slice => {} });
@@ -10558,6 +10560,9 @@ sub main {
    my $update_sth; # update source_cnt and source_cnt in repl table
    my $delete_sth; # delete checksums for one db.tbl from repl table
 
+   my ($source_crc_name, $source_cnt_name); # do we use legacy checksum table definition?
+
+
    if ( $o->get('truncate-replicate-table') ) {
        eval {
            $source_dbh->do("TRUNCATE TABLE $repl_table");
@@ -10829,45 +10834,6 @@ sub main {
          }
       }
 
-      # #####################################################################
-      # Possibly check replication replicas and exit.
-      # #####################################################################
-      if ( $o->get('replicate-check') && $o->get('replicate-check-only') ) {
-         PTDEBUG && _d('Will --replicate-check and exit');
-
-         # --plugin hook
-         if ( $plugin && $plugin->can('before_replicate_check') ) {
-            $plugin->before_replicate_check();
-         }
-
-         foreach my $replica ( @$replicas ) {
-            my $diffs = $rc->find_replication_differences(
-               dbh        => $replica->dbh(),
-               repl_table => $repl_table,
-            );
-            PTDEBUG && _d(scalar @$diffs, 'checksum diffs on',
-               $replica->name());
-            $diffs = filter_tables_replicate_check_only($diffs, $o);
-            if ( @$diffs ) {
-               $exit_status |= $PTC_EXIT_STATUS{TABLE_DIFF};
-               if ( $o->get('quiet') < 2 ) {
-                  print_checksum_diffs(
-                     cxn   => $replica,
-                     diffs => $diffs,
-                  );
-               }
-            }
-         }
-
-         # --plugin hook
-         if ( $plugin && $plugin->can('after_replicate_check') ) {
-            $plugin->after_replicate_check();
-         }
-
-         PTDEBUG && _d('Exit status', $exit_status, 'oktorun', $oktorun);
-         return $exit_status;
-      }
-
       # #####################################################################
       # Check for replication filters.
       # #####################################################################
@@ -10904,10 +10870,10 @@ sub main {
       # Check that the replication table exists, or possibly create it.
       # #####################################################################
       eval {
-         check_repl_table(
+         ($source_crc_name, $source_cnt_name) = check_repl_table(
             dbh          => $source_dbh,
             repl_table   => $repl_table,
-            replicas       => $replicas,
+            replicas     => $replicas,
             have_time    => $have_time,
             OptionParser => $o,
             TableParser  => $tp,
@@ -10918,6 +10884,47 @@ sub main {
          die ts($EVAL_ERROR);
       }
 
+      # #####################################################################
+      # Possibly check replication replicas and exit.
+      # #####################################################################
+      if ( $o->get('replicate-check') && $o->get('replicate-check-only') ) {
+         PTDEBUG && _d('Will --replicate-check and exit');
+
+         # --plugin hook
+         if ( $plugin && $plugin->can('before_replicate_check') ) {
+            $plugin->before_replicate_check();
+         }
+
+         foreach my $replica ( @$replicas ) {
+            my $diffs = $rc->find_replication_differences(
+               dbh             => $replica->dbh(),
+               repl_table      => $repl_table,
+               source_crc_name => $source_crc_name,
+               source_cnt_name => $source_cnt_name,
+            );
+            PTDEBUG && _d(scalar @$diffs, 'checksum diffs on',
+               $replica->name());
+            $diffs = filter_tables_replicate_check_only($diffs, $o);
+            if ( @$diffs ) {
+               $exit_status |= $PTC_EXIT_STATUS{TABLE_DIFF};
+               if ( $o->get('quiet') < 2 ) {
+                  print_checksum_diffs(
+                     cxn   => $replica,
+                     diffs => $diffs,
+                  );
+               }
+            }
+         }
+
+         # --plugin hook
+         if ( $plugin && $plugin->can('after_replicate_check') ) {
+            $plugin->after_replicate_check();
+         }
+
+         PTDEBUG && _d('Exit status', $exit_status, 'oktorun', $oktorun);
+         return $exit_status;
+      }
+
       # #####################################################################
       # Make a ReplicaLagWaiter to help wait for replicas after each chunk.
       # #####################################################################
@@ -11037,7 +11044,7 @@ sub main {
          "SELECT this_crc, this_cnt FROM $repl_table "
          . "WHERE db = ? AND tbl = ? AND chunk = ?");
       $update_sth = $source_dbh->prepare(
-         "UPDATE $repl_table SET chunk_time = ?, ${source_name}_crc = ?, ${source_name}_cnt = ? "
+         "UPDATE $repl_table SET chunk_time = ?, ${source_crc_name} = ?, ${source_cnt_name} = ? "
          . "WHERE db = ? AND tbl = ? AND chunk = ?");
       $delete_sth = $source_dbh->prepare(
          "DELETE FROM $repl_table WHERE db = ? AND tbl = ?");
@@ -11074,8 +11081,9 @@ sub main {
    my $last_chunk;
    if ( $o->get('resume') ) {
       $last_chunk = last_chunk(
-         dbh        => $source_dbh,
-         repl_table => $repl_table,
+         dbh             => $source_dbh,
+         repl_table      => $repl_table,
+         source_cnt_name => $source_cnt_name,
       );
    }
 
@@ -11567,14 +11575,14 @@ sub main {
                 wait_for_replicas(source_dbh => $args{Cxn}->dbh(), source_replica => $ms, replicas => $replicas);
             }
             wait_for_last_checksum(
-               tbl          => $tbl,
-               repl_table   => $repl_table,
-               replicas       => $replicas,
-               max_chunk    => $max_chunk,
-               check_pr     => $check_pr,
-               have_time    => $have_time,
-               OptionParser => $o,
-               source_name  => $source_name,
+               tbl             => $tbl,
+               repl_table      => $repl_table,
+               replicas        => $replicas,
+               max_chunk       => $max_chunk,
+               check_pr        => $check_pr,
+               have_time       => $have_time,
+               OptionParser    => $o,
+               source_crc_name => $source_crc_name,
             );
 
             # Check each replica for checksum diffs.
@@ -11585,6 +11593,8 @@ sub main {
                      dbh        => $replica->dbh(),
                      repl_table => $repl_table,
                      where      => "db='$tbl->{db}' AND tbl='$tbl->{tbl}'",
+                     source_crc_name => $source_crc_name,
+                     source_cnt_name => $source_cnt_name,
                   );
                   PTDEBUG && _d(scalar @$diffs, 'checksum diffs on',
                      $replica->name());
@@ -12328,9 +12338,24 @@ sub check_repl_table {
       }
    }
 
+   my $create_table = $tp->get_create_table( $dbh, $db, $tbl );
+   my $source_crc_name = 'source_crc';
+   my $source_cnt_name = 'source_cnt';
+
+   if ( $create_table =~ /master_crc/si
+      || $create_table =~ /master_cnt/si )
+   {
+      warn "The current checksum table uses deprecated column names. Support for these names "
+      . "will be occasionally removed. Please update the table definition with command:\n"
+      . "ALTER TABLE `$db`.`$tbl` RENAME COLUMN master_crc TO source_crc, "
+      . "RENAME COLUMN master_cnt TO source_cnt;\n";
+
+      $source_crc_name = 'master_crc';
+      $source_cnt_name = 'master_cnt';
+   }
+
    if ( $o->get('binary-index') ) {
       PTDEBUG && _d('--binary-index : checking if replicate table has binary type columns');
-      my $create_table = $tp->get_create_table( $dbh, $db, $tbl );
       if (  $create_table !~ /lower_boundary`?\s+BLOB/si
          || $create_table !~ /upper_boundary`?\s+BLOB/si )
       {
@@ -12340,7 +12365,7 @@ sub check_repl_table {
       }
    }
 
-   return;  # success, repl table is ready to go
+   return ($source_crc_name, $source_cnt_name);  # success, repl table is ready to go
 }
 
 # Check that db.tbl exists on all replicas and has the checksum cols,
@@ -12578,16 +12603,16 @@ sub explain_statement {
 
 sub last_chunk {
    my (%args) = @_;
-   my @required_args = qw(dbh repl_table);
+   my @required_args = qw(dbh repl_table source_cnt_name);
    my $source_name = $args{source_name} ? $args{source_name} : 'source';
    foreach my $arg ( @required_args ) {
       die "I need a $arg argument" unless $args{$arg};
    }
-   my ($dbh, $repl_table, $q) = @args{@required_args};
+   my ($dbh, $repl_table, $source_cnt_name) = @args{@required_args};
    PTDEBUG && _d('Getting last chunk for --resume');
 
    my $sql = "SELECT * FROM $repl_table FORCE INDEX (ts_db_tbl) "
-           . "WHERE ${source_name}_cnt IS NOT NULL "
+           . "WHERE ${source_cnt_name} IS NOT NULL "
            . "ORDER BY ts DESC, db DESC, tbl DESC LIMIT 1";
    PTDEBUG && _d($sql);
    my $sth = $dbh->prepare($sql);
@@ -12660,13 +12685,12 @@ sub wait_for_replicas {
 
 sub wait_for_last_checksum {
    my (%args) = @_;
-   my @required_args = qw(tbl repl_table replicas max_chunk have_time OptionParser);
+   my @required_args = qw(tbl repl_table replicas max_chunk have_time OptionParser source_crc_name);
    foreach my $arg ( @required_args ) {
       die "I need a $arg argument" unless defined $args{$arg};
    }
-   my ($tbl, $repl_table, $replicas, $max_chunk, $have_time, $o) = @args{@required_args};
+   my ($tbl, $repl_table, $replicas, $max_chunk, $have_time, $o, $source_crc_name) = @args{@required_args};
    my $check_pr = $args{check_pr};
-   my $source_name = $args{source_name} ? $args{source_name} : 'source';
 
    # Requiring "AND source_crc IS NOT NULL" avoids a race condition
    # when the system is fast but replication is slow.  In such cases,
@@ -12674,7 +12698,7 @@ sub wait_for_last_checksum {
    # replicates; this causes a false-positive diff.
    my $sql = "SELECT MAX(chunk) FROM $repl_table "
            . "WHERE db='$tbl->{db}' AND tbl='$tbl->{tbl}' "
-           . "AND ${source_name}_crc IS NOT NULL";
+           . "AND ${source_crc_name} IS NOT NULL";
    PTDEBUG && _d($sql);
 
    my $sleep_time = 0;
diff --git a/bin/pt-table-sync b/bin/pt-table-sync
index 8df575acb..f99e4bbc6 100755
--- a/bin/pt-table-sync
+++ b/bin/pt-table-sync
@@ -6953,8 +6953,10 @@ sub _find_replicas_by_hosts {
 
    my $vp = VersionParser->new($dbh);
    my $sql = 'SHOW REPLICAS';
+   my $source_name = 'source';
    if ( $vp < '8.1' || $vp->flavor() =~ m/maria/ ) {
       $sql = 'SHOW SLAVE HOSTS';
+      $source_name='master';
    }
    
    PTDEBUG && _d($dbh, $sql);
@@ -6970,7 +6972,7 @@ sub _find_replicas_by_hosts {
             . ( $hash{password} ? ",p=$hash{password}" : '');
          my $dsn           = $dsn_parser->parse($spec, $dsn);
          $dsn->{server_id} = $hash{server_id};
-         $dsn->{source_id} = $hash{source_id};
+         $dsn->{source_id} = $hash{"${source_name}_id"};
          $dsn->{source}    = 'hosts';
          $dsn;
       } @replicas;
@@ -7049,9 +7051,9 @@ sub is_source_of {
          . "but the source's port is $port";
    }
 
-   if ( !grep { $replica_status->{source_user} eq $_->{user} } @connected ) {
+   if ( !grep { $replica_status->{"${source_name}_user"} eq $_->{user} } @connected ) {
       die "I don't see any replica I/O thread connected with user "
-         . $replica_status->{source_user};
+         . $replica_status->{"${source_name}_user"};
    }
 
    if ( ($replica_status->{replica_io_state} || '')
@@ -10349,7 +10351,7 @@ sub main {
 
          # We should not die if replica connected via tunnel or port redirection
          if ( $EVAL_ERROR ) {
-            $EVAL_ERROR =~ m/The ${replica_name} is connected to (\d+) but the ${source_name}'s port is \d+/;
+            $EVAL_ERROR =~ m/The ${replica_name} is connected to (\d+) but the source's port is \d+/;
             if ( !$1 || $1 != $dsns[0]->{P} ) {
                die $EVAL_ERROR;
             }
diff --git a/lib/MasterSlave.pm b/lib/MasterSlave.pm
index fcd725fa5..ab5d28ca9 100644
--- a/lib/MasterSlave.pm
+++ b/lib/MasterSlave.pm
@@ -339,8 +339,10 @@ sub _find_replicas_by_hosts {
 
    my $vp = VersionParser->new($dbh);
    my $sql = 'SHOW REPLICAS';
+   my $source_name = 'source';
    if ( $vp < '8.1' || $vp->flavor() =~ m/maria/ ) {
       $sql = 'SHOW SLAVE HOSTS';
+      $source_name='master';
    }
    
    PTDEBUG && _d($dbh, $sql);
@@ -357,7 +359,7 @@ sub _find_replicas_by_hosts {
             . ( $hash{password} ? ",p=$hash{password}" : '');
          my $dsn           = $dsn_parser->parse($spec, $dsn);
          $dsn->{server_id} = $hash{server_id};
-         $dsn->{source_id} = $hash{source_id};
+         $dsn->{source_id} = $hash{"${source_name}_id"};
          $dsn->{source}    = 'hosts';
          $dsn;
       } @replicas;
@@ -446,9 +448,9 @@ sub is_source_of {
          . "but the source's port is $port";
    }
 
-   if ( !grep { $replica_status->{source_user} eq $_->{user} } @connected ) {
+   if ( !grep { $replica_status->{"${source_name}_user"} eq $_->{user} } @connected ) {
       die "I don't see any replica I/O thread connected with user "
-         . $replica_status->{source_user};
+         . $replica_status->{"${source_name}_user"};
    }
 
    if ( ($replica_status->{replica_io_state} || '')
diff --git a/lib/RowChecksum.pm b/lib/RowChecksum.pm
index 36b254dd2..772754de7 100644
--- a/lib/RowChecksum.pm
+++ b/lib/RowChecksum.pm
@@ -471,11 +471,11 @@ sub _make_xor_slices {
 # Queries the replication table for chunks that differ from the source's data.
 sub find_replication_differences {
    my ($self, %args) = @_;
-   my @required_args = qw(dbh repl_table);
+   my @required_args = qw(dbh repl_table source_crc_name source_cnt_name);
    foreach my $arg( @required_args ) {
       die "I need a $arg argument" unless $args{$arg};
    }
-   my ($dbh, $repl_table) = @args{@required_args};
+   my ($dbh, $repl_table, $source_crc_name, $source_cnt_name) = @args{@required_args};
 
 
    my $tries = $self->{'OptionParser'}->get('replicate-check-retries') || 1;
@@ -484,13 +484,13 @@ sub find_replication_differences {
       my $sql
          = "SELECT CONCAT(db, '.', tbl) AS `table`, "
          . "chunk, chunk_index, lower_boundary, upper_boundary, "
-         . "COALESCE(this_cnt-source_cnt, 0) AS cnt_diff, "
+         . "COALESCE(this_cnt-${source_cnt_name}, 0) AS cnt_diff, "
          . "COALESCE("
-         .   "this_crc <> source_crc OR ISNULL(source_crc) <> ISNULL(this_crc), 0"
-         . ") AS crc_diff, this_cnt, source_cnt, this_crc, source_crc "
+         .   "this_crc <> ${source_crc_name} OR ISNULL(${source_crc_name}) <> ISNULL(this_crc), 0"
+         . ") AS crc_diff, this_cnt, ${source_cnt_name}, this_crc, ${source_crc_name} "
          . "FROM $repl_table "
-         . "WHERE (source_cnt <> this_cnt OR source_crc <> this_crc "
-         .        "OR ISNULL(source_crc) <> ISNULL(this_crc)) "
+         . "WHERE (${source_cnt_name} <> this_cnt OR ${source_crc_name} <> this_crc "
+         .        "OR ISNULL(${source_crc_name}) <> ISNULL(this_crc)) "
          . ($args{where} ? " AND ($args{where})" : "");
       PTDEBUG && _d($sql);
       $diffs = $dbh->selectall_arrayref($sql, { Slice => {} });
diff --git a/lib/bash/collect_mysql_info.sh b/lib/bash/collect_mysql_info.sh
index 4b8c065d8..454333f10 100644
--- a/lib/bash/collect_mysql_info.sh
+++ b/lib/bash/collect_mysql_info.sh
@@ -153,7 +153,7 @@ collect_mysql_show_replica_hosts () {
 
    local replicas='replicas'
    if [ "$version" '<' "8.1" ]; then
-      replicas='slave hosts'
+      replicas='slave hosts';
    fi
 
    $CMD_MYSQL $EXT_ARGV -ssE -e "SHOW ${replicas}" 2>/dev/null
@@ -167,8 +167,8 @@ collect_source_logs_status () {
    local source_log='binary'
    local source_status='binary log'
    if [ "$version" '<' "8.1" ]; then
-      source_log = 'master'
-      source_status = 'master'
+      source_log='master';
+      source_status='master';
    fi
    $CMD_MYSQL $EXT_ARGV -ss -e "SHOW ${source_log} LOGS" > "$source_logs_file" 2>/dev/null
    $CMD_MYSQL $EXT_ARGV -ss -e "SHOW ${source_status} STATUS" > "$source_status_file" 2>/dev/null
diff --git a/t/lib/MasterSlave.t b/t/lib/MasterSlave.t
index 8fb283886..9bc668f1e 100644
--- a/t/lib/MasterSlave.t
+++ b/t/lib/MasterSlave.t
@@ -88,7 +88,7 @@ PXC_SKIP: {
             source    => 'hosts',
          },
          'get_replicas() from recurse_to_replicas() with a default --recursion-method'
-      );
+      ) or diag(Dumper($slaves->[0]->dsn()));
 
       my ($id) = $slaves->[0]->dbh()->selectrow_array('SELECT @@SERVER_ID');
       is(
@@ -315,15 +315,15 @@ is_deeply(
 # +- 127.0.0.1:slave0
 # |  +- 127.0.0.1:slave1
 # +- 127.0.0.1:slave2
-is($ms->get_replica_status($slaves[0])->{source_port}, $port_for{source}, 'slave 1 port');
-is($ms->get_replica_status($slaves[1])->{source_port}, $port_for{replica0}, 'slave 2 port');
-is($ms->get_replica_status($slaves[2])->{source_port}, $port_for{source}, 'slave 3 port');
+is($ms->get_replica_status($slaves[0])->{"${source_name}_port"}, $port_for{source}, 'slave 1 port');
+is($ms->get_replica_status($slaves[1])->{"${source_name}_port"}, $port_for{replica0}, 'slave 2 port');
+is($ms->get_replica_status($slaves[2])->{"${source_name}_port"}, $port_for{source}, 'slave 3 port');
 
 ok($ms->is_source_of($slaves[0], $slaves[1]), 'slave 1 is slave of slave 0');
 eval {
    $ms->is_source_of($slaves[0], $slaves[2]);
 };
-like($EVAL_ERROR, qr/but the ${source_name}'s port/, 'slave 2 is not slave of slave 0');
+like($EVAL_ERROR, qr/but the source's port/, 'slave 2 is not slave of slave 0') or diag($EVAL_ERROR);
 eval {
    $ms->is_source_of($slaves[2], $slaves[1]);
 };
diff --git a/t/lib/bash/collect_mysql_info.sh b/t/lib/bash/collect_mysql_info.sh
index 191711e16..baced1045 100644
--- a/t/lib/bash/collect_mysql_info.sh
+++ b/t/lib/bash/collect_mysql_info.sh
@@ -163,11 +163,18 @@ cmd_ok \
 # collect_master_logs_status
 
 if [ -n "$(get_var log_bin "$p/mysql-variables")" ]; then
+   mysql_version="$(get_var version "$p/mysql-variables")"
+   source_logs_file="mysql-binary-logs"
+   source_status_file="mysql-binary-log-status"
+   if [ "$mysql_version" '<' "8.1" ]; then
+      source_logs_file='mysql-master-logs'
+      source_status_file='mysql-master-status'
+   fi
    cmd_ok \
-      "test -e $p/mysql-binary-logs" \
+      "test -e $p/$source_logs_file" \
       "If we have a binlog, a file with the master logs should exist"
    cmd_ok \
-      "test -e $p/mysql-binary-log-status" \
+      "test -e $p/$source_status_file" \
       "And likewise for master status"
 else
    skip 1 2 "no binlog"
diff --git a/t/lib/samples/SchemaIterator/all-dbs-tbls-8.0.txt b/t/lib/samples/SchemaIterator/all-dbs-tbls-8.0.txt
index efc6f1cbd..012249de6 100644
--- a/t/lib/samples/SchemaIterator/all-dbs-tbls-8.0.txt
+++ b/t/lib/samples/SchemaIterator/all-dbs-tbls-8.0.txt
@@ -16,7 +16,7 @@ CREATE TABLE `component` (
   `component_group_id` int unsigned NOT NULL,
   `component_urn` text NOT NULL,
   PRIMARY KEY (`component_id`)
-) /*!50100 TABLESPACE `mysql` */ ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 ROW_FORMAT=DYNAMIC COMMENT='Components'
+) /*!50100 TABLESPACE `mysql` */ ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=utf8mb3 ROW_FORMAT=DYNAMIC COMMENT='Components'
 
 mysql.db
 CREATE TABLE `db` (
diff --git a/t/pt-archiver/archive_using_channels.t b/t/pt-archiver/archive_using_channels.t
index 38c056cd6..95a15da7c 100644
--- a/t/pt-archiver/archive_using_channels.t
+++ b/t/pt-archiver/archive_using_channels.t
@@ -68,7 +68,7 @@ is(
     "All rows were loaded into source 1",
 );
 
-my @args = ('--source', $source1_dsn.',D=test,t=t1', '--purge', '--where', sprintf('id >= %d', $num_rows / 2), "--check-${replica_name}-lag", $replica1_dsn);
+my @args = ('--source', $source1_dsn.',D=test,t=t1', '--purge', '--where', sprintf('id >= %d', $num_rows / 2), "--check-replica-lag", $replica1_dsn);
 
 my ($exit_status, $output);
 
@@ -76,8 +76,6 @@ $output = output(
    sub { $exit_status = pt_archiver::main(@args) },
    stderr => 1,
 );
-diag("Exit status: $exit_status") if ($exit_status);
-diag($output);
 
 isnt(
     $exit_status,
@@ -89,7 +87,7 @@ like (
     $output,
     qr/"channel" was not specified/,
     'Message saying channel name must be specified'
-);
+) or diag($output);
 
 push @args, ('--channel', 'sourcechan1');
 
diff --git a/t/pt-heartbeat/multi_update_mode.t b/t/pt-heartbeat/multi_update_mode.t
index 65e1a2ceb..5d69a49b3 100644
--- a/t/pt-heartbeat/multi_update_mode.t
+++ b/t/pt-heartbeat/multi_update_mode.t
@@ -110,7 +110,7 @@ ok(
 );
 
 ok(
-   $rows->{12346}->{"relay_${source_name}_log_file"} && $rows->{12346}->{"exec_${source_name}_log_pos"},
+   $rows->{12346}->{"relay_source_log_file"} && $rows->{12346}->{"exec_source_log_pos"},
    "Replica1 relay_source_log_file and exec_source_log_pos for source"
 ) or diag(Dumper($rows));
 
@@ -144,7 +144,7 @@ ok(
 );
 
 ok(
-   $rows->{12347}->{"relay_${source_name}_log_file"} && $rows->{12347}->{"exec_${source_name}_log_pos"},
+   $rows->{12347}->{"relay_source_log_file"} && $rows->{12347}->{"exec_source_log_pos"},
    "Replica2 relay_source_log_file and exec_source_log_pos for source"
 );
 
diff --git a/t/pt-online-schema-change/basics.t b/t/pt-online-schema-change/basics.t
index 0b5b5ceb0..10fdd296c 100644
--- a/t/pt-online-schema-change/basics.t
+++ b/t/pt-online-schema-change/basics.t
@@ -849,9 +849,9 @@ SKIP: {
 
    like(
       $output,
-      qr/Found 2 replicas.*Successfully altered/si,
+      qr/Found 2 ${replica_name}s.*Successfully altered/si,
       "--recursion-method=dns works"
-   );
+   ) or diag($output);
 
    $source_dbh->do("DROP DATABASE test_recursion_method");
 
diff --git a/t/pt-online-schema-change/samples/stats-execute-5.5.txt b/t/pt-online-schema-change/samples/stats-execute-5.5.txt
index 47e7cd677..51318c502 100644
--- a/t/pt-online-schema-change/samples/stats-execute-5.5.txt
+++ b/t/pt-online-schema-change/samples/stats-execute-5.5.txt
@@ -1,5 +1,5 @@
 No slaves found.  See --recursion-method if host h=127.1,P=12345 has slaves.
-Not checking slave lag because no slaves were found and --check-slave-lag was not specified.
+Not checking slave lag because no slaves were found and --check-replica-lag was not specified.
 Operation, tries, wait:
   analyze_table, 10, 1
   copy_rows, 10, 0.25
diff --git a/t/pt-online-schema-change/samples/stats-execute-5.6.txt b/t/pt-online-schema-change/samples/stats-execute-5.6.txt
index 47e7cd677..51318c502 100644
--- a/t/pt-online-schema-change/samples/stats-execute-5.6.txt
+++ b/t/pt-online-schema-change/samples/stats-execute-5.6.txt
@@ -1,5 +1,5 @@
 No slaves found.  See --recursion-method if host h=127.1,P=12345 has slaves.
-Not checking slave lag because no slaves were found and --check-slave-lag was not specified.
+Not checking slave lag because no slaves were found and --check-replica-lag was not specified.
 Operation, tries, wait:
   analyze_table, 10, 1
   copy_rows, 10, 0.25
diff --git a/t/pt-online-schema-change/samples/stats-execute-5.7.txt b/t/pt-online-schema-change/samples/stats-execute-5.7.txt
index 47e7cd677..51318c502 100644
--- a/t/pt-online-schema-change/samples/stats-execute-5.7.txt
+++ b/t/pt-online-schema-change/samples/stats-execute-5.7.txt
@@ -1,5 +1,5 @@
 No slaves found.  See --recursion-method if host h=127.1,P=12345 has slaves.
-Not checking slave lag because no slaves were found and --check-slave-lag was not specified.
+Not checking slave lag because no slaves were found and --check-replica-lag was not specified.
 Operation, tries, wait:
   analyze_table, 10, 1
   copy_rows, 10, 0.25
diff --git a/t/pt-online-schema-change/samples/stats-execute-8.0.txt b/t/pt-online-schema-change/samples/stats-execute-8.0.txt
index 47e7cd677..51318c502 100644
--- a/t/pt-online-schema-change/samples/stats-execute-8.0.txt
+++ b/t/pt-online-schema-change/samples/stats-execute-8.0.txt
@@ -1,5 +1,5 @@
 No slaves found.  See --recursion-method if host h=127.1,P=12345 has slaves.
-Not checking slave lag because no slaves were found and --check-slave-lag was not specified.
+Not checking slave lag because no slaves were found and --check-replica-lag was not specified.
 Operation, tries, wait:
   analyze_table, 10, 1
   copy_rows, 10, 0.25
diff --git a/t/pt-online-schema-change/slave_lag.t b/t/pt-online-schema-change/slave_lag.t
index 78c603040..8ed942264 100644
--- a/t/pt-online-schema-change/slave_lag.t
+++ b/t/pt-online-schema-change/slave_lag.t
@@ -157,15 +157,15 @@ unlink $filename;
 
 like(
       $output,
-      qr/${replica_name} set to watch has changed/is,
+      qr/Replica set to watch has changed/s,
       "--recursion-method=dsn updates the replica list",
-);
+) or diag($output);
 
 like(
       $output,
-      qr/${replica_name} lag is \d+ seconds on .*  Waiting/is,
+      qr/Replica lag is \d+ seconds on .*  Waiting/s,
       "--recursion-method waits on a replica",
-);
+) or diag($output);
 
 # Repeat the test now using --skip-check-replica-lag
 # Run a full table scan query to ensure the replica is behind the source
diff --git a/t/pt-slave-find/pt-slave-find.t b/t/pt-slave-find/pt-slave-find.t
index 0134cbe69..78b2f4c8d 100644
--- a/t/pt-slave-find/pt-slave-find.t
+++ b/t/pt-slave-find/pt-slave-find.t
@@ -10,6 +10,7 @@ use strict;
 use warnings FATAL => 'all';
 use English qw(-no_match_vars);
 use Test::More;
+use Data::Dumper;
 
 use PerconaTest;
 use Sandbox;
@@ -54,10 +55,10 @@ like($output, qr/Prompt for a password/, 'It compiles');
 # Double check that we're setup correctly.
 my $row = $replica2_dbh->selectall_arrayref("SHOW ${replica_name} STATUS", {Slice => {}});
 is(
-   $row->[0]->{source_port},
+   $row->[0]->{"${source_name}_port"},
    '12346',
    'replica2 is replica of replica1'
-);
+) or diag(Dumper($row));
 
 $output = `$trunk/bin/pt-slave-find -h 127.0.0.1 -P 12345 -u msandbox -p msandbox s=1 --report-format hostname`;
 my $expected = <<EOF;
diff --git a/t/pt-table-checksum/basics.t b/t/pt-table-checksum/basics.t
index 7f9002826..2b1ba33db 100644
--- a/t/pt-table-checksum/basics.t
+++ b/t/pt-table-checksum/basics.t
@@ -442,7 +442,7 @@ $output = output(
 
 like(
    $output,
-   qr/no ${replica_name}s were found/,
+   qr/no replicas were found/,
    "Warns when no replica are found (bug 1087804)"
 ) or diag($output);
 
diff --git a/t/pt-table-checksum/bugs.t b/t/pt-table-checksum/bugs.t
index 7dd38e300..d2378772d 100644
--- a/t/pt-table-checksum/bugs.t
+++ b/t/pt-table-checksum/bugs.t
@@ -100,7 +100,7 @@ is(
    "Bug 987393 (empty table): no errors"
 );
 
-my $rows = $source_dbh->selectall_arrayref("SELECT db, tbl, chunk, ${source_name}_crc, ${source_name}_cnt FROM percona.checksums ORDER BY db, tbl, chunk");
+my $rows = $source_dbh->selectall_arrayref("SELECT db, tbl, chunk, source_crc, source_cnt FROM percona.checksums ORDER BY db, tbl, chunk");
 is_deeply(
    $rows,
    [
diff --git a/t/pt-table-checksum/issue_1485195.t b/t/pt-table-checksum/issue_1485195.t
index c18ff336d..2d9646a5d 100644
--- a/t/pt-table-checksum/issue_1485195.t
+++ b/t/pt-table-checksum/issue_1485195.t
@@ -42,13 +42,13 @@ $output = output(
 
 # We do not count these tables by default, because their presense depends from 
 # previously running tests
-my $extra_tables = $dbh->selectrow_arrayref("select count(*) from percona_test.checksums where db_tbl in ('mysql.plugin', 'mysql.func', 'mysql.proxies_priv');")->[0];
+my $extra_tables = $dbh->selectrow_arrayref("select count(*) from percona_test.checksums where db_tbl in ('mysql.plugin', 'mysql.func', 'mysql.proxies_priv', 'mysql.component');")->[0];
 
 is(
    PerconaTest::count_checksum_results($output, 'rows'),
    $sandbox_version ge '8.0' ? 28 + $extra_tables : $sandbox_version lt '5.7' ? 24 : 23  + $extra_tables,
    "Large BLOB/TEXT/BINARY Checksum"
-);
+) or diag($output);
 
 # #############################################################################
 # Done.
diff --git a/t/pt-table-checksum/replication_filters.t b/t/pt-table-checksum/replication_filters.t
index 8b8958e28..320a92495 100644
--- a/t/pt-table-checksum/replication_filters.t
+++ b/t/pt-table-checksum/replication_filters.t
@@ -93,7 +93,7 @@ is(
    PerconaTest::get_source_binlog_pos($source_dbh),
    $pos,
    "Did not checksum with replication filter"
-);
+) or diag($output);
 
 like(
    $output,
diff --git a/t/pt-table-checksum/resume.t b/t/pt-table-checksum/resume.t
index 7c99ae9c5..d9b7fe854 100644
--- a/t/pt-table-checksum/resume.t
+++ b/t/pt-table-checksum/resume.t
@@ -241,7 +241,7 @@ my $second_half = [
    [qw(sakila store 1 2 )],
 ];
 
-$row = $source_dbh->selectall_arrayref("select db, tbl, chunk, ${source_name}_cnt from percona.checksums order by db, tbl");
+$row = $source_dbh->selectall_arrayref("select db, tbl, chunk, source_cnt from percona.checksums order by db, tbl");
 is_deeply(
    $row,
    $first_half,
@@ -253,7 +253,7 @@ $output = output(
       qw(--chunk-time 0)) },
 );
 
-$row = $source_dbh->selectall_arrayref("select db, tbl, chunk, ${source_name}_cnt from percona.checksums order by db, tbl");
+$row = $source_dbh->selectall_arrayref("select db, tbl, chunk, source_cnt from percona.checksums order by db, tbl");
 is_deeply(
    $row,
    [
@@ -306,7 +306,7 @@ is(
 load_data_infile("sakila-done-1k-chunks", "ts='2011-10-15 13:00:57'");
 $source_dbh->do("delete from percona.checksums where ts > '2011-10-15 13:00:38'");
 
-$row = $source_dbh->selectall_arrayref("select db, tbl, chunk, ${source_name}_cnt from percona.checksums order by db, tbl");
+$row = $source_dbh->selectall_arrayref("select db, tbl, chunk, source_cnt from percona.checksums order by db, tbl");
 is_deeply(
    $row,
    [
@@ -332,7 +332,7 @@ $output = output(
       qw(--chunk-time 0)) },
 );
 
-$row = $source_dbh->selectall_arrayref("select db, tbl, chunk, ${source_name}_cnt from percona.checksums order by db, tbl");
+$row = $source_dbh->selectall_arrayref("select db, tbl, chunk, source_cnt from percona.checksums order by db, tbl");
 is_deeply(
    $row,
    [
@@ -378,7 +378,7 @@ is(
 # ############################################################################
 load_data_infile("sakila-done-1k-chunks", "ts='2011-10-15 13:00:57'");
 $source_dbh->do("delete from percona.checksums where ts > '2011-10-15 13:00:50'");
-$source_dbh->do("update percona.checksums set ${source_name}_crc=NULL, ${source_name}_cnt=NULL, ts='2011-11-11 11:11:11' where db='sakila' and tbl='rental' and chunk=12");
+$source_dbh->do("update percona.checksums set source_crc=NULL, source_cnt=NULL, ts='2011-11-11 11:11:11' where db='sakila' and tbl='rental' and chunk=12");
 
 # Checksum table now ends with:
 #    *************************** 49. row ***************************
@@ -413,7 +413,7 @@ $source_dbh->do("update percona.checksums set ${source_name}_crc=NULL, ${source_
 
 my $chunk11 = $source_dbh->selectall_arrayref(q{select * from percona.checksums where db='sakila' and tbl='rental' and chunk=11});
 
-my $chunk12 = $source_dbh->selectall_arrayref(qq{select ${source_name}_crc from percona.checksums where db='sakila' and tbl='rental' and chunk=12});
+my $chunk12 = $source_dbh->selectall_arrayref(qq{select source_crc from percona.checksums where db='sakila' and tbl='rental' and chunk=12});
 is(
    $chunk12->[0]->[0],
    undef,
@@ -426,7 +426,7 @@ $output = output(
    trf => sub { return PerconaTest::normalize_checksum_results(@_) },
 );
 
-$row = $source_dbh->selectall_arrayref("select db, tbl, chunk, ${source_name}_cnt from percona.checksums order by db, tbl");
+$row = $source_dbh->selectall_arrayref("select db, tbl, chunk, source_cnt from percona.checksums order by db, tbl");
 is_deeply(
    $row,
    [
@@ -455,7 +455,7 @@ is_deeply(
    "Chunk 11 not updated"
 );
 
-$chunk12 = $source_dbh->selectall_arrayref(qq{select ${source_name}_crc, ${source_name}_cnt from percona.checksums where db='sakila' and tbl='rental' and chunk=12});
+$chunk12 = $source_dbh->selectall_arrayref(qq{select source_crc, source_cnt from percona.checksums where db='sakila' and tbl='rental' and chunk=12});
 ok(
    defined $chunk12->[0]->[0],
    "Chunk 12 source_crc updated"
diff --git a/t/pt-table-checksum/samples/default-results-8.0.txt b/t/pt-table-checksum/samples/default-results-8.0.txt
index b6ab161b3..019a094f9 100644
--- a/t/pt-table-checksum/samples/default-results-8.0.txt
+++ b/t/pt-table-checksum/samples/default-results-8.0.txt
@@ -2,7 +2,7 @@ if all tables checksummed
 checksum ...   
 ERRORS DIFFS ROWS SKIPPED TABLE
 0 0 0 0 mysql.columns_priv
-0 0 0 0 mysql.component
+0 0 1 0 mysql.component
 0 0 2 0 mysql.db
 0 0 0 0 mysql.default_roles
 0 1 2 0 mysql.engine_cost

From 194bb99ef939eb741708e1729a5157314cc8b93f Mon Sep 17 00:00:00 2001
From: Sveta Smirnova <sveta.smirnova@percona.com>
Date: Sun, 25 Aug 2024 04:36:37 +0300
Subject: [PATCH 12/31] PT-2340 - Support MySQL 8.4

- Fixed 5.7 tests
---
 sandbox/replica_channels_t-legacy.sql  | 15 +++++++++++++
 sandbox/replica_channels_t.sql         | 13 +++++++++++
 t/lib/MasterSlave.t                    | 12 +++++++---
 t/lib/TableParser.t                    | 18 +++++++--------
 t/pt-archiver/archive_using_channels.t | 12 +++++++---
 t/pt-stalk/pt-stalk.t                  | 31 +++++++++++++++-----------
 t/pt-table-sync/sync_using_channels.t  | 14 ++++++++----
 7 files changed, 83 insertions(+), 32 deletions(-)
 create mode 100644 sandbox/replica_channels_t-legacy.sql
 create mode 100644 sandbox/replica_channels_t.sql

diff --git a/sandbox/replica_channels_t-legacy.sql b/sandbox/replica_channels_t-legacy.sql
new file mode 100644
index 000000000..2ff4fed23
--- /dev/null
+++ b/sandbox/replica_channels_t-legacy.sql
@@ -0,0 +1,15 @@
+STOP SLAVE FOR CHANNEL '';
+SET GLOBAL master_info_repository = 'TABLE';
+SET @@GLOBAL.relay_log_info_repository = 'TABLE';
+SET @@GLOBAL.ENFORCE_GTID_CONSISTENCY=ON;
+SET @@GLOBAL.GTID_MODE = OFF_PERMISSIVE;
+SET @@GLOBAL.GTID_MODE = ON_PERMISSIVE;
+SET @@GLOBAL.GTID_MODE = ON;
+
+CHANGE MASTER TO master_host='127.0.0.1', master_port=2900, master_user='msandbox', master_password='msandbox', master_auto_position=1 FOR CHANNEL 'sourcechan1';
+
+CHANGE MASTER TO master_host='127.0.0.1', master_port=2901, master_user='msandbox', master_password='msandbox', master_auto_position=1 FOR CHANNEL 'sourcechan2';
+
+START SLAVE for channel 'sourcechan1';
+START SLAVE for channel 'sourcechan2';
+
diff --git a/sandbox/replica_channels_t.sql b/sandbox/replica_channels_t.sql
new file mode 100644
index 000000000..9fc04251e
--- /dev/null
+++ b/sandbox/replica_channels_t.sql
@@ -0,0 +1,13 @@
+STOP REPLICA FOR CHANNEL '';
+SET @@GLOBAL.ENFORCE_GTID_CONSISTENCY=ON;
+SET @@GLOBAL.GTID_MODE = OFF_PERMISSIVE;
+SET @@GLOBAL.GTID_MODE = ON_PERMISSIVE;
+SET @@GLOBAL.GTID_MODE = ON;
+
+CHANGE REPLICATION SOURCE TO source_host='127.0.0.1', source_port=2900, source_user='msandbox', source_password='msandbox', source_auto_position=1 FOR CHANNEL 'sourcechan1';
+
+CHANGE REPLICATION SOURCE TO source_host='127.0.0.1', source_port=2901, source_user='msandbox', source_password='msandbox', source_auto_position=1 FOR CHANNEL 'sourcechan2';
+
+START REPLICA for channel 'sourcechan1';
+START REPLICA for channel 'sourcechan2';
+
diff --git a/t/lib/MasterSlave.t b/t/lib/MasterSlave.t
index 9bc668f1e..42a7988d7 100644
--- a/t/lib/MasterSlave.t
+++ b/t/lib/MasterSlave.t
@@ -782,9 +782,15 @@ SKIP: {
    );
    my $slave1_port = $sb->port_for('chan_replica1');
    
-   $sb->load_file('chan_source1', "sandbox/gtid_on.sql", undef, no_wait => 1);
-   $sb->load_file('chan_source2', "sandbox/gtid_on.sql", undef, no_wait => 1);
-   $sb->load_file('chan_replica1', "sandbox/replica_channels.sql", undef, no_wait => 1);
+   if ( $sandbox_version lt '8.1' ) {
+      $sb->load_file('chan_source1', "sandbox/gtid_on-legacy.sql", undef, no_wait => 1);
+      $sb->load_file('chan_source2', "sandbox/gtid_on-legacy.sql", undef, no_wait => 1);
+      $sb->load_file('chan_replica1', "sandbox/replica_channels-legacy.sql", undef, no_wait => 1);
+   } else {
+      $sb->load_file('chan_source1', "sandbox/gtid_on.sql", undef, no_wait => 1);
+      $sb->load_file('chan_source2', "sandbox/gtid_on.sql", undef, no_wait => 1);
+      $sb->load_file('chan_replica1', "sandbox/replica_channels.sql", undef, no_wait => 1);
+   }
                                                              
    my $chan_slaves;
    eval {
diff --git a/t/lib/TableParser.t b/t/lib/TableParser.t
index 173afc4a3..f7371d3b5 100644
--- a/t/lib/TableParser.t
+++ b/t/lib/TableParser.t
@@ -1062,15 +1062,15 @@ SKIP: {
    # We need to create a new server here, otherwise the whole test suite might die
    # if the crashed table can't be dropped.
    
-   my $master3_port = 2900;
-   my $master_basedir = "/tmp/$master3_port";
-   diag(`$trunk/sandbox/stop-sandbox $master3_port >/dev/null`);
-   diag(`$trunk/sandbox/start-sandbox master $master3_port >/dev/null`);
-   my $dbh3 = $sb->get_dbh_for("master3");
+   my $source3_port = 2900;
+   my $source_basedir = "/tmp/$source3_port";
+   diag(`$trunk/sandbox/stop-sandbox $source3_port >/dev/null`);
+   diag(`$trunk/sandbox/start-sandbox source $source3_port >/dev/null`);
+   my $dbh3 = $sb->get_dbh_for("source3");
    
-   $sb->load_file('master3', "t/lib/samples/bug_1047335_crashed_table.sql");
+   $sb->load_file('source3', "t/lib/samples/bug_1047335_crashed_table.sql");
 
-   my $db_dir         = "$master_basedir/data/bug_1047335";
+   my $db_dir         = "$source_basedir/data/bug_1047335";
    my $myi            = glob("$db_dir/crashed_table.[Mm][Yy][Iy]");
    my $frm            = glob("$db_dir/crashed_table.[Ff][Rr][Mm]");
 
@@ -1107,7 +1107,7 @@ SKIP: {
    $dbh3->do(q{CREATE DATABASE bug_1047335_2});
    
    my $broken_frm = "$trunk/t/lib/samples/broken_tbl.frm";
-   my $db_dir_2   = "$master_basedir/data/bug_1047335_2";
+   my $db_dir_2   = "$source_basedir/data/bug_1047335_2";
    
    diag(`cp $broken_frm $db_dir_2 2>&1`);
    
@@ -1119,7 +1119,7 @@ SKIP: {
       "get_create_table dies if SHOW CREATE TABLE failed (using broken_tbl.frm)",
    );
    
-   diag(`$trunk/sandbox/stop-sandbox $master3_port >/dev/null`);
+   diag(`$trunk/sandbox/stop-sandbox $source3_port >/dev/null`);
 }
 
 # #############################################################################
diff --git a/t/pt-archiver/archive_using_channels.t b/t/pt-archiver/archive_using_channels.t
index 95a15da7c..2a4019fdd 100644
--- a/t/pt-archiver/archive_using_channels.t
+++ b/t/pt-archiver/archive_using_channels.t
@@ -45,9 +45,15 @@ my ($replica1_dbh, $replica1_dsn) = $sb->start_sandbox(
 );
 my $replica1_port = $sb->port_for('chan_replica1');
 
-$sb->load_file('chan_source1', "sandbox/gtid_on.sql", undef, no_wait => 1);
-$sb->load_file('chan_source2', "sandbox/gtid_on.sql", undef, no_wait => 1);
-$sb->load_file('chan_replica1', "sandbox/replica_channels.sql", undef, no_wait => 1);
+if ( $sandbox_version lt '8.1' ) {
+   $sb->load_file('chan_source1', "sandbox/gtid_on-legacy.sql", undef, no_wait => 1);
+   $sb->load_file('chan_source2', "sandbox/gtid_on-legacy.sql", undef, no_wait => 1);
+   $sb->load_file('chan_replica1', "sandbox/replica_channels-legacy.sql", undef, no_wait => 1);
+} else {
+   $sb->load_file('chan_source1', "sandbox/gtid_on.sql", undef, no_wait => 1);
+   $sb->load_file('chan_source2', "sandbox/gtid_on.sql", undef, no_wait => 1);
+   $sb->load_file('chan_replica1', "sandbox/replica_channels.sql", undef, no_wait => 1);
+}
 
 my $source1_port = $sb->port_for('chan_source1');
 my $num_rows = 40000;
diff --git a/t/pt-stalk/pt-stalk.t b/t/pt-stalk/pt-stalk.t
index f1cb28a3f..87c383ccf 100644
--- a/t/pt-stalk/pt-stalk.t
+++ b/t/pt-stalk/pt-stalk.t
@@ -775,16 +775,21 @@ SKIP: {
       type   => 'source',
    );
    my $replica1_port = $sb->port_for('chan_replica1');
-   
-   $sb->load_file('chan_source1', "sandbox/gtid_on.sql", undef, no_wait => 1);
-   $sb->load_file('chan_source2', "sandbox/gtid_on.sql", undef, no_wait => 1);
-   $sb->load_file('chan_replica1', "sandbox/replica_channels.sql", undef, no_wait => 1);
+
+   if ( $sandbox_version lt '8.1' ) {
+      $sb->load_file('chan_source1', "sandbox/gtid_on-legacy.sql", undef, no_wait => 1);
+      $sb->load_file('chan_source2', "sandbox/gtid_on-legacy.sql", undef, no_wait => 1);
+      $sb->load_file('chan_replica1', "sandbox/replica_channels_t-legacy.sql", undef, no_wait => 1);
+   } else {
+      $sb->load_file('chan_source1', "sandbox/gtid_on.sql", undef, no_wait => 1);
+      $sb->load_file('chan_source2', "sandbox/gtid_on.sql", undef, no_wait => 1);
+      $sb->load_file('chan_replica1', "sandbox/replica_channels_t.sql", undef, no_wait => 1);
+   }
 
    my $replica_cnf = "/tmp/$replica1_port/my.sandbox.cnf";
    my $cmd = "$trunk/bin/pt-stalk --no-stalk --iterations=1 --host=127.0.0.1 --port=$replica1_port --user=msandbox "
            . "--password=msandbox --sleep 0 --run-time=10 --dest $dest --log $log_file --iterations=1  "
            . "--run-time=2 --pid $pid_file --defaults-file=$replica_cnf >$log_file 2>&1";
-   diag ($cmd);
    system($cmd);
    sleep 5;
    PerconaTest::kill_program(pid_file => $pid_file);
@@ -806,14 +811,14 @@ SKIP: {
    my $cmd = "$trunk/bin/pt-stalk --no-stalk --iterations=1 --host=127.0.0.1 --port=$replica1_port --user=msandbox "
            . "--password=msandbox --sleep 0 --run-time=10 --dest $dest --log $log_file --iterations=1  "
            . "--run-time=2  --pid $pid_file --defaults-file=$cnf >$log_file 2>&1";
-   system($cmd);                                                                 
-   sleep 5;                                                                      
-   PerconaTest::kill_program(pid_file => $pid_file);                             
-                                                                                 
-   $output = `cat $dest/*-${replica_name}-status 2>/dev/null`;                             
-                                                                                 
-   like(                                                                     
-      $output,                                                               
+   system($cmd); 
+   sleep 5; 
+   PerconaTest::kill_program(pid_file => $pid_file); 
+ 
+   $output = `cat $dest/*-${replica_name}-status 2>/dev/null`; 
+
+   like(
+      $output,
       qr/SHOW SLAVE STATUS/,                                                 
       "MySQL 5.6 SLAVE STATUS"                                               
    );
diff --git a/t/pt-table-sync/sync_using_channels.t b/t/pt-table-sync/sync_using_channels.t
index 8ab8674ce..d62dc2c9c 100644
--- a/t/pt-table-sync/sync_using_channels.t
+++ b/t/pt-table-sync/sync_using_channels.t
@@ -45,9 +45,15 @@ my ($replica1_dbh, $replica1_dsn) = $sb->start_sandbox(
 );
 my $replica1_port = $sb->port_for('chan_replica1');
 
-$sb->load_file('chan_source1', "sandbox/gtid_on.sql", undef, no_wait => 1);
-$sb->load_file('chan_source2', "sandbox/gtid_on.sql", undef, no_wait => 1);
-$sb->load_file('chan_replica1', "sandbox/replica_channels.sql", undef, no_wait => 1);
+if ( $sandbox_version lt '8.1' ) {
+   $sb->load_file('chan_source1', "sandbox/gtid_on-legacy.sql", undef, no_wait => 1);
+   $sb->load_file('chan_source2', "sandbox/gtid_on-legacy.sql", undef, no_wait => 1);
+   $sb->load_file('chan_replica1', "sandbox/replica_channels-legacy.sql", undef, no_wait => 1);
+} else {
+   $sb->load_file('chan_source1', "sandbox/gtid_on.sql", undef, no_wait => 1);
+   $sb->load_file('chan_source2', "sandbox/gtid_on.sql", undef, no_wait => 1);
+   $sb->load_file('chan_replica1', "sandbox/replica_channels.sql", undef, no_wait => 1);
+}
                                                           
 my @args = qw(--execute --no-foreign-key-checks --verbose --databases=sakila --tables=actor --sync-to-source --channel=sourcechan1);
 my $exit_status;
@@ -61,7 +67,7 @@ like (
     $output,
     qr/sakila.actor/,
     'Synced actor table'
-);
+) or diag($output);
 
 $sb->stop_sandbox(qw(chan_source1 chan_source2 chan_replica1));
 

From 1006101bb47776e463634764d123c6161169ffd3 Mon Sep 17 00:00:00 2001
From: Sveta Smirnova <sveta.smirnova@percona.com>
Date: Mon, 26 Aug 2024 16:49:42 +0300
Subject: [PATCH 13/31] PT-2340 - Support MySQL 8.4

- Added deprecation warning to pt-slave-delay
- Re-enabled tests for pt-slave-delay to check the warning
- Disabled pt-slave-delay for MySQL 8.1+
---
 bin/pt-slave-delay                  | 206 ++++++++++++++++++++++++++++
 lib/PerconaTest.pm                  |   2 +-
 t/pt-slave-delay/auto_restart.t     |   8 +-
 t/pt-slave-delay/basics.t           |  75 +++++-----
 t/pt-slave-delay/deprecation.t      |  63 +++++++++
 t/pt-slave-delay/issue_1169.t       |   4 +-
 t/pt-slave-delay/standard_options.t |   4 +-
 7 files changed, 320 insertions(+), 42 deletions(-)
 create mode 100644 t/pt-slave-delay/deprecation.t

diff --git a/bin/pt-slave-delay b/bin/pt-slave-delay
index 52193b038..f73bece52 100755
--- a/bin/pt-slave-delay
+++ b/bin/pt-slave-delay
@@ -26,6 +26,7 @@ BEGIN {
       Retry
       HTTP::Micro
       VersionCheck
+      VersionParser
    ));
 }
 
@@ -4293,6 +4294,198 @@ sub _d {
 # End VersionCheck package
 # ###########################################################################
 
+# ###########################################################################
+# VersionParser package
+# This package is a copy without comments from the original.  The original
+# with comments and its test file can be found in the GitHub repository at,
+#   lib/VersionParser.pm
+#   t/lib/VersionParser.t
+# See https://github.com/percona/percona-toolkit for more information.
+# ###########################################################################
+{
+package VersionParser;
+
+use Lmo;
+use Scalar::Util qw(blessed);
+use English qw(-no_match_vars);
+use constant PTDEBUG => $ENV{PTDEBUG} || 0;
+
+use overload (
+   '""'     => "version",
+   '<=>'    => "cmp",
+   'cmp'    => "cmp",
+   fallback => 1,
+);
+
+use Carp ();
+
+has major => (
+    is       => 'ro',
+    isa      => 'Int',
+    required => 1,
+);
+
+has [qw( minor revision )] => (
+    is  => 'ro',
+    isa => 'Num',
+);
+
+has flavor => (
+    is      => 'ro',
+    isa     => 'Str',
+    default => sub { 'Unknown' },
+);
+
+has innodb_version => (
+    is      => 'ro',
+    isa     => 'Str',
+    default => sub { 'NO' },
+);
+
+sub series {
+   my $self = shift;
+   return $self->_join_version($self->major, $self->minor);
+}
+
+sub version {
+   my $self = shift;
+   return $self->_join_version($self->major, $self->minor, $self->revision);
+}
+
+sub is_in {
+   my ($self, $target) = @_;
+
+   return $self eq $target;
+}
+
+sub _join_version {
+    my ($self, @parts) = @_;
+
+    return join ".", map { my $c = $_; $c =~ s/^0\./0/; $c } grep defined, @parts;
+}
+sub _split_version {
+   my ($self, $str) = @_;
+   my @version_parts = map { s/^0(?=\d)/0./; $_ } $str =~ m/(\d+)/g;
+   return @version_parts[0..2];
+}
+
+sub normalized_version {
+   my ( $self ) = @_;
+   my $result = sprintf('%d%02d%02d', map { $_ || 0 } $self->major,
+                                                      $self->minor,
+                                                      $self->revision);
+   PTDEBUG && _d($self->version, 'normalizes to', $result);
+   return $result;
+}
+
+sub comment {
+   my ( $self, $cmd ) = @_;
+   my $v = $self->normalized_version();
+
+   return "/*!$v $cmd */"
+}
+
+my @methods = qw(major minor revision);
+sub cmp {
+   my ($left, $right) = @_;
+   my $right_obj = (blessed($right) && $right->isa(ref($left)))
+                   ? $right
+                   : ref($left)->new($right);
+
+   my $retval = 0;
+   for my $m ( @methods ) {
+      last unless defined($left->$m) && defined($right_obj->$m);
+      $retval = $left->$m <=> $right_obj->$m;
+      last if $retval;
+   }
+   return $retval;
+}
+
+sub BUILDARGS {
+   my $self = shift;
+
+   if ( @_ == 1 ) {
+      my %args;
+      if ( blessed($_[0]) && $_[0]->can("selectrow_hashref") ) {
+         PTDEBUG && _d("VersionParser got a dbh, trying to get the version");
+         my $dbh = $_[0];
+         local $dbh->{FetchHashKeyName} = 'NAME_lc';
+         my $query = eval {
+            $dbh->selectall_arrayref(q/SHOW VARIABLES LIKE 'version%'/, { Slice => {} })
+         };
+         if ( $query ) {
+            $query = { map { $_->{variable_name} => $_->{value} } @$query };
+            @args{@methods} = $self->_split_version($query->{version});
+            $args{flavor} = delete $query->{version_comment}
+                  if $query->{version_comment};
+         }
+         elsif ( eval { ($query) = $dbh->selectrow_array(q/SELECT VERSION()/) } ) {
+            @args{@methods} = $self->_split_version($query);
+         }
+         else {
+            Carp::confess("Couldn't get the version from the dbh while "
+                        . "creating a VersionParser object: $@");
+         }
+         $args{innodb_version} = eval { $self->_innodb_version($dbh) };
+      }
+      elsif ( !ref($_[0]) ) {
+         @args{@methods} = $self->_split_version($_[0]);
+      }
+
+      for my $method (@methods) {
+         delete $args{$method} unless defined $args{$method};
+      }
+      @_ = %args if %args;
+   }
+
+   return $self->SUPER::BUILDARGS(@_);
+}
+
+sub _innodb_version {
+   my ( $self, $dbh ) = @_;
+   return unless $dbh;
+   my $innodb_version = "NO";
+
+   my ($innodb) =
+      grep { $_->{engine} =~ m/InnoDB/i }
+      map  {
+         my %hash;
+         @hash{ map { lc $_ } keys %$_ } = values %$_;
+         \%hash;
+      }
+      @{ $dbh->selectall_arrayref("SHOW ENGINES", {Slice=>{}}) };
+   if ( $innodb ) {
+      PTDEBUG && _d("InnoDB support:", $innodb->{support});
+      if ( $innodb->{support} =~ m/YES|DEFAULT/i ) {
+         my $vars = $dbh->selectrow_hashref(
+            "SHOW VARIABLES LIKE 'innodb_version'");
+         $innodb_version = !$vars ? "BUILTIN"
+                         :          ($vars->{Value} || $vars->{value});
+      }
+      else {
+         $innodb_version = $innodb->{support};  # probably DISABLED or NO
+      }
+   }
+
+   PTDEBUG && _d("InnoDB version:", $innodb_version);
+   return $innodb_version;
+}
+
+sub _d {
+   my ($package, undef, $line) = caller 0;
+   @_ = map { (my $temp = $_) =~ s/\n/\n# /g; $temp; }
+        map { defined $_ ? $_ : 'undef' }
+        @_;
+   print STDERR "# $package:$line $PID ", join(' ', @_), "\n";
+}
+
+no Lmo;
+1;
+}
+# ###########################################################################
+# End VersionParser package
+# ###########################################################################
+
 # ###########################################################################
 # This is a combination of modules and programs in one -- a runnable module.
 # http://www.perl.com/pub/a/2006/07/13/lightning-articles.html?page=last
@@ -4319,6 +4512,8 @@ my $oktorun = 1;
 sub main {
    local @ARGV = @_;  # set global ARGV for this package
 
+   warn "This tool is deprecated and will be removed in future releases.\nUse built-in Delayed Replication instead: https://dev.mysql.com/doc/refman/8.4/en/replication-delayed.html\n\n";
+
    $o = new OptionParser();
    $o->get_specs();
    $o->get_opts();
@@ -4355,6 +4550,13 @@ sub main {
 
    # Connect before daemonizing, in case --ask-pass is needed.
    my $slave_dbh = get_dbh($dp, $slave_dsn);
+
+   # Check version, refuse working with 8.4
+   my $version = VersionParser->new($slave_dbh);
+   if ( $version ge '8.1' && $version->flavor() !~ m/maria/ ) {
+      die "This tool does not work with MySQL 8.1 and newer.\n";
+   }
+
    my $status    = $slave_dbh->selectrow_hashref("SHOW SLAVE STATUS");
    if ( !$status || ! %$status ) {
       die "No SLAVE STATUS found";
@@ -4654,6 +4856,10 @@ if ( !caller ) { exit main(@ARGV); }
 
 pt-slave-delay - Make a MySQL slave server lag behind its master.
 
+This tool is deprecated and will be removed in future releases. It does not support MySQL 8.1 or newer.
+
+Use built-in Delayed Replication instead: https://dev.mysql.com/doc/refman/8.4/en/replication-delayed.html
+
 =head1 SYNOPSIS
 
 Usage: pt-slave-delay [OPTIONS] SLAVE_DSN [MASTER_DSN]
diff --git a/lib/PerconaTest.pm b/lib/PerconaTest.pm
index 720066626..1bb230b31 100644
--- a/lib/PerconaTest.pm
+++ b/lib/PerconaTest.pm
@@ -88,7 +88,7 @@ our $source_status = 'binary log';
 our $source_reset = 'binary logs and gtids';
 our $source_change = 'replication source';
 our $replica_name = 'replica';
-if ( $sandbox_version < '8.1' || ( $ENV{FORK} || "" eq 'mariadb' ) ) {
+if ( $sandbox_version lt '8.1' || ( $ENV{FORK} || "" eq 'mariadb' ) ) {
    $source_name = 'master';
    $source_status = 'master';
    $source_reset = 'master';
diff --git a/t/pt-slave-delay/auto_restart.t b/t/pt-slave-delay/auto_restart.t
index e255e8b50..27d366d6d 100644
--- a/t/pt-slave-delay/auto_restart.t
+++ b/t/pt-slave-delay/auto_restart.t
@@ -22,8 +22,8 @@ my $sb  = Sandbox->new(basedir => '/tmp', DSNParser => $dp);
 my $source_dbh = $sb->get_dbh_for('source');
 my $dbh        = $sb->get_dbh_for('replica1');
 
-if ($sandbox_version ge '5.7') {
-   plan skip_all => 'Use SQL_DELAY';
+if ($sandbox_version ge '8.1') {
+   plan skip_all => 'Tool is not supported. Use SQL_DELAY';
 }
 
 if ( !$dbh ) {
@@ -72,7 +72,7 @@ else {
 # Reap the child.
 waitpid ($pid, 0);
 
-$sb->wait_for_slaves;
+$sb->wait_for_replicas;
 
 # Do it all over again, but this time KILL instead of restart.
 $pid = fork();
@@ -92,7 +92,7 @@ if ( $pid ) {
 else {
    # child. Note that we'll kill the parent's 'mysql' connection
    sleep 1;
-   my $c_dbh = $sb->get_dbh_for('slave1');
+   my $c_dbh = $sb->get_dbh_for('replica1');
    my @cxn = @{$c_dbh->selectall_arrayref('show processlist', {Slice => {}})};
    foreach my $c ( @cxn ) {
       # The parent's connection:
diff --git a/t/pt-slave-delay/basics.t b/t/pt-slave-delay/basics.t
index a968ff6d9..ef0fabdfb 100644
--- a/t/pt-slave-delay/basics.t
+++ b/t/pt-slave-delay/basics.t
@@ -21,8 +21,8 @@ my $master_dbh = $sb->get_dbh_for('source');
 my $slave1_dbh  = $sb->get_dbh_for('replica1');
 my $slave2_dbh  = $sb->get_dbh_for('replica2');
 
-if ($sandbox_version ge '5.7') {
-   plan skip_all => 'Use SQL_DELAY';
+if ($sandbox_version ge '8.1') {
+   plan skip_all => 'Tool is not supported. Use SQL_DELAY';
 }
 
 if ( !$master_dbh ) {
@@ -35,7 +35,7 @@ elsif ( !$slave2_dbh ) {
    plan skip_all => 'Cannot connect to sandbox slave2';
 }
 else {
-   plan tests => 6;
+   plan tests => 7;
 }
 
 my $output;
@@ -43,11 +43,14 @@ my $cnf = '/tmp/12346/my.sandbox.cnf';
 my $cmd = "$trunk/bin/pt-slave-delay -F $cnf h=127.1";
 
 # 1
-$output = `$cmd --help`;
+$output = `$cmd --help 2>&1`;
 like($output, qr/Prompt for a password/, 'It compiles');
 
+# Check deprecation warning
+like($output, qr/This tool is deprecated and will be removed in future releases/, 'Deprecation warning printed') or diag($output);
+
 # #############################################################################
-# 2 Issue 149: h is required even with S, for slavehost argument
+# Issue 149: h is required even with S, for slavehost argument
 # #############################################################################
 $output = `$trunk/bin/pt-slave-delay --run-time 1s --delay 1s --interval 1s S=/tmp/12346/mysql_sandbox12346.sock 2>&1`;
 unlike($output, qr/Missing DSN part 'h'/, 'Does not require h DSN part');
@@ -58,34 +61,40 @@ unlike($output, qr/Missing DSN part 'h'/, 'Does not require h DSN part');
 # easily when you connect to a SLAVE-HOST twice by accident.)  To reproduce,
 # just disable log-bin and log-slave-updates on the slave.
 # #####1#######################################################################
-diag(`cp /tmp/12346/my.sandbox.cnf /tmp/12346/my.sandbox.cnf-original`);
-diag(`sed -i.bak -e '/log-bin/d' -e '/log_slave_updates/d' /tmp/12346/my.sandbox.cnf`);
-diag(`/tmp/12346/stop >/dev/null`);
-diag(`/tmp/12346/start >/dev/null`);
-diag("Sleeping 3 seconds ...");
-sleep(3);
-$slave2_dbh->do('STOP SLAVE');
-$slave2_dbh->do('RESET SLAVE');
-$slave2_dbh->do('START SLAVE');
-
-# 3
-$output = `$trunk/bin/pt-slave-delay --delay 1s h=127.1,P=12346,u=msandbox,p=msandbox h=127.1 2>&1`;
-like(
-   $output,
-   qr/Binary logging is disabled/,
-   'Detects master that is not a master'
-);
-
-diag(`/tmp/12346/stop >/dev/null`);
-diag(`mv /tmp/12346/my.sandbox.cnf-original /tmp/12346/my.sandbox.cnf`);
-diag(`/tmp/12346/start >/dev/null`);
-diag(`/tmp/12346/use -e "set global read_only=1"`);
-
-diag("Sleeping 3 seconds ...");
-sleep(3);
-$slave2_dbh->do('STOP SLAVE');
-$slave2_dbh->do('RESET SLAVE');
-$slave2_dbh->do('START SLAVE');
+SKIP: {
+   if ($sandbox_version ge '8.0') {
+      skip 'Binary log is ON by default in 8.0+';
+   }
+
+   diag(`cp /tmp/12346/my.sandbox.cnf /tmp/12346/my.sandbox.cnf-original`);
+   diag(`sed -i.bak -e '/log-bin/d' -e '/log_slave_updates/d' /tmp/12346/my.sandbox.cnf`);
+   diag(`/tmp/12346/stop >/dev/null`);
+   diag(`/tmp/12346/start >/dev/null`);
+   diag("Sleeping 3 seconds ...");
+   sleep(3);
+   $slave2_dbh->do('STOP SLAVE');
+   $slave2_dbh->do('RESET SLAVE');
+   $slave2_dbh->do('START SLAVE');
+
+   # 3
+   $output = `$trunk/bin/pt-slave-delay --delay 1s h=127.1,P=12346,u=msandbox,p=msandbox h=127.1 2>&1`;
+   like(
+      $output,
+      qr/Binary logging is disabled/,
+      'Detects master that is not a master'
+   );
+
+   diag(`/tmp/12346/stop >/dev/null`);
+   diag(`mv /tmp/12346/my.sandbox.cnf-original /tmp/12346/my.sandbox.cnf`);
+   diag(`/tmp/12346/start >/dev/null`);
+   diag(`/tmp/12346/use -e "set global read_only=1"`);
+
+   diag("Sleeping 3 seconds ...");
+   sleep(3);
+   $slave2_dbh->do('STOP SLAVE');
+   $slave2_dbh->do('RESET SLAVE');
+   $slave2_dbh->do('START SLAVE');
+}
 
 # #############################################################################
 # Check --use-master
diff --git a/t/pt-slave-delay/deprecation.t b/t/pt-slave-delay/deprecation.t
new file mode 100644
index 000000000..a1ff6ddcb
--- /dev/null
+++ b/t/pt-slave-delay/deprecation.t
@@ -0,0 +1,63 @@
+#!/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-slave-delay";
+
+my $dp = new DSNParser(opts=>$dsn_opts);
+my $sb = new Sandbox(basedir => '/tmp', DSNParser => $dp);
+my $master_dbh = $sb->get_dbh_for('source');
+my $slave1_dbh  = $sb->get_dbh_for('replica1');
+my $slave2_dbh  = $sb->get_dbh_for('replica2');
+
+if ($sandbox_version lt '8.1') {
+   plan skip_all => 'Tool is supported.';
+}
+
+if ( !$master_dbh ) {
+   plan skip_all => 'Cannot connect to sandbox master';
+}
+elsif ( !$slave1_dbh ) {
+   plan skip_all => 'Cannot connect to sandbox slave1';
+}
+elsif ( !$slave2_dbh ) {
+   plan skip_all => 'Cannot connect to sandbox slave2';
+}
+else {
+   plan tests => 3;
+}
+
+my $output;
+my $cnf = '/tmp/12346/my.sandbox.cnf';
+my $cmd = "$trunk/bin/pt-slave-delay -F $cnf h=127.1";
+
+$output = `$cmd 2>&1`;
+like(
+   $output, 
+   qr/This tool does not work with MySQL 8.1 and newer/, 
+   'The tool does not work with 8.1 or newer'
+);
+
+isnt(
+   $? >> 8,
+   0,
+   "Tool died"
+);
+
+# #############################################################################
+# Done.
+# #############################################################################
+$sb->wipe_clean($master_dbh);
+ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox");
+exit;
diff --git a/t/pt-slave-delay/issue_1169.t b/t/pt-slave-delay/issue_1169.t
index d45827461..c5647b448 100644
--- a/t/pt-slave-delay/issue_1169.t
+++ b/t/pt-slave-delay/issue_1169.t
@@ -20,8 +20,8 @@ my $dp  = DSNParser->new(opts => $dsn_opts);
 my $sb  = Sandbox->new(basedir => '/tmp', DSNParser => $dp);
 my $dbh = $sb->get_dbh_for('replica1');
 
-if ($sandbox_version ge '5.7') {
-   plan skip_all => 'Use SQL_DELAY';
+if ($sandbox_version ge '8.1') {
+   plan skip_all => 'Tool is not supported. Use SQL_DELAY';
 }
 
 if ( !$dbh ) {
diff --git a/t/pt-slave-delay/standard_options.t b/t/pt-slave-delay/standard_options.t
index 198674fdd..ff47c6440 100644
--- a/t/pt-slave-delay/standard_options.t
+++ b/t/pt-slave-delay/standard_options.t
@@ -20,8 +20,8 @@ my $sb = new Sandbox(basedir => '/tmp', DSNParser => $dp);
 my $master_dbh = $sb->get_dbh_for('source');
 my $slave_dbh  = $sb->get_dbh_for('replica1');
 
-if ($sandbox_version ge '5.7') {
-   plan skip_all => 'Use SQL_DELAY';
+if ($sandbox_version ge '8.1') {
+   plan skip_all => 'Tool is not supported. Use SQL_DELAY';
 }
 
 if ( !$master_dbh ) {

From 8f87bad328656fa6d1f9bf81c52de22137c95fc6 Mon Sep 17 00:00:00 2001
From: Sveta Smirnova <sveta.smirnova@percona.com>
Date: Tue, 27 Aug 2024 00:41:34 +0300
Subject: [PATCH 14/31] PT-2340 - Support MySQL 8.4

- Created pt-replica-restart. pt-slave-restart kept as symbolic link
---
 bin/pt-replica-restart                        | 6449 +++++++++++++++++
 bin/pt-slave-restart                          | 6445 +---------------
 t/pt-replica-restart/deprecation.t            |   37 +
 .../gtid.t                                    |   20 +-
 .../gtid_parallelreplication.t                |    8 +-
 t/pt-replica-restart/pt-replica-restart.t     |  146 +
 .../pt-slave-restart.t                        |    1 +
 7 files changed, 6648 insertions(+), 6458 deletions(-)
 create mode 100755 bin/pt-replica-restart
 mode change 100755 => 120000 bin/pt-slave-restart
 create mode 100644 t/pt-replica-restart/deprecation.t
 rename t/{pt-slave-restart => pt-replica-restart}/gtid.t (90%)
 rename t/{pt-slave-restart => pt-replica-restart}/gtid_parallelreplication.t (88%)
 create mode 100644 t/pt-replica-restart/pt-replica-restart.t
 rename t/{pt-slave-restart => pt-replica-restart}/pt-slave-restart.t (96%)

diff --git a/bin/pt-replica-restart b/bin/pt-replica-restart
new file mode 100755
index 000000000..0dea71fcd
--- /dev/null
+++ b/bin/pt-replica-restart
@@ -0,0 +1,6449 @@
+#!/usr/bin/env perl
+
+# This program is part of Percona Toolkit: http://www.percona.com/software/
+# See "COPYRIGHT, LICENSE, AND WARRANTY" at the end of this file for legal
+# notices and disclaimers.
+
+use strict;
+use warnings FATAL => 'all';
+
+# This tool is "fat-packed": most of its dependent modules are embedded
+# in this file.  Setting %INC to this file for each module makes Perl aware
+# of this so it will not try to load the module from @INC.  See the tool's
+# documentation for a full list of dependencies.
+BEGIN {
+   $INC{$_} = __FILE__ for map { (my $pkg = "$_.pm") =~ s!::!/!g; $pkg } (qw(
+      Percona::Toolkit
+      Quoter
+      OptionParser
+      Lmo::Utils
+      Lmo::Meta
+      Lmo::Object
+      Lmo::Types
+      Lmo
+      VersionParser
+      DSNParser
+      MasterSlave
+      Daemon
+      HTTP::Micro
+      VersionCheck
+   ));
+}
+
+# ###########################################################################
+# Percona::Toolkit package
+# This package is a copy without comments from the original.  The original
+# with comments and its test file can be found in the GitHub repository at,
+#   lib/Percona/Toolkit.pm
+#   t/lib/Percona/Toolkit.t
+# See https://github.com/percona/percona-toolkit for more information.
+# ###########################################################################
+{
+package Percona::Toolkit;
+
+our $VERSION = '3.6.0';
+
+use strict;
+use warnings FATAL => 'all';
+use English qw(-no_match_vars);
+use constant PTDEBUG => $ENV{PTDEBUG} || 0;
+
+use Carp qw(carp cluck);
+use Data::Dumper qw();
+
+require Exporter;
+our @ISA         = qw(Exporter);
+our @EXPORT_OK   = qw(
+   have_required_args
+   Dumper
+   _d
+);
+
+sub have_required_args {
+   my ($args, @required_args) = @_;
+   my $have_required_args = 1;
+   foreach my $arg ( @required_args ) {
+      if ( !defined $args->{$arg} ) {
+         $have_required_args = 0;
+         carp "Argument $arg is not defined";
+      }
+   }
+   cluck unless $have_required_args;  # print backtrace
+   return $have_required_args;
+}
+
+sub Dumper {
+   local $Data::Dumper::Indent    = 1;
+   local $Data::Dumper::Sortkeys  = 1;
+   local $Data::Dumper::Quotekeys = 0;
+   Data::Dumper::Dumper(@_);
+}
+
+sub _d {
+   my ($package, undef, $line) = caller 0;
+   @_ = map { (my $temp = $_) =~ s/\n/\n# /g; $temp; }
+        map { defined $_ ? $_ : 'undef' }
+        @_;
+   print STDERR "# $package:$line $PID ", join(' ', @_), "\n";
+}
+
+1;
+}
+# ###########################################################################
+# End Percona::Toolkit package
+# ###########################################################################
+
+# ###########################################################################
+# Quoter package
+# This package is a copy without comments from the original.  The original
+# with comments and its test file can be found in the GitHub repository at,
+#   lib/Quoter.pm
+#   t/lib/Quoter.t
+# See https://github.com/percona/percona-toolkit for more information.
+# ###########################################################################
+{
+package Quoter;
+
+use strict;
+use warnings FATAL => 'all';
+use English qw(-no_match_vars);
+use constant PTDEBUG => $ENV{PTDEBUG} || 0;
+
+use Data::Dumper;
+$Data::Dumper::Indent    = 1;
+$Data::Dumper::Sortkeys  = 1;
+$Data::Dumper::Quotekeys = 0;
+
+sub new {
+   my ( $class, %args ) = @_;
+   return bless {}, $class;
+}
+
+sub quote {
+   my ( $self, @vals ) = @_;
+   foreach my $val ( @vals ) {
+      $val =~ s/`/``/g;
+   }
+   return join('.', map { '`' . $_ . '`' } @vals);
+}
+
+sub quote_val {
+   my ( $self, $val, %args ) = @_;
+
+   return 'NULL' unless defined $val;          # undef = NULL
+   return "''" if $val eq '';                  # blank string = ''
+   return $val if $val =~ m/^0x[0-9a-fA-F]+$/  # quote hex data
+                  && !$args{is_char};          # unless is_char is true
+
+   return $val if $args{is_float};
+
+   $val =~ s/(['\\])/\\$1/g;
+   return "'$val'";
+}
+
+sub split_unquote {
+   my ( $self, $db_tbl, $default_db ) = @_;
+   my ( $db, $tbl ) = split(/[.]/, $db_tbl);
+   if ( !$tbl ) {
+      $tbl = $db;
+      $db  = $default_db;
+   }
+   for ($db, $tbl) {
+      next unless $_;
+      s/\A`//;
+      s/`\z//;
+      s/``/`/g;
+   }
+
+   return ($db, $tbl);
+}
+
+sub literal_like {
+   my ( $self, $like ) = @_;
+   return unless $like;
+   $like =~ s/([%_])/\\$1/g;
+   return "'$like'";
+}
+
+sub join_quote {
+   my ( $self, $default_db, $db_tbl ) = @_;
+   return unless $db_tbl;
+   my ($db, $tbl) = split(/[.]/, $db_tbl);
+   if ( !$tbl ) {
+      $tbl = $db;
+      $db  = $default_db;
+   }
+   $db  = "`$db`"  if $db  && $db  !~ m/^`/;
+   $tbl = "`$tbl`" if $tbl && $tbl !~ m/^`/;
+   return $db ? "$db.$tbl" : $tbl;
+}
+
+sub serialize_list {
+   my ( $self, @args ) = @_;
+   PTDEBUG && _d('Serializing', Dumper(\@args));
+   return unless @args;
+
+   my @parts;
+   foreach my $arg  ( @args ) {
+      if ( defined $arg ) {
+         $arg =~ s/,/\\,/g;      # escape commas
+         $arg =~ s/\\N/\\\\N/g;  # escape literal \N
+         push @parts, $arg;
+      }
+      else {
+         push @parts, '\N';
+      }
+   }
+
+   my $string = join(',', @parts);
+   PTDEBUG && _d('Serialized: <', $string, '>');
+   return $string;
+}
+
+sub deserialize_list {
+   my ( $self, $string ) = @_;
+   PTDEBUG && _d('Deserializing <', $string, '>');
+   die "Cannot deserialize an undefined string" unless defined $string;
+
+   my @parts;
+   foreach my $arg ( split(/(?<!\\),/, $string) ) {
+      if ( $arg eq '\N' ) {
+         $arg = undef;
+      }
+      else {
+         $arg =~ s/\\,/,/g;
+         $arg =~ s/\\\\N/\\N/g;
+      }
+      push @parts, $arg;
+   }
+
+   if ( !@parts ) {
+      my $n_empty_strings = $string =~ tr/,//;
+      $n_empty_strings++;
+      PTDEBUG && _d($n_empty_strings, 'empty strings');
+      map { push @parts, '' } 1..$n_empty_strings;
+   }
+   elsif ( $string =~ m/(?<!\\),$/ ) {
+      PTDEBUG && _d('Last value is an empty string');
+      push @parts, '';
+   }
+
+   PTDEBUG && _d('Deserialized', Dumper(\@parts));
+   return @parts;
+}
+
+sub _d {
+   my ($package, undef, $line) = caller 0;
+   @_ = map { (my $temp = $_) =~ s/\n/\n# /g; $temp; }
+        map { defined $_ ? $_ : 'undef' }
+        @_;
+   print STDERR "# $package:$line $PID ", join(' ', @_), "\n";
+}
+
+1;
+}
+# ###########################################################################
+# End Quoter package
+# ###########################################################################
+
+# ###########################################################################
+# OptionParser package
+# This package is a copy without comments from the original.  The original
+# with comments and its test file can be found in the GitHub repository at,
+#   lib/OptionParser.pm
+#   t/lib/OptionParser.t
+# See https://github.com/percona/percona-toolkit for more information.
+# ###########################################################################
+{
+package OptionParser;
+
+use strict;
+use warnings FATAL => 'all';
+use English qw(-no_match_vars);
+use constant PTDEBUG => $ENV{PTDEBUG} || 0;
+
+use List::Util qw(max);
+use Getopt::Long;
+use Data::Dumper;
+
+my $POD_link_re = '[LC]<"?([^">]+)"?>';
+
+sub new {
+   my ( $class, %args ) = @_;
+   my @required_args = qw();
+   foreach my $arg ( @required_args ) {
+      die "I need a $arg argument" unless $args{$arg};
+   }
+
+   my ($program_name) = $PROGRAM_NAME =~ m/([.A-Za-z-]+)$/;
+   $program_name ||= $PROGRAM_NAME;
+   my $home = $ENV{HOME} || $ENV{HOMEPATH} || $ENV{USERPROFILE} || '.';
+
+   my %attributes = (
+      'type'       => 1,
+      'short form' => 1,
+      'group'      => 1,
+      'default'    => 1,
+      'cumulative' => 1,
+      'negatable'  => 1,
+      'repeatable' => 1,  # means it can be specified more than once
+   );
+
+   my $self = {
+      head1             => 'OPTIONS',        # These args are used internally
+      skip_rules        => 0,                # to instantiate another Option-
+      item              => '--(.*)',         # Parser obj that parses the
+      attributes        => \%attributes,     # DSN OPTIONS section.  Tools
+      parse_attributes  => \&_parse_attribs, # don't tinker with these args.
+
+      %args,
+
+      strict            => 1,  # disabled by a special rule
+      program_name      => $program_name,
+      opts              => {},
+      got_opts          => 0,
+      short_opts        => {},
+      defaults          => {},
+      groups            => {},
+      allowed_groups    => {},
+      errors            => [],
+      rules             => [],  # desc of rules for --help
+      mutex             => [],  # rule: opts are mutually exclusive
+      atleast1          => [],  # rule: at least one opt is required
+      disables          => {},  # rule: opt disables other opts
+      defaults_to       => {},  # rule: opt defaults to value of other opt
+      DSNParser         => undef,
+      default_files     => [
+         "/etc/percona-toolkit/percona-toolkit.conf",
+         "/etc/percona-toolkit/$program_name.conf",
+         "$home/.percona-toolkit.conf",
+         "$home/.$program_name.conf",
+      ],
+      types             => {
+         string => 's', # standard Getopt type
+         int    => 'i', # standard Getopt type
+         float  => 'f', # standard Getopt type
+         Hash   => 'H', # hash, formed from a comma-separated list
+         hash   => 'h', # hash as above, but only if a value is given
+         Array  => 'A', # array, similar to Hash
+         array  => 'a', # array, similar to hash
+         DSN    => 'd', # DSN
+         size   => 'z', # size with kMG suffix (powers of 2^10)
+         time   => 'm', # time, with an optional suffix of s/h/m/d
+      },
+   };
+
+   return bless $self, $class;
+}
+
+sub get_specs {
+   my ( $self, $file ) = @_;
+   $file ||= $self->{file} || __FILE__;
+   my @specs = $self->_pod_to_specs($file);
+   $self->_parse_specs(@specs);
+
+   open my $fh, "<", $file or die "Cannot open $file: $OS_ERROR";
+   my $contents = do { local $/ = undef; <$fh> };
+   close $fh;
+   if ( $contents =~ m/^=head1 DSN OPTIONS/m ) {
+      PTDEBUG && _d('Parsing DSN OPTIONS');
+      my $dsn_attribs = {
+         dsn  => 1,
+         copy => 1,
+      };
+      my $parse_dsn_attribs = sub {
+         my ( $self, $option, $attribs ) = @_;
+         map {
+            my $val = $attribs->{$_};
+            if ( $val ) {
+               $val    = $val eq 'yes' ? 1
+                       : $val eq 'no'  ? 0
+                       :                 $val;
+               $attribs->{$_} = $val;
+            }
+         } keys %$attribs;
+         return {
+            key => $option,
+            %$attribs,
+         };
+      };
+      my $dsn_o = new OptionParser(
+         description       => 'DSN OPTIONS',
+         head1             => 'DSN OPTIONS',
+         dsn               => 0,         # XXX don't infinitely recurse!
+         item              => '\* (.)',  # key opts are a single character
+         skip_rules        => 1,         # no rules before opts
+         attributes        => $dsn_attribs,
+         parse_attributes  => $parse_dsn_attribs,
+      );
+      my @dsn_opts = map {
+         my $opts = {
+            key  => $_->{spec}->{key},
+            dsn  => $_->{spec}->{dsn},
+            copy => $_->{spec}->{copy},
+            desc => $_->{desc},
+         };
+         $opts;
+      } $dsn_o->_pod_to_specs($file);
+      $self->{DSNParser} = DSNParser->new(opts => \@dsn_opts);
+   }
+
+   if ( $contents =~ m/^=head1 VERSION\n\n^(.+)$/m ) {
+      $self->{version} = $1;
+      PTDEBUG && _d($self->{version});
+   }
+
+   return;
+}
+
+sub DSNParser {
+   my ( $self ) = @_;
+   return $self->{DSNParser};
+};
+
+sub get_defaults_files {
+   my ( $self ) = @_;
+   return @{$self->{default_files}};
+}
+
+sub _pod_to_specs {
+   my ( $self, $file ) = @_;
+   $file ||= $self->{file} || __FILE__;
+   open my $fh, '<', $file or die "Cannot open $file: $OS_ERROR";
+
+   my @specs = ();
+   my @rules = ();
+   my $para;
+
+   local $INPUT_RECORD_SEPARATOR = '';
+   while ( $para = <$fh> ) {
+      next unless $para =~ m/^=head1 $self->{head1}/;
+      last;
+   }
+
+   while ( $para = <$fh> ) {
+      last if $para =~ m/^=over/;
+      next if $self->{skip_rules};
+      chomp $para;
+      $para =~ s/\s+/ /g;
+      $para =~ s/$POD_link_re/$1/go;
+      PTDEBUG && _d('Option rule:', $para);
+      push @rules, $para;
+   }
+
+   die "POD has no $self->{head1} section" unless $para;
+
+   do {
+      if ( my ($option) = $para =~ m/^=item $self->{item}/ ) {
+         chomp $para;
+         PTDEBUG && _d($para);
+         my %attribs;
+
+         $para = <$fh>; # read next paragraph, possibly attributes
+
+         if ( $para =~ m/: / ) { # attributes
+            $para =~ s/\s+\Z//g;
+            %attribs = map {
+                  my ( $attrib, $val) = split(/: /, $_);
+                  die "Unrecognized attribute for --$option: $attrib"
+                     unless $self->{attributes}->{$attrib};
+                  ($attrib, $val);
+               } split(/; /, $para);
+            if ( $attribs{'short form'} ) {
+               $attribs{'short form'} =~ s/-//;
+            }
+            $para = <$fh>; # read next paragraph, probably short help desc
+         }
+         else {
+            PTDEBUG && _d('Option has no attributes');
+         }
+
+         $para =~ s/\s+\Z//g;
+         $para =~ s/\s+/ /g;
+         $para =~ s/$POD_link_re/$1/go;
+
+         $para =~ s/\.(?:\n.*| [A-Z].*|\Z)//s;
+         PTDEBUG && _d('Short help:', $para);
+
+         die "No description after option spec $option" if $para =~ m/^=item/;
+
+         if ( my ($base_option) =  $option =~ m/^\[no\](.*)/ ) {
+            $option = $base_option;
+            $attribs{'negatable'} = 1;
+         }
+
+         push @specs, {
+            spec  => $self->{parse_attributes}->($self, $option, \%attribs),
+            desc  => $para
+               . (defined $attribs{default} ? " (default $attribs{default})" : ''),
+            group => ($attribs{'group'} ? $attribs{'group'} : 'default'),
+            attributes => \%attribs
+         };
+      }
+      while ( $para = <$fh> ) {
+         last unless $para;
+         if ( $para =~ m/^=head1/ ) {
+            $para = undef; # Can't 'last' out of a do {} block.
+            last;
+         }
+         last if $para =~ m/^=item /;
+      }
+   } while ( $para );
+
+   die "No valid specs in $self->{head1}" unless @specs;
+
+   close $fh;
+   return @specs, @rules;
+}
+
+sub _parse_specs {
+   my ( $self, @specs ) = @_;
+   my %disables; # special rule that requires deferred checking
+
+   foreach my $opt ( @specs ) {
+      if ( ref $opt ) { # It's an option spec, not a rule.
+         PTDEBUG && _d('Parsing opt spec:',
+            map { ($_, '=>', $opt->{$_}) } keys %$opt);
+
+         my ( $long, $short ) = $opt->{spec} =~ m/^([\w-]+)(?:\|([^!+=]*))?/;
+         if ( !$long ) {
+            die "Cannot parse long option from spec $opt->{spec}";
+         }
+         $opt->{long} = $long;
+
+         die "Duplicate long option --$long" if exists $self->{opts}->{$long};
+         $self->{opts}->{$long} = $opt;
+
+         if ( length $long == 1 ) {
+            PTDEBUG && _d('Long opt', $long, 'looks like short opt');
+            $self->{short_opts}->{$long} = $long;
+         }
+
+         if ( $short ) {
+            die "Duplicate short option -$short"
+               if exists $self->{short_opts}->{$short};
+            $self->{short_opts}->{$short} = $long;
+            $opt->{short} = $short;
+         }
+         else {
+            $opt->{short} = undef;
+         }
+
+         $opt->{is_negatable}  = $opt->{spec} =~ m/!/        ? 1 : 0;
+         $opt->{is_cumulative} = $opt->{spec} =~ m/\+/       ? 1 : 0;
+         $opt->{is_repeatable} = $opt->{attributes}->{repeatable} ? 1 : 0;
+         $opt->{is_required}   = $opt->{desc} =~ m/required/ ? 1 : 0;
+
+         $opt->{group} ||= 'default';
+         $self->{groups}->{ $opt->{group} }->{$long} = 1;
+
+         $opt->{value} = undef;
+         $opt->{got}   = 0;
+
+         my ( $type ) = $opt->{spec} =~ m/=(.)/;
+         $opt->{type} = $type;
+         PTDEBUG && _d($long, 'type:', $type);
+
+
+         $opt->{spec} =~ s/=./=s/ if ( $type && $type =~ m/[HhAadzm]/ );
+
+         if ( (my ($def) = $opt->{desc} =~ m/default\b(?: ([^)]+))?/) ) {
+            $self->{defaults}->{$long} = defined $def ? $def : 1;
+            PTDEBUG && _d($long, 'default:', $def);
+         }
+
+         if ( $long eq 'config' ) {
+            $self->{defaults}->{$long} = join(',', $self->get_defaults_files());
+         }
+
+         if ( (my ($dis) = $opt->{desc} =~ m/(disables .*)/) ) {
+            $disables{$long} = $dis;
+            PTDEBUG && _d('Deferring check of disables rule for', $opt, $dis);
+         }
+
+         $self->{opts}->{$long} = $opt;
+      }
+      else { # It's an option rule, not a spec.
+         PTDEBUG && _d('Parsing rule:', $opt);
+         push @{$self->{rules}}, $opt;
+         my @participants = $self->_get_participants($opt);
+         my $rule_ok = 0;
+
+         if ( $opt =~ m/mutually exclusive|one and only one/ ) {
+            $rule_ok = 1;
+            push @{$self->{mutex}}, \@participants;
+            PTDEBUG && _d(@participants, 'are mutually exclusive');
+         }
+         if ( $opt =~ m/at least one|one and only one/ ) {
+            $rule_ok = 1;
+            push @{$self->{atleast1}}, \@participants;
+            PTDEBUG && _d(@participants, 'require at least one');
+         }
+         if ( $opt =~ m/default to/ ) {
+            $rule_ok = 1;
+            $self->{defaults_to}->{$participants[0]} = $participants[1];
+            PTDEBUG && _d($participants[0], 'defaults to', $participants[1]);
+         }
+         if ( $opt =~ m/restricted to option groups/ ) {
+            $rule_ok = 1;
+            my ($groups) = $opt =~ m/groups ([\w\s\,]+)/;
+            my @groups = split(',', $groups);
+            %{$self->{allowed_groups}->{$participants[0]}} = map {
+               s/\s+//;
+               $_ => 1;
+            } @groups;
+         }
+         if( $opt =~ m/accepts additional command-line arguments/ ) {
+            $rule_ok = 1;
+            $self->{strict} = 0;
+            PTDEBUG && _d("Strict mode disabled by rule");
+         }
+
+         die "Unrecognized option rule: $opt" unless $rule_ok;
+      }
+   }
+
+   foreach my $long ( keys %disables ) {
+      my @participants = $self->_get_participants($disables{$long});
+      $self->{disables}->{$long} = \@participants;
+      PTDEBUG && _d('Option', $long, 'disables', @participants);
+   }
+
+   return;
+}
+
+sub _get_participants {
+   my ( $self, $str ) = @_;
+   my @participants;
+   foreach my $long ( $str =~ m/--(?:\[no\])?([\w-]+)/g ) {
+      die "Option --$long does not exist while processing rule $str"
+         unless exists $self->{opts}->{$long};
+      push @participants, $long;
+   }
+   PTDEBUG && _d('Participants for', $str, ':', @participants);
+   return @participants;
+}
+
+sub opts {
+   my ( $self ) = @_;
+   my %opts = %{$self->{opts}};
+   return %opts;
+}
+
+sub short_opts {
+   my ( $self ) = @_;
+   my %short_opts = %{$self->{short_opts}};
+   return %short_opts;
+}
+
+sub set_defaults {
+   my ( $self, %defaults ) = @_;
+   $self->{defaults} = {};
+   foreach my $long ( keys %defaults ) {
+      die "Cannot set default for nonexistent option $long"
+         unless exists $self->{opts}->{$long};
+      $self->{defaults}->{$long} = $defaults{$long};
+      PTDEBUG && _d('Default val for', $long, ':', $defaults{$long});
+   }
+   return;
+}
+
+sub get_defaults {
+   my ( $self ) = @_;
+   return $self->{defaults};
+}
+
+sub get_groups {
+   my ( $self ) = @_;
+   return $self->{groups};
+}
+
+sub _set_option {
+   my ( $self, $opt, $val ) = @_;
+   my $long = exists $self->{opts}->{$opt}       ? $opt
+            : exists $self->{short_opts}->{$opt} ? $self->{short_opts}->{$opt}
+            : die "Getopt::Long gave a nonexistent option: $opt";
+   $opt = $self->{opts}->{$long};
+   if ( $opt->{is_cumulative} ) {
+      $opt->{value}++;
+   }
+   elsif ( ($opt->{type} || '') eq 's' && $val =~ m/^--?(.+)/ ) {
+      my $next_opt = $1;
+      if (    exists $self->{opts}->{$next_opt}
+           || exists $self->{short_opts}->{$next_opt} ) {
+         $self->save_error("--$long requires a string value");
+         return;
+      }
+      else {
+         if ($opt->{is_repeatable}) {
+            push @{$opt->{value}} , $val;
+         }
+         else {
+            $opt->{value} = $val;
+         }
+      }
+   }
+   else {
+      if ($opt->{is_repeatable}) {
+         push @{$opt->{value}} , $val;
+      }
+      else {
+         $opt->{value} = $val;
+      }
+   }
+   $opt->{got} = 1;
+   PTDEBUG && _d('Got option', $long, '=', $val);
+}
+
+sub get_opts {
+   my ( $self ) = @_;
+
+   foreach my $long ( keys %{$self->{opts}} ) {
+      $self->{opts}->{$long}->{got} = 0;
+      $self->{opts}->{$long}->{value}
+         = exists $self->{defaults}->{$long}       ? $self->{defaults}->{$long}
+         : $self->{opts}->{$long}->{is_cumulative} ? 0
+         : undef;
+   }
+   $self->{got_opts} = 0;
+
+   $self->{errors} = [];
+
+   if ( @ARGV && $ARGV[0] =~/^--config=/ ) {
+      $ARGV[0] = substr($ARGV[0],9);
+      $ARGV[0] =~ s/^'(.*)'$/$1/;
+      $ARGV[0] =~ s/^"(.*)"$/$1/;
+      $self->_set_option('config', shift @ARGV);
+   }
+   if ( @ARGV && $ARGV[0] eq "--config" ) {
+      shift @ARGV;
+      $self->_set_option('config', shift @ARGV);
+   }
+   if ( $self->has('config') ) {
+      my @extra_args;
+      foreach my $filename ( split(',', $self->get('config')) ) {
+         eval {
+            push @extra_args, $self->_read_config_file($filename);
+         };
+         if ( $EVAL_ERROR ) {
+            if ( $self->got('config') ) {
+               die $EVAL_ERROR;
+            }
+            elsif ( PTDEBUG ) {
+               _d($EVAL_ERROR);
+            }
+         }
+      }
+      unshift @ARGV, @extra_args;
+   }
+
+   Getopt::Long::Configure('no_ignore_case', 'bundling');
+   GetOptions(
+      map    { $_->{spec} => sub { $self->_set_option(@_); } }
+      grep   { $_->{long} ne 'config' } # --config is handled specially above.
+      values %{$self->{opts}}
+   ) or $self->save_error('Error parsing options');
+
+   if ( exists $self->{opts}->{version} && $self->{opts}->{version}->{got} ) {
+      if ( $self->{version} ) {
+         print $self->{version}, "\n";
+         exit 0;
+      }
+      else {
+         print "Error parsing version.  See the VERSION section of the tool's documentation.\n";
+         exit 1;
+      }
+   }
+
+   if ( @ARGV && $self->{strict} ) {
+      $self->save_error("Unrecognized command-line options @ARGV");
+   }
+
+   foreach my $mutex ( @{$self->{mutex}} ) {
+      my @set = grep { $self->{opts}->{$_}->{got} } @$mutex;
+      if ( @set > 1 ) {
+         my $err = join(', ', map { "--$self->{opts}->{$_}->{long}" }
+                      @{$mutex}[ 0 .. scalar(@$mutex) - 2] )
+                 . ' and --'.$self->{opts}->{$mutex->[-1]}->{long}
+                 . ' are mutually exclusive.';
+         $self->save_error($err);
+      }
+   }
+
+   foreach my $required ( @{$self->{atleast1}} ) {
+      my @set = grep { $self->{opts}->{$_}->{got} } @$required;
+      if ( @set == 0 ) {
+         my $err = join(', ', map { "--$self->{opts}->{$_}->{long}" }
+                      @{$required}[ 0 .. scalar(@$required) - 2] )
+                 .' or --'.$self->{opts}->{$required->[-1]}->{long};
+         $self->save_error("Specify at least one of $err");
+      }
+   }
+
+   $self->_check_opts( keys %{$self->{opts}} );
+   $self->{got_opts} = 1;
+   return;
+}
+
+sub _check_opts {
+   my ( $self, @long ) = @_;
+   my $long_last = scalar @long;
+   while ( @long ) {
+      foreach my $i ( 0..$#long ) {
+         my $long = $long[$i];
+         next unless $long;
+         my $opt  = $self->{opts}->{$long};
+         if ( $opt->{got} ) {
+            if ( exists $self->{disables}->{$long} ) {
+               my @disable_opts = @{$self->{disables}->{$long}};
+               map { $self->{opts}->{$_}->{value} = undef; } @disable_opts;
+               PTDEBUG && _d('Unset options', @disable_opts,
+                  'because', $long,'disables them');
+            }
+
+            if ( exists $self->{allowed_groups}->{$long} ) {
+
+               my @restricted_groups = grep {
+                  !exists $self->{allowed_groups}->{$long}->{$_}
+               } keys %{$self->{groups}};
+
+               my @restricted_opts;
+               foreach my $restricted_group ( @restricted_groups ) {
+                  RESTRICTED_OPT:
+                  foreach my $restricted_opt (
+                     keys %{$self->{groups}->{$restricted_group}} )
+                  {
+                     next RESTRICTED_OPT if $restricted_opt eq $long;
+                     push @restricted_opts, $restricted_opt
+                        if $self->{opts}->{$restricted_opt}->{got};
+                  }
+               }
+
+               if ( @restricted_opts ) {
+                  my $err;
+                  if ( @restricted_opts == 1 ) {
+                     $err = "--$restricted_opts[0]";
+                  }
+                  else {
+                     $err = join(', ',
+                               map { "--$self->{opts}->{$_}->{long}" }
+                               grep { $_ }
+                               @restricted_opts[0..scalar(@restricted_opts) - 2]
+                            )
+                          . ' or --'.$self->{opts}->{$restricted_opts[-1]}->{long};
+                  }
+                  $self->save_error("--$long is not allowed with $err");
+               }
+            }
+
+         }
+         elsif ( $opt->{is_required} ) {
+            $self->save_error("Required option --$long must be specified");
+         }
+
+         $self->_validate_type($opt);
+         if ( $opt->{parsed} ) {
+            delete $long[$i];
+         }
+         else {
+            PTDEBUG && _d('Temporarily failed to parse', $long);
+         }
+      }
+
+      die "Failed to parse options, possibly due to circular dependencies"
+         if @long == $long_last;
+      $long_last = @long;
+   }
+
+   return;
+}
+
+sub _validate_type {
+   my ( $self, $opt ) = @_;
+   return unless $opt;
+
+   if ( !$opt->{type} ) {
+      $opt->{parsed} = 1;
+      return;
+   }
+
+   my $val = $opt->{value};
+
+   if ( $val && $opt->{type} eq 'm' ) {  # type time
+      PTDEBUG && _d('Parsing option', $opt->{long}, 'as a time value');
+      my ( $prefix, $num, $suffix ) = $val =~ m/([+-]?)(\d+)([a-z])?$/;
+      if ( !$suffix ) {
+         my ( $s ) = $opt->{desc} =~ m/\(suffix (.)\)/;
+         $suffix = $s || 's';
+         PTDEBUG && _d('No suffix given; using', $suffix, 'for',
+            $opt->{long}, '(value:', $val, ')');
+      }
+      if ( $suffix =~ m/[smhd]/ ) {
+         $val = $suffix eq 's' ? $num            # Seconds
+              : $suffix eq 'm' ? $num * 60       # Minutes
+              : $suffix eq 'h' ? $num * 3600     # Hours
+              :                  $num * 86400;   # Days
+         $opt->{value} = ($prefix || '') . $val;
+         PTDEBUG && _d('Setting option', $opt->{long}, 'to', $val);
+      }
+      else {
+         $self->save_error("Invalid time suffix for --$opt->{long}");
+      }
+   }
+   elsif ( $val && $opt->{type} eq 'd' ) {  # type DSN
+      PTDEBUG && _d('Parsing option', $opt->{long}, 'as a DSN');
+      my $prev = {};
+      my $from_key = $self->{defaults_to}->{ $opt->{long} };
+      if ( $from_key ) {
+         PTDEBUG && _d($opt->{long}, 'DSN copies from', $from_key, 'DSN');
+         if ( $self->{opts}->{$from_key}->{parsed} ) {
+            $prev = $self->{opts}->{$from_key}->{value};
+         }
+         else {
+            PTDEBUG && _d('Cannot parse', $opt->{long}, 'until',
+               $from_key, 'parsed');
+            return;
+         }
+      }
+      my $defaults = $self->{DSNParser}->parse_options($self);
+      if (!$opt->{attributes}->{repeatable}) {
+          $opt->{value} = $self->{DSNParser}->parse($val, $prev, $defaults);
+      } else {
+          my $values = [];
+          for my $dsn_string (@$val) {
+              push @$values, $self->{DSNParser}->parse($dsn_string, $prev, $defaults);
+          }
+          $opt->{value} = $values;
+      }
+   }
+   elsif ( $val && $opt->{type} eq 'z' ) {  # type size
+      PTDEBUG && _d('Parsing option', $opt->{long}, 'as a size value');
+      $self->_parse_size($opt, $val);
+   }
+   elsif ( $opt->{type} eq 'H' || (defined $val && $opt->{type} eq 'h') ) {
+      $opt->{value} = { map { $_ => 1 } split(/(?<!\\),\s*/, ($val || '')) };
+   }
+   elsif ( $opt->{type} eq 'A' || (defined $val && $opt->{type} eq 'a') ) {
+      $opt->{value} = [ split(/(?<!\\),\s*/, ($val || '')) ];
+   }
+   else {
+      PTDEBUG && _d('Nothing to validate for option',
+         $opt->{long}, 'type', $opt->{type}, 'value', $val);
+   }
+
+   $opt->{parsed} = 1;
+   return;
+}
+
+sub get {
+   my ( $self, $opt ) = @_;
+   my $long = (length $opt == 1 ? $self->{short_opts}->{$opt} : $opt);
+   die "Option $opt does not exist"
+      unless $long && exists $self->{opts}->{$long};
+   return $self->{opts}->{$long}->{value};
+}
+
+sub got {
+   my ( $self, $opt ) = @_;
+   my $long = (length $opt == 1 ? $self->{short_opts}->{$opt} : $opt);
+   die "Option $opt does not exist"
+      unless $long && exists $self->{opts}->{$long};
+   return $self->{opts}->{$long}->{got};
+}
+
+sub has {
+   my ( $self, $opt ) = @_;
+   my $long = (length $opt == 1 ? $self->{short_opts}->{$opt} : $opt);
+   return defined $long ? exists $self->{opts}->{$long} : 0;
+}
+
+sub set {
+   my ( $self, $opt, $val ) = @_;
+   my $long = (length $opt == 1 ? $self->{short_opts}->{$opt} : $opt);
+   die "Option $opt does not exist"
+      unless $long && exists $self->{opts}->{$long};
+   $self->{opts}->{$long}->{value} = $val;
+   return;
+}
+
+sub save_error {
+   my ( $self, $error ) = @_;
+   push @{$self->{errors}}, $error;
+   return;
+}
+
+sub errors {
+   my ( $self ) = @_;
+   return $self->{errors};
+}
+
+sub usage {
+   my ( $self ) = @_;
+   warn "No usage string is set" unless $self->{usage}; # XXX
+   return "Usage: " . ($self->{usage} || '') . "\n";
+}
+
+sub descr {
+   my ( $self ) = @_;
+   warn "No description string is set" unless $self->{description}; # XXX
+   my $descr  = ($self->{description} || $self->{program_name} || '')
+              . "  For more details, please use the --help option, "
+              . "or try 'perldoc $PROGRAM_NAME' "
+              . "for complete documentation.";
+   $descr = join("\n", $descr =~ m/(.{0,80})(?:\s+|$)/g)
+      unless $ENV{DONT_BREAK_LINES};
+   $descr =~ s/ +$//mg;
+   return $descr;
+}
+
+sub usage_or_errors {
+   my ( $self, $file, $return ) = @_;
+   $file ||= $self->{file} || __FILE__;
+
+   if ( !$self->{description} || !$self->{usage} ) {
+      PTDEBUG && _d("Getting description and usage from SYNOPSIS in", $file);
+      my %synop = $self->_parse_synopsis($file);
+      $self->{description} ||= $synop{description};
+      $self->{usage}       ||= $synop{usage};
+      PTDEBUG && _d("Description:", $self->{description},
+         "\nUsage:", $self->{usage});
+   }
+
+   if ( $self->{opts}->{help}->{got} ) {
+      print $self->print_usage() or die "Cannot print usage: $OS_ERROR";
+      exit 0 unless $return;
+   }
+   elsif ( scalar @{$self->{errors}} ) {
+      print $self->print_errors() or die "Cannot print errors: $OS_ERROR";
+      exit 1 unless $return;
+   }
+
+   return;
+}
+
+sub print_errors {
+   my ( $self ) = @_;
+   my $usage = $self->usage() . "\n";
+   if ( (my @errors = @{$self->{errors}}) ) {
+      $usage .= join("\n  * ", 'Errors in command-line arguments:', @errors)
+              . "\n";
+   }
+   return $usage . "\n" . $self->descr();
+}
+
+sub print_usage {
+   my ( $self ) = @_;
+   die "Run get_opts() before print_usage()" unless $self->{got_opts};
+   my @opts = values %{$self->{opts}};
+
+   my $maxl = max(
+      map {
+         length($_->{long})               # option long name
+         + ($_->{is_negatable} ? 4 : 0)   # "[no]" if opt is negatable
+         + ($_->{type} ? 2 : 0)           # "=x" where x is the opt type
+      }
+      @opts);
+
+   my $maxs = max(0,
+      map {
+         length($_)
+         + ($self->{opts}->{$_}->{is_negatable} ? 4 : 0)
+         + ($self->{opts}->{$_}->{type} ? 2 : 0)
+      }
+      values %{$self->{short_opts}});
+
+   my $lcol = max($maxl, ($maxs + 3));
+   my $rcol = 80 - $lcol - 6;
+   my $rpad = ' ' x ( 80 - $rcol );
+
+   $maxs = max($lcol - 3, $maxs);
+
+   my $usage = $self->descr() . "\n" . $self->usage();
+
+   my @groups = reverse sort grep { $_ ne 'default'; } keys %{$self->{groups}};
+   push @groups, 'default';
+
+   foreach my $group ( reverse @groups ) {
+      $usage .= "\n".($group eq 'default' ? 'Options' : $group).":\n\n";
+      foreach my $opt (
+         sort { $a->{long} cmp $b->{long} }
+         grep { $_->{group} eq $group }
+         @opts )
+      {
+         my $long  = $opt->{is_negatable} ? "[no]$opt->{long}" : $opt->{long};
+         my $short = $opt->{short};
+         my $desc  = $opt->{desc};
+
+         $long .= $opt->{type} ? "=$opt->{type}" : "";
+
+         if ( $opt->{type} && $opt->{type} eq 'm' ) {
+            my ($s) = $desc =~ m/\(suffix (.)\)/;
+            $s    ||= 's';
+            $desc =~ s/\s+\(suffix .\)//;
+            $desc .= ".  Optional suffix s=seconds, m=minutes, h=hours, "
+                   . "d=days; if no suffix, $s is used.";
+         }
+         $desc = join("\n$rpad", grep { $_ } $desc =~ m/(.{0,$rcol}(?!\W))(?:\s+|(?<=\W)|$)/g);
+         $desc =~ s/ +$//mg;
+         if ( $short ) {
+            $usage .= sprintf("  --%-${maxs}s -%s  %s\n", $long, $short, $desc);
+         }
+         else {
+            $usage .= sprintf("  --%-${lcol}s  %s\n", $long, $desc);
+         }
+      }
+   }
+
+   $usage .= "\nOption types: s=string, i=integer, f=float, h/H/a/A=comma-separated list, d=DSN, z=size, m=time\n";
+
+   if ( (my @rules = @{$self->{rules}}) ) {
+      $usage .= "\nRules:\n\n";
+      $usage .= join("\n", map { "  $_" } @rules) . "\n";
+   }
+   if ( $self->{DSNParser} ) {
+      $usage .= "\n" . $self->{DSNParser}->usage();
+   }
+   $usage .= "\nOptions and values after processing arguments:\n\n";
+   foreach my $opt ( sort { $a->{long} cmp $b->{long} } @opts ) {
+      my $val   = $opt->{value};
+      my $type  = $opt->{type} || '';
+      my $bool  = $opt->{spec} =~ m/^[\w-]+(?:\|[\w-])?!?$/;
+      $val      = $bool              ? ( $val ? 'TRUE' : 'FALSE' )
+                : !defined $val      ? '(No value)'
+                : $type eq 'd'       ? $self->{DSNParser}->as_string($val)
+                : $type =~ m/H|h/    ? join(',', sort keys %$val)
+                : $type =~ m/A|a/    ? join(',', @$val)
+                :                    $val;
+      $usage .= sprintf("  --%-${lcol}s  %s\n", $opt->{long}, $val);
+   }
+   return $usage;
+}
+
+sub prompt_noecho {
+   shift @_ if ref $_[0] eq __PACKAGE__;
+   my ( $prompt ) = @_;
+   local $OUTPUT_AUTOFLUSH = 1;
+   print STDERR $prompt
+      or die "Cannot print: $OS_ERROR";
+   my $response;
+   eval {
+      require Term::ReadKey;
+      Term::ReadKey::ReadMode('noecho');
+      chomp($response = <STDIN>);
+      Term::ReadKey::ReadMode('normal');
+      print "\n"
+         or die "Cannot print: $OS_ERROR";
+   };
+   if ( $EVAL_ERROR ) {
+      die "Cannot read response; is Term::ReadKey installed? $EVAL_ERROR";
+   }
+   return $response;
+}
+
+sub _read_config_file {
+   my ( $self, $filename ) = @_;
+   open my $fh, "<", $filename or die "Cannot open $filename: $OS_ERROR\n";
+   my @args;
+   my $prefix = '--';
+   my $parse  = 1;
+
+   LINE:
+   while ( my $line = <$fh> ) {
+      chomp $line;
+      next LINE if $line =~ m/^\s*(?:\#|\;|$)/;
+      $line =~ s/\s+#.*$//g;
+      $line =~ s/^\s+|\s+$//g;
+      if ( $line eq '--' ) {
+         $prefix = '';
+         $parse  = 0;
+         next LINE;
+      }
+
+      if (  $parse
+            && !$self->has('version-check')
+            && $line =~ /version-check/
+      ) {
+         next LINE;
+      }
+
+      if ( $parse
+         && (my($opt, $arg) = $line =~ m/^\s*([^=\s]+?)(?:\s*=\s*(.*?)\s*)?$/)
+      ) {
+         push @args, grep { defined $_ } ("$prefix$opt", $arg);
+      }
+      elsif ( $line =~ m/./ ) {
+         push @args, $line;
+      }
+      else {
+         die "Syntax error in file $filename at line $INPUT_LINE_NUMBER";
+      }
+   }
+   close $fh;
+   return @args;
+}
+
+sub read_para_after {
+   my ( $self, $file, $regex ) = @_;
+   open my $fh, "<", $file or die "Can't open $file: $OS_ERROR";
+   local $INPUT_RECORD_SEPARATOR = '';
+   my $para;
+   while ( $para = <$fh> ) {
+      next unless $para =~ m/^=pod$/m;
+      last;
+   }
+   while ( $para = <$fh> ) {
+      next unless $para =~ m/$regex/;
+      last;
+   }
+   $para = <$fh>;
+   chomp($para);
+   close $fh or die "Can't close $file: $OS_ERROR";
+   return $para;
+}
+
+sub clone {
+   my ( $self ) = @_;
+
+   my %clone = map {
+      my $hashref  = $self->{$_};
+      my $val_copy = {};
+      foreach my $key ( keys %$hashref ) {
+         my $ref = ref $hashref->{$key};
+         $val_copy->{$key} = !$ref           ? $hashref->{$key}
+                           : $ref eq 'HASH'  ? { %{$hashref->{$key}} }
+                           : $ref eq 'ARRAY' ? [ @{$hashref->{$key}} ]
+                           : $hashref->{$key};
+      }
+      $_ => $val_copy;
+   } qw(opts short_opts defaults);
+
+   foreach my $scalar ( qw(got_opts) ) {
+      $clone{$scalar} = $self->{$scalar};
+   }
+
+   return bless \%clone;
+}
+
+sub _parse_size {
+   my ( $self, $opt, $val ) = @_;
+
+   if ( lc($val || '') eq 'null' ) {
+      PTDEBUG && _d('NULL size for', $opt->{long});
+      $opt->{value} = 'null';
+      return;
+   }
+
+   my %factor_for = (k => 1_024, M => 1_048_576, G => 1_073_741_824);
+   my ($pre, $num, $factor) = $val =~ m/^([+-])?(\d+)([kMG])?$/;
+   if ( defined $num ) {
+      if ( $factor ) {
+         $num *= $factor_for{$factor};
+         PTDEBUG && _d('Setting option', $opt->{y},
+            'to num', $num, '* factor', $factor);
+      }
+      $opt->{value} = ($pre || '') . $num;
+   }
+   else {
+      $self->save_error("Invalid size for --$opt->{long}: $val");
+   }
+   return;
+}
+
+sub _parse_attribs {
+   my ( $self, $option, $attribs ) = @_;
+   my $types = $self->{types};
+   return $option
+      . ($attribs->{'short form'} ? '|' . $attribs->{'short form'}   : '' )
+      . ($attribs->{'negatable'}  ? '!'                              : '' )
+      . ($attribs->{'cumulative'} ? '+'                              : '' )
+      . ($attribs->{'type'}       ? '=' . $types->{$attribs->{type}} : '' );
+}
+
+sub _parse_synopsis {
+   my ( $self, $file ) = @_;
+   $file ||= $self->{file} || __FILE__;
+   PTDEBUG && _d("Parsing SYNOPSIS in", $file);
+
+   local $INPUT_RECORD_SEPARATOR = '';  # read paragraphs
+   open my $fh, "<", $file or die "Cannot open $file: $OS_ERROR";
+   my $para;
+   1 while defined($para = <$fh>) && $para !~ m/^=head1 SYNOPSIS/;
+   die "$file does not contain a SYNOPSIS section" unless $para;
+   my @synop;
+   for ( 1..2 ) {  # 1 for the usage, 2 for the description
+      my $para = <$fh>;
+      push @synop, $para;
+   }
+   close $fh;
+   PTDEBUG && _d("Raw SYNOPSIS text:", @synop);
+   my ($usage, $desc) = @synop;
+   die "The SYNOPSIS section in $file is not formatted properly"
+      unless $usage && $desc;
+
+   $usage =~ s/^\s*Usage:\s+(.+)/$1/;
+   chomp $usage;
+
+   $desc =~ s/\n/ /g;
+   $desc =~ s/\s{2,}/ /g;
+   $desc =~ s/\. ([A-Z][a-z])/.  $1/g;
+   $desc =~ s/\s+$//;
+
+   return (
+      description => $desc,
+      usage       => $usage,
+   );
+};
+
+sub set_vars {
+   my ($self, $file) = @_;
+   $file ||= $self->{file} || __FILE__;
+
+   my %user_vars;
+   my $user_vars = $self->has('set-vars') ? $self->get('set-vars') : undef;
+   if ( $user_vars ) {
+      foreach my $var_val ( @$user_vars ) {
+         my ($var, $val) = $var_val =~ m/([^\s=]+)=(\S+)/;
+         die "Invalid --set-vars value: $var_val\n" unless $var && defined $val;
+         $user_vars{$var} = {
+            val     => $val,
+            default => 0,
+         };
+      }
+   }
+
+   my %default_vars;
+   my $default_vars = $self->read_para_after($file, qr/MAGIC_set_vars/);
+   if ( $default_vars ) {
+      %default_vars = map {
+         my $var_val = $_;
+         my ($var, $val) = $var_val =~ m/([^\s=]+)=(\S+)/;
+         die "Invalid --set-vars value: $var_val\n" unless $var && defined $val;
+         $var => {
+            val     => $val,
+            default => 1,
+         };
+      } split("\n", $default_vars);
+   }
+
+   my %vars = (
+      %default_vars, # first the tool's defaults
+      %user_vars,    # then the user's which overwrite the defaults
+   );
+   PTDEBUG && _d('--set-vars:', Dumper(\%vars));
+   return \%vars;
+}
+
+sub _d {
+   my ($package, undef, $line) = caller 0;
+   @_ = map { (my $temp = $_) =~ s/\n/\n# /g; $temp; }
+        map { defined $_ ? $_ : 'undef' }
+        @_;
+   print STDERR "# $package:$line $PID ", join(' ', @_), "\n";
+}
+
+if ( PTDEBUG ) {
+   print STDERR '# ', $^X, ' ', $], "\n";
+   if ( my $uname = `uname -a` ) {
+      $uname =~ s/\s+/ /g;
+      print STDERR "# $uname\n";
+   }
+   print STDERR '# Arguments: ',
+      join(' ', map { my $a = "_[$_]_"; $a =~ s/\n/\n# /g; $a; } @ARGV), "\n";
+}
+
+1;
+}
+# ###########################################################################
+# End OptionParser package
+# ###########################################################################
+
+# ###########################################################################
+# Lmo::Utils package
+# This package is a copy without comments from the original.  The original
+# with comments and its test file can be found in the GitHub repository at,
+#   lib/Lmo/Utils.pm
+#   t/lib/Lmo/Utils.t
+# See https://github.com/percona/percona-toolkit for more information.
+# ###########################################################################
+{
+package Lmo::Utils;
+
+use strict;
+use warnings qw( FATAL all );
+require Exporter;
+our (@ISA, @EXPORT, @EXPORT_OK);
+
+BEGIN {
+   @ISA = qw(Exporter);
+   @EXPORT = @EXPORT_OK = qw(
+      _install_coderef
+      _unimport_coderefs
+      _glob_for
+      _stash_for
+   );
+}
+
+{
+   no strict 'refs';
+   sub _glob_for {
+      return \*{shift()}
+   }
+
+   sub _stash_for {
+      return \%{ shift() . "::" };
+   }
+}
+
+sub _install_coderef {
+   my ($to, $code) = @_;
+
+   return *{ _glob_for $to } = $code;
+}
+
+sub _unimport_coderefs {
+   my ($target, @names) = @_;
+   return unless @names;
+   my $stash = _stash_for($target);
+   foreach my $name (@names) {
+      if ($stash->{$name} and defined(&{$stash->{$name}})) {
+         delete $stash->{$name};
+      }
+   }
+}
+
+1;
+}
+# ###########################################################################
+# End Lmo::Utils package
+# ###########################################################################
+
+# ###########################################################################
+# Lmo::Meta package
+# This package is a copy without comments from the original.  The original
+# with comments and its test file can be found in the GitHub repository at,
+#   lib/Lmo/Meta.pm
+#   t/lib/Lmo/Meta.t
+# See https://github.com/percona/percona-toolkit for more information.
+# ###########################################################################
+{
+package Lmo::Meta;
+use strict;
+use warnings qw( FATAL all );
+
+my %metadata_for;
+
+sub new {
+   my $class = shift;
+   return bless { @_ }, $class
+}
+
+sub metadata_for {
+   my $self    = shift;
+   my ($class) = @_;
+
+   return $metadata_for{$class} ||= {};
+}
+
+sub class { shift->{class} }
+
+sub attributes {
+   my $self = shift;
+   return keys %{$self->metadata_for($self->class)}
+}
+
+sub attributes_for_new {
+   my $self = shift;
+   my @attributes;
+
+   my $class_metadata = $self->metadata_for($self->class);
+   while ( my ($attr, $meta) = each %$class_metadata ) {
+      if ( exists $meta->{init_arg} ) {
+         push @attributes, $meta->{init_arg}
+               if defined $meta->{init_arg};
+      }
+      else {
+         push @attributes, $attr;
+      }
+   }
+   return @attributes;
+}
+
+1;
+}
+# ###########################################################################
+# End Lmo::Meta package
+# ###########################################################################
+
+# ###########################################################################
+# Lmo::Object package
+# This package is a copy without comments from the original.  The original
+# with comments and its test file can be found in the GitHub repository at,
+#   lib/Lmo/Object.pm
+#   t/lib/Lmo/Object.t
+# See https://github.com/percona/percona-toolkit for more information.
+# ###########################################################################
+{
+package Lmo::Object;
+
+use strict;
+use warnings qw( FATAL all );
+
+use Carp ();
+use Scalar::Util qw(blessed);
+
+use Lmo::Meta;
+use Lmo::Utils qw(_glob_for);
+
+sub new {
+   my $class = shift;
+   my $args  = $class->BUILDARGS(@_);
+
+   my $class_metadata = Lmo::Meta->metadata_for($class);
+
+   my @args_to_delete;
+   while ( my ($attr, $meta) = each %$class_metadata ) {
+      next unless exists $meta->{init_arg};
+      my $init_arg = $meta->{init_arg};
+
+      if ( defined $init_arg ) {
+         $args->{$attr} = delete $args->{$init_arg};
+      }
+      else {
+         push @args_to_delete, $attr;
+      }
+   }
+
+   delete $args->{$_} for @args_to_delete;
+
+   for my $attribute ( keys %$args ) {
+      if ( my $coerce = $class_metadata->{$attribute}{coerce} ) {
+         $args->{$attribute} = $coerce->($args->{$attribute});
+      }
+      if ( my $isa_check = $class_metadata->{$attribute}{isa} ) {
+         my ($check_name, $check_sub) = @$isa_check;
+         $check_sub->($args->{$attribute});
+      }
+   }
+
+   while ( my ($attribute, $meta) = each %$class_metadata ) {
+      next unless $meta->{required};
+      Carp::confess("Attribute ($attribute) is required for $class")
+         if ! exists $args->{$attribute}
+   }
+
+   my $self = bless $args, $class;
+
+   my @build_subs;
+   my $linearized_isa = mro::get_linear_isa($class);
+
+   for my $isa_class ( @$linearized_isa ) {
+      unshift @build_subs, *{ _glob_for "${isa_class}::BUILD" }{CODE};
+   }
+   my @args = %$args;
+   for my $sub (grep { defined($_) && exists &$_ } @build_subs) {
+      $sub->( $self, @args);
+   }
+   return $self;
+}
+
+sub BUILDARGS {
+   shift; # No need for the classname
+   if ( @_ == 1 && ref($_[0]) ) {
+      Carp::confess("Single parameters to new() must be a HASH ref, not $_[0]")
+         unless ref($_[0]) eq ref({});
+      return {%{$_[0]}} # We want a new reference, always
+   }
+   else {
+      return { @_ };
+   }
+}
+
+sub meta {
+   my $class = shift;
+   $class    = Scalar::Util::blessed($class) || $class;
+   return Lmo::Meta->new(class => $class);
+}
+
+1;
+}
+# ###########################################################################
+# End Lmo::Object package
+# ###########################################################################
+
+# ###########################################################################
+# Lmo::Types package
+# This package is a copy without comments from the original.  The original
+# with comments and its test file can be found in the GitHub repository at,
+#   lib/Lmo/Types.pm
+#   t/lib/Lmo/Types.t
+# See https://github.com/percona/percona-toolkit for more information.
+# ###########################################################################
+{
+package Lmo::Types;
+
+use strict;
+use warnings qw( FATAL all );
+
+use Carp ();
+use Scalar::Util qw(looks_like_number blessed);
+
+
+our %TYPES = (
+   Bool   => sub { !$_[0] || (defined $_[0] && looks_like_number($_[0]) && $_[0] == 1) },
+   Num    => sub { defined $_[0] && looks_like_number($_[0]) },
+   Int    => sub { defined $_[0] && looks_like_number($_[0]) && $_[0] == int($_[0]) },
+   Str    => sub { defined $_[0] },
+   Object => sub { defined $_[0] && blessed($_[0]) },
+   FileHandle => sub { local $@; require IO::Handle; fileno($_[0]) && $_[0]->opened },
+
+   map {
+      my $type = /R/ ? $_ : uc $_;
+      $_ . "Ref" => sub { ref $_[0] eq $type }
+   } qw(Array Code Hash Regexp Glob Scalar)
+);
+
+sub check_type_constraints {
+   my ($attribute, $type_check, $check_name, $val) = @_;
+   ( ref($type_check) eq 'CODE'
+      ? $type_check->($val)
+      : (ref $val eq $type_check
+         || ($val && $val eq $type_check)
+         || (exists $TYPES{$type_check} && $TYPES{$type_check}->($val)))
+   )
+   || Carp::confess(
+        qq<Attribute ($attribute) does not pass the type constraint because: >
+      . qq<Validation failed for '$check_name' with value >
+      . (defined $val ? Lmo::Dumper($val) : 'undef') )
+}
+
+sub _nested_constraints {
+   my ($attribute, $aggregate_type, $type) = @_;
+
+   my $inner_types;
+   if ( $type =~ /\A(ArrayRef|Maybe)\[(.*)\]\z/ ) {
+      $inner_types = _nested_constraints($1, $2);
+   }
+   else {
+      $inner_types = $TYPES{$type};
+   }
+
+   if ( $aggregate_type eq 'ArrayRef' ) {
+      return sub {
+         my ($val) = @_;
+         return unless ref($val) eq ref([]);
+
+         if ($inner_types) {
+            for my $value ( @{$val} ) {
+               return unless $inner_types->($value)
+            }
+         }
+         else {
+            for my $value ( @{$val} ) {
+               return unless $value && ($value eq $type
+                        || (Scalar::Util::blessed($value) && $value->isa($type)));
+            }
+         }
+         return 1;
+      };
+   }
+   elsif ( $aggregate_type eq 'Maybe' ) {
+      return sub {
+         my ($value) = @_;
+         return 1 if ! defined($value);
+         if ($inner_types) {
+            return unless $inner_types->($value)
+         }
+         else {
+            return unless $value eq $type
+                        || (Scalar::Util::blessed($value) && $value->isa($type));
+         }
+         return 1;
+      }
+   }
+   else {
+      Carp::confess("Nested aggregate types are only implemented for ArrayRefs and Maybe");
+   }
+}
+
+1;
+}
+# ###########################################################################
+# End Lmo::Types package
+# ###########################################################################
+
+# ###########################################################################
+# Lmo package
+# This package is a copy without comments from the original.  The original
+# with comments and its test file can be found in the GitHub repository at,
+#   lib/Lmo.pm
+#   t/lib/Lmo.t
+# See https://github.com/percona/percona-toolkit for more information.
+# ###########################################################################
+{
+BEGIN {
+$INC{"Lmo.pm"} = __FILE__;
+package Lmo;
+our $VERSION = '0.30_Percona'; # Forked from 0.30 of Mo.
+
+
+use strict;
+use warnings qw( FATAL all );
+
+use Carp ();
+use Scalar::Util qw(looks_like_number blessed);
+
+use Lmo::Meta;
+use Lmo::Object;
+use Lmo::Types;
+
+use Lmo::Utils;
+
+my %export_for;
+sub import {
+   warnings->import(qw(FATAL all));
+   strict->import();
+
+   my $caller     = scalar caller(); # Caller's package
+   my %exports = (
+      extends  => \&extends,
+      has      => \&has,
+      with     => \&with,
+      override => \&override,
+      confess  => \&Carp::confess,
+   );
+
+   $export_for{$caller} = \%exports;
+
+   for my $keyword ( keys %exports ) {
+      _install_coderef "${caller}::$keyword" => $exports{$keyword};
+   }
+
+   if ( !@{ *{ _glob_for "${caller}::ISA" }{ARRAY} || [] } ) {
+      @_ = "Lmo::Object";
+      goto *{ _glob_for "${caller}::extends" }{CODE};
+   }
+}
+
+sub extends {
+   my $caller = scalar caller();
+   for my $class ( @_ ) {
+      _load_module($class);
+   }
+   _set_package_isa($caller, @_);
+   _set_inherited_metadata($caller);
+}
+
+sub _load_module {
+   my ($class) = @_;
+
+   (my $file = $class) =~ s{::|'}{/}g;
+   $file .= '.pm';
+   { local $@; eval { require "$file" } } # or warn $@;
+   return;
+}
+
+sub with {
+   my $package = scalar caller();
+   require Role::Tiny;
+   for my $role ( @_ ) {
+      _load_module($role);
+      _role_attribute_metadata($package, $role);
+   }
+   Role::Tiny->apply_roles_to_package($package, @_);
+}
+
+sub _role_attribute_metadata {
+   my ($package, $role) = @_;
+
+   my $package_meta = Lmo::Meta->metadata_for($package);
+   my $role_meta    = Lmo::Meta->metadata_for($role);
+
+   %$package_meta = (%$role_meta, %$package_meta);
+}
+
+sub has {
+   my $names  = shift;
+   my $caller = scalar caller();
+
+   my $class_metadata = Lmo::Meta->metadata_for($caller);
+
+   for my $attribute ( ref $names ? @$names : $names ) {
+      my %args   = @_;
+      my $method = ($args{is} || '') eq 'ro'
+         ? sub {
+            Carp::confess("Cannot assign a value to a read-only accessor at reader ${caller}::${attribute}")
+               if $#_;
+            return $_[0]{$attribute};
+         }
+         : sub {
+            return $#_
+                  ? $_[0]{$attribute} = $_[1]
+                  : $_[0]{$attribute};
+         };
+
+      $class_metadata->{$attribute} = ();
+
+      if ( my $type_check = $args{isa} ) {
+         my $check_name = $type_check;
+
+         if ( my ($aggregate_type, $inner_type) = $type_check =~ /\A(ArrayRef|Maybe)\[(.*)\]\z/ ) {
+            $type_check = Lmo::Types::_nested_constraints($attribute, $aggregate_type, $inner_type);
+         }
+
+         my $check_sub = sub {
+            my ($new_val) = @_;
+            Lmo::Types::check_type_constraints($attribute, $type_check, $check_name, $new_val);
+         };
+
+         $class_metadata->{$attribute}{isa} = [$check_name, $check_sub];
+         my $orig_method = $method;
+         $method = sub {
+            $check_sub->($_[1]) if $#_;
+            goto &$orig_method;
+         };
+      }
+
+      if ( my $builder = $args{builder} ) {
+         my $original_method = $method;
+         $method = sub {
+               $#_
+                  ? goto &$original_method
+                  : ! exists $_[0]{$attribute}
+                     ? $_[0]{$attribute} = $_[0]->$builder
+                     : goto &$original_method
+         };
+      }
+
+      if ( my $code = $args{default} ) {
+         Carp::confess("${caller}::${attribute}'s default is $code, but should be a coderef")
+               unless ref($code) eq 'CODE';
+         my $original_method = $method;
+         $method = sub {
+               $#_
+                  ? goto &$original_method
+                  : ! exists $_[0]{$attribute}
+                     ? $_[0]{$attribute} = $_[0]->$code
+                     : goto &$original_method
+         };
+      }
+
+      if ( my $role = $args{does} ) {
+         my $original_method = $method;
+         $method = sub {
+            if ( $#_ ) {
+               Carp::confess(qq<Attribute ($attribute) doesn't consume a '$role' role">)
+                  unless Scalar::Util::blessed($_[1]) && eval { $_[1]->does($role) }
+            }
+            goto &$original_method
+         };
+      }
+
+      if ( my $coercion = $args{coerce} ) {
+         $class_metadata->{$attribute}{coerce} = $coercion;
+         my $original_method = $method;
+         $method = sub {
+            if ( $#_ ) {
+               return $original_method->($_[0], $coercion->($_[1]))
+            }
+            goto &$original_method;
+         }
+      }
+
+      _install_coderef "${caller}::$attribute" => $method;
+
+      if ( $args{required} ) {
+         $class_metadata->{$attribute}{required} = 1;
+      }
+
+      if ($args{clearer}) {
+         _install_coderef "${caller}::$args{clearer}"
+            => sub { delete shift->{$attribute} }
+      }
+
+      if ($args{predicate}) {
+         _install_coderef "${caller}::$args{predicate}"
+            => sub { exists shift->{$attribute} }
+      }
+
+      if ($args{handles}) {
+         _has_handles($caller, $attribute, \%args);
+      }
+
+      if (exists $args{init_arg}) {
+         $class_metadata->{$attribute}{init_arg} = $args{init_arg};
+      }
+   }
+}
+
+sub _has_handles {
+   my ($caller, $attribute, $args) = @_;
+   my $handles = $args->{handles};
+
+   my $ref = ref $handles;
+   my $kv;
+   if ( $ref eq ref [] ) {
+         $kv = { map { $_,$_ } @{$handles} };
+   }
+   elsif ( $ref eq ref {} ) {
+         $kv = $handles;
+   }
+   elsif ( $ref eq ref qr// ) {
+         Carp::confess("Cannot delegate methods based on a Regexp without a type constraint (isa)")
+            unless $args->{isa};
+         my $target_class = $args->{isa};
+         $kv = {
+            map   { $_, $_     }
+            grep  { $_ =~ $handles }
+            grep  { !exists $Lmo::Object::{$_} && $target_class->can($_) }
+            grep  { !$export_for{$target_class}->{$_} }
+            keys %{ _stash_for $target_class }
+         };
+   }
+   else {
+         Carp::confess("handles for $ref not yet implemented");
+   }
+
+   while ( my ($method, $target) = each %{$kv} ) {
+         my $name = _glob_for "${caller}::$method";
+         Carp::confess("You cannot overwrite a locally defined method ($method) with a delegation")
+            if defined &$name;
+
+         my ($target, @curried_args) = ref($target) ? @$target : $target;
+         *$name = sub {
+            my $self        = shift;
+            my $delegate_to = $self->$attribute();
+            my $error = "Cannot delegate $method to $target because the value of $attribute";
+            Carp::confess("$error is not defined") unless $delegate_to;
+            Carp::confess("$error is not an object (got '$delegate_to')")
+               unless Scalar::Util::blessed($delegate_to) || (!ref($delegate_to) && $delegate_to->can($target));
+            return $delegate_to->$target(@curried_args, @_);
+         }
+   }
+}
+
+sub _set_package_isa {
+   my ($package, @new_isa) = @_;
+   my $package_isa  = \*{ _glob_for "${package}::ISA" };
+   @{*$package_isa} = @new_isa;
+}
+
+sub _set_inherited_metadata {
+   my $class = shift;
+   my $class_metadata = Lmo::Meta->metadata_for($class);
+   my $linearized_isa = mro::get_linear_isa($class);
+   my %new_metadata;
+
+   for my $isa_class (reverse @$linearized_isa) {
+      my $isa_metadata = Lmo::Meta->metadata_for($isa_class);
+      %new_metadata = (
+         %new_metadata,
+         %$isa_metadata,
+      );
+   }
+   %$class_metadata = %new_metadata;
+}
+
+sub unimport {
+   my $caller = scalar caller();
+   my $target = caller;
+  _unimport_coderefs($target, keys %{$export_for{$caller}});
+}
+
+sub Dumper {
+   require Data::Dumper;
+   local $Data::Dumper::Indent    = 0;
+   local $Data::Dumper::Sortkeys  = 0;
+   local $Data::Dumper::Quotekeys = 0;
+   local $Data::Dumper::Terse     = 1;
+
+   Data::Dumper::Dumper(@_)
+}
+
+BEGIN {
+   if ($] >= 5.010) {
+      { local $@; require mro; }
+   }
+   else {
+      local $@;
+      eval {
+         require MRO::Compat;
+      } or do {
+         *mro::get_linear_isa = *mro::get_linear_isa_dfs = sub {
+            no strict 'refs';
+
+            my $classname = shift;
+
+            my @lin = ($classname);
+            my %stored;
+            foreach my $parent (@{"$classname\::ISA"}) {
+               my $plin = mro::get_linear_isa_dfs($parent);
+               foreach (@$plin) {
+                     next if exists $stored{$_};
+                     push(@lin, $_);
+                     $stored{$_} = 1;
+               }
+            }
+            return \@lin;
+         };
+      }
+   }
+}
+
+sub override {
+   my ($methods, $code) = @_;
+   my $caller          = scalar caller;
+
+   for my $method ( ref($methods) ? @$methods : $methods ) {
+      my $full_method     = "${caller}::${method}";
+      *{_glob_for $full_method} = $code;
+   }
+}
+
+}
+1;
+}
+# ###########################################################################
+# End Lmo package
+# ###########################################################################
+
+# ###########################################################################
+# VersionParser package
+# This package is a copy without comments from the original.  The original
+# with comments and its test file can be found in the GitHub repository at,
+#   lib/VersionParser.pm
+#   t/lib/VersionParser.t
+# See https://github.com/percona/percona-toolkit for more information.
+# ###########################################################################
+{
+package VersionParser;
+
+use Lmo;
+use Scalar::Util qw(blessed);
+use English qw(-no_match_vars);
+use constant PTDEBUG => $ENV{PTDEBUG} || 0;
+
+use overload (
+   '""'     => "version",
+   '<=>'    => "cmp",
+   'cmp'    => "cmp",
+   fallback => 1,
+);
+
+use Carp ();
+
+has major => (
+    is       => 'ro',
+    isa      => 'Int',
+    required => 1,
+);
+
+has [qw( minor revision )] => (
+    is  => 'ro',
+    isa => 'Num',
+);
+
+has flavor => (
+    is      => 'ro',
+    isa     => 'Str',
+    default => sub { 'Unknown' },
+);
+
+has innodb_version => (
+    is      => 'ro',
+    isa     => 'Str',
+    default => sub { 'NO' },
+);
+
+sub series {
+   my $self = shift;
+   return $self->_join_version($self->major, $self->minor);
+}
+
+sub version {
+   my $self = shift;
+   return $self->_join_version($self->major, $self->minor, $self->revision);
+}
+
+sub is_in {
+   my ($self, $target) = @_;
+
+   return $self eq $target;
+}
+
+sub _join_version {
+    my ($self, @parts) = @_;
+
+    return join ".", map { my $c = $_; $c =~ s/^0\./0/; $c } grep defined, @parts;
+}
+sub _split_version {
+   my ($self, $str) = @_;
+   my @version_parts = map { s/^0(?=\d)/0./; $_ } $str =~ m/(\d+)/g;
+   return @version_parts[0..2];
+}
+
+sub normalized_version {
+   my ( $self ) = @_;
+   my $result = sprintf('%d%02d%02d', map { $_ || 0 } $self->major,
+                                                      $self->minor,
+                                                      $self->revision);
+   PTDEBUG && _d($self->version, 'normalizes to', $result);
+   return $result;
+}
+
+sub comment {
+   my ( $self, $cmd ) = @_;
+   my $v = $self->normalized_version();
+
+   return "/*!$v $cmd */"
+}
+
+my @methods = qw(major minor revision);
+sub cmp {
+   my ($left, $right) = @_;
+   my $right_obj = (blessed($right) && $right->isa(ref($left)))
+                   ? $right
+                   : ref($left)->new($right);
+
+   my $retval = 0;
+   for my $m ( @methods ) {
+      last unless defined($left->$m) && defined($right_obj->$m);
+      $retval = $left->$m <=> $right_obj->$m;
+      last if $retval;
+   }
+   return $retval;
+}
+
+sub BUILDARGS {
+   my $self = shift;
+
+   if ( @_ == 1 ) {
+      my %args;
+      if ( blessed($_[0]) && $_[0]->can("selectrow_hashref") ) {
+         PTDEBUG && _d("VersionParser got a dbh, trying to get the version");
+         my $dbh = $_[0];
+         local $dbh->{FetchHashKeyName} = 'NAME_lc';
+         my $query = eval {
+            $dbh->selectall_arrayref(q/SHOW VARIABLES LIKE 'version%'/, { Slice => {} })
+         };
+         if ( $query ) {
+            $query = { map { $_->{variable_name} => $_->{value} } @$query };
+            @args{@methods} = $self->_split_version($query->{version});
+            $args{flavor} = delete $query->{version_comment}
+                  if $query->{version_comment};
+         }
+         elsif ( eval { ($query) = $dbh->selectrow_array(q/SELECT VERSION()/) } ) {
+            @args{@methods} = $self->_split_version($query);
+         }
+         else {
+            Carp::confess("Couldn't get the version from the dbh while "
+                        . "creating a VersionParser object: $@");
+         }
+         $args{innodb_version} = eval { $self->_innodb_version($dbh) };
+      }
+      elsif ( !ref($_[0]) ) {
+         @args{@methods} = $self->_split_version($_[0]);
+      }
+
+      for my $method (@methods) {
+         delete $args{$method} unless defined $args{$method};
+      }
+      @_ = %args if %args;
+   }
+
+   return $self->SUPER::BUILDARGS(@_);
+}
+
+sub _innodb_version {
+   my ( $self, $dbh ) = @_;
+   return unless $dbh;
+   my $innodb_version = "NO";
+
+   my ($innodb) =
+      grep { $_->{engine} =~ m/InnoDB/i }
+      map  {
+         my %hash;
+         @hash{ map { lc $_ } keys %$_ } = values %$_;
+         \%hash;
+      }
+      @{ $dbh->selectall_arrayref("SHOW ENGINES", {Slice=>{}}) };
+   if ( $innodb ) {
+      PTDEBUG && _d("InnoDB support:", $innodb->{support});
+      if ( $innodb->{support} =~ m/YES|DEFAULT/i ) {
+         my $vars = $dbh->selectrow_hashref(
+            "SHOW VARIABLES LIKE 'innodb_version'");
+         $innodb_version = !$vars ? "BUILTIN"
+                         :          ($vars->{Value} || $vars->{value});
+      }
+      else {
+         $innodb_version = $innodb->{support};  # probably DISABLED or NO
+      }
+   }
+
+   PTDEBUG && _d("InnoDB version:", $innodb_version);
+   return $innodb_version;
+}
+
+sub _d {
+   my ($package, undef, $line) = caller 0;
+   @_ = map { (my $temp = $_) =~ s/\n/\n# /g; $temp; }
+        map { defined $_ ? $_ : 'undef' }
+        @_;
+   print STDERR "# $package:$line $PID ", join(' ', @_), "\n";
+}
+
+no Lmo;
+1;
+}
+# ###########################################################################
+# End VersionParser package
+# ###########################################################################
+
+# ###########################################################################
+# DSNParser package
+# This package is a copy without comments from the original.  The original
+# with comments and its test file can be found in the GitHub repository at,
+#   lib/DSNParser.pm
+#   t/lib/DSNParser.t
+# See https://github.com/percona/percona-toolkit for more information.
+# ###########################################################################
+{
+package DSNParser;
+
+use strict;
+use warnings FATAL => 'all';
+use English qw(-no_match_vars);
+use constant PTDEBUG => $ENV{PTDEBUG} || 0;
+
+use Data::Dumper;
+$Data::Dumper::Indent    = 0;
+$Data::Dumper::Quotekeys = 0;
+
+my $dsn_sep = qr/(?<!\\),/;
+
+eval {
+   require DBI;
+};
+my $have_dbi = $EVAL_ERROR ? 0 : 1;
+
+sub new {
+   my ( $class, %args ) = @_;
+   foreach my $arg ( qw(opts) ) {
+      die "I need a $arg argument" unless $args{$arg};
+   }
+   my $self = {
+      opts => {}  # h, P, u, etc.  Should come from DSN OPTIONS section in POD.
+   };
+   foreach my $opt ( @{$args{opts}} ) {
+      if ( !$opt->{key} || !$opt->{desc} ) {
+         die "Invalid DSN option: ", Dumper($opt);
+      }
+      PTDEBUG && _d('DSN option:',
+         join(', ',
+            map { "$_=" . (defined $opt->{$_} ? ($opt->{$_} || '') : 'undef') }
+               keys %$opt
+         )
+      );
+      $self->{opts}->{$opt->{key}} = {
+         dsn  => $opt->{dsn},
+         desc => $opt->{desc},
+         copy => $opt->{copy} || 0,
+      };
+   }
+   return bless $self, $class;
+}
+
+sub prop {
+   my ( $self, $prop, $value ) = @_;
+   if ( @_ > 2 ) {
+      PTDEBUG && _d('Setting', $prop, 'property');
+      $self->{$prop} = $value;
+   }
+   return $self->{$prop};
+}
+
+sub parse {
+   my ( $self, $dsn, $prev, $defaults ) = @_;
+   if ( !$dsn ) {
+      PTDEBUG && _d('No DSN to parse');
+      return;
+   }
+   PTDEBUG && _d('Parsing', $dsn);
+   $prev     ||= {};
+   $defaults ||= {};
+   my %given_props;
+   my %final_props;
+   my $opts = $self->{opts};
+
+   foreach my $dsn_part ( split($dsn_sep, $dsn) ) {
+      $dsn_part =~ s/\\,/,/g;
+      if ( my ($prop_key, $prop_val) = $dsn_part =~  m/^(.)=(.*)$/ ) {
+         $given_props{$prop_key} = $prop_val;
+      }
+      else {
+         PTDEBUG && _d('Interpreting', $dsn_part, 'as h=', $dsn_part);
+         $given_props{h} = $dsn_part;
+      }
+   }
+
+   foreach my $key ( keys %$opts ) {
+      PTDEBUG && _d('Finding value for', $key);
+      $final_props{$key} = $given_props{$key};
+      if ( !defined $final_props{$key}
+           && defined $prev->{$key} && $opts->{$key}->{copy} )
+      {
+         $final_props{$key} = $prev->{$key};
+         PTDEBUG && _d('Copying value for', $key, 'from previous DSN');
+      }
+      if ( !defined $final_props{$key} ) {
+         $final_props{$key} = $defaults->{$key};
+         PTDEBUG && _d('Copying value for', $key, 'from defaults');
+      }
+   }
+
+   foreach my $key ( keys %given_props ) {
+      die "Unknown DSN option '$key' in '$dsn'.  For more details, "
+            . "please use the --help option, or try 'perldoc $PROGRAM_NAME' "
+            . "for complete documentation."
+         unless exists $opts->{$key};
+   }
+   if ( (my $required = $self->prop('required')) ) {
+      foreach my $key ( keys %$required ) {
+         die "Missing required DSN option '$key' in '$dsn'.  For more details, "
+               . "please use the --help option, or try 'perldoc $PROGRAM_NAME' "
+               . "for complete documentation."
+            unless $final_props{$key};
+      }
+   }
+
+   return \%final_props;
+}
+
+sub parse_options {
+   my ( $self, $o ) = @_;
+   die 'I need an OptionParser object' unless ref $o eq 'OptionParser';
+   my $dsn_string
+      = join(',',
+          map  { "$_=".$o->get($_); }
+          grep { $o->has($_) && $o->get($_) }
+          keys %{$self->{opts}}
+        );
+   PTDEBUG && _d('DSN string made from options:', $dsn_string);
+   return $self->parse($dsn_string);
+}
+
+sub as_string {
+   my ( $self, $dsn, $props ) = @_;
+   return $dsn unless ref $dsn;
+   my @keys = $props ? @$props : sort keys %$dsn;
+   return join(',',
+      map  { "$_=" . ($_ eq 'p' ? '...' : $dsn->{$_}) }
+      grep {
+         exists $self->{opts}->{$_}
+         && exists $dsn->{$_}
+         && defined $dsn->{$_}
+      } @keys);
+}
+
+sub usage {
+   my ( $self ) = @_;
+   my $usage
+      = "DSN syntax is key=value[,key=value...]  Allowable DSN keys:\n\n"
+      . "  KEY  COPY  MEANING\n"
+      . "  ===  ====  =============================================\n";
+   my %opts = %{$self->{opts}};
+   foreach my $key ( sort keys %opts ) {
+      $usage .= "  $key    "
+             .  ($opts{$key}->{copy} ? 'yes   ' : 'no    ')
+             .  ($opts{$key}->{desc} || '[No description]')
+             . "\n";
+   }
+   $usage .= "\n  If the DSN is a bareword, the word is treated as the 'h' key.\n";
+   return $usage;
+}
+
+sub get_cxn_params {
+   my ( $self, $info ) = @_;
+   my $dsn;
+   my %opts = %{$self->{opts}};
+   my $driver = $self->prop('dbidriver') || '';
+   if ( $driver eq 'Pg' ) {
+      $dsn = 'DBI:Pg:dbname=' . ( $info->{D} || '' ) . ';'
+         . join(';', map  { "$opts{$_}->{dsn}=$info->{$_}" }
+                     grep { defined $info->{$_} }
+                     qw(h P));
+   }
+   else {
+      $dsn = 'DBI:mysql:' . ( $info->{D} || '' ) . ';'
+         . join(';', map  { "$opts{$_}->{dsn}=$info->{$_}" }
+                     grep { defined $info->{$_} }
+                     qw(F h P S A s))
+         . ';mysql_read_default_group=client'
+         . ($info->{L} ? ';mysql_local_infile=1' : '');
+   }
+   PTDEBUG && _d($dsn);
+   return ($dsn, $info->{u}, $info->{p});
+}
+
+sub fill_in_dsn {
+   my ( $self, $dbh, $dsn ) = @_;
+   my $vars = $dbh->selectall_hashref('SHOW VARIABLES', 'Variable_name');
+   my ($user, $db) = $dbh->selectrow_array('SELECT USER(), DATABASE()');
+   $user =~ s/@.*//;
+   $dsn->{h} ||= $vars->{hostname}->{Value};
+   $dsn->{S} ||= $vars->{'socket'}->{Value};
+   $dsn->{P} ||= $vars->{port}->{Value};
+   $dsn->{u} ||= $user;
+   $dsn->{D} ||= $db;
+}
+
+sub get_dbh {
+   my ( $self, $cxn_string, $user, $pass, $opts ) = @_;
+   $opts ||= {};
+   my $defaults = {
+      AutoCommit         => 0,
+      RaiseError         => 1,
+      PrintError         => 0,
+      ShowErrorStatement => 1,
+      mysql_enable_utf8 => ($cxn_string =~ m/charset=utf8/i ? 1 : 0),
+   };
+   @{$defaults}{ keys %$opts } = values %$opts;
+   if (delete $defaults->{L}) { # L for LOAD DATA LOCAL INFILE, our own extension
+      $defaults->{mysql_local_infile} = 1;
+   }
+
+   if ( $opts->{mysql_use_result} ) {
+      $defaults->{mysql_use_result} = 1;
+   }
+
+   if ( !$have_dbi ) {
+      die "Cannot connect to MySQL because the Perl DBI module is not "
+         . "installed or not found.  Run 'perl -MDBI' to see the directories "
+         . "that Perl searches for DBI.  If DBI is not installed, try:\n"
+         . "  Debian/Ubuntu  apt-get install libdbi-perl\n"
+         . "  RHEL/CentOS    yum install perl-DBI\n"
+         . "  OpenSolaris    pkg install pkg:/SUNWpmdbi\n";
+
+   }
+
+   my $dbh;
+   my $tries = 2;
+   while ( !$dbh && $tries-- ) {
+      PTDEBUG && _d($cxn_string, ' ', $user, ' ', $pass,
+         join(', ', map { "$_=>$defaults->{$_}" } keys %$defaults ));
+
+      $dbh = eval { DBI->connect($cxn_string, $user, $pass, $defaults) };
+
+      if ( !$dbh && $EVAL_ERROR ) {
+         if ( $EVAL_ERROR =~ m/locate DBD\/mysql/i ) {
+            die "Cannot connect to MySQL because the Perl DBD::mysql module is "
+               . "not installed or not found.  Run 'perl -MDBD::mysql' to see "
+               . "the directories that Perl searches for DBD::mysql.  If "
+               . "DBD::mysql is not installed, try:\n"
+               . "  Debian/Ubuntu  apt-get install libdbd-mysql-perl\n"
+               . "  RHEL/CentOS    yum install perl-DBD-MySQL\n"
+               . "  OpenSolaris    pkg install pkg:/SUNWapu13dbd-mysql\n";
+         }
+         elsif ( $EVAL_ERROR =~ m/not a compiled character set|character set utf8/ ) {
+            PTDEBUG && _d('Going to try again without utf8 support');
+            delete $defaults->{mysql_enable_utf8};
+         }
+         if ( !$tries ) {
+            die $EVAL_ERROR;
+         }
+      }
+   }
+
+   if ( $cxn_string =~ m/mysql/i ) {
+      my $sql;
+
+      my ($charset) = $cxn_string =~ m/charset=([\w]+)/;
+      if ( $charset ) {
+         $sql = qq{/*!40101 SET NAMES "$charset"*/};
+         PTDEBUG && _d($dbh, $sql);
+         eval { $dbh->do($sql) };
+         if ( $EVAL_ERROR ) {
+            die "Error setting NAMES to $charset: $EVAL_ERROR";
+         }
+      }
+      else {
+         my ($mysql_version) = eval { $dbh->selectrow_array('SELECT VERSION()') };
+         if ( $EVAL_ERROR ) {
+            die "Cannot get MySQL version: $EVAL_ERROR";
+         }
+         my (undef, $character_set_server) = eval { $dbh->selectrow_array("SHOW VARIABLES LIKE 'character_set_server'") };
+         if ( $EVAL_ERROR ) {
+            die "Cannot get MySQL var character_set_server: $EVAL_ERROR";
+         }
+
+         if ( $mysql_version =~ m/^(\d+)\.(\d)\.(\d+).*/ ) {
+            if ( $1 >= 8 && $character_set_server =~ m/^utf8/ ) {
+               $dbh->{mysql_enable_utf8} = 1;
+               $charset = $character_set_server;
+               my $msg = "MySQL version $mysql_version >= 8 and character_set_server = $character_set_server\n".
+                        "Setting: SET NAMES $character_set_server";
+               PTDEBUG && _d($msg);
+               eval { $dbh->do("SET NAMES '$character_set_server'") };
+               if ( $EVAL_ERROR ) {
+                  die "Cannot SET NAMES $character_set_server: $EVAL_ERROR";
+               }
+            }
+         }
+      }
+      PTDEBUG && _d('Enabling charset for STDOUT');
+      if ( $charset && $charset =~ m/^utf8/ ) {
+         binmode(STDOUT, ':utf8')
+            or die "Can't binmode(STDOUT, ':utf8'): $OS_ERROR";
+         binmode(STDERR, ':utf8')
+            or die "Can't binmode(STDERR, ':utf8'): $OS_ERROR";
+      }
+      else {
+         binmode(STDOUT) or die "Can't binmode(STDOUT): $OS_ERROR";
+      }
+
+      if ( my $vars = $self->prop('set-vars') ) {
+         $self->set_vars($dbh, $vars);
+      }
+
+      $sql = 'SELECT @@SQL_MODE';
+      PTDEBUG && _d($dbh, $sql);
+      my ($sql_mode) = eval { $dbh->selectrow_array($sql) };
+      if ( $EVAL_ERROR ) {
+         die "Error getting the current SQL_MODE: $EVAL_ERROR";
+      }
+
+      $sql = 'SET @@SQL_QUOTE_SHOW_CREATE = 1'
+            . '/*!40101, @@SQL_MODE=\'NO_AUTO_VALUE_ON_ZERO'
+            . ($sql_mode ? ",$sql_mode" : '')
+            . '\'*/';
+      PTDEBUG && _d($dbh, $sql);
+      eval { $dbh->do($sql) };
+      if ( $EVAL_ERROR ) {
+         die "Error setting SQL_QUOTE_SHOW_CREATE, SQL_MODE"
+           . ($sql_mode ? " and $sql_mode" : '')
+           . ": $EVAL_ERROR";
+      }
+   }
+
+   PTDEBUG && _d('DBH info: ',
+      $dbh,
+      Dumper($dbh->selectrow_hashref(
+         'SELECT DATABASE(), CONNECTION_ID(), VERSION()/*!50038 , @@hostname*/')),
+      'Connection info:',      $dbh->{mysql_hostinfo},
+      'Character set info:',   Dumper($dbh->selectall_arrayref(
+                     "SHOW VARIABLES LIKE 'character_set%'", { Slice => {}})),
+      '$DBD::mysql::VERSION:', $DBD::mysql::VERSION,
+      '$DBI::VERSION:',        $DBI::VERSION,
+   );
+
+   return $dbh;
+}
+
+sub get_hostname {
+   my ( $self, $dbh ) = @_;
+   if ( my ($host) = ($dbh->{mysql_hostinfo} || '') =~ m/^(\w+) via/ ) {
+      return $host;
+   }
+   my ( $hostname, $one ) = $dbh->selectrow_array(
+      'SELECT /*!50038 @@hostname, */ 1');
+   return $hostname;
+}
+
+sub disconnect {
+   my ( $self, $dbh ) = @_;
+   PTDEBUG && $self->print_active_handles($dbh);
+   $dbh->disconnect;
+}
+
+sub print_active_handles {
+   my ( $self, $thing, $level ) = @_;
+   $level ||= 0;
+   printf("# Active %sh: %s %s %s\n", ($thing->{Type} || 'undef'), "\t" x $level,
+      $thing, (($thing->{Type} || '') eq 'st' ? $thing->{Statement} || '' : ''))
+      or die "Cannot print: $OS_ERROR";
+   foreach my $handle ( grep {defined} @{ $thing->{ChildHandles} } ) {
+      $self->print_active_handles( $handle, $level + 1 );
+   }
+}
+
+sub copy {
+   my ( $self, $dsn_1, $dsn_2, %args ) = @_;
+   die 'I need a dsn_1 argument' unless $dsn_1;
+   die 'I need a dsn_2 argument' unless $dsn_2;
+   my %new_dsn = map {
+      my $key = $_;
+      my $val;
+      if ( $args{overwrite} ) {
+         $val = defined $dsn_1->{$key} ? $dsn_1->{$key} : $dsn_2->{$key};
+      }
+      else {
+         $val = defined $dsn_2->{$key} ? $dsn_2->{$key} : $dsn_1->{$key};
+      }
+      $key => $val;
+   } keys %{$self->{opts}};
+   return \%new_dsn;
+}
+
+sub set_vars {
+   my ($self, $dbh, $vars) = @_;
+
+   return unless $vars;
+
+   foreach my $var ( sort keys %$vars ) {
+      my $val = $vars->{$var}->{val};
+
+      (my $quoted_var = $var) =~ s/_/\\_/;
+      my ($var_exists, $current_val);
+      eval {
+         ($var_exists, $current_val) = $dbh->selectrow_array(
+            "SHOW VARIABLES LIKE '$quoted_var'");
+      };
+      my $e = $EVAL_ERROR;
+      if ( $e ) {
+         PTDEBUG && _d($e);
+      }
+
+      if ( $vars->{$var}->{default} && !$var_exists ) {
+         PTDEBUG && _d('Not setting default var', $var,
+            'because it does not exist');
+         next;
+      }
+
+      if ( $current_val && $current_val eq $val ) {
+         PTDEBUG && _d('Not setting var', $var, 'because its value',
+            'is already', $val);
+         next;
+      }
+
+      my $sql = "SET SESSION $var=$val";
+      PTDEBUG && _d($dbh, $sql);
+      eval { $dbh->do($sql) };
+      if ( my $set_error = $EVAL_ERROR ) {
+         chomp($set_error);
+         $set_error =~ s/ at \S+ line \d+//;
+         my $msg = "Error setting $var: $set_error";
+         if ( $current_val ) {
+            $msg .= "  The current value for $var is $current_val.  "
+                  . "If the variable is read only (not dynamic), specify "
+                  . "--set-vars $var=$current_val to avoid this warning, "
+                  . "else manually set the variable and restart MySQL.";
+         }
+         warn $msg . "\n\n";
+      }
+   }
+
+   return;
+}
+
+sub _d {
+   my ($package, undef, $line) = caller 0;
+   @_ = map { (my $temp = $_) =~ s/\n/\n# /g; $temp; }
+        map { defined $_ ? $_ : 'undef' }
+        @_;
+   print STDERR "# $package:$line $PID ", join(' ', @_), "\n";
+}
+
+1;
+}
+# ###########################################################################
+# End DSNParser package
+# ###########################################################################
+
+# ###########################################################################
+# MasterSlave package
+# This package is a copy without comments from the original.  The original
+# with comments and its test file can be found in the GitHub repository at,
+#   lib/MasterSlave.pm
+#   t/lib/MasterSlave.t
+# See https://github.com/percona/percona-toolkit for more information.
+# ###########################################################################
+{
+package MasterSlave;
+
+use strict;
+use warnings FATAL => 'all';
+use English qw(-no_match_vars);
+use constant PTDEBUG => $ENV{PTDEBUG} || 0;
+
+sub check_recursion_method {
+   my ($methods) = @_;
+   if ( @$methods != 1 ) {
+      if ( grep({ !m/processlist|hosts/i } @$methods)
+            && $methods->[0] !~ /^dsn=/i )
+      {
+         die  "Invalid combination of recursion methods: "
+            . join(", ", map { defined($_) ? $_ : 'undef' } @$methods) . ". "
+            . "Only hosts and processlist may be combined.\n"
+      }
+   }
+   else {
+      my ($method) = @$methods;
+      die "Invalid recursion method: " . ( $method || 'undef' )
+         unless $method && $method =~ m/^(?:processlist$|hosts$|none$|cluster$|dsn=)/i;
+   }
+}
+
+sub new {
+   my ( $class, %args ) = @_;
+   my @required_args = qw(OptionParser DSNParser Quoter);
+   foreach my $arg ( @required_args ) {
+      die "I need a $arg argument" unless $args{$arg};
+   }
+   my $self = {
+      %args,
+      replication_thread => {},
+   };
+   return bless $self, $class;
+}
+
+sub get_replicas {
+   my ($self, %args) = @_;
+   my @required_args = qw(make_cxn);
+   foreach my $arg ( @required_args ) {
+      die "I need a $arg argument" unless $args{$arg};
+   }
+   my ($make_cxn) = @args{@required_args};
+
+   my $replicas  = [];
+   my $dp      = $self->{DSNParser};
+   my $methods = $self->_resolve_recursion_methods($args{dsn});
+
+   return $replicas unless @$methods;
+
+   if ( grep { m/processlist|hosts/i } @$methods ) {
+      my @required_args = qw(dbh dsn);
+      foreach my $arg ( @required_args ) {
+         die "I need a $arg argument" unless $args{$arg};
+      }
+      my ($dbh, $dsn) = @args{@required_args};
+      my $o = $self->{OptionParser};
+
+      $self->recurse_to_replicas(
+         {  dbh              => $dbh,
+            dsn              => $dsn,
+            replica_user     => $o->got('replica-user') ? $o->get('replica-user') : '',
+            replica_password => $o->got('replica-password') ? $o->get('replica-password') : '',
+            replicas         => $args{replicas},
+            callback  => sub {
+               my ( $dsn, $dbh, $level, $parent ) = @_;
+               return unless $level;
+               PTDEBUG && _d('Found replica:', $dp->as_string($dsn));
+               my $replica_dsn = $dsn;
+               if ($o->got('replica-user')) {
+                  $replica_dsn->{u} = $o->get('replica-user');
+                  PTDEBUG && _d("Using replica user ".$o->get('replica-user')." on ".$replica_dsn->{h}.":".$replica_dsn->{P});
+               }
+               if ($o->got('replica-password')) {
+                  $replica_dsn->{p} = $o->get('replica-password');
+                  PTDEBUG && _d("Replica password set");
+               }
+               push @$replicas, $make_cxn->(dsn => $replica_dsn, dbh => $dbh, parent => $parent);
+               return;
+            },
+            wait_no_die => $args{'wait_no_die'},
+         }
+      );
+   } elsif ( $methods->[0] =~ m/^dsn=/i ) {
+      (my $dsn_table_dsn = join ",", @$methods) =~ s/^dsn=//i;
+      $replicas = $self->get_cxn_from_dsn_table(
+         %args,
+         dsn_table_dsn => $dsn_table_dsn,
+         wait_no_die => $args{'wait_no_die'},
+      );
+   }
+   elsif ( $methods->[0] =~ m/none/i ) {
+      PTDEBUG && _d('Not getting to replicas');
+   }
+   else {
+      die "Unexpected recursion methods: @$methods";
+   }
+
+   return $replicas;
+}
+
+sub _resolve_recursion_methods {
+   my ($self, $dsn) = @_;
+   my $o = $self->{OptionParser};
+   if ( $o->got('recursion-method') ) {
+      return $o->get('recursion-method');
+   }
+   elsif ( $dsn && ($dsn->{P} || 3306) != 3306 ) {
+      PTDEBUG && _d('Port number is non-standard; using only hosts method');
+      return [qw(hosts)];
+   }
+   else {
+      return $o->get('recursion-method');
+   }
+}
+
+sub recurse_to_replicas {
+   my ( $self, $args, $level ) = @_;
+   $level ||= 0;
+   my $dp = $self->{DSNParser};
+   my $recurse = $args->{recurse} || $self->{OptionParser}->get('recurse');
+   my $dsn = $args->{dsn};
+   my $replica_user = $args->{replica_user} || '';
+   my $replica_password = $args->{replica_password} || '';
+
+   my $methods = $self->_resolve_recursion_methods($dsn);
+   PTDEBUG && _d('Recursion methods:', @$methods);
+   if ( lc($methods->[0]) eq 'none' ) {
+      PTDEBUG && _d('Not recursing to replicas');
+      return;
+   }
+
+   my $replica_dsn = $dsn;
+   if ($replica_user) {
+      $replica_dsn->{u} = $replica_user;
+      PTDEBUG && _d("Using replica user $replica_user on "
+         . $replica_dsn->{h} . ":" . ( $replica_dsn->{P} ? $replica_dsn->{P} : ""));
+   }
+   if ($replica_password) {
+      $replica_dsn->{p} = $replica_password;
+      PTDEBUG && _d("Replica password set");
+   }
+
+   my $dbh = $args->{dbh};
+
+   my $get_dbh = sub {
+         eval {
+            $dbh = $dp->get_dbh(
+               $dp->get_cxn_params($replica_dsn), { AutoCommit => 1 }
+            );
+            PTDEBUG && _d('Connected to', $dp->as_string($replica_dsn));
+         };
+         if ( $EVAL_ERROR ) {
+            print STDERR "Cannot connect to ", $dp->as_string($replica_dsn), ": ", $EVAL_ERROR, "\n"
+               or die "Cannot print: $OS_ERROR";
+            return;
+         }
+   };
+
+   DBH: {
+      if ( !defined $dbh ) {
+         foreach my $known_replica ( @{$args->{replicas}} ) {
+            if ($known_replica->{dsn}->{h} eq $replica_dsn->{h} and
+                $known_replica->{dsn}->{P} eq $replica_dsn->{P} ) {
+               $dbh = $known_replica->{dbh};
+               last DBH;
+            }
+         }
+         $get_dbh->();
+      }
+   }
+
+   my $sql  = 'SELECT @@SERVER_ID';
+   PTDEBUG && _d($sql);
+   my $id = undef;
+   do {
+      eval {
+         ($id) = $dbh->selectrow_array($sql);
+      };
+	   if ( $EVAL_ERROR ) {
+		   if ( $args->{wait_no_die} ) {
+			   print STDERR "Error getting server id: ", $EVAL_ERROR,
+               "\nRetrying query for server ", $replica_dsn->{h}, ":", $replica_dsn->{P}, "\n";
+            sleep 1;
+            $dbh->disconnect();
+            $get_dbh->();
+         } else {
+            die $EVAL_ERROR;
+         }
+      }
+   } until (defined $id);
+   PTDEBUG && _d('Working on server ID', $id);
+   my $source_thinks_i_am = $dsn->{server_id};
+   if ( !defined $id
+       || ( defined $source_thinks_i_am && $source_thinks_i_am != $id )
+       || $args->{server_ids_seen}->{$id}++
+   ) {
+      PTDEBUG && _d('Server ID seen, or not what source said');
+      if ( $args->{skip_callback} ) {
+         $args->{skip_callback}->($dsn, $dbh, $level, $args->{parent});
+      }
+      return;
+   }
+
+   $args->{callback}->($dsn, $dbh, $level, $args->{parent});
+
+   if ( !defined $recurse || $level < $recurse ) {
+
+      my @replicas =
+         grep { !$_->{source_id} || $_->{source_id} == $id } # Only my replicas.
+         $self->find_replica_hosts($dp, $dbh, $dsn, $methods);
+
+      foreach my $replica ( @replicas ) {
+         PTDEBUG && _d('Recursing from',
+            $dp->as_string($dsn), 'to', $dp->as_string($replica));
+         $self->recurse_to_replicas(
+            { %$args, dsn => $replica, dbh => undef, parent => $dsn, replica_user => $replica_user, $replica_password => $replica_password }, $level + 1 );
+      }
+   }
+}
+
+sub find_replica_hosts {
+   my ( $self, $dsn_parser, $dbh, $dsn, $methods ) = @_;
+
+   PTDEBUG && _d('Looking for replicas on', $dsn_parser->as_string($dsn),
+      'using methods', @$methods);
+
+   my @replicas;
+   METHOD:
+   foreach my $method ( @$methods ) {
+      my $find_replicas = "_find_replicas_by_$method";
+      PTDEBUG && _d('Finding replicas with', $find_replicas);
+      @replicas = $self->$find_replicas($dsn_parser, $dbh, $dsn);
+      last METHOD if @replicas;
+   }
+
+   PTDEBUG && _d('Found', scalar(@replicas), 'replicas');
+   return @replicas;
+}
+
+sub _find_replicas_by_processlist {
+   my ( $self, $dsn_parser, $dbh, $dsn ) = @_;
+   my @connected_replicas = $self->get_connected_replicas($dbh);
+   my @replicas = $self->_process_replicas_list($dsn_parser, $dsn, \@connected_replicas);
+   return @replicas;
+}
+
+sub _process_replicas_list {
+   my ($self, $dsn_parser, $dsn, $connected_replicas) = @_;
+   my @replicas = map  {
+      my $replica        = $dsn_parser->parse("h=$_", $dsn);
+      $replica->{source} = 'processlist';
+      $replica;
+   }
+   grep { $_ }
+   map  {
+      my ( $host ) = $_->{host} =~ m/^(.*):\d+$/;
+      if ( $host eq 'localhost' ) {
+         $host = '127.0.0.1'; # Replication never uses sockets.
+      }
+      if ($host =~ m/::/) {
+          $host = '['.$host.']';
+      }
+      $host;
+   } @$connected_replicas;
+
+   return @replicas;
+}
+
+sub _find_replicas_by_hosts {
+   my ( $self, $dsn_parser, $dbh, $dsn ) = @_;
+
+   my @replicas;
+
+   my $vp = VersionParser->new($dbh);
+   my $sql = 'SHOW REPLICAS';
+   my $source_name = 'source';
+   if ( $vp < '8.1' || $vp->flavor() =~ m/maria/ ) {
+      $sql = 'SHOW SLAVE HOSTS';
+      $source_name='master';
+   }
+   
+   PTDEBUG && _d($dbh, $sql);
+   @replicas = @{$dbh->selectall_arrayref($sql, { Slice => {} })};
+
+   if ( @replicas ) {
+      PTDEBUG && _d('Found some SHOW REPLICAS info');
+      @replicas = map {
+         my %hash;
+         @hash{ map { lc $_ } keys %$_ } = values %$_;
+         my $spec = "h=$hash{host},P=$hash{port}"
+            . ( $hash{user} ? ",u=$hash{user}" : '')
+            . ( $hash{password} ? ",p=$hash{password}" : '');
+         my $dsn           = $dsn_parser->parse($spec, $dsn);
+         $dsn->{server_id} = $hash{server_id};
+         $dsn->{source_id} = $hash{"${source_name}_id"};
+         $dsn->{source}    = 'hosts';
+         $dsn;
+      } @replicas;
+   }
+
+   return @replicas;
+}
+
+sub get_connected_replicas {
+   my ( $self, $dbh ) = @_;
+
+   my $show = "SHOW GRANTS FOR ";
+   my $user = 'CURRENT_USER()';
+   my $sql = $show . $user;
+   PTDEBUG && _d($dbh, $sql);
+
+   my $proc;
+   eval {
+      $proc = grep {
+         m/ALL PRIVILEGES.*?\*\.\*|PROCESS/
+      } @{$dbh->selectcol_arrayref($sql)};
+   };
+   if ( $EVAL_ERROR ) {
+
+      if ( $EVAL_ERROR =~ m/no such grant defined for user/ ) {
+         PTDEBUG && _d('Retrying SHOW GRANTS without host; error:',
+            $EVAL_ERROR);
+         ($user) = split('@', $user);
+         $sql    = $show . $user;
+         PTDEBUG && _d($sql);
+         eval {
+            $proc = grep {
+               m/ALL PRIVILEGES.*?\*\.\*|PROCESS/
+            } @{$dbh->selectcol_arrayref($sql)};
+         };
+      }
+
+      die "Failed to $sql: $EVAL_ERROR" if $EVAL_ERROR;
+   }
+   if ( !$proc ) {
+      die "You do not have the PROCESS privilege";
+   }
+
+   $sql = 'SHOW FULL PROCESSLIST';
+   PTDEBUG && _d($dbh, $sql);
+   grep { $_->{command} =~ m/Binlog Dump/i }
+   map  { # Lowercase the column names
+      my %hash;
+      @hash{ map { lc $_ } keys %$_ } = values %$_;
+      \%hash;
+   }
+   @{$dbh->selectall_arrayref($sql, { Slice => {} })};
+}
+
+sub is_source_of {
+   my ( $self, $source, $replica ) = @_;
+
+   my $replica_version = VersionParser->new($replica);
+   my $source_name = 'source';
+   my $source_port = 'source_port';
+   if ( $replica_version < '8.1' || $replica_version->flavor() =~ m/maria/ ) {
+      $source_name = 'master';
+      $source_port = 'master_port';
+   }
+
+   my $source_status = $self->get_source_status($source)
+      or die "The server specified as a source is not a source";
+   my $replica_status  = $self->get_replica_status($replica)
+      or die "The server specified as a replica is not a replica";
+   my @connected     = $self->get_connected_replicas($source)
+      or die "The server specified as a source has no connected replicas";
+   my (undef, $port) = $source->selectrow_array("SHOW VARIABLES LIKE 'port'");
+
+   if ( $port != $replica_status->{$source_port} ) {
+      die "The replica is connected to $replica_status->{$source_port} "
+         . "but the source's port is $port";
+   }
+
+   if ( !grep { $replica_status->{"${source_name}_user"} eq $_->{user} } @connected ) {
+      die "I don't see any replica I/O thread connected with user "
+         . $replica_status->{"${source_name}_user"};
+   }
+
+   if ( ($replica_status->{replica_io_state} || '')
+      eq 'Waiting for ${source_name} to send event' )
+   {
+      my ( $source_log_name, $source_log_num )
+         = $source_status->{file} =~ m/^(.*?)\.0*([1-9][0-9]*)$/;
+      my ( $replica_log_name, $replica_log_num )
+         = $replica_status->{source_log_file} =~ m/^(.*?)\.0*([1-9][0-9]*)$/;
+      if ( $source_log_name ne $replica_log_name
+         || abs($source_log_num - $replica_log_num) > 1 )
+      {
+         die "The replica thinks it is reading from "
+            . "$replica_status->{source_log_file},  but the "
+            . "source is writing to $source_status->{file}";
+      }
+   }
+   return 1;
+}
+
+sub get_source_dsn {
+   my ( $self, $dbh, $dsn, $dsn_parser ) = @_;
+
+   my $vp = VersionParser->new($dbh);
+   my $source_host = 'source_host';
+   my $source_port = 'source_port';
+   if ( $vp < '8.1' || $vp->flavor() =~ m/maria/ ) {
+      $source_host = 'master_host';
+      $source_port = 'master_port';
+   }
+
+   my $source = $self->get_replica_status($dbh) or return undef;
+   my $spec   = "h=$source->{${source_host}},P=$source->{${source_port}}";
+   return       $dsn_parser->parse($spec, $dsn);
+}
+
+sub get_replica_status {
+   my ( $self, $dbh ) = @_;
+
+   my $server_version = VersionParser->new($dbh);
+   my $replica_name = 'replica';
+   if ( $server_version < '8.1' || $server_version->flavor() =~ m/maria/ ) {
+      $replica_name = 'slave';
+   }
+
+   if ( !$self->{not_a_replica}->{$dbh} ) {
+      my $sth = $self->{sths}->{$dbh}->{REPLICA_STATUS}
+            ||= $dbh->prepare("SHOW ${replica_name} STATUS");
+      PTDEBUG && _d($dbh, "SHOW ${replica_name} STATUS");
+      $sth->execute();
+      my ($sss_rows) = $sth->fetchall_arrayref({}); # Show Replica Status rows
+
+      my $ss;
+      if ( $sss_rows && @$sss_rows ) {
+          if (scalar @$sss_rows > 1) {
+              if (!$self->{channel}) {
+                  die 'This server returned more than one row for SHOW REPLICA STATUS but "channel" was not specified on the command line';
+              }
+              my $replica_use_channels;
+              for my $row (@$sss_rows) {
+                  $row = { map { lc($_) => $row->{$_} } keys %$row }; # lowercase the keys
+                  if ($row->{channel_name}) {
+                      $replica_use_channels = 1;
+                  }
+                  if ($row->{channel_name} eq $self->{channel}) {
+                      $ss = $row;
+                      last;
+                  }
+              }
+              if (!$ss && $replica_use_channels) {
+                 die 'This server is using replication channels but "channel" was not specified on the command line';
+              }
+          } else {
+              if ($sss_rows->[0]->{channel_name} && $sss_rows->[0]->{channel_name} ne $self->{channel}) {
+                  die 'This server is using replication channels but "channel" was not specified on the command line';
+              } else {
+                  $ss = $sss_rows->[0];
+              }
+          }
+
+          if ( $ss && %$ss ) {
+             $ss = { map { lc($_) => $ss->{$_} } keys %$ss }; # lowercase the keys
+             return $ss;
+          }
+          if (!$ss && $self->{channel}) {
+              die "Specified channel name is invalid";
+          }
+      }
+
+      PTDEBUG && _d('This server returns nothing for SHOW REPLICA STATUS');
+      $self->{not_a_replica}->{$dbh}++;
+  }
+}
+
+sub get_source_status {
+   my ( $self, $dbh ) = @_;
+
+   if ( $self->{not_a_source}->{$dbh} ) {
+      PTDEBUG && _d('Server on dbh', $dbh, 'is not a source');
+      return;
+   }
+
+   my $vp = VersionParser->new($dbh);
+   my $source_name = 'binary log';
+   if ( $vp < '8.1' || $vp->flavor() =~ m/maria/ ) {
+      $source_name = 'master';
+   }
+
+   my $sth;
+   if ( $self->{sths}->{$dbh} && $dbh && $self->{sths}->{$dbh} == $dbh ) {
+      $sth = $self->{sths}->{$dbh}->{SOURCE_STATUS}
+         ||= $dbh->prepare("SHOW ${source_name} STATUS");
+   }
+   else {
+      $sth = $dbh->prepare("SHOW ${source_name} STATUS");
+   }
+   PTDEBUG && _d($dbh, "SHOW ${source_name} STATUS");
+   $sth->execute();
+   my ($ms) = @{$sth->fetchall_arrayref({})};
+   PTDEBUG && _d(
+      $ms ? map { "$_=" . (defined $ms->{$_} ? $ms->{$_} : '') } keys %$ms
+          : '');
+
+   if ( !$ms || scalar keys %$ms < 2 ) {
+      PTDEBUG && _d('Server on dbh', $dbh, 'does not seem to be a source');
+      $self->{not_a_source}->{$dbh}++;
+   }
+
+  return { map { lc($_) => $ms->{$_} } keys %$ms }; # lowercase the keys
+}
+
+sub wait_for_source {
+   my ( $self, %args ) = @_;
+   my @required_args = qw(source_status replica_dbh);
+   foreach my $arg ( @required_args ) {
+      die "I need a $arg argument" unless $args{$arg};
+   }
+   my ($source_status, $replica_dbh) = @args{@required_args};
+   my $timeout       = $args{timeout} || 60;
+
+   my $result;
+   my $waited;
+   if ( $source_status ) {
+      my $replica_status;
+      eval {
+          $replica_status = $self->get_replica_status($replica_dbh);
+      };
+      if ($EVAL_ERROR) {
+          return {
+              result => undef,
+              waited => 0,
+              error  =>'Wait for source: this is a multi-source replica but "channel" was not specified on the command line',
+          };
+      }
+      my $vp = VersionParser->new($replica_dbh);
+      my $source_name = 'source';
+      if ( $vp < '8.1' || $vp->flavor() =~ m/maria/ ) {
+         $source_name = 'master';
+      }
+      my $channel_sql = $vp > '5.6' && $self->{channel} ? ", '$self->{channel}'" : '';
+      my $sql = "SELECT ${source_name}_POS_WAIT('$source_status->{file}', $source_status->{position}, $timeout $channel_sql)";
+      PTDEBUG && _d($replica_dbh, $sql);
+      my $start = time;
+      ($result) = $replica_dbh->selectrow_array($sql);
+
+      $waited = time - $start;
+
+      PTDEBUG && _d('Result of waiting:', $result);
+      PTDEBUG && _d("Waited", $waited, "seconds");
+   }
+   else {
+      PTDEBUG && _d('Not waiting: this server is not a source');
+   }
+
+   return {
+      result => $result,
+      waited => $waited,
+   };
+}
+
+sub stop_replica {
+   my ( $self, $dbh ) = @_;
+   my $vp = VersionParser->new($dbh);
+   my $replica_name = 'replica';
+   if ( $vp < '8.1' || $vp->flavor() =~ m/maria/ ) {
+      $replica_name = 'slave';
+   }
+   my $sth = $self->{sths}->{$dbh}->{STOP_REPLICA}
+         ||= $dbh->prepare("STOP ${replica_name}");
+   PTDEBUG && _d($dbh, $sth->{Statement});
+   $sth->execute();
+}
+
+sub start_replica {
+   my ( $self, $dbh, $pos ) = @_;
+
+   my $vp = VersionParser->new($dbh);
+   my $source_name = 'source';
+   my $replica_name = 'replica';
+   if ( $vp < '8.1' || $vp->flavor() =~ m/maria/ ) {
+      $source_name = 'master';
+      $replica_name = 'slave';
+   }
+
+   if ( $pos ) {
+      my $sql = "START ${replica_name} UNTIL ${source_name}_LOG_FILE='$pos->{file}', "
+              . "${source_name}_LOG_POS=$pos->{position}";
+      PTDEBUG && _d($dbh, $sql);
+      $dbh->do($sql);
+   }
+   else {
+      my $sth = $self->{sths}->{$dbh}->{START_REPLICA}
+            ||= $dbh->prepare("START ${replica_name}");
+      PTDEBUG && _d($dbh, $sth->{Statement});
+      $sth->execute();
+   }
+}
+
+sub catchup_to_source {
+   my ( $self, $replica, $source, $timeout ) = @_;
+   $self->stop_replica($source);
+   $self->stop_replica($replica);
+   my $replica_status  = $self->get_replica_status($replica);
+   my $replica_pos     = $self->repl_posn($replica_status);
+   my $source_status = $self->get_source_status($source);
+   my $source_pos    = $self->repl_posn($source_status);
+   PTDEBUG && _d('Source position:', $self->pos_to_string($source_pos),
+      'Replica position:', $self->pos_to_string($replica_pos));
+
+   my $result;
+   if ( $self->pos_cmp($replica_pos, $source_pos) < 0 ) {
+      PTDEBUG && _d('Waiting for replica to catch up to source');
+      $self->start_replica($replica, $source_pos);
+
+      $result = $self->wait_for_source(
+            source_status => $source_status,
+            replica_dbh   => $replica,
+            timeout       => $timeout,
+            source_status => $source_status
+      );
+      if ($result->{error}) {
+          die $result->{error};
+      }
+      if ( !defined $result->{result} ) {
+         $replica_status = $self->get_replica_status($replica);
+            
+         my $vp = VersionParser->new($replica);
+         my $replica_name = 'replica';
+         if ( $vp < '8.1' || $vp->flavor() =~ m/maria/ ) {
+            $replica_name = 'slave';
+         }
+
+         if ( !$self->replica_is_running($replica_status, $replica_name) ) {
+            PTDEBUG && _d('Source position:',
+               $self->pos_to_string($source_pos),
+               'Replica position:', $self->pos_to_string($replica_pos));
+            $replica_pos = $self->repl_posn($replica_status);
+            if ( $self->pos_cmp($replica_pos, $source_pos) != 0 ) {
+               die "SOURCE_POS_WAIT() returned NULL but replica has not "
+                  . "caught up to source";
+            }
+            PTDEBUG && _d('Replica is caught up to source and stopped');
+         }
+         else {
+            die "Replica has not caught up to source and it is still running";
+         }
+      }
+   }
+   else {
+      PTDEBUG && _d("Replica is already caught up to source");
+   }
+
+   return $result;
+}
+
+sub catchup_to_same_pos {
+   my ( $self, $s1_dbh, $s2_dbh ) = @_;
+   $self->stop_replica($s1_dbh);
+   $self->stop_replica($s2_dbh);
+   my $s1_status = $self->get_replica_status($s1_dbh);
+   my $s2_status = $self->get_replica_status($s2_dbh);
+   my $s1_pos    = $self->repl_posn($s1_status);
+   my $s2_pos    = $self->repl_posn($s2_status);
+   if ( $self->pos_cmp($s1_pos, $s2_pos) < 0 ) {
+      $self->start_replica($s1_dbh, $s2_pos);
+   }
+   elsif ( $self->pos_cmp($s2_pos, $s1_pos) < 0 ) {
+      $self->start_replica($s2_dbh, $s1_pos);
+   }
+
+   $s1_status = $self->get_replica_status($s1_dbh);
+   $s2_status = $self->get_replica_status($s2_dbh);
+   $s1_pos    = $self->repl_posn($s1_status);
+   $s2_pos    = $self->repl_posn($s2_status);
+
+   my $vp1 = VersionParser->new($s1_dbh);
+   my $replica1_name = 'replica';
+   if ( $vp1 < '8.1' || $vp1->flavor() =~ m/maria/ ) {
+      $replica1_name = 'slave';
+   }
+
+   my $vp2 = VersionParser->new($s2_dbh);
+   my $replica2_name = 'replica';
+   if ( $vp2 < '8.1' || $vp2->flavor() =~ m/maria/ ) {
+      $replica2_name = 'slave';
+   }
+
+   if ( $self->replica_is_running($s1_status, $replica1_name)
+     || $self->replica_is_running($s2_status, $replica2_name)
+     || $self->pos_cmp($s1_pos, $s2_pos) != 0)
+   {
+      die "The servers aren't both stopped at the same position";
+   }
+
+}
+
+sub replica_is_running {
+   my ( $self, $replica_status, $replica_name ) = @_;
+   return ($replica_status->{"${replica_name}_sql_running"} || 'No') eq 'Yes';
+}
+
+sub has_replica_updates {
+   my ( $self, $dbh ) = @_;
+   
+   my $vp = VersionParser->new($dbh);
+   my $replica_name = 'replica';
+   if ( $vp < '8.1' || $vp->flavor() =~ m/maria/ ) {
+      $replica_name = 'slave';
+   }
+
+   my $sql = qq{SHOW VARIABLES LIKE 'log_${replica_name}_updates'};
+   PTDEBUG && _d($dbh, $sql);
+   my ($name, $value) = $dbh->selectrow_array($sql);
+   return $value && $value =~ m/^(1|ON)$/;
+}
+
+sub repl_posn {
+   my ( $self, $status ) = @_;
+   if ( exists $status->{file} && exists $status->{position} ) {
+      return {
+         file     => $status->{file},
+         position => $status->{position},
+      };
+   }
+   elsif ( exists $status->{relay_source_log_file} && exists $status->{exec_source_log_pos} ) {
+      return {
+         file     => $status->{relay_source_log_file},
+         position => $status->{exec_source_log_pos},
+      };
+   }
+   else {
+      return {
+         file     => $status->{relay_master_log_file},
+         position => $status->{exec_master_log_pos},
+      };
+   }
+}
+
+sub get_replica_lag {
+   my ( $self, $dbh ) = @_;
+   
+   my $vp = VersionParser->new($dbh);
+   my $source_name = 'source';
+   if ( $vp < '8.1' || $vp->flavor() =~ m/maria/ ) {
+      $source_name = 'master';
+   }
+
+   my $stat = $self->get_replica_status($dbh);
+   return unless $stat;  # server is not a replica
+   return $stat->{"seconds_behind_${source_name}"};
+}
+
+sub pos_cmp {
+   my ( $self, $a, $b ) = @_;
+   return $self->pos_to_string($a) cmp $self->pos_to_string($b);
+}
+
+sub short_host {
+   my ( $self, $dsn ) = @_;
+   my ($host, $port);
+   if ( $dsn->{source_host} ) {
+      $host = $dsn->{source_host};
+      $port = $dsn->{source_port};
+   }
+   else {
+      $host = $dsn->{h};
+      $port = $dsn->{P};
+   }
+   return ($host || '[default]') . ( ($port || 3306) == 3306 ? '' : ":$port" );
+}
+
+sub is_replication_thread {
+   my ( $self, $query, %args ) = @_;
+   return unless $query;
+
+   my $type = lc($args{type} || 'all');
+   die "Invalid type: $type"
+      unless $type =~ m/^binlog_dump|slave_io|slave_sql|replica_io|replica_sql|all$/i;
+
+   my $match = 0;
+   if ( $type =~ m/binlog_dump|all/i ) {
+      $match = 1
+         if ($query->{Command} || $query->{command} || '') eq "Binlog Dump";
+   }
+   if ( !$match ) {
+      if ( ($query->{User} || $query->{user} || '') eq "system user" ) {
+         PTDEBUG && _d("Replica replication thread");
+         if ( $type ne 'all' ) {
+            my $state = $query->{State} || $query->{state} || '';
+
+            if ( $state =~ m/^init|end$/ ) {
+               PTDEBUG && _d("Special state:", $state);
+               $match = 1;
+            }
+            else {
+               my ($replica_sql) = $state =~ m/
+                  ^(Waiting\sfor\sthe\snext\sevent
+                   |Reading\sevent\sfrom\sthe\srelay\slog
+                   |Has\sread\sall\srelay\slog;\swaiting
+                   |Making\stemp\sfile
+                   |Waiting\sfor\sslave\smutex\son\sexit
+                   |Waiting\sfor\sreplica\smutex\son\sexit)/xi;
+
+               $match = $type eq 'replica_sql' &&  $replica_sql ? 1
+                      : $type eq 'replica_io'  && !$replica_sql ? 1
+                      :                                       0;
+            }
+         }
+         else {
+            $match = 1;
+         }
+      }
+      else {
+         PTDEBUG && _d('Not system user');
+      }
+
+      if ( !defined $args{check_known_ids} || $args{check_known_ids} ) {
+         my $id = $query->{Id} || $query->{id};
+         if ( $match ) {
+            $self->{replication_thread}->{$id} = 1;
+         }
+         else {
+            if ( $self->{replication_thread}->{$id} ) {
+               PTDEBUG && _d("Thread ID is a known replication thread ID");
+               $match = 1;
+            }
+         }
+      }
+   }
+
+   PTDEBUG && _d('Matches', $type, 'replication thread:',
+      ($match ? 'yes' : 'no'), '; match:', $match);
+
+   return $match;
+}
+
+
+sub get_replication_filters {
+   my ( $self, %args ) = @_;
+   my @required_args = qw(dbh);
+   foreach my $arg ( @required_args ) {
+      die "I need a $arg argument" unless $args{$arg};
+   }
+   my ($dbh) = @args{@required_args};
+
+   my $vp = VersionParser->new($dbh);
+   my $replica_name = 'replica';
+   if ( $vp < '8.1' || $vp->flavor() =~ m/maria/ ) {
+      $replica_name = 'slave';
+   }
+
+   my %filters = ();
+
+   my $status = $self->get_source_status($dbh);
+   if ( $status ) {
+      map { $filters{$_} = $status->{$_} }
+      grep { defined $status->{$_} && $status->{$_} ne '' }
+      qw(
+         binlog_do_db
+         binlog_ignore_db
+      );
+   }
+
+   $status = $self->get_replica_status($dbh);
+   if ( $status ) {
+      map { $filters{$_} = $status->{$_} }
+      grep { defined $status->{$_} && $status->{$_} ne '' }
+      qw(
+         replicate_do_db
+         replicate_ignore_db
+         replicate_do_table
+         replicate_ignore_table
+         replicate_wild_do_table
+         replicate_wild_ignore_table
+      );
+
+      my $sql = "SHOW VARIABLES LIKE '${replica_name}_skip_errors'";
+      PTDEBUG && _d($dbh, $sql);
+      my $row = $dbh->selectrow_arrayref($sql);
+      $filters{replica_skip_errors} = $row->[1] if $row->[1] && $row->[1] ne 'OFF';
+   }
+
+   return \%filters;
+}
+
+
+sub pos_to_string {
+   my ( $self, $pos ) = @_;
+   my $fmt  = '%s/%020d';
+   return sprintf($fmt, @{$pos}{qw(file position)});
+}
+
+sub reset_known_replication_threads {
+   my ( $self ) = @_;
+   $self->{replication_thread} = {};
+   return;
+}
+
+sub get_cxn_from_dsn_table {
+   my ($self, %args) = @_;
+   my @required_args = qw(dsn_table_dsn make_cxn);
+   foreach my $arg ( @required_args ) {
+      die "I need a $arg argument" unless $args{$arg};
+   }
+   my ($dsn_table_dsn, $make_cxn) = @args{@required_args};
+   PTDEBUG && _d('DSN table DSN:', $dsn_table_dsn);
+
+   my $dp = $self->{DSNParser};
+   my $q  = $self->{Quoter};
+
+   my $dsn = $dp->parse($dsn_table_dsn);
+   my $dsn_table;
+   if ( $dsn->{D} && $dsn->{t} ) {
+      $dsn_table = $q->quote($dsn->{D}, $dsn->{t});
+   }
+   elsif ( $dsn->{t} && $dsn->{t} =~ m/\./ ) {
+      $dsn_table = $q->quote($q->split_unquote($dsn->{t}));
+   }
+   else {
+      die "DSN table DSN does not specify a database (D) "
+        . "or a database-qualified table (t)";
+   }
+
+   my $done = 0;
+   my $dsn_tbl_cxn = $make_cxn->(dsn => $dsn);
+   my $dbh         = $dsn_tbl_cxn->connect();
+   my $sql         = "SELECT dsn FROM $dsn_table ORDER BY id";
+   PTDEBUG && _d($sql);
+   my @cxn;
+   use Data::Dumper;
+   DSN:
+   do {
+      @cxn = ();
+      my $dsn_strings = $dbh->selectcol_arrayref($sql);
+      if ( $dsn_strings ) {
+         foreach my $dsn_string ( @$dsn_strings ) {
+            PTDEBUG && _d('DSN from DSN table:', $dsn_string);
+            if ($args{wait_no_die}) {
+               my $lcxn;
+               eval {
+                  $lcxn = $make_cxn->(dsn_string => $dsn_string);
+               };
+               if ( $EVAL_ERROR && ($dsn_tbl_cxn->lost_connection($EVAL_ERROR)
+                     || $EVAL_ERROR =~ m/Can't connect to MySQL server/)) {
+                  PTDEBUG && _d("Server is not accessible, waiting when it is online again");
+                  sleep(1);
+                  goto DSN;
+               }
+               push @cxn, $lcxn;
+            } else {
+               push @cxn, $make_cxn->(dsn_string => $dsn_string);
+            }
+         }
+      }
+      $done = 1;
+   } until $done;
+   return \@cxn;
+}
+
+sub _d {
+   my ($package, undef, $line) = caller 0;
+   @_ = map { (my $temp = $_) =~ s/\n/\n# /g; $temp; }
+        map { defined $_ ? $_ : 'undef' }
+        @_;
+   print STDERR "# $package:$line $PID ", join(' ', @_), "\n";
+}
+
+1;
+}
+# ###########################################################################
+# End MasterSlave package
+# ###########################################################################
+
+# ###########################################################################
+# Daemon package
+# This package is a copy without comments from the original.  The original
+# with comments and its test file can be found in the GitHub repository at,
+#   lib/Daemon.pm
+#   t/lib/Daemon.t
+# See https://github.com/percona/percona-toolkit for more information.
+# ###########################################################################
+{
+package Daemon;
+
+use strict;
+use warnings FATAL => 'all';
+use English qw(-no_match_vars);
+
+use constant PTDEBUG => $ENV{PTDEBUG} || 0;
+
+use POSIX qw(setsid);
+use Fcntl qw(:DEFAULT);
+
+sub new {
+   my ($class, %args) = @_;
+   my $self = {
+      log_file       => $args{log_file},
+      pid_file       => $args{pid_file},
+      daemonize      => $args{daemonize},
+      force_log_file => $args{force_log_file},
+      parent_exit    => $args{parent_exit},
+      pid_file_owner => 0,
+      utf8           => $args{utf8} // 0,
+   };
+   return bless $self, $class;
+}
+
+sub run {
+   my ($self) = @_;
+
+   my $daemonize      = $self->{daemonize};
+   my $pid_file       = $self->{pid_file};
+   my $log_file       = $self->{log_file};
+   my $force_log_file = $self->{force_log_file};
+   my $parent_exit    = $self->{parent_exit};
+   my $utf8           = $self->{utf8};
+
+   PTDEBUG && _d('Starting daemon');
+
+   if ( $pid_file ) {
+      eval {
+         $self->_make_pid_file(
+            pid      => $PID,  # parent's pid
+            pid_file => $pid_file,
+         );
+      };
+      die "$EVAL_ERROR\n" if $EVAL_ERROR;
+      if ( !$daemonize ) {
+         $self->{pid_file_owner} = $PID;  # parent's pid
+      }
+   }
+
+   if ( $daemonize ) {
+      defined (my $child_pid = fork()) or die "Cannot fork: $OS_ERROR";
+      if ( $child_pid ) {
+         PTDEBUG && _d('Forked child', $child_pid);
+         $parent_exit->($child_pid) if $parent_exit;
+         exit 0;
+      }
+
+      POSIX::setsid() or die "Cannot start a new session: $OS_ERROR";
+      chdir '/'       or die "Cannot chdir to /: $OS_ERROR";
+
+      if ( $pid_file ) {
+         $self->_update_pid_file(
+            pid      => $PID,  # child's pid
+            pid_file => $pid_file,
+         );
+         $self->{pid_file_owner} = $PID;
+      }
+   }
+
+   if ( $daemonize || $force_log_file ) {
+      PTDEBUG && _d('Redirecting STDIN to /dev/null');
+      close STDIN;
+      open  STDIN, '/dev/null'
+         or die "Cannot reopen STDIN to /dev/null: $OS_ERROR";
+      if ( $log_file ) {
+         PTDEBUG && _d('Redirecting STDOUT and STDERR to', $log_file);
+         close STDOUT;
+         open  STDOUT, '>>', $log_file
+            or die "Cannot open log file $log_file: $OS_ERROR";
+         if ( $utf8 ) {
+            binmode(STDOUT, ':utf8')
+               or die "Can't binmode(STDOUT, ':utf8'): $OS_ERROR";
+         }
+
+
+         close STDERR;
+         open  STDERR, ">&STDOUT"
+            or die "Cannot dupe STDERR to STDOUT: $OS_ERROR";
+         if ( $utf8 ) {
+            binmode(STDERR, ':utf8')
+               or die "Can't binmode(STDERR, ':utf8'): $OS_ERROR";
+         }
+      }
+      else {
+         if ( -t STDOUT ) {
+            PTDEBUG && _d('No log file and STDOUT is a terminal;',
+               'redirecting to /dev/null');
+            close STDOUT;
+            open  STDOUT, '>', '/dev/null'
+               or die "Cannot reopen STDOUT to /dev/null: $OS_ERROR";
+         }
+         if ( -t STDERR ) {
+            PTDEBUG && _d('No log file and STDERR is a terminal;',
+               'redirecting to /dev/null');
+            close STDERR;
+            open  STDERR, '>', '/dev/null'
+               or die "Cannot reopen STDERR to /dev/null: $OS_ERROR";
+         }
+      }
+
+      $OUTPUT_AUTOFLUSH = 1;
+   }
+
+   PTDEBUG && _d('Daemon running');
+   return;
+}
+
+sub _make_pid_file {
+   my ($self, %args) = @_;
+   my @required_args = qw(pid pid_file);
+   foreach my $arg ( @required_args ) {
+      die "I need a $arg argument" unless $args{$arg};
+   };
+   my $pid      = $args{pid};
+   my $pid_file = $args{pid_file};
+
+   eval {
+      sysopen(PID_FH, $pid_file, O_RDWR|O_CREAT|O_EXCL) or die $OS_ERROR;
+      print PID_FH $PID, "\n";
+      close PID_FH;
+   };
+   if ( my $e = $EVAL_ERROR ) {
+      if ( $e =~ m/file exists/i ) {
+         my $old_pid = $self->_check_pid_file(
+            pid_file => $pid_file,
+            pid      => $PID,
+         );
+         if ( $old_pid ) {
+            warn "Overwriting PID file $pid_file because PID $old_pid "
+               . "is not running.\n";
+         }
+         $self->_update_pid_file(
+            pid      => $PID,
+            pid_file => $pid_file
+         );
+      }
+      else {
+         die "Error creating PID file $pid_file: $e\n";
+      }
+   }
+
+   return;
+}
+
+sub _check_pid_file {
+   my ($self, %args) = @_;
+   my @required_args = qw(pid_file pid);
+   foreach my $arg ( @required_args ) {
+      die "I need a $arg argument" unless $args{$arg};
+   };
+   my $pid_file = $args{pid_file};
+   my $pid      = $args{pid};
+
+   PTDEBUG && _d('Checking if PID in', $pid_file, 'is running');
+
+   if ( ! -f $pid_file ) {
+      PTDEBUG && _d('PID file', $pid_file, 'does not exist');
+      return;
+   }
+
+   open my $fh, '<', $pid_file
+      or die "Error opening $pid_file: $OS_ERROR";
+   my $existing_pid = do { local $/; <$fh> };
+   chomp($existing_pid) if $existing_pid;
+   close $fh
+      or die "Error closing $pid_file: $OS_ERROR";
+
+   if ( $existing_pid ) {
+      if ( $existing_pid == $pid ) {
+         warn "The current PID $pid already holds the PID file $pid_file\n";
+         return;
+      }
+      else {
+         PTDEBUG && _d('Checking if PID', $existing_pid, 'is running');
+         my $pid_is_alive = kill 0, $existing_pid;
+         if ( $pid_is_alive ) {
+            die "PID file $pid_file exists and PID $existing_pid is running\n";
+         }
+      }
+   }
+   else {
+      die "PID file $pid_file exists but it is empty.  Remove the file "
+         . "if the process is no longer running.\n";
+   }
+
+   return $existing_pid;
+}
+
+sub _update_pid_file {
+   my ($self, %args) = @_;
+   my @required_args = qw(pid pid_file);
+   foreach my $arg ( @required_args ) {
+      die "I need a $arg argument" unless $args{$arg};
+   };
+   my $pid      = $args{pid};
+   my $pid_file = $args{pid_file};
+
+   open my $fh, '>', $pid_file
+      or die "Cannot open $pid_file: $OS_ERROR";
+   print { $fh } $pid, "\n"
+      or die "Cannot print to $pid_file: $OS_ERROR";
+   close $fh
+      or warn "Cannot close $pid_file: $OS_ERROR";
+
+   return;
+}
+
+sub remove_pid_file {
+   my ($self, $pid_file) = @_;
+   $pid_file ||= $self->{pid_file};
+   if ( $pid_file && -f $pid_file ) {
+      unlink $self->{pid_file}
+         or warn "Cannot remove PID file $pid_file: $OS_ERROR";
+      PTDEBUG && _d('Removed PID file');
+   }
+   else {
+      PTDEBUG && _d('No PID to remove');
+   }
+   return;
+}
+
+sub DESTROY {
+   my ($self) = @_;
+
+   if ( $self->{pid_file_owner} == $PID ) {
+      $self->remove_pid_file();
+   }
+
+   return;
+}
+
+sub _d {
+   my ($package, undef, $line) = caller 0;
+   @_ = map { (my $temp = $_) =~ s/\n/\n# /g; $temp; }
+        map { defined $_ ? $_ : 'undef' }
+        @_;
+   print STDERR "# $package:$line $PID ", join(' ', @_), "\n";
+}
+
+1;
+}
+# ###########################################################################
+# End Daemon package
+# ###########################################################################
+
+# ###########################################################################
+# HTTP::Micro package
+# This package is a copy without comments from the original.  The original
+# with comments and its test file can be found in the GitHub repository at,
+#   lib/HTTP/Micro.pm
+#   t/lib/HTTP/Micro.t
+# See https://github.com/percona/percona-toolkit for more information.
+# ###########################################################################
+{
+package HTTP::Micro;
+
+our $VERSION = '0.01';
+
+use strict;
+use warnings FATAL => 'all';
+use English qw(-no_match_vars);
+use Carp ();
+
+my @attributes;
+BEGIN {
+    @attributes = qw(agent timeout);
+    no strict 'refs';
+    for my $accessor ( @attributes ) {
+        *{$accessor} = sub {
+            @_ > 1 ? $_[0]->{$accessor} = $_[1] : $_[0]->{$accessor};
+        };
+    }
+}
+
+sub new {
+    my($class, %args) = @_;
+    (my $agent = $class) =~ s{::}{-}g;
+    my $self = {
+        agent        => $agent . "/" . ($class->VERSION || 0),
+        timeout      => 60,
+    };
+    for my $key ( @attributes ) {
+        $self->{$key} = $args{$key} if exists $args{$key}
+    }
+    return bless $self, $class;
+}
+
+my %DefaultPort = (
+    http => 80,
+    https => 443,
+);
+
+sub request {
+    my ($self, $method, $url, $args) = @_;
+    @_ == 3 || (@_ == 4 && ref $args eq 'HASH')
+      or Carp::croak(q/Usage: $http->request(METHOD, URL, [HASHREF])/);
+    $args ||= {}; # we keep some state in this during _request
+
+    my $response;
+    for ( 0 .. 1 ) {
+        $response = eval { $self->_request($method, $url, $args) };
+        last unless $@ && $method eq 'GET'
+            && $@ =~ m{^(?:Socket closed|Unexpected end)};
+    }
+
+    if (my $e = "$@") {
+        $response = {
+            success => q{},
+            status  => 599,
+            reason  => 'Internal Exception',
+            content => $e,
+            headers => {
+                'content-type'   => 'text/plain',
+                'content-length' => length $e,
+            }
+        };
+    }
+    return $response;
+}
+
+sub _request {
+    my ($self, $method, $url, $args) = @_;
+
+    my ($scheme, $host, $port, $path_query) = $self->_split_url($url);
+
+    my $request = {
+        method    => $method,
+        scheme    => $scheme,
+        host_port => ($port == $DefaultPort{$scheme} ? $host : "$host:$port"),
+        uri       => $path_query,
+        headers   => {},
+    };
+
+    my $handle  = HTTP::Micro::Handle->new(timeout => $self->{timeout});
+
+    $handle->connect($scheme, $host, $port);
+
+    $self->_prepare_headers_and_cb($request, $args);
+    $handle->write_request_header(@{$request}{qw/method uri headers/});
+    $handle->write_content_body($request) if $request->{content};
+
+    my $response;
+    do { $response = $handle->read_response_header }
+        until (substr($response->{status},0,1) ne '1');
+
+    if (!($method eq 'HEAD' || $response->{status} =~ /^[23]04/)) {
+        $response->{content} = '';
+        $handle->read_content_body(sub { $_[1]->{content} .= $_[0] }, $response);
+    }
+
+    $handle->close;
+    $response->{success} = substr($response->{status},0,1) eq '2';
+    return $response;
+}
+
+sub _prepare_headers_and_cb {
+    my ($self, $request, $args) = @_;
+
+    for ($args->{headers}) {
+        next unless defined;
+        while (my ($k, $v) = each %$_) {
+            $request->{headers}{lc $k} = $v;
+        }
+    }
+    $request->{headers}{'host'}         = $request->{host_port};
+    $request->{headers}{'connection'}   = "close";
+    $request->{headers}{'user-agent'} ||= $self->{agent};
+
+    if (defined $args->{content}) {
+        $request->{headers}{'content-type'} ||= "application/octet-stream";
+        utf8::downgrade($args->{content}, 1)
+            or Carp::croak(q/Wide character in request message body/);
+        $request->{headers}{'content-length'} = length $args->{content};
+        $request->{content} = $args->{content};
+    }
+    return;
+}
+
+sub _split_url {
+    my $url = pop;
+
+    my ($scheme, $authority, $path_query) = $url =~ m<\A([^:/?#]+)://([^/?#]*)([^#]*)>
+      or Carp::croak(qq/Cannot parse URL: '$url'/);
+
+    $scheme     = lc $scheme;
+    $path_query = "/$path_query" unless $path_query =~ m<\A/>;
+
+    my $host = (length($authority)) ? lc $authority : 'localhost';
+       $host =~ s/\A[^@]*@//;   # userinfo
+    my $port = do {
+       $host =~ s/:([0-9]*)\z// && length $1
+         ? $1
+         : $DefaultPort{$scheme}
+    };
+
+    return ($scheme, $host, $port, $path_query);
+}
+
+} # HTTP::Micro
+
+{
+   package HTTP::Micro::Handle;
+
+   use strict;
+   use warnings FATAL => 'all';
+   use English qw(-no_match_vars);
+
+   use Carp       qw(croak);
+   use Errno      qw(EINTR EPIPE);
+   use IO::Socket qw(SOCK_STREAM);
+
+   sub BUFSIZE () { 32768 }
+
+   my $Printable = sub {
+       local $_ = shift;
+       s/\r/\\r/g;
+       s/\n/\\n/g;
+       s/\t/\\t/g;
+       s/([^\x20-\x7E])/sprintf('\\x%.2X', ord($1))/ge;
+       $_;
+   };
+
+   sub new {
+       my ($class, %args) = @_;
+       return bless {
+           rbuf          => '',
+           timeout       => 60,
+           max_line_size => 16384,
+           %args
+       }, $class;
+   }
+
+   my $ssl_verify_args = {
+       check_cn         => "when_only",
+       wildcards_in_alt => "anywhere",
+       wildcards_in_cn  => "anywhere"
+   };
+
+   sub connect {
+       @_ == 4 || croak(q/Usage: $handle->connect(scheme, host, port)/);
+       my ($self, $scheme, $host, $port) = @_;
+
+       if ( $scheme eq 'https' ) {
+           eval "require IO::Socket::SSL"
+               unless exists $INC{'IO/Socket/SSL.pm'};
+           croak(qq/IO::Socket::SSL must be installed for https support\n/)
+               unless $INC{'IO/Socket/SSL.pm'};
+       }
+       elsif ( $scheme ne 'http' ) {
+         croak(qq/Unsupported URL scheme '$scheme'\n/);
+       }
+
+       $self->{fh} = IO::Socket::INET->new(
+           PeerHost  => $host,
+           PeerPort  => $port,
+           Proto     => 'tcp',
+           Type      => SOCK_STREAM,
+           Timeout   => $self->{timeout}
+       ) or croak(qq/Could not connect to '$host:$port': $@/);
+
+       binmode($self->{fh})
+         or croak(qq/Could not binmode() socket: '$!'/);
+
+       if ( $scheme eq 'https') {
+           IO::Socket::SSL->start_SSL(
+              $self->{fh},
+              SSL_verifycn_name => $host,
+           );
+           ref($self->{fh}) eq 'IO::Socket::SSL'
+               or die(qq/SSL connection failed for $host\n/);
+           if ( $self->{fh}->can("verify_hostname") ) {
+               $self->{fh}->verify_hostname( $host, $ssl_verify_args )
+                  or die(qq/SSL certificate not valid for $host\n/);
+           }
+           else {
+            my $fh = $self->{fh};
+            _verify_hostname_of_cert($host, _peer_certificate($fh), $ssl_verify_args)
+                  or die(qq/SSL certificate not valid for $host\n/);
+            }
+       }
+
+       $self->{host} = $host;
+       $self->{port} = $port;
+
+       return $self;
+   }
+
+   sub close {
+       @_ == 1 || croak(q/Usage: $handle->close()/);
+       my ($self) = @_;
+       CORE::close($self->{fh})
+         or croak(qq/Could not close socket: '$!'/);
+   }
+
+   sub write {
+       @_ == 2 || croak(q/Usage: $handle->write(buf)/);
+       my ($self, $buf) = @_;
+
+       my $len = length $buf;
+       my $off = 0;
+
+       local $SIG{PIPE} = 'IGNORE';
+
+       while () {
+           $self->can_write
+             or croak(q/Timed out while waiting for socket to become ready for writing/);
+           my $r = syswrite($self->{fh}, $buf, $len, $off);
+           if (defined $r) {
+               $len -= $r;
+               $off += $r;
+               last unless $len > 0;
+           }
+           elsif ($! == EPIPE) {
+               croak(qq/Socket closed by remote server: $!/);
+           }
+           elsif ($! != EINTR) {
+               croak(qq/Could not write to socket: '$!'/);
+           }
+       }
+       return $off;
+   }
+
+   sub read {
+       @_ == 2 || @_ == 3 || croak(q/Usage: $handle->read(len)/);
+       my ($self, $len) = @_;
+
+       my $buf  = '';
+       my $got = length $self->{rbuf};
+
+       if ($got) {
+           my $take = ($got < $len) ? $got : $len;
+           $buf  = substr($self->{rbuf}, 0, $take, '');
+           $len -= $take;
+       }
+
+       while ($len > 0) {
+           $self->can_read
+             or croak(q/Timed out while waiting for socket to become ready for reading/);
+           my $r = sysread($self->{fh}, $buf, $len, length $buf);
+           if (defined $r) {
+               last unless $r;
+               $len -= $r;
+           }
+           elsif ($! != EINTR) {
+               croak(qq/Could not read from socket: '$!'/);
+           }
+       }
+       if ($len) {
+           croak(q/Unexpected end of stream/);
+       }
+       return $buf;
+   }
+
+   sub readline {
+       @_ == 1 || croak(q/Usage: $handle->readline()/);
+       my ($self) = @_;
+
+       while () {
+           if ($self->{rbuf} =~ s/\A ([^\x0D\x0A]* \x0D?\x0A)//x) {
+               return $1;
+           }
+           $self->can_read
+             or croak(q/Timed out while waiting for socket to become ready for reading/);
+           my $r = sysread($self->{fh}, $self->{rbuf}, BUFSIZE, length $self->{rbuf});
+           if (defined $r) {
+               last unless $r;
+           }
+           elsif ($! != EINTR) {
+               croak(qq/Could not read from socket: '$!'/);
+           }
+       }
+       croak(q/Unexpected end of stream while looking for line/);
+   }
+
+   sub read_header_lines {
+       @_ == 1 || @_ == 2 || croak(q/Usage: $handle->read_header_lines([headers])/);
+       my ($self, $headers) = @_;
+       $headers ||= {};
+       my $lines   = 0;
+       my $val;
+
+       while () {
+            my $line = $self->readline;
+
+            if ($line =~ /\A ([^\x00-\x1F\x7F:]+) : [\x09\x20]* ([^\x0D\x0A]*)/x) {
+                my ($field_name) = lc $1;
+                $val = \($headers->{$field_name} = $2);
+            }
+            elsif ($line =~ /\A [\x09\x20]+ ([^\x0D\x0A]*)/x) {
+                $val
+                  or croak(q/Unexpected header continuation line/);
+                next unless length $1;
+                $$val .= ' ' if length $$val;
+                $$val .= $1;
+            }
+            elsif ($line =~ /\A \x0D?\x0A \z/x) {
+               last;
+            }
+            else {
+               croak(q/Malformed header line: / . $Printable->($line));
+            }
+       }
+       return $headers;
+   }
+
+   sub write_header_lines {
+       (@_ == 2 && ref $_[1] eq 'HASH') || croak(q/Usage: $handle->write_header_lines(headers)/);
+       my($self, $headers) = @_;
+
+       my $buf = '';
+       while (my ($k, $v) = each %$headers) {
+           my $field_name = lc $k;
+            $field_name =~ /\A [\x21\x23-\x27\x2A\x2B\x2D\x2E\x30-\x39\x41-\x5A\x5E-\x7A\x7C\x7E]+ \z/x
+               or croak(q/Invalid HTTP header field name: / . $Printable->($field_name));
+            $field_name =~ s/\b(\w)/\u$1/g;
+            $buf .= "$field_name: $v\x0D\x0A";
+       }
+       $buf .= "\x0D\x0A";
+       return $self->write($buf);
+   }
+
+   sub read_content_body {
+       @_ == 3 || @_ == 4 || croak(q/Usage: $handle->read_content_body(callback, response, [read_length])/);
+       my ($self, $cb, $response, $len) = @_;
+       $len ||= $response->{headers}{'content-length'};
+
+       croak("No content-length in the returned response, and this "
+           . "UA doesn't implement chunking") unless defined $len;
+
+       while ($len > 0) {
+           my $read = ($len > BUFSIZE) ? BUFSIZE : $len;
+           $cb->($self->read($read), $response);
+           $len -= $read;
+       }
+
+       return;
+   }
+
+   sub write_content_body {
+       @_ == 2 || croak(q/Usage: $handle->write_content_body(request)/);
+       my ($self, $request) = @_;
+       my ($len, $content_length) = (0, $request->{headers}{'content-length'});
+
+       $len += $self->write($request->{content});
+
+       $len == $content_length
+         or croak(qq/Content-Length mismatch (got: $len expected: $content_length)/);
+
+       return $len;
+   }
+
+   sub read_response_header {
+       @_ == 1 || croak(q/Usage: $handle->read_response_header()/);
+       my ($self) = @_;
+
+       my $line = $self->readline;
+
+       $line =~ /\A (HTTP\/(0*\d+\.0*\d+)) [\x09\x20]+ ([0-9]{3}) [\x09\x20]+ ([^\x0D\x0A]*) \x0D?\x0A/x
+         or croak(q/Malformed Status-Line: / . $Printable->($line));
+
+       my ($protocol, $version, $status, $reason) = ($1, $2, $3, $4);
+
+       return {
+           status   => $status,
+           reason   => $reason,
+           headers  => $self->read_header_lines,
+           protocol => $protocol,
+       };
+   }
+
+   sub write_request_header {
+       @_ == 4 || croak(q/Usage: $handle->write_request_header(method, request_uri, headers)/);
+       my ($self, $method, $request_uri, $headers) = @_;
+
+       return $self->write("$method $request_uri HTTP/1.1\x0D\x0A")
+            + $self->write_header_lines($headers);
+   }
+
+   sub _do_timeout {
+       my ($self, $type, $timeout) = @_;
+       $timeout = $self->{timeout}
+           unless defined $timeout && $timeout >= 0;
+
+       my $fd = fileno $self->{fh};
+       defined $fd && $fd >= 0
+         or croak(q/select(2): 'Bad file descriptor'/);
+
+       my $initial = time;
+       my $pending = $timeout;
+       my $nfound;
+
+       vec(my $fdset = '', $fd, 1) = 1;
+
+       while () {
+           $nfound = ($type eq 'read')
+               ? select($fdset, undef, undef, $pending)
+               : select(undef, $fdset, undef, $pending) ;
+           if ($nfound == -1) {
+               $! == EINTR
+                 or croak(qq/select(2): '$!'/);
+               redo if !$timeout || ($pending = $timeout - (time - $initial)) > 0;
+               $nfound = 0;
+           }
+           last;
+       }
+       $! = 0;
+       return $nfound;
+   }
+
+   sub can_read {
+       @_ == 1 || @_ == 2 || croak(q/Usage: $handle->can_read([timeout])/);
+       my $self = shift;
+       return $self->_do_timeout('read', @_)
+   }
+
+   sub can_write {
+       @_ == 1 || @_ == 2 || croak(q/Usage: $handle->can_write([timeout])/);
+       my $self = shift;
+       return $self->_do_timeout('write', @_)
+   }
+}  # HTTP::Micro::Handle
+
+my $prog = <<'EOP';
+BEGIN {
+   if ( defined &IO::Socket::SSL::CAN_IPV6 ) {
+      *CAN_IPV6 = \*IO::Socket::SSL::CAN_IPV6;
+   }
+   else {
+      constant->import( CAN_IPV6 => '' );
+   }
+   my %const = (
+      NID_CommonName => 13,
+      GEN_DNS => 2,
+      GEN_IPADD => 7,
+   );
+   while ( my ($name,$value) = each %const ) {
+      no strict 'refs';
+      *{$name} = UNIVERSAL::can( 'Net::SSLeay', $name ) || sub { $value };
+   }
+}
+{
+   use Carp qw(croak);
+   my %dispatcher = (
+      issuer =>  sub { Net::SSLeay::X509_NAME_oneline( Net::SSLeay::X509_get_issuer_name( shift )) },
+      subject => sub { Net::SSLeay::X509_NAME_oneline( Net::SSLeay::X509_get_subject_name( shift )) },
+   );
+   if ( $Net::SSLeay::VERSION >= 1.30 ) {
+      $dispatcher{commonName} = sub {
+         my $cn = Net::SSLeay::X509_NAME_get_text_by_NID(
+            Net::SSLeay::X509_get_subject_name( shift ), NID_CommonName);
+         $cn =~s{\0$}{}; # work around Bug in Net::SSLeay <1.33
+         $cn;
+      }
+   } else {
+      $dispatcher{commonName} = sub {
+         croak "you need at least Net::SSLeay version 1.30 for getting commonName"
+      }
+   }
+
+   if ( $Net::SSLeay::VERSION >= 1.33 ) {
+      $dispatcher{subjectAltNames} = sub { Net::SSLeay::X509_get_subjectAltNames( shift ) };
+   } else {
+      $dispatcher{subjectAltNames} = sub {
+         return;
+      };
+   }
+
+   $dispatcher{authority} = $dispatcher{issuer};
+   $dispatcher{owner}     = $dispatcher{subject};
+   $dispatcher{cn}        = $dispatcher{commonName};
+
+   sub _peer_certificate {
+      my ($self, $field) = @_;
+      my $ssl = $self->_get_ssl_object or return;
+
+      my $cert = ${*$self}{_SSL_certificate}
+         ||= Net::SSLeay::get_peer_certificate($ssl)
+         or return $self->error("Could not retrieve peer certificate");
+
+      if ($field) {
+         my $sub = $dispatcher{$field} or croak
+            "invalid argument for peer_certificate, valid are: ".join( " ",keys %dispatcher ).
+            "\nMaybe you need to upgrade your Net::SSLeay";
+         return $sub->($cert);
+      } else {
+         return $cert
+      }
+   }
+
+
+   my %scheme = (
+      ldap => {
+         wildcards_in_cn    => 0,
+         wildcards_in_alt => 'leftmost',
+         check_cn         => 'always',
+      },
+      http => {
+         wildcards_in_cn    => 'anywhere',
+         wildcards_in_alt => 'anywhere',
+         check_cn         => 'when_only',
+      },
+      smtp => {
+         wildcards_in_cn    => 0,
+         wildcards_in_alt => 0,
+         check_cn         => 'always'
+      },
+      none => {}, # do not check
+   );
+
+   $scheme{www}  = $scheme{http}; # alias
+   $scheme{xmpp} = $scheme{http}; # rfc 3920
+   $scheme{pop3} = $scheme{ldap}; # rfc 2595
+   $scheme{imap} = $scheme{ldap}; # rfc 2595
+   $scheme{acap} = $scheme{ldap}; # rfc 2595
+   $scheme{nntp} = $scheme{ldap}; # rfc 4642
+   $scheme{ftp}  = $scheme{http}; # rfc 4217
+
+
+   sub _verify_hostname_of_cert {
+      my $identity = shift;
+      my $cert = shift;
+      my $scheme = shift || 'none';
+      if ( ! ref($scheme) ) {
+         $scheme = $scheme{$scheme} or croak "scheme $scheme not defined";
+      }
+
+      return 1 if ! %$scheme; # 'none'
+
+      my $commonName = $dispatcher{cn}->($cert);
+      my @altNames   = $dispatcher{subjectAltNames}->($cert);
+
+      if ( my $sub = $scheme->{callback} ) {
+         return $sub->($identity,$commonName,@altNames);
+      }
+
+
+      my $ipn;
+      if ( CAN_IPV6 and $identity =~m{:} ) {
+         $ipn = IO::Socket::SSL::inet_pton(IO::Socket::SSL::AF_INET6,$identity)
+            or croak "'$identity' is not IPv6, but neither IPv4 nor hostname";
+      } elsif ( $identity =~m{^\d+\.\d+\.\d+\.\d+$} ) {
+         $ipn = IO::Socket::SSL::inet_aton( $identity ) or croak "'$identity' is not IPv4, but neither IPv6 nor hostname";
+      } else {
+         if ( $identity =~m{[^a-zA-Z0-9_.\-]} ) {
+            $identity =~m{\0} and croak("name '$identity' has \\0 byte");
+            $identity = IO::Socket::SSL::idn_to_ascii($identity) or
+               croak "Warning: Given name '$identity' could not be converted to IDNA!";
+         }
+      }
+
+      my $check_name = sub {
+         my ($name,$identity,$wtyp) = @_;
+         $wtyp ||= '';
+         my $pattern;
+         if ( $wtyp eq 'anywhere' and $name =~m{^([a-zA-Z0-9_\-]*)\*(.+)} ) {
+            $pattern = qr{^\Q$1\E[a-zA-Z0-9_\-]*\Q$2\E$}i;
+         } elsif ( $wtyp eq 'leftmost' and $name =~m{^\*(\..+)$} ) {
+            $pattern = qr{^[a-zA-Z0-9_\-]*\Q$1\E$}i;
+         } else {
+            $pattern = qr{^\Q$name\E$}i;
+         }
+         return $identity =~ $pattern;
+      };
+
+      my $alt_dnsNames = 0;
+      while (@altNames) {
+         my ($type, $name) = splice (@altNames, 0, 2);
+         if ( $ipn and $type == GEN_IPADD ) {
+            return 1 if $ipn eq $name;
+
+         } elsif ( ! $ipn and $type == GEN_DNS ) {
+            $name =~s/\s+$//; $name =~s/^\s+//;
+            $alt_dnsNames++;
+            $check_name->($name,$identity,$scheme->{wildcards_in_alt})
+               and return 1;
+         }
+      }
+
+      if ( ! $ipn and (
+         $scheme->{check_cn} eq 'always' or
+         $scheme->{check_cn} eq 'when_only' and !$alt_dnsNames)) {
+         $check_name->($commonName,$identity,$scheme->{wildcards_in_cn})
+            and return 1;
+      }
+
+      return 0; # no match
+   }
+}
+EOP
+
+eval { require IO::Socket::SSL };
+if ( $INC{"IO/Socket/SSL.pm"} ) {
+   eval $prog;
+   die $@ if $@;
+}
+
+1;
+# ###########################################################################
+# End HTTP::Micro package
+# ###########################################################################
+
+# ###########################################################################
+# VersionCheck package
+# This package is a copy without comments from the original.  The original
+# with comments and its test file can be found in the GitHub repository at,
+#   lib/VersionCheck.pm
+#   t/lib/VersionCheck.t
+# See https://github.com/percona/percona-toolkit for more information.
+# ###########################################################################
+{
+package VersionCheck;
+
+
+use strict;
+use warnings FATAL => 'all';
+use English qw(-no_match_vars);
+
+use constant PTDEBUG => $ENV{PTDEBUG} || 0;
+
+use Data::Dumper;
+local $Data::Dumper::Indent    = 1;
+local $Data::Dumper::Sortkeys  = 1;
+local $Data::Dumper::Quotekeys = 0;
+
+use Digest::MD5 qw(md5_hex);
+use Sys::Hostname qw(hostname);
+use File::Basename qw();
+use File::Spec;
+use FindBin qw();
+
+eval {
+   require Percona::Toolkit;
+   require HTTP::Micro;
+};
+
+my $home    = $ENV{HOME} || $ENV{HOMEPATH} || $ENV{USERPROFILE} || '.';
+my @vc_dirs = (
+   '/etc/percona',
+   '/etc/percona-toolkit',
+   '/tmp',
+   "$home",
+);
+
+{
+   my $file    = 'percona-version-check';
+
+   sub version_check_file {
+      foreach my $dir ( @vc_dirs ) {
+         if ( -d $dir && -w $dir ) {
+            PTDEBUG && _d('Version check file', $file, 'in', $dir);
+            return $dir . '/' . $file;
+         }
+      }
+      PTDEBUG && _d('Version check file', $file, 'in', $ENV{PWD});
+      return $file;  # in the CWD
+   }
+}
+
+sub version_check_time_limit {
+   return 60 * 60 * 24;  # one day
+}
+
+
+sub version_check {
+   my (%args) = @_;
+
+   my $instances = $args{instances} || [];
+   my $instances_to_check;
+
+   PTDEBUG && _d('FindBin::Bin:', $FindBin::Bin);
+   if ( !$args{force} ) {
+      if ( $FindBin::Bin
+           && (-d "$FindBin::Bin/../.bzr"    ||
+               -d "$FindBin::Bin/../../.bzr" ||
+               -d "$FindBin::Bin/../.git"    ||
+               -d "$FindBin::Bin/../../.git"
+              )
+         ) {
+         PTDEBUG && _d("$FindBin::Bin/../.bzr disables --version-check");
+         return;
+      }
+   }
+
+   eval {
+      foreach my $instance ( @$instances ) {
+         my ($name, $id) = get_instance_id($instance);
+         $instance->{name} = $name;
+         $instance->{id}   = $id;
+      }
+
+      push @$instances, { name => 'system', id => 0 };
+
+      $instances_to_check = get_instances_to_check(
+         instances => $instances,
+         vc_file   => $args{vc_file},  # testing
+         now       => $args{now},      # testing
+      );
+      PTDEBUG && _d(scalar @$instances_to_check, 'instances to check');
+      return unless @$instances_to_check;
+
+      my $protocol = 'https';
+      eval { require IO::Socket::SSL; };
+      if ( $EVAL_ERROR ) {
+         PTDEBUG && _d($EVAL_ERROR);
+         PTDEBUG && _d("SSL not available, won't run version_check");
+         return;
+      }
+      PTDEBUG && _d('Using', $protocol);
+      my $url = $args{url}                       # testing
+                || $ENV{PERCONA_VERSION_CHECK_URL}  # testing
+                || "$protocol://v.percona.com";
+      PTDEBUG && _d('API URL:', $url);
+
+      my $advice = pingback(
+         instances => $instances_to_check,
+         protocol  => $protocol,
+         url       => $url,
+      );
+      if ( $advice ) {
+         PTDEBUG && _d('Advice:', Dumper($advice));
+         if ( scalar @$advice > 1) {
+            print "\n# " . scalar @$advice . " software updates are "
+               . "available:\n";
+         }
+         else {
+            print "\n# A software update is available:\n";
+         }
+         print join("\n", map { "#   * $_" } @$advice), "\n\n";
+      }
+   };
+   if ( $EVAL_ERROR ) {
+      PTDEBUG && _d('Version check failed:', $EVAL_ERROR);
+   }
+
+   if ( @$instances_to_check ) {
+      eval {
+         update_check_times(
+            instances => $instances_to_check,
+            vc_file   => $args{vc_file},  # testing
+            now       => $args{now},      # testing
+         );
+      };
+      if ( $EVAL_ERROR ) {
+         PTDEBUG && _d('Error updating version check file:', $EVAL_ERROR);
+      }
+   }
+
+   if ( $ENV{PTDEBUG_VERSION_CHECK} ) {
+      warn "Exiting because the PTDEBUG_VERSION_CHECK "
+         . "environment variable is defined.\n";
+      exit 255;
+   }
+
+   return;
+}
+
+sub get_instances_to_check {
+   my (%args) = @_;
+
+   my $instances = $args{instances};
+   my $now       = $args{now}     || int(time);
+   my $vc_file   = $args{vc_file} || version_check_file();
+
+   if ( !-f $vc_file ) {
+      PTDEBUG && _d('Version check file', $vc_file, 'does not exist;',
+         'version checking all instances');
+      return $instances;
+   }
+
+   open my $fh, '<', $vc_file or die "Cannot open $vc_file: $OS_ERROR";
+   chomp(my $file_contents = do { local $/ = undef; <$fh> });
+   PTDEBUG && _d('Version check file', $vc_file, 'contents:', $file_contents);
+   close $fh;
+   my %last_check_time_for = $file_contents =~ /^([^,]+),(.+)$/mg;
+
+   my $check_time_limit = version_check_time_limit();
+   my @instances_to_check;
+   foreach my $instance ( @$instances ) {
+      my $last_check_time = $last_check_time_for{ $instance->{id} };
+      PTDEBUG && _d('Instance', $instance->{id}, 'last checked',
+         $last_check_time, 'now', $now, 'diff', $now - ($last_check_time || 0),
+         'hours until next check',
+         sprintf '%.2f',
+            ($check_time_limit - ($now - ($last_check_time || 0))) / 3600);
+      if ( !defined $last_check_time
+           || ($now - $last_check_time) >= $check_time_limit ) {
+         PTDEBUG && _d('Time to check', Dumper($instance));
+         push @instances_to_check, $instance;
+      }
+   }
+
+   return \@instances_to_check;
+}
+
+sub update_check_times {
+   my (%args) = @_;
+
+   my $instances = $args{instances};
+   my $now       = $args{now}     || int(time);
+   my $vc_file   = $args{vc_file} || version_check_file();
+   PTDEBUG && _d('Updating last check time:', $now);
+
+   my %all_instances = map {
+      $_->{id} => { name => $_->{name}, ts => $now }
+   } @$instances;
+
+   if ( -f $vc_file ) {
+      open my $fh, '<', $vc_file or die "Cannot read $vc_file: $OS_ERROR";
+      my $contents = do { local $/ = undef; <$fh> };
+      close $fh;
+
+      foreach my $line ( split("\n", ($contents || '')) ) {
+         my ($id, $ts) = split(',', $line);
+         if ( !exists $all_instances{$id} ) {
+            $all_instances{$id} = { ts => $ts };  # original ts, not updated
+         }
+      }
+   }
+
+   open my $fh, '>', $vc_file or die "Cannot write to $vc_file: $OS_ERROR";
+   foreach my $id ( sort keys %all_instances ) {
+      PTDEBUG && _d('Updated:', $id, Dumper($all_instances{$id}));
+      print { $fh } $id . ',' . $all_instances{$id}->{ts} . "\n";
+   }
+   close $fh;
+
+   return;
+}
+
+sub get_instance_id {
+   my ($instance) = @_;
+
+   my $dbh = $instance->{dbh};
+   my $dsn = $instance->{dsn};
+
+   my $sql = q{SELECT CONCAT(@@hostname, @@port)};
+   PTDEBUG && _d($sql);
+   my ($name) = eval { $dbh->selectrow_array($sql) };
+   if ( $EVAL_ERROR ) {
+      PTDEBUG && _d($EVAL_ERROR);
+      $sql = q{SELECT @@hostname};
+      PTDEBUG && _d($sql);
+      ($name) = eval { $dbh->selectrow_array($sql) };
+      if ( $EVAL_ERROR ) {
+         PTDEBUG && _d($EVAL_ERROR);
+         $name = ($dsn->{h} || 'localhost') . ($dsn->{P} || 3306);
+      }
+      else {
+         $sql = q{SHOW VARIABLES LIKE 'port'};
+         PTDEBUG && _d($sql);
+         my (undef, $port) = eval { $dbh->selectrow_array($sql) };
+         PTDEBUG && _d('port:', $port);
+         $name .= $port || '';
+      }
+   }
+   my $id = md5_hex($name);
+
+   PTDEBUG && _d('MySQL instance:', $id, $name, Dumper($dsn));
+
+   return $name, $id;
+}
+
+
+sub get_uuid {
+    my $uuid_file = '/.percona-toolkit.uuid';
+    foreach my $dir (@vc_dirs) {
+        my $filename = $dir.$uuid_file;
+        my $uuid=_read_uuid($filename);
+        return $uuid if $uuid;
+    }
+
+    my $filename = $ENV{"HOME"} . $uuid_file;
+    my $uuid = _generate_uuid();
+
+    my $fh;
+    eval {
+        open($fh, '>', $filename);
+    };
+    if (!$EVAL_ERROR) {
+        print $fh $uuid;
+        close $fh;
+    }
+
+    return $uuid;
+}
+
+sub _generate_uuid {
+    return sprintf+($}="%04x")."$}-$}-$}-$}-".$}x3,map rand 65537,0..7;
+}
+
+sub _read_uuid {
+    my $filename = shift;
+    my $fh;
+
+    eval {
+        open($fh, '<:encoding(UTF-8)', $filename);
+    };
+    return if ($EVAL_ERROR);
+
+    my $uuid;
+    eval { $uuid = <$fh>; };
+    return if ($EVAL_ERROR);
+
+    chomp $uuid;
+    return $uuid;
+}
+
+
+sub pingback {
+   my (%args) = @_;
+   my @required_args = qw(url instances);
+   foreach my $arg ( @required_args ) {
+      die "I need a $arg argument" unless $args{$arg};
+   }
+   my $url       = $args{url};
+   my $instances = $args{instances};
+
+   my $ua = $args{ua} || HTTP::Micro->new( timeout => 3 );
+
+   my $response = $ua->request('GET', $url);
+   PTDEBUG && _d('Server response:', Dumper($response));
+   die "No response from GET $url"
+      if !$response;
+   die("GET on $url returned HTTP status $response->{status}; expected 200\n",
+       ($response->{content} || '')) if $response->{status} != 200;
+   die("GET on $url did not return any programs to check")
+      if !$response->{content};
+
+   my $items = parse_server_response(
+      response => $response->{content}
+   );
+   die "Failed to parse server requested programs: $response->{content}"
+      if !scalar keys %$items;
+
+   my $versions = get_versions(
+      items     => $items,
+      instances => $instances,
+   );
+   die "Failed to get any program versions; should have at least gotten Perl"
+      if !scalar keys %$versions;
+
+   my $client_content = encode_client_response(
+      items      => $items,
+      versions   => $versions,
+      general_id => get_uuid(),
+   );
+
+   my $tool_name = $ENV{XTRABACKUP_VERSION} ? "Percona XtraBackup" : File::Basename::basename($0);
+   my $client_response = {
+      headers => { "X-Percona-Toolkit-Tool" => $tool_name },
+      content => $client_content,
+   };
+   PTDEBUG && _d('Client response:', Dumper($client_response));
+
+   $response = $ua->request('POST', $url, $client_response);
+   PTDEBUG && _d('Server suggestions:', Dumper($response));
+   die "No response from POST $url $client_response"
+      if !$response;
+   die "POST $url returned HTTP status $response->{status}; expected 200"
+      if $response->{status} != 200;
+
+   return unless $response->{content};
+
+   $items = parse_server_response(
+      response   => $response->{content},
+      split_vars => 0,
+   );
+   die "Failed to parse server suggestions: $response->{content}"
+      if !scalar keys %$items;
+   my @suggestions = map { $_->{vars} }
+                     sort { $a->{item} cmp $b->{item} }
+                     values %$items;
+
+   return \@suggestions;
+}
+
+sub encode_client_response {
+   my (%args) = @_;
+   my @required_args = qw(items versions general_id);
+   foreach my $arg ( @required_args ) {
+      die "I need a $arg argument" unless $args{$arg};
+   }
+   my ($items, $versions, $general_id) = @args{@required_args};
+
+   my @lines;
+   foreach my $item ( sort keys %$items ) {
+      next unless exists $versions->{$item};
+      if ( ref($versions->{$item}) eq 'HASH' ) {
+         my $mysql_versions = $versions->{$item};
+         for my $id ( sort keys %$mysql_versions ) {
+            push @lines, join(';', $id, $item, $mysql_versions->{$id});
+         }
+      }
+      else {
+         push @lines, join(';', $general_id, $item, $versions->{$item});
+      }
+   }
+
+   my $client_response = join("\n", @lines) . "\n";
+   return $client_response;
+}
+
+sub parse_server_response {
+   my (%args) = @_;
+   my @required_args = qw(response);
+   foreach my $arg ( @required_args ) {
+      die "I need a $arg argument" unless $args{$arg};
+   }
+   my ($response) = @args{@required_args};
+
+   my %items = map {
+      my ($item, $type, $vars) = split(";", $_);
+      if ( !defined $args{split_vars} || $args{split_vars} ) {
+         $vars = [ split(",", ($vars || '')) ];
+      }
+      $item => {
+         item => $item,
+         type => $type,
+         vars => $vars,
+      };
+   } split("\n", $response);
+
+   PTDEBUG && _d('Items:', Dumper(\%items));
+
+   return \%items;
+}
+
+my %sub_for_type = (
+   os_version          => \&get_os_version,
+   perl_version        => \&get_perl_version,
+   perl_module_version => \&get_perl_module_version,
+   mysql_variable      => \&get_mysql_variable,
+   xtrabackup          => \&get_xtrabackup_version,
+);
+
+sub valid_item {
+   my ($item) = @_;
+   return unless $item;
+   if ( !exists $sub_for_type{ $item->{type} } ) {
+      PTDEBUG && _d('Invalid type:', $item->{type});
+      return 0;
+   }
+   return 1;
+}
+
+sub get_versions {
+   my (%args) = @_;
+   my @required_args = qw(items);
+   foreach my $arg ( @required_args ) {
+      die "I need a $arg argument" unless $args{$arg};
+   }
+   my ($items) = @args{@required_args};
+
+   my %versions;
+   foreach my $item ( values %$items ) {
+      next unless valid_item($item);
+      eval {
+         my $version = $sub_for_type{ $item->{type} }->(
+            item      => $item,
+            instances => $args{instances},
+         );
+         if ( $version ) {
+            chomp $version unless ref($version);
+            $versions{$item->{item}} = $version;
+         }
+      };
+      if ( $EVAL_ERROR ) {
+         PTDEBUG && _d('Error getting version for', Dumper($item), $EVAL_ERROR);
+      }
+   }
+
+   return \%versions;
+}
+
+
+sub get_os_version {
+   if ( $OSNAME eq 'MSWin32' ) {
+      require Win32;
+      return Win32::GetOSDisplayName();
+   }
+
+  chomp(my $platform = `uname -s`);
+  PTDEBUG && _d('platform:', $platform);
+  return $OSNAME unless $platform;
+
+   chomp(my $lsb_release
+            = `which lsb_release 2>/dev/null | awk '{print \$1}'` || '');
+   PTDEBUG && _d('lsb_release:', $lsb_release);
+
+   my $release = "";
+
+   if ( $platform eq 'Linux' ) {
+      if ( -f "/etc/fedora-release" ) {
+         $release = `cat /etc/fedora-release`;
+      }
+      elsif ( -f "/etc/redhat-release" ) {
+         $release = `cat /etc/redhat-release`;
+      }
+      elsif ( -f "/etc/system-release" ) {
+         $release = `cat /etc/system-release`;
+      }
+      elsif ( $lsb_release ) {
+         $release = `$lsb_release -ds`;
+      }
+      elsif ( -f "/etc/lsb-release" ) {
+         $release = `grep DISTRIB_DESCRIPTION /etc/lsb-release`;
+         $release =~ s/^\w+="([^"]+)".+/$1/;
+      }
+      elsif ( -f "/etc/debian_version" ) {
+         chomp(my $rel = `cat /etc/debian_version`);
+         $release = "Debian $rel";
+         if ( -f "/etc/apt/sources.list" ) {
+             chomp(my $code_name = `awk '/^deb/ {print \$3}' /etc/apt/sources.list | awk -F/ '{print \$1}'| awk 'BEGIN {FS="|"} {print \$1}' | sort | uniq -c | sort -rn | head -n1 | awk '{print \$2}'`);
+             $release .= " ($code_name)" if $code_name;
+         }
+      }
+      elsif ( -f "/etc/os-release" ) { # openSUSE
+         chomp($release = `grep PRETTY_NAME /etc/os-release`);
+         $release =~ s/^PRETTY_NAME="(.+)"$/$1/;
+      }
+      elsif ( `ls /etc/*release 2>/dev/null` ) {
+         if ( `grep DISTRIB_DESCRIPTION /etc/*release 2>/dev/null` ) {
+            $release = `grep DISTRIB_DESCRIPTION /etc/*release | head -n1`;
+         }
+         else {
+            $release = `cat /etc/*release | head -n1`;
+         }
+      }
+   }
+   elsif ( $platform =~ m/(?:BSD|^Darwin)$/ ) {
+      my $rel = `uname -r`;
+      $release = "$platform $rel";
+   }
+   elsif ( $platform eq "SunOS" ) {
+      my $rel = `head -n1 /etc/release` || `uname -r`;
+      $release = "$platform $rel";
+   }
+
+   if ( !$release ) {
+      PTDEBUG && _d('Failed to get the release, using platform');
+      $release = $platform;
+   }
+   chomp($release);
+
+   $release =~ s/^"|"$//g;
+
+   PTDEBUG && _d('OS version =', $release);
+   return $release;
+}
+
+sub get_perl_version {
+   my (%args) = @_;
+   my $item = $args{item};
+   return unless $item;
+
+   my $version = sprintf '%vd', $PERL_VERSION;
+   PTDEBUG && _d('Perl version', $version);
+   return $version;
+}
+
+sub get_xtrabackup_version {
+    return $ENV{XTRABACKUP_VERSION};
+}
+
+sub get_perl_module_version {
+   my (%args) = @_;
+   my $item = $args{item};
+   return unless $item;
+
+   my $var     = '$' . $item->{item} . '::VERSION';
+   my $version = eval "use $item->{item}; $var;";
+   PTDEBUG && _d('Perl version for', $var, '=', $version);
+   return $version;
+}
+
+sub get_mysql_variable {
+   return get_from_mysql(
+      show => 'VARIABLES',
+      @_,
+   );
+}
+
+sub get_from_mysql {
+   my (%args) = @_;
+   my $show      = $args{show};
+   my $item      = $args{item};
+   my $instances = $args{instances};
+   return unless $show && $item;
+
+   if ( !$instances || !@$instances ) {
+      PTDEBUG && _d('Cannot check', $item,
+         'because there are no MySQL instances');
+      return;
+   }
+
+   if ($item->{item} eq 'MySQL' && $item->{type} eq 'mysql_variable') {
+      @{$item->{vars}} = grep { $_ eq 'version' || $_ eq 'version_comment' } @{$item->{vars}};
+   }
+
+
+   my @versions;
+   my %version_for;
+   foreach my $instance ( @$instances ) {
+      next unless $instance->{id};  # special system instance has id=0
+      my $dbh = $instance->{dbh};
+      local $dbh->{FetchHashKeyName} = 'NAME_lc';
+      my $sql = qq/SHOW $show/;
+      PTDEBUG && _d($sql);
+      my $rows = $dbh->selectall_hashref($sql, 'variable_name');
+
+      my @versions;
+      foreach my $var ( @{$item->{vars}} ) {
+         $var = lc($var);
+         my $version = $rows->{$var}->{value};
+         PTDEBUG && _d('MySQL version for', $item->{item}, '=', $version,
+            'on', $instance->{name});
+         push @versions, $version;
+      }
+      $version_for{ $instance->{id} } = join(' ', @versions);
+   }
+
+   return \%version_for;
+}
+
+sub _d {
+   my ($package, undef, $line) = caller 0;
+   @_ = map { (my $temp = $_) =~ s/\n/\n# /g; $temp; }
+        map { defined $_ ? $_ : 'undef' }
+        @_;
+   print STDERR "# $package:$line $PID ", join(' ', @_), "\n";
+}
+
+1;
+}
+# ###########################################################################
+# End VersionCheck package
+# ###########################################################################
+
+# ###########################################################################
+# This is a combination of modules and programs in one -- a runnable module.
+# http://www.perl.com/pub/a/2006/07/13/lightning-articles.html?page=last
+# Or, look it up in the Camel book on pages 642 and 643 in the 3rd edition.
+#
+# Check at the end of this package for the call to main() which actually runs
+# the program.
+# ###########################################################################
+package pt_slave_restart;
+
+use English qw(-no_match_vars);
+use IO::File;
+use File::Basename;
+use List::Util qw(min max);
+use Time::HiRes qw(sleep);
+use sigtrap qw(handler finish untrapped normal-signals);
+
+use Percona::Toolkit;
+use constant PTDEBUG => $ENV{PTDEBUG} || 0;
+
+use Data::Dumper;
+
+local $Data::Dumper::Indent    = 1;
+local $Data::Dumper::Sortkeys  = 1;
+local $Data::Dumper::Quotekeys = 0;
+
+$OUTPUT_AUTOFLUSH = 1;
+
+my $o;
+my $dp;
+my $q  = new Quoter();
+my %children;
+
+sub main {
+   local @ARGV = @_;  # set global ARGV for this package
+
+   if ( basename($0) eq 'pt-slave-restart' ) {
+      warn "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";
+   }
+
+   # ########################################################################
+   # Get configuration information.
+   # ########################################################################
+   $o  = new OptionParser();
+   $o->get_specs();
+   $o->get_opts();
+
+   $dp = $o->DSNParser();
+   $dp->prop('set-vars', $o->set_vars());
+
+   $o->set('verbose', 0) if $o->get('quiet');
+
+   if ( !$o->get('help') ) {
+      if ( $o->get('until-master') ) {
+         if ( $o->get('until-master') !~ m/^[.\w-]+,\d+$/ ) {
+            $o->save_error("Invalid --until-master argument, must be file,pos");
+         }
+      }
+      if ( $o->get('until-relay') ) {
+         if ( $o->get('until-relay') !~ m/^[.\w-]+,\d+$/ ) {
+            $o->save_error("Invalid --until-relay argument, must be file,pos");
+         }
+      }
+   }
+
+   eval {
+      MasterSlave::check_recursion_method($o->get('recursion-method'));
+   };
+   if ( $EVAL_ERROR ) {
+      $o->save_error("Invalid --recursion-method: $EVAL_ERROR")
+   }
+
+   $o->usage_or_errors();
+
+   # ########################################################################
+   # First things first: if --stop was given, create the sentinel file.
+   # ########################################################################
+   my $sentinel = $o->get('sentinel');
+   if ( $o->get('stop') ) {
+      PTDEBUG && _d('Creating sentinel file', $sentinel);
+      my $file = IO::File->new($sentinel, ">>")
+         or die "Cannot open $sentinel: $OS_ERROR\n";
+      print $file "Remove this file to permit pt-replica-restart to run\n"
+         or die "Cannot write to $sentinel: $OS_ERROR\n";
+      close $file
+         or die "Cannot close $sentinel: $OS_ERROR\n";
+      print STDOUT "Successfully created file $sentinel\n"
+         unless $o->get('quiet');
+      # Exit unlesss --monitor is given.
+      if ( !$o->got('monitor') ) {
+         PTDEBUG && _d('Nothing more to do, quitting');
+         return 0;
+      }
+      else {
+         # Wait for all other running instances to quit, assuming they have the
+         # same --interval as this invocation.  Then remove the file and
+         # continue.
+         PTDEBUG && _d('Waiting for other instances to quit');
+         sleep $o->get('max-sleep');
+         PTDEBUG && _d('Unlinking', $sentinel);
+         unlink $sentinel
+            or die "Cannot unlink $sentinel: $OS_ERROR";
+      }
+   }
+
+   # ########################################################################
+   # Connect to MySQL.
+   # ########################################################################
+   if ( $o->get('ask-pass') ) {
+      $o->set('password', OptionParser::prompt_noecho("Enter password: "));
+   }
+   my $dsn_defaults = $dp->parse_options($o);
+   my $dsn          = @ARGV ? $dp->parse(shift @ARGV, $dsn_defaults)
+                    :         $dsn_defaults;
+   my $dbh          = $dp->get_dbh($dp->get_cxn_params($dsn),
+                              { AutoCommit => 1, });
+
+   $dbh->{InactiveDestroy}  = 1;         # Don't disconnect on fork/daemonize
+
+   # ########################################################################
+   # Daemonize only after (potentially) asking for passwords for --ask-pass.
+   # If option daemonize is not provided while option pid is provided,
+   # we're not daemoninzing, it just handles PID stuff.
+   # ########################################################################
+   my $daemon;
+   if ( $o->get('daemonize') || $o->get('pid')) {
+      $daemon = new Daemon(
+         log_file => $o->get('log'),
+         pid_file => $o->get('pid'),
+         daemonize => $o->get('daemonize'),
+      );
+      $daemon->run();
+      PTDEBUG && $o->get('daemonize') && _d('I am a daemon now');
+   }
+
+   # ########################################################################
+   # Set source and replica names.
+   # ########################################################################
+
+   my $vp = VersionParser->new($dbh);
+   my $source_name = 'source';
+   my $replica_name = 'replica';
+   if ( $vp < '8.1' || $vp->flavor() =~ m/maria/ ) {
+      $source_name = 'master';
+      $replica_name = 'slave';
+   }
+
+   # ########################################################################
+   # Start monitoring the replica.
+   # ########################################################################
+   my $exit_status = 0;
+   my @servers_to_watch;
+
+   # Despite the name, recursing to replicas actually begins at the specified
+   # server, so the named server may also be watched, if it's a replica.
+   my $ms = new MasterSlave(
+      OptionParser => $o,
+      DSNParser    => $dp,
+      Quoter       => $q,
+   );
+   $ms->recurse_to_replicas(
+      {  dbh      => $dbh,
+         dsn      => $dsn,
+         callback => sub {
+            my ( $dsn, $dbh, $level ) = @_;
+            # Test whether we want to watch this server.
+            eval {
+               my $stat = $ms->get_replica_status($dbh);
+               if ( $stat ) {
+                  push @servers_to_watch, { dsn => $dsn, dbh => $dbh };
+               }
+               else {
+                  die "could not find ${replica_name} status on this server\n";
+               }
+            };
+            if ( $EVAL_ERROR ) {
+               chomp $EVAL_ERROR;
+               PTDEBUG && _d('Not watching', $dp->as_string($dsn),
+                  'because', $EVAL_ERROR);
+            }
+         },
+         skip_callback => sub {
+            my ( $dsn, $dbh, $level ) = @_;
+            print STDERR "Skipping ", $dp->as_string($dsn), "\n";
+         },
+      }
+   );
+
+   # ########################################################################
+   # Do the version-check
+   # ########################################################################
+   if ( $o->get('version-check') && (!$o->has('quiet') || !$o->get('quiet')) ) {
+      VersionCheck::version_check(
+         force     => $o->got('version-check'),
+         instances => [ { dbh => $dbh, dsn => $dsn }, @servers_to_watch ],
+      );
+   }
+
+   # ########################################################################
+   # Watch each server found.
+   # ########################################################################
+   my $must_fork = @servers_to_watch > 1;
+   foreach my $host ( @servers_to_watch ) {
+
+      $host->{dbh}->{InactiveDestroy}  = 1;         # Don't disconnect on fork
+
+      # Fork, but only if there might be more than one host to watch.
+      my $pid = $must_fork ? fork() : undef;
+      if ( !$must_fork || (defined($pid) && $pid == 0) ) {
+         # I either forked and I'm a child, or I didn't fork... confusing, eh?
+         watch_server($host->{dsn}, $host->{dbh}, $must_fork, $ms);
+      }
+      elsif ( $must_fork && !defined($pid) ) {
+         die("Unable to fork!");
+      }
+      # I already exited if I'm a child, so I'm the parent.  (Or maybe I never
+      # forked).
+      $children{$dp->as_string($host->{dsn})} = $pid if $must_fork;
+   }
+
+   PTDEBUG && _d('Child PIDs:', values %children);
+   # Wait for the children to exit.
+   foreach my $host ( keys %children ) {
+      PTDEBUG && _d('Waiting to reap', $host);
+      my $pid = waitpid($children{$host}, 0);
+      $exit_status ||= $CHILD_ERROR >> 8;
+   }
+
+   $dp->disconnect($dbh);
+   return $exit_status;
+}
+
+# ############################################################################
+# Subroutines.
+# ############################################################################
+
+# Actually watch a server.  If many instances are being watched, this is
+# fork()ed.
+sub watch_server {
+   my ( $dsn, $dbh, $was_forked, $ms ) = @_;
+
+   PTDEBUG && _d('Watching server', $dp->as_string($dsn),
+      'forked:', $was_forked);
+
+   my $vp = VersionParser->new($dbh);
+   my $source_name   = 'source';
+   my $source_change = 'replication source';
+   my $replica_name  = 'replica';
+   if ( $vp < '8.1' || $vp->flavor() =~ m/maria/ ) {
+      $source_name   = 'master';
+      $source_change = 'master';
+      $replica_name  = 'slave';
+   }
+
+   my $start_sql = $vp >= '4.0.5' ? "START ${replica_name}" : 'SLAVE START';
+   if ( $o->get('until-master') ) {
+      my ( $file, $pos ) = split(',', $o->get('until-master'));
+      $start_sql .= " UNTIL ${source_name}_LOG_FILE = '$file', ${source_name}_LOG_POS = $pos";
+   }
+   elsif ( $o->get('until-relay') ) {
+      my ( $file, $pos ) = split(',', $o->get('until-relay'));
+      $start_sql .= " UNTIL RELAY_LOG_FILE = '$file', RELAY_LOG_POS = $pos";
+   }
+
+   my $start = $dbh->prepare($start_sql);
+   my $stop  = $dbh->prepare("STOP ${replica_name}");
+
+   # ########################################################################
+   # Detect if GTID is enabled. Skipping an event is done differently.
+   # ########################################################################
+   # When MySQL 5.6.5 or higher is used and gtid is enabled, skipping a
+   # transaction is not possible with SQL_REPLICA_SKIP_COUNTER
+   my $skip_event;
+   my $have_gtid = 0;
+   # We also check if version is lower than 10.0.0 because MariaDB has different
+   # versioning system than MySQL
+   if ( VersionParser->new($dbh) >= '5.6.5' && VersionParser->new($dbh) <= '10.0.0' ) {
+      my $row = $dbh->selectrow_arrayref('SELECT @@GLOBAL.gtid_mode');
+      PTDEBUG && _d('@@GLOBAL.gtid_mode:', $row->[0]);
+      if ( $row && $row->[0] =~ m/^ON/ ) {
+         $have_gtid = 1;
+      }
+   }
+   PTDEBUG && _d('Have GTID:', $have_gtid);
+
+   # If GTID is enabled, replica_parallel_workers should be == 0.
+   # It's currently not possible to know what GTID event the failed trx is.
+   if ( $have_gtid ) {
+      my $threads = $dbh->selectrow_hashref(
+         "SELECT \@\@GLOBAL.${replica_name}_parallel_workers AS threads");
+      if ( $threads->{threads} > 0 ) {
+         die "Cannot skip transactions properly because GTID is enabled "
+            . "and ${replica_name}_parallel_workers > 0.  See 'GLOBAL TRANSACTION IDS' "
+            . "in the tool's documentation.\n";
+      }
+   }
+
+   # ########################################################################
+   # Lookup tables of things to do when a problem is detected.
+   # ########################################################################
+   my @error_patterns = (
+      [ qr/You have an error in your SQL/         => 'refetch_relay_log' ],
+      [ qr/Could not parse relay log event entry/ => 'refetch_relay_log' ],
+      [ qr/Incorrect key file for table/          => 'repair_table'      ],
+      # This must be the last one.  It's a catch-all rule: skip and restart.
+      [ qr/./ => ($have_gtid ? 'skip_gtid' : 'skip')                     ],
+   );
+
+   # ########################################################################
+   # These are actions to take when an error is found.
+   # ########################################################################
+   my %actions = (
+      refetch_relay_log => sub {
+         my ( $stat, $dbh ) = @_;
+         PTDEBUG && _d('Found relay log corruption');
+         # Can't do CHANGE MASTER TO with a running replica.
+         $stop->execute();
+
+         # Cannot use ? placeholders for CHANGE MASTER values:
+         # https://bugs.launchpad.net/percona-toolkit/+bug/932614
+         my $sql = "CHANGE ${source_change} TO "
+                 . "${source_name}_LOG_FILE='" 
+                 . $stat->{"relay_${source_name}_log_file"} . "', "
+                 . "${source_name}_LOG_POS=" . $stat->{"exec_${source_name}_log_pos"};
+         PTDEBUG && _d($sql);
+         $dbh->do($sql);
+      },
+      skip => sub {
+         my ( $stat, $dbh ) = @_;
+         my $set_skip = $dbh->prepare("SET GLOBAL SQL_${replica_name}_SKIP_COUNTER = "
+                          . $o->get('skip-count'));
+         $set_skip->execute();
+      },
+      skip_gtid => sub {
+         my ( $stat, $dbh ) = @_;
+
+         # Get master_uuid from SHOW REPLICA STATUS if a UUID is not specified
+         # with --source-uuid.
+         my $gtid_uuid = $o->get("source-uuid");
+         if ( !$gtid_uuid ) {
+            $gtid_uuid = $stat->{"${source_name}_uuid"};
+            die "No ${source_name}_uuid" unless $gtid_uuid;  # shouldn't happen
+         }
+
+         # We need the highest transaction in the executed_gtid_set.
+         # and then we need to increase it by 1 (the one we want to skip)
+         # Notes:
+         #  - does not work with parallel replication
+         #  - it skips the next transaction from the master_uuid
+         #    (when a replicaB is replicating from replicaA,
+         #     the master_uuid is it's own master, replicaA)
+         my ($gtid_exec_ids) = ($stat->{executed_gtid_set} || '') =~ m/$gtid_uuid([0-9-:]*)/;
+         $gtid_exec_ids =~ s/:[0-9]+-/:/g;
+         die "No executed GTIDs" unless $gtid_exec_ids;
+
+         my @gtid_exec_ranges = split(/:/, $gtid_exec_ids);
+         delete $gtid_exec_ranges[0]; # undef the first value, it's always empty
+
+         # Get the highest id by sorting the array, removing the undef value.
+         my @gtid_exec_sorted = sort { $a <=> $b }
+                                grep { defined($_) } @gtid_exec_ranges;
+         my $gtid_exec_last   = $gtid_exec_sorted[-1];
+
+         PTDEBUG && _d("\n",
+            "GTID: ${source_name}_uuid:",         $gtid_uuid, "\n",
+            "GTID: executed_gtid_set:",           $gtid_exec_ids, "\n",
+            "GTID: max for ${source_name}_uuid:", $gtid_exec_sorted[-1], "\n",
+            "GTID: last executed gtid:",          $gtid_uuid, ":", $gtid_exec_last);
+
+         # Set the sessions next gtid, write an empty transaction
+         my $skipped = 0;
+         while ( $skipped++ < $o->get('skip-count') ) {
+            my $gtid_next = $gtid_exec_last + $skipped;
+            my $sql       = "SET GTID_NEXT='$gtid_uuid:$gtid_next'";
+            PTDEBUG && _d($sql);
+            my $sth = $dbh->prepare($sql);
+            $sth->execute();
+            $dbh->begin_work();
+            $dbh->commit();
+         }
+
+         # Set the session back to the automatically generated GTID_NEXT.
+         $dbh->do("SET GTID_NEXT='AUTOMATIC'");
+      },
+      repair_table => sub {
+         my ( $stat, $dbh ) = @_;
+         PTDEBUG && _d('Found corrupt table');
+         # [ qr/Incorrect key file for table './foo/bar.MYI'
+         my ( $db, $tbl ) = $stat->{last_error} =~ m!([^/]+)/(.*?)\.MYI!;
+         if ( $db && $tbl ) {
+            my $sql = "REPAIR TABLE " . $q->quote($db, $tbl);
+            PTDEBUG && _d($sql);
+            $dbh->do($sql);
+         }
+      },
+   );
+
+   my $err_text  = $o->get('error-text');
+   my $exit_time = time() + ($o->get('run-time') || 0);
+   my $sleep     = $o->get('sleep');
+   my ($last_log, $last_pos);
+
+   my $stat = {}; # Will hold SHOW REPLICA STATUS
+   STAT:
+   while ( $stat
+           && (!$o->get('run-time') || time() < $exit_time)
+           && !-f $o->get('sentinel') ) {
+      my $increase_sleep = 1;
+      $stat = $ms->get_replica_status($dbh);
+      if ( !$stat ) {
+         print STDERR "No ${replica_name} STATUS output found on ",
+            $dp->as_string($dsn), "\n";
+         next STAT;
+      }
+
+      PTDEBUG && _d('Last/current relay log file:',
+         $last_log, $stat->{relay_log_file});
+      PTDEBUG && _d('Last/current relay log pos:',
+         $last_pos, $stat->{relay_log_pos});
+      if ( !$last_log
+           || $last_log ne $stat->{relay_log_file}   # Avoid infinite loops
+           || $last_pos != $stat->{relay_log_pos}
+      ) {
+         $stat->{"${replica_name}_sql_running"} ||= 'No';
+         $stat->{last_error}        ||= '';
+         $stat->{last_errno}        ||= 0;
+
+         if ( $o->get('until-master') && pos_ge($stat, $source_name, $source_name) ) {
+            die "Replica has advanced past " . $o->get('until-master')
+               . " on master.\n";
+         }
+         elsif ( $o->get('until-relay') && pos_ge($stat, 'relay', $source_name) ) {
+            die "Replica has advanced past " . $o->get('until-relay')
+               . " in relay logs.\n";
+         }
+
+         if ( $stat->{"${replica_name}_sql_running"} eq 'No' ) {
+            # Print the time, error, etc
+            if ( $o->get('verbose') ) {
+               my $err = '';
+               if ( $o->get('verbose') > 1 ) {
+                  ($err = $stat->{last_error} || '' ) =~ s/\s+/ /g;
+                  if ( $o->get('error-length') ) {
+                     $err = substr($err, 0, $o->get('error-length'));
+                  }
+               }
+               printf("%s %s %s %11d %d %s\n",
+                  ts(time),
+                  $dp->as_string($dsn),
+                  $stat->{relay_log_file},
+                  $stat->{relay_log_pos},
+                  $stat->{last_errno} || 0,
+                  $err
+               );
+            }
+
+            if ( $o->got('error-numbers')
+                 && !exists($o->get('error-numbers')->{$stat->{last_errno}}) ) {
+               die "Error $stat->{last_errno} is not in --error-numbers.\n";
+            }
+            elsif ( $err_text
+                    && $stat->{last_error}
+                    && $stat->{last_error} !~ m/$err_text/ ) {
+               die "Error does not match --error-text.\n";
+            }
+            elsif ( $stat->{last_error} || $o->get('always') ) {
+
+               # What kind of error is it?
+               foreach my $pat ( @error_patterns ) {
+                  if ( $stat->{last_error} =~ m/$pat->[0]/ ) {
+                     $actions{$pat->[1]}->($stat, $dbh);
+                     last;
+                  }
+               }
+
+               $start->execute();
+               $increase_sleep = 0;
+
+               # Only set this on events I tried to restart.  Otherwise there
+               # could be a race condition: I see it, I record it, but it hasn't
+               # caused an error yet; so I won't try to restart it when it does.
+               # (The point of this is to avoid trying to restart the same event
+               # twice in case another race condition happens -- I restart it,
+               # then check the server and it hasn't yet cleared the error
+               # message and restarted the SQL thread).
+               if ( $o->get('check-relay-log') ) {
+                  $last_log = $stat->{relay_log_file};
+                  $last_pos = $stat->{relay_log_pos};
+               }
+            }
+            else {
+               PTDEBUG && _d('The replica is stopped, but without error');
+               $increase_sleep = 1;
+            }
+         }
+         elsif ( $o->get('verbose') > 2 ) {
+            printf("%s delayed %s sec\n", $dp->as_string($dsn),
+               (defined $stat->{"seconds_behind_${source_name}"} ?
+               $stat->{"seconds_behind_${source_name}"} : 'NULL'));
+         }
+      }
+      else {
+         if ( $o->get('verbose') ) {
+            print "Not checking replica because relay log file or position has "
+               . "not changed "
+               . "(file " . ($last_log || '')
+               . " pos "  . ($last_pos || '') . ")\n";
+         }
+      }
+
+      # Adjust sleep time.
+      if ( $increase_sleep ) {
+         $sleep = min($o->get('max-sleep'), $sleep * 2);
+      }
+      else {
+         $sleep = max($o->get('min-sleep'), $sleep / 2);
+      }
+
+      # Errors are very likely to follow each other in quick succession.  NOTE:
+      # this policy has a side effect with respect to $sleep.  Suppose $sleep is
+      # 512 and pt-replica-restart finds an error; now $sleep is 256, but
+      # pt-replica-restart sleeps only 1 (the initial value of --sleep).  Suppose
+      # there is no error when it wakes up after 1 second, because 1 was too
+      # short.  Now it doubles $sleep, back to 512.  $sleep has the same value
+      # it did before the error was ever found.
+      my $sleep_time = $increase_sleep ? $sleep : min($sleep, $o->get('sleep'));
+      if ( $o->get('verbose') > 2 ) {
+         printf("%s sleeping %f\n", $dp->as_string($dsn), $sleep_time);
+      }
+      sleep $sleep_time;
+   }
+
+   PTDEBUG && _d('All done with server', $dp->as_string($dsn));
+   if ( $was_forked ) {
+      $dp->disconnect($dbh);
+      exit(0);
+   }
+}
+
+# Determines if the $stat's log coordinates are greater than or equal to the
+# desired coordinates. $which is 'master' or 'relay'
+sub pos_ge {
+   my ( $stat, $which, $source_name ) = @_;
+   my $fmt  = '%s/%020d';
+   my $curr = $which eq $source_name
+      ? sprintf($fmt, @{$stat}{("relay_${source_name}_log_file", "exec_${source_name}_log_pos")})
+      : sprintf($fmt, @{$stat}{qw(relay_log_file relay_log_pos)});
+   my $stop = sprintf($fmt, split(',', $o->get("until-$which")));
+   return $curr ge $stop;
+}
+
+sub ts {
+   my ( $time ) = @_;
+   my ( $sec, $min, $hour, $mday, $mon, $year )
+      = localtime($time);
+   $mon  += 1;
+   $year += 1900;
+   return sprintf("%d-%02d-%02dT%02d:%02d:%02d",
+      $year, $mon, $mday, $hour, $min, $sec);
+}
+
+# Catches signals for exiting gracefully.
+sub finish {
+   my ($signal) = @_;
+   print STDERR "Exiting on SIG$signal.\n";
+   if ( %children ) {
+      kill 9, values %children;
+      print STDERR "Signaled ", join(', ', values %children), "\n";
+   }
+   exit(1);
+}
+
+sub _d {
+   my ($package, undef, $line) = caller 0;
+   @_ = map { (my $temp = $_) =~ s/\n/\n# /g; $temp; }
+        map { defined $_ ? $_ : 'undef' }
+        @_;
+   print STDERR "# $package:$line $PID ", join(' ', @_), "\n";
+}
+
+# ############################################################################
+# Run the program.
+# ############################################################################
+if ( !caller ) { exit main(@ARGV); }
+
+1; # Because this is a module as well as a script.
+
+# ############################################################################
+# Documentation.
+# ############################################################################
+
+=pod
+
+=head1 NAME
+
+pt-replica-restart - Watch and restart MySQL replication after errors.
+
+=head1 SYNOPSIS
+
+Usage: pt-replica-restart [OPTIONS] [DSN]
+
+pt-replica-restart watches one or more MySQL replication slaves for
+errors, and tries to restart replication if it stops.
+
+=head1 RISKS
+
+Percona Toolkit is mature, proven in the real world, and well tested,
+but all database tools can pose a risk to the system and the database
+server.  Before using this tool, please:
+
+=over
+
+=item * Read the tool's documentation
+
+=item * Review the tool's known L<"BUGS">
+
+=item * Test the tool on a non-production server
+
+=item * Backup your production server and verify the backups
+
+=back
+
+=head1 DESCRIPTION
+
+pt-replica-restart watches one or more MySQL replication slaves and tries to skip
+statements that cause errors.  It polls slaves intelligently with an
+exponentially varying sleep time.  You can specify errors to skip and run the
+slaves until a certain binlog position.
+
+Although this tool can help a slave advance past errors, you should not
+rely on it to "fix" replication.  If slave errors occur frequently or
+unexpectedly, you should identify and fix the root cause.
+
+=head1 OUTPUT
+
+pt-replica-restart prints a line every time it sees the slave has an error.
+By default this line is: a timestamp, connection information, relay_log_file,
+relay_log_pos, and last_errno.
+You can add more information using the L<"--verbose"> option.
+You can suppress all output using the L<"--quiet"> option.
+
+=head1 SLEEP
+
+pt-replica-restart sleeps intelligently between polling the slave.  The current
+sleep time varies.
+
+=over
+
+=item *
+
+The initial sleep time is given by L<"--sleep">.
+
+=item *
+
+If it checks and finds an error, it halves the previous sleep time.
+
+=item *
+
+If it finds no error, it doubles the previous sleep time.
+
+=item *
+
+The sleep time is bounded below by L<"--min-sleep"> and above by
+L<"--max-sleep">.
+
+=item *
+
+Immediately after finding an error, pt-replica-restart assumes another error is
+very likely to happen next, so it sleeps the current sleep time or the initial
+sleep time, whichever is less.
+
+=back
+
+=head1 GLOBAL TRANSACTION IDS
+
+As of Percona Toolkit 2.2.8, pt-replica-restart supports Global Transaction IDs
+introduced in MySQL 5.6.5.  It's important to keep in mind that:
+
+=over
+
+=item *
+
+pt-replica-restart will not skip transactions when multiple replication threads
+are being used (slave_parallel_workers > 0).  pt-replica-restart does not know
+what the GTID event is of the failed transaction of a specific slave thread.
+
+=item *
+
+The default behavior is to skip the next transaction from the slave's master.
+Writes can originate on different servers, each with their own UUID.
+
+See L<"--master-uuid">.
+
+=back
+
+=head1 EXIT STATUS
+
+An exit status of 0 (sometimes also called a return value or return code)
+indicates success.  Any other value represents the exit status of the Perl
+process itself, or of the last forked process that exited if there were multiple
+servers to monitor.
+
+=head1 COMPATIBILITY
+
+pt-replica-restart should work on many versions of MySQL.  Lettercase of many
+output columns from SHOW SLAVE STATUS has changed over time, so it treats them
+all as lowercase.
+
+=head1 OPTIONS
+
+This tool accepts additional command-line arguments.  Refer to the
+L<"SYNOPSIS"> and usage information for details.
+
+=over
+
+=item --always
+
+Start slaves even when there is no error.  With this option enabled,
+pt-replica-restart will not let you stop the slave manually if you want to!
+
+=item --ask-pass
+
+Prompt for a password when connecting to MySQL.
+
+=item --charset
+
+short form: -A; type: string
+
+Default character set.  If the value is utf8, sets Perl's binmode on
+STDOUT to utf8, passes the mysql_enable_utf8 option to DBD::mysql, and
+runs SET NAMES UTF8 after connecting to MySQL.  Any other value sets
+binmode on STDOUT without the utf8 layer, and runs SET NAMES after
+connecting to MySQL.
+
+=item --[no]check-relay-log
+
+default: yes
+
+Check the last relay log file and position before checking for slave errors.
+
+By default pt-replica-restart will not doing anything (it will just sleep)
+if neither the relay log file nor the relay log position have changed since
+the last check.  This prevents infinite loops (i.e. restarting the same
+error in the same relay log file at the same relay log position).
+
+For certain slave errors, however, this check needs to be disabled by
+specifying C<--no-check-relay-log>.  Do not do this unless you know what
+you are doing!
+
+=item --config
+
+type: Array
+
+Read this comma-separated list of config files; if specified, this must be the
+first option on the command line.
+
+=item --daemonize
+
+Fork to the background and detach from the shell.  POSIX
+operating systems only.
+
+=item --database
+
+short form: -D; type: string
+
+Database to use.
+
+=item --defaults-file
+
+short form: -F; type: string
+
+Only read mysql options from the given file.  You must give an absolute
+pathname.
+
+=item --error-length
+
+type: int
+
+Max length of error message to print.  When L<"--verbose"> is set high enough to
+print the error, this option will truncate the error text to the specified
+length.  This can be useful to prevent wrapping on the terminal.
+
+=item --error-numbers
+
+type: hash
+
+Only restart this comma-separated list of errors.  Makes pt-replica-restart only
+try to restart if the error number is in this comma-separated list of errors.
+If it sees an error not in the list, it will exit.
+
+The error number is in the C<last_errno> column of C<SHOW SLAVE STATUS>.
+
+=item --error-text
+
+type: string
+
+Only restart errors that match this pattern.  A Perl regular expression against
+which the error text, if any, is matched.  If the error text exists and matches,
+pt-replica-restart will try to restart the slave.  If it exists but doesn't match,
+pt-replica-restart will exit.
+
+The error text is in the C<last_error> column of C<SHOW SLAVE STATUS>.
+
+=item --help
+
+Show help and exit.
+
+=item --host
+
+short form: -h; type: string
+
+Connect to host.
+
+=item --log
+
+type: string
+
+Print all output to this file when daemonized.
+
+=item --max-sleep
+
+type: float; default: 64
+
+Maximum sleep seconds.
+
+The maximum time pt-replica-restart will sleep before polling the slave again.
+This is also the time that pt-replica-restart will wait for all other running
+instances to quit if both L<"--stop"> and L<"--monitor"> are specified.
+
+See L<"SLEEP">.
+
+=item --min-sleep
+
+type: float; default: 0.015625
+
+The minimum time pt-replica-restart will sleep before polling the slave again.
+See L<"SLEEP">.
+
+=item --monitor
+
+Whether to monitor the slave (default).  Unless you specify --monitor
+explicitly, L<"--stop"> will disable it.
+
+=item --password
+
+short form: -p; type: string
+
+Password to use when connecting.
+If password contains commas they must be escaped with a backslash: "exam\,ple"
+
+=item --pid
+
+type: string
+
+Create the given PID file.  The tool won't start if the PID file already
+exists and the PID it contains is different than the current PID.  However,
+if the PID file exists and the PID it contains is no longer running, the
+tool will overwrite the PID file with the current PID.  The PID file is
+removed automatically when the tool exits.
+
+=item --port
+
+short form: -P; type: int
+
+Port number to use for connection.
+
+=item --quiet
+
+short form: -q
+
+Suppresses normal output (disables L<"--verbose">).
+
+=item --recurse
+
+type: int; default: 0
+
+Watch slaves of the specified server, up to the specified number of servers deep
+in the hierarchy.  The default depth of 0 means "just watch the slave
+specified."
+
+pt-replica-restart examines C<SHOW PROCESSLIST> and tries to determine which
+connections are from slaves, then connect to them.  See L<"--recursion-method">.
+
+Recursion works by finding all slaves when the program starts, then watching
+them.  If there is more than one slave, C<pt-replica-restart> uses C<fork()> to
+monitor them.
+
+This also works if you have configured your slaves to show up in C<SHOW SLAVE
+HOSTS>.  The minimal configuration for this is the C<report_host> parameter, but
+there are other "report" parameters as well for the port, username, and
+password.
+
+=item --recursion-method
+
+type: array; default: processlist,hosts
+
+Preferred recursion method used to find slaves.
+
+Possible methods are:
+
+  METHOD       USES
+  ===========  ==================
+  processlist  SHOW PROCESSLIST
+  hosts        SHOW SLAVE HOSTS
+  none         Do not find slaves
+
+The processlist method is preferred because SHOW SLAVE HOSTS is not reliable.
+However, the hosts method is required if the server uses a non-standard
+port (not 3306).  Usually pt-replica-restart does the right thing and finds
+the slaves, but you may give a preferred method and it will be used first.
+If it doesn't find any slaves, the other methods will be tried.
+
+=item --run-time
+
+type: time
+
+Time to run before exiting.  Causes pt-replica-restart to stop after the specified
+time has elapsed.  Optional suffix: s=seconds, m=minutes, h=hours, d=days; if no
+suffix, s is used.
+
+=item --sentinel
+
+type: string; default: /tmp/pt-replica-restart-sentinel
+
+Exit if this file exists.
+
+=item --slave-user
+
+type: string
+
+Sets the user to be used to connect to the slaves.
+This parameter allows you to have a different user with less privileges on the
+slaves but that user must exist on all slaves.
+
+=item --slave-password
+
+type: string
+
+Sets the password to be used to connect to the slaves.
+It can be used with --slave-user and the password for the user must be the same
+on all slaves.
+
+=item --set-vars
+
+type: Array
+
+Set the MySQL variables in this comma-separated list of C<variable=value> pairs.
+
+By default, the tool sets:
+
+=for comment ignore-pt-internal-value
+MAGIC_set_vars
+
+   wait_timeout=10000
+
+Variables specified on the command line override these defaults.  For
+example, specifying C<--set-vars wait_timeout=500> overrides the defaultvalue of C<10000>.
+
+The tool prints a warning and continues if a variable cannot be set.
+
+=item --skip-count
+
+type: int; default: 1
+
+Number of statements to skip when restarting the slave.
+
+=item --source-uuid
+
+type: string
+
+When using GTID, an empty transaction should be created in order to skip it.
+If writes are coming from different nodes in the replication tree above, it is
+not possible to know which event from which UUID to skip.
+
+By default, transactions from the slave's master (C<'Master_UUID'> from
+C<SHOW SLAVE STATUS>) are skipped.
+
+For example, with
+
+  master1 -> slave1 -> slave2
+
+When skipping events on slave2 that were written to master1, you must specify
+the UUID of master1, else the tool will use the UUID of slave1 by default.
+
+See L<"GLOBAL TRANSACTION IDS">.
+
+=item --sleep
+
+type: int; default: 1
+
+Initial sleep seconds between checking the slave.
+
+See L<"SLEEP">.
+
+=item --socket
+
+short form: -S; type: string
+
+Socket file to use for connection.
+
+=item --stop
+
+Stop running instances by creating the sentinel file.
+
+Causes C<pt-replica-restart> to create the sentinel file specified by
+L<"--sentinel">.  This should have the effect of stopping all running
+instances which are watching the same sentinel file.  If L<"--monitor"> isn't
+specified, C<pt-replica-restart> will exit after creating the file.  If it is
+specified, C<pt-replica-restart> will wait the interval given by
+L<"--max-sleep">, then remove the file and continue working.
+
+You might find this handy to stop cron jobs gracefully if necessary, or to
+replace one running instance with another.  For example, if you want to stop
+and restart C<pt-replica-restart> every hour (just to make sure that it is
+restarted every hour, in case of a server crash or some other problem), you
+could use a C<crontab> line like this:
+
+ 0 * * * * pt-replica-restart --monitor --stop --sentinel /tmp/pt-replica-restartup
+
+The non-default L<"--sentinel"> will make sure the hourly C<cron> job stops
+only instances previously started with the same options (that is, from the
+same C<cron> job).
+
+See also L<"--sentinel">.
+
+=item --until-master
+
+type: string
+
+Run until this master log file and position.  Start the slave, and retry if it
+fails, until it reaches the given replication coordinates.  The coordinates are
+the logfile and position on the master, given by relay_master_log_file,
+exec_master_log_pos.  The argument must be in the format "file,pos".  Separate
+the filename and position with a single comma and no space.
+
+This will also cause an UNTIL clause to be given to START SLAVE.
+
+After reaching this point, the slave should be stopped and pt-replica-restart
+will exit.
+
+=item --until-relay
+
+type: string
+
+Run until this relay log file and position.  Like L<"--until-master">, but in
+the slave's relay logs instead.  The coordinates are given by relay_log_file,
+relay_log_pos.
+
+=item --user
+
+short form: -u; type: string
+
+User for login if not current user.
+
+=item --verbose
+
+short form: -v; cumulative: yes; default: 1
+
+Adds more information to the output.
+This flag can be specified multiple times. e.g. -v -v OR -vv.
+By default (no verbose flag) the tool outputs connection information, a timestamp,
+relay_log_file, relay_log_pos, and last_errno.
+One flag (-v) adds last_error.  See also L<"--error-length">.
+Two flags (-vv) prints the current sleep time each time pt-replica-restart sleeps.
+To suppress all output use the L<"--quiet"> option.
+
+=item --version
+
+Show version and exit.
+
+=item --[no]version-check
+
+default: yes
+
+Check for the latest version of Percona Toolkit, MySQL, and other programs.
+
+This is a standard "check for updates automatically" feature, with two
+additional features.  First, the tool checks its own version and also the
+versions of the following software: operating system, Percona Monitoring and
+Management (PMM), MySQL, Perl, MySQL driver for Perl (DBD::mysql), and
+Percona Toolkit. Second, it checks for and warns about versions with known
+problems. For example, MySQL 5.5.25 had a critical bug and was re-released
+as 5.5.25a.
+
+A secure connection to Percona’s Version Check database server is done to
+perform these checks. Each request is logged by the server, including software
+version numbers and unique ID of the checked system. The ID is generated by the
+Percona Toolkit installation script or when the Version Check database call is
+done for the first time.
+
+Any updates or known problems are printed to STDOUT before the tool's normal
+output.  This feature should never interfere with the normal operation of the
+tool.
+
+For more information, visit L<https://www.percona.com/doc/percona-toolkit/LATEST/version-check.html>.
+
+=back
+
+Show version and exit.
+
+=head1 DSN OPTIONS
+
+These DSN options are used to create a DSN.  Each option is given like
+C<option=value>.  The options are case-sensitive, so P and p are not the
+same option.  There cannot be whitespace before or after the C<=> and
+if the value contains whitespace it must be quoted.  DSN options are
+comma-separated.  See the L<percona-toolkit> manpage for full details.
+
+=over
+
+=item * A
+
+dsn: charset; copy: yes
+
+Default character set.
+
+=item * D
+
+dsn: database; copy: yes
+
+Default database.
+
+=item * F
+
+dsn: mysql_read_default_file; copy: yes
+
+Only read default options from the given file
+
+=item * h
+
+dsn: host; copy: yes
+
+Connect to host.
+
+=item * p
+
+dsn: password; copy: yes
+
+Password to use when connecting.
+If password contains commas they must be escaped with a backslash: "exam\,ple"
+
+=item * P
+
+dsn: port; copy: yes
+
+Port number to use for connection.
+
+=item * S
+
+dsn: mysql_socket; copy: yes
+
+Socket file to use for connection.
+
+=item * u
+
+dsn: user; copy: yes
+
+User for login if not current user.
+
+=back
+
+=head1 ENVIRONMENT
+
+The environment variable C<PTDEBUG> enables verbose debugging output to STDERR.
+To enable debugging and capture all output to a file, run the tool like:
+
+   PTDEBUG=1 pt-replica-restart ... > FILE 2>&1
+
+Be careful: debugging output is voluminous and can generate several megabytes
+of output.
+
+=head1 ATTENTION
+
+Using <PTDEBUG> might expose passwords. When debug is enabled, all command line
+parameters are shown in the output.
+
+=head1 SYSTEM REQUIREMENTS
+
+You need Perl, DBI, DBD::mysql, and some core packages that ought to be
+installed in any reasonably new version of Perl.
+
+=head1 BUGS
+
+For a list of known bugs, see L<https://jira.percona.com/projects/PT/issues>.
+
+Please report bugs at L<https://jira.percona.com/projects/PT>.
+Include the following information in your bug report:
+
+=over
+
+=item * Complete command-line used to run the tool
+
+=item * Tool L<"--version">
+
+=item * MySQL version of all servers involved
+
+=item * Output from the tool including STDERR
+
+=item * Input files (log/dump/config files, etc.)
+
+=back
+
+If possible, include debugging output by running the tool with C<PTDEBUG>;
+see L<"ENVIRONMENT">.
+
+=head1 DOWNLOADING
+
+Visit L<http://www.percona.com/software/percona-toolkit/> to download the
+latest release of Percona Toolkit.  Or, get the latest release from the
+command line:
+
+   wget percona.com/get/percona-toolkit.tar.gz
+
+   wget percona.com/get/percona-toolkit.rpm
+
+   wget percona.com/get/percona-toolkit.deb
+
+You can also get individual tools from the latest release:
+
+   wget percona.com/get/TOOL
+
+Replace C<TOOL> with the name of any tool.
+
+=head1 AUTHORS
+
+Baron Schwartz
+
+=head1 ABOUT PERCONA TOOLKIT
+
+This tool is part of Percona Toolkit, a collection of advanced command-line
+tools for MySQL developed by Percona.  Percona Toolkit was forked from two
+projects in June, 2011: Maatkit and Aspersa.  Those projects were created by
+Baron Schwartz and primarily developed by him and Daniel Nichter.  Visit
+L<http://www.percona.com/software/> to learn about other free, open-source
+software from Percona.
+
+=head1 COPYRIGHT, LICENSE, AND WARRANTY
+
+This program is copyright 2011-2024 Percona LLC and/or its affiliates,
+2007-2011 Baron Schwartz.
+
+THIS PROGRAM IS PROVIDED "AS IS" AND WITHOUT ANY EXPRESS OR IMPLIED
+WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+
+This program is free software; you can redistribute it and/or modify it under
+the terms of the GNU General Public License as published by the Free Software
+Foundation, version 2; OR the Perl Artistic License.  On UNIX and similar
+systems, you can issue `man perlgpl' or `man perlartistic' to read these
+licenses.
+
+You should have received a copy of the GNU General Public License along with
+this program; if not, write to the Free Software Foundation, Inc., 59 Temple
+Place, Suite 330, Boston, MA  02111-1307  USA.
+
+=head1 VERSION
+
+pt-replica-restart 3.6.0
+
+=cut
diff --git a/bin/pt-slave-restart b/bin/pt-slave-restart
deleted file mode 100755
index 0ac6d9025..000000000
--- a/bin/pt-slave-restart
+++ /dev/null
@@ -1,6444 +0,0 @@
-#!/usr/bin/env perl
-
-# This program is part of Percona Toolkit: http://www.percona.com/software/
-# See "COPYRIGHT, LICENSE, AND WARRANTY" at the end of this file for legal
-# notices and disclaimers.
-
-use strict;
-use warnings FATAL => 'all';
-
-# This tool is "fat-packed": most of its dependent modules are embedded
-# in this file.  Setting %INC to this file for each module makes Perl aware
-# of this so it will not try to load the module from @INC.  See the tool's
-# documentation for a full list of dependencies.
-BEGIN {
-   $INC{$_} = __FILE__ for map { (my $pkg = "$_.pm") =~ s!::!/!g; $pkg } (qw(
-      Percona::Toolkit
-      Quoter
-      OptionParser
-      Lmo::Utils
-      Lmo::Meta
-      Lmo::Object
-      Lmo::Types
-      Lmo
-      VersionParser
-      DSNParser
-      MasterSlave
-      Daemon
-      HTTP::Micro
-      VersionCheck
-   ));
-}
-
-# ###########################################################################
-# Percona::Toolkit package
-# This package is a copy without comments from the original.  The original
-# with comments and its test file can be found in the GitHub repository at,
-#   lib/Percona/Toolkit.pm
-#   t/lib/Percona/Toolkit.t
-# See https://github.com/percona/percona-toolkit for more information.
-# ###########################################################################
-{
-package Percona::Toolkit;
-
-our $VERSION = '3.6.0';
-
-use strict;
-use warnings FATAL => 'all';
-use English qw(-no_match_vars);
-use constant PTDEBUG => $ENV{PTDEBUG} || 0;
-
-use Carp qw(carp cluck);
-use Data::Dumper qw();
-
-require Exporter;
-our @ISA         = qw(Exporter);
-our @EXPORT_OK   = qw(
-   have_required_args
-   Dumper
-   _d
-);
-
-sub have_required_args {
-   my ($args, @required_args) = @_;
-   my $have_required_args = 1;
-   foreach my $arg ( @required_args ) {
-      if ( !defined $args->{$arg} ) {
-         $have_required_args = 0;
-         carp "Argument $arg is not defined";
-      }
-   }
-   cluck unless $have_required_args;  # print backtrace
-   return $have_required_args;
-}
-
-sub Dumper {
-   local $Data::Dumper::Indent    = 1;
-   local $Data::Dumper::Sortkeys  = 1;
-   local $Data::Dumper::Quotekeys = 0;
-   Data::Dumper::Dumper(@_);
-}
-
-sub _d {
-   my ($package, undef, $line) = caller 0;
-   @_ = map { (my $temp = $_) =~ s/\n/\n# /g; $temp; }
-        map { defined $_ ? $_ : 'undef' }
-        @_;
-   print STDERR "# $package:$line $PID ", join(' ', @_), "\n";
-}
-
-1;
-}
-# ###########################################################################
-# End Percona::Toolkit package
-# ###########################################################################
-
-# ###########################################################################
-# Quoter package
-# This package is a copy without comments from the original.  The original
-# with comments and its test file can be found in the GitHub repository at,
-#   lib/Quoter.pm
-#   t/lib/Quoter.t
-# See https://github.com/percona/percona-toolkit for more information.
-# ###########################################################################
-{
-package Quoter;
-
-use strict;
-use warnings FATAL => 'all';
-use English qw(-no_match_vars);
-use constant PTDEBUG => $ENV{PTDEBUG} || 0;
-
-use Data::Dumper;
-$Data::Dumper::Indent    = 1;
-$Data::Dumper::Sortkeys  = 1;
-$Data::Dumper::Quotekeys = 0;
-
-sub new {
-   my ( $class, %args ) = @_;
-   return bless {}, $class;
-}
-
-sub quote {
-   my ( $self, @vals ) = @_;
-   foreach my $val ( @vals ) {
-      $val =~ s/`/``/g;
-   }
-   return join('.', map { '`' . $_ . '`' } @vals);
-}
-
-sub quote_val {
-   my ( $self, $val, %args ) = @_;
-
-   return 'NULL' unless defined $val;          # undef = NULL
-   return "''" if $val eq '';                  # blank string = ''
-   return $val if $val =~ m/^0x[0-9a-fA-F]+$/  # quote hex data
-                  && !$args{is_char};          # unless is_char is true
-
-   return $val if $args{is_float};
-
-   $val =~ s/(['\\])/\\$1/g;
-   return "'$val'";
-}
-
-sub split_unquote {
-   my ( $self, $db_tbl, $default_db ) = @_;
-   my ( $db, $tbl ) = split(/[.]/, $db_tbl);
-   if ( !$tbl ) {
-      $tbl = $db;
-      $db  = $default_db;
-   }
-   for ($db, $tbl) {
-      next unless $_;
-      s/\A`//;
-      s/`\z//;
-      s/``/`/g;
-   }
-
-   return ($db, $tbl);
-}
-
-sub literal_like {
-   my ( $self, $like ) = @_;
-   return unless $like;
-   $like =~ s/([%_])/\\$1/g;
-   return "'$like'";
-}
-
-sub join_quote {
-   my ( $self, $default_db, $db_tbl ) = @_;
-   return unless $db_tbl;
-   my ($db, $tbl) = split(/[.]/, $db_tbl);
-   if ( !$tbl ) {
-      $tbl = $db;
-      $db  = $default_db;
-   }
-   $db  = "`$db`"  if $db  && $db  !~ m/^`/;
-   $tbl = "`$tbl`" if $tbl && $tbl !~ m/^`/;
-   return $db ? "$db.$tbl" : $tbl;
-}
-
-sub serialize_list {
-   my ( $self, @args ) = @_;
-   PTDEBUG && _d('Serializing', Dumper(\@args));
-   return unless @args;
-
-   my @parts;
-   foreach my $arg  ( @args ) {
-      if ( defined $arg ) {
-         $arg =~ s/,/\\,/g;      # escape commas
-         $arg =~ s/\\N/\\\\N/g;  # escape literal \N
-         push @parts, $arg;
-      }
-      else {
-         push @parts, '\N';
-      }
-   }
-
-   my $string = join(',', @parts);
-   PTDEBUG && _d('Serialized: <', $string, '>');
-   return $string;
-}
-
-sub deserialize_list {
-   my ( $self, $string ) = @_;
-   PTDEBUG && _d('Deserializing <', $string, '>');
-   die "Cannot deserialize an undefined string" unless defined $string;
-
-   my @parts;
-   foreach my $arg ( split(/(?<!\\),/, $string) ) {
-      if ( $arg eq '\N' ) {
-         $arg = undef;
-      }
-      else {
-         $arg =~ s/\\,/,/g;
-         $arg =~ s/\\\\N/\\N/g;
-      }
-      push @parts, $arg;
-   }
-
-   if ( !@parts ) {
-      my $n_empty_strings = $string =~ tr/,//;
-      $n_empty_strings++;
-      PTDEBUG && _d($n_empty_strings, 'empty strings');
-      map { push @parts, '' } 1..$n_empty_strings;
-   }
-   elsif ( $string =~ m/(?<!\\),$/ ) {
-      PTDEBUG && _d('Last value is an empty string');
-      push @parts, '';
-   }
-
-   PTDEBUG && _d('Deserialized', Dumper(\@parts));
-   return @parts;
-}
-
-sub _d {
-   my ($package, undef, $line) = caller 0;
-   @_ = map { (my $temp = $_) =~ s/\n/\n# /g; $temp; }
-        map { defined $_ ? $_ : 'undef' }
-        @_;
-   print STDERR "# $package:$line $PID ", join(' ', @_), "\n";
-}
-
-1;
-}
-# ###########################################################################
-# End Quoter package
-# ###########################################################################
-
-# ###########################################################################
-# OptionParser package
-# This package is a copy without comments from the original.  The original
-# with comments and its test file can be found in the GitHub repository at,
-#   lib/OptionParser.pm
-#   t/lib/OptionParser.t
-# See https://github.com/percona/percona-toolkit for more information.
-# ###########################################################################
-{
-package OptionParser;
-
-use strict;
-use warnings FATAL => 'all';
-use English qw(-no_match_vars);
-use constant PTDEBUG => $ENV{PTDEBUG} || 0;
-
-use List::Util qw(max);
-use Getopt::Long;
-use Data::Dumper;
-
-my $POD_link_re = '[LC]<"?([^">]+)"?>';
-
-sub new {
-   my ( $class, %args ) = @_;
-   my @required_args = qw();
-   foreach my $arg ( @required_args ) {
-      die "I need a $arg argument" unless $args{$arg};
-   }
-
-   my ($program_name) = $PROGRAM_NAME =~ m/([.A-Za-z-]+)$/;
-   $program_name ||= $PROGRAM_NAME;
-   my $home = $ENV{HOME} || $ENV{HOMEPATH} || $ENV{USERPROFILE} || '.';
-
-   my %attributes = (
-      'type'       => 1,
-      'short form' => 1,
-      'group'      => 1,
-      'default'    => 1,
-      'cumulative' => 1,
-      'negatable'  => 1,
-      'repeatable' => 1,  # means it can be specified more than once
-   );
-
-   my $self = {
-      head1             => 'OPTIONS',        # These args are used internally
-      skip_rules        => 0,                # to instantiate another Option-
-      item              => '--(.*)',         # Parser obj that parses the
-      attributes        => \%attributes,     # DSN OPTIONS section.  Tools
-      parse_attributes  => \&_parse_attribs, # don't tinker with these args.
-
-      %args,
-
-      strict            => 1,  # disabled by a special rule
-      program_name      => $program_name,
-      opts              => {},
-      got_opts          => 0,
-      short_opts        => {},
-      defaults          => {},
-      groups            => {},
-      allowed_groups    => {},
-      errors            => [],
-      rules             => [],  # desc of rules for --help
-      mutex             => [],  # rule: opts are mutually exclusive
-      atleast1          => [],  # rule: at least one opt is required
-      disables          => {},  # rule: opt disables other opts
-      defaults_to       => {},  # rule: opt defaults to value of other opt
-      DSNParser         => undef,
-      default_files     => [
-         "/etc/percona-toolkit/percona-toolkit.conf",
-         "/etc/percona-toolkit/$program_name.conf",
-         "$home/.percona-toolkit.conf",
-         "$home/.$program_name.conf",
-      ],
-      types             => {
-         string => 's', # standard Getopt type
-         int    => 'i', # standard Getopt type
-         float  => 'f', # standard Getopt type
-         Hash   => 'H', # hash, formed from a comma-separated list
-         hash   => 'h', # hash as above, but only if a value is given
-         Array  => 'A', # array, similar to Hash
-         array  => 'a', # array, similar to hash
-         DSN    => 'd', # DSN
-         size   => 'z', # size with kMG suffix (powers of 2^10)
-         time   => 'm', # time, with an optional suffix of s/h/m/d
-      },
-   };
-
-   return bless $self, $class;
-}
-
-sub get_specs {
-   my ( $self, $file ) = @_;
-   $file ||= $self->{file} || __FILE__;
-   my @specs = $self->_pod_to_specs($file);
-   $self->_parse_specs(@specs);
-
-   open my $fh, "<", $file or die "Cannot open $file: $OS_ERROR";
-   my $contents = do { local $/ = undef; <$fh> };
-   close $fh;
-   if ( $contents =~ m/^=head1 DSN OPTIONS/m ) {
-      PTDEBUG && _d('Parsing DSN OPTIONS');
-      my $dsn_attribs = {
-         dsn  => 1,
-         copy => 1,
-      };
-      my $parse_dsn_attribs = sub {
-         my ( $self, $option, $attribs ) = @_;
-         map {
-            my $val = $attribs->{$_};
-            if ( $val ) {
-               $val    = $val eq 'yes' ? 1
-                       : $val eq 'no'  ? 0
-                       :                 $val;
-               $attribs->{$_} = $val;
-            }
-         } keys %$attribs;
-         return {
-            key => $option,
-            %$attribs,
-         };
-      };
-      my $dsn_o = new OptionParser(
-         description       => 'DSN OPTIONS',
-         head1             => 'DSN OPTIONS',
-         dsn               => 0,         # XXX don't infinitely recurse!
-         item              => '\* (.)',  # key opts are a single character
-         skip_rules        => 1,         # no rules before opts
-         attributes        => $dsn_attribs,
-         parse_attributes  => $parse_dsn_attribs,
-      );
-      my @dsn_opts = map {
-         my $opts = {
-            key  => $_->{spec}->{key},
-            dsn  => $_->{spec}->{dsn},
-            copy => $_->{spec}->{copy},
-            desc => $_->{desc},
-         };
-         $opts;
-      } $dsn_o->_pod_to_specs($file);
-      $self->{DSNParser} = DSNParser->new(opts => \@dsn_opts);
-   }
-
-   if ( $contents =~ m/^=head1 VERSION\n\n^(.+)$/m ) {
-      $self->{version} = $1;
-      PTDEBUG && _d($self->{version});
-   }
-
-   return;
-}
-
-sub DSNParser {
-   my ( $self ) = @_;
-   return $self->{DSNParser};
-};
-
-sub get_defaults_files {
-   my ( $self ) = @_;
-   return @{$self->{default_files}};
-}
-
-sub _pod_to_specs {
-   my ( $self, $file ) = @_;
-   $file ||= $self->{file} || __FILE__;
-   open my $fh, '<', $file or die "Cannot open $file: $OS_ERROR";
-
-   my @specs = ();
-   my @rules = ();
-   my $para;
-
-   local $INPUT_RECORD_SEPARATOR = '';
-   while ( $para = <$fh> ) {
-      next unless $para =~ m/^=head1 $self->{head1}/;
-      last;
-   }
-
-   while ( $para = <$fh> ) {
-      last if $para =~ m/^=over/;
-      next if $self->{skip_rules};
-      chomp $para;
-      $para =~ s/\s+/ /g;
-      $para =~ s/$POD_link_re/$1/go;
-      PTDEBUG && _d('Option rule:', $para);
-      push @rules, $para;
-   }
-
-   die "POD has no $self->{head1} section" unless $para;
-
-   do {
-      if ( my ($option) = $para =~ m/^=item $self->{item}/ ) {
-         chomp $para;
-         PTDEBUG && _d($para);
-         my %attribs;
-
-         $para = <$fh>; # read next paragraph, possibly attributes
-
-         if ( $para =~ m/: / ) { # attributes
-            $para =~ s/\s+\Z//g;
-            %attribs = map {
-                  my ( $attrib, $val) = split(/: /, $_);
-                  die "Unrecognized attribute for --$option: $attrib"
-                     unless $self->{attributes}->{$attrib};
-                  ($attrib, $val);
-               } split(/; /, $para);
-            if ( $attribs{'short form'} ) {
-               $attribs{'short form'} =~ s/-//;
-            }
-            $para = <$fh>; # read next paragraph, probably short help desc
-         }
-         else {
-            PTDEBUG && _d('Option has no attributes');
-         }
-
-         $para =~ s/\s+\Z//g;
-         $para =~ s/\s+/ /g;
-         $para =~ s/$POD_link_re/$1/go;
-
-         $para =~ s/\.(?:\n.*| [A-Z].*|\Z)//s;
-         PTDEBUG && _d('Short help:', $para);
-
-         die "No description after option spec $option" if $para =~ m/^=item/;
-
-         if ( my ($base_option) =  $option =~ m/^\[no\](.*)/ ) {
-            $option = $base_option;
-            $attribs{'negatable'} = 1;
-         }
-
-         push @specs, {
-            spec  => $self->{parse_attributes}->($self, $option, \%attribs),
-            desc  => $para
-               . (defined $attribs{default} ? " (default $attribs{default})" : ''),
-            group => ($attribs{'group'} ? $attribs{'group'} : 'default'),
-            attributes => \%attribs
-         };
-      }
-      while ( $para = <$fh> ) {
-         last unless $para;
-         if ( $para =~ m/^=head1/ ) {
-            $para = undef; # Can't 'last' out of a do {} block.
-            last;
-         }
-         last if $para =~ m/^=item /;
-      }
-   } while ( $para );
-
-   die "No valid specs in $self->{head1}" unless @specs;
-
-   close $fh;
-   return @specs, @rules;
-}
-
-sub _parse_specs {
-   my ( $self, @specs ) = @_;
-   my %disables; # special rule that requires deferred checking
-
-   foreach my $opt ( @specs ) {
-      if ( ref $opt ) { # It's an option spec, not a rule.
-         PTDEBUG && _d('Parsing opt spec:',
-            map { ($_, '=>', $opt->{$_}) } keys %$opt);
-
-         my ( $long, $short ) = $opt->{spec} =~ m/^([\w-]+)(?:\|([^!+=]*))?/;
-         if ( !$long ) {
-            die "Cannot parse long option from spec $opt->{spec}";
-         }
-         $opt->{long} = $long;
-
-         die "Duplicate long option --$long" if exists $self->{opts}->{$long};
-         $self->{opts}->{$long} = $opt;
-
-         if ( length $long == 1 ) {
-            PTDEBUG && _d('Long opt', $long, 'looks like short opt');
-            $self->{short_opts}->{$long} = $long;
-         }
-
-         if ( $short ) {
-            die "Duplicate short option -$short"
-               if exists $self->{short_opts}->{$short};
-            $self->{short_opts}->{$short} = $long;
-            $opt->{short} = $short;
-         }
-         else {
-            $opt->{short} = undef;
-         }
-
-         $opt->{is_negatable}  = $opt->{spec} =~ m/!/        ? 1 : 0;
-         $opt->{is_cumulative} = $opt->{spec} =~ m/\+/       ? 1 : 0;
-         $opt->{is_repeatable} = $opt->{attributes}->{repeatable} ? 1 : 0;
-         $opt->{is_required}   = $opt->{desc} =~ m/required/ ? 1 : 0;
-
-         $opt->{group} ||= 'default';
-         $self->{groups}->{ $opt->{group} }->{$long} = 1;
-
-         $opt->{value} = undef;
-         $opt->{got}   = 0;
-
-         my ( $type ) = $opt->{spec} =~ m/=(.)/;
-         $opt->{type} = $type;
-         PTDEBUG && _d($long, 'type:', $type);
-
-
-         $opt->{spec} =~ s/=./=s/ if ( $type && $type =~ m/[HhAadzm]/ );
-
-         if ( (my ($def) = $opt->{desc} =~ m/default\b(?: ([^)]+))?/) ) {
-            $self->{defaults}->{$long} = defined $def ? $def : 1;
-            PTDEBUG && _d($long, 'default:', $def);
-         }
-
-         if ( $long eq 'config' ) {
-            $self->{defaults}->{$long} = join(',', $self->get_defaults_files());
-         }
-
-         if ( (my ($dis) = $opt->{desc} =~ m/(disables .*)/) ) {
-            $disables{$long} = $dis;
-            PTDEBUG && _d('Deferring check of disables rule for', $opt, $dis);
-         }
-
-         $self->{opts}->{$long} = $opt;
-      }
-      else { # It's an option rule, not a spec.
-         PTDEBUG && _d('Parsing rule:', $opt);
-         push @{$self->{rules}}, $opt;
-         my @participants = $self->_get_participants($opt);
-         my $rule_ok = 0;
-
-         if ( $opt =~ m/mutually exclusive|one and only one/ ) {
-            $rule_ok = 1;
-            push @{$self->{mutex}}, \@participants;
-            PTDEBUG && _d(@participants, 'are mutually exclusive');
-         }
-         if ( $opt =~ m/at least one|one and only one/ ) {
-            $rule_ok = 1;
-            push @{$self->{atleast1}}, \@participants;
-            PTDEBUG && _d(@participants, 'require at least one');
-         }
-         if ( $opt =~ m/default to/ ) {
-            $rule_ok = 1;
-            $self->{defaults_to}->{$participants[0]} = $participants[1];
-            PTDEBUG && _d($participants[0], 'defaults to', $participants[1]);
-         }
-         if ( $opt =~ m/restricted to option groups/ ) {
-            $rule_ok = 1;
-            my ($groups) = $opt =~ m/groups ([\w\s\,]+)/;
-            my @groups = split(',', $groups);
-            %{$self->{allowed_groups}->{$participants[0]}} = map {
-               s/\s+//;
-               $_ => 1;
-            } @groups;
-         }
-         if( $opt =~ m/accepts additional command-line arguments/ ) {
-            $rule_ok = 1;
-            $self->{strict} = 0;
-            PTDEBUG && _d("Strict mode disabled by rule");
-         }
-
-         die "Unrecognized option rule: $opt" unless $rule_ok;
-      }
-   }
-
-   foreach my $long ( keys %disables ) {
-      my @participants = $self->_get_participants($disables{$long});
-      $self->{disables}->{$long} = \@participants;
-      PTDEBUG && _d('Option', $long, 'disables', @participants);
-   }
-
-   return;
-}
-
-sub _get_participants {
-   my ( $self, $str ) = @_;
-   my @participants;
-   foreach my $long ( $str =~ m/--(?:\[no\])?([\w-]+)/g ) {
-      die "Option --$long does not exist while processing rule $str"
-         unless exists $self->{opts}->{$long};
-      push @participants, $long;
-   }
-   PTDEBUG && _d('Participants for', $str, ':', @participants);
-   return @participants;
-}
-
-sub opts {
-   my ( $self ) = @_;
-   my %opts = %{$self->{opts}};
-   return %opts;
-}
-
-sub short_opts {
-   my ( $self ) = @_;
-   my %short_opts = %{$self->{short_opts}};
-   return %short_opts;
-}
-
-sub set_defaults {
-   my ( $self, %defaults ) = @_;
-   $self->{defaults} = {};
-   foreach my $long ( keys %defaults ) {
-      die "Cannot set default for nonexistent option $long"
-         unless exists $self->{opts}->{$long};
-      $self->{defaults}->{$long} = $defaults{$long};
-      PTDEBUG && _d('Default val for', $long, ':', $defaults{$long});
-   }
-   return;
-}
-
-sub get_defaults {
-   my ( $self ) = @_;
-   return $self->{defaults};
-}
-
-sub get_groups {
-   my ( $self ) = @_;
-   return $self->{groups};
-}
-
-sub _set_option {
-   my ( $self, $opt, $val ) = @_;
-   my $long = exists $self->{opts}->{$opt}       ? $opt
-            : exists $self->{short_opts}->{$opt} ? $self->{short_opts}->{$opt}
-            : die "Getopt::Long gave a nonexistent option: $opt";
-   $opt = $self->{opts}->{$long};
-   if ( $opt->{is_cumulative} ) {
-      $opt->{value}++;
-   }
-   elsif ( ($opt->{type} || '') eq 's' && $val =~ m/^--?(.+)/ ) {
-      my $next_opt = $1;
-      if (    exists $self->{opts}->{$next_opt}
-           || exists $self->{short_opts}->{$next_opt} ) {
-         $self->save_error("--$long requires a string value");
-         return;
-      }
-      else {
-         if ($opt->{is_repeatable}) {
-            push @{$opt->{value}} , $val;
-         }
-         else {
-            $opt->{value} = $val;
-         }
-      }
-   }
-   else {
-      if ($opt->{is_repeatable}) {
-         push @{$opt->{value}} , $val;
-      }
-      else {
-         $opt->{value} = $val;
-      }
-   }
-   $opt->{got} = 1;
-   PTDEBUG && _d('Got option', $long, '=', $val);
-}
-
-sub get_opts {
-   my ( $self ) = @_;
-
-   foreach my $long ( keys %{$self->{opts}} ) {
-      $self->{opts}->{$long}->{got} = 0;
-      $self->{opts}->{$long}->{value}
-         = exists $self->{defaults}->{$long}       ? $self->{defaults}->{$long}
-         : $self->{opts}->{$long}->{is_cumulative} ? 0
-         : undef;
-   }
-   $self->{got_opts} = 0;
-
-   $self->{errors} = [];
-
-   if ( @ARGV && $ARGV[0] =~/^--config=/ ) {
-      $ARGV[0] = substr($ARGV[0],9);
-      $ARGV[0] =~ s/^'(.*)'$/$1/;
-      $ARGV[0] =~ s/^"(.*)"$/$1/;
-      $self->_set_option('config', shift @ARGV);
-   }
-   if ( @ARGV && $ARGV[0] eq "--config" ) {
-      shift @ARGV;
-      $self->_set_option('config', shift @ARGV);
-   }
-   if ( $self->has('config') ) {
-      my @extra_args;
-      foreach my $filename ( split(',', $self->get('config')) ) {
-         eval {
-            push @extra_args, $self->_read_config_file($filename);
-         };
-         if ( $EVAL_ERROR ) {
-            if ( $self->got('config') ) {
-               die $EVAL_ERROR;
-            }
-            elsif ( PTDEBUG ) {
-               _d($EVAL_ERROR);
-            }
-         }
-      }
-      unshift @ARGV, @extra_args;
-   }
-
-   Getopt::Long::Configure('no_ignore_case', 'bundling');
-   GetOptions(
-      map    { $_->{spec} => sub { $self->_set_option(@_); } }
-      grep   { $_->{long} ne 'config' } # --config is handled specially above.
-      values %{$self->{opts}}
-   ) or $self->save_error('Error parsing options');
-
-   if ( exists $self->{opts}->{version} && $self->{opts}->{version}->{got} ) {
-      if ( $self->{version} ) {
-         print $self->{version}, "\n";
-         exit 0;
-      }
-      else {
-         print "Error parsing version.  See the VERSION section of the tool's documentation.\n";
-         exit 1;
-      }
-   }
-
-   if ( @ARGV && $self->{strict} ) {
-      $self->save_error("Unrecognized command-line options @ARGV");
-   }
-
-   foreach my $mutex ( @{$self->{mutex}} ) {
-      my @set = grep { $self->{opts}->{$_}->{got} } @$mutex;
-      if ( @set > 1 ) {
-         my $err = join(', ', map { "--$self->{opts}->{$_}->{long}" }
-                      @{$mutex}[ 0 .. scalar(@$mutex) - 2] )
-                 . ' and --'.$self->{opts}->{$mutex->[-1]}->{long}
-                 . ' are mutually exclusive.';
-         $self->save_error($err);
-      }
-   }
-
-   foreach my $required ( @{$self->{atleast1}} ) {
-      my @set = grep { $self->{opts}->{$_}->{got} } @$required;
-      if ( @set == 0 ) {
-         my $err = join(', ', map { "--$self->{opts}->{$_}->{long}" }
-                      @{$required}[ 0 .. scalar(@$required) - 2] )
-                 .' or --'.$self->{opts}->{$required->[-1]}->{long};
-         $self->save_error("Specify at least one of $err");
-      }
-   }
-
-   $self->_check_opts( keys %{$self->{opts}} );
-   $self->{got_opts} = 1;
-   return;
-}
-
-sub _check_opts {
-   my ( $self, @long ) = @_;
-   my $long_last = scalar @long;
-   while ( @long ) {
-      foreach my $i ( 0..$#long ) {
-         my $long = $long[$i];
-         next unless $long;
-         my $opt  = $self->{opts}->{$long};
-         if ( $opt->{got} ) {
-            if ( exists $self->{disables}->{$long} ) {
-               my @disable_opts = @{$self->{disables}->{$long}};
-               map { $self->{opts}->{$_}->{value} = undef; } @disable_opts;
-               PTDEBUG && _d('Unset options', @disable_opts,
-                  'because', $long,'disables them');
-            }
-
-            if ( exists $self->{allowed_groups}->{$long} ) {
-
-               my @restricted_groups = grep {
-                  !exists $self->{allowed_groups}->{$long}->{$_}
-               } keys %{$self->{groups}};
-
-               my @restricted_opts;
-               foreach my $restricted_group ( @restricted_groups ) {
-                  RESTRICTED_OPT:
-                  foreach my $restricted_opt (
-                     keys %{$self->{groups}->{$restricted_group}} )
-                  {
-                     next RESTRICTED_OPT if $restricted_opt eq $long;
-                     push @restricted_opts, $restricted_opt
-                        if $self->{opts}->{$restricted_opt}->{got};
-                  }
-               }
-
-               if ( @restricted_opts ) {
-                  my $err;
-                  if ( @restricted_opts == 1 ) {
-                     $err = "--$restricted_opts[0]";
-                  }
-                  else {
-                     $err = join(', ',
-                               map { "--$self->{opts}->{$_}->{long}" }
-                               grep { $_ }
-                               @restricted_opts[0..scalar(@restricted_opts) - 2]
-                            )
-                          . ' or --'.$self->{opts}->{$restricted_opts[-1]}->{long};
-                  }
-                  $self->save_error("--$long is not allowed with $err");
-               }
-            }
-
-         }
-         elsif ( $opt->{is_required} ) {
-            $self->save_error("Required option --$long must be specified");
-         }
-
-         $self->_validate_type($opt);
-         if ( $opt->{parsed} ) {
-            delete $long[$i];
-         }
-         else {
-            PTDEBUG && _d('Temporarily failed to parse', $long);
-         }
-      }
-
-      die "Failed to parse options, possibly due to circular dependencies"
-         if @long == $long_last;
-      $long_last = @long;
-   }
-
-   return;
-}
-
-sub _validate_type {
-   my ( $self, $opt ) = @_;
-   return unless $opt;
-
-   if ( !$opt->{type} ) {
-      $opt->{parsed} = 1;
-      return;
-   }
-
-   my $val = $opt->{value};
-
-   if ( $val && $opt->{type} eq 'm' ) {  # type time
-      PTDEBUG && _d('Parsing option', $opt->{long}, 'as a time value');
-      my ( $prefix, $num, $suffix ) = $val =~ m/([+-]?)(\d+)([a-z])?$/;
-      if ( !$suffix ) {
-         my ( $s ) = $opt->{desc} =~ m/\(suffix (.)\)/;
-         $suffix = $s || 's';
-         PTDEBUG && _d('No suffix given; using', $suffix, 'for',
-            $opt->{long}, '(value:', $val, ')');
-      }
-      if ( $suffix =~ m/[smhd]/ ) {
-         $val = $suffix eq 's' ? $num            # Seconds
-              : $suffix eq 'm' ? $num * 60       # Minutes
-              : $suffix eq 'h' ? $num * 3600     # Hours
-              :                  $num * 86400;   # Days
-         $opt->{value} = ($prefix || '') . $val;
-         PTDEBUG && _d('Setting option', $opt->{long}, 'to', $val);
-      }
-      else {
-         $self->save_error("Invalid time suffix for --$opt->{long}");
-      }
-   }
-   elsif ( $val && $opt->{type} eq 'd' ) {  # type DSN
-      PTDEBUG && _d('Parsing option', $opt->{long}, 'as a DSN');
-      my $prev = {};
-      my $from_key = $self->{defaults_to}->{ $opt->{long} };
-      if ( $from_key ) {
-         PTDEBUG && _d($opt->{long}, 'DSN copies from', $from_key, 'DSN');
-         if ( $self->{opts}->{$from_key}->{parsed} ) {
-            $prev = $self->{opts}->{$from_key}->{value};
-         }
-         else {
-            PTDEBUG && _d('Cannot parse', $opt->{long}, 'until',
-               $from_key, 'parsed');
-            return;
-         }
-      }
-      my $defaults = $self->{DSNParser}->parse_options($self);
-      if (!$opt->{attributes}->{repeatable}) {
-          $opt->{value} = $self->{DSNParser}->parse($val, $prev, $defaults);
-      } else {
-          my $values = [];
-          for my $dsn_string (@$val) {
-              push @$values, $self->{DSNParser}->parse($dsn_string, $prev, $defaults);
-          }
-          $opt->{value} = $values;
-      }
-   }
-   elsif ( $val && $opt->{type} eq 'z' ) {  # type size
-      PTDEBUG && _d('Parsing option', $opt->{long}, 'as a size value');
-      $self->_parse_size($opt, $val);
-   }
-   elsif ( $opt->{type} eq 'H' || (defined $val && $opt->{type} eq 'h') ) {
-      $opt->{value} = { map { $_ => 1 } split(/(?<!\\),\s*/, ($val || '')) };
-   }
-   elsif ( $opt->{type} eq 'A' || (defined $val && $opt->{type} eq 'a') ) {
-      $opt->{value} = [ split(/(?<!\\),\s*/, ($val || '')) ];
-   }
-   else {
-      PTDEBUG && _d('Nothing to validate for option',
-         $opt->{long}, 'type', $opt->{type}, 'value', $val);
-   }
-
-   $opt->{parsed} = 1;
-   return;
-}
-
-sub get {
-   my ( $self, $opt ) = @_;
-   my $long = (length $opt == 1 ? $self->{short_opts}->{$opt} : $opt);
-   die "Option $opt does not exist"
-      unless $long && exists $self->{opts}->{$long};
-   return $self->{opts}->{$long}->{value};
-}
-
-sub got {
-   my ( $self, $opt ) = @_;
-   my $long = (length $opt == 1 ? $self->{short_opts}->{$opt} : $opt);
-   die "Option $opt does not exist"
-      unless $long && exists $self->{opts}->{$long};
-   return $self->{opts}->{$long}->{got};
-}
-
-sub has {
-   my ( $self, $opt ) = @_;
-   my $long = (length $opt == 1 ? $self->{short_opts}->{$opt} : $opt);
-   return defined $long ? exists $self->{opts}->{$long} : 0;
-}
-
-sub set {
-   my ( $self, $opt, $val ) = @_;
-   my $long = (length $opt == 1 ? $self->{short_opts}->{$opt} : $opt);
-   die "Option $opt does not exist"
-      unless $long && exists $self->{opts}->{$long};
-   $self->{opts}->{$long}->{value} = $val;
-   return;
-}
-
-sub save_error {
-   my ( $self, $error ) = @_;
-   push @{$self->{errors}}, $error;
-   return;
-}
-
-sub errors {
-   my ( $self ) = @_;
-   return $self->{errors};
-}
-
-sub usage {
-   my ( $self ) = @_;
-   warn "No usage string is set" unless $self->{usage}; # XXX
-   return "Usage: " . ($self->{usage} || '') . "\n";
-}
-
-sub descr {
-   my ( $self ) = @_;
-   warn "No description string is set" unless $self->{description}; # XXX
-   my $descr  = ($self->{description} || $self->{program_name} || '')
-              . "  For more details, please use the --help option, "
-              . "or try 'perldoc $PROGRAM_NAME' "
-              . "for complete documentation.";
-   $descr = join("\n", $descr =~ m/(.{0,80})(?:\s+|$)/g)
-      unless $ENV{DONT_BREAK_LINES};
-   $descr =~ s/ +$//mg;
-   return $descr;
-}
-
-sub usage_or_errors {
-   my ( $self, $file, $return ) = @_;
-   $file ||= $self->{file} || __FILE__;
-
-   if ( !$self->{description} || !$self->{usage} ) {
-      PTDEBUG && _d("Getting description and usage from SYNOPSIS in", $file);
-      my %synop = $self->_parse_synopsis($file);
-      $self->{description} ||= $synop{description};
-      $self->{usage}       ||= $synop{usage};
-      PTDEBUG && _d("Description:", $self->{description},
-         "\nUsage:", $self->{usage});
-   }
-
-   if ( $self->{opts}->{help}->{got} ) {
-      print $self->print_usage() or die "Cannot print usage: $OS_ERROR";
-      exit 0 unless $return;
-   }
-   elsif ( scalar @{$self->{errors}} ) {
-      print $self->print_errors() or die "Cannot print errors: $OS_ERROR";
-      exit 1 unless $return;
-   }
-
-   return;
-}
-
-sub print_errors {
-   my ( $self ) = @_;
-   my $usage = $self->usage() . "\n";
-   if ( (my @errors = @{$self->{errors}}) ) {
-      $usage .= join("\n  * ", 'Errors in command-line arguments:', @errors)
-              . "\n";
-   }
-   return $usage . "\n" . $self->descr();
-}
-
-sub print_usage {
-   my ( $self ) = @_;
-   die "Run get_opts() before print_usage()" unless $self->{got_opts};
-   my @opts = values %{$self->{opts}};
-
-   my $maxl = max(
-      map {
-         length($_->{long})               # option long name
-         + ($_->{is_negatable} ? 4 : 0)   # "[no]" if opt is negatable
-         + ($_->{type} ? 2 : 0)           # "=x" where x is the opt type
-      }
-      @opts);
-
-   my $maxs = max(0,
-      map {
-         length($_)
-         + ($self->{opts}->{$_}->{is_negatable} ? 4 : 0)
-         + ($self->{opts}->{$_}->{type} ? 2 : 0)
-      }
-      values %{$self->{short_opts}});
-
-   my $lcol = max($maxl, ($maxs + 3));
-   my $rcol = 80 - $lcol - 6;
-   my $rpad = ' ' x ( 80 - $rcol );
-
-   $maxs = max($lcol - 3, $maxs);
-
-   my $usage = $self->descr() . "\n" . $self->usage();
-
-   my @groups = reverse sort grep { $_ ne 'default'; } keys %{$self->{groups}};
-   push @groups, 'default';
-
-   foreach my $group ( reverse @groups ) {
-      $usage .= "\n".($group eq 'default' ? 'Options' : $group).":\n\n";
-      foreach my $opt (
-         sort { $a->{long} cmp $b->{long} }
-         grep { $_->{group} eq $group }
-         @opts )
-      {
-         my $long  = $opt->{is_negatable} ? "[no]$opt->{long}" : $opt->{long};
-         my $short = $opt->{short};
-         my $desc  = $opt->{desc};
-
-         $long .= $opt->{type} ? "=$opt->{type}" : "";
-
-         if ( $opt->{type} && $opt->{type} eq 'm' ) {
-            my ($s) = $desc =~ m/\(suffix (.)\)/;
-            $s    ||= 's';
-            $desc =~ s/\s+\(suffix .\)//;
-            $desc .= ".  Optional suffix s=seconds, m=minutes, h=hours, "
-                   . "d=days; if no suffix, $s is used.";
-         }
-         $desc = join("\n$rpad", grep { $_ } $desc =~ m/(.{0,$rcol}(?!\W))(?:\s+|(?<=\W)|$)/g);
-         $desc =~ s/ +$//mg;
-         if ( $short ) {
-            $usage .= sprintf("  --%-${maxs}s -%s  %s\n", $long, $short, $desc);
-         }
-         else {
-            $usage .= sprintf("  --%-${lcol}s  %s\n", $long, $desc);
-         }
-      }
-   }
-
-   $usage .= "\nOption types: s=string, i=integer, f=float, h/H/a/A=comma-separated list, d=DSN, z=size, m=time\n";
-
-   if ( (my @rules = @{$self->{rules}}) ) {
-      $usage .= "\nRules:\n\n";
-      $usage .= join("\n", map { "  $_" } @rules) . "\n";
-   }
-   if ( $self->{DSNParser} ) {
-      $usage .= "\n" . $self->{DSNParser}->usage();
-   }
-   $usage .= "\nOptions and values after processing arguments:\n\n";
-   foreach my $opt ( sort { $a->{long} cmp $b->{long} } @opts ) {
-      my $val   = $opt->{value};
-      my $type  = $opt->{type} || '';
-      my $bool  = $opt->{spec} =~ m/^[\w-]+(?:\|[\w-])?!?$/;
-      $val      = $bool              ? ( $val ? 'TRUE' : 'FALSE' )
-                : !defined $val      ? '(No value)'
-                : $type eq 'd'       ? $self->{DSNParser}->as_string($val)
-                : $type =~ m/H|h/    ? join(',', sort keys %$val)
-                : $type =~ m/A|a/    ? join(',', @$val)
-                :                    $val;
-      $usage .= sprintf("  --%-${lcol}s  %s\n", $opt->{long}, $val);
-   }
-   return $usage;
-}
-
-sub prompt_noecho {
-   shift @_ if ref $_[0] eq __PACKAGE__;
-   my ( $prompt ) = @_;
-   local $OUTPUT_AUTOFLUSH = 1;
-   print STDERR $prompt
-      or die "Cannot print: $OS_ERROR";
-   my $response;
-   eval {
-      require Term::ReadKey;
-      Term::ReadKey::ReadMode('noecho');
-      chomp($response = <STDIN>);
-      Term::ReadKey::ReadMode('normal');
-      print "\n"
-         or die "Cannot print: $OS_ERROR";
-   };
-   if ( $EVAL_ERROR ) {
-      die "Cannot read response; is Term::ReadKey installed? $EVAL_ERROR";
-   }
-   return $response;
-}
-
-sub _read_config_file {
-   my ( $self, $filename ) = @_;
-   open my $fh, "<", $filename or die "Cannot open $filename: $OS_ERROR\n";
-   my @args;
-   my $prefix = '--';
-   my $parse  = 1;
-
-   LINE:
-   while ( my $line = <$fh> ) {
-      chomp $line;
-      next LINE if $line =~ m/^\s*(?:\#|\;|$)/;
-      $line =~ s/\s+#.*$//g;
-      $line =~ s/^\s+|\s+$//g;
-      if ( $line eq '--' ) {
-         $prefix = '';
-         $parse  = 0;
-         next LINE;
-      }
-
-      if (  $parse
-            && !$self->has('version-check')
-            && $line =~ /version-check/
-      ) {
-         next LINE;
-      }
-
-      if ( $parse
-         && (my($opt, $arg) = $line =~ m/^\s*([^=\s]+?)(?:\s*=\s*(.*?)\s*)?$/)
-      ) {
-         push @args, grep { defined $_ } ("$prefix$opt", $arg);
-      }
-      elsif ( $line =~ m/./ ) {
-         push @args, $line;
-      }
-      else {
-         die "Syntax error in file $filename at line $INPUT_LINE_NUMBER";
-      }
-   }
-   close $fh;
-   return @args;
-}
-
-sub read_para_after {
-   my ( $self, $file, $regex ) = @_;
-   open my $fh, "<", $file or die "Can't open $file: $OS_ERROR";
-   local $INPUT_RECORD_SEPARATOR = '';
-   my $para;
-   while ( $para = <$fh> ) {
-      next unless $para =~ m/^=pod$/m;
-      last;
-   }
-   while ( $para = <$fh> ) {
-      next unless $para =~ m/$regex/;
-      last;
-   }
-   $para = <$fh>;
-   chomp($para);
-   close $fh or die "Can't close $file: $OS_ERROR";
-   return $para;
-}
-
-sub clone {
-   my ( $self ) = @_;
-
-   my %clone = map {
-      my $hashref  = $self->{$_};
-      my $val_copy = {};
-      foreach my $key ( keys %$hashref ) {
-         my $ref = ref $hashref->{$key};
-         $val_copy->{$key} = !$ref           ? $hashref->{$key}
-                           : $ref eq 'HASH'  ? { %{$hashref->{$key}} }
-                           : $ref eq 'ARRAY' ? [ @{$hashref->{$key}} ]
-                           : $hashref->{$key};
-      }
-      $_ => $val_copy;
-   } qw(opts short_opts defaults);
-
-   foreach my $scalar ( qw(got_opts) ) {
-      $clone{$scalar} = $self->{$scalar};
-   }
-
-   return bless \%clone;
-}
-
-sub _parse_size {
-   my ( $self, $opt, $val ) = @_;
-
-   if ( lc($val || '') eq 'null' ) {
-      PTDEBUG && _d('NULL size for', $opt->{long});
-      $opt->{value} = 'null';
-      return;
-   }
-
-   my %factor_for = (k => 1_024, M => 1_048_576, G => 1_073_741_824);
-   my ($pre, $num, $factor) = $val =~ m/^([+-])?(\d+)([kMG])?$/;
-   if ( defined $num ) {
-      if ( $factor ) {
-         $num *= $factor_for{$factor};
-         PTDEBUG && _d('Setting option', $opt->{y},
-            'to num', $num, '* factor', $factor);
-      }
-      $opt->{value} = ($pre || '') . $num;
-   }
-   else {
-      $self->save_error("Invalid size for --$opt->{long}: $val");
-   }
-   return;
-}
-
-sub _parse_attribs {
-   my ( $self, $option, $attribs ) = @_;
-   my $types = $self->{types};
-   return $option
-      . ($attribs->{'short form'} ? '|' . $attribs->{'short form'}   : '' )
-      . ($attribs->{'negatable'}  ? '!'                              : '' )
-      . ($attribs->{'cumulative'} ? '+'                              : '' )
-      . ($attribs->{'type'}       ? '=' . $types->{$attribs->{type}} : '' );
-}
-
-sub _parse_synopsis {
-   my ( $self, $file ) = @_;
-   $file ||= $self->{file} || __FILE__;
-   PTDEBUG && _d("Parsing SYNOPSIS in", $file);
-
-   local $INPUT_RECORD_SEPARATOR = '';  # read paragraphs
-   open my $fh, "<", $file or die "Cannot open $file: $OS_ERROR";
-   my $para;
-   1 while defined($para = <$fh>) && $para !~ m/^=head1 SYNOPSIS/;
-   die "$file does not contain a SYNOPSIS section" unless $para;
-   my @synop;
-   for ( 1..2 ) {  # 1 for the usage, 2 for the description
-      my $para = <$fh>;
-      push @synop, $para;
-   }
-   close $fh;
-   PTDEBUG && _d("Raw SYNOPSIS text:", @synop);
-   my ($usage, $desc) = @synop;
-   die "The SYNOPSIS section in $file is not formatted properly"
-      unless $usage && $desc;
-
-   $usage =~ s/^\s*Usage:\s+(.+)/$1/;
-   chomp $usage;
-
-   $desc =~ s/\n/ /g;
-   $desc =~ s/\s{2,}/ /g;
-   $desc =~ s/\. ([A-Z][a-z])/.  $1/g;
-   $desc =~ s/\s+$//;
-
-   return (
-      description => $desc,
-      usage       => $usage,
-   );
-};
-
-sub set_vars {
-   my ($self, $file) = @_;
-   $file ||= $self->{file} || __FILE__;
-
-   my %user_vars;
-   my $user_vars = $self->has('set-vars') ? $self->get('set-vars') : undef;
-   if ( $user_vars ) {
-      foreach my $var_val ( @$user_vars ) {
-         my ($var, $val) = $var_val =~ m/([^\s=]+)=(\S+)/;
-         die "Invalid --set-vars value: $var_val\n" unless $var && defined $val;
-         $user_vars{$var} = {
-            val     => $val,
-            default => 0,
-         };
-      }
-   }
-
-   my %default_vars;
-   my $default_vars = $self->read_para_after($file, qr/MAGIC_set_vars/);
-   if ( $default_vars ) {
-      %default_vars = map {
-         my $var_val = $_;
-         my ($var, $val) = $var_val =~ m/([^\s=]+)=(\S+)/;
-         die "Invalid --set-vars value: $var_val\n" unless $var && defined $val;
-         $var => {
-            val     => $val,
-            default => 1,
-         };
-      } split("\n", $default_vars);
-   }
-
-   my %vars = (
-      %default_vars, # first the tool's defaults
-      %user_vars,    # then the user's which overwrite the defaults
-   );
-   PTDEBUG && _d('--set-vars:', Dumper(\%vars));
-   return \%vars;
-}
-
-sub _d {
-   my ($package, undef, $line) = caller 0;
-   @_ = map { (my $temp = $_) =~ s/\n/\n# /g; $temp; }
-        map { defined $_ ? $_ : 'undef' }
-        @_;
-   print STDERR "# $package:$line $PID ", join(' ', @_), "\n";
-}
-
-if ( PTDEBUG ) {
-   print STDERR '# ', $^X, ' ', $], "\n";
-   if ( my $uname = `uname -a` ) {
-      $uname =~ s/\s+/ /g;
-      print STDERR "# $uname\n";
-   }
-   print STDERR '# Arguments: ',
-      join(' ', map { my $a = "_[$_]_"; $a =~ s/\n/\n# /g; $a; } @ARGV), "\n";
-}
-
-1;
-}
-# ###########################################################################
-# End OptionParser package
-# ###########################################################################
-
-# ###########################################################################
-# Lmo::Utils package
-# This package is a copy without comments from the original.  The original
-# with comments and its test file can be found in the GitHub repository at,
-#   lib/Lmo/Utils.pm
-#   t/lib/Lmo/Utils.t
-# See https://github.com/percona/percona-toolkit for more information.
-# ###########################################################################
-{
-package Lmo::Utils;
-
-use strict;
-use warnings qw( FATAL all );
-require Exporter;
-our (@ISA, @EXPORT, @EXPORT_OK);
-
-BEGIN {
-   @ISA = qw(Exporter);
-   @EXPORT = @EXPORT_OK = qw(
-      _install_coderef
-      _unimport_coderefs
-      _glob_for
-      _stash_for
-   );
-}
-
-{
-   no strict 'refs';
-   sub _glob_for {
-      return \*{shift()}
-   }
-
-   sub _stash_for {
-      return \%{ shift() . "::" };
-   }
-}
-
-sub _install_coderef {
-   my ($to, $code) = @_;
-
-   return *{ _glob_for $to } = $code;
-}
-
-sub _unimport_coderefs {
-   my ($target, @names) = @_;
-   return unless @names;
-   my $stash = _stash_for($target);
-   foreach my $name (@names) {
-      if ($stash->{$name} and defined(&{$stash->{$name}})) {
-         delete $stash->{$name};
-      }
-   }
-}
-
-1;
-}
-# ###########################################################################
-# End Lmo::Utils package
-# ###########################################################################
-
-# ###########################################################################
-# Lmo::Meta package
-# This package is a copy without comments from the original.  The original
-# with comments and its test file can be found in the GitHub repository at,
-#   lib/Lmo/Meta.pm
-#   t/lib/Lmo/Meta.t
-# See https://github.com/percona/percona-toolkit for more information.
-# ###########################################################################
-{
-package Lmo::Meta;
-use strict;
-use warnings qw( FATAL all );
-
-my %metadata_for;
-
-sub new {
-   my $class = shift;
-   return bless { @_ }, $class
-}
-
-sub metadata_for {
-   my $self    = shift;
-   my ($class) = @_;
-
-   return $metadata_for{$class} ||= {};
-}
-
-sub class { shift->{class} }
-
-sub attributes {
-   my $self = shift;
-   return keys %{$self->metadata_for($self->class)}
-}
-
-sub attributes_for_new {
-   my $self = shift;
-   my @attributes;
-
-   my $class_metadata = $self->metadata_for($self->class);
-   while ( my ($attr, $meta) = each %$class_metadata ) {
-      if ( exists $meta->{init_arg} ) {
-         push @attributes, $meta->{init_arg}
-               if defined $meta->{init_arg};
-      }
-      else {
-         push @attributes, $attr;
-      }
-   }
-   return @attributes;
-}
-
-1;
-}
-# ###########################################################################
-# End Lmo::Meta package
-# ###########################################################################
-
-# ###########################################################################
-# Lmo::Object package
-# This package is a copy without comments from the original.  The original
-# with comments and its test file can be found in the GitHub repository at,
-#   lib/Lmo/Object.pm
-#   t/lib/Lmo/Object.t
-# See https://github.com/percona/percona-toolkit for more information.
-# ###########################################################################
-{
-package Lmo::Object;
-
-use strict;
-use warnings qw( FATAL all );
-
-use Carp ();
-use Scalar::Util qw(blessed);
-
-use Lmo::Meta;
-use Lmo::Utils qw(_glob_for);
-
-sub new {
-   my $class = shift;
-   my $args  = $class->BUILDARGS(@_);
-
-   my $class_metadata = Lmo::Meta->metadata_for($class);
-
-   my @args_to_delete;
-   while ( my ($attr, $meta) = each %$class_metadata ) {
-      next unless exists $meta->{init_arg};
-      my $init_arg = $meta->{init_arg};
-
-      if ( defined $init_arg ) {
-         $args->{$attr} = delete $args->{$init_arg};
-      }
-      else {
-         push @args_to_delete, $attr;
-      }
-   }
-
-   delete $args->{$_} for @args_to_delete;
-
-   for my $attribute ( keys %$args ) {
-      if ( my $coerce = $class_metadata->{$attribute}{coerce} ) {
-         $args->{$attribute} = $coerce->($args->{$attribute});
-      }
-      if ( my $isa_check = $class_metadata->{$attribute}{isa} ) {
-         my ($check_name, $check_sub) = @$isa_check;
-         $check_sub->($args->{$attribute});
-      }
-   }
-
-   while ( my ($attribute, $meta) = each %$class_metadata ) {
-      next unless $meta->{required};
-      Carp::confess("Attribute ($attribute) is required for $class")
-         if ! exists $args->{$attribute}
-   }
-
-   my $self = bless $args, $class;
-
-   my @build_subs;
-   my $linearized_isa = mro::get_linear_isa($class);
-
-   for my $isa_class ( @$linearized_isa ) {
-      unshift @build_subs, *{ _glob_for "${isa_class}::BUILD" }{CODE};
-   }
-   my @args = %$args;
-   for my $sub (grep { defined($_) && exists &$_ } @build_subs) {
-      $sub->( $self, @args);
-   }
-   return $self;
-}
-
-sub BUILDARGS {
-   shift; # No need for the classname
-   if ( @_ == 1 && ref($_[0]) ) {
-      Carp::confess("Single parameters to new() must be a HASH ref, not $_[0]")
-         unless ref($_[0]) eq ref({});
-      return {%{$_[0]}} # We want a new reference, always
-   }
-   else {
-      return { @_ };
-   }
-}
-
-sub meta {
-   my $class = shift;
-   $class    = Scalar::Util::blessed($class) || $class;
-   return Lmo::Meta->new(class => $class);
-}
-
-1;
-}
-# ###########################################################################
-# End Lmo::Object package
-# ###########################################################################
-
-# ###########################################################################
-# Lmo::Types package
-# This package is a copy without comments from the original.  The original
-# with comments and its test file can be found in the GitHub repository at,
-#   lib/Lmo/Types.pm
-#   t/lib/Lmo/Types.t
-# See https://github.com/percona/percona-toolkit for more information.
-# ###########################################################################
-{
-package Lmo::Types;
-
-use strict;
-use warnings qw( FATAL all );
-
-use Carp ();
-use Scalar::Util qw(looks_like_number blessed);
-
-
-our %TYPES = (
-   Bool   => sub { !$_[0] || (defined $_[0] && looks_like_number($_[0]) && $_[0] == 1) },
-   Num    => sub { defined $_[0] && looks_like_number($_[0]) },
-   Int    => sub { defined $_[0] && looks_like_number($_[0]) && $_[0] == int($_[0]) },
-   Str    => sub { defined $_[0] },
-   Object => sub { defined $_[0] && blessed($_[0]) },
-   FileHandle => sub { local $@; require IO::Handle; fileno($_[0]) && $_[0]->opened },
-
-   map {
-      my $type = /R/ ? $_ : uc $_;
-      $_ . "Ref" => sub { ref $_[0] eq $type }
-   } qw(Array Code Hash Regexp Glob Scalar)
-);
-
-sub check_type_constraints {
-   my ($attribute, $type_check, $check_name, $val) = @_;
-   ( ref($type_check) eq 'CODE'
-      ? $type_check->($val)
-      : (ref $val eq $type_check
-         || ($val && $val eq $type_check)
-         || (exists $TYPES{$type_check} && $TYPES{$type_check}->($val)))
-   )
-   || Carp::confess(
-        qq<Attribute ($attribute) does not pass the type constraint because: >
-      . qq<Validation failed for '$check_name' with value >
-      . (defined $val ? Lmo::Dumper($val) : 'undef') )
-}
-
-sub _nested_constraints {
-   my ($attribute, $aggregate_type, $type) = @_;
-
-   my $inner_types;
-   if ( $type =~ /\A(ArrayRef|Maybe)\[(.*)\]\z/ ) {
-      $inner_types = _nested_constraints($1, $2);
-   }
-   else {
-      $inner_types = $TYPES{$type};
-   }
-
-   if ( $aggregate_type eq 'ArrayRef' ) {
-      return sub {
-         my ($val) = @_;
-         return unless ref($val) eq ref([]);
-
-         if ($inner_types) {
-            for my $value ( @{$val} ) {
-               return unless $inner_types->($value)
-            }
-         }
-         else {
-            for my $value ( @{$val} ) {
-               return unless $value && ($value eq $type
-                        || (Scalar::Util::blessed($value) && $value->isa($type)));
-            }
-         }
-         return 1;
-      };
-   }
-   elsif ( $aggregate_type eq 'Maybe' ) {
-      return sub {
-         my ($value) = @_;
-         return 1 if ! defined($value);
-         if ($inner_types) {
-            return unless $inner_types->($value)
-         }
-         else {
-            return unless $value eq $type
-                        || (Scalar::Util::blessed($value) && $value->isa($type));
-         }
-         return 1;
-      }
-   }
-   else {
-      Carp::confess("Nested aggregate types are only implemented for ArrayRefs and Maybe");
-   }
-}
-
-1;
-}
-# ###########################################################################
-# End Lmo::Types package
-# ###########################################################################
-
-# ###########################################################################
-# Lmo package
-# This package is a copy without comments from the original.  The original
-# with comments and its test file can be found in the GitHub repository at,
-#   lib/Lmo.pm
-#   t/lib/Lmo.t
-# See https://github.com/percona/percona-toolkit for more information.
-# ###########################################################################
-{
-BEGIN {
-$INC{"Lmo.pm"} = __FILE__;
-package Lmo;
-our $VERSION = '0.30_Percona'; # Forked from 0.30 of Mo.
-
-
-use strict;
-use warnings qw( FATAL all );
-
-use Carp ();
-use Scalar::Util qw(looks_like_number blessed);
-
-use Lmo::Meta;
-use Lmo::Object;
-use Lmo::Types;
-
-use Lmo::Utils;
-
-my %export_for;
-sub import {
-   warnings->import(qw(FATAL all));
-   strict->import();
-
-   my $caller     = scalar caller(); # Caller's package
-   my %exports = (
-      extends  => \&extends,
-      has      => \&has,
-      with     => \&with,
-      override => \&override,
-      confess  => \&Carp::confess,
-   );
-
-   $export_for{$caller} = \%exports;
-
-   for my $keyword ( keys %exports ) {
-      _install_coderef "${caller}::$keyword" => $exports{$keyword};
-   }
-
-   if ( !@{ *{ _glob_for "${caller}::ISA" }{ARRAY} || [] } ) {
-      @_ = "Lmo::Object";
-      goto *{ _glob_for "${caller}::extends" }{CODE};
-   }
-}
-
-sub extends {
-   my $caller = scalar caller();
-   for my $class ( @_ ) {
-      _load_module($class);
-   }
-   _set_package_isa($caller, @_);
-   _set_inherited_metadata($caller);
-}
-
-sub _load_module {
-   my ($class) = @_;
-
-   (my $file = $class) =~ s{::|'}{/}g;
-   $file .= '.pm';
-   { local $@; eval { require "$file" } } # or warn $@;
-   return;
-}
-
-sub with {
-   my $package = scalar caller();
-   require Role::Tiny;
-   for my $role ( @_ ) {
-      _load_module($role);
-      _role_attribute_metadata($package, $role);
-   }
-   Role::Tiny->apply_roles_to_package($package, @_);
-}
-
-sub _role_attribute_metadata {
-   my ($package, $role) = @_;
-
-   my $package_meta = Lmo::Meta->metadata_for($package);
-   my $role_meta    = Lmo::Meta->metadata_for($role);
-
-   %$package_meta = (%$role_meta, %$package_meta);
-}
-
-sub has {
-   my $names  = shift;
-   my $caller = scalar caller();
-
-   my $class_metadata = Lmo::Meta->metadata_for($caller);
-
-   for my $attribute ( ref $names ? @$names : $names ) {
-      my %args   = @_;
-      my $method = ($args{is} || '') eq 'ro'
-         ? sub {
-            Carp::confess("Cannot assign a value to a read-only accessor at reader ${caller}::${attribute}")
-               if $#_;
-            return $_[0]{$attribute};
-         }
-         : sub {
-            return $#_
-                  ? $_[0]{$attribute} = $_[1]
-                  : $_[0]{$attribute};
-         };
-
-      $class_metadata->{$attribute} = ();
-
-      if ( my $type_check = $args{isa} ) {
-         my $check_name = $type_check;
-
-         if ( my ($aggregate_type, $inner_type) = $type_check =~ /\A(ArrayRef|Maybe)\[(.*)\]\z/ ) {
-            $type_check = Lmo::Types::_nested_constraints($attribute, $aggregate_type, $inner_type);
-         }
-
-         my $check_sub = sub {
-            my ($new_val) = @_;
-            Lmo::Types::check_type_constraints($attribute, $type_check, $check_name, $new_val);
-         };
-
-         $class_metadata->{$attribute}{isa} = [$check_name, $check_sub];
-         my $orig_method = $method;
-         $method = sub {
-            $check_sub->($_[1]) if $#_;
-            goto &$orig_method;
-         };
-      }
-
-      if ( my $builder = $args{builder} ) {
-         my $original_method = $method;
-         $method = sub {
-               $#_
-                  ? goto &$original_method
-                  : ! exists $_[0]{$attribute}
-                     ? $_[0]{$attribute} = $_[0]->$builder
-                     : goto &$original_method
-         };
-      }
-
-      if ( my $code = $args{default} ) {
-         Carp::confess("${caller}::${attribute}'s default is $code, but should be a coderef")
-               unless ref($code) eq 'CODE';
-         my $original_method = $method;
-         $method = sub {
-               $#_
-                  ? goto &$original_method
-                  : ! exists $_[0]{$attribute}
-                     ? $_[0]{$attribute} = $_[0]->$code
-                     : goto &$original_method
-         };
-      }
-
-      if ( my $role = $args{does} ) {
-         my $original_method = $method;
-         $method = sub {
-            if ( $#_ ) {
-               Carp::confess(qq<Attribute ($attribute) doesn't consume a '$role' role">)
-                  unless Scalar::Util::blessed($_[1]) && eval { $_[1]->does($role) }
-            }
-            goto &$original_method
-         };
-      }
-
-      if ( my $coercion = $args{coerce} ) {
-         $class_metadata->{$attribute}{coerce} = $coercion;
-         my $original_method = $method;
-         $method = sub {
-            if ( $#_ ) {
-               return $original_method->($_[0], $coercion->($_[1]))
-            }
-            goto &$original_method;
-         }
-      }
-
-      _install_coderef "${caller}::$attribute" => $method;
-
-      if ( $args{required} ) {
-         $class_metadata->{$attribute}{required} = 1;
-      }
-
-      if ($args{clearer}) {
-         _install_coderef "${caller}::$args{clearer}"
-            => sub { delete shift->{$attribute} }
-      }
-
-      if ($args{predicate}) {
-         _install_coderef "${caller}::$args{predicate}"
-            => sub { exists shift->{$attribute} }
-      }
-
-      if ($args{handles}) {
-         _has_handles($caller, $attribute, \%args);
-      }
-
-      if (exists $args{init_arg}) {
-         $class_metadata->{$attribute}{init_arg} = $args{init_arg};
-      }
-   }
-}
-
-sub _has_handles {
-   my ($caller, $attribute, $args) = @_;
-   my $handles = $args->{handles};
-
-   my $ref = ref $handles;
-   my $kv;
-   if ( $ref eq ref [] ) {
-         $kv = { map { $_,$_ } @{$handles} };
-   }
-   elsif ( $ref eq ref {} ) {
-         $kv = $handles;
-   }
-   elsif ( $ref eq ref qr// ) {
-         Carp::confess("Cannot delegate methods based on a Regexp without a type constraint (isa)")
-            unless $args->{isa};
-         my $target_class = $args->{isa};
-         $kv = {
-            map   { $_, $_     }
-            grep  { $_ =~ $handles }
-            grep  { !exists $Lmo::Object::{$_} && $target_class->can($_) }
-            grep  { !$export_for{$target_class}->{$_} }
-            keys %{ _stash_for $target_class }
-         };
-   }
-   else {
-         Carp::confess("handles for $ref not yet implemented");
-   }
-
-   while ( my ($method, $target) = each %{$kv} ) {
-         my $name = _glob_for "${caller}::$method";
-         Carp::confess("You cannot overwrite a locally defined method ($method) with a delegation")
-            if defined &$name;
-
-         my ($target, @curried_args) = ref($target) ? @$target : $target;
-         *$name = sub {
-            my $self        = shift;
-            my $delegate_to = $self->$attribute();
-            my $error = "Cannot delegate $method to $target because the value of $attribute";
-            Carp::confess("$error is not defined") unless $delegate_to;
-            Carp::confess("$error is not an object (got '$delegate_to')")
-               unless Scalar::Util::blessed($delegate_to) || (!ref($delegate_to) && $delegate_to->can($target));
-            return $delegate_to->$target(@curried_args, @_);
-         }
-   }
-}
-
-sub _set_package_isa {
-   my ($package, @new_isa) = @_;
-   my $package_isa  = \*{ _glob_for "${package}::ISA" };
-   @{*$package_isa} = @new_isa;
-}
-
-sub _set_inherited_metadata {
-   my $class = shift;
-   my $class_metadata = Lmo::Meta->metadata_for($class);
-   my $linearized_isa = mro::get_linear_isa($class);
-   my %new_metadata;
-
-   for my $isa_class (reverse @$linearized_isa) {
-      my $isa_metadata = Lmo::Meta->metadata_for($isa_class);
-      %new_metadata = (
-         %new_metadata,
-         %$isa_metadata,
-      );
-   }
-   %$class_metadata = %new_metadata;
-}
-
-sub unimport {
-   my $caller = scalar caller();
-   my $target = caller;
-  _unimport_coderefs($target, keys %{$export_for{$caller}});
-}
-
-sub Dumper {
-   require Data::Dumper;
-   local $Data::Dumper::Indent    = 0;
-   local $Data::Dumper::Sortkeys  = 0;
-   local $Data::Dumper::Quotekeys = 0;
-   local $Data::Dumper::Terse     = 1;
-
-   Data::Dumper::Dumper(@_)
-}
-
-BEGIN {
-   if ($] >= 5.010) {
-      { local $@; require mro; }
-   }
-   else {
-      local $@;
-      eval {
-         require MRO::Compat;
-      } or do {
-         *mro::get_linear_isa = *mro::get_linear_isa_dfs = sub {
-            no strict 'refs';
-
-            my $classname = shift;
-
-            my @lin = ($classname);
-            my %stored;
-            foreach my $parent (@{"$classname\::ISA"}) {
-               my $plin = mro::get_linear_isa_dfs($parent);
-               foreach (@$plin) {
-                     next if exists $stored{$_};
-                     push(@lin, $_);
-                     $stored{$_} = 1;
-               }
-            }
-            return \@lin;
-         };
-      }
-   }
-}
-
-sub override {
-   my ($methods, $code) = @_;
-   my $caller          = scalar caller;
-
-   for my $method ( ref($methods) ? @$methods : $methods ) {
-      my $full_method     = "${caller}::${method}";
-      *{_glob_for $full_method} = $code;
-   }
-}
-
-}
-1;
-}
-# ###########################################################################
-# End Lmo package
-# ###########################################################################
-
-# ###########################################################################
-# VersionParser package
-# This package is a copy without comments from the original.  The original
-# with comments and its test file can be found in the GitHub repository at,
-#   lib/VersionParser.pm
-#   t/lib/VersionParser.t
-# See https://github.com/percona/percona-toolkit for more information.
-# ###########################################################################
-{
-package VersionParser;
-
-use Lmo;
-use Scalar::Util qw(blessed);
-use English qw(-no_match_vars);
-use constant PTDEBUG => $ENV{PTDEBUG} || 0;
-
-use overload (
-   '""'     => "version",
-   '<=>'    => "cmp",
-   'cmp'    => "cmp",
-   fallback => 1,
-);
-
-use Carp ();
-
-has major => (
-    is       => 'ro',
-    isa      => 'Int',
-    required => 1,
-);
-
-has [qw( minor revision )] => (
-    is  => 'ro',
-    isa => 'Num',
-);
-
-has flavor => (
-    is      => 'ro',
-    isa     => 'Str',
-    default => sub { 'Unknown' },
-);
-
-has innodb_version => (
-    is      => 'ro',
-    isa     => 'Str',
-    default => sub { 'NO' },
-);
-
-sub series {
-   my $self = shift;
-   return $self->_join_version($self->major, $self->minor);
-}
-
-sub version {
-   my $self = shift;
-   return $self->_join_version($self->major, $self->minor, $self->revision);
-}
-
-sub is_in {
-   my ($self, $target) = @_;
-
-   return $self eq $target;
-}
-
-sub _join_version {
-    my ($self, @parts) = @_;
-
-    return join ".", map { my $c = $_; $c =~ s/^0\./0/; $c } grep defined, @parts;
-}
-sub _split_version {
-   my ($self, $str) = @_;
-   my @version_parts = map { s/^0(?=\d)/0./; $_ } $str =~ m/(\d+)/g;
-   return @version_parts[0..2];
-}
-
-sub normalized_version {
-   my ( $self ) = @_;
-   my $result = sprintf('%d%02d%02d', map { $_ || 0 } $self->major,
-                                                      $self->minor,
-                                                      $self->revision);
-   PTDEBUG && _d($self->version, 'normalizes to', $result);
-   return $result;
-}
-
-sub comment {
-   my ( $self, $cmd ) = @_;
-   my $v = $self->normalized_version();
-
-   return "/*!$v $cmd */"
-}
-
-my @methods = qw(major minor revision);
-sub cmp {
-   my ($left, $right) = @_;
-   my $right_obj = (blessed($right) && $right->isa(ref($left)))
-                   ? $right
-                   : ref($left)->new($right);
-
-   my $retval = 0;
-   for my $m ( @methods ) {
-      last unless defined($left->$m) && defined($right_obj->$m);
-      $retval = $left->$m <=> $right_obj->$m;
-      last if $retval;
-   }
-   return $retval;
-}
-
-sub BUILDARGS {
-   my $self = shift;
-
-   if ( @_ == 1 ) {
-      my %args;
-      if ( blessed($_[0]) && $_[0]->can("selectrow_hashref") ) {
-         PTDEBUG && _d("VersionParser got a dbh, trying to get the version");
-         my $dbh = $_[0];
-         local $dbh->{FetchHashKeyName} = 'NAME_lc';
-         my $query = eval {
-            $dbh->selectall_arrayref(q/SHOW VARIABLES LIKE 'version%'/, { Slice => {} })
-         };
-         if ( $query ) {
-            $query = { map { $_->{variable_name} => $_->{value} } @$query };
-            @args{@methods} = $self->_split_version($query->{version});
-            $args{flavor} = delete $query->{version_comment}
-                  if $query->{version_comment};
-         }
-         elsif ( eval { ($query) = $dbh->selectrow_array(q/SELECT VERSION()/) } ) {
-            @args{@methods} = $self->_split_version($query);
-         }
-         else {
-            Carp::confess("Couldn't get the version from the dbh while "
-                        . "creating a VersionParser object: $@");
-         }
-         $args{innodb_version} = eval { $self->_innodb_version($dbh) };
-      }
-      elsif ( !ref($_[0]) ) {
-         @args{@methods} = $self->_split_version($_[0]);
-      }
-
-      for my $method (@methods) {
-         delete $args{$method} unless defined $args{$method};
-      }
-      @_ = %args if %args;
-   }
-
-   return $self->SUPER::BUILDARGS(@_);
-}
-
-sub _innodb_version {
-   my ( $self, $dbh ) = @_;
-   return unless $dbh;
-   my $innodb_version = "NO";
-
-   my ($innodb) =
-      grep { $_->{engine} =~ m/InnoDB/i }
-      map  {
-         my %hash;
-         @hash{ map { lc $_ } keys %$_ } = values %$_;
-         \%hash;
-      }
-      @{ $dbh->selectall_arrayref("SHOW ENGINES", {Slice=>{}}) };
-   if ( $innodb ) {
-      PTDEBUG && _d("InnoDB support:", $innodb->{support});
-      if ( $innodb->{support} =~ m/YES|DEFAULT/i ) {
-         my $vars = $dbh->selectrow_hashref(
-            "SHOW VARIABLES LIKE 'innodb_version'");
-         $innodb_version = !$vars ? "BUILTIN"
-                         :          ($vars->{Value} || $vars->{value});
-      }
-      else {
-         $innodb_version = $innodb->{support};  # probably DISABLED or NO
-      }
-   }
-
-   PTDEBUG && _d("InnoDB version:", $innodb_version);
-   return $innodb_version;
-}
-
-sub _d {
-   my ($package, undef, $line) = caller 0;
-   @_ = map { (my $temp = $_) =~ s/\n/\n# /g; $temp; }
-        map { defined $_ ? $_ : 'undef' }
-        @_;
-   print STDERR "# $package:$line $PID ", join(' ', @_), "\n";
-}
-
-no Lmo;
-1;
-}
-# ###########################################################################
-# End VersionParser package
-# ###########################################################################
-
-# ###########################################################################
-# DSNParser package
-# This package is a copy without comments from the original.  The original
-# with comments and its test file can be found in the GitHub repository at,
-#   lib/DSNParser.pm
-#   t/lib/DSNParser.t
-# See https://github.com/percona/percona-toolkit for more information.
-# ###########################################################################
-{
-package DSNParser;
-
-use strict;
-use warnings FATAL => 'all';
-use English qw(-no_match_vars);
-use constant PTDEBUG => $ENV{PTDEBUG} || 0;
-
-use Data::Dumper;
-$Data::Dumper::Indent    = 0;
-$Data::Dumper::Quotekeys = 0;
-
-my $dsn_sep = qr/(?<!\\),/;
-
-eval {
-   require DBI;
-};
-my $have_dbi = $EVAL_ERROR ? 0 : 1;
-
-sub new {
-   my ( $class, %args ) = @_;
-   foreach my $arg ( qw(opts) ) {
-      die "I need a $arg argument" unless $args{$arg};
-   }
-   my $self = {
-      opts => {}  # h, P, u, etc.  Should come from DSN OPTIONS section in POD.
-   };
-   foreach my $opt ( @{$args{opts}} ) {
-      if ( !$opt->{key} || !$opt->{desc} ) {
-         die "Invalid DSN option: ", Dumper($opt);
-      }
-      PTDEBUG && _d('DSN option:',
-         join(', ',
-            map { "$_=" . (defined $opt->{$_} ? ($opt->{$_} || '') : 'undef') }
-               keys %$opt
-         )
-      );
-      $self->{opts}->{$opt->{key}} = {
-         dsn  => $opt->{dsn},
-         desc => $opt->{desc},
-         copy => $opt->{copy} || 0,
-      };
-   }
-   return bless $self, $class;
-}
-
-sub prop {
-   my ( $self, $prop, $value ) = @_;
-   if ( @_ > 2 ) {
-      PTDEBUG && _d('Setting', $prop, 'property');
-      $self->{$prop} = $value;
-   }
-   return $self->{$prop};
-}
-
-sub parse {
-   my ( $self, $dsn, $prev, $defaults ) = @_;
-   if ( !$dsn ) {
-      PTDEBUG && _d('No DSN to parse');
-      return;
-   }
-   PTDEBUG && _d('Parsing', $dsn);
-   $prev     ||= {};
-   $defaults ||= {};
-   my %given_props;
-   my %final_props;
-   my $opts = $self->{opts};
-
-   foreach my $dsn_part ( split($dsn_sep, $dsn) ) {
-      $dsn_part =~ s/\\,/,/g;
-      if ( my ($prop_key, $prop_val) = $dsn_part =~  m/^(.)=(.*)$/ ) {
-         $given_props{$prop_key} = $prop_val;
-      }
-      else {
-         PTDEBUG && _d('Interpreting', $dsn_part, 'as h=', $dsn_part);
-         $given_props{h} = $dsn_part;
-      }
-   }
-
-   foreach my $key ( keys %$opts ) {
-      PTDEBUG && _d('Finding value for', $key);
-      $final_props{$key} = $given_props{$key};
-      if ( !defined $final_props{$key}
-           && defined $prev->{$key} && $opts->{$key}->{copy} )
-      {
-         $final_props{$key} = $prev->{$key};
-         PTDEBUG && _d('Copying value for', $key, 'from previous DSN');
-      }
-      if ( !defined $final_props{$key} ) {
-         $final_props{$key} = $defaults->{$key};
-         PTDEBUG && _d('Copying value for', $key, 'from defaults');
-      }
-   }
-
-   foreach my $key ( keys %given_props ) {
-      die "Unknown DSN option '$key' in '$dsn'.  For more details, "
-            . "please use the --help option, or try 'perldoc $PROGRAM_NAME' "
-            . "for complete documentation."
-         unless exists $opts->{$key};
-   }
-   if ( (my $required = $self->prop('required')) ) {
-      foreach my $key ( keys %$required ) {
-         die "Missing required DSN option '$key' in '$dsn'.  For more details, "
-               . "please use the --help option, or try 'perldoc $PROGRAM_NAME' "
-               . "for complete documentation."
-            unless $final_props{$key};
-      }
-   }
-
-   return \%final_props;
-}
-
-sub parse_options {
-   my ( $self, $o ) = @_;
-   die 'I need an OptionParser object' unless ref $o eq 'OptionParser';
-   my $dsn_string
-      = join(',',
-          map  { "$_=".$o->get($_); }
-          grep { $o->has($_) && $o->get($_) }
-          keys %{$self->{opts}}
-        );
-   PTDEBUG && _d('DSN string made from options:', $dsn_string);
-   return $self->parse($dsn_string);
-}
-
-sub as_string {
-   my ( $self, $dsn, $props ) = @_;
-   return $dsn unless ref $dsn;
-   my @keys = $props ? @$props : sort keys %$dsn;
-   return join(',',
-      map  { "$_=" . ($_ eq 'p' ? '...' : $dsn->{$_}) }
-      grep {
-         exists $self->{opts}->{$_}
-         && exists $dsn->{$_}
-         && defined $dsn->{$_}
-      } @keys);
-}
-
-sub usage {
-   my ( $self ) = @_;
-   my $usage
-      = "DSN syntax is key=value[,key=value...]  Allowable DSN keys:\n\n"
-      . "  KEY  COPY  MEANING\n"
-      . "  ===  ====  =============================================\n";
-   my %opts = %{$self->{opts}};
-   foreach my $key ( sort keys %opts ) {
-      $usage .= "  $key    "
-             .  ($opts{$key}->{copy} ? 'yes   ' : 'no    ')
-             .  ($opts{$key}->{desc} || '[No description]')
-             . "\n";
-   }
-   $usage .= "\n  If the DSN is a bareword, the word is treated as the 'h' key.\n";
-   return $usage;
-}
-
-sub get_cxn_params {
-   my ( $self, $info ) = @_;
-   my $dsn;
-   my %opts = %{$self->{opts}};
-   my $driver = $self->prop('dbidriver') || '';
-   if ( $driver eq 'Pg' ) {
-      $dsn = 'DBI:Pg:dbname=' . ( $info->{D} || '' ) . ';'
-         . join(';', map  { "$opts{$_}->{dsn}=$info->{$_}" }
-                     grep { defined $info->{$_} }
-                     qw(h P));
-   }
-   else {
-      $dsn = 'DBI:mysql:' . ( $info->{D} || '' ) . ';'
-         . join(';', map  { "$opts{$_}->{dsn}=$info->{$_}" }
-                     grep { defined $info->{$_} }
-                     qw(F h P S A s))
-         . ';mysql_read_default_group=client'
-         . ($info->{L} ? ';mysql_local_infile=1' : '');
-   }
-   PTDEBUG && _d($dsn);
-   return ($dsn, $info->{u}, $info->{p});
-}
-
-sub fill_in_dsn {
-   my ( $self, $dbh, $dsn ) = @_;
-   my $vars = $dbh->selectall_hashref('SHOW VARIABLES', 'Variable_name');
-   my ($user, $db) = $dbh->selectrow_array('SELECT USER(), DATABASE()');
-   $user =~ s/@.*//;
-   $dsn->{h} ||= $vars->{hostname}->{Value};
-   $dsn->{S} ||= $vars->{'socket'}->{Value};
-   $dsn->{P} ||= $vars->{port}->{Value};
-   $dsn->{u} ||= $user;
-   $dsn->{D} ||= $db;
-}
-
-sub get_dbh {
-   my ( $self, $cxn_string, $user, $pass, $opts ) = @_;
-   $opts ||= {};
-   my $defaults = {
-      AutoCommit         => 0,
-      RaiseError         => 1,
-      PrintError         => 0,
-      ShowErrorStatement => 1,
-      mysql_enable_utf8 => ($cxn_string =~ m/charset=utf8/i ? 1 : 0),
-   };
-   @{$defaults}{ keys %$opts } = values %$opts;
-   if (delete $defaults->{L}) { # L for LOAD DATA LOCAL INFILE, our own extension
-      $defaults->{mysql_local_infile} = 1;
-   }
-
-   if ( $opts->{mysql_use_result} ) {
-      $defaults->{mysql_use_result} = 1;
-   }
-
-   if ( !$have_dbi ) {
-      die "Cannot connect to MySQL because the Perl DBI module is not "
-         . "installed or not found.  Run 'perl -MDBI' to see the directories "
-         . "that Perl searches for DBI.  If DBI is not installed, try:\n"
-         . "  Debian/Ubuntu  apt-get install libdbi-perl\n"
-         . "  RHEL/CentOS    yum install perl-DBI\n"
-         . "  OpenSolaris    pkg install pkg:/SUNWpmdbi\n";
-
-   }
-
-   my $dbh;
-   my $tries = 2;
-   while ( !$dbh && $tries-- ) {
-      PTDEBUG && _d($cxn_string, ' ', $user, ' ', $pass,
-         join(', ', map { "$_=>$defaults->{$_}" } keys %$defaults ));
-
-      $dbh = eval { DBI->connect($cxn_string, $user, $pass, $defaults) };
-
-      if ( !$dbh && $EVAL_ERROR ) {
-         if ( $EVAL_ERROR =~ m/locate DBD\/mysql/i ) {
-            die "Cannot connect to MySQL because the Perl DBD::mysql module is "
-               . "not installed or not found.  Run 'perl -MDBD::mysql' to see "
-               . "the directories that Perl searches for DBD::mysql.  If "
-               . "DBD::mysql is not installed, try:\n"
-               . "  Debian/Ubuntu  apt-get install libdbd-mysql-perl\n"
-               . "  RHEL/CentOS    yum install perl-DBD-MySQL\n"
-               . "  OpenSolaris    pkg install pkg:/SUNWapu13dbd-mysql\n";
-         }
-         elsif ( $EVAL_ERROR =~ m/not a compiled character set|character set utf8/ ) {
-            PTDEBUG && _d('Going to try again without utf8 support');
-            delete $defaults->{mysql_enable_utf8};
-         }
-         if ( !$tries ) {
-            die $EVAL_ERROR;
-         }
-      }
-   }
-
-   if ( $cxn_string =~ m/mysql/i ) {
-      my $sql;
-
-      my ($charset) = $cxn_string =~ m/charset=([\w]+)/;
-      if ( $charset ) {
-         $sql = qq{/*!40101 SET NAMES "$charset"*/};
-         PTDEBUG && _d($dbh, $sql);
-         eval { $dbh->do($sql) };
-         if ( $EVAL_ERROR ) {
-            die "Error setting NAMES to $charset: $EVAL_ERROR";
-         }
-      }
-      else {
-         my ($mysql_version) = eval { $dbh->selectrow_array('SELECT VERSION()') };
-         if ( $EVAL_ERROR ) {
-            die "Cannot get MySQL version: $EVAL_ERROR";
-         }
-         my (undef, $character_set_server) = eval { $dbh->selectrow_array("SHOW VARIABLES LIKE 'character_set_server'") };
-         if ( $EVAL_ERROR ) {
-            die "Cannot get MySQL var character_set_server: $EVAL_ERROR";
-         }
-
-         if ( $mysql_version =~ m/^(\d+)\.(\d)\.(\d+).*/ ) {
-            if ( $1 >= 8 && $character_set_server =~ m/^utf8/ ) {
-               $dbh->{mysql_enable_utf8} = 1;
-               $charset = $character_set_server;
-               my $msg = "MySQL version $mysql_version >= 8 and character_set_server = $character_set_server\n".
-                        "Setting: SET NAMES $character_set_server";
-               PTDEBUG && _d($msg);
-               eval { $dbh->do("SET NAMES '$character_set_server'") };
-               if ( $EVAL_ERROR ) {
-                  die "Cannot SET NAMES $character_set_server: $EVAL_ERROR";
-               }
-            }
-         }
-      }
-      PTDEBUG && _d('Enabling charset for STDOUT');
-      if ( $charset && $charset =~ m/^utf8/ ) {
-         binmode(STDOUT, ':utf8')
-            or die "Can't binmode(STDOUT, ':utf8'): $OS_ERROR";
-         binmode(STDERR, ':utf8')
-            or die "Can't binmode(STDERR, ':utf8'): $OS_ERROR";
-      }
-      else {
-         binmode(STDOUT) or die "Can't binmode(STDOUT): $OS_ERROR";
-      }
-
-      if ( my $vars = $self->prop('set-vars') ) {
-         $self->set_vars($dbh, $vars);
-      }
-
-      $sql = 'SELECT @@SQL_MODE';
-      PTDEBUG && _d($dbh, $sql);
-      my ($sql_mode) = eval { $dbh->selectrow_array($sql) };
-      if ( $EVAL_ERROR ) {
-         die "Error getting the current SQL_MODE: $EVAL_ERROR";
-      }
-
-      $sql = 'SET @@SQL_QUOTE_SHOW_CREATE = 1'
-            . '/*!40101, @@SQL_MODE=\'NO_AUTO_VALUE_ON_ZERO'
-            . ($sql_mode ? ",$sql_mode" : '')
-            . '\'*/';
-      PTDEBUG && _d($dbh, $sql);
-      eval { $dbh->do($sql) };
-      if ( $EVAL_ERROR ) {
-         die "Error setting SQL_QUOTE_SHOW_CREATE, SQL_MODE"
-           . ($sql_mode ? " and $sql_mode" : '')
-           . ": $EVAL_ERROR";
-      }
-   }
-
-   PTDEBUG && _d('DBH info: ',
-      $dbh,
-      Dumper($dbh->selectrow_hashref(
-         'SELECT DATABASE(), CONNECTION_ID(), VERSION()/*!50038 , @@hostname*/')),
-      'Connection info:',      $dbh->{mysql_hostinfo},
-      'Character set info:',   Dumper($dbh->selectall_arrayref(
-                     "SHOW VARIABLES LIKE 'character_set%'", { Slice => {}})),
-      '$DBD::mysql::VERSION:', $DBD::mysql::VERSION,
-      '$DBI::VERSION:',        $DBI::VERSION,
-   );
-
-   return $dbh;
-}
-
-sub get_hostname {
-   my ( $self, $dbh ) = @_;
-   if ( my ($host) = ($dbh->{mysql_hostinfo} || '') =~ m/^(\w+) via/ ) {
-      return $host;
-   }
-   my ( $hostname, $one ) = $dbh->selectrow_array(
-      'SELECT /*!50038 @@hostname, */ 1');
-   return $hostname;
-}
-
-sub disconnect {
-   my ( $self, $dbh ) = @_;
-   PTDEBUG && $self->print_active_handles($dbh);
-   $dbh->disconnect;
-}
-
-sub print_active_handles {
-   my ( $self, $thing, $level ) = @_;
-   $level ||= 0;
-   printf("# Active %sh: %s %s %s\n", ($thing->{Type} || 'undef'), "\t" x $level,
-      $thing, (($thing->{Type} || '') eq 'st' ? $thing->{Statement} || '' : ''))
-      or die "Cannot print: $OS_ERROR";
-   foreach my $handle ( grep {defined} @{ $thing->{ChildHandles} } ) {
-      $self->print_active_handles( $handle, $level + 1 );
-   }
-}
-
-sub copy {
-   my ( $self, $dsn_1, $dsn_2, %args ) = @_;
-   die 'I need a dsn_1 argument' unless $dsn_1;
-   die 'I need a dsn_2 argument' unless $dsn_2;
-   my %new_dsn = map {
-      my $key = $_;
-      my $val;
-      if ( $args{overwrite} ) {
-         $val = defined $dsn_1->{$key} ? $dsn_1->{$key} : $dsn_2->{$key};
-      }
-      else {
-         $val = defined $dsn_2->{$key} ? $dsn_2->{$key} : $dsn_1->{$key};
-      }
-      $key => $val;
-   } keys %{$self->{opts}};
-   return \%new_dsn;
-}
-
-sub set_vars {
-   my ($self, $dbh, $vars) = @_;
-
-   return unless $vars;
-
-   foreach my $var ( sort keys %$vars ) {
-      my $val = $vars->{$var}->{val};
-
-      (my $quoted_var = $var) =~ s/_/\\_/;
-      my ($var_exists, $current_val);
-      eval {
-         ($var_exists, $current_val) = $dbh->selectrow_array(
-            "SHOW VARIABLES LIKE '$quoted_var'");
-      };
-      my $e = $EVAL_ERROR;
-      if ( $e ) {
-         PTDEBUG && _d($e);
-      }
-
-      if ( $vars->{$var}->{default} && !$var_exists ) {
-         PTDEBUG && _d('Not setting default var', $var,
-            'because it does not exist');
-         next;
-      }
-
-      if ( $current_val && $current_val eq $val ) {
-         PTDEBUG && _d('Not setting var', $var, 'because its value',
-            'is already', $val);
-         next;
-      }
-
-      my $sql = "SET SESSION $var=$val";
-      PTDEBUG && _d($dbh, $sql);
-      eval { $dbh->do($sql) };
-      if ( my $set_error = $EVAL_ERROR ) {
-         chomp($set_error);
-         $set_error =~ s/ at \S+ line \d+//;
-         my $msg = "Error setting $var: $set_error";
-         if ( $current_val ) {
-            $msg .= "  The current value for $var is $current_val.  "
-                  . "If the variable is read only (not dynamic), specify "
-                  . "--set-vars $var=$current_val to avoid this warning, "
-                  . "else manually set the variable and restart MySQL.";
-         }
-         warn $msg . "\n\n";
-      }
-   }
-
-   return;
-}
-
-sub _d {
-   my ($package, undef, $line) = caller 0;
-   @_ = map { (my $temp = $_) =~ s/\n/\n# /g; $temp; }
-        map { defined $_ ? $_ : 'undef' }
-        @_;
-   print STDERR "# $package:$line $PID ", join(' ', @_), "\n";
-}
-
-1;
-}
-# ###########################################################################
-# End DSNParser package
-# ###########################################################################
-
-# ###########################################################################
-# MasterSlave package
-# This package is a copy without comments from the original.  The original
-# with comments and its test file can be found in the GitHub repository at,
-#   lib/MasterSlave.pm
-#   t/lib/MasterSlave.t
-# See https://github.com/percona/percona-toolkit for more information.
-# ###########################################################################
-{
-package MasterSlave;
-
-use strict;
-use warnings FATAL => 'all';
-use English qw(-no_match_vars);
-use constant PTDEBUG => $ENV{PTDEBUG} || 0;
-
-sub check_recursion_method {
-   my ($methods) = @_;
-   if ( @$methods != 1 ) {
-      if ( grep({ !m/processlist|hosts/i } @$methods)
-            && $methods->[0] !~ /^dsn=/i )
-      {
-         die  "Invalid combination of recursion methods: "
-            . join(", ", map { defined($_) ? $_ : 'undef' } @$methods) . ". "
-            . "Only hosts and processlist may be combined.\n"
-      }
-   }
-   else {
-      my ($method) = @$methods;
-      die "Invalid recursion method: " . ( $method || 'undef' )
-         unless $method && $method =~ m/^(?:processlist$|hosts$|none$|cluster$|dsn=)/i;
-   }
-}
-
-sub new {
-   my ( $class, %args ) = @_;
-   my @required_args = qw(OptionParser DSNParser Quoter);
-   foreach my $arg ( @required_args ) {
-      die "I need a $arg argument" unless $args{$arg};
-   }
-   my $self = {
-      %args,
-      replication_thread => {},
-   };
-   return bless $self, $class;
-}
-
-sub get_replicas {
-   my ($self, %args) = @_;
-   my @required_args = qw(make_cxn);
-   foreach my $arg ( @required_args ) {
-      die "I need a $arg argument" unless $args{$arg};
-   }
-   my ($make_cxn) = @args{@required_args};
-
-   my $replicas  = [];
-   my $dp      = $self->{DSNParser};
-   my $methods = $self->_resolve_recursion_methods($args{dsn});
-
-   return $replicas unless @$methods;
-
-   if ( grep { m/processlist|hosts/i } @$methods ) {
-      my @required_args = qw(dbh dsn);
-      foreach my $arg ( @required_args ) {
-         die "I need a $arg argument" unless $args{$arg};
-      }
-      my ($dbh, $dsn) = @args{@required_args};
-      my $o = $self->{OptionParser};
-
-      $self->recurse_to_replicas(
-         {  dbh              => $dbh,
-            dsn              => $dsn,
-            replica_user     => $o->got('replica-user') ? $o->get('replica-user') : '',
-            replica_password => $o->got('replica-password') ? $o->get('replica-password') : '',
-            replicas         => $args{replicas},
-            callback  => sub {
-               my ( $dsn, $dbh, $level, $parent ) = @_;
-               return unless $level;
-               PTDEBUG && _d('Found replica:', $dp->as_string($dsn));
-               my $replica_dsn = $dsn;
-               if ($o->got('replica-user')) {
-                  $replica_dsn->{u} = $o->get('replica-user');
-                  PTDEBUG && _d("Using replica user ".$o->get('replica-user')." on ".$replica_dsn->{h}.":".$replica_dsn->{P});
-               }
-               if ($o->got('replica-password')) {
-                  $replica_dsn->{p} = $o->get('replica-password');
-                  PTDEBUG && _d("Replica password set");
-               }
-               push @$replicas, $make_cxn->(dsn => $replica_dsn, dbh => $dbh, parent => $parent);
-               return;
-            },
-            wait_no_die => $args{'wait_no_die'},
-         }
-      );
-   } elsif ( $methods->[0] =~ m/^dsn=/i ) {
-      (my $dsn_table_dsn = join ",", @$methods) =~ s/^dsn=//i;
-      $replicas = $self->get_cxn_from_dsn_table(
-         %args,
-         dsn_table_dsn => $dsn_table_dsn,
-         wait_no_die => $args{'wait_no_die'},
-      );
-   }
-   elsif ( $methods->[0] =~ m/none/i ) {
-      PTDEBUG && _d('Not getting to replicas');
-   }
-   else {
-      die "Unexpected recursion methods: @$methods";
-   }
-
-   return $replicas;
-}
-
-sub _resolve_recursion_methods {
-   my ($self, $dsn) = @_;
-   my $o = $self->{OptionParser};
-   if ( $o->got('recursion-method') ) {
-      return $o->get('recursion-method');
-   }
-   elsif ( $dsn && ($dsn->{P} || 3306) != 3306 ) {
-      PTDEBUG && _d('Port number is non-standard; using only hosts method');
-      return [qw(hosts)];
-   }
-   else {
-      return $o->get('recursion-method');
-   }
-}
-
-sub recurse_to_replicas {
-   my ( $self, $args, $level ) = @_;
-   $level ||= 0;
-   my $dp = $self->{DSNParser};
-   my $recurse = $args->{recurse} || $self->{OptionParser}->get('recurse');
-   my $dsn = $args->{dsn};
-   my $replica_user = $args->{replica_user} || '';
-   my $replica_password = $args->{replica_password} || '';
-
-   my $methods = $self->_resolve_recursion_methods($dsn);
-   PTDEBUG && _d('Recursion methods:', @$methods);
-   if ( lc($methods->[0]) eq 'none' ) {
-      PTDEBUG && _d('Not recursing to replicas');
-      return;
-   }
-
-   my $replica_dsn = $dsn;
-   if ($replica_user) {
-      $replica_dsn->{u} = $replica_user;
-      PTDEBUG && _d("Using replica user $replica_user on "
-         . $replica_dsn->{h} . ":" . ( $replica_dsn->{P} ? $replica_dsn->{P} : ""));
-   }
-   if ($replica_password) {
-      $replica_dsn->{p} = $replica_password;
-      PTDEBUG && _d("Replica password set");
-   }
-
-   my $dbh = $args->{dbh};
-
-   my $get_dbh = sub {
-         eval {
-            $dbh = $dp->get_dbh(
-               $dp->get_cxn_params($replica_dsn), { AutoCommit => 1 }
-            );
-            PTDEBUG && _d('Connected to', $dp->as_string($replica_dsn));
-         };
-         if ( $EVAL_ERROR ) {
-            print STDERR "Cannot connect to ", $dp->as_string($replica_dsn), ": ", $EVAL_ERROR, "\n"
-               or die "Cannot print: $OS_ERROR";
-            return;
-         }
-   };
-
-   DBH: {
-      if ( !defined $dbh ) {
-         foreach my $known_replica ( @{$args->{replicas}} ) {
-            if ($known_replica->{dsn}->{h} eq $replica_dsn->{h} and
-                $known_replica->{dsn}->{P} eq $replica_dsn->{P} ) {
-               $dbh = $known_replica->{dbh};
-               last DBH;
-            }
-         }
-         $get_dbh->();
-      }
-   }
-
-   my $sql  = 'SELECT @@SERVER_ID';
-   PTDEBUG && _d($sql);
-   my $id = undef;
-   do {
-      eval {
-         ($id) = $dbh->selectrow_array($sql);
-      };
-	   if ( $EVAL_ERROR ) {
-		   if ( $args->{wait_no_die} ) {
-			   print STDERR "Error getting server id: ", $EVAL_ERROR,
-               "\nRetrying query for server ", $replica_dsn->{h}, ":", $replica_dsn->{P}, "\n";
-            sleep 1;
-            $dbh->disconnect();
-            $get_dbh->();
-         } else {
-            die $EVAL_ERROR;
-         }
-      }
-   } until (defined $id);
-   PTDEBUG && _d('Working on server ID', $id);
-   my $source_thinks_i_am = $dsn->{server_id};
-   if ( !defined $id
-       || ( defined $source_thinks_i_am && $source_thinks_i_am != $id )
-       || $args->{server_ids_seen}->{$id}++
-   ) {
-      PTDEBUG && _d('Server ID seen, or not what source said');
-      if ( $args->{skip_callback} ) {
-         $args->{skip_callback}->($dsn, $dbh, $level, $args->{parent});
-      }
-      return;
-   }
-
-   $args->{callback}->($dsn, $dbh, $level, $args->{parent});
-
-   if ( !defined $recurse || $level < $recurse ) {
-
-      my @replicas =
-         grep { !$_->{source_id} || $_->{source_id} == $id } # Only my replicas.
-         $self->find_replica_hosts($dp, $dbh, $dsn, $methods);
-
-      foreach my $replica ( @replicas ) {
-         PTDEBUG && _d('Recursing from',
-            $dp->as_string($dsn), 'to', $dp->as_string($replica));
-         $self->recurse_to_replicas(
-            { %$args, dsn => $replica, dbh => undef, parent => $dsn, replica_user => $replica_user, $replica_password => $replica_password }, $level + 1 );
-      }
-   }
-}
-
-sub find_replica_hosts {
-   my ( $self, $dsn_parser, $dbh, $dsn, $methods ) = @_;
-
-   PTDEBUG && _d('Looking for replicas on', $dsn_parser->as_string($dsn),
-      'using methods', @$methods);
-
-   my @replicas;
-   METHOD:
-   foreach my $method ( @$methods ) {
-      my $find_replicas = "_find_replicas_by_$method";
-      PTDEBUG && _d('Finding replicas with', $find_replicas);
-      @replicas = $self->$find_replicas($dsn_parser, $dbh, $dsn);
-      last METHOD if @replicas;
-   }
-
-   PTDEBUG && _d('Found', scalar(@replicas), 'replicas');
-   return @replicas;
-}
-
-sub _find_replicas_by_processlist {
-   my ( $self, $dsn_parser, $dbh, $dsn ) = @_;
-   my @connected_replicas = $self->get_connected_replicas($dbh);
-   my @replicas = $self->_process_replicas_list($dsn_parser, $dsn, \@connected_replicas);
-   return @replicas;
-}
-
-sub _process_replicas_list {
-   my ($self, $dsn_parser, $dsn, $connected_replicas) = @_;
-   my @replicas = map  {
-      my $replica        = $dsn_parser->parse("h=$_", $dsn);
-      $replica->{source} = 'processlist';
-      $replica;
-   }
-   grep { $_ }
-   map  {
-      my ( $host ) = $_->{host} =~ m/^(.*):\d+$/;
-      if ( $host eq 'localhost' ) {
-         $host = '127.0.0.1'; # Replication never uses sockets.
-      }
-      if ($host =~ m/::/) {
-          $host = '['.$host.']';
-      }
-      $host;
-   } @$connected_replicas;
-
-   return @replicas;
-}
-
-sub _find_replicas_by_hosts {
-   my ( $self, $dsn_parser, $dbh, $dsn ) = @_;
-
-   my @replicas;
-
-   my $vp = VersionParser->new($dbh);
-   my $sql = 'SHOW REPLICAS';
-   my $source_name = 'source';
-   if ( $vp < '8.1' || $vp->flavor() =~ m/maria/ ) {
-      $sql = 'SHOW SLAVE HOSTS';
-      $source_name='master';
-   }
-   
-   PTDEBUG && _d($dbh, $sql);
-   @replicas = @{$dbh->selectall_arrayref($sql, { Slice => {} })};
-
-   if ( @replicas ) {
-      PTDEBUG && _d('Found some SHOW REPLICAS info');
-      @replicas = map {
-         my %hash;
-         @hash{ map { lc $_ } keys %$_ } = values %$_;
-         my $spec = "h=$hash{host},P=$hash{port}"
-            . ( $hash{user} ? ",u=$hash{user}" : '')
-            . ( $hash{password} ? ",p=$hash{password}" : '');
-         my $dsn           = $dsn_parser->parse($spec, $dsn);
-         $dsn->{server_id} = $hash{server_id};
-         $dsn->{source_id} = $hash{"${source_name}_id"};
-         $dsn->{source}    = 'hosts';
-         $dsn;
-      } @replicas;
-   }
-
-   return @replicas;
-}
-
-sub get_connected_replicas {
-   my ( $self, $dbh ) = @_;
-
-   my $show = "SHOW GRANTS FOR ";
-   my $user = 'CURRENT_USER()';
-   my $sql = $show . $user;
-   PTDEBUG && _d($dbh, $sql);
-
-   my $proc;
-   eval {
-      $proc = grep {
-         m/ALL PRIVILEGES.*?\*\.\*|PROCESS/
-      } @{$dbh->selectcol_arrayref($sql)};
-   };
-   if ( $EVAL_ERROR ) {
-
-      if ( $EVAL_ERROR =~ m/no such grant defined for user/ ) {
-         PTDEBUG && _d('Retrying SHOW GRANTS without host; error:',
-            $EVAL_ERROR);
-         ($user) = split('@', $user);
-         $sql    = $show . $user;
-         PTDEBUG && _d($sql);
-         eval {
-            $proc = grep {
-               m/ALL PRIVILEGES.*?\*\.\*|PROCESS/
-            } @{$dbh->selectcol_arrayref($sql)};
-         };
-      }
-
-      die "Failed to $sql: $EVAL_ERROR" if $EVAL_ERROR;
-   }
-   if ( !$proc ) {
-      die "You do not have the PROCESS privilege";
-   }
-
-   $sql = 'SHOW FULL PROCESSLIST';
-   PTDEBUG && _d($dbh, $sql);
-   grep { $_->{command} =~ m/Binlog Dump/i }
-   map  { # Lowercase the column names
-      my %hash;
-      @hash{ map { lc $_ } keys %$_ } = values %$_;
-      \%hash;
-   }
-   @{$dbh->selectall_arrayref($sql, { Slice => {} })};
-}
-
-sub is_source_of {
-   my ( $self, $source, $replica ) = @_;
-
-   my $replica_version = VersionParser->new($replica);
-   my $source_name = 'source';
-   my $source_port = 'source_port';
-   if ( $replica_version < '8.1' || $replica_version->flavor() =~ m/maria/ ) {
-      $source_name = 'master';
-      $source_port = 'master_port';
-   }
-
-   my $source_status = $self->get_source_status($source)
-      or die "The server specified as a source is not a source";
-   my $replica_status  = $self->get_replica_status($replica)
-      or die "The server specified as a replica is not a replica";
-   my @connected     = $self->get_connected_replicas($source)
-      or die "The server specified as a source has no connected replicas";
-   my (undef, $port) = $source->selectrow_array("SHOW VARIABLES LIKE 'port'");
-
-   if ( $port != $replica_status->{$source_port} ) {
-      die "The replica is connected to $replica_status->{$source_port} "
-         . "but the source's port is $port";
-   }
-
-   if ( !grep { $replica_status->{"${source_name}_user"} eq $_->{user} } @connected ) {
-      die "I don't see any replica I/O thread connected with user "
-         . $replica_status->{"${source_name}_user"};
-   }
-
-   if ( ($replica_status->{replica_io_state} || '')
-      eq 'Waiting for ${source_name} to send event' )
-   {
-      my ( $source_log_name, $source_log_num )
-         = $source_status->{file} =~ m/^(.*?)\.0*([1-9][0-9]*)$/;
-      my ( $replica_log_name, $replica_log_num )
-         = $replica_status->{source_log_file} =~ m/^(.*?)\.0*([1-9][0-9]*)$/;
-      if ( $source_log_name ne $replica_log_name
-         || abs($source_log_num - $replica_log_num) > 1 )
-      {
-         die "The replica thinks it is reading from "
-            . "$replica_status->{source_log_file},  but the "
-            . "source is writing to $source_status->{file}";
-      }
-   }
-   return 1;
-}
-
-sub get_source_dsn {
-   my ( $self, $dbh, $dsn, $dsn_parser ) = @_;
-
-   my $vp = VersionParser->new($dbh);
-   my $source_host = 'source_host';
-   my $source_port = 'source_port';
-   if ( $vp < '8.1' || $vp->flavor() =~ m/maria/ ) {
-      $source_host = 'master_host';
-      $source_port = 'master_port';
-   }
-
-   my $source = $self->get_replica_status($dbh) or return undef;
-   my $spec   = "h=$source->{${source_host}},P=$source->{${source_port}}";
-   return       $dsn_parser->parse($spec, $dsn);
-}
-
-sub get_replica_status {
-   my ( $self, $dbh ) = @_;
-
-   my $server_version = VersionParser->new($dbh);
-   my $replica_name = 'replica';
-   if ( $server_version < '8.1' || $server_version->flavor() =~ m/maria/ ) {
-      $replica_name = 'slave';
-   }
-
-   if ( !$self->{not_a_replica}->{$dbh} ) {
-      my $sth = $self->{sths}->{$dbh}->{REPLICA_STATUS}
-            ||= $dbh->prepare("SHOW ${replica_name} STATUS");
-      PTDEBUG && _d($dbh, "SHOW ${replica_name} STATUS");
-      $sth->execute();
-      my ($sss_rows) = $sth->fetchall_arrayref({}); # Show Replica Status rows
-
-      my $ss;
-      if ( $sss_rows && @$sss_rows ) {
-          if (scalar @$sss_rows > 1) {
-              if (!$self->{channel}) {
-                  die 'This server returned more than one row for SHOW REPLICA STATUS but "channel" was not specified on the command line';
-              }
-              my $replica_use_channels;
-              for my $row (@$sss_rows) {
-                  $row = { map { lc($_) => $row->{$_} } keys %$row }; # lowercase the keys
-                  if ($row->{channel_name}) {
-                      $replica_use_channels = 1;
-                  }
-                  if ($row->{channel_name} eq $self->{channel}) {
-                      $ss = $row;
-                      last;
-                  }
-              }
-              if (!$ss && $replica_use_channels) {
-                 die 'This server is using replication channels but "channel" was not specified on the command line';
-              }
-          } else {
-              if ($sss_rows->[0]->{channel_name} && $sss_rows->[0]->{channel_name} ne $self->{channel}) {
-                  die 'This server is using replication channels but "channel" was not specified on the command line';
-              } else {
-                  $ss = $sss_rows->[0];
-              }
-          }
-
-          if ( $ss && %$ss ) {
-             $ss = { map { lc($_) => $ss->{$_} } keys %$ss }; # lowercase the keys
-             return $ss;
-          }
-          if (!$ss && $self->{channel}) {
-              die "Specified channel name is invalid";
-          }
-      }
-
-      PTDEBUG && _d('This server returns nothing for SHOW REPLICA STATUS');
-      $self->{not_a_replica}->{$dbh}++;
-  }
-}
-
-sub get_source_status {
-   my ( $self, $dbh ) = @_;
-
-   if ( $self->{not_a_source}->{$dbh} ) {
-      PTDEBUG && _d('Server on dbh', $dbh, 'is not a source');
-      return;
-   }
-
-   my $vp = VersionParser->new($dbh);
-   my $source_name = 'binary log';
-   if ( $vp < '8.1' || $vp->flavor() =~ m/maria/ ) {
-      $source_name = 'master';
-   }
-
-   my $sth;
-   if ( $self->{sths}->{$dbh} && $dbh && $self->{sths}->{$dbh} == $dbh ) {
-      $sth = $self->{sths}->{$dbh}->{SOURCE_STATUS}
-         ||= $dbh->prepare("SHOW ${source_name} STATUS");
-   }
-   else {
-      $sth = $dbh->prepare("SHOW ${source_name} STATUS");
-   }
-   PTDEBUG && _d($dbh, "SHOW ${source_name} STATUS");
-   $sth->execute();
-   my ($ms) = @{$sth->fetchall_arrayref({})};
-   PTDEBUG && _d(
-      $ms ? map { "$_=" . (defined $ms->{$_} ? $ms->{$_} : '') } keys %$ms
-          : '');
-
-   if ( !$ms || scalar keys %$ms < 2 ) {
-      PTDEBUG && _d('Server on dbh', $dbh, 'does not seem to be a source');
-      $self->{not_a_source}->{$dbh}++;
-   }
-
-  return { map { lc($_) => $ms->{$_} } keys %$ms }; # lowercase the keys
-}
-
-sub wait_for_source {
-   my ( $self, %args ) = @_;
-   my @required_args = qw(source_status replica_dbh);
-   foreach my $arg ( @required_args ) {
-      die "I need a $arg argument" unless $args{$arg};
-   }
-   my ($source_status, $replica_dbh) = @args{@required_args};
-   my $timeout       = $args{timeout} || 60;
-
-   my $result;
-   my $waited;
-   if ( $source_status ) {
-      my $replica_status;
-      eval {
-          $replica_status = $self->get_replica_status($replica_dbh);
-      };
-      if ($EVAL_ERROR) {
-          return {
-              result => undef,
-              waited => 0,
-              error  =>'Wait for source: this is a multi-source replica but "channel" was not specified on the command line',
-          };
-      }
-      my $vp = VersionParser->new($replica_dbh);
-      my $source_name = 'source';
-      if ( $vp < '8.1' || $vp->flavor() =~ m/maria/ ) {
-         $source_name = 'master';
-      }
-      my $channel_sql = $vp > '5.6' && $self->{channel} ? ", '$self->{channel}'" : '';
-      my $sql = "SELECT ${source_name}_POS_WAIT('$source_status->{file}', $source_status->{position}, $timeout $channel_sql)";
-      PTDEBUG && _d($replica_dbh, $sql);
-      my $start = time;
-      ($result) = $replica_dbh->selectrow_array($sql);
-
-      $waited = time - $start;
-
-      PTDEBUG && _d('Result of waiting:', $result);
-      PTDEBUG && _d("Waited", $waited, "seconds");
-   }
-   else {
-      PTDEBUG && _d('Not waiting: this server is not a source');
-   }
-
-   return {
-      result => $result,
-      waited => $waited,
-   };
-}
-
-sub stop_replica {
-   my ( $self, $dbh ) = @_;
-   my $vp = VersionParser->new($dbh);
-   my $replica_name = 'replica';
-   if ( $vp < '8.1' || $vp->flavor() =~ m/maria/ ) {
-      $replica_name = 'slave';
-   }
-   my $sth = $self->{sths}->{$dbh}->{STOP_REPLICA}
-         ||= $dbh->prepare("STOP ${replica_name}");
-   PTDEBUG && _d($dbh, $sth->{Statement});
-   $sth->execute();
-}
-
-sub start_replica {
-   my ( $self, $dbh, $pos ) = @_;
-
-   my $vp = VersionParser->new($dbh);
-   my $source_name = 'source';
-   my $replica_name = 'replica';
-   if ( $vp < '8.1' || $vp->flavor() =~ m/maria/ ) {
-      $source_name = 'master';
-      $replica_name = 'slave';
-   }
-
-   if ( $pos ) {
-      my $sql = "START ${replica_name} UNTIL ${source_name}_LOG_FILE='$pos->{file}', "
-              . "${source_name}_LOG_POS=$pos->{position}";
-      PTDEBUG && _d($dbh, $sql);
-      $dbh->do($sql);
-   }
-   else {
-      my $sth = $self->{sths}->{$dbh}->{START_REPLICA}
-            ||= $dbh->prepare("START ${replica_name}");
-      PTDEBUG && _d($dbh, $sth->{Statement});
-      $sth->execute();
-   }
-}
-
-sub catchup_to_source {
-   my ( $self, $replica, $source, $timeout ) = @_;
-   $self->stop_replica($source);
-   $self->stop_replica($replica);
-   my $replica_status  = $self->get_replica_status($replica);
-   my $replica_pos     = $self->repl_posn($replica_status);
-   my $source_status = $self->get_source_status($source);
-   my $source_pos    = $self->repl_posn($source_status);
-   PTDEBUG && _d('Source position:', $self->pos_to_string($source_pos),
-      'Replica position:', $self->pos_to_string($replica_pos));
-
-   my $result;
-   if ( $self->pos_cmp($replica_pos, $source_pos) < 0 ) {
-      PTDEBUG && _d('Waiting for replica to catch up to source');
-      $self->start_replica($replica, $source_pos);
-
-      $result = $self->wait_for_source(
-            source_status => $source_status,
-            replica_dbh   => $replica,
-            timeout       => $timeout,
-            source_status => $source_status
-      );
-      if ($result->{error}) {
-          die $result->{error};
-      }
-      if ( !defined $result->{result} ) {
-         $replica_status = $self->get_replica_status($replica);
-            
-         my $vp = VersionParser->new($replica);
-         my $replica_name = 'replica';
-         if ( $vp < '8.1' || $vp->flavor() =~ m/maria/ ) {
-            $replica_name = 'slave';
-         }
-
-         if ( !$self->replica_is_running($replica_status, $replica_name) ) {
-            PTDEBUG && _d('Source position:',
-               $self->pos_to_string($source_pos),
-               'Replica position:', $self->pos_to_string($replica_pos));
-            $replica_pos = $self->repl_posn($replica_status);
-            if ( $self->pos_cmp($replica_pos, $source_pos) != 0 ) {
-               die "SOURCE_POS_WAIT() returned NULL but replica has not "
-                  . "caught up to source";
-            }
-            PTDEBUG && _d('Replica is caught up to source and stopped');
-         }
-         else {
-            die "Replica has not caught up to source and it is still running";
-         }
-      }
-   }
-   else {
-      PTDEBUG && _d("Replica is already caught up to source");
-   }
-
-   return $result;
-}
-
-sub catchup_to_same_pos {
-   my ( $self, $s1_dbh, $s2_dbh ) = @_;
-   $self->stop_replica($s1_dbh);
-   $self->stop_replica($s2_dbh);
-   my $s1_status = $self->get_replica_status($s1_dbh);
-   my $s2_status = $self->get_replica_status($s2_dbh);
-   my $s1_pos    = $self->repl_posn($s1_status);
-   my $s2_pos    = $self->repl_posn($s2_status);
-   if ( $self->pos_cmp($s1_pos, $s2_pos) < 0 ) {
-      $self->start_replica($s1_dbh, $s2_pos);
-   }
-   elsif ( $self->pos_cmp($s2_pos, $s1_pos) < 0 ) {
-      $self->start_replica($s2_dbh, $s1_pos);
-   }
-
-   $s1_status = $self->get_replica_status($s1_dbh);
-   $s2_status = $self->get_replica_status($s2_dbh);
-   $s1_pos    = $self->repl_posn($s1_status);
-   $s2_pos    = $self->repl_posn($s2_status);
-
-   my $vp1 = VersionParser->new($s1_dbh);
-   my $replica1_name = 'replica';
-   if ( $vp1 < '8.1' || $vp1->flavor() =~ m/maria/ ) {
-      $replica1_name = 'slave';
-   }
-
-   my $vp2 = VersionParser->new($s2_dbh);
-   my $replica2_name = 'replica';
-   if ( $vp2 < '8.1' || $vp2->flavor() =~ m/maria/ ) {
-      $replica2_name = 'slave';
-   }
-
-   if ( $self->replica_is_running($s1_status, $replica1_name)
-     || $self->replica_is_running($s2_status, $replica2_name)
-     || $self->pos_cmp($s1_pos, $s2_pos) != 0)
-   {
-      die "The servers aren't both stopped at the same position";
-   }
-
-}
-
-sub replica_is_running {
-   my ( $self, $replica_status, $replica_name ) = @_;
-   return ($replica_status->{"${replica_name}_sql_running"} || 'No') eq 'Yes';
-}
-
-sub has_replica_updates {
-   my ( $self, $dbh ) = @_;
-   
-   my $vp = VersionParser->new($dbh);
-   my $replica_name = 'replica';
-   if ( $vp < '8.1' || $vp->flavor() =~ m/maria/ ) {
-      $replica_name = 'slave';
-   }
-
-   my $sql = qq{SHOW VARIABLES LIKE 'log_${replica_name}_updates'};
-   PTDEBUG && _d($dbh, $sql);
-   my ($name, $value) = $dbh->selectrow_array($sql);
-   return $value && $value =~ m/^(1|ON)$/;
-}
-
-sub repl_posn {
-   my ( $self, $status ) = @_;
-   if ( exists $status->{file} && exists $status->{position} ) {
-      return {
-         file     => $status->{file},
-         position => $status->{position},
-      };
-   }
-   elsif ( exists $status->{relay_source_log_file} && exists $status->{exec_source_log_pos} ) {
-      return {
-         file     => $status->{relay_source_log_file},
-         position => $status->{exec_source_log_pos},
-      };
-   }
-   else {
-      return {
-         file     => $status->{relay_master_log_file},
-         position => $status->{exec_master_log_pos},
-      };
-   }
-}
-
-sub get_replica_lag {
-   my ( $self, $dbh ) = @_;
-   
-   my $vp = VersionParser->new($dbh);
-   my $source_name = 'source';
-   if ( $vp < '8.1' || $vp->flavor() =~ m/maria/ ) {
-      $source_name = 'master';
-   }
-
-   my $stat = $self->get_replica_status($dbh);
-   return unless $stat;  # server is not a replica
-   return $stat->{"seconds_behind_${source_name}"};
-}
-
-sub pos_cmp {
-   my ( $self, $a, $b ) = @_;
-   return $self->pos_to_string($a) cmp $self->pos_to_string($b);
-}
-
-sub short_host {
-   my ( $self, $dsn ) = @_;
-   my ($host, $port);
-   if ( $dsn->{source_host} ) {
-      $host = $dsn->{source_host};
-      $port = $dsn->{source_port};
-   }
-   else {
-      $host = $dsn->{h};
-      $port = $dsn->{P};
-   }
-   return ($host || '[default]') . ( ($port || 3306) == 3306 ? '' : ":$port" );
-}
-
-sub is_replication_thread {
-   my ( $self, $query, %args ) = @_;
-   return unless $query;
-
-   my $type = lc($args{type} || 'all');
-   die "Invalid type: $type"
-      unless $type =~ m/^binlog_dump|slave_io|slave_sql|replica_io|replica_sql|all$/i;
-
-   my $match = 0;
-   if ( $type =~ m/binlog_dump|all/i ) {
-      $match = 1
-         if ($query->{Command} || $query->{command} || '') eq "Binlog Dump";
-   }
-   if ( !$match ) {
-      if ( ($query->{User} || $query->{user} || '') eq "system user" ) {
-         PTDEBUG && _d("Replica replication thread");
-         if ( $type ne 'all' ) {
-            my $state = $query->{State} || $query->{state} || '';
-
-            if ( $state =~ m/^init|end$/ ) {
-               PTDEBUG && _d("Special state:", $state);
-               $match = 1;
-            }
-            else {
-               my ($replica_sql) = $state =~ m/
-                  ^(Waiting\sfor\sthe\snext\sevent
-                   |Reading\sevent\sfrom\sthe\srelay\slog
-                   |Has\sread\sall\srelay\slog;\swaiting
-                   |Making\stemp\sfile
-                   |Waiting\sfor\sslave\smutex\son\sexit
-                   |Waiting\sfor\sreplica\smutex\son\sexit)/xi;
-
-               $match = $type eq 'replica_sql' &&  $replica_sql ? 1
-                      : $type eq 'replica_io'  && !$replica_sql ? 1
-                      :                                       0;
-            }
-         }
-         else {
-            $match = 1;
-         }
-      }
-      else {
-         PTDEBUG && _d('Not system user');
-      }
-
-      if ( !defined $args{check_known_ids} || $args{check_known_ids} ) {
-         my $id = $query->{Id} || $query->{id};
-         if ( $match ) {
-            $self->{replication_thread}->{$id} = 1;
-         }
-         else {
-            if ( $self->{replication_thread}->{$id} ) {
-               PTDEBUG && _d("Thread ID is a known replication thread ID");
-               $match = 1;
-            }
-         }
-      }
-   }
-
-   PTDEBUG && _d('Matches', $type, 'replication thread:',
-      ($match ? 'yes' : 'no'), '; match:', $match);
-
-   return $match;
-}
-
-
-sub get_replication_filters {
-   my ( $self, %args ) = @_;
-   my @required_args = qw(dbh);
-   foreach my $arg ( @required_args ) {
-      die "I need a $arg argument" unless $args{$arg};
-   }
-   my ($dbh) = @args{@required_args};
-
-   my $vp = VersionParser->new($dbh);
-   my $replica_name = 'replica';
-   if ( $vp < '8.1' || $vp->flavor() =~ m/maria/ ) {
-      $replica_name = 'slave';
-   }
-
-   my %filters = ();
-
-   my $status = $self->get_source_status($dbh);
-   if ( $status ) {
-      map { $filters{$_} = $status->{$_} }
-      grep { defined $status->{$_} && $status->{$_} ne '' }
-      qw(
-         binlog_do_db
-         binlog_ignore_db
-      );
-   }
-
-   $status = $self->get_replica_status($dbh);
-   if ( $status ) {
-      map { $filters{$_} = $status->{$_} }
-      grep { defined $status->{$_} && $status->{$_} ne '' }
-      qw(
-         replicate_do_db
-         replicate_ignore_db
-         replicate_do_table
-         replicate_ignore_table
-         replicate_wild_do_table
-         replicate_wild_ignore_table
-      );
-
-      my $sql = "SHOW VARIABLES LIKE '${replica_name}_skip_errors'";
-      PTDEBUG && _d($dbh, $sql);
-      my $row = $dbh->selectrow_arrayref($sql);
-      $filters{replica_skip_errors} = $row->[1] if $row->[1] && $row->[1] ne 'OFF';
-   }
-
-   return \%filters;
-}
-
-
-sub pos_to_string {
-   my ( $self, $pos ) = @_;
-   my $fmt  = '%s/%020d';
-   return sprintf($fmt, @{$pos}{qw(file position)});
-}
-
-sub reset_known_replication_threads {
-   my ( $self ) = @_;
-   $self->{replication_thread} = {};
-   return;
-}
-
-sub get_cxn_from_dsn_table {
-   my ($self, %args) = @_;
-   my @required_args = qw(dsn_table_dsn make_cxn);
-   foreach my $arg ( @required_args ) {
-      die "I need a $arg argument" unless $args{$arg};
-   }
-   my ($dsn_table_dsn, $make_cxn) = @args{@required_args};
-   PTDEBUG && _d('DSN table DSN:', $dsn_table_dsn);
-
-   my $dp = $self->{DSNParser};
-   my $q  = $self->{Quoter};
-
-   my $dsn = $dp->parse($dsn_table_dsn);
-   my $dsn_table;
-   if ( $dsn->{D} && $dsn->{t} ) {
-      $dsn_table = $q->quote($dsn->{D}, $dsn->{t});
-   }
-   elsif ( $dsn->{t} && $dsn->{t} =~ m/\./ ) {
-      $dsn_table = $q->quote($q->split_unquote($dsn->{t}));
-   }
-   else {
-      die "DSN table DSN does not specify a database (D) "
-        . "or a database-qualified table (t)";
-   }
-
-   my $done = 0;
-   my $dsn_tbl_cxn = $make_cxn->(dsn => $dsn);
-   my $dbh         = $dsn_tbl_cxn->connect();
-   my $sql         = "SELECT dsn FROM $dsn_table ORDER BY id";
-   PTDEBUG && _d($sql);
-   my @cxn;
-   use Data::Dumper;
-   DSN:
-   do {
-      @cxn = ();
-      my $dsn_strings = $dbh->selectcol_arrayref($sql);
-      if ( $dsn_strings ) {
-         foreach my $dsn_string ( @$dsn_strings ) {
-            PTDEBUG && _d('DSN from DSN table:', $dsn_string);
-            if ($args{wait_no_die}) {
-               my $lcxn;
-               eval {
-                  $lcxn = $make_cxn->(dsn_string => $dsn_string);
-               };
-               if ( $EVAL_ERROR && ($dsn_tbl_cxn->lost_connection($EVAL_ERROR)
-                     || $EVAL_ERROR =~ m/Can't connect to MySQL server/)) {
-                  PTDEBUG && _d("Server is not accessible, waiting when it is online again");
-                  sleep(1);
-                  goto DSN;
-               }
-               push @cxn, $lcxn;
-            } else {
-               push @cxn, $make_cxn->(dsn_string => $dsn_string);
-            }
-         }
-      }
-      $done = 1;
-   } until $done;
-   return \@cxn;
-}
-
-sub _d {
-   my ($package, undef, $line) = caller 0;
-   @_ = map { (my $temp = $_) =~ s/\n/\n# /g; $temp; }
-        map { defined $_ ? $_ : 'undef' }
-        @_;
-   print STDERR "# $package:$line $PID ", join(' ', @_), "\n";
-}
-
-1;
-}
-# ###########################################################################
-# End MasterSlave package
-# ###########################################################################
-
-# ###########################################################################
-# Daemon package
-# This package is a copy without comments from the original.  The original
-# with comments and its test file can be found in the GitHub repository at,
-#   lib/Daemon.pm
-#   t/lib/Daemon.t
-# See https://github.com/percona/percona-toolkit for more information.
-# ###########################################################################
-{
-package Daemon;
-
-use strict;
-use warnings FATAL => 'all';
-use English qw(-no_match_vars);
-
-use constant PTDEBUG => $ENV{PTDEBUG} || 0;
-
-use POSIX qw(setsid);
-use Fcntl qw(:DEFAULT);
-
-sub new {
-   my ($class, %args) = @_;
-   my $self = {
-      log_file       => $args{log_file},
-      pid_file       => $args{pid_file},
-      daemonize      => $args{daemonize},
-      force_log_file => $args{force_log_file},
-      parent_exit    => $args{parent_exit},
-      pid_file_owner => 0,
-      utf8           => $args{utf8} // 0,
-   };
-   return bless $self, $class;
-}
-
-sub run {
-   my ($self) = @_;
-
-   my $daemonize      = $self->{daemonize};
-   my $pid_file       = $self->{pid_file};
-   my $log_file       = $self->{log_file};
-   my $force_log_file = $self->{force_log_file};
-   my $parent_exit    = $self->{parent_exit};
-   my $utf8           = $self->{utf8};
-
-   PTDEBUG && _d('Starting daemon');
-
-   if ( $pid_file ) {
-      eval {
-         $self->_make_pid_file(
-            pid      => $PID,  # parent's pid
-            pid_file => $pid_file,
-         );
-      };
-      die "$EVAL_ERROR\n" if $EVAL_ERROR;
-      if ( !$daemonize ) {
-         $self->{pid_file_owner} = $PID;  # parent's pid
-      }
-   }
-
-   if ( $daemonize ) {
-      defined (my $child_pid = fork()) or die "Cannot fork: $OS_ERROR";
-      if ( $child_pid ) {
-         PTDEBUG && _d('Forked child', $child_pid);
-         $parent_exit->($child_pid) if $parent_exit;
-         exit 0;
-      }
-
-      POSIX::setsid() or die "Cannot start a new session: $OS_ERROR";
-      chdir '/'       or die "Cannot chdir to /: $OS_ERROR";
-
-      if ( $pid_file ) {
-         $self->_update_pid_file(
-            pid      => $PID,  # child's pid
-            pid_file => $pid_file,
-         );
-         $self->{pid_file_owner} = $PID;
-      }
-   }
-
-   if ( $daemonize || $force_log_file ) {
-      PTDEBUG && _d('Redirecting STDIN to /dev/null');
-      close STDIN;
-      open  STDIN, '/dev/null'
-         or die "Cannot reopen STDIN to /dev/null: $OS_ERROR";
-      if ( $log_file ) {
-         PTDEBUG && _d('Redirecting STDOUT and STDERR to', $log_file);
-         close STDOUT;
-         open  STDOUT, '>>', $log_file
-            or die "Cannot open log file $log_file: $OS_ERROR";
-         if ( $utf8 ) {
-            binmode(STDOUT, ':utf8')
-               or die "Can't binmode(STDOUT, ':utf8'): $OS_ERROR";
-         }
-
-
-         close STDERR;
-         open  STDERR, ">&STDOUT"
-            or die "Cannot dupe STDERR to STDOUT: $OS_ERROR";
-         if ( $utf8 ) {
-            binmode(STDERR, ':utf8')
-               or die "Can't binmode(STDERR, ':utf8'): $OS_ERROR";
-         }
-      }
-      else {
-         if ( -t STDOUT ) {
-            PTDEBUG && _d('No log file and STDOUT is a terminal;',
-               'redirecting to /dev/null');
-            close STDOUT;
-            open  STDOUT, '>', '/dev/null'
-               or die "Cannot reopen STDOUT to /dev/null: $OS_ERROR";
-         }
-         if ( -t STDERR ) {
-            PTDEBUG && _d('No log file and STDERR is a terminal;',
-               'redirecting to /dev/null');
-            close STDERR;
-            open  STDERR, '>', '/dev/null'
-               or die "Cannot reopen STDERR to /dev/null: $OS_ERROR";
-         }
-      }
-
-      $OUTPUT_AUTOFLUSH = 1;
-   }
-
-   PTDEBUG && _d('Daemon running');
-   return;
-}
-
-sub _make_pid_file {
-   my ($self, %args) = @_;
-   my @required_args = qw(pid pid_file);
-   foreach my $arg ( @required_args ) {
-      die "I need a $arg argument" unless $args{$arg};
-   };
-   my $pid      = $args{pid};
-   my $pid_file = $args{pid_file};
-
-   eval {
-      sysopen(PID_FH, $pid_file, O_RDWR|O_CREAT|O_EXCL) or die $OS_ERROR;
-      print PID_FH $PID, "\n";
-      close PID_FH;
-   };
-   if ( my $e = $EVAL_ERROR ) {
-      if ( $e =~ m/file exists/i ) {
-         my $old_pid = $self->_check_pid_file(
-            pid_file => $pid_file,
-            pid      => $PID,
-         );
-         if ( $old_pid ) {
-            warn "Overwriting PID file $pid_file because PID $old_pid "
-               . "is not running.\n";
-         }
-         $self->_update_pid_file(
-            pid      => $PID,
-            pid_file => $pid_file
-         );
-      }
-      else {
-         die "Error creating PID file $pid_file: $e\n";
-      }
-   }
-
-   return;
-}
-
-sub _check_pid_file {
-   my ($self, %args) = @_;
-   my @required_args = qw(pid_file pid);
-   foreach my $arg ( @required_args ) {
-      die "I need a $arg argument" unless $args{$arg};
-   };
-   my $pid_file = $args{pid_file};
-   my $pid      = $args{pid};
-
-   PTDEBUG && _d('Checking if PID in', $pid_file, 'is running');
-
-   if ( ! -f $pid_file ) {
-      PTDEBUG && _d('PID file', $pid_file, 'does not exist');
-      return;
-   }
-
-   open my $fh, '<', $pid_file
-      or die "Error opening $pid_file: $OS_ERROR";
-   my $existing_pid = do { local $/; <$fh> };
-   chomp($existing_pid) if $existing_pid;
-   close $fh
-      or die "Error closing $pid_file: $OS_ERROR";
-
-   if ( $existing_pid ) {
-      if ( $existing_pid == $pid ) {
-         warn "The current PID $pid already holds the PID file $pid_file\n";
-         return;
-      }
-      else {
-         PTDEBUG && _d('Checking if PID', $existing_pid, 'is running');
-         my $pid_is_alive = kill 0, $existing_pid;
-         if ( $pid_is_alive ) {
-            die "PID file $pid_file exists and PID $existing_pid is running\n";
-         }
-      }
-   }
-   else {
-      die "PID file $pid_file exists but it is empty.  Remove the file "
-         . "if the process is no longer running.\n";
-   }
-
-   return $existing_pid;
-}
-
-sub _update_pid_file {
-   my ($self, %args) = @_;
-   my @required_args = qw(pid pid_file);
-   foreach my $arg ( @required_args ) {
-      die "I need a $arg argument" unless $args{$arg};
-   };
-   my $pid      = $args{pid};
-   my $pid_file = $args{pid_file};
-
-   open my $fh, '>', $pid_file
-      or die "Cannot open $pid_file: $OS_ERROR";
-   print { $fh } $pid, "\n"
-      or die "Cannot print to $pid_file: $OS_ERROR";
-   close $fh
-      or warn "Cannot close $pid_file: $OS_ERROR";
-
-   return;
-}
-
-sub remove_pid_file {
-   my ($self, $pid_file) = @_;
-   $pid_file ||= $self->{pid_file};
-   if ( $pid_file && -f $pid_file ) {
-      unlink $self->{pid_file}
-         or warn "Cannot remove PID file $pid_file: $OS_ERROR";
-      PTDEBUG && _d('Removed PID file');
-   }
-   else {
-      PTDEBUG && _d('No PID to remove');
-   }
-   return;
-}
-
-sub DESTROY {
-   my ($self) = @_;
-
-   if ( $self->{pid_file_owner} == $PID ) {
-      $self->remove_pid_file();
-   }
-
-   return;
-}
-
-sub _d {
-   my ($package, undef, $line) = caller 0;
-   @_ = map { (my $temp = $_) =~ s/\n/\n# /g; $temp; }
-        map { defined $_ ? $_ : 'undef' }
-        @_;
-   print STDERR "# $package:$line $PID ", join(' ', @_), "\n";
-}
-
-1;
-}
-# ###########################################################################
-# End Daemon package
-# ###########################################################################
-
-# ###########################################################################
-# HTTP::Micro package
-# This package is a copy without comments from the original.  The original
-# with comments and its test file can be found in the GitHub repository at,
-#   lib/HTTP/Micro.pm
-#   t/lib/HTTP/Micro.t
-# See https://github.com/percona/percona-toolkit for more information.
-# ###########################################################################
-{
-package HTTP::Micro;
-
-our $VERSION = '0.01';
-
-use strict;
-use warnings FATAL => 'all';
-use English qw(-no_match_vars);
-use Carp ();
-
-my @attributes;
-BEGIN {
-    @attributes = qw(agent timeout);
-    no strict 'refs';
-    for my $accessor ( @attributes ) {
-        *{$accessor} = sub {
-            @_ > 1 ? $_[0]->{$accessor} = $_[1] : $_[0]->{$accessor};
-        };
-    }
-}
-
-sub new {
-    my($class, %args) = @_;
-    (my $agent = $class) =~ s{::}{-}g;
-    my $self = {
-        agent        => $agent . "/" . ($class->VERSION || 0),
-        timeout      => 60,
-    };
-    for my $key ( @attributes ) {
-        $self->{$key} = $args{$key} if exists $args{$key}
-    }
-    return bless $self, $class;
-}
-
-my %DefaultPort = (
-    http => 80,
-    https => 443,
-);
-
-sub request {
-    my ($self, $method, $url, $args) = @_;
-    @_ == 3 || (@_ == 4 && ref $args eq 'HASH')
-      or Carp::croak(q/Usage: $http->request(METHOD, URL, [HASHREF])/);
-    $args ||= {}; # we keep some state in this during _request
-
-    my $response;
-    for ( 0 .. 1 ) {
-        $response = eval { $self->_request($method, $url, $args) };
-        last unless $@ && $method eq 'GET'
-            && $@ =~ m{^(?:Socket closed|Unexpected end)};
-    }
-
-    if (my $e = "$@") {
-        $response = {
-            success => q{},
-            status  => 599,
-            reason  => 'Internal Exception',
-            content => $e,
-            headers => {
-                'content-type'   => 'text/plain',
-                'content-length' => length $e,
-            }
-        };
-    }
-    return $response;
-}
-
-sub _request {
-    my ($self, $method, $url, $args) = @_;
-
-    my ($scheme, $host, $port, $path_query) = $self->_split_url($url);
-
-    my $request = {
-        method    => $method,
-        scheme    => $scheme,
-        host_port => ($port == $DefaultPort{$scheme} ? $host : "$host:$port"),
-        uri       => $path_query,
-        headers   => {},
-    };
-
-    my $handle  = HTTP::Micro::Handle->new(timeout => $self->{timeout});
-
-    $handle->connect($scheme, $host, $port);
-
-    $self->_prepare_headers_and_cb($request, $args);
-    $handle->write_request_header(@{$request}{qw/method uri headers/});
-    $handle->write_content_body($request) if $request->{content};
-
-    my $response;
-    do { $response = $handle->read_response_header }
-        until (substr($response->{status},0,1) ne '1');
-
-    if (!($method eq 'HEAD' || $response->{status} =~ /^[23]04/)) {
-        $response->{content} = '';
-        $handle->read_content_body(sub { $_[1]->{content} .= $_[0] }, $response);
-    }
-
-    $handle->close;
-    $response->{success} = substr($response->{status},0,1) eq '2';
-    return $response;
-}
-
-sub _prepare_headers_and_cb {
-    my ($self, $request, $args) = @_;
-
-    for ($args->{headers}) {
-        next unless defined;
-        while (my ($k, $v) = each %$_) {
-            $request->{headers}{lc $k} = $v;
-        }
-    }
-    $request->{headers}{'host'}         = $request->{host_port};
-    $request->{headers}{'connection'}   = "close";
-    $request->{headers}{'user-agent'} ||= $self->{agent};
-
-    if (defined $args->{content}) {
-        $request->{headers}{'content-type'} ||= "application/octet-stream";
-        utf8::downgrade($args->{content}, 1)
-            or Carp::croak(q/Wide character in request message body/);
-        $request->{headers}{'content-length'} = length $args->{content};
-        $request->{content} = $args->{content};
-    }
-    return;
-}
-
-sub _split_url {
-    my $url = pop;
-
-    my ($scheme, $authority, $path_query) = $url =~ m<\A([^:/?#]+)://([^/?#]*)([^#]*)>
-      or Carp::croak(qq/Cannot parse URL: '$url'/);
-
-    $scheme     = lc $scheme;
-    $path_query = "/$path_query" unless $path_query =~ m<\A/>;
-
-    my $host = (length($authority)) ? lc $authority : 'localhost';
-       $host =~ s/\A[^@]*@//;   # userinfo
-    my $port = do {
-       $host =~ s/:([0-9]*)\z// && length $1
-         ? $1
-         : $DefaultPort{$scheme}
-    };
-
-    return ($scheme, $host, $port, $path_query);
-}
-
-} # HTTP::Micro
-
-{
-   package HTTP::Micro::Handle;
-
-   use strict;
-   use warnings FATAL => 'all';
-   use English qw(-no_match_vars);
-
-   use Carp       qw(croak);
-   use Errno      qw(EINTR EPIPE);
-   use IO::Socket qw(SOCK_STREAM);
-
-   sub BUFSIZE () { 32768 }
-
-   my $Printable = sub {
-       local $_ = shift;
-       s/\r/\\r/g;
-       s/\n/\\n/g;
-       s/\t/\\t/g;
-       s/([^\x20-\x7E])/sprintf('\\x%.2X', ord($1))/ge;
-       $_;
-   };
-
-   sub new {
-       my ($class, %args) = @_;
-       return bless {
-           rbuf          => '',
-           timeout       => 60,
-           max_line_size => 16384,
-           %args
-       }, $class;
-   }
-
-   my $ssl_verify_args = {
-       check_cn         => "when_only",
-       wildcards_in_alt => "anywhere",
-       wildcards_in_cn  => "anywhere"
-   };
-
-   sub connect {
-       @_ == 4 || croak(q/Usage: $handle->connect(scheme, host, port)/);
-       my ($self, $scheme, $host, $port) = @_;
-
-       if ( $scheme eq 'https' ) {
-           eval "require IO::Socket::SSL"
-               unless exists $INC{'IO/Socket/SSL.pm'};
-           croak(qq/IO::Socket::SSL must be installed for https support\n/)
-               unless $INC{'IO/Socket/SSL.pm'};
-       }
-       elsif ( $scheme ne 'http' ) {
-         croak(qq/Unsupported URL scheme '$scheme'\n/);
-       }
-
-       $self->{fh} = IO::Socket::INET->new(
-           PeerHost  => $host,
-           PeerPort  => $port,
-           Proto     => 'tcp',
-           Type      => SOCK_STREAM,
-           Timeout   => $self->{timeout}
-       ) or croak(qq/Could not connect to '$host:$port': $@/);
-
-       binmode($self->{fh})
-         or croak(qq/Could not binmode() socket: '$!'/);
-
-       if ( $scheme eq 'https') {
-           IO::Socket::SSL->start_SSL(
-              $self->{fh},
-              SSL_verifycn_name => $host,
-           );
-           ref($self->{fh}) eq 'IO::Socket::SSL'
-               or die(qq/SSL connection failed for $host\n/);
-           if ( $self->{fh}->can("verify_hostname") ) {
-               $self->{fh}->verify_hostname( $host, $ssl_verify_args )
-                  or die(qq/SSL certificate not valid for $host\n/);
-           }
-           else {
-            my $fh = $self->{fh};
-            _verify_hostname_of_cert($host, _peer_certificate($fh), $ssl_verify_args)
-                  or die(qq/SSL certificate not valid for $host\n/);
-            }
-       }
-
-       $self->{host} = $host;
-       $self->{port} = $port;
-
-       return $self;
-   }
-
-   sub close {
-       @_ == 1 || croak(q/Usage: $handle->close()/);
-       my ($self) = @_;
-       CORE::close($self->{fh})
-         or croak(qq/Could not close socket: '$!'/);
-   }
-
-   sub write {
-       @_ == 2 || croak(q/Usage: $handle->write(buf)/);
-       my ($self, $buf) = @_;
-
-       my $len = length $buf;
-       my $off = 0;
-
-       local $SIG{PIPE} = 'IGNORE';
-
-       while () {
-           $self->can_write
-             or croak(q/Timed out while waiting for socket to become ready for writing/);
-           my $r = syswrite($self->{fh}, $buf, $len, $off);
-           if (defined $r) {
-               $len -= $r;
-               $off += $r;
-               last unless $len > 0;
-           }
-           elsif ($! == EPIPE) {
-               croak(qq/Socket closed by remote server: $!/);
-           }
-           elsif ($! != EINTR) {
-               croak(qq/Could not write to socket: '$!'/);
-           }
-       }
-       return $off;
-   }
-
-   sub read {
-       @_ == 2 || @_ == 3 || croak(q/Usage: $handle->read(len)/);
-       my ($self, $len) = @_;
-
-       my $buf  = '';
-       my $got = length $self->{rbuf};
-
-       if ($got) {
-           my $take = ($got < $len) ? $got : $len;
-           $buf  = substr($self->{rbuf}, 0, $take, '');
-           $len -= $take;
-       }
-
-       while ($len > 0) {
-           $self->can_read
-             or croak(q/Timed out while waiting for socket to become ready for reading/);
-           my $r = sysread($self->{fh}, $buf, $len, length $buf);
-           if (defined $r) {
-               last unless $r;
-               $len -= $r;
-           }
-           elsif ($! != EINTR) {
-               croak(qq/Could not read from socket: '$!'/);
-           }
-       }
-       if ($len) {
-           croak(q/Unexpected end of stream/);
-       }
-       return $buf;
-   }
-
-   sub readline {
-       @_ == 1 || croak(q/Usage: $handle->readline()/);
-       my ($self) = @_;
-
-       while () {
-           if ($self->{rbuf} =~ s/\A ([^\x0D\x0A]* \x0D?\x0A)//x) {
-               return $1;
-           }
-           $self->can_read
-             or croak(q/Timed out while waiting for socket to become ready for reading/);
-           my $r = sysread($self->{fh}, $self->{rbuf}, BUFSIZE, length $self->{rbuf});
-           if (defined $r) {
-               last unless $r;
-           }
-           elsif ($! != EINTR) {
-               croak(qq/Could not read from socket: '$!'/);
-           }
-       }
-       croak(q/Unexpected end of stream while looking for line/);
-   }
-
-   sub read_header_lines {
-       @_ == 1 || @_ == 2 || croak(q/Usage: $handle->read_header_lines([headers])/);
-       my ($self, $headers) = @_;
-       $headers ||= {};
-       my $lines   = 0;
-       my $val;
-
-       while () {
-            my $line = $self->readline;
-
-            if ($line =~ /\A ([^\x00-\x1F\x7F:]+) : [\x09\x20]* ([^\x0D\x0A]*)/x) {
-                my ($field_name) = lc $1;
-                $val = \($headers->{$field_name} = $2);
-            }
-            elsif ($line =~ /\A [\x09\x20]+ ([^\x0D\x0A]*)/x) {
-                $val
-                  or croak(q/Unexpected header continuation line/);
-                next unless length $1;
-                $$val .= ' ' if length $$val;
-                $$val .= $1;
-            }
-            elsif ($line =~ /\A \x0D?\x0A \z/x) {
-               last;
-            }
-            else {
-               croak(q/Malformed header line: / . $Printable->($line));
-            }
-       }
-       return $headers;
-   }
-
-   sub write_header_lines {
-       (@_ == 2 && ref $_[1] eq 'HASH') || croak(q/Usage: $handle->write_header_lines(headers)/);
-       my($self, $headers) = @_;
-
-       my $buf = '';
-       while (my ($k, $v) = each %$headers) {
-           my $field_name = lc $k;
-            $field_name =~ /\A [\x21\x23-\x27\x2A\x2B\x2D\x2E\x30-\x39\x41-\x5A\x5E-\x7A\x7C\x7E]+ \z/x
-               or croak(q/Invalid HTTP header field name: / . $Printable->($field_name));
-            $field_name =~ s/\b(\w)/\u$1/g;
-            $buf .= "$field_name: $v\x0D\x0A";
-       }
-       $buf .= "\x0D\x0A";
-       return $self->write($buf);
-   }
-
-   sub read_content_body {
-       @_ == 3 || @_ == 4 || croak(q/Usage: $handle->read_content_body(callback, response, [read_length])/);
-       my ($self, $cb, $response, $len) = @_;
-       $len ||= $response->{headers}{'content-length'};
-
-       croak("No content-length in the returned response, and this "
-           . "UA doesn't implement chunking") unless defined $len;
-
-       while ($len > 0) {
-           my $read = ($len > BUFSIZE) ? BUFSIZE : $len;
-           $cb->($self->read($read), $response);
-           $len -= $read;
-       }
-
-       return;
-   }
-
-   sub write_content_body {
-       @_ == 2 || croak(q/Usage: $handle->write_content_body(request)/);
-       my ($self, $request) = @_;
-       my ($len, $content_length) = (0, $request->{headers}{'content-length'});
-
-       $len += $self->write($request->{content});
-
-       $len == $content_length
-         or croak(qq/Content-Length mismatch (got: $len expected: $content_length)/);
-
-       return $len;
-   }
-
-   sub read_response_header {
-       @_ == 1 || croak(q/Usage: $handle->read_response_header()/);
-       my ($self) = @_;
-
-       my $line = $self->readline;
-
-       $line =~ /\A (HTTP\/(0*\d+\.0*\d+)) [\x09\x20]+ ([0-9]{3}) [\x09\x20]+ ([^\x0D\x0A]*) \x0D?\x0A/x
-         or croak(q/Malformed Status-Line: / . $Printable->($line));
-
-       my ($protocol, $version, $status, $reason) = ($1, $2, $3, $4);
-
-       return {
-           status   => $status,
-           reason   => $reason,
-           headers  => $self->read_header_lines,
-           protocol => $protocol,
-       };
-   }
-
-   sub write_request_header {
-       @_ == 4 || croak(q/Usage: $handle->write_request_header(method, request_uri, headers)/);
-       my ($self, $method, $request_uri, $headers) = @_;
-
-       return $self->write("$method $request_uri HTTP/1.1\x0D\x0A")
-            + $self->write_header_lines($headers);
-   }
-
-   sub _do_timeout {
-       my ($self, $type, $timeout) = @_;
-       $timeout = $self->{timeout}
-           unless defined $timeout && $timeout >= 0;
-
-       my $fd = fileno $self->{fh};
-       defined $fd && $fd >= 0
-         or croak(q/select(2): 'Bad file descriptor'/);
-
-       my $initial = time;
-       my $pending = $timeout;
-       my $nfound;
-
-       vec(my $fdset = '', $fd, 1) = 1;
-
-       while () {
-           $nfound = ($type eq 'read')
-               ? select($fdset, undef, undef, $pending)
-               : select(undef, $fdset, undef, $pending) ;
-           if ($nfound == -1) {
-               $! == EINTR
-                 or croak(qq/select(2): '$!'/);
-               redo if !$timeout || ($pending = $timeout - (time - $initial)) > 0;
-               $nfound = 0;
-           }
-           last;
-       }
-       $! = 0;
-       return $nfound;
-   }
-
-   sub can_read {
-       @_ == 1 || @_ == 2 || croak(q/Usage: $handle->can_read([timeout])/);
-       my $self = shift;
-       return $self->_do_timeout('read', @_)
-   }
-
-   sub can_write {
-       @_ == 1 || @_ == 2 || croak(q/Usage: $handle->can_write([timeout])/);
-       my $self = shift;
-       return $self->_do_timeout('write', @_)
-   }
-}  # HTTP::Micro::Handle
-
-my $prog = <<'EOP';
-BEGIN {
-   if ( defined &IO::Socket::SSL::CAN_IPV6 ) {
-      *CAN_IPV6 = \*IO::Socket::SSL::CAN_IPV6;
-   }
-   else {
-      constant->import( CAN_IPV6 => '' );
-   }
-   my %const = (
-      NID_CommonName => 13,
-      GEN_DNS => 2,
-      GEN_IPADD => 7,
-   );
-   while ( my ($name,$value) = each %const ) {
-      no strict 'refs';
-      *{$name} = UNIVERSAL::can( 'Net::SSLeay', $name ) || sub { $value };
-   }
-}
-{
-   use Carp qw(croak);
-   my %dispatcher = (
-      issuer =>  sub { Net::SSLeay::X509_NAME_oneline( Net::SSLeay::X509_get_issuer_name( shift )) },
-      subject => sub { Net::SSLeay::X509_NAME_oneline( Net::SSLeay::X509_get_subject_name( shift )) },
-   );
-   if ( $Net::SSLeay::VERSION >= 1.30 ) {
-      $dispatcher{commonName} = sub {
-         my $cn = Net::SSLeay::X509_NAME_get_text_by_NID(
-            Net::SSLeay::X509_get_subject_name( shift ), NID_CommonName);
-         $cn =~s{\0$}{}; # work around Bug in Net::SSLeay <1.33
-         $cn;
-      }
-   } else {
-      $dispatcher{commonName} = sub {
-         croak "you need at least Net::SSLeay version 1.30 for getting commonName"
-      }
-   }
-
-   if ( $Net::SSLeay::VERSION >= 1.33 ) {
-      $dispatcher{subjectAltNames} = sub { Net::SSLeay::X509_get_subjectAltNames( shift ) };
-   } else {
-      $dispatcher{subjectAltNames} = sub {
-         return;
-      };
-   }
-
-   $dispatcher{authority} = $dispatcher{issuer};
-   $dispatcher{owner}     = $dispatcher{subject};
-   $dispatcher{cn}        = $dispatcher{commonName};
-
-   sub _peer_certificate {
-      my ($self, $field) = @_;
-      my $ssl = $self->_get_ssl_object or return;
-
-      my $cert = ${*$self}{_SSL_certificate}
-         ||= Net::SSLeay::get_peer_certificate($ssl)
-         or return $self->error("Could not retrieve peer certificate");
-
-      if ($field) {
-         my $sub = $dispatcher{$field} or croak
-            "invalid argument for peer_certificate, valid are: ".join( " ",keys %dispatcher ).
-            "\nMaybe you need to upgrade your Net::SSLeay";
-         return $sub->($cert);
-      } else {
-         return $cert
-      }
-   }
-
-
-   my %scheme = (
-      ldap => {
-         wildcards_in_cn    => 0,
-         wildcards_in_alt => 'leftmost',
-         check_cn         => 'always',
-      },
-      http => {
-         wildcards_in_cn    => 'anywhere',
-         wildcards_in_alt => 'anywhere',
-         check_cn         => 'when_only',
-      },
-      smtp => {
-         wildcards_in_cn    => 0,
-         wildcards_in_alt => 0,
-         check_cn         => 'always'
-      },
-      none => {}, # do not check
-   );
-
-   $scheme{www}  = $scheme{http}; # alias
-   $scheme{xmpp} = $scheme{http}; # rfc 3920
-   $scheme{pop3} = $scheme{ldap}; # rfc 2595
-   $scheme{imap} = $scheme{ldap}; # rfc 2595
-   $scheme{acap} = $scheme{ldap}; # rfc 2595
-   $scheme{nntp} = $scheme{ldap}; # rfc 4642
-   $scheme{ftp}  = $scheme{http}; # rfc 4217
-
-
-   sub _verify_hostname_of_cert {
-      my $identity = shift;
-      my $cert = shift;
-      my $scheme = shift || 'none';
-      if ( ! ref($scheme) ) {
-         $scheme = $scheme{$scheme} or croak "scheme $scheme not defined";
-      }
-
-      return 1 if ! %$scheme; # 'none'
-
-      my $commonName = $dispatcher{cn}->($cert);
-      my @altNames   = $dispatcher{subjectAltNames}->($cert);
-
-      if ( my $sub = $scheme->{callback} ) {
-         return $sub->($identity,$commonName,@altNames);
-      }
-
-
-      my $ipn;
-      if ( CAN_IPV6 and $identity =~m{:} ) {
-         $ipn = IO::Socket::SSL::inet_pton(IO::Socket::SSL::AF_INET6,$identity)
-            or croak "'$identity' is not IPv6, but neither IPv4 nor hostname";
-      } elsif ( $identity =~m{^\d+\.\d+\.\d+\.\d+$} ) {
-         $ipn = IO::Socket::SSL::inet_aton( $identity ) or croak "'$identity' is not IPv4, but neither IPv6 nor hostname";
-      } else {
-         if ( $identity =~m{[^a-zA-Z0-9_.\-]} ) {
-            $identity =~m{\0} and croak("name '$identity' has \\0 byte");
-            $identity = IO::Socket::SSL::idn_to_ascii($identity) or
-               croak "Warning: Given name '$identity' could not be converted to IDNA!";
-         }
-      }
-
-      my $check_name = sub {
-         my ($name,$identity,$wtyp) = @_;
-         $wtyp ||= '';
-         my $pattern;
-         if ( $wtyp eq 'anywhere' and $name =~m{^([a-zA-Z0-9_\-]*)\*(.+)} ) {
-            $pattern = qr{^\Q$1\E[a-zA-Z0-9_\-]*\Q$2\E$}i;
-         } elsif ( $wtyp eq 'leftmost' and $name =~m{^\*(\..+)$} ) {
-            $pattern = qr{^[a-zA-Z0-9_\-]*\Q$1\E$}i;
-         } else {
-            $pattern = qr{^\Q$name\E$}i;
-         }
-         return $identity =~ $pattern;
-      };
-
-      my $alt_dnsNames = 0;
-      while (@altNames) {
-         my ($type, $name) = splice (@altNames, 0, 2);
-         if ( $ipn and $type == GEN_IPADD ) {
-            return 1 if $ipn eq $name;
-
-         } elsif ( ! $ipn and $type == GEN_DNS ) {
-            $name =~s/\s+$//; $name =~s/^\s+//;
-            $alt_dnsNames++;
-            $check_name->($name,$identity,$scheme->{wildcards_in_alt})
-               and return 1;
-         }
-      }
-
-      if ( ! $ipn and (
-         $scheme->{check_cn} eq 'always' or
-         $scheme->{check_cn} eq 'when_only' and !$alt_dnsNames)) {
-         $check_name->($commonName,$identity,$scheme->{wildcards_in_cn})
-            and return 1;
-      }
-
-      return 0; # no match
-   }
-}
-EOP
-
-eval { require IO::Socket::SSL };
-if ( $INC{"IO/Socket/SSL.pm"} ) {
-   eval $prog;
-   die $@ if $@;
-}
-
-1;
-# ###########################################################################
-# End HTTP::Micro package
-# ###########################################################################
-
-# ###########################################################################
-# VersionCheck package
-# This package is a copy without comments from the original.  The original
-# with comments and its test file can be found in the GitHub repository at,
-#   lib/VersionCheck.pm
-#   t/lib/VersionCheck.t
-# See https://github.com/percona/percona-toolkit for more information.
-# ###########################################################################
-{
-package VersionCheck;
-
-
-use strict;
-use warnings FATAL => 'all';
-use English qw(-no_match_vars);
-
-use constant PTDEBUG => $ENV{PTDEBUG} || 0;
-
-use Data::Dumper;
-local $Data::Dumper::Indent    = 1;
-local $Data::Dumper::Sortkeys  = 1;
-local $Data::Dumper::Quotekeys = 0;
-
-use Digest::MD5 qw(md5_hex);
-use Sys::Hostname qw(hostname);
-use File::Basename qw();
-use File::Spec;
-use FindBin qw();
-
-eval {
-   require Percona::Toolkit;
-   require HTTP::Micro;
-};
-
-my $home    = $ENV{HOME} || $ENV{HOMEPATH} || $ENV{USERPROFILE} || '.';
-my @vc_dirs = (
-   '/etc/percona',
-   '/etc/percona-toolkit',
-   '/tmp',
-   "$home",
-);
-
-{
-   my $file    = 'percona-version-check';
-
-   sub version_check_file {
-      foreach my $dir ( @vc_dirs ) {
-         if ( -d $dir && -w $dir ) {
-            PTDEBUG && _d('Version check file', $file, 'in', $dir);
-            return $dir . '/' . $file;
-         }
-      }
-      PTDEBUG && _d('Version check file', $file, 'in', $ENV{PWD});
-      return $file;  # in the CWD
-   }
-}
-
-sub version_check_time_limit {
-   return 60 * 60 * 24;  # one day
-}
-
-
-sub version_check {
-   my (%args) = @_;
-
-   my $instances = $args{instances} || [];
-   my $instances_to_check;
-
-   PTDEBUG && _d('FindBin::Bin:', $FindBin::Bin);
-   if ( !$args{force} ) {
-      if ( $FindBin::Bin
-           && (-d "$FindBin::Bin/../.bzr"    ||
-               -d "$FindBin::Bin/../../.bzr" ||
-               -d "$FindBin::Bin/../.git"    ||
-               -d "$FindBin::Bin/../../.git"
-              )
-         ) {
-         PTDEBUG && _d("$FindBin::Bin/../.bzr disables --version-check");
-         return;
-      }
-   }
-
-   eval {
-      foreach my $instance ( @$instances ) {
-         my ($name, $id) = get_instance_id($instance);
-         $instance->{name} = $name;
-         $instance->{id}   = $id;
-      }
-
-      push @$instances, { name => 'system', id => 0 };
-
-      $instances_to_check = get_instances_to_check(
-         instances => $instances,
-         vc_file   => $args{vc_file},  # testing
-         now       => $args{now},      # testing
-      );
-      PTDEBUG && _d(scalar @$instances_to_check, 'instances to check');
-      return unless @$instances_to_check;
-
-      my $protocol = 'https';
-      eval { require IO::Socket::SSL; };
-      if ( $EVAL_ERROR ) {
-         PTDEBUG && _d($EVAL_ERROR);
-         PTDEBUG && _d("SSL not available, won't run version_check");
-         return;
-      }
-      PTDEBUG && _d('Using', $protocol);
-      my $url = $args{url}                       # testing
-                || $ENV{PERCONA_VERSION_CHECK_URL}  # testing
-                || "$protocol://v.percona.com";
-      PTDEBUG && _d('API URL:', $url);
-
-      my $advice = pingback(
-         instances => $instances_to_check,
-         protocol  => $protocol,
-         url       => $url,
-      );
-      if ( $advice ) {
-         PTDEBUG && _d('Advice:', Dumper($advice));
-         if ( scalar @$advice > 1) {
-            print "\n# " . scalar @$advice . " software updates are "
-               . "available:\n";
-         }
-         else {
-            print "\n# A software update is available:\n";
-         }
-         print join("\n", map { "#   * $_" } @$advice), "\n\n";
-      }
-   };
-   if ( $EVAL_ERROR ) {
-      PTDEBUG && _d('Version check failed:', $EVAL_ERROR);
-   }
-
-   if ( @$instances_to_check ) {
-      eval {
-         update_check_times(
-            instances => $instances_to_check,
-            vc_file   => $args{vc_file},  # testing
-            now       => $args{now},      # testing
-         );
-      };
-      if ( $EVAL_ERROR ) {
-         PTDEBUG && _d('Error updating version check file:', $EVAL_ERROR);
-      }
-   }
-
-   if ( $ENV{PTDEBUG_VERSION_CHECK} ) {
-      warn "Exiting because the PTDEBUG_VERSION_CHECK "
-         . "environment variable is defined.\n";
-      exit 255;
-   }
-
-   return;
-}
-
-sub get_instances_to_check {
-   my (%args) = @_;
-
-   my $instances = $args{instances};
-   my $now       = $args{now}     || int(time);
-   my $vc_file   = $args{vc_file} || version_check_file();
-
-   if ( !-f $vc_file ) {
-      PTDEBUG && _d('Version check file', $vc_file, 'does not exist;',
-         'version checking all instances');
-      return $instances;
-   }
-
-   open my $fh, '<', $vc_file or die "Cannot open $vc_file: $OS_ERROR";
-   chomp(my $file_contents = do { local $/ = undef; <$fh> });
-   PTDEBUG && _d('Version check file', $vc_file, 'contents:', $file_contents);
-   close $fh;
-   my %last_check_time_for = $file_contents =~ /^([^,]+),(.+)$/mg;
-
-   my $check_time_limit = version_check_time_limit();
-   my @instances_to_check;
-   foreach my $instance ( @$instances ) {
-      my $last_check_time = $last_check_time_for{ $instance->{id} };
-      PTDEBUG && _d('Instance', $instance->{id}, 'last checked',
-         $last_check_time, 'now', $now, 'diff', $now - ($last_check_time || 0),
-         'hours until next check',
-         sprintf '%.2f',
-            ($check_time_limit - ($now - ($last_check_time || 0))) / 3600);
-      if ( !defined $last_check_time
-           || ($now - $last_check_time) >= $check_time_limit ) {
-         PTDEBUG && _d('Time to check', Dumper($instance));
-         push @instances_to_check, $instance;
-      }
-   }
-
-   return \@instances_to_check;
-}
-
-sub update_check_times {
-   my (%args) = @_;
-
-   my $instances = $args{instances};
-   my $now       = $args{now}     || int(time);
-   my $vc_file   = $args{vc_file} || version_check_file();
-   PTDEBUG && _d('Updating last check time:', $now);
-
-   my %all_instances = map {
-      $_->{id} => { name => $_->{name}, ts => $now }
-   } @$instances;
-
-   if ( -f $vc_file ) {
-      open my $fh, '<', $vc_file or die "Cannot read $vc_file: $OS_ERROR";
-      my $contents = do { local $/ = undef; <$fh> };
-      close $fh;
-
-      foreach my $line ( split("\n", ($contents || '')) ) {
-         my ($id, $ts) = split(',', $line);
-         if ( !exists $all_instances{$id} ) {
-            $all_instances{$id} = { ts => $ts };  # original ts, not updated
-         }
-      }
-   }
-
-   open my $fh, '>', $vc_file or die "Cannot write to $vc_file: $OS_ERROR";
-   foreach my $id ( sort keys %all_instances ) {
-      PTDEBUG && _d('Updated:', $id, Dumper($all_instances{$id}));
-      print { $fh } $id . ',' . $all_instances{$id}->{ts} . "\n";
-   }
-   close $fh;
-
-   return;
-}
-
-sub get_instance_id {
-   my ($instance) = @_;
-
-   my $dbh = $instance->{dbh};
-   my $dsn = $instance->{dsn};
-
-   my $sql = q{SELECT CONCAT(@@hostname, @@port)};
-   PTDEBUG && _d($sql);
-   my ($name) = eval { $dbh->selectrow_array($sql) };
-   if ( $EVAL_ERROR ) {
-      PTDEBUG && _d($EVAL_ERROR);
-      $sql = q{SELECT @@hostname};
-      PTDEBUG && _d($sql);
-      ($name) = eval { $dbh->selectrow_array($sql) };
-      if ( $EVAL_ERROR ) {
-         PTDEBUG && _d($EVAL_ERROR);
-         $name = ($dsn->{h} || 'localhost') . ($dsn->{P} || 3306);
-      }
-      else {
-         $sql = q{SHOW VARIABLES LIKE 'port'};
-         PTDEBUG && _d($sql);
-         my (undef, $port) = eval { $dbh->selectrow_array($sql) };
-         PTDEBUG && _d('port:', $port);
-         $name .= $port || '';
-      }
-   }
-   my $id = md5_hex($name);
-
-   PTDEBUG && _d('MySQL instance:', $id, $name, Dumper($dsn));
-
-   return $name, $id;
-}
-
-
-sub get_uuid {
-    my $uuid_file = '/.percona-toolkit.uuid';
-    foreach my $dir (@vc_dirs) {
-        my $filename = $dir.$uuid_file;
-        my $uuid=_read_uuid($filename);
-        return $uuid if $uuid;
-    }
-
-    my $filename = $ENV{"HOME"} . $uuid_file;
-    my $uuid = _generate_uuid();
-
-    my $fh;
-    eval {
-        open($fh, '>', $filename);
-    };
-    if (!$EVAL_ERROR) {
-        print $fh $uuid;
-        close $fh;
-    }
-
-    return $uuid;
-}
-
-sub _generate_uuid {
-    return sprintf+($}="%04x")."$}-$}-$}-$}-".$}x3,map rand 65537,0..7;
-}
-
-sub _read_uuid {
-    my $filename = shift;
-    my $fh;
-
-    eval {
-        open($fh, '<:encoding(UTF-8)', $filename);
-    };
-    return if ($EVAL_ERROR);
-
-    my $uuid;
-    eval { $uuid = <$fh>; };
-    return if ($EVAL_ERROR);
-
-    chomp $uuid;
-    return $uuid;
-}
-
-
-sub pingback {
-   my (%args) = @_;
-   my @required_args = qw(url instances);
-   foreach my $arg ( @required_args ) {
-      die "I need a $arg argument" unless $args{$arg};
-   }
-   my $url       = $args{url};
-   my $instances = $args{instances};
-
-   my $ua = $args{ua} || HTTP::Micro->new( timeout => 3 );
-
-   my $response = $ua->request('GET', $url);
-   PTDEBUG && _d('Server response:', Dumper($response));
-   die "No response from GET $url"
-      if !$response;
-   die("GET on $url returned HTTP status $response->{status}; expected 200\n",
-       ($response->{content} || '')) if $response->{status} != 200;
-   die("GET on $url did not return any programs to check")
-      if !$response->{content};
-
-   my $items = parse_server_response(
-      response => $response->{content}
-   );
-   die "Failed to parse server requested programs: $response->{content}"
-      if !scalar keys %$items;
-
-   my $versions = get_versions(
-      items     => $items,
-      instances => $instances,
-   );
-   die "Failed to get any program versions; should have at least gotten Perl"
-      if !scalar keys %$versions;
-
-   my $client_content = encode_client_response(
-      items      => $items,
-      versions   => $versions,
-      general_id => get_uuid(),
-   );
-
-   my $tool_name = $ENV{XTRABACKUP_VERSION} ? "Percona XtraBackup" : File::Basename::basename($0);
-   my $client_response = {
-      headers => { "X-Percona-Toolkit-Tool" => $tool_name },
-      content => $client_content,
-   };
-   PTDEBUG && _d('Client response:', Dumper($client_response));
-
-   $response = $ua->request('POST', $url, $client_response);
-   PTDEBUG && _d('Server suggestions:', Dumper($response));
-   die "No response from POST $url $client_response"
-      if !$response;
-   die "POST $url returned HTTP status $response->{status}; expected 200"
-      if $response->{status} != 200;
-
-   return unless $response->{content};
-
-   $items = parse_server_response(
-      response   => $response->{content},
-      split_vars => 0,
-   );
-   die "Failed to parse server suggestions: $response->{content}"
-      if !scalar keys %$items;
-   my @suggestions = map { $_->{vars} }
-                     sort { $a->{item} cmp $b->{item} }
-                     values %$items;
-
-   return \@suggestions;
-}
-
-sub encode_client_response {
-   my (%args) = @_;
-   my @required_args = qw(items versions general_id);
-   foreach my $arg ( @required_args ) {
-      die "I need a $arg argument" unless $args{$arg};
-   }
-   my ($items, $versions, $general_id) = @args{@required_args};
-
-   my @lines;
-   foreach my $item ( sort keys %$items ) {
-      next unless exists $versions->{$item};
-      if ( ref($versions->{$item}) eq 'HASH' ) {
-         my $mysql_versions = $versions->{$item};
-         for my $id ( sort keys %$mysql_versions ) {
-            push @lines, join(';', $id, $item, $mysql_versions->{$id});
-         }
-      }
-      else {
-         push @lines, join(';', $general_id, $item, $versions->{$item});
-      }
-   }
-
-   my $client_response = join("\n", @lines) . "\n";
-   return $client_response;
-}
-
-sub parse_server_response {
-   my (%args) = @_;
-   my @required_args = qw(response);
-   foreach my $arg ( @required_args ) {
-      die "I need a $arg argument" unless $args{$arg};
-   }
-   my ($response) = @args{@required_args};
-
-   my %items = map {
-      my ($item, $type, $vars) = split(";", $_);
-      if ( !defined $args{split_vars} || $args{split_vars} ) {
-         $vars = [ split(",", ($vars || '')) ];
-      }
-      $item => {
-         item => $item,
-         type => $type,
-         vars => $vars,
-      };
-   } split("\n", $response);
-
-   PTDEBUG && _d('Items:', Dumper(\%items));
-
-   return \%items;
-}
-
-my %sub_for_type = (
-   os_version          => \&get_os_version,
-   perl_version        => \&get_perl_version,
-   perl_module_version => \&get_perl_module_version,
-   mysql_variable      => \&get_mysql_variable,
-   xtrabackup          => \&get_xtrabackup_version,
-);
-
-sub valid_item {
-   my ($item) = @_;
-   return unless $item;
-   if ( !exists $sub_for_type{ $item->{type} } ) {
-      PTDEBUG && _d('Invalid type:', $item->{type});
-      return 0;
-   }
-   return 1;
-}
-
-sub get_versions {
-   my (%args) = @_;
-   my @required_args = qw(items);
-   foreach my $arg ( @required_args ) {
-      die "I need a $arg argument" unless $args{$arg};
-   }
-   my ($items) = @args{@required_args};
-
-   my %versions;
-   foreach my $item ( values %$items ) {
-      next unless valid_item($item);
-      eval {
-         my $version = $sub_for_type{ $item->{type} }->(
-            item      => $item,
-            instances => $args{instances},
-         );
-         if ( $version ) {
-            chomp $version unless ref($version);
-            $versions{$item->{item}} = $version;
-         }
-      };
-      if ( $EVAL_ERROR ) {
-         PTDEBUG && _d('Error getting version for', Dumper($item), $EVAL_ERROR);
-      }
-   }
-
-   return \%versions;
-}
-
-
-sub get_os_version {
-   if ( $OSNAME eq 'MSWin32' ) {
-      require Win32;
-      return Win32::GetOSDisplayName();
-   }
-
-  chomp(my $platform = `uname -s`);
-  PTDEBUG && _d('platform:', $platform);
-  return $OSNAME unless $platform;
-
-   chomp(my $lsb_release
-            = `which lsb_release 2>/dev/null | awk '{print \$1}'` || '');
-   PTDEBUG && _d('lsb_release:', $lsb_release);
-
-   my $release = "";
-
-   if ( $platform eq 'Linux' ) {
-      if ( -f "/etc/fedora-release" ) {
-         $release = `cat /etc/fedora-release`;
-      }
-      elsif ( -f "/etc/redhat-release" ) {
-         $release = `cat /etc/redhat-release`;
-      }
-      elsif ( -f "/etc/system-release" ) {
-         $release = `cat /etc/system-release`;
-      }
-      elsif ( $lsb_release ) {
-         $release = `$lsb_release -ds`;
-      }
-      elsif ( -f "/etc/lsb-release" ) {
-         $release = `grep DISTRIB_DESCRIPTION /etc/lsb-release`;
-         $release =~ s/^\w+="([^"]+)".+/$1/;
-      }
-      elsif ( -f "/etc/debian_version" ) {
-         chomp(my $rel = `cat /etc/debian_version`);
-         $release = "Debian $rel";
-         if ( -f "/etc/apt/sources.list" ) {
-             chomp(my $code_name = `awk '/^deb/ {print \$3}' /etc/apt/sources.list | awk -F/ '{print \$1}'| awk 'BEGIN {FS="|"} {print \$1}' | sort | uniq -c | sort -rn | head -n1 | awk '{print \$2}'`);
-             $release .= " ($code_name)" if $code_name;
-         }
-      }
-      elsif ( -f "/etc/os-release" ) { # openSUSE
-         chomp($release = `grep PRETTY_NAME /etc/os-release`);
-         $release =~ s/^PRETTY_NAME="(.+)"$/$1/;
-      }
-      elsif ( `ls /etc/*release 2>/dev/null` ) {
-         if ( `grep DISTRIB_DESCRIPTION /etc/*release 2>/dev/null` ) {
-            $release = `grep DISTRIB_DESCRIPTION /etc/*release | head -n1`;
-         }
-         else {
-            $release = `cat /etc/*release | head -n1`;
-         }
-      }
-   }
-   elsif ( $platform =~ m/(?:BSD|^Darwin)$/ ) {
-      my $rel = `uname -r`;
-      $release = "$platform $rel";
-   }
-   elsif ( $platform eq "SunOS" ) {
-      my $rel = `head -n1 /etc/release` || `uname -r`;
-      $release = "$platform $rel";
-   }
-
-   if ( !$release ) {
-      PTDEBUG && _d('Failed to get the release, using platform');
-      $release = $platform;
-   }
-   chomp($release);
-
-   $release =~ s/^"|"$//g;
-
-   PTDEBUG && _d('OS version =', $release);
-   return $release;
-}
-
-sub get_perl_version {
-   my (%args) = @_;
-   my $item = $args{item};
-   return unless $item;
-
-   my $version = sprintf '%vd', $PERL_VERSION;
-   PTDEBUG && _d('Perl version', $version);
-   return $version;
-}
-
-sub get_xtrabackup_version {
-    return $ENV{XTRABACKUP_VERSION};
-}
-
-sub get_perl_module_version {
-   my (%args) = @_;
-   my $item = $args{item};
-   return unless $item;
-
-   my $var     = '$' . $item->{item} . '::VERSION';
-   my $version = eval "use $item->{item}; $var;";
-   PTDEBUG && _d('Perl version for', $var, '=', $version);
-   return $version;
-}
-
-sub get_mysql_variable {
-   return get_from_mysql(
-      show => 'VARIABLES',
-      @_,
-   );
-}
-
-sub get_from_mysql {
-   my (%args) = @_;
-   my $show      = $args{show};
-   my $item      = $args{item};
-   my $instances = $args{instances};
-   return unless $show && $item;
-
-   if ( !$instances || !@$instances ) {
-      PTDEBUG && _d('Cannot check', $item,
-         'because there are no MySQL instances');
-      return;
-   }
-
-   if ($item->{item} eq 'MySQL' && $item->{type} eq 'mysql_variable') {
-      @{$item->{vars}} = grep { $_ eq 'version' || $_ eq 'version_comment' } @{$item->{vars}};
-   }
-
-
-   my @versions;
-   my %version_for;
-   foreach my $instance ( @$instances ) {
-      next unless $instance->{id};  # special system instance has id=0
-      my $dbh = $instance->{dbh};
-      local $dbh->{FetchHashKeyName} = 'NAME_lc';
-      my $sql = qq/SHOW $show/;
-      PTDEBUG && _d($sql);
-      my $rows = $dbh->selectall_hashref($sql, 'variable_name');
-
-      my @versions;
-      foreach my $var ( @{$item->{vars}} ) {
-         $var = lc($var);
-         my $version = $rows->{$var}->{value};
-         PTDEBUG && _d('MySQL version for', $item->{item}, '=', $version,
-            'on', $instance->{name});
-         push @versions, $version;
-      }
-      $version_for{ $instance->{id} } = join(' ', @versions);
-   }
-
-   return \%version_for;
-}
-
-sub _d {
-   my ($package, undef, $line) = caller 0;
-   @_ = map { (my $temp = $_) =~ s/\n/\n# /g; $temp; }
-        map { defined $_ ? $_ : 'undef' }
-        @_;
-   print STDERR "# $package:$line $PID ", join(' ', @_), "\n";
-}
-
-1;
-}
-# ###########################################################################
-# End VersionCheck package
-# ###########################################################################
-
-# ###########################################################################
-# This is a combination of modules and programs in one -- a runnable module.
-# http://www.perl.com/pub/a/2006/07/13/lightning-articles.html?page=last
-# Or, look it up in the Camel book on pages 642 and 643 in the 3rd edition.
-#
-# Check at the end of this package for the call to main() which actually runs
-# the program.
-# ###########################################################################
-package pt_slave_restart;
-
-use English qw(-no_match_vars);
-use IO::File;
-use List::Util qw(min max);
-use Time::HiRes qw(sleep);
-use sigtrap qw(handler finish untrapped normal-signals);
-
-use Percona::Toolkit;
-use constant PTDEBUG => $ENV{PTDEBUG} || 0;
-
-use Data::Dumper;
-
-local $Data::Dumper::Indent    = 1;
-local $Data::Dumper::Sortkeys  = 1;
-local $Data::Dumper::Quotekeys = 0;
-
-$OUTPUT_AUTOFLUSH = 1;
-
-my $o;
-my $dp;
-my $q  = new Quoter();
-my %children;
-
-sub main {
-   local @ARGV = @_;  # set global ARGV for this package
-
-   # ########################################################################
-   # Get configuration information.
-   # ########################################################################
-   $o  = new OptionParser();
-   $o->get_specs();
-   $o->get_opts();
-
-   $dp = $o->DSNParser();
-   $dp->prop('set-vars', $o->set_vars());
-
-   $o->set('verbose', 0) if $o->get('quiet');
-
-   if ( !$o->get('help') ) {
-      if ( $o->get('until-master') ) {
-         if ( $o->get('until-master') !~ m/^[.\w-]+,\d+$/ ) {
-            $o->save_error("Invalid --until-master argument, must be file,pos");
-         }
-      }
-      if ( $o->get('until-relay') ) {
-         if ( $o->get('until-relay') !~ m/^[.\w-]+,\d+$/ ) {
-            $o->save_error("Invalid --until-relay argument, must be file,pos");
-         }
-      }
-   }
-
-   eval {
-      MasterSlave::check_recursion_method($o->get('recursion-method'));
-   };
-   if ( $EVAL_ERROR ) {
-      $o->save_error("Invalid --recursion-method: $EVAL_ERROR")
-   }
-
-   $o->usage_or_errors();
-
-   # ########################################################################
-   # First things first: if --stop was given, create the sentinel file.
-   # ########################################################################
-   my $sentinel = $o->get('sentinel');
-   if ( $o->get('stop') ) {
-      PTDEBUG && _d('Creating sentinel file', $sentinel);
-      my $file = IO::File->new($sentinel, ">>")
-         or die "Cannot open $sentinel: $OS_ERROR\n";
-      print $file "Remove this file to permit pt-slave-restart to run\n"
-         or die "Cannot write to $sentinel: $OS_ERROR\n";
-      close $file
-         or die "Cannot close $sentinel: $OS_ERROR\n";
-      print STDOUT "Successfully created file $sentinel\n"
-         unless $o->get('quiet');
-      # Exit unlesss --monitor is given.
-      if ( !$o->got('monitor') ) {
-         PTDEBUG && _d('Nothing more to do, quitting');
-         return 0;
-      }
-      else {
-         # Wait for all other running instances to quit, assuming they have the
-         # same --interval as this invocation.  Then remove the file and
-         # continue.
-         PTDEBUG && _d('Waiting for other instances to quit');
-         sleep $o->get('max-sleep');
-         PTDEBUG && _d('Unlinking', $sentinel);
-         unlink $sentinel
-            or die "Cannot unlink $sentinel: $OS_ERROR";
-      }
-   }
-
-   # ########################################################################
-   # Connect to MySQL.
-   # ########################################################################
-   if ( $o->get('ask-pass') ) {
-      $o->set('password', OptionParser::prompt_noecho("Enter password: "));
-   }
-   my $dsn_defaults = $dp->parse_options($o);
-   my $dsn          = @ARGV ? $dp->parse(shift @ARGV, $dsn_defaults)
-                    :         $dsn_defaults;
-   my $dbh          = $dp->get_dbh($dp->get_cxn_params($dsn),
-                              { AutoCommit => 1, });
-
-   $dbh->{InactiveDestroy}  = 1;         # Don't disconnect on fork/daemonize
-
-   # ########################################################################
-   # Daemonize only after (potentially) asking for passwords for --ask-pass.
-   # If option daemonize is not provided while option pid is provided,
-   # we're not daemoninzing, it just handles PID stuff.
-   # ########################################################################
-   my $daemon;
-   if ( $o->get('daemonize') || $o->get('pid')) {
-      $daemon = new Daemon(
-         log_file => $o->get('log'),
-         pid_file => $o->get('pid'),
-         daemonize => $o->get('daemonize'),
-      );
-      $daemon->run();
-      PTDEBUG && $o->get('daemonize') && _d('I am a daemon now');
-   }
-
-   # ########################################################################
-   # Set source and replica names.
-   # ########################################################################
-
-   my $vp = VersionParser->new($dbh);
-   my $source_name = 'source';
-   my $replica_name = 'replica';
-   if ( $vp < '8.1' || $vp->flavor() =~ m/maria/ ) {
-      $source_name = 'master';
-      $replica_name = 'slave';
-   }
-
-   # ########################################################################
-   # Start monitoring the replica.
-   # ########################################################################
-   my $exit_status = 0;
-   my @servers_to_watch;
-
-   # Despite the name, recursing to replicas actually begins at the specified
-   # server, so the named server may also be watched, if it's a replica.
-   my $ms = new MasterSlave(
-      OptionParser => $o,
-      DSNParser    => $dp,
-      Quoter       => $q,
-   );
-   $ms->recurse_to_replicas(
-      {  dbh      => $dbh,
-         dsn      => $dsn,
-         callback => sub {
-            my ( $dsn, $dbh, $level ) = @_;
-            # Test whether we want to watch this server.
-            eval {
-               my $stat = $ms->get_replica_status($dbh);
-               if ( $stat ) {
-                  push @servers_to_watch, { dsn => $dsn, dbh => $dbh };
-               }
-               else {
-                  die "could not find ${replica_name} status on this server\n";
-               }
-            };
-            if ( $EVAL_ERROR ) {
-               chomp $EVAL_ERROR;
-               PTDEBUG && _d('Not watching', $dp->as_string($dsn),
-                  'because', $EVAL_ERROR);
-            }
-         },
-         skip_callback => sub {
-            my ( $dsn, $dbh, $level ) = @_;
-            print STDERR "Skipping ", $dp->as_string($dsn), "\n";
-         },
-      }
-   );
-
-   # ########################################################################
-   # Do the version-check
-   # ########################################################################
-   if ( $o->get('version-check') && (!$o->has('quiet') || !$o->get('quiet')) ) {
-      VersionCheck::version_check(
-         force     => $o->got('version-check'),
-         instances => [ { dbh => $dbh, dsn => $dsn }, @servers_to_watch ],
-      );
-   }
-
-   # ########################################################################
-   # Watch each server found.
-   # ########################################################################
-   my $must_fork = @servers_to_watch > 1;
-   foreach my $host ( @servers_to_watch ) {
-
-      $host->{dbh}->{InactiveDestroy}  = 1;         # Don't disconnect on fork
-
-      # Fork, but only if there might be more than one host to watch.
-      my $pid = $must_fork ? fork() : undef;
-      if ( !$must_fork || (defined($pid) && $pid == 0) ) {
-         # I either forked and I'm a child, or I didn't fork... confusing, eh?
-         watch_server($host->{dsn}, $host->{dbh}, $must_fork, $ms);
-      }
-      elsif ( $must_fork && !defined($pid) ) {
-         die("Unable to fork!");
-      }
-      # I already exited if I'm a child, so I'm the parent.  (Or maybe I never
-      # forked).
-      $children{$dp->as_string($host->{dsn})} = $pid if $must_fork;
-   }
-
-   PTDEBUG && _d('Child PIDs:', values %children);
-   # Wait for the children to exit.
-   foreach my $host ( keys %children ) {
-      PTDEBUG && _d('Waiting to reap', $host);
-      my $pid = waitpid($children{$host}, 0);
-      $exit_status ||= $CHILD_ERROR >> 8;
-   }
-
-   $dp->disconnect($dbh);
-   return $exit_status;
-}
-
-# ############################################################################
-# Subroutines.
-# ############################################################################
-
-# Actually watch a server.  If many instances are being watched, this is
-# fork()ed.
-sub watch_server {
-   my ( $dsn, $dbh, $was_forked, $ms ) = @_;
-
-   PTDEBUG && _d('Watching server', $dp->as_string($dsn),
-      'forked:', $was_forked);
-
-   my $vp = VersionParser->new($dbh);
-   my $source_name   = 'source';
-   my $source_change = 'replication source';
-   my $replica_name  = 'replica';
-   if ( $vp < '8.1' || $vp->flavor() =~ m/maria/ ) {
-      $source_name   = 'master';
-      $source_change = 'master';
-      $replica_name  = 'slave';
-   }
-
-   my $start_sql = $vp >= '4.0.5' ? "START ${replica_name}" : 'SLAVE START';
-   if ( $o->get('until-master') ) {
-      my ( $file, $pos ) = split(',', $o->get('until-master'));
-      $start_sql .= " UNTIL ${source_name}_LOG_FILE = '$file', ${source_name}_LOG_POS = $pos";
-   }
-   elsif ( $o->get('until-relay') ) {
-      my ( $file, $pos ) = split(',', $o->get('until-relay'));
-      $start_sql .= " UNTIL RELAY_LOG_FILE = '$file', RELAY_LOG_POS = $pos";
-   }
-
-   my $start = $dbh->prepare($start_sql);
-   my $stop  = $dbh->prepare("STOP ${replica_name}");
-
-   # ########################################################################
-   # Detect if GTID is enabled. Skipping an event is done differently.
-   # ########################################################################
-   # When MySQL 5.6.5 or higher is used and gtid is enabled, skipping a
-   # transaction is not possible with SQL_REPLICA_SKIP_COUNTER
-   my $skip_event;
-   my $have_gtid = 0;
-   # We also check if version is lower than 10.0.0 because MariaDB has different
-   # versioning system than MySQL
-   if ( VersionParser->new($dbh) >= '5.6.5' && VersionParser->new($dbh) <= '10.0.0' ) {
-      my $row = $dbh->selectrow_arrayref('SELECT @@GLOBAL.gtid_mode');
-      PTDEBUG && _d('@@GLOBAL.gtid_mode:', $row->[0]);
-      if ( $row && $row->[0] =~ m/^ON/ ) {
-         $have_gtid = 1;
-      }
-   }
-   PTDEBUG && _d('Have GTID:', $have_gtid);
-
-   # If GTID is enabled, replica_parallel_workers should be == 0.
-   # It's currently not possible to know what GTID event the failed trx is.
-   if ( $have_gtid ) {
-      my $threads = $dbh->selectrow_hashref(
-         "SELECT \@\@GLOBAL.${replica_name}_parallel_workers AS threads");
-      if ( $threads->{threads} > 0 ) {
-         die "Cannot skip transactions properly because GTID is enabled "
-            . "and ${replica_name}_parallel_workers > 0.  See 'GLOBAL TRANSACTION IDS' "
-            . "in the tool's documentation.\n";
-      }
-   }
-
-   # ########################################################################
-   # Lookup tables of things to do when a problem is detected.
-   # ########################################################################
-   my @error_patterns = (
-      [ qr/You have an error in your SQL/         => 'refetch_relay_log' ],
-      [ qr/Could not parse relay log event entry/ => 'refetch_relay_log' ],
-      [ qr/Incorrect key file for table/          => 'repair_table'      ],
-      # This must be the last one.  It's a catch-all rule: skip and restart.
-      [ qr/./ => ($have_gtid ? 'skip_gtid' : 'skip')                     ],
-   );
-
-   # ########################################################################
-   # These are actions to take when an error is found.
-   # ########################################################################
-   my %actions = (
-      refetch_relay_log => sub {
-         my ( $stat, $dbh ) = @_;
-         PTDEBUG && _d('Found relay log corruption');
-         # Can't do CHANGE MASTER TO with a running replica.
-         $stop->execute();
-
-         # Cannot use ? placeholders for CHANGE MASTER values:
-         # https://bugs.launchpad.net/percona-toolkit/+bug/932614
-         my $sql = "CHANGE ${source_change} TO "
-                 . "${source_name}_LOG_FILE='" 
-                 . $stat->{"relay_${source_name}_log_file"} . "', "
-                 . "${source_name}_LOG_POS=" . $stat->{"exec_${source_name}_log_pos"};
-         PTDEBUG && _d($sql);
-         $dbh->do($sql);
-      },
-      skip => sub {
-         my ( $stat, $dbh ) = @_;
-         my $set_skip = $dbh->prepare("SET GLOBAL SQL_${replica_name}_SKIP_COUNTER = "
-                          . $o->get('skip-count'));
-         $set_skip->execute();
-      },
-      skip_gtid => sub {
-         my ( $stat, $dbh ) = @_;
-
-         # Get master_uuid from SHOW REPLICA STATUS if a UUID is not specified
-         # with --source-uuid.
-         my $gtid_uuid = $o->get("source-uuid");
-         if ( !$gtid_uuid ) {
-            $gtid_uuid = $stat->{"${source_name}_uuid"};
-            die "No ${source_name}_uuid" unless $gtid_uuid;  # shouldn't happen
-         }
-
-         # We need the highest transaction in the executed_gtid_set.
-         # and then we need to increase it by 1 (the one we want to skip)
-         # Notes:
-         #  - does not work with parallel replication
-         #  - it skips the next transaction from the master_uuid
-         #    (when a replicaB is replicating from replicaA,
-         #     the master_uuid is it's own master, replicaA)
-         my ($gtid_exec_ids) = ($stat->{executed_gtid_set} || '') =~ m/$gtid_uuid([0-9-:]*)/;
-         $gtid_exec_ids =~ s/:[0-9]+-/:/g;
-         die "No executed GTIDs" unless $gtid_exec_ids;
-
-         my @gtid_exec_ranges = split(/:/, $gtid_exec_ids);
-         delete $gtid_exec_ranges[0]; # undef the first value, it's always empty
-
-         # Get the highest id by sorting the array, removing the undef value.
-         my @gtid_exec_sorted = sort { $a <=> $b }
-                                grep { defined($_) } @gtid_exec_ranges;
-         my $gtid_exec_last   = $gtid_exec_sorted[-1];
-
-         PTDEBUG && _d("\n",
-            "GTID: ${source_name}_uuid:",         $gtid_uuid, "\n",
-            "GTID: executed_gtid_set:",           $gtid_exec_ids, "\n",
-            "GTID: max for ${source_name}_uuid:", $gtid_exec_sorted[-1], "\n",
-            "GTID: last executed gtid:",          $gtid_uuid, ":", $gtid_exec_last);
-
-         # Set the sessions next gtid, write an empty transaction
-         my $skipped = 0;
-         while ( $skipped++ < $o->get('skip-count') ) {
-            my $gtid_next = $gtid_exec_last + $skipped;
-            my $sql       = "SET GTID_NEXT='$gtid_uuid:$gtid_next'";
-            PTDEBUG && _d($sql);
-            my $sth = $dbh->prepare($sql);
-            $sth->execute();
-            $dbh->begin_work();
-            $dbh->commit();
-         }
-
-         # Set the session back to the automatically generated GTID_NEXT.
-         $dbh->do("SET GTID_NEXT='AUTOMATIC'");
-      },
-      repair_table => sub {
-         my ( $stat, $dbh ) = @_;
-         PTDEBUG && _d('Found corrupt table');
-         # [ qr/Incorrect key file for table './foo/bar.MYI'
-         my ( $db, $tbl ) = $stat->{last_error} =~ m!([^/]+)/(.*?)\.MYI!;
-         if ( $db && $tbl ) {
-            my $sql = "REPAIR TABLE " . $q->quote($db, $tbl);
-            PTDEBUG && _d($sql);
-            $dbh->do($sql);
-         }
-      },
-   );
-
-   my $err_text  = $o->get('error-text');
-   my $exit_time = time() + ($o->get('run-time') || 0);
-   my $sleep     = $o->get('sleep');
-   my ($last_log, $last_pos);
-
-   my $stat = {}; # Will hold SHOW REPLICA STATUS
-   STAT:
-   while ( $stat
-           && (!$o->get('run-time') || time() < $exit_time)
-           && !-f $o->get('sentinel') ) {
-      my $increase_sleep = 1;
-      $stat = $ms->get_replica_status($dbh);
-      if ( !$stat ) {
-         print STDERR "No ${replica_name} STATUS output found on ",
-            $dp->as_string($dsn), "\n";
-         next STAT;
-      }
-
-      PTDEBUG && _d('Last/current relay log file:',
-         $last_log, $stat->{relay_log_file});
-      PTDEBUG && _d('Last/current relay log pos:',
-         $last_pos, $stat->{relay_log_pos});
-      if ( !$last_log
-           || $last_log ne $stat->{relay_log_file}   # Avoid infinite loops
-           || $last_pos != $stat->{relay_log_pos}
-      ) {
-         $stat->{"${replica_name}_sql_running"} ||= 'No';
-         $stat->{last_error}        ||= '';
-         $stat->{last_errno}        ||= 0;
-
-         if ( $o->get('until-master') && pos_ge($stat, $source_name, $source_name) ) {
-            die "Replica has advanced past " . $o->get('until-master')
-               . " on master.\n";
-         }
-         elsif ( $o->get('until-relay') && pos_ge($stat, 'relay', $source_name) ) {
-            die "Replica has advanced past " . $o->get('until-relay')
-               . " in relay logs.\n";
-         }
-
-         if ( $stat->{"${replica_name}_sql_running"} eq 'No' ) {
-            # Print the time, error, etc
-            if ( $o->get('verbose') ) {
-               my $err = '';
-               if ( $o->get('verbose') > 1 ) {
-                  ($err = $stat->{last_error} || '' ) =~ s/\s+/ /g;
-                  if ( $o->get('error-length') ) {
-                     $err = substr($err, 0, $o->get('error-length'));
-                  }
-               }
-               printf("%s %s %s %11d %d %s\n",
-                  ts(time),
-                  $dp->as_string($dsn),
-                  $stat->{relay_log_file},
-                  $stat->{relay_log_pos},
-                  $stat->{last_errno} || 0,
-                  $err
-               );
-            }
-
-            if ( $o->got('error-numbers')
-                 && !exists($o->get('error-numbers')->{$stat->{last_errno}}) ) {
-               die "Error $stat->{last_errno} is not in --error-numbers.\n";
-            }
-            elsif ( $err_text
-                    && $stat->{last_error}
-                    && $stat->{last_error} !~ m/$err_text/ ) {
-               die "Error does not match --error-text.\n";
-            }
-            elsif ( $stat->{last_error} || $o->get('always') ) {
-
-               # What kind of error is it?
-               foreach my $pat ( @error_patterns ) {
-                  if ( $stat->{last_error} =~ m/$pat->[0]/ ) {
-                     $actions{$pat->[1]}->($stat, $dbh);
-                     last;
-                  }
-               }
-
-               $start->execute();
-               $increase_sleep = 0;
-
-               # Only set this on events I tried to restart.  Otherwise there
-               # could be a race condition: I see it, I record it, but it hasn't
-               # caused an error yet; so I won't try to restart it when it does.
-               # (The point of this is to avoid trying to restart the same event
-               # twice in case another race condition happens -- I restart it,
-               # then check the server and it hasn't yet cleared the error
-               # message and restarted the SQL thread).
-               if ( $o->get('check-relay-log') ) {
-                  $last_log = $stat->{relay_log_file};
-                  $last_pos = $stat->{relay_log_pos};
-               }
-            }
-            else {
-               PTDEBUG && _d('The replica is stopped, but without error');
-               $increase_sleep = 1;
-            }
-         }
-         elsif ( $o->get('verbose') > 2 ) {
-            printf("%s delayed %s sec\n", $dp->as_string($dsn),
-               (defined $stat->{"seconds_behind_${source_name}"} ?
-               $stat->{"seconds_behind_${source_name}"} : 'NULL'));
-         }
-      }
-      else {
-         if ( $o->get('verbose') ) {
-            print "Not checking replica because relay log file or position has "
-               . "not changed "
-               . "(file " . ($last_log || '')
-               . " pos "  . ($last_pos || '') . ")\n";
-         }
-      }
-
-      # Adjust sleep time.
-      if ( $increase_sleep ) {
-         $sleep = min($o->get('max-sleep'), $sleep * 2);
-      }
-      else {
-         $sleep = max($o->get('min-sleep'), $sleep / 2);
-      }
-
-      # Errors are very likely to follow each other in quick succession.  NOTE:
-      # this policy has a side effect with respect to $sleep.  Suppose $sleep is
-      # 512 and pt-slave-restart finds an error; now $sleep is 256, but
-      # pt-slave-restart sleeps only 1 (the initial value of --sleep).  Suppose
-      # there is no error when it wakes up after 1 second, because 1 was too
-      # short.  Now it doubles $sleep, back to 512.  $sleep has the same value
-      # it did before the error was ever found.
-      my $sleep_time = $increase_sleep ? $sleep : min($sleep, $o->get('sleep'));
-      if ( $o->get('verbose') > 2 ) {
-         printf("%s sleeping %f\n", $dp->as_string($dsn), $sleep_time);
-      }
-      sleep $sleep_time;
-   }
-
-   PTDEBUG && _d('All done with server', $dp->as_string($dsn));
-   if ( $was_forked ) {
-      $dp->disconnect($dbh);
-      exit(0);
-   }
-}
-
-# Determines if the $stat's log coordinates are greater than or equal to the
-# desired coordinates. $which is 'master' or 'relay'
-sub pos_ge {
-   my ( $stat, $which, $source_name ) = @_;
-   my $fmt  = '%s/%020d';
-   my $curr = $which eq $source_name
-      ? sprintf($fmt, @{$stat}{("relay_${source_name}_log_file", "exec_${source_name}_log_pos")})
-      : sprintf($fmt, @{$stat}{qw(relay_log_file relay_log_pos)});
-   my $stop = sprintf($fmt, split(',', $o->get("until-$which")));
-   return $curr ge $stop;
-}
-
-sub ts {
-   my ( $time ) = @_;
-   my ( $sec, $min, $hour, $mday, $mon, $year )
-      = localtime($time);
-   $mon  += 1;
-   $year += 1900;
-   return sprintf("%d-%02d-%02dT%02d:%02d:%02d",
-      $year, $mon, $mday, $hour, $min, $sec);
-}
-
-# Catches signals for exiting gracefully.
-sub finish {
-   my ($signal) = @_;
-   print STDERR "Exiting on SIG$signal.\n";
-   if ( %children ) {
-      kill 9, values %children;
-      print STDERR "Signaled ", join(', ', values %children), "\n";
-   }
-   exit(1);
-}
-
-sub _d {
-   my ($package, undef, $line) = caller 0;
-   @_ = map { (my $temp = $_) =~ s/\n/\n# /g; $temp; }
-        map { defined $_ ? $_ : 'undef' }
-        @_;
-   print STDERR "# $package:$line $PID ", join(' ', @_), "\n";
-}
-
-# ############################################################################
-# Run the program.
-# ############################################################################
-if ( !caller ) { exit main(@ARGV); }
-
-1; # Because this is a module as well as a script.
-
-# ############################################################################
-# Documentation.
-# ############################################################################
-
-=pod
-
-=head1 NAME
-
-pt-slave-restart - Watch and restart MySQL replication after errors.
-
-=head1 SYNOPSIS
-
-Usage: pt-slave-restart [OPTIONS] [DSN]
-
-pt-slave-restart watches one or more MySQL replication slaves for
-errors, and tries to restart replication if it stops.
-
-=head1 RISKS
-
-Percona Toolkit is mature, proven in the real world, and well tested,
-but all database tools can pose a risk to the system and the database
-server.  Before using this tool, please:
-
-=over
-
-=item * Read the tool's documentation
-
-=item * Review the tool's known L<"BUGS">
-
-=item * Test the tool on a non-production server
-
-=item * Backup your production server and verify the backups
-
-=back
-
-=head1 DESCRIPTION
-
-pt-slave-restart watches one or more MySQL replication slaves and tries to skip
-statements that cause errors.  It polls slaves intelligently with an
-exponentially varying sleep time.  You can specify errors to skip and run the
-slaves until a certain binlog position.
-
-Although this tool can help a slave advance past errors, you should not
-rely on it to "fix" replication.  If slave errors occur frequently or
-unexpectedly, you should identify and fix the root cause.
-
-=head1 OUTPUT
-
-pt-slave-restart prints a line every time it sees the slave has an error.
-By default this line is: a timestamp, connection information, relay_log_file,
-relay_log_pos, and last_errno.
-You can add more information using the L<"--verbose"> option.
-You can suppress all output using the L<"--quiet"> option.
-
-=head1 SLEEP
-
-pt-slave-restart sleeps intelligently between polling the slave.  The current
-sleep time varies.
-
-=over
-
-=item *
-
-The initial sleep time is given by L<"--sleep">.
-
-=item *
-
-If it checks and finds an error, it halves the previous sleep time.
-
-=item *
-
-If it finds no error, it doubles the previous sleep time.
-
-=item *
-
-The sleep time is bounded below by L<"--min-sleep"> and above by
-L<"--max-sleep">.
-
-=item *
-
-Immediately after finding an error, pt-slave-restart assumes another error is
-very likely to happen next, so it sleeps the current sleep time or the initial
-sleep time, whichever is less.
-
-=back
-
-=head1 GLOBAL TRANSACTION IDS
-
-As of Percona Toolkit 2.2.8, pt-slave-restart supports Global Transaction IDs
-introduced in MySQL 5.6.5.  It's important to keep in mind that:
-
-=over
-
-=item *
-
-pt-slave-restart will not skip transactions when multiple replication threads
-are being used (slave_parallel_workers > 0).  pt-slave-restart does not know
-what the GTID event is of the failed transaction of a specific slave thread.
-
-=item *
-
-The default behavior is to skip the next transaction from the slave's master.
-Writes can originate on different servers, each with their own UUID.
-
-See L<"--master-uuid">.
-
-=back
-
-=head1 EXIT STATUS
-
-An exit status of 0 (sometimes also called a return value or return code)
-indicates success.  Any other value represents the exit status of the Perl
-process itself, or of the last forked process that exited if there were multiple
-servers to monitor.
-
-=head1 COMPATIBILITY
-
-pt-slave-restart should work on many versions of MySQL.  Lettercase of many
-output columns from SHOW SLAVE STATUS has changed over time, so it treats them
-all as lowercase.
-
-=head1 OPTIONS
-
-This tool accepts additional command-line arguments.  Refer to the
-L<"SYNOPSIS"> and usage information for details.
-
-=over
-
-=item --always
-
-Start slaves even when there is no error.  With this option enabled,
-pt-slave-restart will not let you stop the slave manually if you want to!
-
-=item --ask-pass
-
-Prompt for a password when connecting to MySQL.
-
-=item --charset
-
-short form: -A; type: string
-
-Default character set.  If the value is utf8, sets Perl's binmode on
-STDOUT to utf8, passes the mysql_enable_utf8 option to DBD::mysql, and
-runs SET NAMES UTF8 after connecting to MySQL.  Any other value sets
-binmode on STDOUT without the utf8 layer, and runs SET NAMES after
-connecting to MySQL.
-
-=item --[no]check-relay-log
-
-default: yes
-
-Check the last relay log file and position before checking for slave errors.
-
-By default pt-slave-restart will not doing anything (it will just sleep)
-if neither the relay log file nor the relay log position have changed since
-the last check.  This prevents infinite loops (i.e. restarting the same
-error in the same relay log file at the same relay log position).
-
-For certain slave errors, however, this check needs to be disabled by
-specifying C<--no-check-relay-log>.  Do not do this unless you know what
-you are doing!
-
-=item --config
-
-type: Array
-
-Read this comma-separated list of config files; if specified, this must be the
-first option on the command line.
-
-=item --daemonize
-
-Fork to the background and detach from the shell.  POSIX
-operating systems only.
-
-=item --database
-
-short form: -D; type: string
-
-Database to use.
-
-=item --defaults-file
-
-short form: -F; type: string
-
-Only read mysql options from the given file.  You must give an absolute
-pathname.
-
-=item --error-length
-
-type: int
-
-Max length of error message to print.  When L<"--verbose"> is set high enough to
-print the error, this option will truncate the error text to the specified
-length.  This can be useful to prevent wrapping on the terminal.
-
-=item --error-numbers
-
-type: hash
-
-Only restart this comma-separated list of errors.  Makes pt-slave-restart only
-try to restart if the error number is in this comma-separated list of errors.
-If it sees an error not in the list, it will exit.
-
-The error number is in the C<last_errno> column of C<SHOW SLAVE STATUS>.
-
-=item --error-text
-
-type: string
-
-Only restart errors that match this pattern.  A Perl regular expression against
-which the error text, if any, is matched.  If the error text exists and matches,
-pt-slave-restart will try to restart the slave.  If it exists but doesn't match,
-pt-slave-restart will exit.
-
-The error text is in the C<last_error> column of C<SHOW SLAVE STATUS>.
-
-=item --help
-
-Show help and exit.
-
-=item --host
-
-short form: -h; type: string
-
-Connect to host.
-
-=item --log
-
-type: string
-
-Print all output to this file when daemonized.
-
-=item --max-sleep
-
-type: float; default: 64
-
-Maximum sleep seconds.
-
-The maximum time pt-slave-restart will sleep before polling the slave again.
-This is also the time that pt-slave-restart will wait for all other running
-instances to quit if both L<"--stop"> and L<"--monitor"> are specified.
-
-See L<"SLEEP">.
-
-=item --min-sleep
-
-type: float; default: 0.015625
-
-The minimum time pt-slave-restart will sleep before polling the slave again.
-See L<"SLEEP">.
-
-=item --monitor
-
-Whether to monitor the slave (default).  Unless you specify --monitor
-explicitly, L<"--stop"> will disable it.
-
-=item --password
-
-short form: -p; type: string
-
-Password to use when connecting.
-If password contains commas they must be escaped with a backslash: "exam\,ple"
-
-=item --pid
-
-type: string
-
-Create the given PID file.  The tool won't start if the PID file already
-exists and the PID it contains is different than the current PID.  However,
-if the PID file exists and the PID it contains is no longer running, the
-tool will overwrite the PID file with the current PID.  The PID file is
-removed automatically when the tool exits.
-
-=item --port
-
-short form: -P; type: int
-
-Port number to use for connection.
-
-=item --quiet
-
-short form: -q
-
-Suppresses normal output (disables L<"--verbose">).
-
-=item --recurse
-
-type: int; default: 0
-
-Watch slaves of the specified server, up to the specified number of servers deep
-in the hierarchy.  The default depth of 0 means "just watch the slave
-specified."
-
-pt-slave-restart examines C<SHOW PROCESSLIST> and tries to determine which
-connections are from slaves, then connect to them.  See L<"--recursion-method">.
-
-Recursion works by finding all slaves when the program starts, then watching
-them.  If there is more than one slave, C<pt-slave-restart> uses C<fork()> to
-monitor them.
-
-This also works if you have configured your slaves to show up in C<SHOW SLAVE
-HOSTS>.  The minimal configuration for this is the C<report_host> parameter, but
-there are other "report" parameters as well for the port, username, and
-password.
-
-=item --recursion-method
-
-type: array; default: processlist,hosts
-
-Preferred recursion method used to find slaves.
-
-Possible methods are:
-
-  METHOD       USES
-  ===========  ==================
-  processlist  SHOW PROCESSLIST
-  hosts        SHOW SLAVE HOSTS
-  none         Do not find slaves
-
-The processlist method is preferred because SHOW SLAVE HOSTS is not reliable.
-However, the hosts method is required if the server uses a non-standard
-port (not 3306).  Usually pt-slave-restart does the right thing and finds
-the slaves, but you may give a preferred method and it will be used first.
-If it doesn't find any slaves, the other methods will be tried.
-
-=item --run-time
-
-type: time
-
-Time to run before exiting.  Causes pt-slave-restart to stop after the specified
-time has elapsed.  Optional suffix: s=seconds, m=minutes, h=hours, d=days; if no
-suffix, s is used.
-
-=item --sentinel
-
-type: string; default: /tmp/pt-slave-restart-sentinel
-
-Exit if this file exists.
-
-=item --slave-user
-
-type: string
-
-Sets the user to be used to connect to the slaves.
-This parameter allows you to have a different user with less privileges on the
-slaves but that user must exist on all slaves.
-
-=item --slave-password
-
-type: string
-
-Sets the password to be used to connect to the slaves.
-It can be used with --slave-user and the password for the user must be the same
-on all slaves.
-
-=item --set-vars
-
-type: Array
-
-Set the MySQL variables in this comma-separated list of C<variable=value> pairs.
-
-By default, the tool sets:
-
-=for comment ignore-pt-internal-value
-MAGIC_set_vars
-
-   wait_timeout=10000
-
-Variables specified on the command line override these defaults.  For
-example, specifying C<--set-vars wait_timeout=500> overrides the defaultvalue of C<10000>.
-
-The tool prints a warning and continues if a variable cannot be set.
-
-=item --skip-count
-
-type: int; default: 1
-
-Number of statements to skip when restarting the slave.
-
-=item --source-uuid
-
-type: string
-
-When using GTID, an empty transaction should be created in order to skip it.
-If writes are coming from different nodes in the replication tree above, it is
-not possible to know which event from which UUID to skip.
-
-By default, transactions from the slave's master (C<'Master_UUID'> from
-C<SHOW SLAVE STATUS>) are skipped.
-
-For example, with
-
-  master1 -> slave1 -> slave2
-
-When skipping events on slave2 that were written to master1, you must specify
-the UUID of master1, else the tool will use the UUID of slave1 by default.
-
-See L<"GLOBAL TRANSACTION IDS">.
-
-=item --sleep
-
-type: int; default: 1
-
-Initial sleep seconds between checking the slave.
-
-See L<"SLEEP">.
-
-=item --socket
-
-short form: -S; type: string
-
-Socket file to use for connection.
-
-=item --stop
-
-Stop running instances by creating the sentinel file.
-
-Causes C<pt-slave-restart> to create the sentinel file specified by
-L<"--sentinel">.  This should have the effect of stopping all running
-instances which are watching the same sentinel file.  If L<"--monitor"> isn't
-specified, C<pt-slave-restart> will exit after creating the file.  If it is
-specified, C<pt-slave-restart> will wait the interval given by
-L<"--max-sleep">, then remove the file and continue working.
-
-You might find this handy to stop cron jobs gracefully if necessary, or to
-replace one running instance with another.  For example, if you want to stop
-and restart C<pt-slave-restart> every hour (just to make sure that it is
-restarted every hour, in case of a server crash or some other problem), you
-could use a C<crontab> line like this:
-
- 0 * * * * pt-slave-restart --monitor --stop --sentinel /tmp/pt-slave-restartup
-
-The non-default L<"--sentinel"> will make sure the hourly C<cron> job stops
-only instances previously started with the same options (that is, from the
-same C<cron> job).
-
-See also L<"--sentinel">.
-
-=item --until-master
-
-type: string
-
-Run until this master log file and position.  Start the slave, and retry if it
-fails, until it reaches the given replication coordinates.  The coordinates are
-the logfile and position on the master, given by relay_master_log_file,
-exec_master_log_pos.  The argument must be in the format "file,pos".  Separate
-the filename and position with a single comma and no space.
-
-This will also cause an UNTIL clause to be given to START SLAVE.
-
-After reaching this point, the slave should be stopped and pt-slave-restart
-will exit.
-
-=item --until-relay
-
-type: string
-
-Run until this relay log file and position.  Like L<"--until-master">, but in
-the slave's relay logs instead.  The coordinates are given by relay_log_file,
-relay_log_pos.
-
-=item --user
-
-short form: -u; type: string
-
-User for login if not current user.
-
-=item --verbose
-
-short form: -v; cumulative: yes; default: 1
-
-Adds more information to the output.
-This flag can be specified multiple times. e.g. -v -v OR -vv.
-By default (no verbose flag) the tool outputs connection information, a timestamp,
-relay_log_file, relay_log_pos, and last_errno.
-One flag (-v) adds last_error.  See also L<"--error-length">.
-Two flags (-vv) prints the current sleep time each time pt-slave-restart sleeps.
-To suppress all output use the L<"--quiet"> option.
-
-=item --version
-
-Show version and exit.
-
-=item --[no]version-check
-
-default: yes
-
-Check for the latest version of Percona Toolkit, MySQL, and other programs.
-
-This is a standard "check for updates automatically" feature, with two
-additional features.  First, the tool checks its own version and also the
-versions of the following software: operating system, Percona Monitoring and
-Management (PMM), MySQL, Perl, MySQL driver for Perl (DBD::mysql), and
-Percona Toolkit. Second, it checks for and warns about versions with known
-problems. For example, MySQL 5.5.25 had a critical bug and was re-released
-as 5.5.25a.
-
-A secure connection to Percona’s Version Check database server is done to
-perform these checks. Each request is logged by the server, including software
-version numbers and unique ID of the checked system. The ID is generated by the
-Percona Toolkit installation script or when the Version Check database call is
-done for the first time.
-
-Any updates or known problems are printed to STDOUT before the tool's normal
-output.  This feature should never interfere with the normal operation of the
-tool.
-
-For more information, visit L<https://www.percona.com/doc/percona-toolkit/LATEST/version-check.html>.
-
-=back
-
-Show version and exit.
-
-=head1 DSN OPTIONS
-
-These DSN options are used to create a DSN.  Each option is given like
-C<option=value>.  The options are case-sensitive, so P and p are not the
-same option.  There cannot be whitespace before or after the C<=> and
-if the value contains whitespace it must be quoted.  DSN options are
-comma-separated.  See the L<percona-toolkit> manpage for full details.
-
-=over
-
-=item * A
-
-dsn: charset; copy: yes
-
-Default character set.
-
-=item * D
-
-dsn: database; copy: yes
-
-Default database.
-
-=item * F
-
-dsn: mysql_read_default_file; copy: yes
-
-Only read default options from the given file
-
-=item * h
-
-dsn: host; copy: yes
-
-Connect to host.
-
-=item * p
-
-dsn: password; copy: yes
-
-Password to use when connecting.
-If password contains commas they must be escaped with a backslash: "exam\,ple"
-
-=item * P
-
-dsn: port; copy: yes
-
-Port number to use for connection.
-
-=item * S
-
-dsn: mysql_socket; copy: yes
-
-Socket file to use for connection.
-
-=item * u
-
-dsn: user; copy: yes
-
-User for login if not current user.
-
-=back
-
-=head1 ENVIRONMENT
-
-The environment variable C<PTDEBUG> enables verbose debugging output to STDERR.
-To enable debugging and capture all output to a file, run the tool like:
-
-   PTDEBUG=1 pt-slave-restart ... > FILE 2>&1
-
-Be careful: debugging output is voluminous and can generate several megabytes
-of output.
-
-=head1 ATTENTION
-
-Using <PTDEBUG> might expose passwords. When debug is enabled, all command line
-parameters are shown in the output.
-
-=head1 SYSTEM REQUIREMENTS
-
-You need Perl, DBI, DBD::mysql, and some core packages that ought to be
-installed in any reasonably new version of Perl.
-
-=head1 BUGS
-
-For a list of known bugs, see L<https://jira.percona.com/projects/PT/issues>.
-
-Please report bugs at L<https://jira.percona.com/projects/PT>.
-Include the following information in your bug report:
-
-=over
-
-=item * Complete command-line used to run the tool
-
-=item * Tool L<"--version">
-
-=item * MySQL version of all servers involved
-
-=item * Output from the tool including STDERR
-
-=item * Input files (log/dump/config files, etc.)
-
-=back
-
-If possible, include debugging output by running the tool with C<PTDEBUG>;
-see L<"ENVIRONMENT">.
-
-=head1 DOWNLOADING
-
-Visit L<http://www.percona.com/software/percona-toolkit/> to download the
-latest release of Percona Toolkit.  Or, get the latest release from the
-command line:
-
-   wget percona.com/get/percona-toolkit.tar.gz
-
-   wget percona.com/get/percona-toolkit.rpm
-
-   wget percona.com/get/percona-toolkit.deb
-
-You can also get individual tools from the latest release:
-
-   wget percona.com/get/TOOL
-
-Replace C<TOOL> with the name of any tool.
-
-=head1 AUTHORS
-
-Baron Schwartz
-
-=head1 ABOUT PERCONA TOOLKIT
-
-This tool is part of Percona Toolkit, a collection of advanced command-line
-tools for MySQL developed by Percona.  Percona Toolkit was forked from two
-projects in June, 2011: Maatkit and Aspersa.  Those projects were created by
-Baron Schwartz and primarily developed by him and Daniel Nichter.  Visit
-L<http://www.percona.com/software/> to learn about other free, open-source
-software from Percona.
-
-=head1 COPYRIGHT, LICENSE, AND WARRANTY
-
-This program is copyright 2011-2024 Percona LLC and/or its affiliates,
-2007-2011 Baron Schwartz.
-
-THIS PROGRAM IS PROVIDED "AS IS" AND WITHOUT ANY EXPRESS OR IMPLIED
-WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
-
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation, version 2; OR the Perl Artistic License.  On UNIX and similar
-systems, you can issue `man perlgpl' or `man perlartistic' to read these
-licenses.
-
-You should have received a copy of the GNU General Public License along with
-this program; if not, write to the Free Software Foundation, Inc., 59 Temple
-Place, Suite 330, Boston, MA  02111-1307  USA.
-
-=head1 VERSION
-
-pt-slave-restart 3.6.0
-
-=cut
diff --git a/bin/pt-slave-restart b/bin/pt-slave-restart
new file mode 120000
index 000000000..2c40dd31f
--- /dev/null
+++ b/bin/pt-slave-restart
@@ -0,0 +1 @@
+pt-replica-restart
\ No newline at end of file
diff --git a/t/pt-replica-restart/deprecation.t b/t/pt-replica-restart/deprecation.t
new file mode 100644
index 000000000..ee88cae3d
--- /dev/null
+++ b/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;
diff --git a/t/pt-slave-restart/gtid.t b/t/pt-replica-restart/gtid.t
similarity index 90%
rename from t/pt-slave-restart/gtid.t
rename to t/pt-replica-restart/gtid.t
index fab66e03d..255ff80fb 100644
--- a/t/pt-slave-restart/gtid.t
+++ b/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.
diff --git a/t/pt-slave-restart/gtid_parallelreplication.t b/t/pt-replica-restart/gtid_parallelreplication.t
similarity index 88%
rename from t/pt-slave-restart/gtid_parallelreplication.t
rename to t/pt-replica-restart/gtid_parallelreplication.t
index 4246238d4..c0f7d0d61 100644
--- a/t/pt-slave-restart/gtid_parallelreplication.t
+++ b/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);
 
 # #############################################################################
diff --git a/t/pt-replica-restart/pt-replica-restart.t b/t/pt-replica-restart/pt-replica-restart.t
new file mode 100644
index 000000000..2db4da27c
--- /dev/null
+++ b/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;
diff --git a/t/pt-slave-restart/pt-slave-restart.t b/t/pt-replica-restart/pt-slave-restart.t
similarity index 96%
rename from t/pt-slave-restart/pt-slave-restart.t
rename to t/pt-replica-restart/pt-slave-restart.t
index 46b7a101e..3cd3a516e 100644
--- a/t/pt-slave-restart/pt-slave-restart.t
+++ b/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,
    '',

From 42486a80a53ac2f6fdb54dafe26d6fd737dc3e8c Mon Sep 17 00:00:00 2001
From: Sveta Smirnova <sveta.smirnova@percona.com>
Date: Tue, 27 Aug 2024 12:51:09 +0300
Subject: [PATCH 15/31] PT-2340 - Support MySQL 8.4

- Changed write-user-docs script, so it creates special documentation pages for symbolic links.
---
 util/write-user-docs | 25 +++++++++++++++++++++----
 1 file changed, 21 insertions(+), 4 deletions(-)

diff --git a/util/write-user-docs b/util/write-user-docs
index 5797ced7a..e55fff2b5 100755
--- a/util/write-user-docs
+++ b/util/write-user-docs
@@ -159,11 +159,28 @@ write_rst() {
       return
    fi
 
-   $BRANCH/util/pod2rst-fixed.packed $file > $RST_DIR/$tool.rst
-   if [ $? -eq 0 ]; then
-      echo "Wrote $RST_DIR/$tool.rst"
+   if [ -h $file ]; then
+      local link="$(readlink $file)"
+      echo "
+.. program:: ${tool}
+
+============================
+:program:\`${tool}\`
+============================
+
+NAME
+====
+
+:program:\`$(basename $file)\` is a symbolic link to ${link}. Please read documentation for ${link}.
+
+" > $RST_DIR/$tool.rst
    else
-      die "Error writing $RST_DIR/$tool.rst"
+      $BRANCH/util/pod2rst-fixed.packed $file > $RST_DIR/$tool.rst
+      if [ $? -eq 0 ]; then
+         echo "Wrote $RST_DIR/$tool.rst"
+      else
+         die "Error writing $RST_DIR/$tool.rst"
+      fi
    fi
 }
 

From e3e352d1d665825876a5e124cfd22e9b3ff14071 Mon Sep 17 00:00:00 2001
From: Sveta Smirnova <sveta.smirnova@percona.com>
Date: Tue, 27 Aug 2024 13:45:37 +0300
Subject: [PATCH 16/31] PT-2340 - Support MySQL 8.4

- Fixed comparison operators for VersionCheck calls
---
 bin/pt-archiver                            | 28 +++++++++---------
 bin/pt-heartbeat                           | 34 +++++++++++-----------
 bin/pt-kill                                | 28 +++++++++---------
 bin/pt-online-schema-change                | 30 +++++++++----------
 bin/pt-query-digest                        | 28 +++++++++---------
 bin/pt-replica-restart                     | 32 ++++++++++----------
 bin/pt-slave-find                          | 30 +++++++++----------
 bin/pt-table-checksum                      | 30 +++++++++----------
 bin/pt-table-sync                          | 30 +++++++++----------
 lib/MasterSlave.pm                         | 28 +++++++++---------
 t/pt-online-schema-change/pt-1717-resume.t |  2 +-
 t/pt-online-schema-change/pt-1760.t        |  6 ++--
 t/pt-online-schema-change/pt-2168-cancel.t |  2 +-
 t/pt-online-schema-change/pt-2168.t        |  2 +-
 t/pt-online-schema-change/pt-2241.t        |  2 +-
 t/pt-online-schema-change/slave_lag.t      |  2 +-
 t/pt-show-grants/all_grants.t              |  4 +--
 t/pt-show-grants/basics.t                  |  4 +--
 t/pt-table-checksum/basics.t               |  4 +--
 t/pt-table-checksum/issue_47.t             |  2 +-
 t/pt-table-checksum/pt-204.t               |  2 +-
 21 files changed, 165 insertions(+), 165 deletions(-)

diff --git a/bin/pt-archiver b/bin/pt-archiver
index 53d442a8d..78fba95a1 100755
--- a/bin/pt-archiver
+++ b/bin/pt-archiver
@@ -3923,7 +3923,7 @@ sub _find_replicas_by_hosts {
    my $vp = VersionParser->new($dbh);
    my $sql = 'SHOW REPLICAS';
    my $source_name = 'source';
-   if ( $vp < '8.1' || $vp->flavor() =~ m/maria/ ) {
+   if ( $vp lt '8.1' || $vp->flavor() =~ m/maria/ ) {
       $sql = 'SHOW SLAVE HOSTS';
       $source_name='master';
    }
@@ -4002,7 +4002,7 @@ sub is_source_of {
    my $replica_version = VersionParser->new($replica);
    my $source_name = 'source';
    my $source_port = 'source_port';
-   if ( $replica_version < '8.1' || $replica_version->flavor() =~ m/maria/ ) {
+   if ( $replica_version lt '8.1' || $replica_version->flavor() =~ m/maria/ ) {
       $source_name = 'master';
       $source_port = 'master_port';
    }
@@ -4049,7 +4049,7 @@ sub get_source_dsn {
    my $vp = VersionParser->new($dbh);
    my $source_host = 'source_host';
    my $source_port = 'source_port';
-   if ( $vp < '8.1' || $vp->flavor() =~ m/maria/ ) {
+   if ( $vp lt '8.1' || $vp->flavor() =~ m/maria/ ) {
       $source_host = 'master_host';
       $source_port = 'master_port';
    }
@@ -4064,7 +4064,7 @@ sub get_replica_status {
 
    my $server_version = VersionParser->new($dbh);
    my $replica_name = 'replica';
-   if ( $server_version < '8.1' || $server_version->flavor() =~ m/maria/ ) {
+   if ( $server_version lt '8.1' || $server_version->flavor() =~ m/maria/ ) {
       $replica_name = 'slave';
    }
 
@@ -4127,7 +4127,7 @@ sub get_source_status {
 
    my $vp = VersionParser->new($dbh);
    my $source_name = 'binary log';
-   if ( $vp < '8.1' || $vp->flavor() =~ m/maria/ ) {
+   if ( $vp lt '8.1' || $vp->flavor() =~ m/maria/ ) {
       $source_name = 'master';
    }
 
@@ -4179,7 +4179,7 @@ sub wait_for_source {
       }
       my $vp = VersionParser->new($replica_dbh);
       my $source_name = 'source';
-      if ( $vp < '8.1' || $vp->flavor() =~ m/maria/ ) {
+      if ( $vp lt '8.1' || $vp->flavor() =~ m/maria/ ) {
          $source_name = 'master';
       }
       my $channel_sql = $vp > '5.6' && $self->{channel} ? ", '$self->{channel}'" : '';
@@ -4207,7 +4207,7 @@ sub stop_replica {
    my ( $self, $dbh ) = @_;
    my $vp = VersionParser->new($dbh);
    my $replica_name = 'replica';
-   if ( $vp < '8.1' || $vp->flavor() =~ m/maria/ ) {
+   if ( $vp lt '8.1' || $vp->flavor() =~ m/maria/ ) {
       $replica_name = 'slave';
    }
    my $sth = $self->{sths}->{$dbh}->{STOP_REPLICA}
@@ -4222,7 +4222,7 @@ sub start_replica {
    my $vp = VersionParser->new($dbh);
    my $source_name = 'source';
    my $replica_name = 'replica';
-   if ( $vp < '8.1' || $vp->flavor() =~ m/maria/ ) {
+   if ( $vp lt '8.1' || $vp->flavor() =~ m/maria/ ) {
       $source_name = 'master';
       $replica_name = 'slave';
    }
@@ -4271,7 +4271,7 @@ sub catchup_to_source {
             
          my $vp = VersionParser->new($replica);
          my $replica_name = 'replica';
-         if ( $vp < '8.1' || $vp->flavor() =~ m/maria/ ) {
+         if ( $vp lt '8.1' || $vp->flavor() =~ m/maria/ ) {
             $replica_name = 'slave';
          }
 
@@ -4320,13 +4320,13 @@ sub catchup_to_same_pos {
 
    my $vp1 = VersionParser->new($s1_dbh);
    my $replica1_name = 'replica';
-   if ( $vp1 < '8.1' || $vp1->flavor() =~ m/maria/ ) {
+   if ( $vp1 lt '8.1' || $vp1->flavor() =~ m/maria/ ) {
       $replica1_name = 'slave';
    }
 
    my $vp2 = VersionParser->new($s2_dbh);
    my $replica2_name = 'replica';
-   if ( $vp2 < '8.1' || $vp2->flavor() =~ m/maria/ ) {
+   if ( $vp2 lt '8.1' || $vp2->flavor() =~ m/maria/ ) {
       $replica2_name = 'slave';
    }
 
@@ -4349,7 +4349,7 @@ sub has_replica_updates {
    
    my $vp = VersionParser->new($dbh);
    my $replica_name = 'replica';
-   if ( $vp < '8.1' || $vp->flavor() =~ m/maria/ ) {
+   if ( $vp lt '8.1' || $vp->flavor() =~ m/maria/ ) {
       $replica_name = 'slave';
    }
 
@@ -4386,7 +4386,7 @@ sub get_replica_lag {
    
    my $vp = VersionParser->new($dbh);
    my $source_name = 'source';
-   if ( $vp < '8.1' || $vp->flavor() =~ m/maria/ ) {
+   if ( $vp lt '8.1' || $vp->flavor() =~ m/maria/ ) {
       $source_name = 'master';
    }
 
@@ -4490,7 +4490,7 @@ sub get_replication_filters {
 
    my $vp = VersionParser->new($dbh);
    my $replica_name = 'replica';
-   if ( $vp < '8.1' || $vp->flavor() =~ m/maria/ ) {
+   if ( $vp lt '8.1' || $vp->flavor() =~ m/maria/ ) {
       $replica_name = 'slave';
    }
 
diff --git a/bin/pt-heartbeat b/bin/pt-heartbeat
index 42423ca43..5bc70081d 100755
--- a/bin/pt-heartbeat
+++ b/bin/pt-heartbeat
@@ -384,7 +384,7 @@ sub _find_replicas_by_hosts {
    my $vp = VersionParser->new($dbh);
    my $sql = 'SHOW REPLICAS';
    my $source_name = 'source';
-   if ( $vp < '8.1' || $vp->flavor() =~ m/maria/ ) {
+   if ( $vp lt '8.1' || $vp->flavor() =~ m/maria/ ) {
       $sql = 'SHOW SLAVE HOSTS';
       $source_name='master';
    }
@@ -463,7 +463,7 @@ sub is_source_of {
    my $replica_version = VersionParser->new($replica);
    my $source_name = 'source';
    my $source_port = 'source_port';
-   if ( $replica_version < '8.1' || $replica_version->flavor() =~ m/maria/ ) {
+   if ( $replica_version lt '8.1' || $replica_version->flavor() =~ m/maria/ ) {
       $source_name = 'master';
       $source_port = 'master_port';
    }
@@ -510,7 +510,7 @@ sub get_source_dsn {
    my $vp = VersionParser->new($dbh);
    my $source_host = 'source_host';
    my $source_port = 'source_port';
-   if ( $vp < '8.1' || $vp->flavor() =~ m/maria/ ) {
+   if ( $vp lt '8.1' || $vp->flavor() =~ m/maria/ ) {
       $source_host = 'master_host';
       $source_port = 'master_port';
    }
@@ -525,7 +525,7 @@ sub get_replica_status {
 
    my $server_version = VersionParser->new($dbh);
    my $replica_name = 'replica';
-   if ( $server_version < '8.1' || $server_version->flavor() =~ m/maria/ ) {
+   if ( $server_version lt '8.1' || $server_version->flavor() =~ m/maria/ ) {
       $replica_name = 'slave';
    }
 
@@ -588,7 +588,7 @@ sub get_source_status {
 
    my $vp = VersionParser->new($dbh);
    my $source_name = 'binary log';
-   if ( $vp < '8.1' || $vp->flavor() =~ m/maria/ ) {
+   if ( $vp lt '8.1' || $vp->flavor() =~ m/maria/ ) {
       $source_name = 'master';
    }
 
@@ -640,7 +640,7 @@ sub wait_for_source {
       }
       my $vp = VersionParser->new($replica_dbh);
       my $source_name = 'source';
-      if ( $vp < '8.1' || $vp->flavor() =~ m/maria/ ) {
+      if ( $vp lt '8.1' || $vp->flavor() =~ m/maria/ ) {
          $source_name = 'master';
       }
       my $channel_sql = $vp > '5.6' && $self->{channel} ? ", '$self->{channel}'" : '';
@@ -668,7 +668,7 @@ sub stop_replica {
    my ( $self, $dbh ) = @_;
    my $vp = VersionParser->new($dbh);
    my $replica_name = 'replica';
-   if ( $vp < '8.1' || $vp->flavor() =~ m/maria/ ) {
+   if ( $vp lt '8.1' || $vp->flavor() =~ m/maria/ ) {
       $replica_name = 'slave';
    }
    my $sth = $self->{sths}->{$dbh}->{STOP_REPLICA}
@@ -683,7 +683,7 @@ sub start_replica {
    my $vp = VersionParser->new($dbh);
    my $source_name = 'source';
    my $replica_name = 'replica';
-   if ( $vp < '8.1' || $vp->flavor() =~ m/maria/ ) {
+   if ( $vp lt '8.1' || $vp->flavor() =~ m/maria/ ) {
       $source_name = 'master';
       $replica_name = 'slave';
    }
@@ -732,7 +732,7 @@ sub catchup_to_source {
             
          my $vp = VersionParser->new($replica);
          my $replica_name = 'replica';
-         if ( $vp < '8.1' || $vp->flavor() =~ m/maria/ ) {
+         if ( $vp lt '8.1' || $vp->flavor() =~ m/maria/ ) {
             $replica_name = 'slave';
          }
 
@@ -781,13 +781,13 @@ sub catchup_to_same_pos {
 
    my $vp1 = VersionParser->new($s1_dbh);
    my $replica1_name = 'replica';
-   if ( $vp1 < '8.1' || $vp1->flavor() =~ m/maria/ ) {
+   if ( $vp1 lt '8.1' || $vp1->flavor() =~ m/maria/ ) {
       $replica1_name = 'slave';
    }
 
    my $vp2 = VersionParser->new($s2_dbh);
    my $replica2_name = 'replica';
-   if ( $vp2 < '8.1' || $vp2->flavor() =~ m/maria/ ) {
+   if ( $vp2 lt '8.1' || $vp2->flavor() =~ m/maria/ ) {
       $replica2_name = 'slave';
    }
 
@@ -810,7 +810,7 @@ sub has_replica_updates {
    
    my $vp = VersionParser->new($dbh);
    my $replica_name = 'replica';
-   if ( $vp < '8.1' || $vp->flavor() =~ m/maria/ ) {
+   if ( $vp lt '8.1' || $vp->flavor() =~ m/maria/ ) {
       $replica_name = 'slave';
    }
 
@@ -847,7 +847,7 @@ sub get_replica_lag {
    
    my $vp = VersionParser->new($dbh);
    my $source_name = 'source';
-   if ( $vp < '8.1' || $vp->flavor() =~ m/maria/ ) {
+   if ( $vp lt '8.1' || $vp->flavor() =~ m/maria/ ) {
       $source_name = 'master';
    }
 
@@ -951,7 +951,7 @@ sub get_replication_filters {
 
    my $vp = VersionParser->new($dbh);
    my $replica_name = 'replica';
-   if ( $vp < '8.1' || $vp->flavor() =~ m/maria/ ) {
+   if ( $vp lt '8.1' || $vp->flavor() =~ m/maria/ ) {
       $replica_name = 'slave';
    }
 
@@ -6435,7 +6435,7 @@ sub main {
       my $vp = VersionParser->new($dbh);
 
       my $source_name = 'source';
-      if ( $vp < '8.1' || $vp->flavor() =~ m/maria/  ) {
+      if ( $vp lt '8.1' || $vp->flavor() =~ m/maria/  ) {
          $source_name = 'master';
       }
 
@@ -6478,7 +6478,7 @@ sub main {
 
          my $sql;
          if ( @master_status_cols ) {
-            if ( $vp >= '8.1' && $vp->flavor() !~ m/maria/ ) {
+            if ( $vp ge '8.1' && $vp->flavor() !~ m/maria/ ) {
                $sql = 'SHOW BINARY LOG STATUS';
             }
             else {
@@ -6496,7 +6496,7 @@ sub main {
          }
 
          if ( @slave_status_cols ) {
-            if ( $vp >= '8.1' && $vp->flavor() !~ m/maria/ ) {
+            if ( $vp ge '8.1' && $vp->flavor() !~ m/maria/ ) {
                $sql = 'SHOW REPLICA STATUS';
             }
             else {
diff --git a/bin/pt-kill b/bin/pt-kill
index a4762b31f..e1fd36ab1 100755
--- a/bin/pt-kill
+++ b/bin/pt-kill
@@ -4200,7 +4200,7 @@ sub _find_replicas_by_hosts {
    my $vp = VersionParser->new($dbh);
    my $sql = 'SHOW REPLICAS';
    my $source_name = 'source';
-   if ( $vp < '8.1' || $vp->flavor() =~ m/maria/ ) {
+   if ( $vp lt '8.1' || $vp->flavor() =~ m/maria/ ) {
       $sql = 'SHOW SLAVE HOSTS';
       $source_name='master';
    }
@@ -4279,7 +4279,7 @@ sub is_source_of {
    my $replica_version = VersionParser->new($replica);
    my $source_name = 'source';
    my $source_port = 'source_port';
-   if ( $replica_version < '8.1' || $replica_version->flavor() =~ m/maria/ ) {
+   if ( $replica_version lt '8.1' || $replica_version->flavor() =~ m/maria/ ) {
       $source_name = 'master';
       $source_port = 'master_port';
    }
@@ -4326,7 +4326,7 @@ sub get_source_dsn {
    my $vp = VersionParser->new($dbh);
    my $source_host = 'source_host';
    my $source_port = 'source_port';
-   if ( $vp < '8.1' || $vp->flavor() =~ m/maria/ ) {
+   if ( $vp lt '8.1' || $vp->flavor() =~ m/maria/ ) {
       $source_host = 'master_host';
       $source_port = 'master_port';
    }
@@ -4341,7 +4341,7 @@ sub get_replica_status {
 
    my $server_version = VersionParser->new($dbh);
    my $replica_name = 'replica';
-   if ( $server_version < '8.1' || $server_version->flavor() =~ m/maria/ ) {
+   if ( $server_version lt '8.1' || $server_version->flavor() =~ m/maria/ ) {
       $replica_name = 'slave';
    }
 
@@ -4404,7 +4404,7 @@ sub get_source_status {
 
    my $vp = VersionParser->new($dbh);
    my $source_name = 'binary log';
-   if ( $vp < '8.1' || $vp->flavor() =~ m/maria/ ) {
+   if ( $vp lt '8.1' || $vp->flavor() =~ m/maria/ ) {
       $source_name = 'master';
    }
 
@@ -4456,7 +4456,7 @@ sub wait_for_source {
       }
       my $vp = VersionParser->new($replica_dbh);
       my $source_name = 'source';
-      if ( $vp < '8.1' || $vp->flavor() =~ m/maria/ ) {
+      if ( $vp lt '8.1' || $vp->flavor() =~ m/maria/ ) {
          $source_name = 'master';
       }
       my $channel_sql = $vp > '5.6' && $self->{channel} ? ", '$self->{channel}'" : '';
@@ -4484,7 +4484,7 @@ sub stop_replica {
    my ( $self, $dbh ) = @_;
    my $vp = VersionParser->new($dbh);
    my $replica_name = 'replica';
-   if ( $vp < '8.1' || $vp->flavor() =~ m/maria/ ) {
+   if ( $vp lt '8.1' || $vp->flavor() =~ m/maria/ ) {
       $replica_name = 'slave';
    }
    my $sth = $self->{sths}->{$dbh}->{STOP_REPLICA}
@@ -4499,7 +4499,7 @@ sub start_replica {
    my $vp = VersionParser->new($dbh);
    my $source_name = 'source';
    my $replica_name = 'replica';
-   if ( $vp < '8.1' || $vp->flavor() =~ m/maria/ ) {
+   if ( $vp lt '8.1' || $vp->flavor() =~ m/maria/ ) {
       $source_name = 'master';
       $replica_name = 'slave';
    }
@@ -4548,7 +4548,7 @@ sub catchup_to_source {
             
          my $vp = VersionParser->new($replica);
          my $replica_name = 'replica';
-         if ( $vp < '8.1' || $vp->flavor() =~ m/maria/ ) {
+         if ( $vp lt '8.1' || $vp->flavor() =~ m/maria/ ) {
             $replica_name = 'slave';
          }
 
@@ -4597,13 +4597,13 @@ sub catchup_to_same_pos {
 
    my $vp1 = VersionParser->new($s1_dbh);
    my $replica1_name = 'replica';
-   if ( $vp1 < '8.1' || $vp1->flavor() =~ m/maria/ ) {
+   if ( $vp1 lt '8.1' || $vp1->flavor() =~ m/maria/ ) {
       $replica1_name = 'slave';
    }
 
    my $vp2 = VersionParser->new($s2_dbh);
    my $replica2_name = 'replica';
-   if ( $vp2 < '8.1' || $vp2->flavor() =~ m/maria/ ) {
+   if ( $vp2 lt '8.1' || $vp2->flavor() =~ m/maria/ ) {
       $replica2_name = 'slave';
    }
 
@@ -4626,7 +4626,7 @@ sub has_replica_updates {
    
    my $vp = VersionParser->new($dbh);
    my $replica_name = 'replica';
-   if ( $vp < '8.1' || $vp->flavor() =~ m/maria/ ) {
+   if ( $vp lt '8.1' || $vp->flavor() =~ m/maria/ ) {
       $replica_name = 'slave';
    }
 
@@ -4663,7 +4663,7 @@ sub get_replica_lag {
    
    my $vp = VersionParser->new($dbh);
    my $source_name = 'source';
-   if ( $vp < '8.1' || $vp->flavor() =~ m/maria/ ) {
+   if ( $vp lt '8.1' || $vp->flavor() =~ m/maria/ ) {
       $source_name = 'master';
    }
 
@@ -4767,7 +4767,7 @@ sub get_replication_filters {
 
    my $vp = VersionParser->new($dbh);
    my $replica_name = 'replica';
-   if ( $vp < '8.1' || $vp->flavor() =~ m/maria/ ) {
+   if ( $vp lt '8.1' || $vp->flavor() =~ m/maria/ ) {
       $replica_name = 'slave';
    }
 
diff --git a/bin/pt-online-schema-change b/bin/pt-online-schema-change
index 7dd929205..7871d8ccd 100755
--- a/bin/pt-online-schema-change
+++ b/bin/pt-online-schema-change
@@ -4488,7 +4488,7 @@ sub _find_replicas_by_hosts {
    my $vp = VersionParser->new($dbh);
    my $sql = 'SHOW REPLICAS';
    my $source_name = 'source';
-   if ( $vp < '8.1' || $vp->flavor() =~ m/maria/ ) {
+   if ( $vp lt '8.1' || $vp->flavor() =~ m/maria/ ) {
       $sql = 'SHOW SLAVE HOSTS';
       $source_name='master';
    }
@@ -4567,7 +4567,7 @@ sub is_source_of {
    my $replica_version = VersionParser->new($replica);
    my $source_name = 'source';
    my $source_port = 'source_port';
-   if ( $replica_version < '8.1' || $replica_version->flavor() =~ m/maria/ ) {
+   if ( $replica_version lt '8.1' || $replica_version->flavor() =~ m/maria/ ) {
       $source_name = 'master';
       $source_port = 'master_port';
    }
@@ -4614,7 +4614,7 @@ sub get_source_dsn {
    my $vp = VersionParser->new($dbh);
    my $source_host = 'source_host';
    my $source_port = 'source_port';
-   if ( $vp < '8.1' || $vp->flavor() =~ m/maria/ ) {
+   if ( $vp lt '8.1' || $vp->flavor() =~ m/maria/ ) {
       $source_host = 'master_host';
       $source_port = 'master_port';
    }
@@ -4629,7 +4629,7 @@ sub get_replica_status {
 
    my $server_version = VersionParser->new($dbh);
    my $replica_name = 'replica';
-   if ( $server_version < '8.1' || $server_version->flavor() =~ m/maria/ ) {
+   if ( $server_version lt '8.1' || $server_version->flavor() =~ m/maria/ ) {
       $replica_name = 'slave';
    }
 
@@ -4692,7 +4692,7 @@ sub get_source_status {
 
    my $vp = VersionParser->new($dbh);
    my $source_name = 'binary log';
-   if ( $vp < '8.1' || $vp->flavor() =~ m/maria/ ) {
+   if ( $vp lt '8.1' || $vp->flavor() =~ m/maria/ ) {
       $source_name = 'master';
    }
 
@@ -4744,7 +4744,7 @@ sub wait_for_source {
       }
       my $vp = VersionParser->new($replica_dbh);
       my $source_name = 'source';
-      if ( $vp < '8.1' || $vp->flavor() =~ m/maria/ ) {
+      if ( $vp lt '8.1' || $vp->flavor() =~ m/maria/ ) {
          $source_name = 'master';
       }
       my $channel_sql = $vp > '5.6' && $self->{channel} ? ", '$self->{channel}'" : '';
@@ -4772,7 +4772,7 @@ sub stop_replica {
    my ( $self, $dbh ) = @_;
    my $vp = VersionParser->new($dbh);
    my $replica_name = 'replica';
-   if ( $vp < '8.1' || $vp->flavor() =~ m/maria/ ) {
+   if ( $vp lt '8.1' || $vp->flavor() =~ m/maria/ ) {
       $replica_name = 'slave';
    }
    my $sth = $self->{sths}->{$dbh}->{STOP_REPLICA}
@@ -4787,7 +4787,7 @@ sub start_replica {
    my $vp = VersionParser->new($dbh);
    my $source_name = 'source';
    my $replica_name = 'replica';
-   if ( $vp < '8.1' || $vp->flavor() =~ m/maria/ ) {
+   if ( $vp lt '8.1' || $vp->flavor() =~ m/maria/ ) {
       $source_name = 'master';
       $replica_name = 'slave';
    }
@@ -4836,7 +4836,7 @@ sub catchup_to_source {
             
          my $vp = VersionParser->new($replica);
          my $replica_name = 'replica';
-         if ( $vp < '8.1' || $vp->flavor() =~ m/maria/ ) {
+         if ( $vp lt '8.1' || $vp->flavor() =~ m/maria/ ) {
             $replica_name = 'slave';
          }
 
@@ -4885,13 +4885,13 @@ sub catchup_to_same_pos {
 
    my $vp1 = VersionParser->new($s1_dbh);
    my $replica1_name = 'replica';
-   if ( $vp1 < '8.1' || $vp1->flavor() =~ m/maria/ ) {
+   if ( $vp1 lt '8.1' || $vp1->flavor() =~ m/maria/ ) {
       $replica1_name = 'slave';
    }
 
    my $vp2 = VersionParser->new($s2_dbh);
    my $replica2_name = 'replica';
-   if ( $vp2 < '8.1' || $vp2->flavor() =~ m/maria/ ) {
+   if ( $vp2 lt '8.1' || $vp2->flavor() =~ m/maria/ ) {
       $replica2_name = 'slave';
    }
 
@@ -4914,7 +4914,7 @@ sub has_replica_updates {
    
    my $vp = VersionParser->new($dbh);
    my $replica_name = 'replica';
-   if ( $vp < '8.1' || $vp->flavor() =~ m/maria/ ) {
+   if ( $vp lt '8.1' || $vp->flavor() =~ m/maria/ ) {
       $replica_name = 'slave';
    }
 
@@ -4951,7 +4951,7 @@ sub get_replica_lag {
    
    my $vp = VersionParser->new($dbh);
    my $source_name = 'source';
-   if ( $vp < '8.1' || $vp->flavor() =~ m/maria/ ) {
+   if ( $vp lt '8.1' || $vp->flavor() =~ m/maria/ ) {
       $source_name = 'master';
    }
 
@@ -5055,7 +5055,7 @@ sub get_replication_filters {
 
    my $vp = VersionParser->new($dbh);
    my $replica_name = 'replica';
-   if ( $vp < '8.1' || $vp->flavor() =~ m/maria/ ) {
+   if ( $vp lt '8.1' || $vp->flavor() =~ m/maria/ ) {
       $replica_name = 'slave';
    }
 
@@ -9218,7 +9218,7 @@ sub main {
 
       my $vp = VersionParser->new($cxn->dbh());
       my $replica_name = 'replica';
-      if ( $vp < '8.1' || $vp->flavor() =~ m/maria/ ) {
+      if ( $vp lt '8.1' || $vp->flavor() =~ m/maria/ ) {
          $replica_name = 'slave';
       }
 
diff --git a/bin/pt-query-digest b/bin/pt-query-digest
index e6bbfbdab..fd4cc0137 100755
--- a/bin/pt-query-digest
+++ b/bin/pt-query-digest
@@ -10794,7 +10794,7 @@ sub _find_replicas_by_hosts {
    my $vp = VersionParser->new($dbh);
    my $sql = 'SHOW REPLICAS';
    my $source_name = 'source';
-   if ( $vp < '8.1' || $vp->flavor() =~ m/maria/ ) {
+   if ( $vp lt '8.1' || $vp->flavor() =~ m/maria/ ) {
       $sql = 'SHOW SLAVE HOSTS';
       $source_name='master';
    }
@@ -10873,7 +10873,7 @@ sub is_source_of {
    my $replica_version = VersionParser->new($replica);
    my $source_name = 'source';
    my $source_port = 'source_port';
-   if ( $replica_version < '8.1' || $replica_version->flavor() =~ m/maria/ ) {
+   if ( $replica_version lt '8.1' || $replica_version->flavor() =~ m/maria/ ) {
       $source_name = 'master';
       $source_port = 'master_port';
    }
@@ -10920,7 +10920,7 @@ sub get_source_dsn {
    my $vp = VersionParser->new($dbh);
    my $source_host = 'source_host';
    my $source_port = 'source_port';
-   if ( $vp < '8.1' || $vp->flavor() =~ m/maria/ ) {
+   if ( $vp lt '8.1' || $vp->flavor() =~ m/maria/ ) {
       $source_host = 'master_host';
       $source_port = 'master_port';
    }
@@ -10935,7 +10935,7 @@ sub get_replica_status {
 
    my $server_version = VersionParser->new($dbh);
    my $replica_name = 'replica';
-   if ( $server_version < '8.1' || $server_version->flavor() =~ m/maria/ ) {
+   if ( $server_version lt '8.1' || $server_version->flavor() =~ m/maria/ ) {
       $replica_name = 'slave';
    }
 
@@ -10998,7 +10998,7 @@ sub get_source_status {
 
    my $vp = VersionParser->new($dbh);
    my $source_name = 'binary log';
-   if ( $vp < '8.1' || $vp->flavor() =~ m/maria/ ) {
+   if ( $vp lt '8.1' || $vp->flavor() =~ m/maria/ ) {
       $source_name = 'master';
    }
 
@@ -11050,7 +11050,7 @@ sub wait_for_source {
       }
       my $vp = VersionParser->new($replica_dbh);
       my $source_name = 'source';
-      if ( $vp < '8.1' || $vp->flavor() =~ m/maria/ ) {
+      if ( $vp lt '8.1' || $vp->flavor() =~ m/maria/ ) {
          $source_name = 'master';
       }
       my $channel_sql = $vp > '5.6' && $self->{channel} ? ", '$self->{channel}'" : '';
@@ -11078,7 +11078,7 @@ sub stop_replica {
    my ( $self, $dbh ) = @_;
    my $vp = VersionParser->new($dbh);
    my $replica_name = 'replica';
-   if ( $vp < '8.1' || $vp->flavor() =~ m/maria/ ) {
+   if ( $vp lt '8.1' || $vp->flavor() =~ m/maria/ ) {
       $replica_name = 'slave';
    }
    my $sth = $self->{sths}->{$dbh}->{STOP_REPLICA}
@@ -11093,7 +11093,7 @@ sub start_replica {
    my $vp = VersionParser->new($dbh);
    my $source_name = 'source';
    my $replica_name = 'replica';
-   if ( $vp < '8.1' || $vp->flavor() =~ m/maria/ ) {
+   if ( $vp lt '8.1' || $vp->flavor() =~ m/maria/ ) {
       $source_name = 'master';
       $replica_name = 'slave';
    }
@@ -11142,7 +11142,7 @@ sub catchup_to_source {
             
          my $vp = VersionParser->new($replica);
          my $replica_name = 'replica';
-         if ( $vp < '8.1' || $vp->flavor() =~ m/maria/ ) {
+         if ( $vp lt '8.1' || $vp->flavor() =~ m/maria/ ) {
             $replica_name = 'slave';
          }
 
@@ -11191,13 +11191,13 @@ sub catchup_to_same_pos {
 
    my $vp1 = VersionParser->new($s1_dbh);
    my $replica1_name = 'replica';
-   if ( $vp1 < '8.1' || $vp1->flavor() =~ m/maria/ ) {
+   if ( $vp1 lt '8.1' || $vp1->flavor() =~ m/maria/ ) {
       $replica1_name = 'slave';
    }
 
    my $vp2 = VersionParser->new($s2_dbh);
    my $replica2_name = 'replica';
-   if ( $vp2 < '8.1' || $vp2->flavor() =~ m/maria/ ) {
+   if ( $vp2 lt '8.1' || $vp2->flavor() =~ m/maria/ ) {
       $replica2_name = 'slave';
    }
 
@@ -11220,7 +11220,7 @@ sub has_replica_updates {
    
    my $vp = VersionParser->new($dbh);
    my $replica_name = 'replica';
-   if ( $vp < '8.1' || $vp->flavor() =~ m/maria/ ) {
+   if ( $vp lt '8.1' || $vp->flavor() =~ m/maria/ ) {
       $replica_name = 'slave';
    }
 
@@ -11257,7 +11257,7 @@ sub get_replica_lag {
    
    my $vp = VersionParser->new($dbh);
    my $source_name = 'source';
-   if ( $vp < '8.1' || $vp->flavor() =~ m/maria/ ) {
+   if ( $vp lt '8.1' || $vp->flavor() =~ m/maria/ ) {
       $source_name = 'master';
    }
 
@@ -11361,7 +11361,7 @@ sub get_replication_filters {
 
    my $vp = VersionParser->new($dbh);
    my $replica_name = 'replica';
-   if ( $vp < '8.1' || $vp->flavor() =~ m/maria/ ) {
+   if ( $vp lt '8.1' || $vp->flavor() =~ m/maria/ ) {
       $replica_name = 'slave';
    }
 
diff --git a/bin/pt-replica-restart b/bin/pt-replica-restart
index 0dea71fcd..da1cd4bf1 100755
--- a/bin/pt-replica-restart
+++ b/bin/pt-replica-restart
@@ -2936,7 +2936,7 @@ sub _find_replicas_by_hosts {
    my $vp = VersionParser->new($dbh);
    my $sql = 'SHOW REPLICAS';
    my $source_name = 'source';
-   if ( $vp < '8.1' || $vp->flavor() =~ m/maria/ ) {
+   if ( $vp lt '8.1' || $vp->flavor() =~ m/maria/ ) {
       $sql = 'SHOW SLAVE HOSTS';
       $source_name='master';
    }
@@ -3015,7 +3015,7 @@ sub is_source_of {
    my $replica_version = VersionParser->new($replica);
    my $source_name = 'source';
    my $source_port = 'source_port';
-   if ( $replica_version < '8.1' || $replica_version->flavor() =~ m/maria/ ) {
+   if ( $replica_version lt '8.1' || $replica_version->flavor() =~ m/maria/ ) {
       $source_name = 'master';
       $source_port = 'master_port';
    }
@@ -3062,7 +3062,7 @@ sub get_source_dsn {
    my $vp = VersionParser->new($dbh);
    my $source_host = 'source_host';
    my $source_port = 'source_port';
-   if ( $vp < '8.1' || $vp->flavor() =~ m/maria/ ) {
+   if ( $vp lt '8.1' || $vp->flavor() =~ m/maria/ ) {
       $source_host = 'master_host';
       $source_port = 'master_port';
    }
@@ -3077,7 +3077,7 @@ sub get_replica_status {
 
    my $server_version = VersionParser->new($dbh);
    my $replica_name = 'replica';
-   if ( $server_version < '8.1' || $server_version->flavor() =~ m/maria/ ) {
+   if ( $server_version lt '8.1' || $server_version->flavor() =~ m/maria/ ) {
       $replica_name = 'slave';
    }
 
@@ -3140,7 +3140,7 @@ sub get_source_status {
 
    my $vp = VersionParser->new($dbh);
    my $source_name = 'binary log';
-   if ( $vp < '8.1' || $vp->flavor() =~ m/maria/ ) {
+   if ( $vp lt '8.1' || $vp->flavor() =~ m/maria/ ) {
       $source_name = 'master';
    }
 
@@ -3192,7 +3192,7 @@ sub wait_for_source {
       }
       my $vp = VersionParser->new($replica_dbh);
       my $source_name = 'source';
-      if ( $vp < '8.1' || $vp->flavor() =~ m/maria/ ) {
+      if ( $vp lt '8.1' || $vp->flavor() =~ m/maria/ ) {
          $source_name = 'master';
       }
       my $channel_sql = $vp > '5.6' && $self->{channel} ? ", '$self->{channel}'" : '';
@@ -3220,7 +3220,7 @@ sub stop_replica {
    my ( $self, $dbh ) = @_;
    my $vp = VersionParser->new($dbh);
    my $replica_name = 'replica';
-   if ( $vp < '8.1' || $vp->flavor() =~ m/maria/ ) {
+   if ( $vp lt '8.1' || $vp->flavor() =~ m/maria/ ) {
       $replica_name = 'slave';
    }
    my $sth = $self->{sths}->{$dbh}->{STOP_REPLICA}
@@ -3235,7 +3235,7 @@ sub start_replica {
    my $vp = VersionParser->new($dbh);
    my $source_name = 'source';
    my $replica_name = 'replica';
-   if ( $vp < '8.1' || $vp->flavor() =~ m/maria/ ) {
+   if ( $vp lt '8.1' || $vp->flavor() =~ m/maria/ ) {
       $source_name = 'master';
       $replica_name = 'slave';
    }
@@ -3284,7 +3284,7 @@ sub catchup_to_source {
             
          my $vp = VersionParser->new($replica);
          my $replica_name = 'replica';
-         if ( $vp < '8.1' || $vp->flavor() =~ m/maria/ ) {
+         if ( $vp lt '8.1' || $vp->flavor() =~ m/maria/ ) {
             $replica_name = 'slave';
          }
 
@@ -3333,13 +3333,13 @@ sub catchup_to_same_pos {
 
    my $vp1 = VersionParser->new($s1_dbh);
    my $replica1_name = 'replica';
-   if ( $vp1 < '8.1' || $vp1->flavor() =~ m/maria/ ) {
+   if ( $vp1 lt '8.1' || $vp1->flavor() =~ m/maria/ ) {
       $replica1_name = 'slave';
    }
 
    my $vp2 = VersionParser->new($s2_dbh);
    my $replica2_name = 'replica';
-   if ( $vp2 < '8.1' || $vp2->flavor() =~ m/maria/ ) {
+   if ( $vp2 lt '8.1' || $vp2->flavor() =~ m/maria/ ) {
       $replica2_name = 'slave';
    }
 
@@ -3362,7 +3362,7 @@ sub has_replica_updates {
    
    my $vp = VersionParser->new($dbh);
    my $replica_name = 'replica';
-   if ( $vp < '8.1' || $vp->flavor() =~ m/maria/ ) {
+   if ( $vp lt '8.1' || $vp->flavor() =~ m/maria/ ) {
       $replica_name = 'slave';
    }
 
@@ -3399,7 +3399,7 @@ sub get_replica_lag {
    
    my $vp = VersionParser->new($dbh);
    my $source_name = 'source';
-   if ( $vp < '8.1' || $vp->flavor() =~ m/maria/ ) {
+   if ( $vp lt '8.1' || $vp->flavor() =~ m/maria/ ) {
       $source_name = 'master';
    }
 
@@ -3503,7 +3503,7 @@ sub get_replication_filters {
 
    my $vp = VersionParser->new($dbh);
    my $replica_name = 'replica';
-   if ( $vp < '8.1' || $vp->flavor() =~ m/maria/ ) {
+   if ( $vp lt '8.1' || $vp->flavor() =~ m/maria/ ) {
       $replica_name = 'slave';
    }
 
@@ -5329,7 +5329,7 @@ sub main {
    my $vp = VersionParser->new($dbh);
    my $source_name = 'source';
    my $replica_name = 'replica';
-   if ( $vp < '8.1' || $vp->flavor() =~ m/maria/ ) {
+   if ( $vp lt '8.1' || $vp->flavor() =~ m/maria/ ) {
       $source_name = 'master';
       $replica_name = 'slave';
    }
@@ -5435,7 +5435,7 @@ sub watch_server {
    my $source_name   = 'source';
    my $source_change = 'replication source';
    my $replica_name  = 'replica';
-   if ( $vp < '8.1' || $vp->flavor() =~ m/maria/ ) {
+   if ( $vp lt '8.1' || $vp->flavor() =~ m/maria/ ) {
       $source_name   = 'master';
       $source_change = 'master';
       $replica_name  = 'slave';
diff --git a/bin/pt-slave-find b/bin/pt-slave-find
index 0443c9ba8..4c0177636 100755
--- a/bin/pt-slave-find
+++ b/bin/pt-slave-find
@@ -2525,7 +2525,7 @@ sub _find_replicas_by_hosts {
    my $vp = VersionParser->new($dbh);
    my $sql = 'SHOW REPLICAS';
    my $source_name = 'source';
-   if ( $vp < '8.1' || $vp->flavor() =~ m/maria/ ) {
+   if ( $vp lt '8.1' || $vp->flavor() =~ m/maria/ ) {
       $sql = 'SHOW SLAVE HOSTS';
       $source_name='master';
    }
@@ -2604,7 +2604,7 @@ sub is_source_of {
    my $replica_version = VersionParser->new($replica);
    my $source_name = 'source';
    my $source_port = 'source_port';
-   if ( $replica_version < '8.1' || $replica_version->flavor() =~ m/maria/ ) {
+   if ( $replica_version lt '8.1' || $replica_version->flavor() =~ m/maria/ ) {
       $source_name = 'master';
       $source_port = 'master_port';
    }
@@ -2651,7 +2651,7 @@ sub get_source_dsn {
    my $vp = VersionParser->new($dbh);
    my $source_host = 'source_host';
    my $source_port = 'source_port';
-   if ( $vp < '8.1' || $vp->flavor() =~ m/maria/ ) {
+   if ( $vp lt '8.1' || $vp->flavor() =~ m/maria/ ) {
       $source_host = 'master_host';
       $source_port = 'master_port';
    }
@@ -2666,7 +2666,7 @@ sub get_replica_status {
 
    my $server_version = VersionParser->new($dbh);
    my $replica_name = 'replica';
-   if ( $server_version < '8.1' || $server_version->flavor() =~ m/maria/ ) {
+   if ( $server_version lt '8.1' || $server_version->flavor() =~ m/maria/ ) {
       $replica_name = 'slave';
    }
 
@@ -2729,7 +2729,7 @@ sub get_source_status {
 
    my $vp = VersionParser->new($dbh);
    my $source_name = 'binary log';
-   if ( $vp < '8.1' || $vp->flavor() =~ m/maria/ ) {
+   if ( $vp lt '8.1' || $vp->flavor() =~ m/maria/ ) {
       $source_name = 'master';
    }
 
@@ -2781,7 +2781,7 @@ sub wait_for_source {
       }
       my $vp = VersionParser->new($replica_dbh);
       my $source_name = 'source';
-      if ( $vp < '8.1' || $vp->flavor() =~ m/maria/ ) {
+      if ( $vp lt '8.1' || $vp->flavor() =~ m/maria/ ) {
          $source_name = 'master';
       }
       my $channel_sql = $vp > '5.6' && $self->{channel} ? ", '$self->{channel}'" : '';
@@ -2809,7 +2809,7 @@ sub stop_replica {
    my ( $self, $dbh ) = @_;
    my $vp = VersionParser->new($dbh);
    my $replica_name = 'replica';
-   if ( $vp < '8.1' || $vp->flavor() =~ m/maria/ ) {
+   if ( $vp lt '8.1' || $vp->flavor() =~ m/maria/ ) {
       $replica_name = 'slave';
    }
    my $sth = $self->{sths}->{$dbh}->{STOP_REPLICA}
@@ -2824,7 +2824,7 @@ sub start_replica {
    my $vp = VersionParser->new($dbh);
    my $source_name = 'source';
    my $replica_name = 'replica';
-   if ( $vp < '8.1' || $vp->flavor() =~ m/maria/ ) {
+   if ( $vp lt '8.1' || $vp->flavor() =~ m/maria/ ) {
       $source_name = 'master';
       $replica_name = 'slave';
    }
@@ -2873,7 +2873,7 @@ sub catchup_to_source {
             
          my $vp = VersionParser->new($replica);
          my $replica_name = 'replica';
-         if ( $vp < '8.1' || $vp->flavor() =~ m/maria/ ) {
+         if ( $vp lt '8.1' || $vp->flavor() =~ m/maria/ ) {
             $replica_name = 'slave';
          }
 
@@ -2922,13 +2922,13 @@ sub catchup_to_same_pos {
 
    my $vp1 = VersionParser->new($s1_dbh);
    my $replica1_name = 'replica';
-   if ( $vp1 < '8.1' || $vp1->flavor() =~ m/maria/ ) {
+   if ( $vp1 lt '8.1' || $vp1->flavor() =~ m/maria/ ) {
       $replica1_name = 'slave';
    }
 
    my $vp2 = VersionParser->new($s2_dbh);
    my $replica2_name = 'replica';
-   if ( $vp2 < '8.1' || $vp2->flavor() =~ m/maria/ ) {
+   if ( $vp2 lt '8.1' || $vp2->flavor() =~ m/maria/ ) {
       $replica2_name = 'slave';
    }
 
@@ -2951,7 +2951,7 @@ sub has_replica_updates {
    
    my $vp = VersionParser->new($dbh);
    my $replica_name = 'replica';
-   if ( $vp < '8.1' || $vp->flavor() =~ m/maria/ ) {
+   if ( $vp lt '8.1' || $vp->flavor() =~ m/maria/ ) {
       $replica_name = 'slave';
    }
 
@@ -2988,7 +2988,7 @@ sub get_replica_lag {
    
    my $vp = VersionParser->new($dbh);
    my $source_name = 'source';
-   if ( $vp < '8.1' || $vp->flavor() =~ m/maria/ ) {
+   if ( $vp lt '8.1' || $vp->flavor() =~ m/maria/ ) {
       $source_name = 'master';
    }
 
@@ -3092,7 +3092,7 @@ sub get_replication_filters {
 
    my $vp = VersionParser->new($dbh);
    my $replica_name = 'replica';
-   if ( $vp < '8.1' || $vp->flavor() =~ m/maria/ ) {
+   if ( $vp lt '8.1' || $vp->flavor() =~ m/maria/ ) {
       $replica_name = 'slave';
    }
 
@@ -4229,7 +4229,7 @@ sub print_node_summary {
    my $vp = VersionParser->new($dbh);
    my $source_name = 'source';
    my $replica_name = 'replica';
-   if ( $vp < '8.1' || $vp->flavor() =~ m/maria/ ) {
+   if ( $vp lt '8.1' || $vp->flavor() =~ m/maria/ ) {
       $source_name = 'master';
       $replica_name = 'slave';
    }
diff --git a/bin/pt-table-checksum b/bin/pt-table-checksum
index 110909bf1..fa1d94d36 100755
--- a/bin/pt-table-checksum
+++ b/bin/pt-table-checksum
@@ -5443,7 +5443,7 @@ sub _find_replicas_by_hosts {
    my $vp = VersionParser->new($dbh);
    my $sql = 'SHOW REPLICAS';
    my $source_name = 'source';
-   if ( $vp < '8.1' || $vp->flavor() =~ m/maria/ ) {
+   if ( $vp lt '8.1' || $vp->flavor() =~ m/maria/ ) {
       $sql = 'SHOW SLAVE HOSTS';
       $source_name='master';
    }
@@ -5522,7 +5522,7 @@ sub is_source_of {
    my $replica_version = VersionParser->new($replica);
    my $source_name = 'source';
    my $source_port = 'source_port';
-   if ( $replica_version < '8.1' || $replica_version->flavor() =~ m/maria/ ) {
+   if ( $replica_version lt '8.1' || $replica_version->flavor() =~ m/maria/ ) {
       $source_name = 'master';
       $source_port = 'master_port';
    }
@@ -5569,7 +5569,7 @@ sub get_source_dsn {
    my $vp = VersionParser->new($dbh);
    my $source_host = 'source_host';
    my $source_port = 'source_port';
-   if ( $vp < '8.1' || $vp->flavor() =~ m/maria/ ) {
+   if ( $vp lt '8.1' || $vp->flavor() =~ m/maria/ ) {
       $source_host = 'master_host';
       $source_port = 'master_port';
    }
@@ -5584,7 +5584,7 @@ sub get_replica_status {
 
    my $server_version = VersionParser->new($dbh);
    my $replica_name = 'replica';
-   if ( $server_version < '8.1' || $server_version->flavor() =~ m/maria/ ) {
+   if ( $server_version lt '8.1' || $server_version->flavor() =~ m/maria/ ) {
       $replica_name = 'slave';
    }
 
@@ -5647,7 +5647,7 @@ sub get_source_status {
 
    my $vp = VersionParser->new($dbh);
    my $source_name = 'binary log';
-   if ( $vp < '8.1' || $vp->flavor() =~ m/maria/ ) {
+   if ( $vp lt '8.1' || $vp->flavor() =~ m/maria/ ) {
       $source_name = 'master';
    }
 
@@ -5699,7 +5699,7 @@ sub wait_for_source {
       }
       my $vp = VersionParser->new($replica_dbh);
       my $source_name = 'source';
-      if ( $vp < '8.1' || $vp->flavor() =~ m/maria/ ) {
+      if ( $vp lt '8.1' || $vp->flavor() =~ m/maria/ ) {
          $source_name = 'master';
       }
       my $channel_sql = $vp > '5.6' && $self->{channel} ? ", '$self->{channel}'" : '';
@@ -5727,7 +5727,7 @@ sub stop_replica {
    my ( $self, $dbh ) = @_;
    my $vp = VersionParser->new($dbh);
    my $replica_name = 'replica';
-   if ( $vp < '8.1' || $vp->flavor() =~ m/maria/ ) {
+   if ( $vp lt '8.1' || $vp->flavor() =~ m/maria/ ) {
       $replica_name = 'slave';
    }
    my $sth = $self->{sths}->{$dbh}->{STOP_REPLICA}
@@ -5742,7 +5742,7 @@ sub start_replica {
    my $vp = VersionParser->new($dbh);
    my $source_name = 'source';
    my $replica_name = 'replica';
-   if ( $vp < '8.1' || $vp->flavor() =~ m/maria/ ) {
+   if ( $vp lt '8.1' || $vp->flavor() =~ m/maria/ ) {
       $source_name = 'master';
       $replica_name = 'slave';
    }
@@ -5791,7 +5791,7 @@ sub catchup_to_source {
             
          my $vp = VersionParser->new($replica);
          my $replica_name = 'replica';
-         if ( $vp < '8.1' || $vp->flavor() =~ m/maria/ ) {
+         if ( $vp lt '8.1' || $vp->flavor() =~ m/maria/ ) {
             $replica_name = 'slave';
          }
 
@@ -5840,13 +5840,13 @@ sub catchup_to_same_pos {
 
    my $vp1 = VersionParser->new($s1_dbh);
    my $replica1_name = 'replica';
-   if ( $vp1 < '8.1' || $vp1->flavor() =~ m/maria/ ) {
+   if ( $vp1 lt '8.1' || $vp1->flavor() =~ m/maria/ ) {
       $replica1_name = 'slave';
    }
 
    my $vp2 = VersionParser->new($s2_dbh);
    my $replica2_name = 'replica';
-   if ( $vp2 < '8.1' || $vp2->flavor() =~ m/maria/ ) {
+   if ( $vp2 lt '8.1' || $vp2->flavor() =~ m/maria/ ) {
       $replica2_name = 'slave';
    }
 
@@ -5869,7 +5869,7 @@ sub has_replica_updates {
    
    my $vp = VersionParser->new($dbh);
    my $replica_name = 'replica';
-   if ( $vp < '8.1' || $vp->flavor() =~ m/maria/ ) {
+   if ( $vp lt '8.1' || $vp->flavor() =~ m/maria/ ) {
       $replica_name = 'slave';
    }
 
@@ -5906,7 +5906,7 @@ sub get_replica_lag {
    
    my $vp = VersionParser->new($dbh);
    my $source_name = 'source';
-   if ( $vp < '8.1' || $vp->flavor() =~ m/maria/ ) {
+   if ( $vp lt '8.1' || $vp->flavor() =~ m/maria/ ) {
       $source_name = 'master';
    }
 
@@ -6010,7 +6010,7 @@ sub get_replication_filters {
 
    my $vp = VersionParser->new($dbh);
    my $replica_name = 'replica';
-   if ( $vp < '8.1' || $vp->flavor() =~ m/maria/ ) {
+   if ( $vp lt '8.1' || $vp->flavor() =~ m/maria/ ) {
       $replica_name = 'slave';
    }
 
@@ -10410,7 +10410,7 @@ sub main {
    my $vp = VersionParser->new($source_dbh);
    my $source_name = 'source';
    my $replica_name = 'replica';
-   if ( $vp < '8.1' || $vp->flavor() =~ m/maria/ ) {
+   if ( $vp lt '8.1' || $vp->flavor() =~ m/maria/ ) {
       $source_name = 'master';
       $replica_name = 'replica';
    }
diff --git a/bin/pt-table-sync b/bin/pt-table-sync
index f99e4bbc6..88e76d567 100755
--- a/bin/pt-table-sync
+++ b/bin/pt-table-sync
@@ -6954,7 +6954,7 @@ sub _find_replicas_by_hosts {
    my $vp = VersionParser->new($dbh);
    my $sql = 'SHOW REPLICAS';
    my $source_name = 'source';
-   if ( $vp < '8.1' || $vp->flavor() =~ m/maria/ ) {
+   if ( $vp lt '8.1' || $vp->flavor() =~ m/maria/ ) {
       $sql = 'SHOW SLAVE HOSTS';
       $source_name='master';
    }
@@ -7033,7 +7033,7 @@ sub is_source_of {
    my $replica_version = VersionParser->new($replica);
    my $source_name = 'source';
    my $source_port = 'source_port';
-   if ( $replica_version < '8.1' || $replica_version->flavor() =~ m/maria/ ) {
+   if ( $replica_version lt '8.1' || $replica_version->flavor() =~ m/maria/ ) {
       $source_name = 'master';
       $source_port = 'master_port';
    }
@@ -7080,7 +7080,7 @@ sub get_source_dsn {
    my $vp = VersionParser->new($dbh);
    my $source_host = 'source_host';
    my $source_port = 'source_port';
-   if ( $vp < '8.1' || $vp->flavor() =~ m/maria/ ) {
+   if ( $vp lt '8.1' || $vp->flavor() =~ m/maria/ ) {
       $source_host = 'master_host';
       $source_port = 'master_port';
    }
@@ -7095,7 +7095,7 @@ sub get_replica_status {
 
    my $server_version = VersionParser->new($dbh);
    my $replica_name = 'replica';
-   if ( $server_version < '8.1' || $server_version->flavor() =~ m/maria/ ) {
+   if ( $server_version lt '8.1' || $server_version->flavor() =~ m/maria/ ) {
       $replica_name = 'slave';
    }
 
@@ -7158,7 +7158,7 @@ sub get_source_status {
 
    my $vp = VersionParser->new($dbh);
    my $source_name = 'binary log';
-   if ( $vp < '8.1' || $vp->flavor() =~ m/maria/ ) {
+   if ( $vp lt '8.1' || $vp->flavor() =~ m/maria/ ) {
       $source_name = 'master';
    }
 
@@ -7210,7 +7210,7 @@ sub wait_for_source {
       }
       my $vp = VersionParser->new($replica_dbh);
       my $source_name = 'source';
-      if ( $vp < '8.1' || $vp->flavor() =~ m/maria/ ) {
+      if ( $vp lt '8.1' || $vp->flavor() =~ m/maria/ ) {
          $source_name = 'master';
       }
       my $channel_sql = $vp > '5.6' && $self->{channel} ? ", '$self->{channel}'" : '';
@@ -7238,7 +7238,7 @@ sub stop_replica {
    my ( $self, $dbh ) = @_;
    my $vp = VersionParser->new($dbh);
    my $replica_name = 'replica';
-   if ( $vp < '8.1' || $vp->flavor() =~ m/maria/ ) {
+   if ( $vp lt '8.1' || $vp->flavor() =~ m/maria/ ) {
       $replica_name = 'slave';
    }
    my $sth = $self->{sths}->{$dbh}->{STOP_REPLICA}
@@ -7253,7 +7253,7 @@ sub start_replica {
    my $vp = VersionParser->new($dbh);
    my $source_name = 'source';
    my $replica_name = 'replica';
-   if ( $vp < '8.1' || $vp->flavor() =~ m/maria/ ) {
+   if ( $vp lt '8.1' || $vp->flavor() =~ m/maria/ ) {
       $source_name = 'master';
       $replica_name = 'slave';
    }
@@ -7302,7 +7302,7 @@ sub catchup_to_source {
             
          my $vp = VersionParser->new($replica);
          my $replica_name = 'replica';
-         if ( $vp < '8.1' || $vp->flavor() =~ m/maria/ ) {
+         if ( $vp lt '8.1' || $vp->flavor() =~ m/maria/ ) {
             $replica_name = 'slave';
          }
 
@@ -7351,13 +7351,13 @@ sub catchup_to_same_pos {
 
    my $vp1 = VersionParser->new($s1_dbh);
    my $replica1_name = 'replica';
-   if ( $vp1 < '8.1' || $vp1->flavor() =~ m/maria/ ) {
+   if ( $vp1 lt '8.1' || $vp1->flavor() =~ m/maria/ ) {
       $replica1_name = 'slave';
    }
 
    my $vp2 = VersionParser->new($s2_dbh);
    my $replica2_name = 'replica';
-   if ( $vp2 < '8.1' || $vp2->flavor() =~ m/maria/ ) {
+   if ( $vp2 lt '8.1' || $vp2->flavor() =~ m/maria/ ) {
       $replica2_name = 'slave';
    }
 
@@ -7380,7 +7380,7 @@ sub has_replica_updates {
    
    my $vp = VersionParser->new($dbh);
    my $replica_name = 'replica';
-   if ( $vp < '8.1' || $vp->flavor() =~ m/maria/ ) {
+   if ( $vp lt '8.1' || $vp->flavor() =~ m/maria/ ) {
       $replica_name = 'slave';
    }
 
@@ -7417,7 +7417,7 @@ sub get_replica_lag {
    
    my $vp = VersionParser->new($dbh);
    my $source_name = 'source';
-   if ( $vp < '8.1' || $vp->flavor() =~ m/maria/ ) {
+   if ( $vp lt '8.1' || $vp->flavor() =~ m/maria/ ) {
       $source_name = 'master';
    }
 
@@ -7521,7 +7521,7 @@ sub get_replication_filters {
 
    my $vp = VersionParser->new($dbh);
    my $replica_name = 'replica';
-   if ( $vp < '8.1' || $vp->flavor() =~ m/maria/ ) {
+   if ( $vp lt '8.1' || $vp->flavor() =~ m/maria/ ) {
       $replica_name = 'slave';
    }
 
@@ -10339,7 +10339,7 @@ sub main {
       my $vp = VersionParser->new($dsns[1]->{dbh});
       my $source_name = 'source';
       my $replica_name = 'replica';
-      if ( $vp < '8.1' || $vp->flavor() =~ m/maria/ ) {
+      if ( $vp lt '8.1' || $vp->flavor() =~ m/maria/ ) {
          $source_name = 'master';
          $replica_name = 'replica';
       }
diff --git a/lib/MasterSlave.pm b/lib/MasterSlave.pm
index ab5d28ca9..308a7686a 100644
--- a/lib/MasterSlave.pm
+++ b/lib/MasterSlave.pm
@@ -340,7 +340,7 @@ sub _find_replicas_by_hosts {
    my $vp = VersionParser->new($dbh);
    my $sql = 'SHOW REPLICAS';
    my $source_name = 'source';
-   if ( $vp < '8.1' || $vp->flavor() =~ m/maria/ ) {
+   if ( $vp lt '8.1' || $vp->flavor() =~ m/maria/ ) {
       $sql = 'SHOW SLAVE HOSTS';
       $source_name='master';
    }
@@ -430,7 +430,7 @@ sub is_source_of {
    my $replica_version = VersionParser->new($replica);
    my $source_name = 'source';
    my $source_port = 'source_port';
-   if ( $replica_version < '8.1' || $replica_version->flavor() =~ m/maria/ ) {
+   if ( $replica_version lt '8.1' || $replica_version->flavor() =~ m/maria/ ) {
       $source_name = 'master';
       $source_port = 'master_port';
    }
@@ -488,7 +488,7 @@ sub get_source_dsn {
    my $vp = VersionParser->new($dbh);
    my $source_host = 'source_host';
    my $source_port = 'source_port';
-   if ( $vp < '8.1' || $vp->flavor() =~ m/maria/ ) {
+   if ( $vp lt '8.1' || $vp->flavor() =~ m/maria/ ) {
       $source_host = 'master_host';
       $source_port = 'master_port';
    }
@@ -504,7 +504,7 @@ sub get_replica_status {
 
    my $server_version = VersionParser->new($dbh);
    my $replica_name = 'replica';
-   if ( $server_version < '8.1' || $server_version->flavor() =~ m/maria/ ) {
+   if ( $server_version lt '8.1' || $server_version->flavor() =~ m/maria/ ) {
       $replica_name = 'slave';
    }
 
@@ -573,7 +573,7 @@ sub get_source_status {
 
    my $vp = VersionParser->new($dbh);
    my $source_name = 'binary log';
-   if ( $vp < '8.1' || $vp->flavor() =~ m/maria/ ) {
+   if ( $vp lt '8.1' || $vp->flavor() =~ m/maria/ ) {
       $source_name = 'master';
    }
 
@@ -646,7 +646,7 @@ sub wait_for_source {
       }
       my $vp = VersionParser->new($replica_dbh);
       my $source_name = 'source';
-      if ( $vp < '8.1' || $vp->flavor() =~ m/maria/ ) {
+      if ( $vp lt '8.1' || $vp->flavor() =~ m/maria/ ) {
          $source_name = 'master';
       }
       my $channel_sql = $vp > '5.6' && $self->{channel} ? ", '$self->{channel}'" : '';
@@ -679,7 +679,7 @@ sub stop_replica {
    my ( $self, $dbh ) = @_;
    my $vp = VersionParser->new($dbh);
    my $replica_name = 'replica';
-   if ( $vp < '8.1' || $vp->flavor() =~ m/maria/ ) {
+   if ( $vp lt '8.1' || $vp->flavor() =~ m/maria/ ) {
       $replica_name = 'slave';
    }
    my $sth = $self->{sths}->{$dbh}->{STOP_REPLICA}
@@ -695,7 +695,7 @@ sub start_replica {
    my $vp = VersionParser->new($dbh);
    my $source_name = 'source';
    my $replica_name = 'replica';
-   if ( $vp < '8.1' || $vp->flavor() =~ m/maria/ ) {
+   if ( $vp lt '8.1' || $vp->flavor() =~ m/maria/ ) {
       $source_name = 'master';
       $replica_name = 'slave';
    }
@@ -753,7 +753,7 @@ sub catchup_to_source {
             
          my $vp = VersionParser->new($replica);
          my $replica_name = 'replica';
-         if ( $vp < '8.1' || $vp->flavor() =~ m/maria/ ) {
+         if ( $vp lt '8.1' || $vp->flavor() =~ m/maria/ ) {
             $replica_name = 'slave';
          }
 
@@ -805,13 +805,13 @@ sub catchup_to_same_pos {
 
    my $vp1 = VersionParser->new($s1_dbh);
    my $replica1_name = 'replica';
-   if ( $vp1 < '8.1' || $vp1->flavor() =~ m/maria/ ) {
+   if ( $vp1 lt '8.1' || $vp1->flavor() =~ m/maria/ ) {
       $replica1_name = 'slave';
    }
 
    my $vp2 = VersionParser->new($s2_dbh);
    my $replica2_name = 'replica';
-   if ( $vp2 < '8.1' || $vp2->flavor() =~ m/maria/ ) {
+   if ( $vp2 lt '8.1' || $vp2->flavor() =~ m/maria/ ) {
       $replica2_name = 'slave';
    }
 
@@ -837,7 +837,7 @@ sub has_replica_updates {
    
    my $vp = VersionParser->new($dbh);
    my $replica_name = 'replica';
-   if ( $vp < '8.1' || $vp->flavor() =~ m/maria/ ) {
+   if ( $vp lt '8.1' || $vp->flavor() =~ m/maria/ ) {
       $replica_name = 'slave';
    }
 
@@ -879,7 +879,7 @@ sub get_replica_lag {
    
    my $vp = VersionParser->new($dbh);
    my $source_name = 'source';
-   if ( $vp < '8.1' || $vp->flavor() =~ m/maria/ ) {
+   if ( $vp lt '8.1' || $vp->flavor() =~ m/maria/ ) {
       $source_name = 'master';
    }
 
@@ -1041,7 +1041,7 @@ sub get_replication_filters {
 
    my $vp = VersionParser->new($dbh);
    my $replica_name = 'replica';
-   if ( $vp < '8.1' || $vp->flavor() =~ m/maria/ ) {
+   if ( $vp lt '8.1' || $vp->flavor() =~ m/maria/ ) {
       $replica_name = 'slave';
    }
 
diff --git a/t/pt-online-schema-change/pt-1717-resume.t b/t/pt-online-schema-change/pt-1717-resume.t
index ecd18e70b..b44138f12 100644
--- a/t/pt-online-schema-change/pt-1717-resume.t
+++ b/t/pt-online-schema-change/pt-1717-resume.t
@@ -59,7 +59,7 @@ diag(`/tmp/12347/start >/dev/null`);
 
 sub reset_query_cache {
     my @dbhs = @_;
-    return if ($sandbox_version >= '8.0');
+    return if ($sandbox_version ge '8.0');
     foreach my $dbh (@dbhs) {
         $dbh->do('RESET QUERY CACHE');
     }
diff --git a/t/pt-online-schema-change/pt-1760.t b/t/pt-online-schema-change/pt-1760.t
index 32d7b70f0..ec774f609 100644
--- a/t/pt-online-schema-change/pt-1760.t
+++ b/t/pt-online-schema-change/pt-1760.t
@@ -41,14 +41,14 @@ my $replica_dsn1 = 'h=127.0.0.1,P=12346,u=msandbox,p=msandbox';
 my $replica_dsn2 = 'h=127.0.0.1,P=12347,u=msandbox,p=msandbox';
 my $sample = "t/pt-online-schema-change/samples";
 my ($orig_master_info_repository, $orig_relay_log_info_repository);
-if ( $sandbox_version < '8.4' ) {
+if ( $sandbox_version lt '8.4' ) {
    ($orig_master_info_repository) = $replica_dbh1->selectrow_array(q{SELECT @@master_info_repository});
    ($orig_relay_log_info_repository) = $replica_dbh1->selectrow_array(q{SELECT @@relay_log_info_repository});
 }
 
 $replica_dbh1->do("stop ${replica_name}");
 $replica_dbh1->do("reset ${replica_name} all");
-if ( $sandbox_version < '8.4' ) {
+if ( $sandbox_version lt '8.4' ) {
    $replica_dbh1->do("SET GLOBAL master_info_repository='TABLE'");
    $replica_dbh1->do("SET GLOBAL relay_log_info_repository='TABLE'");
 }
@@ -83,7 +83,7 @@ like(
 $replica_dbh1->do("STOP ${replica_name}");
 $source_dbh->do("RESET ${source_reset}");
 $replica_dbh1->do("RESET ${replica_name} ALL");
-if ( $sandbox_version < '8.4' ) {
+if ( $sandbox_version lt '8.4' ) {
    $replica_dbh1->do("SET GLOBAL master_info_repository='${orig_master_info_repository}'");
    $replica_dbh1->do("SET GLOBAL relay_log_info_repository='${orig_relay_log_info_repository}'");
 }
diff --git a/t/pt-online-schema-change/pt-2168-cancel.t b/t/pt-online-schema-change/pt-2168-cancel.t
index d9844679e..929d2ce52 100644
--- a/t/pt-online-schema-change/pt-2168-cancel.t
+++ b/t/pt-online-schema-change/pt-2168-cancel.t
@@ -62,7 +62,7 @@ $sb->load_file('source', "$sample/create_dsns.sql");
 
 sub reset_query_cache {
     my @dbhs = @_;
-    return if ($sandbox_version >= '8.0');
+    return if ($sandbox_version ge '8.0');
     foreach my $dbh (@dbhs) {
         $dbh->do('RESET QUERY CACHE');
     }
diff --git a/t/pt-online-schema-change/pt-2168.t b/t/pt-online-schema-change/pt-2168.t
index 64123e468..2a6993456 100644
--- a/t/pt-online-schema-change/pt-2168.t
+++ b/t/pt-online-schema-change/pt-2168.t
@@ -55,7 +55,7 @@ diag(`/tmp/12347/start >/dev/null`);
 
 sub reset_query_cache {
     my @dbhs = @_;
-    return if ($sandbox_version >= '8.0');
+    return if ($sandbox_version ge '8.0');
     foreach my $dbh (@dbhs) {
         $dbh->do('RESET QUERY CACHE');
     }
diff --git a/t/pt-online-schema-change/pt-2241.t b/t/pt-online-schema-change/pt-2241.t
index 7c4e99ad4..42ded2187 100644
--- a/t/pt-online-schema-change/pt-2241.t
+++ b/t/pt-online-schema-change/pt-2241.t
@@ -45,7 +45,7 @@ my $replica_dsn2 = 'h=127.0.0.1,P=12347,u=msandbox,p=msandbox';
 
 sub reset_query_cache {
     my @dbhs = @_;
-    return if ($sandbox_version >= '8.0');
+    return if ($sandbox_version ge '8.0');
     foreach my $dbh (@dbhs) {
         $dbh->do('RESET QUERY CACHE');
     }
diff --git a/t/pt-online-schema-change/slave_lag.t b/t/pt-online-schema-change/slave_lag.t
index 8ed942264..be880aeca 100644
--- a/t/pt-online-schema-change/slave_lag.t
+++ b/t/pt-online-schema-change/slave_lag.t
@@ -45,7 +45,7 @@ my $replica_dsn = 'h=127.0.0.1,P=12346,u=msandbox,p=msandbox';
 
 sub reset_query_cache {
     my @dbhs = @_;
-    return if ($sandbox_version >= '8.0');
+    return if ($sandbox_version ge '8.0');
     foreach my $dbh (@dbhs) {
         $dbh->do('RESET QUERY CACHE');
     }
diff --git a/t/pt-show-grants/all_grants.t b/t/pt-show-grants/all_grants.t
index 67867dea1..3b651c201 100644
--- a/t/pt-show-grants/all_grants.t
+++ b/t/pt-show-grants/all_grants.t
@@ -106,7 +106,7 @@ GRANT USAGE ON *.* TO 'bob'@'192.168.1.1';
 GRANT USAGE ON *.* TO 'bob'@'localhost';
 END_OUTPUT_2
 
-my $expected =  $sandbox_version < '5.7' ? $expected_56 : $sandbox_version < '8.0' ? $expected_57 : $sandbox_version < '8.4' ? $expected_80 : $expected_84;
+my $expected =  $sandbox_version lt '5.7' ? $expected_56 : $sandbox_version lt '8.0' ? $expected_57 : $sandbox_version lt '8.4' ? $expected_80 : $expected_84;
 
 is(
    $output,
@@ -144,7 +144,7 @@ $expected_56 = <<'END_OUTPUT_4';
 GRANT USAGE ON *.* TO 'bob'@'192.168.1.1';
 END_OUTPUT_4
 
-$expected =  $sandbox_version < '5.7' ? $expected_56 : $sandbox_version < '8.0' ? $expected_57 : $sandbox_version < '8.4' ? $expected_80 : $expected_84;
+$expected =  $sandbox_version lt '5.7' ? $expected_56 : $sandbox_version lt '8.0' ? $expected_57 : $sandbox_version lt '8.4' ? $expected_80 : $expected_84;
 
 is(
    $output,
diff --git a/t/pt-show-grants/basics.t b/t/pt-show-grants/basics.t
index a355345d3..475e58af7 100644
--- a/t/pt-show-grants/basics.t
+++ b/t/pt-show-grants/basics.t
@@ -66,7 +66,7 @@ like(
 );
 
 SKIP: {
-   skip "MySQL 8.0+ doesn't have ALL PRIVILEGES", 1 if ($sandbox_version >= '8.0');
+   skip "MySQL 8.0+ doesn't have ALL PRIVILEGES", 1 if ($sandbox_version ge '8.0');
    like(
       $output,
       qr/^REVOKE ALL PRIVILEGES/m,
@@ -105,7 +105,7 @@ diag(`/tmp/12345/use -u root -e "CREATE USER 'sally'\@'%'"`);
 diag(`/tmp/12345/use -u root -e "GRANT SELECT(DateCreated, PckPrice, PaymentStat, SANumber) ON test.t TO 'sally'\@'%'"`);
 diag(`/tmp/12345/use -u root -e "GRANT SELECT(city_id), INSERT(city) ON sakila.city TO 'sally'\@'%'"`);
 
-my $postfix = $sandbox_version >= '8.4' ? '-84' : $sandbox_version >= '8.0' ? '-80' : $sandbox_version < '5.7' ? '' : '-57';
+my $postfix = $sandbox_version ge '8.4' ? '-84' : $sandbox_version ge '8.0' ? '-80' : $sandbox_version lt '5.7' ? '' : '-57';
 
 # 11
 ok(
diff --git a/t/pt-table-checksum/basics.t b/t/pt-table-checksum/basics.t
index 2b1ba33db..6cb71a8f7 100644
--- a/t/pt-table-checksum/basics.t
+++ b/t/pt-table-checksum/basics.t
@@ -100,7 +100,7 @@ ok(
 # other than to ensure that there's at least one for each table.
 # 2
 $row = $source_dbh->selectrow_arrayref("select count(*) from percona.checksums");
-my $max_chunks = $sandbox_version < '5.7' ? 60 : 100;
+my $max_chunks = $sandbox_version lt '5.7' ? 60 : 100;
 
 ok(
    $row->[0] > 25 && $row->[0] < $max_chunks,
@@ -127,7 +127,7 @@ ok(
 
 $row = $source_dbh->selectrow_arrayref("select count(*) from percona.checksums");
 
-my $max_rows = $sandbox_version >= '8.0' ? 102 : $sandbox_version < '5.7' ? 90 : 100;
+my $max_rows = $sandbox_version ge '8.0' ? 102 : $sandbox_version lt '5.7' ? 90 : 100;
 ok(
    $row->[0] >= 75 && $row->[0] <= $max_rows,
    'Between 75 and 90 chunks on source'
diff --git a/t/pt-table-checksum/issue_47.t b/t/pt-table-checksum/issue_47.t
index 42f929414..a4819837d 100644
--- a/t/pt-table-checksum/issue_47.t
+++ b/t/pt-table-checksum/issue_47.t
@@ -21,7 +21,7 @@ my $source_dbh = $sb->get_dbh_for('source');
 
 if ( !$source_dbh ) {
    plan skip_all => 'Cannot connect to sandbox source';
-} elsif ($sandbox_version >= '8.0') { 
+} elsif ($sandbox_version ge '8.0') { 
    plan skip_all => "8.0 requires fix for https://jira.percona.com/browse/PT-1805";
 } else {
    plan tests => 3;
diff --git a/t/pt-table-checksum/pt-204.t b/t/pt-table-checksum/pt-204.t
index b5ce649eb..7721db750 100644
--- a/t/pt-table-checksum/pt-204.t
+++ b/t/pt-table-checksum/pt-204.t
@@ -70,7 +70,7 @@ like(
    stderr => 1,
 );
 
-my $return_code = ($sandbox_version >= '5.7') ? 16 : 0;
+my $return_code = ($sandbox_version ge '5.7') ? 16 : 0;
 
 is(
    $exit_status,

From 2ca815650e267a85903ad87a77d948d056033492 Mon Sep 17 00:00:00 2001
From: Sveta Smirnova <sveta.smirnova@percona.com>
Date: Wed, 28 Aug 2024 00:41:11 +0300
Subject: [PATCH 17/31] PT-2340 - Support MySQL 8.4

- Created pt-replica-find. pt-slave-find kept as symbolic link
---
 bin/pt-replica-find                           | 4787 +++++++++++++++++
 bin/pt-slave-find                             | 4783 +---------------
 t/pt-replica-find/deprecation.t               |   37 +
 t/pt-replica-find/pt-replica-find.t           |  170 +
 .../pt-slave-find.t                           |    4 +-
 .../samples/summary001-5.0.txt                |    0
 .../samples/summary001.txt                    |    0
 7 files changed, 4997 insertions(+), 4784 deletions(-)
 create mode 100755 bin/pt-replica-find
 mode change 100755 => 120000 bin/pt-slave-find
 create mode 100644 t/pt-replica-find/deprecation.t
 create mode 100644 t/pt-replica-find/pt-replica-find.t
 rename t/{pt-slave-find => pt-replica-find}/pt-slave-find.t (97%)
 rename t/{pt-slave-find => pt-replica-find}/samples/summary001-5.0.txt (100%)
 rename t/{pt-slave-find => pt-replica-find}/samples/summary001.txt (100%)

diff --git a/bin/pt-replica-find b/bin/pt-replica-find
new file mode 100755
index 000000000..9a9637fec
--- /dev/null
+++ b/bin/pt-replica-find
@@ -0,0 +1,4787 @@
+#!/usr/bin/env perl
+
+# This program is part of Percona Toolkit: http://www.percona.com/software/
+# See "COPYRIGHT, LICENSE, AND WARRANTY" at the end of this file for legal
+# notices and disclaimers.
+
+use strict;
+use warnings FATAL => 'all';
+
+# This tool is "fat-packed": most of its dependent modules are embedded
+# in this file.  Setting %INC to this file for each module makes Perl aware
+# of this so it will not try to load the module from @INC.  See the tool's
+# documentation for a full list of dependencies.
+BEGIN {
+   $INC{$_} = __FILE__ for map { (my $pkg = "$_.pm") =~ s!::!/!g; $pkg } (qw(
+      OptionParser
+      Lmo::Utils
+      Lmo::Meta
+      Lmo::Object
+      Lmo::Types
+      Lmo
+      DSNParser
+      MasterSlave
+      Daemon
+      VersionParser
+      Transformers
+   ));
+}
+
+# ###########################################################################
+# OptionParser package
+# This package is a copy without comments from the original.  The original
+# with comments and its test file can be found in the GitHub repository at,
+#   lib/OptionParser.pm
+#   t/lib/OptionParser.t
+# See https://github.com/percona/percona-toolkit for more information.
+# ###########################################################################
+{
+package OptionParser;
+
+use strict;
+use warnings FATAL => 'all';
+use English qw(-no_match_vars);
+use constant PTDEBUG => $ENV{PTDEBUG} || 0;
+
+use List::Util qw(max);
+use Getopt::Long;
+use Data::Dumper;
+
+my $POD_link_re = '[LC]<"?([^">]+)"?>';
+
+sub new {
+   my ( $class, %args ) = @_;
+   my @required_args = qw();
+   foreach my $arg ( @required_args ) {
+      die "I need a $arg argument" unless $args{$arg};
+   }
+
+   my ($program_name) = $PROGRAM_NAME =~ m/([.A-Za-z-]+)$/;
+   $program_name ||= $PROGRAM_NAME;
+   my $home = $ENV{HOME} || $ENV{HOMEPATH} || $ENV{USERPROFILE} || '.';
+
+   my %attributes = (
+      'type'       => 1,
+      'short form' => 1,
+      'group'      => 1,
+      'default'    => 1,
+      'cumulative' => 1,
+      'negatable'  => 1,
+      'repeatable' => 1,  # means it can be specified more than once
+   );
+
+   my $self = {
+      head1             => 'OPTIONS',        # These args are used internally
+      skip_rules        => 0,                # to instantiate another Option-
+      item              => '--(.*)',         # Parser obj that parses the
+      attributes        => \%attributes,     # DSN OPTIONS section.  Tools
+      parse_attributes  => \&_parse_attribs, # don't tinker with these args.
+
+      %args,
+
+      strict            => 1,  # disabled by a special rule
+      program_name      => $program_name,
+      opts              => {},
+      got_opts          => 0,
+      short_opts        => {},
+      defaults          => {},
+      groups            => {},
+      allowed_groups    => {},
+      errors            => [],
+      rules             => [],  # desc of rules for --help
+      mutex             => [],  # rule: opts are mutually exclusive
+      atleast1          => [],  # rule: at least one opt is required
+      disables          => {},  # rule: opt disables other opts
+      defaults_to       => {},  # rule: opt defaults to value of other opt
+      DSNParser         => undef,
+      default_files     => [
+         "/etc/percona-toolkit/percona-toolkit.conf",
+         "/etc/percona-toolkit/$program_name.conf",
+         "$home/.percona-toolkit.conf",
+         "$home/.$program_name.conf",
+      ],
+      types             => {
+         string => 's', # standard Getopt type
+         int    => 'i', # standard Getopt type
+         float  => 'f', # standard Getopt type
+         Hash   => 'H', # hash, formed from a comma-separated list
+         hash   => 'h', # hash as above, but only if a value is given
+         Array  => 'A', # array, similar to Hash
+         array  => 'a', # array, similar to hash
+         DSN    => 'd', # DSN
+         size   => 'z', # size with kMG suffix (powers of 2^10)
+         time   => 'm', # time, with an optional suffix of s/h/m/d
+      },
+   };
+
+   return bless $self, $class;
+}
+
+sub get_specs {
+   my ( $self, $file ) = @_;
+   $file ||= $self->{file} || __FILE__;
+   my @specs = $self->_pod_to_specs($file);
+   $self->_parse_specs(@specs);
+
+   open my $fh, "<", $file or die "Cannot open $file: $OS_ERROR";
+   my $contents = do { local $/ = undef; <$fh> };
+   close $fh;
+   if ( $contents =~ m/^=head1 DSN OPTIONS/m ) {
+      PTDEBUG && _d('Parsing DSN OPTIONS');
+      my $dsn_attribs = {
+         dsn  => 1,
+         copy => 1,
+      };
+      my $parse_dsn_attribs = sub {
+         my ( $self, $option, $attribs ) = @_;
+         map {
+            my $val = $attribs->{$_};
+            if ( $val ) {
+               $val    = $val eq 'yes' ? 1
+                       : $val eq 'no'  ? 0
+                       :                 $val;
+               $attribs->{$_} = $val;
+            }
+         } keys %$attribs;
+         return {
+            key => $option,
+            %$attribs,
+         };
+      };
+      my $dsn_o = new OptionParser(
+         description       => 'DSN OPTIONS',
+         head1             => 'DSN OPTIONS',
+         dsn               => 0,         # XXX don't infinitely recurse!
+         item              => '\* (.)',  # key opts are a single character
+         skip_rules        => 1,         # no rules before opts
+         attributes        => $dsn_attribs,
+         parse_attributes  => $parse_dsn_attribs,
+      );
+      my @dsn_opts = map {
+         my $opts = {
+            key  => $_->{spec}->{key},
+            dsn  => $_->{spec}->{dsn},
+            copy => $_->{spec}->{copy},
+            desc => $_->{desc},
+         };
+         $opts;
+      } $dsn_o->_pod_to_specs($file);
+      $self->{DSNParser} = DSNParser->new(opts => \@dsn_opts);
+   }
+
+   if ( $contents =~ m/^=head1 VERSION\n\n^(.+)$/m ) {
+      $self->{version} = $1;
+      PTDEBUG && _d($self->{version});
+   }
+
+   return;
+}
+
+sub DSNParser {
+   my ( $self ) = @_;
+   return $self->{DSNParser};
+};
+
+sub get_defaults_files {
+   my ( $self ) = @_;
+   return @{$self->{default_files}};
+}
+
+sub _pod_to_specs {
+   my ( $self, $file ) = @_;
+   $file ||= $self->{file} || __FILE__;
+   open my $fh, '<', $file or die "Cannot open $file: $OS_ERROR";
+
+   my @specs = ();
+   my @rules = ();
+   my $para;
+
+   local $INPUT_RECORD_SEPARATOR = '';
+   while ( $para = <$fh> ) {
+      next unless $para =~ m/^=head1 $self->{head1}/;
+      last;
+   }
+
+   while ( $para = <$fh> ) {
+      last if $para =~ m/^=over/;
+      next if $self->{skip_rules};
+      chomp $para;
+      $para =~ s/\s+/ /g;
+      $para =~ s/$POD_link_re/$1/go;
+      PTDEBUG && _d('Option rule:', $para);
+      push @rules, $para;
+   }
+
+   die "POD has no $self->{head1} section" unless $para;
+
+   do {
+      if ( my ($option) = $para =~ m/^=item $self->{item}/ ) {
+         chomp $para;
+         PTDEBUG && _d($para);
+         my %attribs;
+
+         $para = <$fh>; # read next paragraph, possibly attributes
+
+         if ( $para =~ m/: / ) { # attributes
+            $para =~ s/\s+\Z//g;
+            %attribs = map {
+                  my ( $attrib, $val) = split(/: /, $_);
+                  die "Unrecognized attribute for --$option: $attrib"
+                     unless $self->{attributes}->{$attrib};
+                  ($attrib, $val);
+               } split(/; /, $para);
+            if ( $attribs{'short form'} ) {
+               $attribs{'short form'} =~ s/-//;
+            }
+            $para = <$fh>; # read next paragraph, probably short help desc
+         }
+         else {
+            PTDEBUG && _d('Option has no attributes');
+         }
+
+         $para =~ s/\s+\Z//g;
+         $para =~ s/\s+/ /g;
+         $para =~ s/$POD_link_re/$1/go;
+
+         $para =~ s/\.(?:\n.*| [A-Z].*|\Z)//s;
+         PTDEBUG && _d('Short help:', $para);
+
+         die "No description after option spec $option" if $para =~ m/^=item/;
+
+         if ( my ($base_option) =  $option =~ m/^\[no\](.*)/ ) {
+            $option = $base_option;
+            $attribs{'negatable'} = 1;
+         }
+
+         push @specs, {
+            spec  => $self->{parse_attributes}->($self, $option, \%attribs),
+            desc  => $para
+               . (defined $attribs{default} ? " (default $attribs{default})" : ''),
+            group => ($attribs{'group'} ? $attribs{'group'} : 'default'),
+            attributes => \%attribs
+         };
+      }
+      while ( $para = <$fh> ) {
+         last unless $para;
+         if ( $para =~ m/^=head1/ ) {
+            $para = undef; # Can't 'last' out of a do {} block.
+            last;
+         }
+         last if $para =~ m/^=item /;
+      }
+   } while ( $para );
+
+   die "No valid specs in $self->{head1}" unless @specs;
+
+   close $fh;
+   return @specs, @rules;
+}
+
+sub _parse_specs {
+   my ( $self, @specs ) = @_;
+   my %disables; # special rule that requires deferred checking
+
+   foreach my $opt ( @specs ) {
+      if ( ref $opt ) { # It's an option spec, not a rule.
+         PTDEBUG && _d('Parsing opt spec:',
+            map { ($_, '=>', $opt->{$_}) } keys %$opt);
+
+         my ( $long, $short ) = $opt->{spec} =~ m/^([\w-]+)(?:\|([^!+=]*))?/;
+         if ( !$long ) {
+            die "Cannot parse long option from spec $opt->{spec}";
+         }
+         $opt->{long} = $long;
+
+         die "Duplicate long option --$long" if exists $self->{opts}->{$long};
+         $self->{opts}->{$long} = $opt;
+
+         if ( length $long == 1 ) {
+            PTDEBUG && _d('Long opt', $long, 'looks like short opt');
+            $self->{short_opts}->{$long} = $long;
+         }
+
+         if ( $short ) {
+            die "Duplicate short option -$short"
+               if exists $self->{short_opts}->{$short};
+            $self->{short_opts}->{$short} = $long;
+            $opt->{short} = $short;
+         }
+         else {
+            $opt->{short} = undef;
+         }
+
+         $opt->{is_negatable}  = $opt->{spec} =~ m/!/        ? 1 : 0;
+         $opt->{is_cumulative} = $opt->{spec} =~ m/\+/       ? 1 : 0;
+         $opt->{is_repeatable} = $opt->{attributes}->{repeatable} ? 1 : 0;
+         $opt->{is_required}   = $opt->{desc} =~ m/required/ ? 1 : 0;
+
+         $opt->{group} ||= 'default';
+         $self->{groups}->{ $opt->{group} }->{$long} = 1;
+
+         $opt->{value} = undef;
+         $opt->{got}   = 0;
+
+         my ( $type ) = $opt->{spec} =~ m/=(.)/;
+         $opt->{type} = $type;
+         PTDEBUG && _d($long, 'type:', $type);
+
+
+         $opt->{spec} =~ s/=./=s/ if ( $type && $type =~ m/[HhAadzm]/ );
+
+         if ( (my ($def) = $opt->{desc} =~ m/default\b(?: ([^)]+))?/) ) {
+            $self->{defaults}->{$long} = defined $def ? $def : 1;
+            PTDEBUG && _d($long, 'default:', $def);
+         }
+
+         if ( $long eq 'config' ) {
+            $self->{defaults}->{$long} = join(',', $self->get_defaults_files());
+         }
+
+         if ( (my ($dis) = $opt->{desc} =~ m/(disables .*)/) ) {
+            $disables{$long} = $dis;
+            PTDEBUG && _d('Deferring check of disables rule for', $opt, $dis);
+         }
+
+         $self->{opts}->{$long} = $opt;
+      }
+      else { # It's an option rule, not a spec.
+         PTDEBUG && _d('Parsing rule:', $opt);
+         push @{$self->{rules}}, $opt;
+         my @participants = $self->_get_participants($opt);
+         my $rule_ok = 0;
+
+         if ( $opt =~ m/mutually exclusive|one and only one/ ) {
+            $rule_ok = 1;
+            push @{$self->{mutex}}, \@participants;
+            PTDEBUG && _d(@participants, 'are mutually exclusive');
+         }
+         if ( $opt =~ m/at least one|one and only one/ ) {
+            $rule_ok = 1;
+            push @{$self->{atleast1}}, \@participants;
+            PTDEBUG && _d(@participants, 'require at least one');
+         }
+         if ( $opt =~ m/default to/ ) {
+            $rule_ok = 1;
+            $self->{defaults_to}->{$participants[0]} = $participants[1];
+            PTDEBUG && _d($participants[0], 'defaults to', $participants[1]);
+         }
+         if ( $opt =~ m/restricted to option groups/ ) {
+            $rule_ok = 1;
+            my ($groups) = $opt =~ m/groups ([\w\s\,]+)/;
+            my @groups = split(',', $groups);
+            %{$self->{allowed_groups}->{$participants[0]}} = map {
+               s/\s+//;
+               $_ => 1;
+            } @groups;
+         }
+         if( $opt =~ m/accepts additional command-line arguments/ ) {
+            $rule_ok = 1;
+            $self->{strict} = 0;
+            PTDEBUG && _d("Strict mode disabled by rule");
+         }
+
+         die "Unrecognized option rule: $opt" unless $rule_ok;
+      }
+   }
+
+   foreach my $long ( keys %disables ) {
+      my @participants = $self->_get_participants($disables{$long});
+      $self->{disables}->{$long} = \@participants;
+      PTDEBUG && _d('Option', $long, 'disables', @participants);
+   }
+
+   return;
+}
+
+sub _get_participants {
+   my ( $self, $str ) = @_;
+   my @participants;
+   foreach my $long ( $str =~ m/--(?:\[no\])?([\w-]+)/g ) {
+      die "Option --$long does not exist while processing rule $str"
+         unless exists $self->{opts}->{$long};
+      push @participants, $long;
+   }
+   PTDEBUG && _d('Participants for', $str, ':', @participants);
+   return @participants;
+}
+
+sub opts {
+   my ( $self ) = @_;
+   my %opts = %{$self->{opts}};
+   return %opts;
+}
+
+sub short_opts {
+   my ( $self ) = @_;
+   my %short_opts = %{$self->{short_opts}};
+   return %short_opts;
+}
+
+sub set_defaults {
+   my ( $self, %defaults ) = @_;
+   $self->{defaults} = {};
+   foreach my $long ( keys %defaults ) {
+      die "Cannot set default for nonexistent option $long"
+         unless exists $self->{opts}->{$long};
+      $self->{defaults}->{$long} = $defaults{$long};
+      PTDEBUG && _d('Default val for', $long, ':', $defaults{$long});
+   }
+   return;
+}
+
+sub get_defaults {
+   my ( $self ) = @_;
+   return $self->{defaults};
+}
+
+sub get_groups {
+   my ( $self ) = @_;
+   return $self->{groups};
+}
+
+sub _set_option {
+   my ( $self, $opt, $val ) = @_;
+   my $long = exists $self->{opts}->{$opt}       ? $opt
+            : exists $self->{short_opts}->{$opt} ? $self->{short_opts}->{$opt}
+            : die "Getopt::Long gave a nonexistent option: $opt";
+   $opt = $self->{opts}->{$long};
+   if ( $opt->{is_cumulative} ) {
+      $opt->{value}++;
+   }
+   elsif ( ($opt->{type} || '') eq 's' && $val =~ m/^--?(.+)/ ) {
+      my $next_opt = $1;
+      if (    exists $self->{opts}->{$next_opt}
+           || exists $self->{short_opts}->{$next_opt} ) {
+         $self->save_error("--$long requires a string value");
+         return;
+      }
+      else {
+         if ($opt->{is_repeatable}) {
+            push @{$opt->{value}} , $val;
+         }
+         else {
+            $opt->{value} = $val;
+         }
+      }
+   }
+   else {
+      if ($opt->{is_repeatable}) {
+         push @{$opt->{value}} , $val;
+      }
+      else {
+         $opt->{value} = $val;
+      }
+   }
+   $opt->{got} = 1;
+   PTDEBUG && _d('Got option', $long, '=', $val);
+}
+
+sub get_opts {
+   my ( $self ) = @_;
+
+   foreach my $long ( keys %{$self->{opts}} ) {
+      $self->{opts}->{$long}->{got} = 0;
+      $self->{opts}->{$long}->{value}
+         = exists $self->{defaults}->{$long}       ? $self->{defaults}->{$long}
+         : $self->{opts}->{$long}->{is_cumulative} ? 0
+         : undef;
+   }
+   $self->{got_opts} = 0;
+
+   $self->{errors} = [];
+
+   if ( @ARGV && $ARGV[0] =~/^--config=/ ) {
+      $ARGV[0] = substr($ARGV[0],9);
+      $ARGV[0] =~ s/^'(.*)'$/$1/;
+      $ARGV[0] =~ s/^"(.*)"$/$1/;
+      $self->_set_option('config', shift @ARGV);
+   }
+   if ( @ARGV && $ARGV[0] eq "--config" ) {
+      shift @ARGV;
+      $self->_set_option('config', shift @ARGV);
+   }
+   if ( $self->has('config') ) {
+      my @extra_args;
+      foreach my $filename ( split(',', $self->get('config')) ) {
+         eval {
+            push @extra_args, $self->_read_config_file($filename);
+         };
+         if ( $EVAL_ERROR ) {
+            if ( $self->got('config') ) {
+               die $EVAL_ERROR;
+            }
+            elsif ( PTDEBUG ) {
+               _d($EVAL_ERROR);
+            }
+         }
+      }
+      unshift @ARGV, @extra_args;
+   }
+
+   Getopt::Long::Configure('no_ignore_case', 'bundling');
+   GetOptions(
+      map    { $_->{spec} => sub { $self->_set_option(@_); } }
+      grep   { $_->{long} ne 'config' } # --config is handled specially above.
+      values %{$self->{opts}}
+   ) or $self->save_error('Error parsing options');
+
+   if ( exists $self->{opts}->{version} && $self->{opts}->{version}->{got} ) {
+      if ( $self->{version} ) {
+         print $self->{version}, "\n";
+         exit 0;
+      }
+      else {
+         print "Error parsing version.  See the VERSION section of the tool's documentation.\n";
+         exit 1;
+      }
+   }
+
+   if ( @ARGV && $self->{strict} ) {
+      $self->save_error("Unrecognized command-line options @ARGV");
+   }
+
+   foreach my $mutex ( @{$self->{mutex}} ) {
+      my @set = grep { $self->{opts}->{$_}->{got} } @$mutex;
+      if ( @set > 1 ) {
+         my $err = join(', ', map { "--$self->{opts}->{$_}->{long}" }
+                      @{$mutex}[ 0 .. scalar(@$mutex) - 2] )
+                 . ' and --'.$self->{opts}->{$mutex->[-1]}->{long}
+                 . ' are mutually exclusive.';
+         $self->save_error($err);
+      }
+   }
+
+   foreach my $required ( @{$self->{atleast1}} ) {
+      my @set = grep { $self->{opts}->{$_}->{got} } @$required;
+      if ( @set == 0 ) {
+         my $err = join(', ', map { "--$self->{opts}->{$_}->{long}" }
+                      @{$required}[ 0 .. scalar(@$required) - 2] )
+                 .' or --'.$self->{opts}->{$required->[-1]}->{long};
+         $self->save_error("Specify at least one of $err");
+      }
+   }
+
+   $self->_check_opts( keys %{$self->{opts}} );
+   $self->{got_opts} = 1;
+   return;
+}
+
+sub _check_opts {
+   my ( $self, @long ) = @_;
+   my $long_last = scalar @long;
+   while ( @long ) {
+      foreach my $i ( 0..$#long ) {
+         my $long = $long[$i];
+         next unless $long;
+         my $opt  = $self->{opts}->{$long};
+         if ( $opt->{got} ) {
+            if ( exists $self->{disables}->{$long} ) {
+               my @disable_opts = @{$self->{disables}->{$long}};
+               map { $self->{opts}->{$_}->{value} = undef; } @disable_opts;
+               PTDEBUG && _d('Unset options', @disable_opts,
+                  'because', $long,'disables them');
+            }
+
+            if ( exists $self->{allowed_groups}->{$long} ) {
+
+               my @restricted_groups = grep {
+                  !exists $self->{allowed_groups}->{$long}->{$_}
+               } keys %{$self->{groups}};
+
+               my @restricted_opts;
+               foreach my $restricted_group ( @restricted_groups ) {
+                  RESTRICTED_OPT:
+                  foreach my $restricted_opt (
+                     keys %{$self->{groups}->{$restricted_group}} )
+                  {
+                     next RESTRICTED_OPT if $restricted_opt eq $long;
+                     push @restricted_opts, $restricted_opt
+                        if $self->{opts}->{$restricted_opt}->{got};
+                  }
+               }
+
+               if ( @restricted_opts ) {
+                  my $err;
+                  if ( @restricted_opts == 1 ) {
+                     $err = "--$restricted_opts[0]";
+                  }
+                  else {
+                     $err = join(', ',
+                               map { "--$self->{opts}->{$_}->{long}" }
+                               grep { $_ }
+                               @restricted_opts[0..scalar(@restricted_opts) - 2]
+                            )
+                          . ' or --'.$self->{opts}->{$restricted_opts[-1]}->{long};
+                  }
+                  $self->save_error("--$long is not allowed with $err");
+               }
+            }
+
+         }
+         elsif ( $opt->{is_required} ) {
+            $self->save_error("Required option --$long must be specified");
+         }
+
+         $self->_validate_type($opt);
+         if ( $opt->{parsed} ) {
+            delete $long[$i];
+         }
+         else {
+            PTDEBUG && _d('Temporarily failed to parse', $long);
+         }
+      }
+
+      die "Failed to parse options, possibly due to circular dependencies"
+         if @long == $long_last;
+      $long_last = @long;
+   }
+
+   return;
+}
+
+sub _validate_type {
+   my ( $self, $opt ) = @_;
+   return unless $opt;
+
+   if ( !$opt->{type} ) {
+      $opt->{parsed} = 1;
+      return;
+   }
+
+   my $val = $opt->{value};
+
+   if ( $val && $opt->{type} eq 'm' ) {  # type time
+      PTDEBUG && _d('Parsing option', $opt->{long}, 'as a time value');
+      my ( $prefix, $num, $suffix ) = $val =~ m/([+-]?)(\d+)([a-z])?$/;
+      if ( !$suffix ) {
+         my ( $s ) = $opt->{desc} =~ m/\(suffix (.)\)/;
+         $suffix = $s || 's';
+         PTDEBUG && _d('No suffix given; using', $suffix, 'for',
+            $opt->{long}, '(value:', $val, ')');
+      }
+      if ( $suffix =~ m/[smhd]/ ) {
+         $val = $suffix eq 's' ? $num            # Seconds
+              : $suffix eq 'm' ? $num * 60       # Minutes
+              : $suffix eq 'h' ? $num * 3600     # Hours
+              :                  $num * 86400;   # Days
+         $opt->{value} = ($prefix || '') . $val;
+         PTDEBUG && _d('Setting option', $opt->{long}, 'to', $val);
+      }
+      else {
+         $self->save_error("Invalid time suffix for --$opt->{long}");
+      }
+   }
+   elsif ( $val && $opt->{type} eq 'd' ) {  # type DSN
+      PTDEBUG && _d('Parsing option', $opt->{long}, 'as a DSN');
+      my $prev = {};
+      my $from_key = $self->{defaults_to}->{ $opt->{long} };
+      if ( $from_key ) {
+         PTDEBUG && _d($opt->{long}, 'DSN copies from', $from_key, 'DSN');
+         if ( $self->{opts}->{$from_key}->{parsed} ) {
+            $prev = $self->{opts}->{$from_key}->{value};
+         }
+         else {
+            PTDEBUG && _d('Cannot parse', $opt->{long}, 'until',
+               $from_key, 'parsed');
+            return;
+         }
+      }
+      my $defaults = $self->{DSNParser}->parse_options($self);
+      if (!$opt->{attributes}->{repeatable}) {
+          $opt->{value} = $self->{DSNParser}->parse($val, $prev, $defaults);
+      } else {
+          my $values = [];
+          for my $dsn_string (@$val) {
+              push @$values, $self->{DSNParser}->parse($dsn_string, $prev, $defaults);
+          }
+          $opt->{value} = $values;
+      }
+   }
+   elsif ( $val && $opt->{type} eq 'z' ) {  # type size
+      PTDEBUG && _d('Parsing option', $opt->{long}, 'as a size value');
+      $self->_parse_size($opt, $val);
+   }
+   elsif ( $opt->{type} eq 'H' || (defined $val && $opt->{type} eq 'h') ) {
+      $opt->{value} = { map { $_ => 1 } split(/(?<!\\),\s*/, ($val || '')) };
+   }
+   elsif ( $opt->{type} eq 'A' || (defined $val && $opt->{type} eq 'a') ) {
+      $opt->{value} = [ split(/(?<!\\),\s*/, ($val || '')) ];
+   }
+   else {
+      PTDEBUG && _d('Nothing to validate for option',
+         $opt->{long}, 'type', $opt->{type}, 'value', $val);
+   }
+
+   $opt->{parsed} = 1;
+   return;
+}
+
+sub get {
+   my ( $self, $opt ) = @_;
+   my $long = (length $opt == 1 ? $self->{short_opts}->{$opt} : $opt);
+   die "Option $opt does not exist"
+      unless $long && exists $self->{opts}->{$long};
+   return $self->{opts}->{$long}->{value};
+}
+
+sub got {
+   my ( $self, $opt ) = @_;
+   my $long = (length $opt == 1 ? $self->{short_opts}->{$opt} : $opt);
+   die "Option $opt does not exist"
+      unless $long && exists $self->{opts}->{$long};
+   return $self->{opts}->{$long}->{got};
+}
+
+sub has {
+   my ( $self, $opt ) = @_;
+   my $long = (length $opt == 1 ? $self->{short_opts}->{$opt} : $opt);
+   return defined $long ? exists $self->{opts}->{$long} : 0;
+}
+
+sub set {
+   my ( $self, $opt, $val ) = @_;
+   my $long = (length $opt == 1 ? $self->{short_opts}->{$opt} : $opt);
+   die "Option $opt does not exist"
+      unless $long && exists $self->{opts}->{$long};
+   $self->{opts}->{$long}->{value} = $val;
+   return;
+}
+
+sub save_error {
+   my ( $self, $error ) = @_;
+   push @{$self->{errors}}, $error;
+   return;
+}
+
+sub errors {
+   my ( $self ) = @_;
+   return $self->{errors};
+}
+
+sub usage {
+   my ( $self ) = @_;
+   warn "No usage string is set" unless $self->{usage}; # XXX
+   return "Usage: " . ($self->{usage} || '') . "\n";
+}
+
+sub descr {
+   my ( $self ) = @_;
+   warn "No description string is set" unless $self->{description}; # XXX
+   my $descr  = ($self->{description} || $self->{program_name} || '')
+              . "  For more details, please use the --help option, "
+              . "or try 'perldoc $PROGRAM_NAME' "
+              . "for complete documentation.";
+   $descr = join("\n", $descr =~ m/(.{0,80})(?:\s+|$)/g)
+      unless $ENV{DONT_BREAK_LINES};
+   $descr =~ s/ +$//mg;
+   return $descr;
+}
+
+sub usage_or_errors {
+   my ( $self, $file, $return ) = @_;
+   $file ||= $self->{file} || __FILE__;
+
+   if ( !$self->{description} || !$self->{usage} ) {
+      PTDEBUG && _d("Getting description and usage from SYNOPSIS in", $file);
+      my %synop = $self->_parse_synopsis($file);
+      $self->{description} ||= $synop{description};
+      $self->{usage}       ||= $synop{usage};
+      PTDEBUG && _d("Description:", $self->{description},
+         "\nUsage:", $self->{usage});
+   }
+
+   if ( $self->{opts}->{help}->{got} ) {
+      print $self->print_usage() or die "Cannot print usage: $OS_ERROR";
+      exit 0 unless $return;
+   }
+   elsif ( scalar @{$self->{errors}} ) {
+      print $self->print_errors() or die "Cannot print errors: $OS_ERROR";
+      exit 1 unless $return;
+   }
+
+   return;
+}
+
+sub print_errors {
+   my ( $self ) = @_;
+   my $usage = $self->usage() . "\n";
+   if ( (my @errors = @{$self->{errors}}) ) {
+      $usage .= join("\n  * ", 'Errors in command-line arguments:', @errors)
+              . "\n";
+   }
+   return $usage . "\n" . $self->descr();
+}
+
+sub print_usage {
+   my ( $self ) = @_;
+   die "Run get_opts() before print_usage()" unless $self->{got_opts};
+   my @opts = values %{$self->{opts}};
+
+   my $maxl = max(
+      map {
+         length($_->{long})               # option long name
+         + ($_->{is_negatable} ? 4 : 0)   # "[no]" if opt is negatable
+         + ($_->{type} ? 2 : 0)           # "=x" where x is the opt type
+      }
+      @opts);
+
+   my $maxs = max(0,
+      map {
+         length($_)
+         + ($self->{opts}->{$_}->{is_negatable} ? 4 : 0)
+         + ($self->{opts}->{$_}->{type} ? 2 : 0)
+      }
+      values %{$self->{short_opts}});
+
+   my $lcol = max($maxl, ($maxs + 3));
+   my $rcol = 80 - $lcol - 6;
+   my $rpad = ' ' x ( 80 - $rcol );
+
+   $maxs = max($lcol - 3, $maxs);
+
+   my $usage = $self->descr() . "\n" . $self->usage();
+
+   my @groups = reverse sort grep { $_ ne 'default'; } keys %{$self->{groups}};
+   push @groups, 'default';
+
+   foreach my $group ( reverse @groups ) {
+      $usage .= "\n".($group eq 'default' ? 'Options' : $group).":\n\n";
+      foreach my $opt (
+         sort { $a->{long} cmp $b->{long} }
+         grep { $_->{group} eq $group }
+         @opts )
+      {
+         my $long  = $opt->{is_negatable} ? "[no]$opt->{long}" : $opt->{long};
+         my $short = $opt->{short};
+         my $desc  = $opt->{desc};
+
+         $long .= $opt->{type} ? "=$opt->{type}" : "";
+
+         if ( $opt->{type} && $opt->{type} eq 'm' ) {
+            my ($s) = $desc =~ m/\(suffix (.)\)/;
+            $s    ||= 's';
+            $desc =~ s/\s+\(suffix .\)//;
+            $desc .= ".  Optional suffix s=seconds, m=minutes, h=hours, "
+                   . "d=days; if no suffix, $s is used.";
+         }
+         $desc = join("\n$rpad", grep { $_ } $desc =~ m/(.{0,$rcol}(?!\W))(?:\s+|(?<=\W)|$)/g);
+         $desc =~ s/ +$//mg;
+         if ( $short ) {
+            $usage .= sprintf("  --%-${maxs}s -%s  %s\n", $long, $short, $desc);
+         }
+         else {
+            $usage .= sprintf("  --%-${lcol}s  %s\n", $long, $desc);
+         }
+      }
+   }
+
+   $usage .= "\nOption types: s=string, i=integer, f=float, h/H/a/A=comma-separated list, d=DSN, z=size, m=time\n";
+
+   if ( (my @rules = @{$self->{rules}}) ) {
+      $usage .= "\nRules:\n\n";
+      $usage .= join("\n", map { "  $_" } @rules) . "\n";
+   }
+   if ( $self->{DSNParser} ) {
+      $usage .= "\n" . $self->{DSNParser}->usage();
+   }
+   $usage .= "\nOptions and values after processing arguments:\n\n";
+   foreach my $opt ( sort { $a->{long} cmp $b->{long} } @opts ) {
+      my $val   = $opt->{value};
+      my $type  = $opt->{type} || '';
+      my $bool  = $opt->{spec} =~ m/^[\w-]+(?:\|[\w-])?!?$/;
+      $val      = $bool              ? ( $val ? 'TRUE' : 'FALSE' )
+                : !defined $val      ? '(No value)'
+                : $type eq 'd'       ? $self->{DSNParser}->as_string($val)
+                : $type =~ m/H|h/    ? join(',', sort keys %$val)
+                : $type =~ m/A|a/    ? join(',', @$val)
+                :                    $val;
+      $usage .= sprintf("  --%-${lcol}s  %s\n", $opt->{long}, $val);
+   }
+   return $usage;
+}
+
+sub prompt_noecho {
+   shift @_ if ref $_[0] eq __PACKAGE__;
+   my ( $prompt ) = @_;
+   local $OUTPUT_AUTOFLUSH = 1;
+   print STDERR $prompt
+      or die "Cannot print: $OS_ERROR";
+   my $response;
+   eval {
+      require Term::ReadKey;
+      Term::ReadKey::ReadMode('noecho');
+      chomp($response = <STDIN>);
+      Term::ReadKey::ReadMode('normal');
+      print "\n"
+         or die "Cannot print: $OS_ERROR";
+   };
+   if ( $EVAL_ERROR ) {
+      die "Cannot read response; is Term::ReadKey installed? $EVAL_ERROR";
+   }
+   return $response;
+}
+
+sub _read_config_file {
+   my ( $self, $filename ) = @_;
+   open my $fh, "<", $filename or die "Cannot open $filename: $OS_ERROR\n";
+   my @args;
+   my $prefix = '--';
+   my $parse  = 1;
+
+   LINE:
+   while ( my $line = <$fh> ) {
+      chomp $line;
+      next LINE if $line =~ m/^\s*(?:\#|\;|$)/;
+      $line =~ s/\s+#.*$//g;
+      $line =~ s/^\s+|\s+$//g;
+      if ( $line eq '--' ) {
+         $prefix = '';
+         $parse  = 0;
+         next LINE;
+      }
+
+      if (  $parse
+            && !$self->has('version-check')
+            && $line =~ /version-check/
+      ) {
+         next LINE;
+      }
+
+      if ( $parse
+         && (my($opt, $arg) = $line =~ m/^\s*([^=\s]+?)(?:\s*=\s*(.*?)\s*)?$/)
+      ) {
+         push @args, grep { defined $_ } ("$prefix$opt", $arg);
+      }
+      elsif ( $line =~ m/./ ) {
+         push @args, $line;
+      }
+      else {
+         die "Syntax error in file $filename at line $INPUT_LINE_NUMBER";
+      }
+   }
+   close $fh;
+   return @args;
+}
+
+sub read_para_after {
+   my ( $self, $file, $regex ) = @_;
+   open my $fh, "<", $file or die "Can't open $file: $OS_ERROR";
+   local $INPUT_RECORD_SEPARATOR = '';
+   my $para;
+   while ( $para = <$fh> ) {
+      next unless $para =~ m/^=pod$/m;
+      last;
+   }
+   while ( $para = <$fh> ) {
+      next unless $para =~ m/$regex/;
+      last;
+   }
+   $para = <$fh>;
+   chomp($para);
+   close $fh or die "Can't close $file: $OS_ERROR";
+   return $para;
+}
+
+sub clone {
+   my ( $self ) = @_;
+
+   my %clone = map {
+      my $hashref  = $self->{$_};
+      my $val_copy = {};
+      foreach my $key ( keys %$hashref ) {
+         my $ref = ref $hashref->{$key};
+         $val_copy->{$key} = !$ref           ? $hashref->{$key}
+                           : $ref eq 'HASH'  ? { %{$hashref->{$key}} }
+                           : $ref eq 'ARRAY' ? [ @{$hashref->{$key}} ]
+                           : $hashref->{$key};
+      }
+      $_ => $val_copy;
+   } qw(opts short_opts defaults);
+
+   foreach my $scalar ( qw(got_opts) ) {
+      $clone{$scalar} = $self->{$scalar};
+   }
+
+   return bless \%clone;
+}
+
+sub _parse_size {
+   my ( $self, $opt, $val ) = @_;
+
+   if ( lc($val || '') eq 'null' ) {
+      PTDEBUG && _d('NULL size for', $opt->{long});
+      $opt->{value} = 'null';
+      return;
+   }
+
+   my %factor_for = (k => 1_024, M => 1_048_576, G => 1_073_741_824);
+   my ($pre, $num, $factor) = $val =~ m/^([+-])?(\d+)([kMG])?$/;
+   if ( defined $num ) {
+      if ( $factor ) {
+         $num *= $factor_for{$factor};
+         PTDEBUG && _d('Setting option', $opt->{y},
+            'to num', $num, '* factor', $factor);
+      }
+      $opt->{value} = ($pre || '') . $num;
+   }
+   else {
+      $self->save_error("Invalid size for --$opt->{long}: $val");
+   }
+   return;
+}
+
+sub _parse_attribs {
+   my ( $self, $option, $attribs ) = @_;
+   my $types = $self->{types};
+   return $option
+      . ($attribs->{'short form'} ? '|' . $attribs->{'short form'}   : '' )
+      . ($attribs->{'negatable'}  ? '!'                              : '' )
+      . ($attribs->{'cumulative'} ? '+'                              : '' )
+      . ($attribs->{'type'}       ? '=' . $types->{$attribs->{type}} : '' );
+}
+
+sub _parse_synopsis {
+   my ( $self, $file ) = @_;
+   $file ||= $self->{file} || __FILE__;
+   PTDEBUG && _d("Parsing SYNOPSIS in", $file);
+
+   local $INPUT_RECORD_SEPARATOR = '';  # read paragraphs
+   open my $fh, "<", $file or die "Cannot open $file: $OS_ERROR";
+   my $para;
+   1 while defined($para = <$fh>) && $para !~ m/^=head1 SYNOPSIS/;
+   die "$file does not contain a SYNOPSIS section" unless $para;
+   my @synop;
+   for ( 1..2 ) {  # 1 for the usage, 2 for the description
+      my $para = <$fh>;
+      push @synop, $para;
+   }
+   close $fh;
+   PTDEBUG && _d("Raw SYNOPSIS text:", @synop);
+   my ($usage, $desc) = @synop;
+   die "The SYNOPSIS section in $file is not formatted properly"
+      unless $usage && $desc;
+
+   $usage =~ s/^\s*Usage:\s+(.+)/$1/;
+   chomp $usage;
+
+   $desc =~ s/\n/ /g;
+   $desc =~ s/\s{2,}/ /g;
+   $desc =~ s/\. ([A-Z][a-z])/.  $1/g;
+   $desc =~ s/\s+$//;
+
+   return (
+      description => $desc,
+      usage       => $usage,
+   );
+};
+
+sub set_vars {
+   my ($self, $file) = @_;
+   $file ||= $self->{file} || __FILE__;
+
+   my %user_vars;
+   my $user_vars = $self->has('set-vars') ? $self->get('set-vars') : undef;
+   if ( $user_vars ) {
+      foreach my $var_val ( @$user_vars ) {
+         my ($var, $val) = $var_val =~ m/([^\s=]+)=(\S+)/;
+         die "Invalid --set-vars value: $var_val\n" unless $var && defined $val;
+         $user_vars{$var} = {
+            val     => $val,
+            default => 0,
+         };
+      }
+   }
+
+   my %default_vars;
+   my $default_vars = $self->read_para_after($file, qr/MAGIC_set_vars/);
+   if ( $default_vars ) {
+      %default_vars = map {
+         my $var_val = $_;
+         my ($var, $val) = $var_val =~ m/([^\s=]+)=(\S+)/;
+         die "Invalid --set-vars value: $var_val\n" unless $var && defined $val;
+         $var => {
+            val     => $val,
+            default => 1,
+         };
+      } split("\n", $default_vars);
+   }
+
+   my %vars = (
+      %default_vars, # first the tool's defaults
+      %user_vars,    # then the user's which overwrite the defaults
+   );
+   PTDEBUG && _d('--set-vars:', Dumper(\%vars));
+   return \%vars;
+}
+
+sub _d {
+   my ($package, undef, $line) = caller 0;
+   @_ = map { (my $temp = $_) =~ s/\n/\n# /g; $temp; }
+        map { defined $_ ? $_ : 'undef' }
+        @_;
+   print STDERR "# $package:$line $PID ", join(' ', @_), "\n";
+}
+
+if ( PTDEBUG ) {
+   print STDERR '# ', $^X, ' ', $], "\n";
+   if ( my $uname = `uname -a` ) {
+      $uname =~ s/\s+/ /g;
+      print STDERR "# $uname\n";
+   }
+   print STDERR '# Arguments: ',
+      join(' ', map { my $a = "_[$_]_"; $a =~ s/\n/\n# /g; $a; } @ARGV), "\n";
+}
+
+1;
+}
+# ###########################################################################
+# End OptionParser package
+# ###########################################################################
+
+# ###########################################################################
+# Lmo::Utils package
+# This package is a copy without comments from the original.  The original
+# with comments and its test file can be found in the GitHub repository at,
+#   lib/Lmo/Utils.pm
+#   t/lib/Lmo/Utils.t
+# See https://github.com/percona/percona-toolkit for more information.
+# ###########################################################################
+{
+package Lmo::Utils;
+
+use strict;
+use warnings qw( FATAL all );
+require Exporter;
+our (@ISA, @EXPORT, @EXPORT_OK);
+
+BEGIN {
+   @ISA = qw(Exporter);
+   @EXPORT = @EXPORT_OK = qw(
+      _install_coderef
+      _unimport_coderefs
+      _glob_for
+      _stash_for
+   );
+}
+
+{
+   no strict 'refs';
+   sub _glob_for {
+      return \*{shift()}
+   }
+
+   sub _stash_for {
+      return \%{ shift() . "::" };
+   }
+}
+
+sub _install_coderef {
+   my ($to, $code) = @_;
+
+   return *{ _glob_for $to } = $code;
+}
+
+sub _unimport_coderefs {
+   my ($target, @names) = @_;
+   return unless @names;
+   my $stash = _stash_for($target);
+   foreach my $name (@names) {
+      if ($stash->{$name} and defined(&{$stash->{$name}})) {
+         delete $stash->{$name};
+      }
+   }
+}
+
+1;
+}
+# ###########################################################################
+# End Lmo::Utils package
+# ###########################################################################
+
+# ###########################################################################
+# Lmo::Meta package
+# This package is a copy without comments from the original.  The original
+# with comments and its test file can be found in the GitHub repository at,
+#   lib/Lmo/Meta.pm
+#   t/lib/Lmo/Meta.t
+# See https://github.com/percona/percona-toolkit for more information.
+# ###########################################################################
+{
+package Lmo::Meta;
+use strict;
+use warnings qw( FATAL all );
+
+my %metadata_for;
+
+sub new {
+   my $class = shift;
+   return bless { @_ }, $class
+}
+
+sub metadata_for {
+   my $self    = shift;
+   my ($class) = @_;
+
+   return $metadata_for{$class} ||= {};
+}
+
+sub class { shift->{class} }
+
+sub attributes {
+   my $self = shift;
+   return keys %{$self->metadata_for($self->class)}
+}
+
+sub attributes_for_new {
+   my $self = shift;
+   my @attributes;
+
+   my $class_metadata = $self->metadata_for($self->class);
+   while ( my ($attr, $meta) = each %$class_metadata ) {
+      if ( exists $meta->{init_arg} ) {
+         push @attributes, $meta->{init_arg}
+               if defined $meta->{init_arg};
+      }
+      else {
+         push @attributes, $attr;
+      }
+   }
+   return @attributes;
+}
+
+1;
+}
+# ###########################################################################
+# End Lmo::Meta package
+# ###########################################################################
+
+# ###########################################################################
+# Lmo::Object package
+# This package is a copy without comments from the original.  The original
+# with comments and its test file can be found in the GitHub repository at,
+#   lib/Lmo/Object.pm
+#   t/lib/Lmo/Object.t
+# See https://github.com/percona/percona-toolkit for more information.
+# ###########################################################################
+{
+package Lmo::Object;
+
+use strict;
+use warnings qw( FATAL all );
+
+use Carp ();
+use Scalar::Util qw(blessed);
+
+use Lmo::Meta;
+use Lmo::Utils qw(_glob_for);
+
+sub new {
+   my $class = shift;
+   my $args  = $class->BUILDARGS(@_);
+
+   my $class_metadata = Lmo::Meta->metadata_for($class);
+
+   my @args_to_delete;
+   while ( my ($attr, $meta) = each %$class_metadata ) {
+      next unless exists $meta->{init_arg};
+      my $init_arg = $meta->{init_arg};
+
+      if ( defined $init_arg ) {
+         $args->{$attr} = delete $args->{$init_arg};
+      }
+      else {
+         push @args_to_delete, $attr;
+      }
+   }
+
+   delete $args->{$_} for @args_to_delete;
+
+   for my $attribute ( keys %$args ) {
+      if ( my $coerce = $class_metadata->{$attribute}{coerce} ) {
+         $args->{$attribute} = $coerce->($args->{$attribute});
+      }
+      if ( my $isa_check = $class_metadata->{$attribute}{isa} ) {
+         my ($check_name, $check_sub) = @$isa_check;
+         $check_sub->($args->{$attribute});
+      }
+   }
+
+   while ( my ($attribute, $meta) = each %$class_metadata ) {
+      next unless $meta->{required};
+      Carp::confess("Attribute ($attribute) is required for $class")
+         if ! exists $args->{$attribute}
+   }
+
+   my $self = bless $args, $class;
+
+   my @build_subs;
+   my $linearized_isa = mro::get_linear_isa($class);
+
+   for my $isa_class ( @$linearized_isa ) {
+      unshift @build_subs, *{ _glob_for "${isa_class}::BUILD" }{CODE};
+   }
+   my @args = %$args;
+   for my $sub (grep { defined($_) && exists &$_ } @build_subs) {
+      $sub->( $self, @args);
+   }
+   return $self;
+}
+
+sub BUILDARGS {
+   shift; # No need for the classname
+   if ( @_ == 1 && ref($_[0]) ) {
+      Carp::confess("Single parameters to new() must be a HASH ref, not $_[0]")
+         unless ref($_[0]) eq ref({});
+      return {%{$_[0]}} # We want a new reference, always
+   }
+   else {
+      return { @_ };
+   }
+}
+
+sub meta {
+   my $class = shift;
+   $class    = Scalar::Util::blessed($class) || $class;
+   return Lmo::Meta->new(class => $class);
+}
+
+1;
+}
+# ###########################################################################
+# End Lmo::Object package
+# ###########################################################################
+
+# ###########################################################################
+# Lmo::Types package
+# This package is a copy without comments from the original.  The original
+# with comments and its test file can be found in the GitHub repository at,
+#   lib/Lmo/Types.pm
+#   t/lib/Lmo/Types.t
+# See https://github.com/percona/percona-toolkit for more information.
+# ###########################################################################
+{
+package Lmo::Types;
+
+use strict;
+use warnings qw( FATAL all );
+
+use Carp ();
+use Scalar::Util qw(looks_like_number blessed);
+
+
+our %TYPES = (
+   Bool   => sub { !$_[0] || (defined $_[0] && looks_like_number($_[0]) && $_[0] == 1) },
+   Num    => sub { defined $_[0] && looks_like_number($_[0]) },
+   Int    => sub { defined $_[0] && looks_like_number($_[0]) && $_[0] == int($_[0]) },
+   Str    => sub { defined $_[0] },
+   Object => sub { defined $_[0] && blessed($_[0]) },
+   FileHandle => sub { local $@; require IO::Handle; fileno($_[0]) && $_[0]->opened },
+
+   map {
+      my $type = /R/ ? $_ : uc $_;
+      $_ . "Ref" => sub { ref $_[0] eq $type }
+   } qw(Array Code Hash Regexp Glob Scalar)
+);
+
+sub check_type_constraints {
+   my ($attribute, $type_check, $check_name, $val) = @_;
+   ( ref($type_check) eq 'CODE'
+      ? $type_check->($val)
+      : (ref $val eq $type_check
+         || ($val && $val eq $type_check)
+         || (exists $TYPES{$type_check} && $TYPES{$type_check}->($val)))
+   )
+   || Carp::confess(
+        qq<Attribute ($attribute) does not pass the type constraint because: >
+      . qq<Validation failed for '$check_name' with value >
+      . (defined $val ? Lmo::Dumper($val) : 'undef') )
+}
+
+sub _nested_constraints {
+   my ($attribute, $aggregate_type, $type) = @_;
+
+   my $inner_types;
+   if ( $type =~ /\A(ArrayRef|Maybe)\[(.*)\]\z/ ) {
+      $inner_types = _nested_constraints($1, $2);
+   }
+   else {
+      $inner_types = $TYPES{$type};
+   }
+
+   if ( $aggregate_type eq 'ArrayRef' ) {
+      return sub {
+         my ($val) = @_;
+         return unless ref($val) eq ref([]);
+
+         if ($inner_types) {
+            for my $value ( @{$val} ) {
+               return unless $inner_types->($value)
+            }
+         }
+         else {
+            for my $value ( @{$val} ) {
+               return unless $value && ($value eq $type
+                        || (Scalar::Util::blessed($value) && $value->isa($type)));
+            }
+         }
+         return 1;
+      };
+   }
+   elsif ( $aggregate_type eq 'Maybe' ) {
+      return sub {
+         my ($value) = @_;
+         return 1 if ! defined($value);
+         if ($inner_types) {
+            return unless $inner_types->($value)
+         }
+         else {
+            return unless $value eq $type
+                        || (Scalar::Util::blessed($value) && $value->isa($type));
+         }
+         return 1;
+      }
+   }
+   else {
+      Carp::confess("Nested aggregate types are only implemented for ArrayRefs and Maybe");
+   }
+}
+
+1;
+}
+# ###########################################################################
+# End Lmo::Types package
+# ###########################################################################
+
+# ###########################################################################
+# Lmo package
+# This package is a copy without comments from the original.  The original
+# with comments and its test file can be found in the GitHub repository at,
+#   lib/Lmo.pm
+#   t/lib/Lmo.t
+# See https://github.com/percona/percona-toolkit for more information.
+# ###########################################################################
+{
+BEGIN {
+$INC{"Lmo.pm"} = __FILE__;
+package Lmo;
+our $VERSION = '0.30_Percona'; # Forked from 0.30 of Mo.
+
+
+use strict;
+use warnings qw( FATAL all );
+
+use Carp ();
+use Scalar::Util qw(looks_like_number blessed);
+
+use Lmo::Meta;
+use Lmo::Object;
+use Lmo::Types;
+
+use Lmo::Utils;
+
+my %export_for;
+sub import {
+   warnings->import(qw(FATAL all));
+   strict->import();
+
+   my $caller     = scalar caller(); # Caller's package
+   my %exports = (
+      extends  => \&extends,
+      has      => \&has,
+      with     => \&with,
+      override => \&override,
+      confess  => \&Carp::confess,
+   );
+
+   $export_for{$caller} = \%exports;
+
+   for my $keyword ( keys %exports ) {
+      _install_coderef "${caller}::$keyword" => $exports{$keyword};
+   }
+
+   if ( !@{ *{ _glob_for "${caller}::ISA" }{ARRAY} || [] } ) {
+      @_ = "Lmo::Object";
+      goto *{ _glob_for "${caller}::extends" }{CODE};
+   }
+}
+
+sub extends {
+   my $caller = scalar caller();
+   for my $class ( @_ ) {
+      _load_module($class);
+   }
+   _set_package_isa($caller, @_);
+   _set_inherited_metadata($caller);
+}
+
+sub _load_module {
+   my ($class) = @_;
+
+   (my $file = $class) =~ s{::|'}{/}g;
+   $file .= '.pm';
+   { local $@; eval { require "$file" } } # or warn $@;
+   return;
+}
+
+sub with {
+   my $package = scalar caller();
+   require Role::Tiny;
+   for my $role ( @_ ) {
+      _load_module($role);
+      _role_attribute_metadata($package, $role);
+   }
+   Role::Tiny->apply_roles_to_package($package, @_);
+}
+
+sub _role_attribute_metadata {
+   my ($package, $role) = @_;
+
+   my $package_meta = Lmo::Meta->metadata_for($package);
+   my $role_meta    = Lmo::Meta->metadata_for($role);
+
+   %$package_meta = (%$role_meta, %$package_meta);
+}
+
+sub has {
+   my $names  = shift;
+   my $caller = scalar caller();
+
+   my $class_metadata = Lmo::Meta->metadata_for($caller);
+
+   for my $attribute ( ref $names ? @$names : $names ) {
+      my %args   = @_;
+      my $method = ($args{is} || '') eq 'ro'
+         ? sub {
+            Carp::confess("Cannot assign a value to a read-only accessor at reader ${caller}::${attribute}")
+               if $#_;
+            return $_[0]{$attribute};
+         }
+         : sub {
+            return $#_
+                  ? $_[0]{$attribute} = $_[1]
+                  : $_[0]{$attribute};
+         };
+
+      $class_metadata->{$attribute} = ();
+
+      if ( my $type_check = $args{isa} ) {
+         my $check_name = $type_check;
+
+         if ( my ($aggregate_type, $inner_type) = $type_check =~ /\A(ArrayRef|Maybe)\[(.*)\]\z/ ) {
+            $type_check = Lmo::Types::_nested_constraints($attribute, $aggregate_type, $inner_type);
+         }
+
+         my $check_sub = sub {
+            my ($new_val) = @_;
+            Lmo::Types::check_type_constraints($attribute, $type_check, $check_name, $new_val);
+         };
+
+         $class_metadata->{$attribute}{isa} = [$check_name, $check_sub];
+         my $orig_method = $method;
+         $method = sub {
+            $check_sub->($_[1]) if $#_;
+            goto &$orig_method;
+         };
+      }
+
+      if ( my $builder = $args{builder} ) {
+         my $original_method = $method;
+         $method = sub {
+               $#_
+                  ? goto &$original_method
+                  : ! exists $_[0]{$attribute}
+                     ? $_[0]{$attribute} = $_[0]->$builder
+                     : goto &$original_method
+         };
+      }
+
+      if ( my $code = $args{default} ) {
+         Carp::confess("${caller}::${attribute}'s default is $code, but should be a coderef")
+               unless ref($code) eq 'CODE';
+         my $original_method = $method;
+         $method = sub {
+               $#_
+                  ? goto &$original_method
+                  : ! exists $_[0]{$attribute}
+                     ? $_[0]{$attribute} = $_[0]->$code
+                     : goto &$original_method
+         };
+      }
+
+      if ( my $role = $args{does} ) {
+         my $original_method = $method;
+         $method = sub {
+            if ( $#_ ) {
+               Carp::confess(qq<Attribute ($attribute) doesn't consume a '$role' role">)
+                  unless Scalar::Util::blessed($_[1]) && eval { $_[1]->does($role) }
+            }
+            goto &$original_method
+         };
+      }
+
+      if ( my $coercion = $args{coerce} ) {
+         $class_metadata->{$attribute}{coerce} = $coercion;
+         my $original_method = $method;
+         $method = sub {
+            if ( $#_ ) {
+               return $original_method->($_[0], $coercion->($_[1]))
+            }
+            goto &$original_method;
+         }
+      }
+
+      _install_coderef "${caller}::$attribute" => $method;
+
+      if ( $args{required} ) {
+         $class_metadata->{$attribute}{required} = 1;
+      }
+
+      if ($args{clearer}) {
+         _install_coderef "${caller}::$args{clearer}"
+            => sub { delete shift->{$attribute} }
+      }
+
+      if ($args{predicate}) {
+         _install_coderef "${caller}::$args{predicate}"
+            => sub { exists shift->{$attribute} }
+      }
+
+      if ($args{handles}) {
+         _has_handles($caller, $attribute, \%args);
+      }
+
+      if (exists $args{init_arg}) {
+         $class_metadata->{$attribute}{init_arg} = $args{init_arg};
+      }
+   }
+}
+
+sub _has_handles {
+   my ($caller, $attribute, $args) = @_;
+   my $handles = $args->{handles};
+
+   my $ref = ref $handles;
+   my $kv;
+   if ( $ref eq ref [] ) {
+         $kv = { map { $_,$_ } @{$handles} };
+   }
+   elsif ( $ref eq ref {} ) {
+         $kv = $handles;
+   }
+   elsif ( $ref eq ref qr// ) {
+         Carp::confess("Cannot delegate methods based on a Regexp without a type constraint (isa)")
+            unless $args->{isa};
+         my $target_class = $args->{isa};
+         $kv = {
+            map   { $_, $_     }
+            grep  { $_ =~ $handles }
+            grep  { !exists $Lmo::Object::{$_} && $target_class->can($_) }
+            grep  { !$export_for{$target_class}->{$_} }
+            keys %{ _stash_for $target_class }
+         };
+   }
+   else {
+         Carp::confess("handles for $ref not yet implemented");
+   }
+
+   while ( my ($method, $target) = each %{$kv} ) {
+         my $name = _glob_for "${caller}::$method";
+         Carp::confess("You cannot overwrite a locally defined method ($method) with a delegation")
+            if defined &$name;
+
+         my ($target, @curried_args) = ref($target) ? @$target : $target;
+         *$name = sub {
+            my $self        = shift;
+            my $delegate_to = $self->$attribute();
+            my $error = "Cannot delegate $method to $target because the value of $attribute";
+            Carp::confess("$error is not defined") unless $delegate_to;
+            Carp::confess("$error is not an object (got '$delegate_to')")
+               unless Scalar::Util::blessed($delegate_to) || (!ref($delegate_to) && $delegate_to->can($target));
+            return $delegate_to->$target(@curried_args, @_);
+         }
+   }
+}
+
+sub _set_package_isa {
+   my ($package, @new_isa) = @_;
+   my $package_isa  = \*{ _glob_for "${package}::ISA" };
+   @{*$package_isa} = @new_isa;
+}
+
+sub _set_inherited_metadata {
+   my $class = shift;
+   my $class_metadata = Lmo::Meta->metadata_for($class);
+   my $linearized_isa = mro::get_linear_isa($class);
+   my %new_metadata;
+
+   for my $isa_class (reverse @$linearized_isa) {
+      my $isa_metadata = Lmo::Meta->metadata_for($isa_class);
+      %new_metadata = (
+         %new_metadata,
+         %$isa_metadata,
+      );
+   }
+   %$class_metadata = %new_metadata;
+}
+
+sub unimport {
+   my $caller = scalar caller();
+   my $target = caller;
+  _unimport_coderefs($target, keys %{$export_for{$caller}});
+}
+
+sub Dumper {
+   require Data::Dumper;
+   local $Data::Dumper::Indent    = 0;
+   local $Data::Dumper::Sortkeys  = 0;
+   local $Data::Dumper::Quotekeys = 0;
+   local $Data::Dumper::Terse     = 1;
+
+   Data::Dumper::Dumper(@_)
+}
+
+BEGIN {
+   if ($] >= 5.010) {
+      { local $@; require mro; }
+   }
+   else {
+      local $@;
+      eval {
+         require MRO::Compat;
+      } or do {
+         *mro::get_linear_isa = *mro::get_linear_isa_dfs = sub {
+            no strict 'refs';
+
+            my $classname = shift;
+
+            my @lin = ($classname);
+            my %stored;
+            foreach my $parent (@{"$classname\::ISA"}) {
+               my $plin = mro::get_linear_isa_dfs($parent);
+               foreach (@$plin) {
+                     next if exists $stored{$_};
+                     push(@lin, $_);
+                     $stored{$_} = 1;
+               }
+            }
+            return \@lin;
+         };
+      }
+   }
+}
+
+sub override {
+   my ($methods, $code) = @_;
+   my $caller          = scalar caller;
+
+   for my $method ( ref($methods) ? @$methods : $methods ) {
+      my $full_method     = "${caller}::${method}";
+      *{_glob_for $full_method} = $code;
+   }
+}
+
+}
+1;
+}
+# ###########################################################################
+# End Lmo package
+# ###########################################################################
+
+# ###########################################################################
+# DSNParser package
+# This package is a copy without comments from the original.  The original
+# with comments and its test file can be found in the GitHub repository at,
+#   lib/DSNParser.pm
+#   t/lib/DSNParser.t
+# See https://github.com/percona/percona-toolkit for more information.
+# ###########################################################################
+{
+package DSNParser;
+
+use strict;
+use warnings FATAL => 'all';
+use English qw(-no_match_vars);
+use constant PTDEBUG => $ENV{PTDEBUG} || 0;
+
+use Data::Dumper;
+$Data::Dumper::Indent    = 0;
+$Data::Dumper::Quotekeys = 0;
+
+my $dsn_sep = qr/(?<!\\),/;
+
+eval {
+   require DBI;
+};
+my $have_dbi = $EVAL_ERROR ? 0 : 1;
+
+sub new {
+   my ( $class, %args ) = @_;
+   foreach my $arg ( qw(opts) ) {
+      die "I need a $arg argument" unless $args{$arg};
+   }
+   my $self = {
+      opts => {}  # h, P, u, etc.  Should come from DSN OPTIONS section in POD.
+   };
+   foreach my $opt ( @{$args{opts}} ) {
+      if ( !$opt->{key} || !$opt->{desc} ) {
+         die "Invalid DSN option: ", Dumper($opt);
+      }
+      PTDEBUG && _d('DSN option:',
+         join(', ',
+            map { "$_=" . (defined $opt->{$_} ? ($opt->{$_} || '') : 'undef') }
+               keys %$opt
+         )
+      );
+      $self->{opts}->{$opt->{key}} = {
+         dsn  => $opt->{dsn},
+         desc => $opt->{desc},
+         copy => $opt->{copy} || 0,
+      };
+   }
+   return bless $self, $class;
+}
+
+sub prop {
+   my ( $self, $prop, $value ) = @_;
+   if ( @_ > 2 ) {
+      PTDEBUG && _d('Setting', $prop, 'property');
+      $self->{$prop} = $value;
+   }
+   return $self->{$prop};
+}
+
+sub parse {
+   my ( $self, $dsn, $prev, $defaults ) = @_;
+   if ( !$dsn ) {
+      PTDEBUG && _d('No DSN to parse');
+      return;
+   }
+   PTDEBUG && _d('Parsing', $dsn);
+   $prev     ||= {};
+   $defaults ||= {};
+   my %given_props;
+   my %final_props;
+   my $opts = $self->{opts};
+
+   foreach my $dsn_part ( split($dsn_sep, $dsn) ) {
+      $dsn_part =~ s/\\,/,/g;
+      if ( my ($prop_key, $prop_val) = $dsn_part =~  m/^(.)=(.*)$/ ) {
+         $given_props{$prop_key} = $prop_val;
+      }
+      else {
+         PTDEBUG && _d('Interpreting', $dsn_part, 'as h=', $dsn_part);
+         $given_props{h} = $dsn_part;
+      }
+   }
+
+   foreach my $key ( keys %$opts ) {
+      PTDEBUG && _d('Finding value for', $key);
+      $final_props{$key} = $given_props{$key};
+      if ( !defined $final_props{$key}
+           && defined $prev->{$key} && $opts->{$key}->{copy} )
+      {
+         $final_props{$key} = $prev->{$key};
+         PTDEBUG && _d('Copying value for', $key, 'from previous DSN');
+      }
+      if ( !defined $final_props{$key} ) {
+         $final_props{$key} = $defaults->{$key};
+         PTDEBUG && _d('Copying value for', $key, 'from defaults');
+      }
+   }
+
+   foreach my $key ( keys %given_props ) {
+      die "Unknown DSN option '$key' in '$dsn'.  For more details, "
+            . "please use the --help option, or try 'perldoc $PROGRAM_NAME' "
+            . "for complete documentation."
+         unless exists $opts->{$key};
+   }
+   if ( (my $required = $self->prop('required')) ) {
+      foreach my $key ( keys %$required ) {
+         die "Missing required DSN option '$key' in '$dsn'.  For more details, "
+               . "please use the --help option, or try 'perldoc $PROGRAM_NAME' "
+               . "for complete documentation."
+            unless $final_props{$key};
+      }
+   }
+
+   return \%final_props;
+}
+
+sub parse_options {
+   my ( $self, $o ) = @_;
+   die 'I need an OptionParser object' unless ref $o eq 'OptionParser';
+   my $dsn_string
+      = join(',',
+          map  { "$_=".$o->get($_); }
+          grep { $o->has($_) && $o->get($_) }
+          keys %{$self->{opts}}
+        );
+   PTDEBUG && _d('DSN string made from options:', $dsn_string);
+   return $self->parse($dsn_string);
+}
+
+sub as_string {
+   my ( $self, $dsn, $props ) = @_;
+   return $dsn unless ref $dsn;
+   my @keys = $props ? @$props : sort keys %$dsn;
+   return join(',',
+      map  { "$_=" . ($_ eq 'p' ? '...' : $dsn->{$_}) }
+      grep {
+         exists $self->{opts}->{$_}
+         && exists $dsn->{$_}
+         && defined $dsn->{$_}
+      } @keys);
+}
+
+sub usage {
+   my ( $self ) = @_;
+   my $usage
+      = "DSN syntax is key=value[,key=value...]  Allowable DSN keys:\n\n"
+      . "  KEY  COPY  MEANING\n"
+      . "  ===  ====  =============================================\n";
+   my %opts = %{$self->{opts}};
+   foreach my $key ( sort keys %opts ) {
+      $usage .= "  $key    "
+             .  ($opts{$key}->{copy} ? 'yes   ' : 'no    ')
+             .  ($opts{$key}->{desc} || '[No description]')
+             . "\n";
+   }
+   $usage .= "\n  If the DSN is a bareword, the word is treated as the 'h' key.\n";
+   return $usage;
+}
+
+sub get_cxn_params {
+   my ( $self, $info ) = @_;
+   my $dsn;
+   my %opts = %{$self->{opts}};
+   my $driver = $self->prop('dbidriver') || '';
+   if ( $driver eq 'Pg' ) {
+      $dsn = 'DBI:Pg:dbname=' . ( $info->{D} || '' ) . ';'
+         . join(';', map  { "$opts{$_}->{dsn}=$info->{$_}" }
+                     grep { defined $info->{$_} }
+                     qw(h P));
+   }
+   else {
+      $dsn = 'DBI:mysql:' . ( $info->{D} || '' ) . ';'
+         . join(';', map  { "$opts{$_}->{dsn}=$info->{$_}" }
+                     grep { defined $info->{$_} }
+                     qw(F h P S A s))
+         . ';mysql_read_default_group=client'
+         . ($info->{L} ? ';mysql_local_infile=1' : '');
+   }
+   PTDEBUG && _d($dsn);
+   return ($dsn, $info->{u}, $info->{p});
+}
+
+sub fill_in_dsn {
+   my ( $self, $dbh, $dsn ) = @_;
+   my $vars = $dbh->selectall_hashref('SHOW VARIABLES', 'Variable_name');
+   my ($user, $db) = $dbh->selectrow_array('SELECT USER(), DATABASE()');
+   $user =~ s/@.*//;
+   $dsn->{h} ||= $vars->{hostname}->{Value};
+   $dsn->{S} ||= $vars->{'socket'}->{Value};
+   $dsn->{P} ||= $vars->{port}->{Value};
+   $dsn->{u} ||= $user;
+   $dsn->{D} ||= $db;
+}
+
+sub get_dbh {
+   my ( $self, $cxn_string, $user, $pass, $opts ) = @_;
+   $opts ||= {};
+   my $defaults = {
+      AutoCommit         => 0,
+      RaiseError         => 1,
+      PrintError         => 0,
+      ShowErrorStatement => 1,
+      mysql_enable_utf8 => ($cxn_string =~ m/charset=utf8/i ? 1 : 0),
+   };
+   @{$defaults}{ keys %$opts } = values %$opts;
+   if (delete $defaults->{L}) { # L for LOAD DATA LOCAL INFILE, our own extension
+      $defaults->{mysql_local_infile} = 1;
+   }
+
+   if ( $opts->{mysql_use_result} ) {
+      $defaults->{mysql_use_result} = 1;
+   }
+
+   if ( !$have_dbi ) {
+      die "Cannot connect to MySQL because the Perl DBI module is not "
+         . "installed or not found.  Run 'perl -MDBI' to see the directories "
+         . "that Perl searches for DBI.  If DBI is not installed, try:\n"
+         . "  Debian/Ubuntu  apt-get install libdbi-perl\n"
+         . "  RHEL/CentOS    yum install perl-DBI\n"
+         . "  OpenSolaris    pkg install pkg:/SUNWpmdbi\n";
+
+   }
+
+   my $dbh;
+   my $tries = 2;
+   while ( !$dbh && $tries-- ) {
+      PTDEBUG && _d($cxn_string, ' ', $user, ' ', $pass,
+         join(', ', map { "$_=>$defaults->{$_}" } keys %$defaults ));
+
+      $dbh = eval { DBI->connect($cxn_string, $user, $pass, $defaults) };
+
+      if ( !$dbh && $EVAL_ERROR ) {
+         if ( $EVAL_ERROR =~ m/locate DBD\/mysql/i ) {
+            die "Cannot connect to MySQL because the Perl DBD::mysql module is "
+               . "not installed or not found.  Run 'perl -MDBD::mysql' to see "
+               . "the directories that Perl searches for DBD::mysql.  If "
+               . "DBD::mysql is not installed, try:\n"
+               . "  Debian/Ubuntu  apt-get install libdbd-mysql-perl\n"
+               . "  RHEL/CentOS    yum install perl-DBD-MySQL\n"
+               . "  OpenSolaris    pkg install pkg:/SUNWapu13dbd-mysql\n";
+         }
+         elsif ( $EVAL_ERROR =~ m/not a compiled character set|character set utf8/ ) {
+            PTDEBUG && _d('Going to try again without utf8 support');
+            delete $defaults->{mysql_enable_utf8};
+         }
+         if ( !$tries ) {
+            die $EVAL_ERROR;
+         }
+      }
+   }
+
+   if ( $cxn_string =~ m/mysql/i ) {
+      my $sql;
+
+      my ($charset) = $cxn_string =~ m/charset=([\w]+)/;
+      if ( $charset ) {
+         $sql = qq{/*!40101 SET NAMES "$charset"*/};
+         PTDEBUG && _d($dbh, $sql);
+         eval { $dbh->do($sql) };
+         if ( $EVAL_ERROR ) {
+            die "Error setting NAMES to $charset: $EVAL_ERROR";
+         }
+      }
+      else {
+         my ($mysql_version) = eval { $dbh->selectrow_array('SELECT VERSION()') };
+         if ( $EVAL_ERROR ) {
+            die "Cannot get MySQL version: $EVAL_ERROR";
+         }
+         my (undef, $character_set_server) = eval { $dbh->selectrow_array("SHOW VARIABLES LIKE 'character_set_server'") };
+         if ( $EVAL_ERROR ) {
+            die "Cannot get MySQL var character_set_server: $EVAL_ERROR";
+         }
+
+         if ( $mysql_version =~ m/^(\d+)\.(\d)\.(\d+).*/ ) {
+            if ( $1 >= 8 && $character_set_server =~ m/^utf8/ ) {
+               $dbh->{mysql_enable_utf8} = 1;
+               $charset = $character_set_server;
+               my $msg = "MySQL version $mysql_version >= 8 and character_set_server = $character_set_server\n".
+                        "Setting: SET NAMES $character_set_server";
+               PTDEBUG && _d($msg);
+               eval { $dbh->do("SET NAMES '$character_set_server'") };
+               if ( $EVAL_ERROR ) {
+                  die "Cannot SET NAMES $character_set_server: $EVAL_ERROR";
+               }
+            }
+         }
+      }
+      PTDEBUG && _d('Enabling charset for STDOUT');
+      if ( $charset && $charset =~ m/^utf8/ ) {
+         binmode(STDOUT, ':utf8')
+            or die "Can't binmode(STDOUT, ':utf8'): $OS_ERROR";
+         binmode(STDERR, ':utf8')
+            or die "Can't binmode(STDERR, ':utf8'): $OS_ERROR";
+      }
+      else {
+         binmode(STDOUT) or die "Can't binmode(STDOUT): $OS_ERROR";
+      }
+
+      if ( my $vars = $self->prop('set-vars') ) {
+         $self->set_vars($dbh, $vars);
+      }
+
+      $sql = 'SELECT @@SQL_MODE';
+      PTDEBUG && _d($dbh, $sql);
+      my ($sql_mode) = eval { $dbh->selectrow_array($sql) };
+      if ( $EVAL_ERROR ) {
+         die "Error getting the current SQL_MODE: $EVAL_ERROR";
+      }
+
+      $sql = 'SET @@SQL_QUOTE_SHOW_CREATE = 1'
+            . '/*!40101, @@SQL_MODE=\'NO_AUTO_VALUE_ON_ZERO'
+            . ($sql_mode ? ",$sql_mode" : '')
+            . '\'*/';
+      PTDEBUG && _d($dbh, $sql);
+      eval { $dbh->do($sql) };
+      if ( $EVAL_ERROR ) {
+         die "Error setting SQL_QUOTE_SHOW_CREATE, SQL_MODE"
+           . ($sql_mode ? " and $sql_mode" : '')
+           . ": $EVAL_ERROR";
+      }
+   }
+
+   PTDEBUG && _d('DBH info: ',
+      $dbh,
+      Dumper($dbh->selectrow_hashref(
+         'SELECT DATABASE(), CONNECTION_ID(), VERSION()/*!50038 , @@hostname*/')),
+      'Connection info:',      $dbh->{mysql_hostinfo},
+      'Character set info:',   Dumper($dbh->selectall_arrayref(
+                     "SHOW VARIABLES LIKE 'character_set%'", { Slice => {}})),
+      '$DBD::mysql::VERSION:', $DBD::mysql::VERSION,
+      '$DBI::VERSION:',        $DBI::VERSION,
+   );
+
+   return $dbh;
+}
+
+sub get_hostname {
+   my ( $self, $dbh ) = @_;
+   if ( my ($host) = ($dbh->{mysql_hostinfo} || '') =~ m/^(\w+) via/ ) {
+      return $host;
+   }
+   my ( $hostname, $one ) = $dbh->selectrow_array(
+      'SELECT /*!50038 @@hostname, */ 1');
+   return $hostname;
+}
+
+sub disconnect {
+   my ( $self, $dbh ) = @_;
+   PTDEBUG && $self->print_active_handles($dbh);
+   $dbh->disconnect;
+}
+
+sub print_active_handles {
+   my ( $self, $thing, $level ) = @_;
+   $level ||= 0;
+   printf("# Active %sh: %s %s %s\n", ($thing->{Type} || 'undef'), "\t" x $level,
+      $thing, (($thing->{Type} || '') eq 'st' ? $thing->{Statement} || '' : ''))
+      or die "Cannot print: $OS_ERROR";
+   foreach my $handle ( grep {defined} @{ $thing->{ChildHandles} } ) {
+      $self->print_active_handles( $handle, $level + 1 );
+   }
+}
+
+sub copy {
+   my ( $self, $dsn_1, $dsn_2, %args ) = @_;
+   die 'I need a dsn_1 argument' unless $dsn_1;
+   die 'I need a dsn_2 argument' unless $dsn_2;
+   my %new_dsn = map {
+      my $key = $_;
+      my $val;
+      if ( $args{overwrite} ) {
+         $val = defined $dsn_1->{$key} ? $dsn_1->{$key} : $dsn_2->{$key};
+      }
+      else {
+         $val = defined $dsn_2->{$key} ? $dsn_2->{$key} : $dsn_1->{$key};
+      }
+      $key => $val;
+   } keys %{$self->{opts}};
+   return \%new_dsn;
+}
+
+sub set_vars {
+   my ($self, $dbh, $vars) = @_;
+
+   return unless $vars;
+
+   foreach my $var ( sort keys %$vars ) {
+      my $val = $vars->{$var}->{val};
+
+      (my $quoted_var = $var) =~ s/_/\\_/;
+      my ($var_exists, $current_val);
+      eval {
+         ($var_exists, $current_val) = $dbh->selectrow_array(
+            "SHOW VARIABLES LIKE '$quoted_var'");
+      };
+      my $e = $EVAL_ERROR;
+      if ( $e ) {
+         PTDEBUG && _d($e);
+      }
+
+      if ( $vars->{$var}->{default} && !$var_exists ) {
+         PTDEBUG && _d('Not setting default var', $var,
+            'because it does not exist');
+         next;
+      }
+
+      if ( $current_val && $current_val eq $val ) {
+         PTDEBUG && _d('Not setting var', $var, 'because its value',
+            'is already', $val);
+         next;
+      }
+
+      my $sql = "SET SESSION $var=$val";
+      PTDEBUG && _d($dbh, $sql);
+      eval { $dbh->do($sql) };
+      if ( my $set_error = $EVAL_ERROR ) {
+         chomp($set_error);
+         $set_error =~ s/ at \S+ line \d+//;
+         my $msg = "Error setting $var: $set_error";
+         if ( $current_val ) {
+            $msg .= "  The current value for $var is $current_val.  "
+                  . "If the variable is read only (not dynamic), specify "
+                  . "--set-vars $var=$current_val to avoid this warning, "
+                  . "else manually set the variable and restart MySQL.";
+         }
+         warn $msg . "\n\n";
+      }
+   }
+
+   return;
+}
+
+sub _d {
+   my ($package, undef, $line) = caller 0;
+   @_ = map { (my $temp = $_) =~ s/\n/\n# /g; $temp; }
+        map { defined $_ ? $_ : 'undef' }
+        @_;
+   print STDERR "# $package:$line $PID ", join(' ', @_), "\n";
+}
+
+1;
+}
+# ###########################################################################
+# End DSNParser package
+# ###########################################################################
+
+# ###########################################################################
+# MasterSlave package
+# This package is a copy without comments from the original.  The original
+# with comments and its test file can be found in the GitHub repository at,
+#   lib/MasterSlave.pm
+#   t/lib/MasterSlave.t
+# See https://github.com/percona/percona-toolkit for more information.
+# ###########################################################################
+{
+package MasterSlave;
+
+use strict;
+use warnings FATAL => 'all';
+use English qw(-no_match_vars);
+use constant PTDEBUG => $ENV{PTDEBUG} || 0;
+
+sub check_recursion_method {
+   my ($methods) = @_;
+   if ( @$methods != 1 ) {
+      if ( grep({ !m/processlist|hosts/i } @$methods)
+            && $methods->[0] !~ /^dsn=/i )
+      {
+         die  "Invalid combination of recursion methods: "
+            . join(", ", map { defined($_) ? $_ : 'undef' } @$methods) . ". "
+            . "Only hosts and processlist may be combined.\n"
+      }
+   }
+   else {
+      my ($method) = @$methods;
+      die "Invalid recursion method: " . ( $method || 'undef' )
+         unless $method && $method =~ m/^(?:processlist$|hosts$|none$|cluster$|dsn=)/i;
+   }
+}
+
+sub new {
+   my ( $class, %args ) = @_;
+   my @required_args = qw(OptionParser DSNParser Quoter);
+   foreach my $arg ( @required_args ) {
+      die "I need a $arg argument" unless $args{$arg};
+   }
+   my $self = {
+      %args,
+      replication_thread => {},
+   };
+   return bless $self, $class;
+}
+
+sub get_replicas {
+   my ($self, %args) = @_;
+   my @required_args = qw(make_cxn);
+   foreach my $arg ( @required_args ) {
+      die "I need a $arg argument" unless $args{$arg};
+   }
+   my ($make_cxn) = @args{@required_args};
+
+   my $replicas  = [];
+   my $dp      = $self->{DSNParser};
+   my $methods = $self->_resolve_recursion_methods($args{dsn});
+
+   return $replicas unless @$methods;
+
+   if ( grep { m/processlist|hosts/i } @$methods ) {
+      my @required_args = qw(dbh dsn);
+      foreach my $arg ( @required_args ) {
+         die "I need a $arg argument" unless $args{$arg};
+      }
+      my ($dbh, $dsn) = @args{@required_args};
+      my $o = $self->{OptionParser};
+
+      $self->recurse_to_replicas(
+         {  dbh              => $dbh,
+            dsn              => $dsn,
+            replica_user     => $o->got('replica-user') ? $o->get('replica-user') : '',
+            replica_password => $o->got('replica-password') ? $o->get('replica-password') : '',
+            replicas         => $args{replicas},
+            callback  => sub {
+               my ( $dsn, $dbh, $level, $parent ) = @_;
+               return unless $level;
+               PTDEBUG && _d('Found replica:', $dp->as_string($dsn));
+               my $replica_dsn = $dsn;
+               if ($o->got('replica-user')) {
+                  $replica_dsn->{u} = $o->get('replica-user');
+                  PTDEBUG && _d("Using replica user ".$o->get('replica-user')." on ".$replica_dsn->{h}.":".$replica_dsn->{P});
+               }
+               if ($o->got('replica-password')) {
+                  $replica_dsn->{p} = $o->get('replica-password');
+                  PTDEBUG && _d("Replica password set");
+               }
+               push @$replicas, $make_cxn->(dsn => $replica_dsn, dbh => $dbh, parent => $parent);
+               return;
+            },
+            wait_no_die => $args{'wait_no_die'},
+         }
+      );
+   } elsif ( $methods->[0] =~ m/^dsn=/i ) {
+      (my $dsn_table_dsn = join ",", @$methods) =~ s/^dsn=//i;
+      $replicas = $self->get_cxn_from_dsn_table(
+         %args,
+         dsn_table_dsn => $dsn_table_dsn,
+         wait_no_die => $args{'wait_no_die'},
+      );
+   }
+   elsif ( $methods->[0] =~ m/none/i ) {
+      PTDEBUG && _d('Not getting to replicas');
+   }
+   else {
+      die "Unexpected recursion methods: @$methods";
+   }
+
+   return $replicas;
+}
+
+sub _resolve_recursion_methods {
+   my ($self, $dsn) = @_;
+   my $o = $self->{OptionParser};
+   if ( $o->got('recursion-method') ) {
+      return $o->get('recursion-method');
+   }
+   elsif ( $dsn && ($dsn->{P} || 3306) != 3306 ) {
+      PTDEBUG && _d('Port number is non-standard; using only hosts method');
+      return [qw(hosts)];
+   }
+   else {
+      return $o->get('recursion-method');
+   }
+}
+
+sub recurse_to_replicas {
+   my ( $self, $args, $level ) = @_;
+   $level ||= 0;
+   my $dp = $self->{DSNParser};
+   my $recurse = $args->{recurse} || $self->{OptionParser}->get('recurse');
+   my $dsn = $args->{dsn};
+   my $replica_user = $args->{replica_user} || '';
+   my $replica_password = $args->{replica_password} || '';
+
+   my $methods = $self->_resolve_recursion_methods($dsn);
+   PTDEBUG && _d('Recursion methods:', @$methods);
+   if ( lc($methods->[0]) eq 'none' ) {
+      PTDEBUG && _d('Not recursing to replicas');
+      return;
+   }
+
+   my $replica_dsn = $dsn;
+   if ($replica_user) {
+      $replica_dsn->{u} = $replica_user;
+      PTDEBUG && _d("Using replica user $replica_user on "
+         . $replica_dsn->{h} . ":" . ( $replica_dsn->{P} ? $replica_dsn->{P} : ""));
+   }
+   if ($replica_password) {
+      $replica_dsn->{p} = $replica_password;
+      PTDEBUG && _d("Replica password set");
+   }
+
+   my $dbh = $args->{dbh};
+
+   my $get_dbh = sub {
+         eval {
+            $dbh = $dp->get_dbh(
+               $dp->get_cxn_params($replica_dsn), { AutoCommit => 1 }
+            );
+            PTDEBUG && _d('Connected to', $dp->as_string($replica_dsn));
+         };
+         if ( $EVAL_ERROR ) {
+            print STDERR "Cannot connect to ", $dp->as_string($replica_dsn), ": ", $EVAL_ERROR, "\n"
+               or die "Cannot print: $OS_ERROR";
+            return;
+         }
+   };
+
+   DBH: {
+      if ( !defined $dbh ) {
+         foreach my $known_replica ( @{$args->{replicas}} ) {
+            if ($known_replica->{dsn}->{h} eq $replica_dsn->{h} and
+                $known_replica->{dsn}->{P} eq $replica_dsn->{P} ) {
+               $dbh = $known_replica->{dbh};
+               last DBH;
+            }
+         }
+         $get_dbh->();
+      }
+   }
+
+   my $sql  = 'SELECT @@SERVER_ID';
+   PTDEBUG && _d($sql);
+   my $id = undef;
+   do {
+      eval {
+         ($id) = $dbh->selectrow_array($sql);
+      };
+	   if ( $EVAL_ERROR ) {
+		   if ( $args->{wait_no_die} ) {
+			   print STDERR "Error getting server id: ", $EVAL_ERROR,
+               "\nRetrying query for server ", $replica_dsn->{h}, ":", $replica_dsn->{P}, "\n";
+            sleep 1;
+            $dbh->disconnect();
+            $get_dbh->();
+         } else {
+            die $EVAL_ERROR;
+         }
+      }
+   } until (defined $id);
+   PTDEBUG && _d('Working on server ID', $id);
+   my $source_thinks_i_am = $dsn->{server_id};
+   if ( !defined $id
+       || ( defined $source_thinks_i_am && $source_thinks_i_am != $id )
+       || $args->{server_ids_seen}->{$id}++
+   ) {
+      PTDEBUG && _d('Server ID seen, or not what source said');
+      if ( $args->{skip_callback} ) {
+         $args->{skip_callback}->($dsn, $dbh, $level, $args->{parent});
+      }
+      return;
+   }
+
+   $args->{callback}->($dsn, $dbh, $level, $args->{parent});
+
+   if ( !defined $recurse || $level < $recurse ) {
+
+      my @replicas =
+         grep { !$_->{source_id} || $_->{source_id} == $id } # Only my replicas.
+         $self->find_replica_hosts($dp, $dbh, $dsn, $methods);
+
+      foreach my $replica ( @replicas ) {
+         PTDEBUG && _d('Recursing from',
+            $dp->as_string($dsn), 'to', $dp->as_string($replica));
+         $self->recurse_to_replicas(
+            { %$args, dsn => $replica, dbh => undef, parent => $dsn, replica_user => $replica_user, $replica_password => $replica_password }, $level + 1 );
+      }
+   }
+}
+
+sub find_replica_hosts {
+   my ( $self, $dsn_parser, $dbh, $dsn, $methods ) = @_;
+
+   PTDEBUG && _d('Looking for replicas on', $dsn_parser->as_string($dsn),
+      'using methods', @$methods);
+
+   my @replicas;
+   METHOD:
+   foreach my $method ( @$methods ) {
+      my $find_replicas = "_find_replicas_by_$method";
+      PTDEBUG && _d('Finding replicas with', $find_replicas);
+      @replicas = $self->$find_replicas($dsn_parser, $dbh, $dsn);
+      last METHOD if @replicas;
+   }
+
+   PTDEBUG && _d('Found', scalar(@replicas), 'replicas');
+   return @replicas;
+}
+
+sub _find_replicas_by_processlist {
+   my ( $self, $dsn_parser, $dbh, $dsn ) = @_;
+   my @connected_replicas = $self->get_connected_replicas($dbh);
+   my @replicas = $self->_process_replicas_list($dsn_parser, $dsn, \@connected_replicas);
+   return @replicas;
+}
+
+sub _process_replicas_list {
+   my ($self, $dsn_parser, $dsn, $connected_replicas) = @_;
+   my @replicas = map  {
+      my $replica        = $dsn_parser->parse("h=$_", $dsn);
+      $replica->{source} = 'processlist';
+      $replica;
+   }
+   grep { $_ }
+   map  {
+      my ( $host ) = $_->{host} =~ m/^(.*):\d+$/;
+      if ( $host eq 'localhost' ) {
+         $host = '127.0.0.1'; # Replication never uses sockets.
+      }
+      if ($host =~ m/::/) {
+          $host = '['.$host.']';
+      }
+      $host;
+   } @$connected_replicas;
+
+   return @replicas;
+}
+
+sub _find_replicas_by_hosts {
+   my ( $self, $dsn_parser, $dbh, $dsn ) = @_;
+
+   my @replicas;
+
+   my $vp = VersionParser->new($dbh);
+   my $sql = 'SHOW REPLICAS';
+   my $source_name = 'source';
+   if ( $vp lt '8.1' || $vp->flavor() =~ m/maria/ ) {
+      $sql = 'SHOW SLAVE HOSTS';
+      $source_name='master';
+   }
+   
+   PTDEBUG && _d($dbh, $sql);
+   @replicas = @{$dbh->selectall_arrayref($sql, { Slice => {} })};
+
+   if ( @replicas ) {
+      PTDEBUG && _d('Found some SHOW REPLICAS info');
+      @replicas = map {
+         my %hash;
+         @hash{ map { lc $_ } keys %$_ } = values %$_;
+         my $spec = "h=$hash{host},P=$hash{port}"
+            . ( $hash{user} ? ",u=$hash{user}" : '')
+            . ( $hash{password} ? ",p=$hash{password}" : '');
+         my $dsn           = $dsn_parser->parse($spec, $dsn);
+         $dsn->{server_id} = $hash{server_id};
+         $dsn->{source_id} = $hash{"${source_name}_id"};
+         $dsn->{source}    = 'hosts';
+         $dsn;
+      } @replicas;
+   }
+
+   return @replicas;
+}
+
+sub get_connected_replicas {
+   my ( $self, $dbh ) = @_;
+
+   my $show = "SHOW GRANTS FOR ";
+   my $user = 'CURRENT_USER()';
+   my $sql = $show . $user;
+   PTDEBUG && _d($dbh, $sql);
+
+   my $proc;
+   eval {
+      $proc = grep {
+         m/ALL PRIVILEGES.*?\*\.\*|PROCESS/
+      } @{$dbh->selectcol_arrayref($sql)};
+   };
+   if ( $EVAL_ERROR ) {
+
+      if ( $EVAL_ERROR =~ m/no such grant defined for user/ ) {
+         PTDEBUG && _d('Retrying SHOW GRANTS without host; error:',
+            $EVAL_ERROR);
+         ($user) = split('@', $user);
+         $sql    = $show . $user;
+         PTDEBUG && _d($sql);
+         eval {
+            $proc = grep {
+               m/ALL PRIVILEGES.*?\*\.\*|PROCESS/
+            } @{$dbh->selectcol_arrayref($sql)};
+         };
+      }
+
+      die "Failed to $sql: $EVAL_ERROR" if $EVAL_ERROR;
+   }
+   if ( !$proc ) {
+      die "You do not have the PROCESS privilege";
+   }
+
+   $sql = 'SHOW FULL PROCESSLIST';
+   PTDEBUG && _d($dbh, $sql);
+   grep { $_->{command} =~ m/Binlog Dump/i }
+   map  { # Lowercase the column names
+      my %hash;
+      @hash{ map { lc $_ } keys %$_ } = values %$_;
+      \%hash;
+   }
+   @{$dbh->selectall_arrayref($sql, { Slice => {} })};
+}
+
+sub is_source_of {
+   my ( $self, $source, $replica ) = @_;
+
+   my $replica_version = VersionParser->new($replica);
+   my $source_name = 'source';
+   my $source_port = 'source_port';
+   if ( $replica_version lt '8.1' || $replica_version->flavor() =~ m/maria/ ) {
+      $source_name = 'master';
+      $source_port = 'master_port';
+   }
+
+   my $source_status = $self->get_source_status($source)
+      or die "The server specified as a source is not a source";
+   my $replica_status  = $self->get_replica_status($replica)
+      or die "The server specified as a replica is not a replica";
+   my @connected     = $self->get_connected_replicas($source)
+      or die "The server specified as a source has no connected replicas";
+   my (undef, $port) = $source->selectrow_array("SHOW VARIABLES LIKE 'port'");
+
+   if ( $port != $replica_status->{$source_port} ) {
+      die "The replica is connected to $replica_status->{$source_port} "
+         . "but the source's port is $port";
+   }
+
+   if ( !grep { $replica_status->{"${source_name}_user"} eq $_->{user} } @connected ) {
+      die "I don't see any replica I/O thread connected with user "
+         . $replica_status->{"${source_name}_user"};
+   }
+
+   if ( ($replica_status->{replica_io_state} || '')
+      eq 'Waiting for ${source_name} to send event' )
+   {
+      my ( $source_log_name, $source_log_num )
+         = $source_status->{file} =~ m/^(.*?)\.0*([1-9][0-9]*)$/;
+      my ( $replica_log_name, $replica_log_num )
+         = $replica_status->{source_log_file} =~ m/^(.*?)\.0*([1-9][0-9]*)$/;
+      if ( $source_log_name ne $replica_log_name
+         || abs($source_log_num - $replica_log_num) > 1 )
+      {
+         die "The replica thinks it is reading from "
+            . "$replica_status->{source_log_file},  but the "
+            . "source is writing to $source_status->{file}";
+      }
+   }
+   return 1;
+}
+
+sub get_source_dsn {
+   my ( $self, $dbh, $dsn, $dsn_parser ) = @_;
+
+   my $vp = VersionParser->new($dbh);
+   my $source_host = 'source_host';
+   my $source_port = 'source_port';
+   if ( $vp lt '8.1' || $vp->flavor() =~ m/maria/ ) {
+      $source_host = 'master_host';
+      $source_port = 'master_port';
+   }
+
+   my $source = $self->get_replica_status($dbh) or return undef;
+   my $spec   = "h=$source->{${source_host}},P=$source->{${source_port}}";
+   return       $dsn_parser->parse($spec, $dsn);
+}
+
+sub get_replica_status {
+   my ( $self, $dbh ) = @_;
+
+   my $server_version = VersionParser->new($dbh);
+   my $replica_name = 'replica';
+   if ( $server_version lt '8.1' || $server_version->flavor() =~ m/maria/ ) {
+      $replica_name = 'slave';
+   }
+
+   if ( !$self->{not_a_replica}->{$dbh} ) {
+      my $sth = $self->{sths}->{$dbh}->{REPLICA_STATUS}
+            ||= $dbh->prepare("SHOW ${replica_name} STATUS");
+      PTDEBUG && _d($dbh, "SHOW ${replica_name} STATUS");
+      $sth->execute();
+      my ($sss_rows) = $sth->fetchall_arrayref({}); # Show Replica Status rows
+
+      my $ss;
+      if ( $sss_rows && @$sss_rows ) {
+          if (scalar @$sss_rows > 1) {
+              if (!$self->{channel}) {
+                  die 'This server returned more than one row for SHOW REPLICA STATUS but "channel" was not specified on the command line';
+              }
+              my $replica_use_channels;
+              for my $row (@$sss_rows) {
+                  $row = { map { lc($_) => $row->{$_} } keys %$row }; # lowercase the keys
+                  if ($row->{channel_name}) {
+                      $replica_use_channels = 1;
+                  }
+                  if ($row->{channel_name} eq $self->{channel}) {
+                      $ss = $row;
+                      last;
+                  }
+              }
+              if (!$ss && $replica_use_channels) {
+                 die 'This server is using replication channels but "channel" was not specified on the command line';
+              }
+          } else {
+              if ($sss_rows->[0]->{channel_name} && $sss_rows->[0]->{channel_name} ne $self->{channel}) {
+                  die 'This server is using replication channels but "channel" was not specified on the command line';
+              } else {
+                  $ss = $sss_rows->[0];
+              }
+          }
+
+          if ( $ss && %$ss ) {
+             $ss = { map { lc($_) => $ss->{$_} } keys %$ss }; # lowercase the keys
+             return $ss;
+          }
+          if (!$ss && $self->{channel}) {
+              die "Specified channel name is invalid";
+          }
+      }
+
+      PTDEBUG && _d('This server returns nothing for SHOW REPLICA STATUS');
+      $self->{not_a_replica}->{$dbh}++;
+  }
+}
+
+sub get_source_status {
+   my ( $self, $dbh ) = @_;
+
+   if ( $self->{not_a_source}->{$dbh} ) {
+      PTDEBUG && _d('Server on dbh', $dbh, 'is not a source');
+      return;
+   }
+
+   my $vp = VersionParser->new($dbh);
+   my $source_name = 'binary log';
+   if ( $vp lt '8.1' || $vp->flavor() =~ m/maria/ ) {
+      $source_name = 'master';
+   }
+
+   my $sth;
+   if ( $self->{sths}->{$dbh} && $dbh && $self->{sths}->{$dbh} == $dbh ) {
+      $sth = $self->{sths}->{$dbh}->{SOURCE_STATUS}
+         ||= $dbh->prepare("SHOW ${source_name} STATUS");
+   }
+   else {
+      $sth = $dbh->prepare("SHOW ${source_name} STATUS");
+   }
+   PTDEBUG && _d($dbh, "SHOW ${source_name} STATUS");
+   $sth->execute();
+   my ($ms) = @{$sth->fetchall_arrayref({})};
+   PTDEBUG && _d(
+      $ms ? map { "$_=" . (defined $ms->{$_} ? $ms->{$_} : '') } keys %$ms
+          : '');
+
+   if ( !$ms || scalar keys %$ms < 2 ) {
+      PTDEBUG && _d('Server on dbh', $dbh, 'does not seem to be a source');
+      $self->{not_a_source}->{$dbh}++;
+   }
+
+  return { map { lc($_) => $ms->{$_} } keys %$ms }; # lowercase the keys
+}
+
+sub wait_for_source {
+   my ( $self, %args ) = @_;
+   my @required_args = qw(source_status replica_dbh);
+   foreach my $arg ( @required_args ) {
+      die "I need a $arg argument" unless $args{$arg};
+   }
+   my ($source_status, $replica_dbh) = @args{@required_args};
+   my $timeout       = $args{timeout} || 60;
+
+   my $result;
+   my $waited;
+   if ( $source_status ) {
+      my $replica_status;
+      eval {
+          $replica_status = $self->get_replica_status($replica_dbh);
+      };
+      if ($EVAL_ERROR) {
+          return {
+              result => undef,
+              waited => 0,
+              error  =>'Wait for source: this is a multi-source replica but "channel" was not specified on the command line',
+          };
+      }
+      my $vp = VersionParser->new($replica_dbh);
+      my $source_name = 'source';
+      if ( $vp lt '8.1' || $vp->flavor() =~ m/maria/ ) {
+         $source_name = 'master';
+      }
+      my $channel_sql = $vp > '5.6' && $self->{channel} ? ", '$self->{channel}'" : '';
+      my $sql = "SELECT ${source_name}_POS_WAIT('$source_status->{file}', $source_status->{position}, $timeout $channel_sql)";
+      PTDEBUG && _d($replica_dbh, $sql);
+      my $start = time;
+      ($result) = $replica_dbh->selectrow_array($sql);
+
+      $waited = time - $start;
+
+      PTDEBUG && _d('Result of waiting:', $result);
+      PTDEBUG && _d("Waited", $waited, "seconds");
+   }
+   else {
+      PTDEBUG && _d('Not waiting: this server is not a source');
+   }
+
+   return {
+      result => $result,
+      waited => $waited,
+   };
+}
+
+sub stop_replica {
+   my ( $self, $dbh ) = @_;
+   my $vp = VersionParser->new($dbh);
+   my $replica_name = 'replica';
+   if ( $vp lt '8.1' || $vp->flavor() =~ m/maria/ ) {
+      $replica_name = 'slave';
+   }
+   my $sth = $self->{sths}->{$dbh}->{STOP_REPLICA}
+         ||= $dbh->prepare("STOP ${replica_name}");
+   PTDEBUG && _d($dbh, $sth->{Statement});
+   $sth->execute();
+}
+
+sub start_replica {
+   my ( $self, $dbh, $pos ) = @_;
+
+   my $vp = VersionParser->new($dbh);
+   my $source_name = 'source';
+   my $replica_name = 'replica';
+   if ( $vp lt '8.1' || $vp->flavor() =~ m/maria/ ) {
+      $source_name = 'master';
+      $replica_name = 'slave';
+   }
+
+   if ( $pos ) {
+      my $sql = "START ${replica_name} UNTIL ${source_name}_LOG_FILE='$pos->{file}', "
+              . "${source_name}_LOG_POS=$pos->{position}";
+      PTDEBUG && _d($dbh, $sql);
+      $dbh->do($sql);
+   }
+   else {
+      my $sth = $self->{sths}->{$dbh}->{START_REPLICA}
+            ||= $dbh->prepare("START ${replica_name}");
+      PTDEBUG && _d($dbh, $sth->{Statement});
+      $sth->execute();
+   }
+}
+
+sub catchup_to_source {
+   my ( $self, $replica, $source, $timeout ) = @_;
+   $self->stop_replica($source);
+   $self->stop_replica($replica);
+   my $replica_status  = $self->get_replica_status($replica);
+   my $replica_pos     = $self->repl_posn($replica_status);
+   my $source_status = $self->get_source_status($source);
+   my $source_pos    = $self->repl_posn($source_status);
+   PTDEBUG && _d('Source position:', $self->pos_to_string($source_pos),
+      'Replica position:', $self->pos_to_string($replica_pos));
+
+   my $result;
+   if ( $self->pos_cmp($replica_pos, $source_pos) < 0 ) {
+      PTDEBUG && _d('Waiting for replica to catch up to source');
+      $self->start_replica($replica, $source_pos);
+
+      $result = $self->wait_for_source(
+            source_status => $source_status,
+            replica_dbh   => $replica,
+            timeout       => $timeout,
+            source_status => $source_status
+      );
+      if ($result->{error}) {
+          die $result->{error};
+      }
+      if ( !defined $result->{result} ) {
+         $replica_status = $self->get_replica_status($replica);
+            
+         my $vp = VersionParser->new($replica);
+         my $replica_name = 'replica';
+         if ( $vp lt '8.1' || $vp->flavor() =~ m/maria/ ) {
+            $replica_name = 'slave';
+         }
+
+         if ( !$self->replica_is_running($replica_status, $replica_name) ) {
+            PTDEBUG && _d('Source position:',
+               $self->pos_to_string($source_pos),
+               'Replica position:', $self->pos_to_string($replica_pos));
+            $replica_pos = $self->repl_posn($replica_status);
+            if ( $self->pos_cmp($replica_pos, $source_pos) != 0 ) {
+               die "SOURCE_POS_WAIT() returned NULL but replica has not "
+                  . "caught up to source";
+            }
+            PTDEBUG && _d('Replica is caught up to source and stopped');
+         }
+         else {
+            die "Replica has not caught up to source and it is still running";
+         }
+      }
+   }
+   else {
+      PTDEBUG && _d("Replica is already caught up to source");
+   }
+
+   return $result;
+}
+
+sub catchup_to_same_pos {
+   my ( $self, $s1_dbh, $s2_dbh ) = @_;
+   $self->stop_replica($s1_dbh);
+   $self->stop_replica($s2_dbh);
+   my $s1_status = $self->get_replica_status($s1_dbh);
+   my $s2_status = $self->get_replica_status($s2_dbh);
+   my $s1_pos    = $self->repl_posn($s1_status);
+   my $s2_pos    = $self->repl_posn($s2_status);
+   if ( $self->pos_cmp($s1_pos, $s2_pos) < 0 ) {
+      $self->start_replica($s1_dbh, $s2_pos);
+   }
+   elsif ( $self->pos_cmp($s2_pos, $s1_pos) < 0 ) {
+      $self->start_replica($s2_dbh, $s1_pos);
+   }
+
+   $s1_status = $self->get_replica_status($s1_dbh);
+   $s2_status = $self->get_replica_status($s2_dbh);
+   $s1_pos    = $self->repl_posn($s1_status);
+   $s2_pos    = $self->repl_posn($s2_status);
+
+   my $vp1 = VersionParser->new($s1_dbh);
+   my $replica1_name = 'replica';
+   if ( $vp1 lt '8.1' || $vp1->flavor() =~ m/maria/ ) {
+      $replica1_name = 'slave';
+   }
+
+   my $vp2 = VersionParser->new($s2_dbh);
+   my $replica2_name = 'replica';
+   if ( $vp2 lt '8.1' || $vp2->flavor() =~ m/maria/ ) {
+      $replica2_name = 'slave';
+   }
+
+   if ( $self->replica_is_running($s1_status, $replica1_name)
+     || $self->replica_is_running($s2_status, $replica2_name)
+     || $self->pos_cmp($s1_pos, $s2_pos) != 0)
+   {
+      die "The servers aren't both stopped at the same position";
+   }
+
+}
+
+sub replica_is_running {
+   my ( $self, $replica_status, $replica_name ) = @_;
+   return ($replica_status->{"${replica_name}_sql_running"} || 'No') eq 'Yes';
+}
+
+sub has_replica_updates {
+   my ( $self, $dbh ) = @_;
+   
+   my $vp = VersionParser->new($dbh);
+   my $replica_name = 'replica';
+   if ( $vp lt '8.1' || $vp->flavor() =~ m/maria/ ) {
+      $replica_name = 'slave';
+   }
+
+   my $sql = qq{SHOW VARIABLES LIKE 'log_${replica_name}_updates'};
+   PTDEBUG && _d($dbh, $sql);
+   my ($name, $value) = $dbh->selectrow_array($sql);
+   return $value && $value =~ m/^(1|ON)$/;
+}
+
+sub repl_posn {
+   my ( $self, $status ) = @_;
+   if ( exists $status->{file} && exists $status->{position} ) {
+      return {
+         file     => $status->{file},
+         position => $status->{position},
+      };
+   }
+   elsif ( exists $status->{relay_source_log_file} && exists $status->{exec_source_log_pos} ) {
+      return {
+         file     => $status->{relay_source_log_file},
+         position => $status->{exec_source_log_pos},
+      };
+   }
+   else {
+      return {
+         file     => $status->{relay_master_log_file},
+         position => $status->{exec_master_log_pos},
+      };
+   }
+}
+
+sub get_replica_lag {
+   my ( $self, $dbh ) = @_;
+   
+   my $vp = VersionParser->new($dbh);
+   my $source_name = 'source';
+   if ( $vp lt '8.1' || $vp->flavor() =~ m/maria/ ) {
+      $source_name = 'master';
+   }
+
+   my $stat = $self->get_replica_status($dbh);
+   return unless $stat;  # server is not a replica
+   return $stat->{"seconds_behind_${source_name}"};
+}
+
+sub pos_cmp {
+   my ( $self, $a, $b ) = @_;
+   return $self->pos_to_string($a) cmp $self->pos_to_string($b);
+}
+
+sub short_host {
+   my ( $self, $dsn ) = @_;
+   my ($host, $port);
+   if ( $dsn->{source_host} ) {
+      $host = $dsn->{source_host};
+      $port = $dsn->{source_port};
+   }
+   else {
+      $host = $dsn->{h};
+      $port = $dsn->{P};
+   }
+   return ($host || '[default]') . ( ($port || 3306) == 3306 ? '' : ":$port" );
+}
+
+sub is_replication_thread {
+   my ( $self, $query, %args ) = @_;
+   return unless $query;
+
+   my $type = lc($args{type} || 'all');
+   die "Invalid type: $type"
+      unless $type =~ m/^binlog_dump|slave_io|slave_sql|replica_io|replica_sql|all$/i;
+
+   my $match = 0;
+   if ( $type =~ m/binlog_dump|all/i ) {
+      $match = 1
+         if ($query->{Command} || $query->{command} || '') eq "Binlog Dump";
+   }
+   if ( !$match ) {
+      if ( ($query->{User} || $query->{user} || '') eq "system user" ) {
+         PTDEBUG && _d("Replica replication thread");
+         if ( $type ne 'all' ) {
+            my $state = $query->{State} || $query->{state} || '';
+
+            if ( $state =~ m/^init|end$/ ) {
+               PTDEBUG && _d("Special state:", $state);
+               $match = 1;
+            }
+            else {
+               my ($replica_sql) = $state =~ m/
+                  ^(Waiting\sfor\sthe\snext\sevent
+                   |Reading\sevent\sfrom\sthe\srelay\slog
+                   |Has\sread\sall\srelay\slog;\swaiting
+                   |Making\stemp\sfile
+                   |Waiting\sfor\sslave\smutex\son\sexit
+                   |Waiting\sfor\sreplica\smutex\son\sexit)/xi;
+
+               $match = $type eq 'replica_sql' &&  $replica_sql ? 1
+                      : $type eq 'replica_io'  && !$replica_sql ? 1
+                      :                                       0;
+            }
+         }
+         else {
+            $match = 1;
+         }
+      }
+      else {
+         PTDEBUG && _d('Not system user');
+      }
+
+      if ( !defined $args{check_known_ids} || $args{check_known_ids} ) {
+         my $id = $query->{Id} || $query->{id};
+         if ( $match ) {
+            $self->{replication_thread}->{$id} = 1;
+         }
+         else {
+            if ( $self->{replication_thread}->{$id} ) {
+               PTDEBUG && _d("Thread ID is a known replication thread ID");
+               $match = 1;
+            }
+         }
+      }
+   }
+
+   PTDEBUG && _d('Matches', $type, 'replication thread:',
+      ($match ? 'yes' : 'no'), '; match:', $match);
+
+   return $match;
+}
+
+
+sub get_replication_filters {
+   my ( $self, %args ) = @_;
+   my @required_args = qw(dbh);
+   foreach my $arg ( @required_args ) {
+      die "I need a $arg argument" unless $args{$arg};
+   }
+   my ($dbh) = @args{@required_args};
+
+   my $vp = VersionParser->new($dbh);
+   my $replica_name = 'replica';
+   if ( $vp lt '8.1' || $vp->flavor() =~ m/maria/ ) {
+      $replica_name = 'slave';
+   }
+
+   my %filters = ();
+
+   my $status = $self->get_source_status($dbh);
+   if ( $status ) {
+      map { $filters{$_} = $status->{$_} }
+      grep { defined $status->{$_} && $status->{$_} ne '' }
+      qw(
+         binlog_do_db
+         binlog_ignore_db
+      );
+   }
+
+   $status = $self->get_replica_status($dbh);
+   if ( $status ) {
+      map { $filters{$_} = $status->{$_} }
+      grep { defined $status->{$_} && $status->{$_} ne '' }
+      qw(
+         replicate_do_db
+         replicate_ignore_db
+         replicate_do_table
+         replicate_ignore_table
+         replicate_wild_do_table
+         replicate_wild_ignore_table
+      );
+
+      my $sql = "SHOW VARIABLES LIKE '${replica_name}_skip_errors'";
+      PTDEBUG && _d($dbh, $sql);
+      my $row = $dbh->selectrow_arrayref($sql);
+      $filters{replica_skip_errors} = $row->[1] if $row->[1] && $row->[1] ne 'OFF';
+   }
+
+   return \%filters;
+}
+
+
+sub pos_to_string {
+   my ( $self, $pos ) = @_;
+   my $fmt  = '%s/%020d';
+   return sprintf($fmt, @{$pos}{qw(file position)});
+}
+
+sub reset_known_replication_threads {
+   my ( $self ) = @_;
+   $self->{replication_thread} = {};
+   return;
+}
+
+sub get_cxn_from_dsn_table {
+   my ($self, %args) = @_;
+   my @required_args = qw(dsn_table_dsn make_cxn);
+   foreach my $arg ( @required_args ) {
+      die "I need a $arg argument" unless $args{$arg};
+   }
+   my ($dsn_table_dsn, $make_cxn) = @args{@required_args};
+   PTDEBUG && _d('DSN table DSN:', $dsn_table_dsn);
+
+   my $dp = $self->{DSNParser};
+   my $q  = $self->{Quoter};
+
+   my $dsn = $dp->parse($dsn_table_dsn);
+   my $dsn_table;
+   if ( $dsn->{D} && $dsn->{t} ) {
+      $dsn_table = $q->quote($dsn->{D}, $dsn->{t});
+   }
+   elsif ( $dsn->{t} && $dsn->{t} =~ m/\./ ) {
+      $dsn_table = $q->quote($q->split_unquote($dsn->{t}));
+   }
+   else {
+      die "DSN table DSN does not specify a database (D) "
+        . "or a database-qualified table (t)";
+   }
+
+   my $done = 0;
+   my $dsn_tbl_cxn = $make_cxn->(dsn => $dsn);
+   my $dbh         = $dsn_tbl_cxn->connect();
+   my $sql         = "SELECT dsn FROM $dsn_table ORDER BY id";
+   PTDEBUG && _d($sql);
+   my @cxn;
+   use Data::Dumper;
+   DSN:
+   do {
+      @cxn = ();
+      my $dsn_strings = $dbh->selectcol_arrayref($sql);
+      if ( $dsn_strings ) {
+         foreach my $dsn_string ( @$dsn_strings ) {
+            PTDEBUG && _d('DSN from DSN table:', $dsn_string);
+            if ($args{wait_no_die}) {
+               my $lcxn;
+               eval {
+                  $lcxn = $make_cxn->(dsn_string => $dsn_string);
+               };
+               if ( $EVAL_ERROR && ($dsn_tbl_cxn->lost_connection($EVAL_ERROR)
+                     || $EVAL_ERROR =~ m/Can't connect to MySQL server/)) {
+                  PTDEBUG && _d("Server is not accessible, waiting when it is online again");
+                  sleep(1);
+                  goto DSN;
+               }
+               push @cxn, $lcxn;
+            } else {
+               push @cxn, $make_cxn->(dsn_string => $dsn_string);
+            }
+         }
+      }
+      $done = 1;
+   } until $done;
+   return \@cxn;
+}
+
+sub _d {
+   my ($package, undef, $line) = caller 0;
+   @_ = map { (my $temp = $_) =~ s/\n/\n# /g; $temp; }
+        map { defined $_ ? $_ : 'undef' }
+        @_;
+   print STDERR "# $package:$line $PID ", join(' ', @_), "\n";
+}
+
+1;
+}
+# ###########################################################################
+# End MasterSlave package
+# ###########################################################################
+
+# ###########################################################################
+# Daemon package
+# This package is a copy without comments from the original.  The original
+# with comments and its test file can be found in the GitHub repository at,
+#   lib/Daemon.pm
+#   t/lib/Daemon.t
+# See https://github.com/percona/percona-toolkit for more information.
+# ###########################################################################
+{
+package Daemon;
+
+use strict;
+use warnings FATAL => 'all';
+use English qw(-no_match_vars);
+
+use constant PTDEBUG => $ENV{PTDEBUG} || 0;
+
+use POSIX qw(setsid);
+use Fcntl qw(:DEFAULT);
+
+sub new {
+   my ($class, %args) = @_;
+   my $self = {
+      log_file       => $args{log_file},
+      pid_file       => $args{pid_file},
+      daemonize      => $args{daemonize},
+      force_log_file => $args{force_log_file},
+      parent_exit    => $args{parent_exit},
+      pid_file_owner => 0,
+      utf8           => $args{utf8} // 0,
+   };
+   return bless $self, $class;
+}
+
+sub run {
+   my ($self) = @_;
+
+   my $daemonize      = $self->{daemonize};
+   my $pid_file       = $self->{pid_file};
+   my $log_file       = $self->{log_file};
+   my $force_log_file = $self->{force_log_file};
+   my $parent_exit    = $self->{parent_exit};
+   my $utf8           = $self->{utf8};
+
+   PTDEBUG && _d('Starting daemon');
+
+   if ( $pid_file ) {
+      eval {
+         $self->_make_pid_file(
+            pid      => $PID,  # parent's pid
+            pid_file => $pid_file,
+         );
+      };
+      die "$EVAL_ERROR\n" if $EVAL_ERROR;
+      if ( !$daemonize ) {
+         $self->{pid_file_owner} = $PID;  # parent's pid
+      }
+   }
+
+   if ( $daemonize ) {
+      defined (my $child_pid = fork()) or die "Cannot fork: $OS_ERROR";
+      if ( $child_pid ) {
+         PTDEBUG && _d('Forked child', $child_pid);
+         $parent_exit->($child_pid) if $parent_exit;
+         exit 0;
+      }
+
+      POSIX::setsid() or die "Cannot start a new session: $OS_ERROR";
+      chdir '/'       or die "Cannot chdir to /: $OS_ERROR";
+
+      if ( $pid_file ) {
+         $self->_update_pid_file(
+            pid      => $PID,  # child's pid
+            pid_file => $pid_file,
+         );
+         $self->{pid_file_owner} = $PID;
+      }
+   }
+
+   if ( $daemonize || $force_log_file ) {
+      PTDEBUG && _d('Redirecting STDIN to /dev/null');
+      close STDIN;
+      open  STDIN, '/dev/null'
+         or die "Cannot reopen STDIN to /dev/null: $OS_ERROR";
+      if ( $log_file ) {
+         PTDEBUG && _d('Redirecting STDOUT and STDERR to', $log_file);
+         close STDOUT;
+         open  STDOUT, '>>', $log_file
+            or die "Cannot open log file $log_file: $OS_ERROR";
+         if ( $utf8 ) {
+            binmode(STDOUT, ':utf8')
+               or die "Can't binmode(STDOUT, ':utf8'): $OS_ERROR";
+         }
+
+
+         close STDERR;
+         open  STDERR, ">&STDOUT"
+            or die "Cannot dupe STDERR to STDOUT: $OS_ERROR";
+         if ( $utf8 ) {
+            binmode(STDERR, ':utf8')
+               or die "Can't binmode(STDERR, ':utf8'): $OS_ERROR";
+         }
+      }
+      else {
+         if ( -t STDOUT ) {
+            PTDEBUG && _d('No log file and STDOUT is a terminal;',
+               'redirecting to /dev/null');
+            close STDOUT;
+            open  STDOUT, '>', '/dev/null'
+               or die "Cannot reopen STDOUT to /dev/null: $OS_ERROR";
+         }
+         if ( -t STDERR ) {
+            PTDEBUG && _d('No log file and STDERR is a terminal;',
+               'redirecting to /dev/null');
+            close STDERR;
+            open  STDERR, '>', '/dev/null'
+               or die "Cannot reopen STDERR to /dev/null: $OS_ERROR";
+         }
+      }
+
+      $OUTPUT_AUTOFLUSH = 1;
+   }
+
+   PTDEBUG && _d('Daemon running');
+   return;
+}
+
+sub _make_pid_file {
+   my ($self, %args) = @_;
+   my @required_args = qw(pid pid_file);
+   foreach my $arg ( @required_args ) {
+      die "I need a $arg argument" unless $args{$arg};
+   };
+   my $pid      = $args{pid};
+   my $pid_file = $args{pid_file};
+
+   eval {
+      sysopen(PID_FH, $pid_file, O_RDWR|O_CREAT|O_EXCL) or die $OS_ERROR;
+      print PID_FH $PID, "\n";
+      close PID_FH;
+   };
+   if ( my $e = $EVAL_ERROR ) {
+      if ( $e =~ m/file exists/i ) {
+         my $old_pid = $self->_check_pid_file(
+            pid_file => $pid_file,
+            pid      => $PID,
+         );
+         if ( $old_pid ) {
+            warn "Overwriting PID file $pid_file because PID $old_pid "
+               . "is not running.\n";
+         }
+         $self->_update_pid_file(
+            pid      => $PID,
+            pid_file => $pid_file
+         );
+      }
+      else {
+         die "Error creating PID file $pid_file: $e\n";
+      }
+   }
+
+   return;
+}
+
+sub _check_pid_file {
+   my ($self, %args) = @_;
+   my @required_args = qw(pid_file pid);
+   foreach my $arg ( @required_args ) {
+      die "I need a $arg argument" unless $args{$arg};
+   };
+   my $pid_file = $args{pid_file};
+   my $pid      = $args{pid};
+
+   PTDEBUG && _d('Checking if PID in', $pid_file, 'is running');
+
+   if ( ! -f $pid_file ) {
+      PTDEBUG && _d('PID file', $pid_file, 'does not exist');
+      return;
+   }
+
+   open my $fh, '<', $pid_file
+      or die "Error opening $pid_file: $OS_ERROR";
+   my $existing_pid = do { local $/; <$fh> };
+   chomp($existing_pid) if $existing_pid;
+   close $fh
+      or die "Error closing $pid_file: $OS_ERROR";
+
+   if ( $existing_pid ) {
+      if ( $existing_pid == $pid ) {
+         warn "The current PID $pid already holds the PID file $pid_file\n";
+         return;
+      }
+      else {
+         PTDEBUG && _d('Checking if PID', $existing_pid, 'is running');
+         my $pid_is_alive = kill 0, $existing_pid;
+         if ( $pid_is_alive ) {
+            die "PID file $pid_file exists and PID $existing_pid is running\n";
+         }
+      }
+   }
+   else {
+      die "PID file $pid_file exists but it is empty.  Remove the file "
+         . "if the process is no longer running.\n";
+   }
+
+   return $existing_pid;
+}
+
+sub _update_pid_file {
+   my ($self, %args) = @_;
+   my @required_args = qw(pid pid_file);
+   foreach my $arg ( @required_args ) {
+      die "I need a $arg argument" unless $args{$arg};
+   };
+   my $pid      = $args{pid};
+   my $pid_file = $args{pid_file};
+
+   open my $fh, '>', $pid_file
+      or die "Cannot open $pid_file: $OS_ERROR";
+   print { $fh } $pid, "\n"
+      or die "Cannot print to $pid_file: $OS_ERROR";
+   close $fh
+      or warn "Cannot close $pid_file: $OS_ERROR";
+
+   return;
+}
+
+sub remove_pid_file {
+   my ($self, $pid_file) = @_;
+   $pid_file ||= $self->{pid_file};
+   if ( $pid_file && -f $pid_file ) {
+      unlink $self->{pid_file}
+         or warn "Cannot remove PID file $pid_file: $OS_ERROR";
+      PTDEBUG && _d('Removed PID file');
+   }
+   else {
+      PTDEBUG && _d('No PID to remove');
+   }
+   return;
+}
+
+sub DESTROY {
+   my ($self) = @_;
+
+   if ( $self->{pid_file_owner} == $PID ) {
+      $self->remove_pid_file();
+   }
+
+   return;
+}
+
+sub _d {
+   my ($package, undef, $line) = caller 0;
+   @_ = map { (my $temp = $_) =~ s/\n/\n# /g; $temp; }
+        map { defined $_ ? $_ : 'undef' }
+        @_;
+   print STDERR "# $package:$line $PID ", join(' ', @_), "\n";
+}
+
+1;
+}
+# ###########################################################################
+# End Daemon package
+# ###########################################################################
+
+# ###########################################################################
+# VersionParser package
+# This package is a copy without comments from the original.  The original
+# with comments and its test file can be found in the GitHub repository at,
+#   lib/VersionParser.pm
+#   t/lib/VersionParser.t
+# See https://github.com/percona/percona-toolkit for more information.
+# ###########################################################################
+{
+package VersionParser;
+
+use Lmo;
+use Scalar::Util qw(blessed);
+use English qw(-no_match_vars);
+use constant PTDEBUG => $ENV{PTDEBUG} || 0;
+
+use overload (
+   '""'     => "version",
+   '<=>'    => "cmp",
+   'cmp'    => "cmp",
+   fallback => 1,
+);
+
+use Carp ();
+
+has major => (
+    is       => 'ro',
+    isa      => 'Int',
+    required => 1,
+);
+
+has [qw( minor revision )] => (
+    is  => 'ro',
+    isa => 'Num',
+);
+
+has flavor => (
+    is      => 'ro',
+    isa     => 'Str',
+    default => sub { 'Unknown' },
+);
+
+has innodb_version => (
+    is      => 'ro',
+    isa     => 'Str',
+    default => sub { 'NO' },
+);
+
+sub series {
+   my $self = shift;
+   return $self->_join_version($self->major, $self->minor);
+}
+
+sub version {
+   my $self = shift;
+   return $self->_join_version($self->major, $self->minor, $self->revision);
+}
+
+sub is_in {
+   my ($self, $target) = @_;
+
+   return $self eq $target;
+}
+
+sub _join_version {
+    my ($self, @parts) = @_;
+
+    return join ".", map { my $c = $_; $c =~ s/^0\./0/; $c } grep defined, @parts;
+}
+sub _split_version {
+   my ($self, $str) = @_;
+   my @version_parts = map { s/^0(?=\d)/0./; $_ } $str =~ m/(\d+)/g;
+   return @version_parts[0..2];
+}
+
+sub normalized_version {
+   my ( $self ) = @_;
+   my $result = sprintf('%d%02d%02d', map { $_ || 0 } $self->major,
+                                                      $self->minor,
+                                                      $self->revision);
+   PTDEBUG && _d($self->version, 'normalizes to', $result);
+   return $result;
+}
+
+sub comment {
+   my ( $self, $cmd ) = @_;
+   my $v = $self->normalized_version();
+
+   return "/*!$v $cmd */"
+}
+
+my @methods = qw(major minor revision);
+sub cmp {
+   my ($left, $right) = @_;
+   my $right_obj = (blessed($right) && $right->isa(ref($left)))
+                   ? $right
+                   : ref($left)->new($right);
+
+   my $retval = 0;
+   for my $m ( @methods ) {
+      last unless defined($left->$m) && defined($right_obj->$m);
+      $retval = $left->$m <=> $right_obj->$m;
+      last if $retval;
+   }
+   return $retval;
+}
+
+sub BUILDARGS {
+   my $self = shift;
+
+   if ( @_ == 1 ) {
+      my %args;
+      if ( blessed($_[0]) && $_[0]->can("selectrow_hashref") ) {
+         PTDEBUG && _d("VersionParser got a dbh, trying to get the version");
+         my $dbh = $_[0];
+         local $dbh->{FetchHashKeyName} = 'NAME_lc';
+         my $query = eval {
+            $dbh->selectall_arrayref(q/SHOW VARIABLES LIKE 'version%'/, { Slice => {} })
+         };
+         if ( $query ) {
+            $query = { map { $_->{variable_name} => $_->{value} } @$query };
+            @args{@methods} = $self->_split_version($query->{version});
+            $args{flavor} = delete $query->{version_comment}
+                  if $query->{version_comment};
+         }
+         elsif ( eval { ($query) = $dbh->selectrow_array(q/SELECT VERSION()/) } ) {
+            @args{@methods} = $self->_split_version($query);
+         }
+         else {
+            Carp::confess("Couldn't get the version from the dbh while "
+                        . "creating a VersionParser object: $@");
+         }
+         $args{innodb_version} = eval { $self->_innodb_version($dbh) };
+      }
+      elsif ( !ref($_[0]) ) {
+         @args{@methods} = $self->_split_version($_[0]);
+      }
+
+      for my $method (@methods) {
+         delete $args{$method} unless defined $args{$method};
+      }
+      @_ = %args if %args;
+   }
+
+   return $self->SUPER::BUILDARGS(@_);
+}
+
+sub _innodb_version {
+   my ( $self, $dbh ) = @_;
+   return unless $dbh;
+   my $innodb_version = "NO";
+
+   my ($innodb) =
+      grep { $_->{engine} =~ m/InnoDB/i }
+      map  {
+         my %hash;
+         @hash{ map { lc $_ } keys %$_ } = values %$_;
+         \%hash;
+      }
+      @{ $dbh->selectall_arrayref("SHOW ENGINES", {Slice=>{}}) };
+   if ( $innodb ) {
+      PTDEBUG && _d("InnoDB support:", $innodb->{support});
+      if ( $innodb->{support} =~ m/YES|DEFAULT/i ) {
+         my $vars = $dbh->selectrow_hashref(
+            "SHOW VARIABLES LIKE 'innodb_version'");
+         $innodb_version = !$vars ? "BUILTIN"
+                         :          ($vars->{Value} || $vars->{value});
+      }
+      else {
+         $innodb_version = $innodb->{support};  # probably DISABLED or NO
+      }
+   }
+
+   PTDEBUG && _d("InnoDB version:", $innodb_version);
+   return $innodb_version;
+}
+
+sub _d {
+   my ($package, undef, $line) = caller 0;
+   @_ = map { (my $temp = $_) =~ s/\n/\n# /g; $temp; }
+        map { defined $_ ? $_ : 'undef' }
+        @_;
+   print STDERR "# $package:$line $PID ", join(' ', @_), "\n";
+}
+
+no Lmo;
+1;
+}
+# ###########################################################################
+# End VersionParser package
+# ###########################################################################
+
+# ###########################################################################
+# Transformers package
+# This package is a copy without comments from the original.  The original
+# with comments and its test file can be found in the GitHub repository at,
+#   lib/Transformers.pm
+#   t/lib/Transformers.t
+# See https://github.com/percona/percona-toolkit for more information.
+# ###########################################################################
+{
+package Transformers;
+
+use strict;
+use warnings FATAL => 'all';
+use English qw(-no_match_vars);
+use constant PTDEBUG => $ENV{PTDEBUG} || 0;
+
+use Time::Local qw(timegm timelocal);
+use Digest::MD5 qw(md5_hex);
+use B qw();
+
+BEGIN {
+   require Exporter;
+   our @ISA         = qw(Exporter);
+   our %EXPORT_TAGS = ();
+   our @EXPORT      = ();
+   our @EXPORT_OK   = qw(
+      micro_t
+      percentage_of
+      secs_to_time
+      time_to_secs
+      shorten
+      ts
+      parse_timestamp
+      unix_timestamp
+      any_unix_timestamp
+      make_checksum
+      crc32
+      encode_json
+   );
+}
+
+our $mysql_ts  = qr/(\d\d)(\d\d)(\d\d) +(\d+):(\d+):(\d+)(\.\d+)?/;
+our $proper_ts = qr/(\d\d\d\d)-(\d\d)-(\d\d)[T ](\d\d):(\d\d):(\d\d)(\.\d+)?/;
+our $n_ts      = qr/(\d{1,5})([shmd]?)/; # Limit \d{1,5} because \d{6} looks
+
+sub micro_t {
+   my ( $t, %args ) = @_;
+   my $p_ms = defined $args{p_ms} ? $args{p_ms} : 0;  # precision for ms vals
+   my $p_s  = defined $args{p_s}  ? $args{p_s}  : 0;  # precision for s vals
+   my $f;
+
+   $t = 0 if $t < 0;
+
+   $t = sprintf('%.17f', $t) if $t =~ /e/;
+
+   $t =~ s/\.(\d{1,6})\d*/\.$1/;
+
+   if ($t > 0 && $t <= 0.000999) {
+      $f = ($t * 1000000) . 'us';
+   }
+   elsif ($t >= 0.001000 && $t <= 0.999999) {
+      $f = sprintf("%.${p_ms}f", $t * 1000);
+      $f = ($f * 1) . 'ms'; # * 1 to remove insignificant zeros
+   }
+   elsif ($t >= 1) {
+      $f = sprintf("%.${p_s}f", $t);
+      $f = ($f * 1) . 's'; # * 1 to remove insignificant zeros
+   }
+   else {
+      $f = 0;  # $t should = 0 at this point
+   }
+
+   return $f;
+}
+
+sub percentage_of {
+   my ( $is, $of, %args ) = @_;
+   my $p   = $args{p} || 0; # float precision
+   my $fmt = $p ? "%.${p}f" : "%d";
+   return sprintf $fmt, ($is * 100) / ($of ||= 1);
+}
+
+sub secs_to_time {
+   my ( $secs, $fmt ) = @_;
+   $secs ||= 0;
+   return '00:00' unless $secs;
+
+   $fmt ||= $secs >= 86_400 ? 'd'
+          : $secs >= 3_600  ? 'h'
+          :                   'm';
+
+   return
+      $fmt eq 'd' ? sprintf(
+         "%d+%02d:%02d:%02d",
+         int($secs / 86_400),
+         int(($secs % 86_400) / 3_600),
+         int(($secs % 3_600) / 60),
+         $secs % 60)
+      : $fmt eq 'h' ? sprintf(
+         "%02d:%02d:%02d",
+         int(($secs % 86_400) / 3_600),
+         int(($secs % 3_600) / 60),
+         $secs % 60)
+      : sprintf(
+         "%02d:%02d",
+         int(($secs % 3_600) / 60),
+         $secs % 60);
+}
+
+sub time_to_secs {
+   my ( $val, $default_suffix ) = @_;
+   die "I need a val argument" unless defined $val;
+   my $t = 0;
+   my ( $prefix, $num, $suffix ) = $val =~ m/([+-]?)(\d+)([a-z])?$/;
+   $suffix = $suffix || $default_suffix || 's';
+   if ( $suffix =~ m/[smhd]/ ) {
+      $t = $suffix eq 's' ? $num * 1        # Seconds
+         : $suffix eq 'm' ? $num * 60       # Minutes
+         : $suffix eq 'h' ? $num * 3600     # Hours
+         :                  $num * 86400;   # Days
+
+      $t *= -1 if $prefix && $prefix eq '-';
+   }
+   else {
+      die "Invalid suffix for $val: $suffix";
+   }
+   return $t;
+}
+
+sub shorten {
+   my ( $num, %args ) = @_;
+   my $p = defined $args{p} ? $args{p} : 2;     # float precision
+   my $d = defined $args{d} ? $args{d} : 1_024; # divisor
+   my $n = 0;
+   my @units = ('', qw(k M G T P E Z Y));
+   while ( $num >= $d && $n < @units - 1 ) {
+      $num /= $d;
+      ++$n;
+   }
+   return sprintf(
+      $num =~ m/\./ || $n
+         ? '%1$.'.$p.'f%2$s'
+         : '%1$d',
+      $num, $units[$n]);
+}
+
+sub ts {
+   my ( $time, $gmt ) = @_;
+   my ( $sec, $min, $hour, $mday, $mon, $year )
+      = $gmt ? gmtime($time) : localtime($time);
+   $mon  += 1;
+   $year += 1900;
+   my $val = sprintf("%d-%02d-%02dT%02d:%02d:%02d",
+      $year, $mon, $mday, $hour, $min, $sec);
+   if ( my ($us) = $time =~ m/(\.\d+)$/ ) {
+      $us = sprintf("%.6f", $us);
+      $us =~ s/^0\././;
+      $val .= $us;
+   }
+   return $val;
+}
+
+sub parse_timestamp {
+   my ( $val ) = @_;
+   if ( my($y, $m, $d, $h, $i, $s, $f)
+         = $val =~ m/^$mysql_ts$/ )
+   {
+      return sprintf "%d-%02d-%02d %02d:%02d:"
+                     . (defined $f ? '%09.6f' : '%02d'),
+                     $y + 2000, $m, $d, $h, $i, (defined $f ? $s + $f : $s);
+   }
+   elsif ( $val =~ m/^$proper_ts$/ ) {
+      return $val;
+   }
+   return $val;
+}
+
+sub unix_timestamp {
+   my ( $val, $gmt ) = @_;
+   if ( my($y, $m, $d, $h, $i, $s, $us) = $val =~ m/^$proper_ts$/ ) {
+      $val = $gmt
+         ? timegm($s, $i, $h, $d, $m - 1, $y)
+         : timelocal($s, $i, $h, $d, $m - 1, $y);
+      if ( defined $us ) {
+         $us = sprintf('%.6f', $us);
+         $us =~ s/^0\././;
+         $val .= $us;
+      }
+   }
+   return $val;
+}
+
+sub any_unix_timestamp {
+   my ( $val, $callback ) = @_;
+
+   if ( my ($n, $suffix) = $val =~ m/^$n_ts$/ ) {
+      $n = $suffix eq 's' ? $n            # Seconds
+         : $suffix eq 'm' ? $n * 60       # Minutes
+         : $suffix eq 'h' ? $n * 3600     # Hours
+         : $suffix eq 'd' ? $n * 86400    # Days
+         :                  $n;           # default: Seconds
+      PTDEBUG && _d('ts is now - N[shmd]:', $n);
+      return time - $n;
+   }
+   elsif ( $val =~ m/^\d{9,}/ ) {
+      PTDEBUG && _d('ts is already a unix timestamp');
+      return $val;
+   }
+   elsif ( my ($ymd, $hms) = $val =~ m/^(\d{6})(?:\s+(\d+:\d+:\d+))?/ ) {
+      PTDEBUG && _d('ts is MySQL slow log timestamp');
+      $val .= ' 00:00:00' unless $hms;
+      return unix_timestamp(parse_timestamp($val));
+   }
+   elsif ( ($ymd, $hms) = $val =~ m/^(\d{4}-\d\d-\d\d)(?:[T ](\d+:\d+:\d+))?/) {
+      PTDEBUG && _d('ts is properly formatted timestamp');
+      $val .= ' 00:00:00' unless $hms;
+      return unix_timestamp($val);
+   }
+   else {
+      PTDEBUG && _d('ts is MySQL expression');
+      return $callback->($val) if $callback && ref $callback eq 'CODE';
+   }
+
+   PTDEBUG && _d('Unknown ts type:', $val);
+   return;
+}
+
+sub make_checksum {
+   my ( $val ) = @_;
+   my $checksum = uc md5_hex($val);
+   PTDEBUG && _d($checksum, 'checksum for', $val);
+   return $checksum;
+}
+
+sub crc32 {
+   my ( $string ) = @_;
+   return unless $string;
+   my $poly = 0xEDB88320;
+   my $crc  = 0xFFFFFFFF;
+   foreach my $char ( split(//, $string) ) {
+      my $comp = ($crc ^ ord($char)) & 0xFF;
+      for ( 1 .. 8 ) {
+         $comp = $comp & 1 ? $poly ^ ($comp >> 1) : $comp >> 1;
+      }
+      $crc = (($crc >> 8) & 0x00FFFFFF) ^ $comp;
+   }
+   return $crc ^ 0xFFFFFFFF;
+}
+
+my $got_json = eval { require JSON };
+sub encode_json {
+   return JSON::encode_json(@_) if $got_json;
+   my ( $data ) = @_;
+   return (object_to_json($data) || '');
+}
+
+
+sub object_to_json {
+   my ($obj) = @_;
+   my $type  = ref($obj);
+
+   if($type eq 'HASH'){
+      return hash_to_json($obj);
+   }
+   elsif($type eq 'ARRAY'){
+      return array_to_json($obj);
+   }
+   else {
+      return value_to_json($obj);
+   }
+}
+
+sub hash_to_json {
+   my ($obj) = @_;
+   my @res;
+   for my $k ( sort { $a cmp $b } keys %$obj ) {
+      push @res, string_to_json( $k )
+         .  ":"
+         . ( object_to_json( $obj->{$k} ) || value_to_json( $obj->{$k} ) );
+   }
+   return '{' . ( @res ? join( ",", @res ) : '' )  . '}';
+}
+
+sub array_to_json {
+   my ($obj) = @_;
+   my @res;
+
+   for my $v (@$obj) {
+      push @res, object_to_json($v) || value_to_json($v);
+   }
+
+   return '[' . ( @res ? join( ",", @res ) : '' ) . ']';
+}
+
+sub value_to_json {
+   my ($value) = @_;
+
+   return 'null' if(!defined $value);
+
+   my $b_obj = B::svref_2object(\$value);  # for round trip problem
+   my $flags = $b_obj->FLAGS;
+   return $value # as is
+      if $flags & ( B::SVp_IOK | B::SVp_NOK ) and !( $flags & B::SVp_POK ); # SvTYPE is IV or NV?
+
+   my $type = ref($value);
+
+   if( !$type ) {
+      return string_to_json($value);
+   }
+   else {
+      return 'null';
+   }
+
+}
+
+my %esc = (
+   "\n" => '\n',
+   "\r" => '\r',
+   "\t" => '\t',
+   "\f" => '\f',
+   "\b" => '\b',
+   "\"" => '\"',
+   "\\" => '\\\\',
+   "\'" => '\\\'',
+);
+
+sub string_to_json {
+   my ($arg) = @_;
+
+   $arg =~ s/([\x22\x5c\n\r\t\f\b])/$esc{$1}/g;
+   $arg =~ s/\//\\\//g;
+   $arg =~ s/([\x00-\x08\x0b\x0e-\x1f])/'\\u00' . unpack('H2', $1)/eg;
+
+   utf8::upgrade($arg);
+   utf8::encode($arg);
+
+   return '"' . $arg . '"';
+}
+
+sub _d {
+   my ($package, undef, $line) = caller 0;
+   @_ = map { (my $temp = $_) =~ s/\n/\n# /g; $temp; }
+        map { defined $_ ? $_ : 'undef' }
+        @_;
+   print STDERR "# $package:$line $PID ", join(' ', @_), "\n";
+}
+
+1;
+}
+# ###########################################################################
+# End Transformers package
+# ###########################################################################
+
+# ###########################################################################
+# This is a combination of modules and programs in one -- a runnable module.
+# http://www.perl.com/pub/a/2006/07/13/lightning-articles.html?page=last
+# Or, look it up in the Camel book on pages 642 and 643 in the 3rd edition.
+#
+# Check at the end of this package for the call to main() which actually runs
+# the program.
+# ###########################################################################
+package pt_slave_find;
+
+use strict;
+use warnings FATAL => 'all';
+use English qw(-no_match_vars);
+use File::Basename;
+use constant PTDEBUG => $ENV{PTDEBUG} || 0;
+
+Transformers->import(qw(secs_to_time ts));
+
+sub main {
+   @ARGV = @_;  # set global ARGV for this package
+
+   if ( basename($0) eq 'pt-slave-find' ) {
+      warn "pt-slave-find is a link to pt-replica-find.\nThis file name is deprecated and will be removed in future releases. Use pt-replica-find instead.\n\n";
+   }
+
+   # ########################################################################
+   # Get configuration information.
+   # ########################################################################
+   my $o = new OptionParser();
+   $o->get_specs();
+   $o->get_opts();
+
+   my $dp = $o->DSNParser();
+   $dp->prop('set-vars', $o->set_vars());
+
+   if ( $o->get('ask-pass') ) {
+      $o->set('password', OptionParser::prompt_noecho("Enter password: "));
+   }
+
+   my $dsn_defaults = $dp->parse_options($o);
+   my $master_dsn   = @ARGV ? $dp->parse(shift @ARGV, $dsn_defaults)
+                            : $dsn_defaults;
+   if ( !$master_dsn ) {
+      $o->save_error("Missing or invalid master host");
+   }
+
+   eval {
+      MasterSlave::check_recursion_method($o->get('recursion-method'));
+   };
+   if ( $EVAL_ERROR ) {
+      $o->save_error("Invalid --recursion-method: $EVAL_ERROR")
+   }
+
+   $o->usage_or_errors();
+
+   # ########################################################################
+   # If --pid, check it first since we'll die if it already exits.
+   # ########################################################################
+   my $daemon;
+   if ( $o->get('pid') ) {
+      # We're not daemoninzing, it just handles PID stuff.  Keep $daemon
+      # in the the scope of main() because when it's destroyed it automatically
+      # removes the PID file.
+      $daemon = new Daemon(
+         daemonize => 0, # not daemoninzing, just PID file
+         pid_file => $o->get('pid'),
+      );
+      $daemon->run();
+   }
+
+   # ########################################################################
+   # Connect and go to work.
+   # ########################################################################
+   my $dbh = $dp->get_dbh($dp->get_cxn_params($master_dsn), {AutoCommit => 1});
+
+   my $exit_status = 0;
+   my %slaves_found;
+   my $root;
+
+   # Despite the name, recursing to slaves actually begins at the specified
+   # server, so the named server may also be included.
+   my $ms = new MasterSlave(
+      OptionParser => $o,
+      DSNParser    => $dp,
+      Quoter       => "Quoter",
+   );
+   $ms->recurse_to_replicas(
+      {  dbh      => $dbh,
+         dsn      => $master_dsn,
+         callback => sub {
+            my ( $dsn, $dbh, $level, $parent ) = @_;
+            if ( !$parent ) {
+               $root = $dsn;
+            }
+            else {
+               my $p = $slaves_found{$dp->as_string($parent)};
+               push @{$p->{children}}, $dsn;
+            }
+            my $slave = $dp->as_string($dsn);
+            $slaves_found{$slave}        = $dsn;
+            $slaves_found{$slave}->{dbh} = $dbh;
+         },
+      }
+   );
+
+   # If the user relied on values from the defaults file, the $root hostname
+   # might not be defined.  Try to fill it in.
+   $root->{h} ||= $dp->get_hostname($dbh);
+
+   # Now that we've found them all, recurse through them and do stuff!
+   my %print_node_sub_for = (
+      hostname => \&print_node_hostname,
+      summary  => \&print_node_summary,
+   );
+   my $print_node = $print_node_sub_for{lc($o->get('report-format'))};
+   print_slaves(
+      node          => $root,
+      print_node    => $print_node,
+      MasterSlave   => $ms,
+      resolve_address => $o->get('resolve-address'),
+   );
+
+   return 0;
+}
+
+# ############################################################################
+# Subroutines
+# ############################################################################
+
+# Print master and slaves in a tree like:
+#    master:port
+#    +- slave1:port
+#       +- slave1-1:port
+#    +- slave2:port
+# The levels are thus:
+#    0
+#    +- 1
+#       +- 2
+#    +- 1
+sub print_slaves {
+   my ( %args ) = @_;
+   my ($ms, $node, $level, $print_node)
+      = @args{qw(MasterSlave node level print_node)};
+   die "I need a node" unless $node;
+   $level ||= 0;
+
+   PTDEBUG && _d("Printing slaves, starting level", $level);
+
+   # Print this node.
+   $print_node->(%args);
+
+   # If this node has slaves, print them.
+   if ( $node->{children} ) {
+      PTDEBUG && _d($ms->short_host($node), "has slaves");
+      my @slaves = reverse @{$node->{children}};
+      foreach my $slave ( @slaves ) {
+         print_slaves(%args, node=>$slave, level=>$level + 1);
+      }
+   }
+
+   return;
+}
+
+sub print_node_hostname {
+   my ( %args ) = @_;
+   my ($ms, $node, $level, $resolve_address) = @args{qw(MasterSlave node level resolve_address)};
+   die "I need a node" unless $node;
+   $level ||= 0;
+
+   # Strip out the noise.  We really only need to see the host and port, and if
+   # the port is default, we don't even need to see that.
+   my $host   = $ms->short_host($node);
+   my $prefix = $level ? (' ' x (($level-1)*3) . '+- ') : '';
+
+   PTDEBUG && _d('level', $level, 'host', $host);
+
+   print_host($prefix, $host, $resolve_address);
+
+   return;
+}
+
+sub print_node_summary {
+   my ( %args ) = @_;
+   my ($ms, $node, $level, $resolve_address)
+      = @args{qw(MasterSlave node level resolve_address)};
+   die "I need a node" unless $node;
+   $level ||= 0;
+
+   my $host   = $ms->short_host($node);
+   my $prefix = $level ? (' ' x (($level-1)*3) . '+- ') : '';
+   my $indent = ' ' x ($level * 3);
+
+   PTDEBUG && _d('level', $level, 'host', $host);
+
+   print_host($prefix, $host, $resolve_address);
+
+   my $dbh = $node->{dbh};
+   if ( !$dbh ) {
+      print $prefix . "Cannot connect to this slave\n";
+      return;
+   }
+   $dbh->{FetchHashKeyName} = 'NAME_lc';
+   
+   my $vp = VersionParser->new($dbh);
+   my $source_name = 'source';
+   my $replica_name = 'replica';
+   if ( $vp lt '8.1' || $vp->flavor() =~ m/maria/ ) {
+      $source_name = 'master';
+      $replica_name = 'slave';
+   }
+
+   # Build the summary line by line, then join and print the lines.
+   my @lines;
+   my $vars  = $dbh->selectall_hashref("SHOW VARIABLES", 'variable_name');
+   my $stats = $dbh->selectall_hashref("SHOW STATUS", 'variable_name');
+   my $ss    = $dbh->selectrow_hashref("SHOW ${replica_name} STATUS");
+   my $proc  = $dbh->selectall_hashref("SHOW PROCESSLIST", 'id');
+
+   push @lines, ['Version',   $vars->{version}->{value}];
+   push @lines, ['Server ID', $vars->{server_id}->{value}];
+
+   my $dhms    = secs_to_time($stats->{Uptime}->{value}) || '';
+   my $started = ts(time - $stats->{Uptime}->{value})    || '';
+   push @lines, ['Uptime', "$dhms (started $started)"];
+
+   my $n_slaves = 0;
+   if ( $proc ) {
+      map { $n_slaves++ if $proc->{$_}->{command} =~ m/Binlog Dump/i }
+         keys %$proc;
+   }
+   push @lines, [
+      'Replication',
+      ($ss ? "Is a slave, " : "Is not a slave, ")
+         . "has $n_slaves slaves connected, "
+         . "is " . (($vars->{read_only}->{value} || "") eq "ON" ? "" : "not ")
+         . "read_only"
+   ];
+
+   my $repl_filters = $ms->get_replication_filters(dbh=>$dbh);
+   push @lines, [
+      'Filters',
+      keys %$repl_filters ?
+         join('; ', map { "$_=$repl_filters->{$_}" } keys %$repl_filters) : ''
+   ];
+
+   push @lines, ['Binary logging',  $vars->{binlog_format}->{value}];
+
+   my $slave_status = '';
+   if ( $ss ) {
+      $slave_status = sprintf("%s seconds behind, %s, %s",
+         defined $ss->{"seconds_behind_${source_name}"} ? $ss->{"seconds_behind_${source_name}"} : '',
+         $ss->{"${replica_name}_io_running"}  eq 'Yes' && $ss->{"${replica_name}_sql_running"} eq 'Yes' ? 'running' : 'not running',
+          $ss->{last_errno} ? "error $ss->{last_errno}" : "no errors",
+      );
+   }
+   push @lines, ['Slave status', $slave_status];
+   push @lines, ['Slave mode',   $vars->{slave_exec_mode}->{value}];
+   push @lines, [
+      'Auto-increment',
+        "increment " . ($vars->{auto_increment_increment}->{value}|| '')
+      . ", offset "  . ($vars->{auto_increment_offset}->{value}   || '')
+   ];
+
+   my $innodb_version = VersionParser->new($dbh)->innodb_version();
+   push @lines, ['InnoDB version', $innodb_version];
+
+   my $line_fmt = "$indent%-15s %s";
+   print join("\n",
+         map { sprintf($line_fmt, $_->[0], defined $_->[1] ? $_->[1] : 'unknown') } @lines),
+      "\n";
+
+   return;
+}
+
+sub print_host {
+   my ($prefix, $host, $resolve_address) = @_;
+
+   my $hostname;
+   # resolve address to hostname if user requested it
+   if($resolve_address) {
+      use Socket;
+      my $without_port = $host;
+      $without_port =~ s/:\d*$//;  # strip port from ip address
+      my $packed = inet_aton($without_port);
+      if ($packed) {
+          $hostname = gethostbyaddr($packed, AF_INET);
+      }
+   }
+   if ($hostname) {
+       print "$prefix$host ($hostname)\n";
+   }
+   else {
+       print "$prefix$host\n";
+   }
+}
+
+sub _d {
+   my ($package, undef, $line) = caller 0;
+   @_ = map { (my $temp = $_) =~ s/\n/\n# /g; $temp; }
+        map { defined $_ ? $_ : 'undef' }
+        @_;
+   print STDERR "# $package:$line $PID ", join(' ', @_), "\n";
+}
+
+# ############################################################################
+# Run the program.
+# ############################################################################
+if ( !caller ) { exit main(@ARGV); }
+
+1; # Because this is a module as well as a script.
+
+# ############################################################################
+# Documentation.
+# ############################################################################
+
+=pod
+
+=head1 NAME
+
+pt-replica-find - Find and print replication hierarchy tree of MySQL slaves.
+
+=head1 SYNOPSIS
+
+Usage: pt-replica-find [OPTIONS] [DSN]
+
+pt-replica-find finds and prints a hierarchy tree of MySQL slaves.
+
+Examples:
+
+   pt-replica-find --host master-host
+
+=head1 RISKS
+
+Percona Toolkit is mature, proven in the real world, and well tested,
+but all database tools can pose a risk to the system and the database
+server.  Before using this tool, please:
+
+=over
+
+=item * Read the tool's documentation
+
+=item * Review the tool's known L<"BUGS">
+
+=item * Test the tool on a non-production server
+
+=item * Backup your production server and verify the backups
+
+=back
+
+=head1 DESCRIPTION
+
+pt-replica-find connects to a MySQL replication master and finds its slaves.
+Currently the only thing it can do is print a tree-like view of the replication
+hierarchy.
+
+The master host can be specified using one of two methods.  The first method is
+to use the standard connection-related command line options:
+L<"--defaults-file">, L<"--password">, L<"--host">, L<"--port">, L<"--socket">
+or L<"--user">.
+
+The second method to specify the master host is a DSN.  A DSN is a special
+syntax that can be either just a hostname (like C<server.domain.com> or
+C<1.2.3.4>), or a C<key=value,key=value> string. Keys are a single letter:
+
+   KEY MEANING
+   === =======
+   h   Connect to host
+   P   Port number to use for connection
+   S   Socket file to use for connection
+   u   User for login if not current user
+   p   Password to use when connecting
+   F   Only read default options from the given file
+
+C<pt-replica-find> reads all normal MySQL option files, such as ~/.my.cnf, so
+you may not need to specify username, password and other common options at all.
+
+=head1 EXIT STATUS
+
+An exit status of 0 (sometimes also called a return value or return code)
+indicates success.  Any other value represents the exit status of
+the Perl process itself.
+
+=head1 OPTIONS
+
+This tool accepts additional command-line arguments.  Refer to the
+L<"SYNOPSIS"> and usage information for details.
+
+=over
+
+=item --ask-pass
+
+Prompt for a password when connecting to MySQL.
+
+=item --charset
+
+short form: -A; type: string
+
+Default character set.  If the value is utf8, sets Perl's binmode on
+STDOUT to utf8, passes the mysql_enable_utf8 option to DBD::mysql, and
+runs SET NAMES UTF8 after connecting to MySQL.  Any other value sets
+binmode on STDOUT without the utf8 layer, and runs SET NAMES after
+connecting to MySQL.
+
+=item --config
+
+type: Array
+
+Read this comma-separated list of config files; if specified, this must be the
+first option on the command line.
+
+=item --database
+
+type: string; short form: -D
+
+Database to use.
+
+=item --defaults-file
+
+short form: -F; type: string
+
+Only read mysql options from the given file.  You must give an absolute
+pathname.
+
+=item --help
+
+Show help and exit.
+
+=item --host
+
+short form: -h; type: string
+
+Connect to host.
+
+=item --password
+
+short form: -p; type: string
+
+Password to use when connecting.
+If password contains commas they must be escaped with a backslash: "exam\,ple"
+
+=item --pid
+
+type: string
+
+Create the given PID file.  The tool won't start if the PID file already
+exists and the PID it contains is different than the current PID.  However,
+if the PID file exists and the PID it contains is no longer running, the
+tool will overwrite the PID file with the current PID.  The PID file is
+removed automatically when the tool exits.
+
+=item --port
+
+short form: -P; type: int
+
+Port number to use for connection.
+
+=item --recurse
+
+type: int
+
+Number of levels to recurse in the hierarchy.  Default is infinite.
+
+See L<"--recursion-method">.
+
+=item --recursion-method
+
+type: array; default: processlist,hosts
+
+Preferred recursion method used to find slaves.
+
+Possible methods are:
+
+  METHOD       USES
+  ===========  ==================
+  processlist  SHOW PROCESSLIST
+  hosts        SHOW SLAVE HOSTS
+  none         Do not find slaves
+
+The processlist method is preferred because SHOW SLAVE HOSTS is not reliable.
+However, the hosts method is required if the server uses a non-standard
+port (not 3306).  Usually pt-replica-find does the right thing and finds
+the slaves, but you may give a preferred method and it will be used first.
+If it doesn't find any slaves, the other methods will be tried.
+
+=item --report-format
+
+type: string; default: summary
+
+Set what information about the slaves is printed.  The report format can be
+one of the following:
+
+=over
+
+=item * hostname
+
+Print just the hostname name of the slaves.  It looks like:
+
+  127.0.0.1:12345
+  +- 127.0.0.1:12346
+     +- 127.0.0.1:12347
+
+=item * summary
+
+Print a summary of each slave's settings.  This report shows more information
+about each slave, like:
+
+  127.0.0.1:12345
+  Version         5.1.34-log
+  Server ID       12345
+  Uptime          04:56 (started 2010-06-17T11:21:22)
+  Replication     Is not a slave, has 1 slaves connected
+  Filters
+  Binary logging  STATEMENT
+  Slave status
+  Slave mode      STRICT
+  Auto-increment  increment 1, offset 1
+  +- 127.0.0.1:12346
+     Version         5.1.34-log
+     Server ID       12346
+     Uptime          04:54 (started 2010-06-17T11:21:24)
+     Replication     Is a slave, has 1 slaves connected
+     Filters
+     Binary logging  STATEMENT
+     Slave status    0 seconds behind, running, no errors
+     Slave mode      STRICT
+     Auto-increment  increment 1, offset 1
+
+=back
+
+=item --resolve-address
+
+Resolve ip-address to hostname. Report will print both IP and hostname.
+
+Example:
+
+   10.10.7.14 (dbase1.sample.net)
+
+Might delay runtime a few seconds.
+
+=item --slave-user
+
+type: string
+
+Sets the user to be used to connect to the slaves.
+This parameter allows you to have a different user with less privileges on the
+slaves but that user must exist on all slaves.
+
+=item --slave-password
+
+type: string
+
+Sets the password to be used to connect to the slaves.
+It can be used with --slave-user and the password for the user must be the same
+on all slaves.
+
+=item --set-vars
+
+type: Array
+
+Set the MySQL variables in this comma-separated list of C<variable=value> pairs.
+
+By default, the tool sets:
+
+=for comment ignore-pt-internal-value
+MAGIC_set_vars
+
+   wait_timeout=10000
+
+Variables specified on the command line override these defaults.  For
+example, specifying C<--set-vars wait_timeout=500> overrides the defaultvalue of C<10000>.
+
+The tool prints a warning and continues if a variable cannot be set.
+
+=item --socket
+
+short form: -S; type: string
+
+Socket file to use for connection.
+
+=item --user
+
+short form: -u; type: string
+
+User for login if not current user.
+
+=item --version
+
+Show version and exit.
+
+=back
+
+=head1 DSN OPTIONS
+
+These DSN options are used to create a DSN.  Each option is given like
+C<option=value>.  The options are case-sensitive, so P and p are not the
+same option.  There cannot be whitespace before or after the C<=> and
+if the value contains whitespace it must be quoted.  DSN options are
+comma-separated.  See the L<percona-toolkit> manpage for full details.
+
+=over
+
+=item * A
+
+dsn: charset; copy: yes
+
+Default character set.
+
+=item * D
+
+dsn: database; copy: yes
+
+Default database.
+
+=item * F
+
+dsn: mysql_read_default_file; copy: yes
+
+Only read default options from the given file
+
+=item * h
+
+dsn: host; copy: yes
+
+Connect to host.
+
+=item * p
+
+dsn: password; copy: yes
+
+Password to use when connecting.
+If password contains commas they must be escaped with a backslash: "exam\,ple"
+
+=item * P
+
+dsn: port; copy: yes
+
+Port number to use for connection.
+
+=item * S
+
+dsn: mysql_socket; copy: yes
+
+Socket file to use for connection.
+
+=item * u
+
+dsn: user; copy: yes
+
+User for login if not current user.
+
+=item * s
+
+dsn: mysql_ssl; copy: yes
+
+Create SSL connection
+
+=back
+
+=head1 ENVIRONMENT
+
+The environment variable C<PTDEBUG> enables verbose debugging output to STDERR.
+To enable debugging and capture all output to a file, run the tool like:
+
+   PTDEBUG=1 pt-replica-find ... > FILE 2>&1
+
+Be careful: debugging output is voluminous and can generate several megabytes
+of output.
+
+=head1 ATTENTION
+
+Using <PTDEBUG> might expose passwords. When debug is enabled, all command line
+parameters are shown in the output.
+
+=head1 SYSTEM REQUIREMENTS
+
+You need Perl, DBI, DBD::mysql, and some core packages that ought to be
+installed in any reasonably new version of Perl.
+
+=head1 BUGS
+
+For a list of known bugs, see L<https://jira.percona.com/projects/PT/issues>.
+
+Please report bugs at L<https://jira.percona.com/projects/PT>.
+Include the following information in your bug report:
+
+=over
+
+=item * Complete command-line used to run the tool
+
+=item * Tool L<"--version">
+
+=item * MySQL version of all servers involved
+
+=item * Output from the tool including STDERR
+
+=item * Input files (log/dump/config files, etc.)
+
+=back
+
+If possible, include debugging output by running the tool with C<PTDEBUG>;
+see L<"ENVIRONMENT">.
+
+=head1 DOWNLOADING
+
+Visit L<http://www.percona.com/software/percona-toolkit/> to download the
+latest release of Percona Toolkit.  Or, get the latest release from the
+command line:
+
+   wget percona.com/get/percona-toolkit.tar.gz
+
+   wget percona.com/get/percona-toolkit.rpm
+
+   wget percona.com/get/percona-toolkit.deb
+
+You can also get individual tools from the latest release:
+
+   wget percona.com/get/TOOL
+
+Replace C<TOOL> with the name of any tool.
+
+=head1 AUTHORS
+
+Baron Schwartz and Daniel Nichter
+
+=head1 ABOUT PERCONA TOOLKIT
+
+This tool is part of Percona Toolkit, a collection of advanced command-line
+tools for MySQL developed by Percona.  Percona Toolkit was forked from two
+projects in June, 2011: Maatkit and Aspersa.  Those projects were created by
+Baron Schwartz and primarily developed by him and Daniel Nichter.  Visit
+L<http://www.percona.com/software/> to learn about other free, open-source
+software from Percona.
+
+=head1 COPYRIGHT, LICENSE, AND WARRANTY
+
+This program is copyright 2011-2024 Percona LLC and/or its affiliates,
+2007-2011 Baron Schwartz.
+
+THIS PROGRAM IS PROVIDED "AS IS" AND WITHOUT ANY EXPRESS OR IMPLIED
+WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+
+This program is free software; you can redistribute it and/or modify it under
+the terms of the GNU General Public License as published by the Free Software
+Foundation, version 2; OR the Perl Artistic License.  On UNIX and similar
+systems, you can issue `man perlgpl' or `man perlartistic' to read these
+licenses.
+
+You should have received a copy of the GNU General Public License along with
+this program; if not, write to the Free Software Foundation, Inc., 59 Temple
+Place, Suite 330, Boston, MA  02111-1307  USA.
+
+=head1 VERSION
+
+pt-replica-find 3.6.0
+
+=cut
diff --git a/bin/pt-slave-find b/bin/pt-slave-find
deleted file mode 100755
index 4c0177636..000000000
--- a/bin/pt-slave-find
+++ /dev/null
@@ -1,4782 +0,0 @@
-#!/usr/bin/env perl
-
-# This program is part of Percona Toolkit: http://www.percona.com/software/
-# See "COPYRIGHT, LICENSE, AND WARRANTY" at the end of this file for legal
-# notices and disclaimers.
-
-use strict;
-use warnings FATAL => 'all';
-
-# This tool is "fat-packed": most of its dependent modules are embedded
-# in this file.  Setting %INC to this file for each module makes Perl aware
-# of this so it will not try to load the module from @INC.  See the tool's
-# documentation for a full list of dependencies.
-BEGIN {
-   $INC{$_} = __FILE__ for map { (my $pkg = "$_.pm") =~ s!::!/!g; $pkg } (qw(
-      OptionParser
-      Lmo::Utils
-      Lmo::Meta
-      Lmo::Object
-      Lmo::Types
-      Lmo
-      DSNParser
-      MasterSlave
-      Daemon
-      VersionParser
-      Transformers
-   ));
-}
-
-# ###########################################################################
-# OptionParser package
-# This package is a copy without comments from the original.  The original
-# with comments and its test file can be found in the GitHub repository at,
-#   lib/OptionParser.pm
-#   t/lib/OptionParser.t
-# See https://github.com/percona/percona-toolkit for more information.
-# ###########################################################################
-{
-package OptionParser;
-
-use strict;
-use warnings FATAL => 'all';
-use English qw(-no_match_vars);
-use constant PTDEBUG => $ENV{PTDEBUG} || 0;
-
-use List::Util qw(max);
-use Getopt::Long;
-use Data::Dumper;
-
-my $POD_link_re = '[LC]<"?([^">]+)"?>';
-
-sub new {
-   my ( $class, %args ) = @_;
-   my @required_args = qw();
-   foreach my $arg ( @required_args ) {
-      die "I need a $arg argument" unless $args{$arg};
-   }
-
-   my ($program_name) = $PROGRAM_NAME =~ m/([.A-Za-z-]+)$/;
-   $program_name ||= $PROGRAM_NAME;
-   my $home = $ENV{HOME} || $ENV{HOMEPATH} || $ENV{USERPROFILE} || '.';
-
-   my %attributes = (
-      'type'       => 1,
-      'short form' => 1,
-      'group'      => 1,
-      'default'    => 1,
-      'cumulative' => 1,
-      'negatable'  => 1,
-      'repeatable' => 1,  # means it can be specified more than once
-   );
-
-   my $self = {
-      head1             => 'OPTIONS',        # These args are used internally
-      skip_rules        => 0,                # to instantiate another Option-
-      item              => '--(.*)',         # Parser obj that parses the
-      attributes        => \%attributes,     # DSN OPTIONS section.  Tools
-      parse_attributes  => \&_parse_attribs, # don't tinker with these args.
-
-      %args,
-
-      strict            => 1,  # disabled by a special rule
-      program_name      => $program_name,
-      opts              => {},
-      got_opts          => 0,
-      short_opts        => {},
-      defaults          => {},
-      groups            => {},
-      allowed_groups    => {},
-      errors            => [],
-      rules             => [],  # desc of rules for --help
-      mutex             => [],  # rule: opts are mutually exclusive
-      atleast1          => [],  # rule: at least one opt is required
-      disables          => {},  # rule: opt disables other opts
-      defaults_to       => {},  # rule: opt defaults to value of other opt
-      DSNParser         => undef,
-      default_files     => [
-         "/etc/percona-toolkit/percona-toolkit.conf",
-         "/etc/percona-toolkit/$program_name.conf",
-         "$home/.percona-toolkit.conf",
-         "$home/.$program_name.conf",
-      ],
-      types             => {
-         string => 's', # standard Getopt type
-         int    => 'i', # standard Getopt type
-         float  => 'f', # standard Getopt type
-         Hash   => 'H', # hash, formed from a comma-separated list
-         hash   => 'h', # hash as above, but only if a value is given
-         Array  => 'A', # array, similar to Hash
-         array  => 'a', # array, similar to hash
-         DSN    => 'd', # DSN
-         size   => 'z', # size with kMG suffix (powers of 2^10)
-         time   => 'm', # time, with an optional suffix of s/h/m/d
-      },
-   };
-
-   return bless $self, $class;
-}
-
-sub get_specs {
-   my ( $self, $file ) = @_;
-   $file ||= $self->{file} || __FILE__;
-   my @specs = $self->_pod_to_specs($file);
-   $self->_parse_specs(@specs);
-
-   open my $fh, "<", $file or die "Cannot open $file: $OS_ERROR";
-   my $contents = do { local $/ = undef; <$fh> };
-   close $fh;
-   if ( $contents =~ m/^=head1 DSN OPTIONS/m ) {
-      PTDEBUG && _d('Parsing DSN OPTIONS');
-      my $dsn_attribs = {
-         dsn  => 1,
-         copy => 1,
-      };
-      my $parse_dsn_attribs = sub {
-         my ( $self, $option, $attribs ) = @_;
-         map {
-            my $val = $attribs->{$_};
-            if ( $val ) {
-               $val    = $val eq 'yes' ? 1
-                       : $val eq 'no'  ? 0
-                       :                 $val;
-               $attribs->{$_} = $val;
-            }
-         } keys %$attribs;
-         return {
-            key => $option,
-            %$attribs,
-         };
-      };
-      my $dsn_o = new OptionParser(
-         description       => 'DSN OPTIONS',
-         head1             => 'DSN OPTIONS',
-         dsn               => 0,         # XXX don't infinitely recurse!
-         item              => '\* (.)',  # key opts are a single character
-         skip_rules        => 1,         # no rules before opts
-         attributes        => $dsn_attribs,
-         parse_attributes  => $parse_dsn_attribs,
-      );
-      my @dsn_opts = map {
-         my $opts = {
-            key  => $_->{spec}->{key},
-            dsn  => $_->{spec}->{dsn},
-            copy => $_->{spec}->{copy},
-            desc => $_->{desc},
-         };
-         $opts;
-      } $dsn_o->_pod_to_specs($file);
-      $self->{DSNParser} = DSNParser->new(opts => \@dsn_opts);
-   }
-
-   if ( $contents =~ m/^=head1 VERSION\n\n^(.+)$/m ) {
-      $self->{version} = $1;
-      PTDEBUG && _d($self->{version});
-   }
-
-   return;
-}
-
-sub DSNParser {
-   my ( $self ) = @_;
-   return $self->{DSNParser};
-};
-
-sub get_defaults_files {
-   my ( $self ) = @_;
-   return @{$self->{default_files}};
-}
-
-sub _pod_to_specs {
-   my ( $self, $file ) = @_;
-   $file ||= $self->{file} || __FILE__;
-   open my $fh, '<', $file or die "Cannot open $file: $OS_ERROR";
-
-   my @specs = ();
-   my @rules = ();
-   my $para;
-
-   local $INPUT_RECORD_SEPARATOR = '';
-   while ( $para = <$fh> ) {
-      next unless $para =~ m/^=head1 $self->{head1}/;
-      last;
-   }
-
-   while ( $para = <$fh> ) {
-      last if $para =~ m/^=over/;
-      next if $self->{skip_rules};
-      chomp $para;
-      $para =~ s/\s+/ /g;
-      $para =~ s/$POD_link_re/$1/go;
-      PTDEBUG && _d('Option rule:', $para);
-      push @rules, $para;
-   }
-
-   die "POD has no $self->{head1} section" unless $para;
-
-   do {
-      if ( my ($option) = $para =~ m/^=item $self->{item}/ ) {
-         chomp $para;
-         PTDEBUG && _d($para);
-         my %attribs;
-
-         $para = <$fh>; # read next paragraph, possibly attributes
-
-         if ( $para =~ m/: / ) { # attributes
-            $para =~ s/\s+\Z//g;
-            %attribs = map {
-                  my ( $attrib, $val) = split(/: /, $_);
-                  die "Unrecognized attribute for --$option: $attrib"
-                     unless $self->{attributes}->{$attrib};
-                  ($attrib, $val);
-               } split(/; /, $para);
-            if ( $attribs{'short form'} ) {
-               $attribs{'short form'} =~ s/-//;
-            }
-            $para = <$fh>; # read next paragraph, probably short help desc
-         }
-         else {
-            PTDEBUG && _d('Option has no attributes');
-         }
-
-         $para =~ s/\s+\Z//g;
-         $para =~ s/\s+/ /g;
-         $para =~ s/$POD_link_re/$1/go;
-
-         $para =~ s/\.(?:\n.*| [A-Z].*|\Z)//s;
-         PTDEBUG && _d('Short help:', $para);
-
-         die "No description after option spec $option" if $para =~ m/^=item/;
-
-         if ( my ($base_option) =  $option =~ m/^\[no\](.*)/ ) {
-            $option = $base_option;
-            $attribs{'negatable'} = 1;
-         }
-
-         push @specs, {
-            spec  => $self->{parse_attributes}->($self, $option, \%attribs),
-            desc  => $para
-               . (defined $attribs{default} ? " (default $attribs{default})" : ''),
-            group => ($attribs{'group'} ? $attribs{'group'} : 'default'),
-            attributes => \%attribs
-         };
-      }
-      while ( $para = <$fh> ) {
-         last unless $para;
-         if ( $para =~ m/^=head1/ ) {
-            $para = undef; # Can't 'last' out of a do {} block.
-            last;
-         }
-         last if $para =~ m/^=item /;
-      }
-   } while ( $para );
-
-   die "No valid specs in $self->{head1}" unless @specs;
-
-   close $fh;
-   return @specs, @rules;
-}
-
-sub _parse_specs {
-   my ( $self, @specs ) = @_;
-   my %disables; # special rule that requires deferred checking
-
-   foreach my $opt ( @specs ) {
-      if ( ref $opt ) { # It's an option spec, not a rule.
-         PTDEBUG && _d('Parsing opt spec:',
-            map { ($_, '=>', $opt->{$_}) } keys %$opt);
-
-         my ( $long, $short ) = $opt->{spec} =~ m/^([\w-]+)(?:\|([^!+=]*))?/;
-         if ( !$long ) {
-            die "Cannot parse long option from spec $opt->{spec}";
-         }
-         $opt->{long} = $long;
-
-         die "Duplicate long option --$long" if exists $self->{opts}->{$long};
-         $self->{opts}->{$long} = $opt;
-
-         if ( length $long == 1 ) {
-            PTDEBUG && _d('Long opt', $long, 'looks like short opt');
-            $self->{short_opts}->{$long} = $long;
-         }
-
-         if ( $short ) {
-            die "Duplicate short option -$short"
-               if exists $self->{short_opts}->{$short};
-            $self->{short_opts}->{$short} = $long;
-            $opt->{short} = $short;
-         }
-         else {
-            $opt->{short} = undef;
-         }
-
-         $opt->{is_negatable}  = $opt->{spec} =~ m/!/        ? 1 : 0;
-         $opt->{is_cumulative} = $opt->{spec} =~ m/\+/       ? 1 : 0;
-         $opt->{is_repeatable} = $opt->{attributes}->{repeatable} ? 1 : 0;
-         $opt->{is_required}   = $opt->{desc} =~ m/required/ ? 1 : 0;
-
-         $opt->{group} ||= 'default';
-         $self->{groups}->{ $opt->{group} }->{$long} = 1;
-
-         $opt->{value} = undef;
-         $opt->{got}   = 0;
-
-         my ( $type ) = $opt->{spec} =~ m/=(.)/;
-         $opt->{type} = $type;
-         PTDEBUG && _d($long, 'type:', $type);
-
-
-         $opt->{spec} =~ s/=./=s/ if ( $type && $type =~ m/[HhAadzm]/ );
-
-         if ( (my ($def) = $opt->{desc} =~ m/default\b(?: ([^)]+))?/) ) {
-            $self->{defaults}->{$long} = defined $def ? $def : 1;
-            PTDEBUG && _d($long, 'default:', $def);
-         }
-
-         if ( $long eq 'config' ) {
-            $self->{defaults}->{$long} = join(',', $self->get_defaults_files());
-         }
-
-         if ( (my ($dis) = $opt->{desc} =~ m/(disables .*)/) ) {
-            $disables{$long} = $dis;
-            PTDEBUG && _d('Deferring check of disables rule for', $opt, $dis);
-         }
-
-         $self->{opts}->{$long} = $opt;
-      }
-      else { # It's an option rule, not a spec.
-         PTDEBUG && _d('Parsing rule:', $opt);
-         push @{$self->{rules}}, $opt;
-         my @participants = $self->_get_participants($opt);
-         my $rule_ok = 0;
-
-         if ( $opt =~ m/mutually exclusive|one and only one/ ) {
-            $rule_ok = 1;
-            push @{$self->{mutex}}, \@participants;
-            PTDEBUG && _d(@participants, 'are mutually exclusive');
-         }
-         if ( $opt =~ m/at least one|one and only one/ ) {
-            $rule_ok = 1;
-            push @{$self->{atleast1}}, \@participants;
-            PTDEBUG && _d(@participants, 'require at least one');
-         }
-         if ( $opt =~ m/default to/ ) {
-            $rule_ok = 1;
-            $self->{defaults_to}->{$participants[0]} = $participants[1];
-            PTDEBUG && _d($participants[0], 'defaults to', $participants[1]);
-         }
-         if ( $opt =~ m/restricted to option groups/ ) {
-            $rule_ok = 1;
-            my ($groups) = $opt =~ m/groups ([\w\s\,]+)/;
-            my @groups = split(',', $groups);
-            %{$self->{allowed_groups}->{$participants[0]}} = map {
-               s/\s+//;
-               $_ => 1;
-            } @groups;
-         }
-         if( $opt =~ m/accepts additional command-line arguments/ ) {
-            $rule_ok = 1;
-            $self->{strict} = 0;
-            PTDEBUG && _d("Strict mode disabled by rule");
-         }
-
-         die "Unrecognized option rule: $opt" unless $rule_ok;
-      }
-   }
-
-   foreach my $long ( keys %disables ) {
-      my @participants = $self->_get_participants($disables{$long});
-      $self->{disables}->{$long} = \@participants;
-      PTDEBUG && _d('Option', $long, 'disables', @participants);
-   }
-
-   return;
-}
-
-sub _get_participants {
-   my ( $self, $str ) = @_;
-   my @participants;
-   foreach my $long ( $str =~ m/--(?:\[no\])?([\w-]+)/g ) {
-      die "Option --$long does not exist while processing rule $str"
-         unless exists $self->{opts}->{$long};
-      push @participants, $long;
-   }
-   PTDEBUG && _d('Participants for', $str, ':', @participants);
-   return @participants;
-}
-
-sub opts {
-   my ( $self ) = @_;
-   my %opts = %{$self->{opts}};
-   return %opts;
-}
-
-sub short_opts {
-   my ( $self ) = @_;
-   my %short_opts = %{$self->{short_opts}};
-   return %short_opts;
-}
-
-sub set_defaults {
-   my ( $self, %defaults ) = @_;
-   $self->{defaults} = {};
-   foreach my $long ( keys %defaults ) {
-      die "Cannot set default for nonexistent option $long"
-         unless exists $self->{opts}->{$long};
-      $self->{defaults}->{$long} = $defaults{$long};
-      PTDEBUG && _d('Default val for', $long, ':', $defaults{$long});
-   }
-   return;
-}
-
-sub get_defaults {
-   my ( $self ) = @_;
-   return $self->{defaults};
-}
-
-sub get_groups {
-   my ( $self ) = @_;
-   return $self->{groups};
-}
-
-sub _set_option {
-   my ( $self, $opt, $val ) = @_;
-   my $long = exists $self->{opts}->{$opt}       ? $opt
-            : exists $self->{short_opts}->{$opt} ? $self->{short_opts}->{$opt}
-            : die "Getopt::Long gave a nonexistent option: $opt";
-   $opt = $self->{opts}->{$long};
-   if ( $opt->{is_cumulative} ) {
-      $opt->{value}++;
-   }
-   elsif ( ($opt->{type} || '') eq 's' && $val =~ m/^--?(.+)/ ) {
-      my $next_opt = $1;
-      if (    exists $self->{opts}->{$next_opt}
-           || exists $self->{short_opts}->{$next_opt} ) {
-         $self->save_error("--$long requires a string value");
-         return;
-      }
-      else {
-         if ($opt->{is_repeatable}) {
-            push @{$opt->{value}} , $val;
-         }
-         else {
-            $opt->{value} = $val;
-         }
-      }
-   }
-   else {
-      if ($opt->{is_repeatable}) {
-         push @{$opt->{value}} , $val;
-      }
-      else {
-         $opt->{value} = $val;
-      }
-   }
-   $opt->{got} = 1;
-   PTDEBUG && _d('Got option', $long, '=', $val);
-}
-
-sub get_opts {
-   my ( $self ) = @_;
-
-   foreach my $long ( keys %{$self->{opts}} ) {
-      $self->{opts}->{$long}->{got} = 0;
-      $self->{opts}->{$long}->{value}
-         = exists $self->{defaults}->{$long}       ? $self->{defaults}->{$long}
-         : $self->{opts}->{$long}->{is_cumulative} ? 0
-         : undef;
-   }
-   $self->{got_opts} = 0;
-
-   $self->{errors} = [];
-
-   if ( @ARGV && $ARGV[0] =~/^--config=/ ) {
-      $ARGV[0] = substr($ARGV[0],9);
-      $ARGV[0] =~ s/^'(.*)'$/$1/;
-      $ARGV[0] =~ s/^"(.*)"$/$1/;
-      $self->_set_option('config', shift @ARGV);
-   }
-   if ( @ARGV && $ARGV[0] eq "--config" ) {
-      shift @ARGV;
-      $self->_set_option('config', shift @ARGV);
-   }
-   if ( $self->has('config') ) {
-      my @extra_args;
-      foreach my $filename ( split(',', $self->get('config')) ) {
-         eval {
-            push @extra_args, $self->_read_config_file($filename);
-         };
-         if ( $EVAL_ERROR ) {
-            if ( $self->got('config') ) {
-               die $EVAL_ERROR;
-            }
-            elsif ( PTDEBUG ) {
-               _d($EVAL_ERROR);
-            }
-         }
-      }
-      unshift @ARGV, @extra_args;
-   }
-
-   Getopt::Long::Configure('no_ignore_case', 'bundling');
-   GetOptions(
-      map    { $_->{spec} => sub { $self->_set_option(@_); } }
-      grep   { $_->{long} ne 'config' } # --config is handled specially above.
-      values %{$self->{opts}}
-   ) or $self->save_error('Error parsing options');
-
-   if ( exists $self->{opts}->{version} && $self->{opts}->{version}->{got} ) {
-      if ( $self->{version} ) {
-         print $self->{version}, "\n";
-         exit 0;
-      }
-      else {
-         print "Error parsing version.  See the VERSION section of the tool's documentation.\n";
-         exit 1;
-      }
-   }
-
-   if ( @ARGV && $self->{strict} ) {
-      $self->save_error("Unrecognized command-line options @ARGV");
-   }
-
-   foreach my $mutex ( @{$self->{mutex}} ) {
-      my @set = grep { $self->{opts}->{$_}->{got} } @$mutex;
-      if ( @set > 1 ) {
-         my $err = join(', ', map { "--$self->{opts}->{$_}->{long}" }
-                      @{$mutex}[ 0 .. scalar(@$mutex) - 2] )
-                 . ' and --'.$self->{opts}->{$mutex->[-1]}->{long}
-                 . ' are mutually exclusive.';
-         $self->save_error($err);
-      }
-   }
-
-   foreach my $required ( @{$self->{atleast1}} ) {
-      my @set = grep { $self->{opts}->{$_}->{got} } @$required;
-      if ( @set == 0 ) {
-         my $err = join(', ', map { "--$self->{opts}->{$_}->{long}" }
-                      @{$required}[ 0 .. scalar(@$required) - 2] )
-                 .' or --'.$self->{opts}->{$required->[-1]}->{long};
-         $self->save_error("Specify at least one of $err");
-      }
-   }
-
-   $self->_check_opts( keys %{$self->{opts}} );
-   $self->{got_opts} = 1;
-   return;
-}
-
-sub _check_opts {
-   my ( $self, @long ) = @_;
-   my $long_last = scalar @long;
-   while ( @long ) {
-      foreach my $i ( 0..$#long ) {
-         my $long = $long[$i];
-         next unless $long;
-         my $opt  = $self->{opts}->{$long};
-         if ( $opt->{got} ) {
-            if ( exists $self->{disables}->{$long} ) {
-               my @disable_opts = @{$self->{disables}->{$long}};
-               map { $self->{opts}->{$_}->{value} = undef; } @disable_opts;
-               PTDEBUG && _d('Unset options', @disable_opts,
-                  'because', $long,'disables them');
-            }
-
-            if ( exists $self->{allowed_groups}->{$long} ) {
-
-               my @restricted_groups = grep {
-                  !exists $self->{allowed_groups}->{$long}->{$_}
-               } keys %{$self->{groups}};
-
-               my @restricted_opts;
-               foreach my $restricted_group ( @restricted_groups ) {
-                  RESTRICTED_OPT:
-                  foreach my $restricted_opt (
-                     keys %{$self->{groups}->{$restricted_group}} )
-                  {
-                     next RESTRICTED_OPT if $restricted_opt eq $long;
-                     push @restricted_opts, $restricted_opt
-                        if $self->{opts}->{$restricted_opt}->{got};
-                  }
-               }
-
-               if ( @restricted_opts ) {
-                  my $err;
-                  if ( @restricted_opts == 1 ) {
-                     $err = "--$restricted_opts[0]";
-                  }
-                  else {
-                     $err = join(', ',
-                               map { "--$self->{opts}->{$_}->{long}" }
-                               grep { $_ }
-                               @restricted_opts[0..scalar(@restricted_opts) - 2]
-                            )
-                          . ' or --'.$self->{opts}->{$restricted_opts[-1]}->{long};
-                  }
-                  $self->save_error("--$long is not allowed with $err");
-               }
-            }
-
-         }
-         elsif ( $opt->{is_required} ) {
-            $self->save_error("Required option --$long must be specified");
-         }
-
-         $self->_validate_type($opt);
-         if ( $opt->{parsed} ) {
-            delete $long[$i];
-         }
-         else {
-            PTDEBUG && _d('Temporarily failed to parse', $long);
-         }
-      }
-
-      die "Failed to parse options, possibly due to circular dependencies"
-         if @long == $long_last;
-      $long_last = @long;
-   }
-
-   return;
-}
-
-sub _validate_type {
-   my ( $self, $opt ) = @_;
-   return unless $opt;
-
-   if ( !$opt->{type} ) {
-      $opt->{parsed} = 1;
-      return;
-   }
-
-   my $val = $opt->{value};
-
-   if ( $val && $opt->{type} eq 'm' ) {  # type time
-      PTDEBUG && _d('Parsing option', $opt->{long}, 'as a time value');
-      my ( $prefix, $num, $suffix ) = $val =~ m/([+-]?)(\d+)([a-z])?$/;
-      if ( !$suffix ) {
-         my ( $s ) = $opt->{desc} =~ m/\(suffix (.)\)/;
-         $suffix = $s || 's';
-         PTDEBUG && _d('No suffix given; using', $suffix, 'for',
-            $opt->{long}, '(value:', $val, ')');
-      }
-      if ( $suffix =~ m/[smhd]/ ) {
-         $val = $suffix eq 's' ? $num            # Seconds
-              : $suffix eq 'm' ? $num * 60       # Minutes
-              : $suffix eq 'h' ? $num * 3600     # Hours
-              :                  $num * 86400;   # Days
-         $opt->{value} = ($prefix || '') . $val;
-         PTDEBUG && _d('Setting option', $opt->{long}, 'to', $val);
-      }
-      else {
-         $self->save_error("Invalid time suffix for --$opt->{long}");
-      }
-   }
-   elsif ( $val && $opt->{type} eq 'd' ) {  # type DSN
-      PTDEBUG && _d('Parsing option', $opt->{long}, 'as a DSN');
-      my $prev = {};
-      my $from_key = $self->{defaults_to}->{ $opt->{long} };
-      if ( $from_key ) {
-         PTDEBUG && _d($opt->{long}, 'DSN copies from', $from_key, 'DSN');
-         if ( $self->{opts}->{$from_key}->{parsed} ) {
-            $prev = $self->{opts}->{$from_key}->{value};
-         }
-         else {
-            PTDEBUG && _d('Cannot parse', $opt->{long}, 'until',
-               $from_key, 'parsed');
-            return;
-         }
-      }
-      my $defaults = $self->{DSNParser}->parse_options($self);
-      if (!$opt->{attributes}->{repeatable}) {
-          $opt->{value} = $self->{DSNParser}->parse($val, $prev, $defaults);
-      } else {
-          my $values = [];
-          for my $dsn_string (@$val) {
-              push @$values, $self->{DSNParser}->parse($dsn_string, $prev, $defaults);
-          }
-          $opt->{value} = $values;
-      }
-   }
-   elsif ( $val && $opt->{type} eq 'z' ) {  # type size
-      PTDEBUG && _d('Parsing option', $opt->{long}, 'as a size value');
-      $self->_parse_size($opt, $val);
-   }
-   elsif ( $opt->{type} eq 'H' || (defined $val && $opt->{type} eq 'h') ) {
-      $opt->{value} = { map { $_ => 1 } split(/(?<!\\),\s*/, ($val || '')) };
-   }
-   elsif ( $opt->{type} eq 'A' || (defined $val && $opt->{type} eq 'a') ) {
-      $opt->{value} = [ split(/(?<!\\),\s*/, ($val || '')) ];
-   }
-   else {
-      PTDEBUG && _d('Nothing to validate for option',
-         $opt->{long}, 'type', $opt->{type}, 'value', $val);
-   }
-
-   $opt->{parsed} = 1;
-   return;
-}
-
-sub get {
-   my ( $self, $opt ) = @_;
-   my $long = (length $opt == 1 ? $self->{short_opts}->{$opt} : $opt);
-   die "Option $opt does not exist"
-      unless $long && exists $self->{opts}->{$long};
-   return $self->{opts}->{$long}->{value};
-}
-
-sub got {
-   my ( $self, $opt ) = @_;
-   my $long = (length $opt == 1 ? $self->{short_opts}->{$opt} : $opt);
-   die "Option $opt does not exist"
-      unless $long && exists $self->{opts}->{$long};
-   return $self->{opts}->{$long}->{got};
-}
-
-sub has {
-   my ( $self, $opt ) = @_;
-   my $long = (length $opt == 1 ? $self->{short_opts}->{$opt} : $opt);
-   return defined $long ? exists $self->{opts}->{$long} : 0;
-}
-
-sub set {
-   my ( $self, $opt, $val ) = @_;
-   my $long = (length $opt == 1 ? $self->{short_opts}->{$opt} : $opt);
-   die "Option $opt does not exist"
-      unless $long && exists $self->{opts}->{$long};
-   $self->{opts}->{$long}->{value} = $val;
-   return;
-}
-
-sub save_error {
-   my ( $self, $error ) = @_;
-   push @{$self->{errors}}, $error;
-   return;
-}
-
-sub errors {
-   my ( $self ) = @_;
-   return $self->{errors};
-}
-
-sub usage {
-   my ( $self ) = @_;
-   warn "No usage string is set" unless $self->{usage}; # XXX
-   return "Usage: " . ($self->{usage} || '') . "\n";
-}
-
-sub descr {
-   my ( $self ) = @_;
-   warn "No description string is set" unless $self->{description}; # XXX
-   my $descr  = ($self->{description} || $self->{program_name} || '')
-              . "  For more details, please use the --help option, "
-              . "or try 'perldoc $PROGRAM_NAME' "
-              . "for complete documentation.";
-   $descr = join("\n", $descr =~ m/(.{0,80})(?:\s+|$)/g)
-      unless $ENV{DONT_BREAK_LINES};
-   $descr =~ s/ +$//mg;
-   return $descr;
-}
-
-sub usage_or_errors {
-   my ( $self, $file, $return ) = @_;
-   $file ||= $self->{file} || __FILE__;
-
-   if ( !$self->{description} || !$self->{usage} ) {
-      PTDEBUG && _d("Getting description and usage from SYNOPSIS in", $file);
-      my %synop = $self->_parse_synopsis($file);
-      $self->{description} ||= $synop{description};
-      $self->{usage}       ||= $synop{usage};
-      PTDEBUG && _d("Description:", $self->{description},
-         "\nUsage:", $self->{usage});
-   }
-
-   if ( $self->{opts}->{help}->{got} ) {
-      print $self->print_usage() or die "Cannot print usage: $OS_ERROR";
-      exit 0 unless $return;
-   }
-   elsif ( scalar @{$self->{errors}} ) {
-      print $self->print_errors() or die "Cannot print errors: $OS_ERROR";
-      exit 1 unless $return;
-   }
-
-   return;
-}
-
-sub print_errors {
-   my ( $self ) = @_;
-   my $usage = $self->usage() . "\n";
-   if ( (my @errors = @{$self->{errors}}) ) {
-      $usage .= join("\n  * ", 'Errors in command-line arguments:', @errors)
-              . "\n";
-   }
-   return $usage . "\n" . $self->descr();
-}
-
-sub print_usage {
-   my ( $self ) = @_;
-   die "Run get_opts() before print_usage()" unless $self->{got_opts};
-   my @opts = values %{$self->{opts}};
-
-   my $maxl = max(
-      map {
-         length($_->{long})               # option long name
-         + ($_->{is_negatable} ? 4 : 0)   # "[no]" if opt is negatable
-         + ($_->{type} ? 2 : 0)           # "=x" where x is the opt type
-      }
-      @opts);
-
-   my $maxs = max(0,
-      map {
-         length($_)
-         + ($self->{opts}->{$_}->{is_negatable} ? 4 : 0)
-         + ($self->{opts}->{$_}->{type} ? 2 : 0)
-      }
-      values %{$self->{short_opts}});
-
-   my $lcol = max($maxl, ($maxs + 3));
-   my $rcol = 80 - $lcol - 6;
-   my $rpad = ' ' x ( 80 - $rcol );
-
-   $maxs = max($lcol - 3, $maxs);
-
-   my $usage = $self->descr() . "\n" . $self->usage();
-
-   my @groups = reverse sort grep { $_ ne 'default'; } keys %{$self->{groups}};
-   push @groups, 'default';
-
-   foreach my $group ( reverse @groups ) {
-      $usage .= "\n".($group eq 'default' ? 'Options' : $group).":\n\n";
-      foreach my $opt (
-         sort { $a->{long} cmp $b->{long} }
-         grep { $_->{group} eq $group }
-         @opts )
-      {
-         my $long  = $opt->{is_negatable} ? "[no]$opt->{long}" : $opt->{long};
-         my $short = $opt->{short};
-         my $desc  = $opt->{desc};
-
-         $long .= $opt->{type} ? "=$opt->{type}" : "";
-
-         if ( $opt->{type} && $opt->{type} eq 'm' ) {
-            my ($s) = $desc =~ m/\(suffix (.)\)/;
-            $s    ||= 's';
-            $desc =~ s/\s+\(suffix .\)//;
-            $desc .= ".  Optional suffix s=seconds, m=minutes, h=hours, "
-                   . "d=days; if no suffix, $s is used.";
-         }
-         $desc = join("\n$rpad", grep { $_ } $desc =~ m/(.{0,$rcol}(?!\W))(?:\s+|(?<=\W)|$)/g);
-         $desc =~ s/ +$//mg;
-         if ( $short ) {
-            $usage .= sprintf("  --%-${maxs}s -%s  %s\n", $long, $short, $desc);
-         }
-         else {
-            $usage .= sprintf("  --%-${lcol}s  %s\n", $long, $desc);
-         }
-      }
-   }
-
-   $usage .= "\nOption types: s=string, i=integer, f=float, h/H/a/A=comma-separated list, d=DSN, z=size, m=time\n";
-
-   if ( (my @rules = @{$self->{rules}}) ) {
-      $usage .= "\nRules:\n\n";
-      $usage .= join("\n", map { "  $_" } @rules) . "\n";
-   }
-   if ( $self->{DSNParser} ) {
-      $usage .= "\n" . $self->{DSNParser}->usage();
-   }
-   $usage .= "\nOptions and values after processing arguments:\n\n";
-   foreach my $opt ( sort { $a->{long} cmp $b->{long} } @opts ) {
-      my $val   = $opt->{value};
-      my $type  = $opt->{type} || '';
-      my $bool  = $opt->{spec} =~ m/^[\w-]+(?:\|[\w-])?!?$/;
-      $val      = $bool              ? ( $val ? 'TRUE' : 'FALSE' )
-                : !defined $val      ? '(No value)'
-                : $type eq 'd'       ? $self->{DSNParser}->as_string($val)
-                : $type =~ m/H|h/    ? join(',', sort keys %$val)
-                : $type =~ m/A|a/    ? join(',', @$val)
-                :                    $val;
-      $usage .= sprintf("  --%-${lcol}s  %s\n", $opt->{long}, $val);
-   }
-   return $usage;
-}
-
-sub prompt_noecho {
-   shift @_ if ref $_[0] eq __PACKAGE__;
-   my ( $prompt ) = @_;
-   local $OUTPUT_AUTOFLUSH = 1;
-   print STDERR $prompt
-      or die "Cannot print: $OS_ERROR";
-   my $response;
-   eval {
-      require Term::ReadKey;
-      Term::ReadKey::ReadMode('noecho');
-      chomp($response = <STDIN>);
-      Term::ReadKey::ReadMode('normal');
-      print "\n"
-         or die "Cannot print: $OS_ERROR";
-   };
-   if ( $EVAL_ERROR ) {
-      die "Cannot read response; is Term::ReadKey installed? $EVAL_ERROR";
-   }
-   return $response;
-}
-
-sub _read_config_file {
-   my ( $self, $filename ) = @_;
-   open my $fh, "<", $filename or die "Cannot open $filename: $OS_ERROR\n";
-   my @args;
-   my $prefix = '--';
-   my $parse  = 1;
-
-   LINE:
-   while ( my $line = <$fh> ) {
-      chomp $line;
-      next LINE if $line =~ m/^\s*(?:\#|\;|$)/;
-      $line =~ s/\s+#.*$//g;
-      $line =~ s/^\s+|\s+$//g;
-      if ( $line eq '--' ) {
-         $prefix = '';
-         $parse  = 0;
-         next LINE;
-      }
-
-      if (  $parse
-            && !$self->has('version-check')
-            && $line =~ /version-check/
-      ) {
-         next LINE;
-      }
-
-      if ( $parse
-         && (my($opt, $arg) = $line =~ m/^\s*([^=\s]+?)(?:\s*=\s*(.*?)\s*)?$/)
-      ) {
-         push @args, grep { defined $_ } ("$prefix$opt", $arg);
-      }
-      elsif ( $line =~ m/./ ) {
-         push @args, $line;
-      }
-      else {
-         die "Syntax error in file $filename at line $INPUT_LINE_NUMBER";
-      }
-   }
-   close $fh;
-   return @args;
-}
-
-sub read_para_after {
-   my ( $self, $file, $regex ) = @_;
-   open my $fh, "<", $file or die "Can't open $file: $OS_ERROR";
-   local $INPUT_RECORD_SEPARATOR = '';
-   my $para;
-   while ( $para = <$fh> ) {
-      next unless $para =~ m/^=pod$/m;
-      last;
-   }
-   while ( $para = <$fh> ) {
-      next unless $para =~ m/$regex/;
-      last;
-   }
-   $para = <$fh>;
-   chomp($para);
-   close $fh or die "Can't close $file: $OS_ERROR";
-   return $para;
-}
-
-sub clone {
-   my ( $self ) = @_;
-
-   my %clone = map {
-      my $hashref  = $self->{$_};
-      my $val_copy = {};
-      foreach my $key ( keys %$hashref ) {
-         my $ref = ref $hashref->{$key};
-         $val_copy->{$key} = !$ref           ? $hashref->{$key}
-                           : $ref eq 'HASH'  ? { %{$hashref->{$key}} }
-                           : $ref eq 'ARRAY' ? [ @{$hashref->{$key}} ]
-                           : $hashref->{$key};
-      }
-      $_ => $val_copy;
-   } qw(opts short_opts defaults);
-
-   foreach my $scalar ( qw(got_opts) ) {
-      $clone{$scalar} = $self->{$scalar};
-   }
-
-   return bless \%clone;
-}
-
-sub _parse_size {
-   my ( $self, $opt, $val ) = @_;
-
-   if ( lc($val || '') eq 'null' ) {
-      PTDEBUG && _d('NULL size for', $opt->{long});
-      $opt->{value} = 'null';
-      return;
-   }
-
-   my %factor_for = (k => 1_024, M => 1_048_576, G => 1_073_741_824);
-   my ($pre, $num, $factor) = $val =~ m/^([+-])?(\d+)([kMG])?$/;
-   if ( defined $num ) {
-      if ( $factor ) {
-         $num *= $factor_for{$factor};
-         PTDEBUG && _d('Setting option', $opt->{y},
-            'to num', $num, '* factor', $factor);
-      }
-      $opt->{value} = ($pre || '') . $num;
-   }
-   else {
-      $self->save_error("Invalid size for --$opt->{long}: $val");
-   }
-   return;
-}
-
-sub _parse_attribs {
-   my ( $self, $option, $attribs ) = @_;
-   my $types = $self->{types};
-   return $option
-      . ($attribs->{'short form'} ? '|' . $attribs->{'short form'}   : '' )
-      . ($attribs->{'negatable'}  ? '!'                              : '' )
-      . ($attribs->{'cumulative'} ? '+'                              : '' )
-      . ($attribs->{'type'}       ? '=' . $types->{$attribs->{type}} : '' );
-}
-
-sub _parse_synopsis {
-   my ( $self, $file ) = @_;
-   $file ||= $self->{file} || __FILE__;
-   PTDEBUG && _d("Parsing SYNOPSIS in", $file);
-
-   local $INPUT_RECORD_SEPARATOR = '';  # read paragraphs
-   open my $fh, "<", $file or die "Cannot open $file: $OS_ERROR";
-   my $para;
-   1 while defined($para = <$fh>) && $para !~ m/^=head1 SYNOPSIS/;
-   die "$file does not contain a SYNOPSIS section" unless $para;
-   my @synop;
-   for ( 1..2 ) {  # 1 for the usage, 2 for the description
-      my $para = <$fh>;
-      push @synop, $para;
-   }
-   close $fh;
-   PTDEBUG && _d("Raw SYNOPSIS text:", @synop);
-   my ($usage, $desc) = @synop;
-   die "The SYNOPSIS section in $file is not formatted properly"
-      unless $usage && $desc;
-
-   $usage =~ s/^\s*Usage:\s+(.+)/$1/;
-   chomp $usage;
-
-   $desc =~ s/\n/ /g;
-   $desc =~ s/\s{2,}/ /g;
-   $desc =~ s/\. ([A-Z][a-z])/.  $1/g;
-   $desc =~ s/\s+$//;
-
-   return (
-      description => $desc,
-      usage       => $usage,
-   );
-};
-
-sub set_vars {
-   my ($self, $file) = @_;
-   $file ||= $self->{file} || __FILE__;
-
-   my %user_vars;
-   my $user_vars = $self->has('set-vars') ? $self->get('set-vars') : undef;
-   if ( $user_vars ) {
-      foreach my $var_val ( @$user_vars ) {
-         my ($var, $val) = $var_val =~ m/([^\s=]+)=(\S+)/;
-         die "Invalid --set-vars value: $var_val\n" unless $var && defined $val;
-         $user_vars{$var} = {
-            val     => $val,
-            default => 0,
-         };
-      }
-   }
-
-   my %default_vars;
-   my $default_vars = $self->read_para_after($file, qr/MAGIC_set_vars/);
-   if ( $default_vars ) {
-      %default_vars = map {
-         my $var_val = $_;
-         my ($var, $val) = $var_val =~ m/([^\s=]+)=(\S+)/;
-         die "Invalid --set-vars value: $var_val\n" unless $var && defined $val;
-         $var => {
-            val     => $val,
-            default => 1,
-         };
-      } split("\n", $default_vars);
-   }
-
-   my %vars = (
-      %default_vars, # first the tool's defaults
-      %user_vars,    # then the user's which overwrite the defaults
-   );
-   PTDEBUG && _d('--set-vars:', Dumper(\%vars));
-   return \%vars;
-}
-
-sub _d {
-   my ($package, undef, $line) = caller 0;
-   @_ = map { (my $temp = $_) =~ s/\n/\n# /g; $temp; }
-        map { defined $_ ? $_ : 'undef' }
-        @_;
-   print STDERR "# $package:$line $PID ", join(' ', @_), "\n";
-}
-
-if ( PTDEBUG ) {
-   print STDERR '# ', $^X, ' ', $], "\n";
-   if ( my $uname = `uname -a` ) {
-      $uname =~ s/\s+/ /g;
-      print STDERR "# $uname\n";
-   }
-   print STDERR '# Arguments: ',
-      join(' ', map { my $a = "_[$_]_"; $a =~ s/\n/\n# /g; $a; } @ARGV), "\n";
-}
-
-1;
-}
-# ###########################################################################
-# End OptionParser package
-# ###########################################################################
-
-# ###########################################################################
-# Lmo::Utils package
-# This package is a copy without comments from the original.  The original
-# with comments and its test file can be found in the GitHub repository at,
-#   lib/Lmo/Utils.pm
-#   t/lib/Lmo/Utils.t
-# See https://github.com/percona/percona-toolkit for more information.
-# ###########################################################################
-{
-package Lmo::Utils;
-
-use strict;
-use warnings qw( FATAL all );
-require Exporter;
-our (@ISA, @EXPORT, @EXPORT_OK);
-
-BEGIN {
-   @ISA = qw(Exporter);
-   @EXPORT = @EXPORT_OK = qw(
-      _install_coderef
-      _unimport_coderefs
-      _glob_for
-      _stash_for
-   );
-}
-
-{
-   no strict 'refs';
-   sub _glob_for {
-      return \*{shift()}
-   }
-
-   sub _stash_for {
-      return \%{ shift() . "::" };
-   }
-}
-
-sub _install_coderef {
-   my ($to, $code) = @_;
-
-   return *{ _glob_for $to } = $code;
-}
-
-sub _unimport_coderefs {
-   my ($target, @names) = @_;
-   return unless @names;
-   my $stash = _stash_for($target);
-   foreach my $name (@names) {
-      if ($stash->{$name} and defined(&{$stash->{$name}})) {
-         delete $stash->{$name};
-      }
-   }
-}
-
-1;
-}
-# ###########################################################################
-# End Lmo::Utils package
-# ###########################################################################
-
-# ###########################################################################
-# Lmo::Meta package
-# This package is a copy without comments from the original.  The original
-# with comments and its test file can be found in the GitHub repository at,
-#   lib/Lmo/Meta.pm
-#   t/lib/Lmo/Meta.t
-# See https://github.com/percona/percona-toolkit for more information.
-# ###########################################################################
-{
-package Lmo::Meta;
-use strict;
-use warnings qw( FATAL all );
-
-my %metadata_for;
-
-sub new {
-   my $class = shift;
-   return bless { @_ }, $class
-}
-
-sub metadata_for {
-   my $self    = shift;
-   my ($class) = @_;
-
-   return $metadata_for{$class} ||= {};
-}
-
-sub class { shift->{class} }
-
-sub attributes {
-   my $self = shift;
-   return keys %{$self->metadata_for($self->class)}
-}
-
-sub attributes_for_new {
-   my $self = shift;
-   my @attributes;
-
-   my $class_metadata = $self->metadata_for($self->class);
-   while ( my ($attr, $meta) = each %$class_metadata ) {
-      if ( exists $meta->{init_arg} ) {
-         push @attributes, $meta->{init_arg}
-               if defined $meta->{init_arg};
-      }
-      else {
-         push @attributes, $attr;
-      }
-   }
-   return @attributes;
-}
-
-1;
-}
-# ###########################################################################
-# End Lmo::Meta package
-# ###########################################################################
-
-# ###########################################################################
-# Lmo::Object package
-# This package is a copy without comments from the original.  The original
-# with comments and its test file can be found in the GitHub repository at,
-#   lib/Lmo/Object.pm
-#   t/lib/Lmo/Object.t
-# See https://github.com/percona/percona-toolkit for more information.
-# ###########################################################################
-{
-package Lmo::Object;
-
-use strict;
-use warnings qw( FATAL all );
-
-use Carp ();
-use Scalar::Util qw(blessed);
-
-use Lmo::Meta;
-use Lmo::Utils qw(_glob_for);
-
-sub new {
-   my $class = shift;
-   my $args  = $class->BUILDARGS(@_);
-
-   my $class_metadata = Lmo::Meta->metadata_for($class);
-
-   my @args_to_delete;
-   while ( my ($attr, $meta) = each %$class_metadata ) {
-      next unless exists $meta->{init_arg};
-      my $init_arg = $meta->{init_arg};
-
-      if ( defined $init_arg ) {
-         $args->{$attr} = delete $args->{$init_arg};
-      }
-      else {
-         push @args_to_delete, $attr;
-      }
-   }
-
-   delete $args->{$_} for @args_to_delete;
-
-   for my $attribute ( keys %$args ) {
-      if ( my $coerce = $class_metadata->{$attribute}{coerce} ) {
-         $args->{$attribute} = $coerce->($args->{$attribute});
-      }
-      if ( my $isa_check = $class_metadata->{$attribute}{isa} ) {
-         my ($check_name, $check_sub) = @$isa_check;
-         $check_sub->($args->{$attribute});
-      }
-   }
-
-   while ( my ($attribute, $meta) = each %$class_metadata ) {
-      next unless $meta->{required};
-      Carp::confess("Attribute ($attribute) is required for $class")
-         if ! exists $args->{$attribute}
-   }
-
-   my $self = bless $args, $class;
-
-   my @build_subs;
-   my $linearized_isa = mro::get_linear_isa($class);
-
-   for my $isa_class ( @$linearized_isa ) {
-      unshift @build_subs, *{ _glob_for "${isa_class}::BUILD" }{CODE};
-   }
-   my @args = %$args;
-   for my $sub (grep { defined($_) && exists &$_ } @build_subs) {
-      $sub->( $self, @args);
-   }
-   return $self;
-}
-
-sub BUILDARGS {
-   shift; # No need for the classname
-   if ( @_ == 1 && ref($_[0]) ) {
-      Carp::confess("Single parameters to new() must be a HASH ref, not $_[0]")
-         unless ref($_[0]) eq ref({});
-      return {%{$_[0]}} # We want a new reference, always
-   }
-   else {
-      return { @_ };
-   }
-}
-
-sub meta {
-   my $class = shift;
-   $class    = Scalar::Util::blessed($class) || $class;
-   return Lmo::Meta->new(class => $class);
-}
-
-1;
-}
-# ###########################################################################
-# End Lmo::Object package
-# ###########################################################################
-
-# ###########################################################################
-# Lmo::Types package
-# This package is a copy without comments from the original.  The original
-# with comments and its test file can be found in the GitHub repository at,
-#   lib/Lmo/Types.pm
-#   t/lib/Lmo/Types.t
-# See https://github.com/percona/percona-toolkit for more information.
-# ###########################################################################
-{
-package Lmo::Types;
-
-use strict;
-use warnings qw( FATAL all );
-
-use Carp ();
-use Scalar::Util qw(looks_like_number blessed);
-
-
-our %TYPES = (
-   Bool   => sub { !$_[0] || (defined $_[0] && looks_like_number($_[0]) && $_[0] == 1) },
-   Num    => sub { defined $_[0] && looks_like_number($_[0]) },
-   Int    => sub { defined $_[0] && looks_like_number($_[0]) && $_[0] == int($_[0]) },
-   Str    => sub { defined $_[0] },
-   Object => sub { defined $_[0] && blessed($_[0]) },
-   FileHandle => sub { local $@; require IO::Handle; fileno($_[0]) && $_[0]->opened },
-
-   map {
-      my $type = /R/ ? $_ : uc $_;
-      $_ . "Ref" => sub { ref $_[0] eq $type }
-   } qw(Array Code Hash Regexp Glob Scalar)
-);
-
-sub check_type_constraints {
-   my ($attribute, $type_check, $check_name, $val) = @_;
-   ( ref($type_check) eq 'CODE'
-      ? $type_check->($val)
-      : (ref $val eq $type_check
-         || ($val && $val eq $type_check)
-         || (exists $TYPES{$type_check} && $TYPES{$type_check}->($val)))
-   )
-   || Carp::confess(
-        qq<Attribute ($attribute) does not pass the type constraint because: >
-      . qq<Validation failed for '$check_name' with value >
-      . (defined $val ? Lmo::Dumper($val) : 'undef') )
-}
-
-sub _nested_constraints {
-   my ($attribute, $aggregate_type, $type) = @_;
-
-   my $inner_types;
-   if ( $type =~ /\A(ArrayRef|Maybe)\[(.*)\]\z/ ) {
-      $inner_types = _nested_constraints($1, $2);
-   }
-   else {
-      $inner_types = $TYPES{$type};
-   }
-
-   if ( $aggregate_type eq 'ArrayRef' ) {
-      return sub {
-         my ($val) = @_;
-         return unless ref($val) eq ref([]);
-
-         if ($inner_types) {
-            for my $value ( @{$val} ) {
-               return unless $inner_types->($value)
-            }
-         }
-         else {
-            for my $value ( @{$val} ) {
-               return unless $value && ($value eq $type
-                        || (Scalar::Util::blessed($value) && $value->isa($type)));
-            }
-         }
-         return 1;
-      };
-   }
-   elsif ( $aggregate_type eq 'Maybe' ) {
-      return sub {
-         my ($value) = @_;
-         return 1 if ! defined($value);
-         if ($inner_types) {
-            return unless $inner_types->($value)
-         }
-         else {
-            return unless $value eq $type
-                        || (Scalar::Util::blessed($value) && $value->isa($type));
-         }
-         return 1;
-      }
-   }
-   else {
-      Carp::confess("Nested aggregate types are only implemented for ArrayRefs and Maybe");
-   }
-}
-
-1;
-}
-# ###########################################################################
-# End Lmo::Types package
-# ###########################################################################
-
-# ###########################################################################
-# Lmo package
-# This package is a copy without comments from the original.  The original
-# with comments and its test file can be found in the GitHub repository at,
-#   lib/Lmo.pm
-#   t/lib/Lmo.t
-# See https://github.com/percona/percona-toolkit for more information.
-# ###########################################################################
-{
-BEGIN {
-$INC{"Lmo.pm"} = __FILE__;
-package Lmo;
-our $VERSION = '0.30_Percona'; # Forked from 0.30 of Mo.
-
-
-use strict;
-use warnings qw( FATAL all );
-
-use Carp ();
-use Scalar::Util qw(looks_like_number blessed);
-
-use Lmo::Meta;
-use Lmo::Object;
-use Lmo::Types;
-
-use Lmo::Utils;
-
-my %export_for;
-sub import {
-   warnings->import(qw(FATAL all));
-   strict->import();
-
-   my $caller     = scalar caller(); # Caller's package
-   my %exports = (
-      extends  => \&extends,
-      has      => \&has,
-      with     => \&with,
-      override => \&override,
-      confess  => \&Carp::confess,
-   );
-
-   $export_for{$caller} = \%exports;
-
-   for my $keyword ( keys %exports ) {
-      _install_coderef "${caller}::$keyword" => $exports{$keyword};
-   }
-
-   if ( !@{ *{ _glob_for "${caller}::ISA" }{ARRAY} || [] } ) {
-      @_ = "Lmo::Object";
-      goto *{ _glob_for "${caller}::extends" }{CODE};
-   }
-}
-
-sub extends {
-   my $caller = scalar caller();
-   for my $class ( @_ ) {
-      _load_module($class);
-   }
-   _set_package_isa($caller, @_);
-   _set_inherited_metadata($caller);
-}
-
-sub _load_module {
-   my ($class) = @_;
-
-   (my $file = $class) =~ s{::|'}{/}g;
-   $file .= '.pm';
-   { local $@; eval { require "$file" } } # or warn $@;
-   return;
-}
-
-sub with {
-   my $package = scalar caller();
-   require Role::Tiny;
-   for my $role ( @_ ) {
-      _load_module($role);
-      _role_attribute_metadata($package, $role);
-   }
-   Role::Tiny->apply_roles_to_package($package, @_);
-}
-
-sub _role_attribute_metadata {
-   my ($package, $role) = @_;
-
-   my $package_meta = Lmo::Meta->metadata_for($package);
-   my $role_meta    = Lmo::Meta->metadata_for($role);
-
-   %$package_meta = (%$role_meta, %$package_meta);
-}
-
-sub has {
-   my $names  = shift;
-   my $caller = scalar caller();
-
-   my $class_metadata = Lmo::Meta->metadata_for($caller);
-
-   for my $attribute ( ref $names ? @$names : $names ) {
-      my %args   = @_;
-      my $method = ($args{is} || '') eq 'ro'
-         ? sub {
-            Carp::confess("Cannot assign a value to a read-only accessor at reader ${caller}::${attribute}")
-               if $#_;
-            return $_[0]{$attribute};
-         }
-         : sub {
-            return $#_
-                  ? $_[0]{$attribute} = $_[1]
-                  : $_[0]{$attribute};
-         };
-
-      $class_metadata->{$attribute} = ();
-
-      if ( my $type_check = $args{isa} ) {
-         my $check_name = $type_check;
-
-         if ( my ($aggregate_type, $inner_type) = $type_check =~ /\A(ArrayRef|Maybe)\[(.*)\]\z/ ) {
-            $type_check = Lmo::Types::_nested_constraints($attribute, $aggregate_type, $inner_type);
-         }
-
-         my $check_sub = sub {
-            my ($new_val) = @_;
-            Lmo::Types::check_type_constraints($attribute, $type_check, $check_name, $new_val);
-         };
-
-         $class_metadata->{$attribute}{isa} = [$check_name, $check_sub];
-         my $orig_method = $method;
-         $method = sub {
-            $check_sub->($_[1]) if $#_;
-            goto &$orig_method;
-         };
-      }
-
-      if ( my $builder = $args{builder} ) {
-         my $original_method = $method;
-         $method = sub {
-               $#_
-                  ? goto &$original_method
-                  : ! exists $_[0]{$attribute}
-                     ? $_[0]{$attribute} = $_[0]->$builder
-                     : goto &$original_method
-         };
-      }
-
-      if ( my $code = $args{default} ) {
-         Carp::confess("${caller}::${attribute}'s default is $code, but should be a coderef")
-               unless ref($code) eq 'CODE';
-         my $original_method = $method;
-         $method = sub {
-               $#_
-                  ? goto &$original_method
-                  : ! exists $_[0]{$attribute}
-                     ? $_[0]{$attribute} = $_[0]->$code
-                     : goto &$original_method
-         };
-      }
-
-      if ( my $role = $args{does} ) {
-         my $original_method = $method;
-         $method = sub {
-            if ( $#_ ) {
-               Carp::confess(qq<Attribute ($attribute) doesn't consume a '$role' role">)
-                  unless Scalar::Util::blessed($_[1]) && eval { $_[1]->does($role) }
-            }
-            goto &$original_method
-         };
-      }
-
-      if ( my $coercion = $args{coerce} ) {
-         $class_metadata->{$attribute}{coerce} = $coercion;
-         my $original_method = $method;
-         $method = sub {
-            if ( $#_ ) {
-               return $original_method->($_[0], $coercion->($_[1]))
-            }
-            goto &$original_method;
-         }
-      }
-
-      _install_coderef "${caller}::$attribute" => $method;
-
-      if ( $args{required} ) {
-         $class_metadata->{$attribute}{required} = 1;
-      }
-
-      if ($args{clearer}) {
-         _install_coderef "${caller}::$args{clearer}"
-            => sub { delete shift->{$attribute} }
-      }
-
-      if ($args{predicate}) {
-         _install_coderef "${caller}::$args{predicate}"
-            => sub { exists shift->{$attribute} }
-      }
-
-      if ($args{handles}) {
-         _has_handles($caller, $attribute, \%args);
-      }
-
-      if (exists $args{init_arg}) {
-         $class_metadata->{$attribute}{init_arg} = $args{init_arg};
-      }
-   }
-}
-
-sub _has_handles {
-   my ($caller, $attribute, $args) = @_;
-   my $handles = $args->{handles};
-
-   my $ref = ref $handles;
-   my $kv;
-   if ( $ref eq ref [] ) {
-         $kv = { map { $_,$_ } @{$handles} };
-   }
-   elsif ( $ref eq ref {} ) {
-         $kv = $handles;
-   }
-   elsif ( $ref eq ref qr// ) {
-         Carp::confess("Cannot delegate methods based on a Regexp without a type constraint (isa)")
-            unless $args->{isa};
-         my $target_class = $args->{isa};
-         $kv = {
-            map   { $_, $_     }
-            grep  { $_ =~ $handles }
-            grep  { !exists $Lmo::Object::{$_} && $target_class->can($_) }
-            grep  { !$export_for{$target_class}->{$_} }
-            keys %{ _stash_for $target_class }
-         };
-   }
-   else {
-         Carp::confess("handles for $ref not yet implemented");
-   }
-
-   while ( my ($method, $target) = each %{$kv} ) {
-         my $name = _glob_for "${caller}::$method";
-         Carp::confess("You cannot overwrite a locally defined method ($method) with a delegation")
-            if defined &$name;
-
-         my ($target, @curried_args) = ref($target) ? @$target : $target;
-         *$name = sub {
-            my $self        = shift;
-            my $delegate_to = $self->$attribute();
-            my $error = "Cannot delegate $method to $target because the value of $attribute";
-            Carp::confess("$error is not defined") unless $delegate_to;
-            Carp::confess("$error is not an object (got '$delegate_to')")
-               unless Scalar::Util::blessed($delegate_to) || (!ref($delegate_to) && $delegate_to->can($target));
-            return $delegate_to->$target(@curried_args, @_);
-         }
-   }
-}
-
-sub _set_package_isa {
-   my ($package, @new_isa) = @_;
-   my $package_isa  = \*{ _glob_for "${package}::ISA" };
-   @{*$package_isa} = @new_isa;
-}
-
-sub _set_inherited_metadata {
-   my $class = shift;
-   my $class_metadata = Lmo::Meta->metadata_for($class);
-   my $linearized_isa = mro::get_linear_isa($class);
-   my %new_metadata;
-
-   for my $isa_class (reverse @$linearized_isa) {
-      my $isa_metadata = Lmo::Meta->metadata_for($isa_class);
-      %new_metadata = (
-         %new_metadata,
-         %$isa_metadata,
-      );
-   }
-   %$class_metadata = %new_metadata;
-}
-
-sub unimport {
-   my $caller = scalar caller();
-   my $target = caller;
-  _unimport_coderefs($target, keys %{$export_for{$caller}});
-}
-
-sub Dumper {
-   require Data::Dumper;
-   local $Data::Dumper::Indent    = 0;
-   local $Data::Dumper::Sortkeys  = 0;
-   local $Data::Dumper::Quotekeys = 0;
-   local $Data::Dumper::Terse     = 1;
-
-   Data::Dumper::Dumper(@_)
-}
-
-BEGIN {
-   if ($] >= 5.010) {
-      { local $@; require mro; }
-   }
-   else {
-      local $@;
-      eval {
-         require MRO::Compat;
-      } or do {
-         *mro::get_linear_isa = *mro::get_linear_isa_dfs = sub {
-            no strict 'refs';
-
-            my $classname = shift;
-
-            my @lin = ($classname);
-            my %stored;
-            foreach my $parent (@{"$classname\::ISA"}) {
-               my $plin = mro::get_linear_isa_dfs($parent);
-               foreach (@$plin) {
-                     next if exists $stored{$_};
-                     push(@lin, $_);
-                     $stored{$_} = 1;
-               }
-            }
-            return \@lin;
-         };
-      }
-   }
-}
-
-sub override {
-   my ($methods, $code) = @_;
-   my $caller          = scalar caller;
-
-   for my $method ( ref($methods) ? @$methods : $methods ) {
-      my $full_method     = "${caller}::${method}";
-      *{_glob_for $full_method} = $code;
-   }
-}
-
-}
-1;
-}
-# ###########################################################################
-# End Lmo package
-# ###########################################################################
-
-# ###########################################################################
-# DSNParser package
-# This package is a copy without comments from the original.  The original
-# with comments and its test file can be found in the GitHub repository at,
-#   lib/DSNParser.pm
-#   t/lib/DSNParser.t
-# See https://github.com/percona/percona-toolkit for more information.
-# ###########################################################################
-{
-package DSNParser;
-
-use strict;
-use warnings FATAL => 'all';
-use English qw(-no_match_vars);
-use constant PTDEBUG => $ENV{PTDEBUG} || 0;
-
-use Data::Dumper;
-$Data::Dumper::Indent    = 0;
-$Data::Dumper::Quotekeys = 0;
-
-my $dsn_sep = qr/(?<!\\),/;
-
-eval {
-   require DBI;
-};
-my $have_dbi = $EVAL_ERROR ? 0 : 1;
-
-sub new {
-   my ( $class, %args ) = @_;
-   foreach my $arg ( qw(opts) ) {
-      die "I need a $arg argument" unless $args{$arg};
-   }
-   my $self = {
-      opts => {}  # h, P, u, etc.  Should come from DSN OPTIONS section in POD.
-   };
-   foreach my $opt ( @{$args{opts}} ) {
-      if ( !$opt->{key} || !$opt->{desc} ) {
-         die "Invalid DSN option: ", Dumper($opt);
-      }
-      PTDEBUG && _d('DSN option:',
-         join(', ',
-            map { "$_=" . (defined $opt->{$_} ? ($opt->{$_} || '') : 'undef') }
-               keys %$opt
-         )
-      );
-      $self->{opts}->{$opt->{key}} = {
-         dsn  => $opt->{dsn},
-         desc => $opt->{desc},
-         copy => $opt->{copy} || 0,
-      };
-   }
-   return bless $self, $class;
-}
-
-sub prop {
-   my ( $self, $prop, $value ) = @_;
-   if ( @_ > 2 ) {
-      PTDEBUG && _d('Setting', $prop, 'property');
-      $self->{$prop} = $value;
-   }
-   return $self->{$prop};
-}
-
-sub parse {
-   my ( $self, $dsn, $prev, $defaults ) = @_;
-   if ( !$dsn ) {
-      PTDEBUG && _d('No DSN to parse');
-      return;
-   }
-   PTDEBUG && _d('Parsing', $dsn);
-   $prev     ||= {};
-   $defaults ||= {};
-   my %given_props;
-   my %final_props;
-   my $opts = $self->{opts};
-
-   foreach my $dsn_part ( split($dsn_sep, $dsn) ) {
-      $dsn_part =~ s/\\,/,/g;
-      if ( my ($prop_key, $prop_val) = $dsn_part =~  m/^(.)=(.*)$/ ) {
-         $given_props{$prop_key} = $prop_val;
-      }
-      else {
-         PTDEBUG && _d('Interpreting', $dsn_part, 'as h=', $dsn_part);
-         $given_props{h} = $dsn_part;
-      }
-   }
-
-   foreach my $key ( keys %$opts ) {
-      PTDEBUG && _d('Finding value for', $key);
-      $final_props{$key} = $given_props{$key};
-      if ( !defined $final_props{$key}
-           && defined $prev->{$key} && $opts->{$key}->{copy} )
-      {
-         $final_props{$key} = $prev->{$key};
-         PTDEBUG && _d('Copying value for', $key, 'from previous DSN');
-      }
-      if ( !defined $final_props{$key} ) {
-         $final_props{$key} = $defaults->{$key};
-         PTDEBUG && _d('Copying value for', $key, 'from defaults');
-      }
-   }
-
-   foreach my $key ( keys %given_props ) {
-      die "Unknown DSN option '$key' in '$dsn'.  For more details, "
-            . "please use the --help option, or try 'perldoc $PROGRAM_NAME' "
-            . "for complete documentation."
-         unless exists $opts->{$key};
-   }
-   if ( (my $required = $self->prop('required')) ) {
-      foreach my $key ( keys %$required ) {
-         die "Missing required DSN option '$key' in '$dsn'.  For more details, "
-               . "please use the --help option, or try 'perldoc $PROGRAM_NAME' "
-               . "for complete documentation."
-            unless $final_props{$key};
-      }
-   }
-
-   return \%final_props;
-}
-
-sub parse_options {
-   my ( $self, $o ) = @_;
-   die 'I need an OptionParser object' unless ref $o eq 'OptionParser';
-   my $dsn_string
-      = join(',',
-          map  { "$_=".$o->get($_); }
-          grep { $o->has($_) && $o->get($_) }
-          keys %{$self->{opts}}
-        );
-   PTDEBUG && _d('DSN string made from options:', $dsn_string);
-   return $self->parse($dsn_string);
-}
-
-sub as_string {
-   my ( $self, $dsn, $props ) = @_;
-   return $dsn unless ref $dsn;
-   my @keys = $props ? @$props : sort keys %$dsn;
-   return join(',',
-      map  { "$_=" . ($_ eq 'p' ? '...' : $dsn->{$_}) }
-      grep {
-         exists $self->{opts}->{$_}
-         && exists $dsn->{$_}
-         && defined $dsn->{$_}
-      } @keys);
-}
-
-sub usage {
-   my ( $self ) = @_;
-   my $usage
-      = "DSN syntax is key=value[,key=value...]  Allowable DSN keys:\n\n"
-      . "  KEY  COPY  MEANING\n"
-      . "  ===  ====  =============================================\n";
-   my %opts = %{$self->{opts}};
-   foreach my $key ( sort keys %opts ) {
-      $usage .= "  $key    "
-             .  ($opts{$key}->{copy} ? 'yes   ' : 'no    ')
-             .  ($opts{$key}->{desc} || '[No description]')
-             . "\n";
-   }
-   $usage .= "\n  If the DSN is a bareword, the word is treated as the 'h' key.\n";
-   return $usage;
-}
-
-sub get_cxn_params {
-   my ( $self, $info ) = @_;
-   my $dsn;
-   my %opts = %{$self->{opts}};
-   my $driver = $self->prop('dbidriver') || '';
-   if ( $driver eq 'Pg' ) {
-      $dsn = 'DBI:Pg:dbname=' . ( $info->{D} || '' ) . ';'
-         . join(';', map  { "$opts{$_}->{dsn}=$info->{$_}" }
-                     grep { defined $info->{$_} }
-                     qw(h P));
-   }
-   else {
-      $dsn = 'DBI:mysql:' . ( $info->{D} || '' ) . ';'
-         . join(';', map  { "$opts{$_}->{dsn}=$info->{$_}" }
-                     grep { defined $info->{$_} }
-                     qw(F h P S A s))
-         . ';mysql_read_default_group=client'
-         . ($info->{L} ? ';mysql_local_infile=1' : '');
-   }
-   PTDEBUG && _d($dsn);
-   return ($dsn, $info->{u}, $info->{p});
-}
-
-sub fill_in_dsn {
-   my ( $self, $dbh, $dsn ) = @_;
-   my $vars = $dbh->selectall_hashref('SHOW VARIABLES', 'Variable_name');
-   my ($user, $db) = $dbh->selectrow_array('SELECT USER(), DATABASE()');
-   $user =~ s/@.*//;
-   $dsn->{h} ||= $vars->{hostname}->{Value};
-   $dsn->{S} ||= $vars->{'socket'}->{Value};
-   $dsn->{P} ||= $vars->{port}->{Value};
-   $dsn->{u} ||= $user;
-   $dsn->{D} ||= $db;
-}
-
-sub get_dbh {
-   my ( $self, $cxn_string, $user, $pass, $opts ) = @_;
-   $opts ||= {};
-   my $defaults = {
-      AutoCommit         => 0,
-      RaiseError         => 1,
-      PrintError         => 0,
-      ShowErrorStatement => 1,
-      mysql_enable_utf8 => ($cxn_string =~ m/charset=utf8/i ? 1 : 0),
-   };
-   @{$defaults}{ keys %$opts } = values %$opts;
-   if (delete $defaults->{L}) { # L for LOAD DATA LOCAL INFILE, our own extension
-      $defaults->{mysql_local_infile} = 1;
-   }
-
-   if ( $opts->{mysql_use_result} ) {
-      $defaults->{mysql_use_result} = 1;
-   }
-
-   if ( !$have_dbi ) {
-      die "Cannot connect to MySQL because the Perl DBI module is not "
-         . "installed or not found.  Run 'perl -MDBI' to see the directories "
-         . "that Perl searches for DBI.  If DBI is not installed, try:\n"
-         . "  Debian/Ubuntu  apt-get install libdbi-perl\n"
-         . "  RHEL/CentOS    yum install perl-DBI\n"
-         . "  OpenSolaris    pkg install pkg:/SUNWpmdbi\n";
-
-   }
-
-   my $dbh;
-   my $tries = 2;
-   while ( !$dbh && $tries-- ) {
-      PTDEBUG && _d($cxn_string, ' ', $user, ' ', $pass,
-         join(', ', map { "$_=>$defaults->{$_}" } keys %$defaults ));
-
-      $dbh = eval { DBI->connect($cxn_string, $user, $pass, $defaults) };
-
-      if ( !$dbh && $EVAL_ERROR ) {
-         if ( $EVAL_ERROR =~ m/locate DBD\/mysql/i ) {
-            die "Cannot connect to MySQL because the Perl DBD::mysql module is "
-               . "not installed or not found.  Run 'perl -MDBD::mysql' to see "
-               . "the directories that Perl searches for DBD::mysql.  If "
-               . "DBD::mysql is not installed, try:\n"
-               . "  Debian/Ubuntu  apt-get install libdbd-mysql-perl\n"
-               . "  RHEL/CentOS    yum install perl-DBD-MySQL\n"
-               . "  OpenSolaris    pkg install pkg:/SUNWapu13dbd-mysql\n";
-         }
-         elsif ( $EVAL_ERROR =~ m/not a compiled character set|character set utf8/ ) {
-            PTDEBUG && _d('Going to try again without utf8 support');
-            delete $defaults->{mysql_enable_utf8};
-         }
-         if ( !$tries ) {
-            die $EVAL_ERROR;
-         }
-      }
-   }
-
-   if ( $cxn_string =~ m/mysql/i ) {
-      my $sql;
-
-      my ($charset) = $cxn_string =~ m/charset=([\w]+)/;
-      if ( $charset ) {
-         $sql = qq{/*!40101 SET NAMES "$charset"*/};
-         PTDEBUG && _d($dbh, $sql);
-         eval { $dbh->do($sql) };
-         if ( $EVAL_ERROR ) {
-            die "Error setting NAMES to $charset: $EVAL_ERROR";
-         }
-      }
-      else {
-         my ($mysql_version) = eval { $dbh->selectrow_array('SELECT VERSION()') };
-         if ( $EVAL_ERROR ) {
-            die "Cannot get MySQL version: $EVAL_ERROR";
-         }
-         my (undef, $character_set_server) = eval { $dbh->selectrow_array("SHOW VARIABLES LIKE 'character_set_server'") };
-         if ( $EVAL_ERROR ) {
-            die "Cannot get MySQL var character_set_server: $EVAL_ERROR";
-         }
-
-         if ( $mysql_version =~ m/^(\d+)\.(\d)\.(\d+).*/ ) {
-            if ( $1 >= 8 && $character_set_server =~ m/^utf8/ ) {
-               $dbh->{mysql_enable_utf8} = 1;
-               $charset = $character_set_server;
-               my $msg = "MySQL version $mysql_version >= 8 and character_set_server = $character_set_server\n".
-                        "Setting: SET NAMES $character_set_server";
-               PTDEBUG && _d($msg);
-               eval { $dbh->do("SET NAMES '$character_set_server'") };
-               if ( $EVAL_ERROR ) {
-                  die "Cannot SET NAMES $character_set_server: $EVAL_ERROR";
-               }
-            }
-         }
-      }
-      PTDEBUG && _d('Enabling charset for STDOUT');
-      if ( $charset && $charset =~ m/^utf8/ ) {
-         binmode(STDOUT, ':utf8')
-            or die "Can't binmode(STDOUT, ':utf8'): $OS_ERROR";
-         binmode(STDERR, ':utf8')
-            or die "Can't binmode(STDERR, ':utf8'): $OS_ERROR";
-      }
-      else {
-         binmode(STDOUT) or die "Can't binmode(STDOUT): $OS_ERROR";
-      }
-
-      if ( my $vars = $self->prop('set-vars') ) {
-         $self->set_vars($dbh, $vars);
-      }
-
-      $sql = 'SELECT @@SQL_MODE';
-      PTDEBUG && _d($dbh, $sql);
-      my ($sql_mode) = eval { $dbh->selectrow_array($sql) };
-      if ( $EVAL_ERROR ) {
-         die "Error getting the current SQL_MODE: $EVAL_ERROR";
-      }
-
-      $sql = 'SET @@SQL_QUOTE_SHOW_CREATE = 1'
-            . '/*!40101, @@SQL_MODE=\'NO_AUTO_VALUE_ON_ZERO'
-            . ($sql_mode ? ",$sql_mode" : '')
-            . '\'*/';
-      PTDEBUG && _d($dbh, $sql);
-      eval { $dbh->do($sql) };
-      if ( $EVAL_ERROR ) {
-         die "Error setting SQL_QUOTE_SHOW_CREATE, SQL_MODE"
-           . ($sql_mode ? " and $sql_mode" : '')
-           . ": $EVAL_ERROR";
-      }
-   }
-
-   PTDEBUG && _d('DBH info: ',
-      $dbh,
-      Dumper($dbh->selectrow_hashref(
-         'SELECT DATABASE(), CONNECTION_ID(), VERSION()/*!50038 , @@hostname*/')),
-      'Connection info:',      $dbh->{mysql_hostinfo},
-      'Character set info:',   Dumper($dbh->selectall_arrayref(
-                     "SHOW VARIABLES LIKE 'character_set%'", { Slice => {}})),
-      '$DBD::mysql::VERSION:', $DBD::mysql::VERSION,
-      '$DBI::VERSION:',        $DBI::VERSION,
-   );
-
-   return $dbh;
-}
-
-sub get_hostname {
-   my ( $self, $dbh ) = @_;
-   if ( my ($host) = ($dbh->{mysql_hostinfo} || '') =~ m/^(\w+) via/ ) {
-      return $host;
-   }
-   my ( $hostname, $one ) = $dbh->selectrow_array(
-      'SELECT /*!50038 @@hostname, */ 1');
-   return $hostname;
-}
-
-sub disconnect {
-   my ( $self, $dbh ) = @_;
-   PTDEBUG && $self->print_active_handles($dbh);
-   $dbh->disconnect;
-}
-
-sub print_active_handles {
-   my ( $self, $thing, $level ) = @_;
-   $level ||= 0;
-   printf("# Active %sh: %s %s %s\n", ($thing->{Type} || 'undef'), "\t" x $level,
-      $thing, (($thing->{Type} || '') eq 'st' ? $thing->{Statement} || '' : ''))
-      or die "Cannot print: $OS_ERROR";
-   foreach my $handle ( grep {defined} @{ $thing->{ChildHandles} } ) {
-      $self->print_active_handles( $handle, $level + 1 );
-   }
-}
-
-sub copy {
-   my ( $self, $dsn_1, $dsn_2, %args ) = @_;
-   die 'I need a dsn_1 argument' unless $dsn_1;
-   die 'I need a dsn_2 argument' unless $dsn_2;
-   my %new_dsn = map {
-      my $key = $_;
-      my $val;
-      if ( $args{overwrite} ) {
-         $val = defined $dsn_1->{$key} ? $dsn_1->{$key} : $dsn_2->{$key};
-      }
-      else {
-         $val = defined $dsn_2->{$key} ? $dsn_2->{$key} : $dsn_1->{$key};
-      }
-      $key => $val;
-   } keys %{$self->{opts}};
-   return \%new_dsn;
-}
-
-sub set_vars {
-   my ($self, $dbh, $vars) = @_;
-
-   return unless $vars;
-
-   foreach my $var ( sort keys %$vars ) {
-      my $val = $vars->{$var}->{val};
-
-      (my $quoted_var = $var) =~ s/_/\\_/;
-      my ($var_exists, $current_val);
-      eval {
-         ($var_exists, $current_val) = $dbh->selectrow_array(
-            "SHOW VARIABLES LIKE '$quoted_var'");
-      };
-      my $e = $EVAL_ERROR;
-      if ( $e ) {
-         PTDEBUG && _d($e);
-      }
-
-      if ( $vars->{$var}->{default} && !$var_exists ) {
-         PTDEBUG && _d('Not setting default var', $var,
-            'because it does not exist');
-         next;
-      }
-
-      if ( $current_val && $current_val eq $val ) {
-         PTDEBUG && _d('Not setting var', $var, 'because its value',
-            'is already', $val);
-         next;
-      }
-
-      my $sql = "SET SESSION $var=$val";
-      PTDEBUG && _d($dbh, $sql);
-      eval { $dbh->do($sql) };
-      if ( my $set_error = $EVAL_ERROR ) {
-         chomp($set_error);
-         $set_error =~ s/ at \S+ line \d+//;
-         my $msg = "Error setting $var: $set_error";
-         if ( $current_val ) {
-            $msg .= "  The current value for $var is $current_val.  "
-                  . "If the variable is read only (not dynamic), specify "
-                  . "--set-vars $var=$current_val to avoid this warning, "
-                  . "else manually set the variable and restart MySQL.";
-         }
-         warn $msg . "\n\n";
-      }
-   }
-
-   return;
-}
-
-sub _d {
-   my ($package, undef, $line) = caller 0;
-   @_ = map { (my $temp = $_) =~ s/\n/\n# /g; $temp; }
-        map { defined $_ ? $_ : 'undef' }
-        @_;
-   print STDERR "# $package:$line $PID ", join(' ', @_), "\n";
-}
-
-1;
-}
-# ###########################################################################
-# End DSNParser package
-# ###########################################################################
-
-# ###########################################################################
-# MasterSlave package
-# This package is a copy without comments from the original.  The original
-# with comments and its test file can be found in the GitHub repository at,
-#   lib/MasterSlave.pm
-#   t/lib/MasterSlave.t
-# See https://github.com/percona/percona-toolkit for more information.
-# ###########################################################################
-{
-package MasterSlave;
-
-use strict;
-use warnings FATAL => 'all';
-use English qw(-no_match_vars);
-use constant PTDEBUG => $ENV{PTDEBUG} || 0;
-
-sub check_recursion_method {
-   my ($methods) = @_;
-   if ( @$methods != 1 ) {
-      if ( grep({ !m/processlist|hosts/i } @$methods)
-            && $methods->[0] !~ /^dsn=/i )
-      {
-         die  "Invalid combination of recursion methods: "
-            . join(", ", map { defined($_) ? $_ : 'undef' } @$methods) . ". "
-            . "Only hosts and processlist may be combined.\n"
-      }
-   }
-   else {
-      my ($method) = @$methods;
-      die "Invalid recursion method: " . ( $method || 'undef' )
-         unless $method && $method =~ m/^(?:processlist$|hosts$|none$|cluster$|dsn=)/i;
-   }
-}
-
-sub new {
-   my ( $class, %args ) = @_;
-   my @required_args = qw(OptionParser DSNParser Quoter);
-   foreach my $arg ( @required_args ) {
-      die "I need a $arg argument" unless $args{$arg};
-   }
-   my $self = {
-      %args,
-      replication_thread => {},
-   };
-   return bless $self, $class;
-}
-
-sub get_replicas {
-   my ($self, %args) = @_;
-   my @required_args = qw(make_cxn);
-   foreach my $arg ( @required_args ) {
-      die "I need a $arg argument" unless $args{$arg};
-   }
-   my ($make_cxn) = @args{@required_args};
-
-   my $replicas  = [];
-   my $dp      = $self->{DSNParser};
-   my $methods = $self->_resolve_recursion_methods($args{dsn});
-
-   return $replicas unless @$methods;
-
-   if ( grep { m/processlist|hosts/i } @$methods ) {
-      my @required_args = qw(dbh dsn);
-      foreach my $arg ( @required_args ) {
-         die "I need a $arg argument" unless $args{$arg};
-      }
-      my ($dbh, $dsn) = @args{@required_args};
-      my $o = $self->{OptionParser};
-
-      $self->recurse_to_replicas(
-         {  dbh              => $dbh,
-            dsn              => $dsn,
-            replica_user     => $o->got('replica-user') ? $o->get('replica-user') : '',
-            replica_password => $o->got('replica-password') ? $o->get('replica-password') : '',
-            replicas         => $args{replicas},
-            callback  => sub {
-               my ( $dsn, $dbh, $level, $parent ) = @_;
-               return unless $level;
-               PTDEBUG && _d('Found replica:', $dp->as_string($dsn));
-               my $replica_dsn = $dsn;
-               if ($o->got('replica-user')) {
-                  $replica_dsn->{u} = $o->get('replica-user');
-                  PTDEBUG && _d("Using replica user ".$o->get('replica-user')." on ".$replica_dsn->{h}.":".$replica_dsn->{P});
-               }
-               if ($o->got('replica-password')) {
-                  $replica_dsn->{p} = $o->get('replica-password');
-                  PTDEBUG && _d("Replica password set");
-               }
-               push @$replicas, $make_cxn->(dsn => $replica_dsn, dbh => $dbh, parent => $parent);
-               return;
-            },
-            wait_no_die => $args{'wait_no_die'},
-         }
-      );
-   } elsif ( $methods->[0] =~ m/^dsn=/i ) {
-      (my $dsn_table_dsn = join ",", @$methods) =~ s/^dsn=//i;
-      $replicas = $self->get_cxn_from_dsn_table(
-         %args,
-         dsn_table_dsn => $dsn_table_dsn,
-         wait_no_die => $args{'wait_no_die'},
-      );
-   }
-   elsif ( $methods->[0] =~ m/none/i ) {
-      PTDEBUG && _d('Not getting to replicas');
-   }
-   else {
-      die "Unexpected recursion methods: @$methods";
-   }
-
-   return $replicas;
-}
-
-sub _resolve_recursion_methods {
-   my ($self, $dsn) = @_;
-   my $o = $self->{OptionParser};
-   if ( $o->got('recursion-method') ) {
-      return $o->get('recursion-method');
-   }
-   elsif ( $dsn && ($dsn->{P} || 3306) != 3306 ) {
-      PTDEBUG && _d('Port number is non-standard; using only hosts method');
-      return [qw(hosts)];
-   }
-   else {
-      return $o->get('recursion-method');
-   }
-}
-
-sub recurse_to_replicas {
-   my ( $self, $args, $level ) = @_;
-   $level ||= 0;
-   my $dp = $self->{DSNParser};
-   my $recurse = $args->{recurse} || $self->{OptionParser}->get('recurse');
-   my $dsn = $args->{dsn};
-   my $replica_user = $args->{replica_user} || '';
-   my $replica_password = $args->{replica_password} || '';
-
-   my $methods = $self->_resolve_recursion_methods($dsn);
-   PTDEBUG && _d('Recursion methods:', @$methods);
-   if ( lc($methods->[0]) eq 'none' ) {
-      PTDEBUG && _d('Not recursing to replicas');
-      return;
-   }
-
-   my $replica_dsn = $dsn;
-   if ($replica_user) {
-      $replica_dsn->{u} = $replica_user;
-      PTDEBUG && _d("Using replica user $replica_user on "
-         . $replica_dsn->{h} . ":" . ( $replica_dsn->{P} ? $replica_dsn->{P} : ""));
-   }
-   if ($replica_password) {
-      $replica_dsn->{p} = $replica_password;
-      PTDEBUG && _d("Replica password set");
-   }
-
-   my $dbh = $args->{dbh};
-
-   my $get_dbh = sub {
-         eval {
-            $dbh = $dp->get_dbh(
-               $dp->get_cxn_params($replica_dsn), { AutoCommit => 1 }
-            );
-            PTDEBUG && _d('Connected to', $dp->as_string($replica_dsn));
-         };
-         if ( $EVAL_ERROR ) {
-            print STDERR "Cannot connect to ", $dp->as_string($replica_dsn), ": ", $EVAL_ERROR, "\n"
-               or die "Cannot print: $OS_ERROR";
-            return;
-         }
-   };
-
-   DBH: {
-      if ( !defined $dbh ) {
-         foreach my $known_replica ( @{$args->{replicas}} ) {
-            if ($known_replica->{dsn}->{h} eq $replica_dsn->{h} and
-                $known_replica->{dsn}->{P} eq $replica_dsn->{P} ) {
-               $dbh = $known_replica->{dbh};
-               last DBH;
-            }
-         }
-         $get_dbh->();
-      }
-   }
-
-   my $sql  = 'SELECT @@SERVER_ID';
-   PTDEBUG && _d($sql);
-   my $id = undef;
-   do {
-      eval {
-         ($id) = $dbh->selectrow_array($sql);
-      };
-	   if ( $EVAL_ERROR ) {
-		   if ( $args->{wait_no_die} ) {
-			   print STDERR "Error getting server id: ", $EVAL_ERROR,
-               "\nRetrying query for server ", $replica_dsn->{h}, ":", $replica_dsn->{P}, "\n";
-            sleep 1;
-            $dbh->disconnect();
-            $get_dbh->();
-         } else {
-            die $EVAL_ERROR;
-         }
-      }
-   } until (defined $id);
-   PTDEBUG && _d('Working on server ID', $id);
-   my $source_thinks_i_am = $dsn->{server_id};
-   if ( !defined $id
-       || ( defined $source_thinks_i_am && $source_thinks_i_am != $id )
-       || $args->{server_ids_seen}->{$id}++
-   ) {
-      PTDEBUG && _d('Server ID seen, or not what source said');
-      if ( $args->{skip_callback} ) {
-         $args->{skip_callback}->($dsn, $dbh, $level, $args->{parent});
-      }
-      return;
-   }
-
-   $args->{callback}->($dsn, $dbh, $level, $args->{parent});
-
-   if ( !defined $recurse || $level < $recurse ) {
-
-      my @replicas =
-         grep { !$_->{source_id} || $_->{source_id} == $id } # Only my replicas.
-         $self->find_replica_hosts($dp, $dbh, $dsn, $methods);
-
-      foreach my $replica ( @replicas ) {
-         PTDEBUG && _d('Recursing from',
-            $dp->as_string($dsn), 'to', $dp->as_string($replica));
-         $self->recurse_to_replicas(
-            { %$args, dsn => $replica, dbh => undef, parent => $dsn, replica_user => $replica_user, $replica_password => $replica_password }, $level + 1 );
-      }
-   }
-}
-
-sub find_replica_hosts {
-   my ( $self, $dsn_parser, $dbh, $dsn, $methods ) = @_;
-
-   PTDEBUG && _d('Looking for replicas on', $dsn_parser->as_string($dsn),
-      'using methods', @$methods);
-
-   my @replicas;
-   METHOD:
-   foreach my $method ( @$methods ) {
-      my $find_replicas = "_find_replicas_by_$method";
-      PTDEBUG && _d('Finding replicas with', $find_replicas);
-      @replicas = $self->$find_replicas($dsn_parser, $dbh, $dsn);
-      last METHOD if @replicas;
-   }
-
-   PTDEBUG && _d('Found', scalar(@replicas), 'replicas');
-   return @replicas;
-}
-
-sub _find_replicas_by_processlist {
-   my ( $self, $dsn_parser, $dbh, $dsn ) = @_;
-   my @connected_replicas = $self->get_connected_replicas($dbh);
-   my @replicas = $self->_process_replicas_list($dsn_parser, $dsn, \@connected_replicas);
-   return @replicas;
-}
-
-sub _process_replicas_list {
-   my ($self, $dsn_parser, $dsn, $connected_replicas) = @_;
-   my @replicas = map  {
-      my $replica        = $dsn_parser->parse("h=$_", $dsn);
-      $replica->{source} = 'processlist';
-      $replica;
-   }
-   grep { $_ }
-   map  {
-      my ( $host ) = $_->{host} =~ m/^(.*):\d+$/;
-      if ( $host eq 'localhost' ) {
-         $host = '127.0.0.1'; # Replication never uses sockets.
-      }
-      if ($host =~ m/::/) {
-          $host = '['.$host.']';
-      }
-      $host;
-   } @$connected_replicas;
-
-   return @replicas;
-}
-
-sub _find_replicas_by_hosts {
-   my ( $self, $dsn_parser, $dbh, $dsn ) = @_;
-
-   my @replicas;
-
-   my $vp = VersionParser->new($dbh);
-   my $sql = 'SHOW REPLICAS';
-   my $source_name = 'source';
-   if ( $vp lt '8.1' || $vp->flavor() =~ m/maria/ ) {
-      $sql = 'SHOW SLAVE HOSTS';
-      $source_name='master';
-   }
-   
-   PTDEBUG && _d($dbh, $sql);
-   @replicas = @{$dbh->selectall_arrayref($sql, { Slice => {} })};
-
-   if ( @replicas ) {
-      PTDEBUG && _d('Found some SHOW REPLICAS info');
-      @replicas = map {
-         my %hash;
-         @hash{ map { lc $_ } keys %$_ } = values %$_;
-         my $spec = "h=$hash{host},P=$hash{port}"
-            . ( $hash{user} ? ",u=$hash{user}" : '')
-            . ( $hash{password} ? ",p=$hash{password}" : '');
-         my $dsn           = $dsn_parser->parse($spec, $dsn);
-         $dsn->{server_id} = $hash{server_id};
-         $dsn->{source_id} = $hash{"${source_name}_id"};
-         $dsn->{source}    = 'hosts';
-         $dsn;
-      } @replicas;
-   }
-
-   return @replicas;
-}
-
-sub get_connected_replicas {
-   my ( $self, $dbh ) = @_;
-
-   my $show = "SHOW GRANTS FOR ";
-   my $user = 'CURRENT_USER()';
-   my $sql = $show . $user;
-   PTDEBUG && _d($dbh, $sql);
-
-   my $proc;
-   eval {
-      $proc = grep {
-         m/ALL PRIVILEGES.*?\*\.\*|PROCESS/
-      } @{$dbh->selectcol_arrayref($sql)};
-   };
-   if ( $EVAL_ERROR ) {
-
-      if ( $EVAL_ERROR =~ m/no such grant defined for user/ ) {
-         PTDEBUG && _d('Retrying SHOW GRANTS without host; error:',
-            $EVAL_ERROR);
-         ($user) = split('@', $user);
-         $sql    = $show . $user;
-         PTDEBUG && _d($sql);
-         eval {
-            $proc = grep {
-               m/ALL PRIVILEGES.*?\*\.\*|PROCESS/
-            } @{$dbh->selectcol_arrayref($sql)};
-         };
-      }
-
-      die "Failed to $sql: $EVAL_ERROR" if $EVAL_ERROR;
-   }
-   if ( !$proc ) {
-      die "You do not have the PROCESS privilege";
-   }
-
-   $sql = 'SHOW FULL PROCESSLIST';
-   PTDEBUG && _d($dbh, $sql);
-   grep { $_->{command} =~ m/Binlog Dump/i }
-   map  { # Lowercase the column names
-      my %hash;
-      @hash{ map { lc $_ } keys %$_ } = values %$_;
-      \%hash;
-   }
-   @{$dbh->selectall_arrayref($sql, { Slice => {} })};
-}
-
-sub is_source_of {
-   my ( $self, $source, $replica ) = @_;
-
-   my $replica_version = VersionParser->new($replica);
-   my $source_name = 'source';
-   my $source_port = 'source_port';
-   if ( $replica_version lt '8.1' || $replica_version->flavor() =~ m/maria/ ) {
-      $source_name = 'master';
-      $source_port = 'master_port';
-   }
-
-   my $source_status = $self->get_source_status($source)
-      or die "The server specified as a source is not a source";
-   my $replica_status  = $self->get_replica_status($replica)
-      or die "The server specified as a replica is not a replica";
-   my @connected     = $self->get_connected_replicas($source)
-      or die "The server specified as a source has no connected replicas";
-   my (undef, $port) = $source->selectrow_array("SHOW VARIABLES LIKE 'port'");
-
-   if ( $port != $replica_status->{$source_port} ) {
-      die "The replica is connected to $replica_status->{$source_port} "
-         . "but the source's port is $port";
-   }
-
-   if ( !grep { $replica_status->{"${source_name}_user"} eq $_->{user} } @connected ) {
-      die "I don't see any replica I/O thread connected with user "
-         . $replica_status->{"${source_name}_user"};
-   }
-
-   if ( ($replica_status->{replica_io_state} || '')
-      eq 'Waiting for ${source_name} to send event' )
-   {
-      my ( $source_log_name, $source_log_num )
-         = $source_status->{file} =~ m/^(.*?)\.0*([1-9][0-9]*)$/;
-      my ( $replica_log_name, $replica_log_num )
-         = $replica_status->{source_log_file} =~ m/^(.*?)\.0*([1-9][0-9]*)$/;
-      if ( $source_log_name ne $replica_log_name
-         || abs($source_log_num - $replica_log_num) > 1 )
-      {
-         die "The replica thinks it is reading from "
-            . "$replica_status->{source_log_file},  but the "
-            . "source is writing to $source_status->{file}";
-      }
-   }
-   return 1;
-}
-
-sub get_source_dsn {
-   my ( $self, $dbh, $dsn, $dsn_parser ) = @_;
-
-   my $vp = VersionParser->new($dbh);
-   my $source_host = 'source_host';
-   my $source_port = 'source_port';
-   if ( $vp lt '8.1' || $vp->flavor() =~ m/maria/ ) {
-      $source_host = 'master_host';
-      $source_port = 'master_port';
-   }
-
-   my $source = $self->get_replica_status($dbh) or return undef;
-   my $spec   = "h=$source->{${source_host}},P=$source->{${source_port}}";
-   return       $dsn_parser->parse($spec, $dsn);
-}
-
-sub get_replica_status {
-   my ( $self, $dbh ) = @_;
-
-   my $server_version = VersionParser->new($dbh);
-   my $replica_name = 'replica';
-   if ( $server_version lt '8.1' || $server_version->flavor() =~ m/maria/ ) {
-      $replica_name = 'slave';
-   }
-
-   if ( !$self->{not_a_replica}->{$dbh} ) {
-      my $sth = $self->{sths}->{$dbh}->{REPLICA_STATUS}
-            ||= $dbh->prepare("SHOW ${replica_name} STATUS");
-      PTDEBUG && _d($dbh, "SHOW ${replica_name} STATUS");
-      $sth->execute();
-      my ($sss_rows) = $sth->fetchall_arrayref({}); # Show Replica Status rows
-
-      my $ss;
-      if ( $sss_rows && @$sss_rows ) {
-          if (scalar @$sss_rows > 1) {
-              if (!$self->{channel}) {
-                  die 'This server returned more than one row for SHOW REPLICA STATUS but "channel" was not specified on the command line';
-              }
-              my $replica_use_channels;
-              for my $row (@$sss_rows) {
-                  $row = { map { lc($_) => $row->{$_} } keys %$row }; # lowercase the keys
-                  if ($row->{channel_name}) {
-                      $replica_use_channels = 1;
-                  }
-                  if ($row->{channel_name} eq $self->{channel}) {
-                      $ss = $row;
-                      last;
-                  }
-              }
-              if (!$ss && $replica_use_channels) {
-                 die 'This server is using replication channels but "channel" was not specified on the command line';
-              }
-          } else {
-              if ($sss_rows->[0]->{channel_name} && $sss_rows->[0]->{channel_name} ne $self->{channel}) {
-                  die 'This server is using replication channels but "channel" was not specified on the command line';
-              } else {
-                  $ss = $sss_rows->[0];
-              }
-          }
-
-          if ( $ss && %$ss ) {
-             $ss = { map { lc($_) => $ss->{$_} } keys %$ss }; # lowercase the keys
-             return $ss;
-          }
-          if (!$ss && $self->{channel}) {
-              die "Specified channel name is invalid";
-          }
-      }
-
-      PTDEBUG && _d('This server returns nothing for SHOW REPLICA STATUS');
-      $self->{not_a_replica}->{$dbh}++;
-  }
-}
-
-sub get_source_status {
-   my ( $self, $dbh ) = @_;
-
-   if ( $self->{not_a_source}->{$dbh} ) {
-      PTDEBUG && _d('Server on dbh', $dbh, 'is not a source');
-      return;
-   }
-
-   my $vp = VersionParser->new($dbh);
-   my $source_name = 'binary log';
-   if ( $vp lt '8.1' || $vp->flavor() =~ m/maria/ ) {
-      $source_name = 'master';
-   }
-
-   my $sth;
-   if ( $self->{sths}->{$dbh} && $dbh && $self->{sths}->{$dbh} == $dbh ) {
-      $sth = $self->{sths}->{$dbh}->{SOURCE_STATUS}
-         ||= $dbh->prepare("SHOW ${source_name} STATUS");
-   }
-   else {
-      $sth = $dbh->prepare("SHOW ${source_name} STATUS");
-   }
-   PTDEBUG && _d($dbh, "SHOW ${source_name} STATUS");
-   $sth->execute();
-   my ($ms) = @{$sth->fetchall_arrayref({})};
-   PTDEBUG && _d(
-      $ms ? map { "$_=" . (defined $ms->{$_} ? $ms->{$_} : '') } keys %$ms
-          : '');
-
-   if ( !$ms || scalar keys %$ms < 2 ) {
-      PTDEBUG && _d('Server on dbh', $dbh, 'does not seem to be a source');
-      $self->{not_a_source}->{$dbh}++;
-   }
-
-  return { map { lc($_) => $ms->{$_} } keys %$ms }; # lowercase the keys
-}
-
-sub wait_for_source {
-   my ( $self, %args ) = @_;
-   my @required_args = qw(source_status replica_dbh);
-   foreach my $arg ( @required_args ) {
-      die "I need a $arg argument" unless $args{$arg};
-   }
-   my ($source_status, $replica_dbh) = @args{@required_args};
-   my $timeout       = $args{timeout} || 60;
-
-   my $result;
-   my $waited;
-   if ( $source_status ) {
-      my $replica_status;
-      eval {
-          $replica_status = $self->get_replica_status($replica_dbh);
-      };
-      if ($EVAL_ERROR) {
-          return {
-              result => undef,
-              waited => 0,
-              error  =>'Wait for source: this is a multi-source replica but "channel" was not specified on the command line',
-          };
-      }
-      my $vp = VersionParser->new($replica_dbh);
-      my $source_name = 'source';
-      if ( $vp lt '8.1' || $vp->flavor() =~ m/maria/ ) {
-         $source_name = 'master';
-      }
-      my $channel_sql = $vp > '5.6' && $self->{channel} ? ", '$self->{channel}'" : '';
-      my $sql = "SELECT ${source_name}_POS_WAIT('$source_status->{file}', $source_status->{position}, $timeout $channel_sql)";
-      PTDEBUG && _d($replica_dbh, $sql);
-      my $start = time;
-      ($result) = $replica_dbh->selectrow_array($sql);
-
-      $waited = time - $start;
-
-      PTDEBUG && _d('Result of waiting:', $result);
-      PTDEBUG && _d("Waited", $waited, "seconds");
-   }
-   else {
-      PTDEBUG && _d('Not waiting: this server is not a source');
-   }
-
-   return {
-      result => $result,
-      waited => $waited,
-   };
-}
-
-sub stop_replica {
-   my ( $self, $dbh ) = @_;
-   my $vp = VersionParser->new($dbh);
-   my $replica_name = 'replica';
-   if ( $vp lt '8.1' || $vp->flavor() =~ m/maria/ ) {
-      $replica_name = 'slave';
-   }
-   my $sth = $self->{sths}->{$dbh}->{STOP_REPLICA}
-         ||= $dbh->prepare("STOP ${replica_name}");
-   PTDEBUG && _d($dbh, $sth->{Statement});
-   $sth->execute();
-}
-
-sub start_replica {
-   my ( $self, $dbh, $pos ) = @_;
-
-   my $vp = VersionParser->new($dbh);
-   my $source_name = 'source';
-   my $replica_name = 'replica';
-   if ( $vp lt '8.1' || $vp->flavor() =~ m/maria/ ) {
-      $source_name = 'master';
-      $replica_name = 'slave';
-   }
-
-   if ( $pos ) {
-      my $sql = "START ${replica_name} UNTIL ${source_name}_LOG_FILE='$pos->{file}', "
-              . "${source_name}_LOG_POS=$pos->{position}";
-      PTDEBUG && _d($dbh, $sql);
-      $dbh->do($sql);
-   }
-   else {
-      my $sth = $self->{sths}->{$dbh}->{START_REPLICA}
-            ||= $dbh->prepare("START ${replica_name}");
-      PTDEBUG && _d($dbh, $sth->{Statement});
-      $sth->execute();
-   }
-}
-
-sub catchup_to_source {
-   my ( $self, $replica, $source, $timeout ) = @_;
-   $self->stop_replica($source);
-   $self->stop_replica($replica);
-   my $replica_status  = $self->get_replica_status($replica);
-   my $replica_pos     = $self->repl_posn($replica_status);
-   my $source_status = $self->get_source_status($source);
-   my $source_pos    = $self->repl_posn($source_status);
-   PTDEBUG && _d('Source position:', $self->pos_to_string($source_pos),
-      'Replica position:', $self->pos_to_string($replica_pos));
-
-   my $result;
-   if ( $self->pos_cmp($replica_pos, $source_pos) < 0 ) {
-      PTDEBUG && _d('Waiting for replica to catch up to source');
-      $self->start_replica($replica, $source_pos);
-
-      $result = $self->wait_for_source(
-            source_status => $source_status,
-            replica_dbh   => $replica,
-            timeout       => $timeout,
-            source_status => $source_status
-      );
-      if ($result->{error}) {
-          die $result->{error};
-      }
-      if ( !defined $result->{result} ) {
-         $replica_status = $self->get_replica_status($replica);
-            
-         my $vp = VersionParser->new($replica);
-         my $replica_name = 'replica';
-         if ( $vp lt '8.1' || $vp->flavor() =~ m/maria/ ) {
-            $replica_name = 'slave';
-         }
-
-         if ( !$self->replica_is_running($replica_status, $replica_name) ) {
-            PTDEBUG && _d('Source position:',
-               $self->pos_to_string($source_pos),
-               'Replica position:', $self->pos_to_string($replica_pos));
-            $replica_pos = $self->repl_posn($replica_status);
-            if ( $self->pos_cmp($replica_pos, $source_pos) != 0 ) {
-               die "SOURCE_POS_WAIT() returned NULL but replica has not "
-                  . "caught up to source";
-            }
-            PTDEBUG && _d('Replica is caught up to source and stopped');
-         }
-         else {
-            die "Replica has not caught up to source and it is still running";
-         }
-      }
-   }
-   else {
-      PTDEBUG && _d("Replica is already caught up to source");
-   }
-
-   return $result;
-}
-
-sub catchup_to_same_pos {
-   my ( $self, $s1_dbh, $s2_dbh ) = @_;
-   $self->stop_replica($s1_dbh);
-   $self->stop_replica($s2_dbh);
-   my $s1_status = $self->get_replica_status($s1_dbh);
-   my $s2_status = $self->get_replica_status($s2_dbh);
-   my $s1_pos    = $self->repl_posn($s1_status);
-   my $s2_pos    = $self->repl_posn($s2_status);
-   if ( $self->pos_cmp($s1_pos, $s2_pos) < 0 ) {
-      $self->start_replica($s1_dbh, $s2_pos);
-   }
-   elsif ( $self->pos_cmp($s2_pos, $s1_pos) < 0 ) {
-      $self->start_replica($s2_dbh, $s1_pos);
-   }
-
-   $s1_status = $self->get_replica_status($s1_dbh);
-   $s2_status = $self->get_replica_status($s2_dbh);
-   $s1_pos    = $self->repl_posn($s1_status);
-   $s2_pos    = $self->repl_posn($s2_status);
-
-   my $vp1 = VersionParser->new($s1_dbh);
-   my $replica1_name = 'replica';
-   if ( $vp1 lt '8.1' || $vp1->flavor() =~ m/maria/ ) {
-      $replica1_name = 'slave';
-   }
-
-   my $vp2 = VersionParser->new($s2_dbh);
-   my $replica2_name = 'replica';
-   if ( $vp2 lt '8.1' || $vp2->flavor() =~ m/maria/ ) {
-      $replica2_name = 'slave';
-   }
-
-   if ( $self->replica_is_running($s1_status, $replica1_name)
-     || $self->replica_is_running($s2_status, $replica2_name)
-     || $self->pos_cmp($s1_pos, $s2_pos) != 0)
-   {
-      die "The servers aren't both stopped at the same position";
-   }
-
-}
-
-sub replica_is_running {
-   my ( $self, $replica_status, $replica_name ) = @_;
-   return ($replica_status->{"${replica_name}_sql_running"} || 'No') eq 'Yes';
-}
-
-sub has_replica_updates {
-   my ( $self, $dbh ) = @_;
-   
-   my $vp = VersionParser->new($dbh);
-   my $replica_name = 'replica';
-   if ( $vp lt '8.1' || $vp->flavor() =~ m/maria/ ) {
-      $replica_name = 'slave';
-   }
-
-   my $sql = qq{SHOW VARIABLES LIKE 'log_${replica_name}_updates'};
-   PTDEBUG && _d($dbh, $sql);
-   my ($name, $value) = $dbh->selectrow_array($sql);
-   return $value && $value =~ m/^(1|ON)$/;
-}
-
-sub repl_posn {
-   my ( $self, $status ) = @_;
-   if ( exists $status->{file} && exists $status->{position} ) {
-      return {
-         file     => $status->{file},
-         position => $status->{position},
-      };
-   }
-   elsif ( exists $status->{relay_source_log_file} && exists $status->{exec_source_log_pos} ) {
-      return {
-         file     => $status->{relay_source_log_file},
-         position => $status->{exec_source_log_pos},
-      };
-   }
-   else {
-      return {
-         file     => $status->{relay_master_log_file},
-         position => $status->{exec_master_log_pos},
-      };
-   }
-}
-
-sub get_replica_lag {
-   my ( $self, $dbh ) = @_;
-   
-   my $vp = VersionParser->new($dbh);
-   my $source_name = 'source';
-   if ( $vp lt '8.1' || $vp->flavor() =~ m/maria/ ) {
-      $source_name = 'master';
-   }
-
-   my $stat = $self->get_replica_status($dbh);
-   return unless $stat;  # server is not a replica
-   return $stat->{"seconds_behind_${source_name}"};
-}
-
-sub pos_cmp {
-   my ( $self, $a, $b ) = @_;
-   return $self->pos_to_string($a) cmp $self->pos_to_string($b);
-}
-
-sub short_host {
-   my ( $self, $dsn ) = @_;
-   my ($host, $port);
-   if ( $dsn->{source_host} ) {
-      $host = $dsn->{source_host};
-      $port = $dsn->{source_port};
-   }
-   else {
-      $host = $dsn->{h};
-      $port = $dsn->{P};
-   }
-   return ($host || '[default]') . ( ($port || 3306) == 3306 ? '' : ":$port" );
-}
-
-sub is_replication_thread {
-   my ( $self, $query, %args ) = @_;
-   return unless $query;
-
-   my $type = lc($args{type} || 'all');
-   die "Invalid type: $type"
-      unless $type =~ m/^binlog_dump|slave_io|slave_sql|replica_io|replica_sql|all$/i;
-
-   my $match = 0;
-   if ( $type =~ m/binlog_dump|all/i ) {
-      $match = 1
-         if ($query->{Command} || $query->{command} || '') eq "Binlog Dump";
-   }
-   if ( !$match ) {
-      if ( ($query->{User} || $query->{user} || '') eq "system user" ) {
-         PTDEBUG && _d("Replica replication thread");
-         if ( $type ne 'all' ) {
-            my $state = $query->{State} || $query->{state} || '';
-
-            if ( $state =~ m/^init|end$/ ) {
-               PTDEBUG && _d("Special state:", $state);
-               $match = 1;
-            }
-            else {
-               my ($replica_sql) = $state =~ m/
-                  ^(Waiting\sfor\sthe\snext\sevent
-                   |Reading\sevent\sfrom\sthe\srelay\slog
-                   |Has\sread\sall\srelay\slog;\swaiting
-                   |Making\stemp\sfile
-                   |Waiting\sfor\sslave\smutex\son\sexit
-                   |Waiting\sfor\sreplica\smutex\son\sexit)/xi;
-
-               $match = $type eq 'replica_sql' &&  $replica_sql ? 1
-                      : $type eq 'replica_io'  && !$replica_sql ? 1
-                      :                                       0;
-            }
-         }
-         else {
-            $match = 1;
-         }
-      }
-      else {
-         PTDEBUG && _d('Not system user');
-      }
-
-      if ( !defined $args{check_known_ids} || $args{check_known_ids} ) {
-         my $id = $query->{Id} || $query->{id};
-         if ( $match ) {
-            $self->{replication_thread}->{$id} = 1;
-         }
-         else {
-            if ( $self->{replication_thread}->{$id} ) {
-               PTDEBUG && _d("Thread ID is a known replication thread ID");
-               $match = 1;
-            }
-         }
-      }
-   }
-
-   PTDEBUG && _d('Matches', $type, 'replication thread:',
-      ($match ? 'yes' : 'no'), '; match:', $match);
-
-   return $match;
-}
-
-
-sub get_replication_filters {
-   my ( $self, %args ) = @_;
-   my @required_args = qw(dbh);
-   foreach my $arg ( @required_args ) {
-      die "I need a $arg argument" unless $args{$arg};
-   }
-   my ($dbh) = @args{@required_args};
-
-   my $vp = VersionParser->new($dbh);
-   my $replica_name = 'replica';
-   if ( $vp lt '8.1' || $vp->flavor() =~ m/maria/ ) {
-      $replica_name = 'slave';
-   }
-
-   my %filters = ();
-
-   my $status = $self->get_source_status($dbh);
-   if ( $status ) {
-      map { $filters{$_} = $status->{$_} }
-      grep { defined $status->{$_} && $status->{$_} ne '' }
-      qw(
-         binlog_do_db
-         binlog_ignore_db
-      );
-   }
-
-   $status = $self->get_replica_status($dbh);
-   if ( $status ) {
-      map { $filters{$_} = $status->{$_} }
-      grep { defined $status->{$_} && $status->{$_} ne '' }
-      qw(
-         replicate_do_db
-         replicate_ignore_db
-         replicate_do_table
-         replicate_ignore_table
-         replicate_wild_do_table
-         replicate_wild_ignore_table
-      );
-
-      my $sql = "SHOW VARIABLES LIKE '${replica_name}_skip_errors'";
-      PTDEBUG && _d($dbh, $sql);
-      my $row = $dbh->selectrow_arrayref($sql);
-      $filters{replica_skip_errors} = $row->[1] if $row->[1] && $row->[1] ne 'OFF';
-   }
-
-   return \%filters;
-}
-
-
-sub pos_to_string {
-   my ( $self, $pos ) = @_;
-   my $fmt  = '%s/%020d';
-   return sprintf($fmt, @{$pos}{qw(file position)});
-}
-
-sub reset_known_replication_threads {
-   my ( $self ) = @_;
-   $self->{replication_thread} = {};
-   return;
-}
-
-sub get_cxn_from_dsn_table {
-   my ($self, %args) = @_;
-   my @required_args = qw(dsn_table_dsn make_cxn);
-   foreach my $arg ( @required_args ) {
-      die "I need a $arg argument" unless $args{$arg};
-   }
-   my ($dsn_table_dsn, $make_cxn) = @args{@required_args};
-   PTDEBUG && _d('DSN table DSN:', $dsn_table_dsn);
-
-   my $dp = $self->{DSNParser};
-   my $q  = $self->{Quoter};
-
-   my $dsn = $dp->parse($dsn_table_dsn);
-   my $dsn_table;
-   if ( $dsn->{D} && $dsn->{t} ) {
-      $dsn_table = $q->quote($dsn->{D}, $dsn->{t});
-   }
-   elsif ( $dsn->{t} && $dsn->{t} =~ m/\./ ) {
-      $dsn_table = $q->quote($q->split_unquote($dsn->{t}));
-   }
-   else {
-      die "DSN table DSN does not specify a database (D) "
-        . "or a database-qualified table (t)";
-   }
-
-   my $done = 0;
-   my $dsn_tbl_cxn = $make_cxn->(dsn => $dsn);
-   my $dbh         = $dsn_tbl_cxn->connect();
-   my $sql         = "SELECT dsn FROM $dsn_table ORDER BY id";
-   PTDEBUG && _d($sql);
-   my @cxn;
-   use Data::Dumper;
-   DSN:
-   do {
-      @cxn = ();
-      my $dsn_strings = $dbh->selectcol_arrayref($sql);
-      if ( $dsn_strings ) {
-         foreach my $dsn_string ( @$dsn_strings ) {
-            PTDEBUG && _d('DSN from DSN table:', $dsn_string);
-            if ($args{wait_no_die}) {
-               my $lcxn;
-               eval {
-                  $lcxn = $make_cxn->(dsn_string => $dsn_string);
-               };
-               if ( $EVAL_ERROR && ($dsn_tbl_cxn->lost_connection($EVAL_ERROR)
-                     || $EVAL_ERROR =~ m/Can't connect to MySQL server/)) {
-                  PTDEBUG && _d("Server is not accessible, waiting when it is online again");
-                  sleep(1);
-                  goto DSN;
-               }
-               push @cxn, $lcxn;
-            } else {
-               push @cxn, $make_cxn->(dsn_string => $dsn_string);
-            }
-         }
-      }
-      $done = 1;
-   } until $done;
-   return \@cxn;
-}
-
-sub _d {
-   my ($package, undef, $line) = caller 0;
-   @_ = map { (my $temp = $_) =~ s/\n/\n# /g; $temp; }
-        map { defined $_ ? $_ : 'undef' }
-        @_;
-   print STDERR "# $package:$line $PID ", join(' ', @_), "\n";
-}
-
-1;
-}
-# ###########################################################################
-# End MasterSlave package
-# ###########################################################################
-
-# ###########################################################################
-# Daemon package
-# This package is a copy without comments from the original.  The original
-# with comments and its test file can be found in the GitHub repository at,
-#   lib/Daemon.pm
-#   t/lib/Daemon.t
-# See https://github.com/percona/percona-toolkit for more information.
-# ###########################################################################
-{
-package Daemon;
-
-use strict;
-use warnings FATAL => 'all';
-use English qw(-no_match_vars);
-
-use constant PTDEBUG => $ENV{PTDEBUG} || 0;
-
-use POSIX qw(setsid);
-use Fcntl qw(:DEFAULT);
-
-sub new {
-   my ($class, %args) = @_;
-   my $self = {
-      log_file       => $args{log_file},
-      pid_file       => $args{pid_file},
-      daemonize      => $args{daemonize},
-      force_log_file => $args{force_log_file},
-      parent_exit    => $args{parent_exit},
-      pid_file_owner => 0,
-      utf8           => $args{utf8} // 0,
-   };
-   return bless $self, $class;
-}
-
-sub run {
-   my ($self) = @_;
-
-   my $daemonize      = $self->{daemonize};
-   my $pid_file       = $self->{pid_file};
-   my $log_file       = $self->{log_file};
-   my $force_log_file = $self->{force_log_file};
-   my $parent_exit    = $self->{parent_exit};
-   my $utf8           = $self->{utf8};
-
-   PTDEBUG && _d('Starting daemon');
-
-   if ( $pid_file ) {
-      eval {
-         $self->_make_pid_file(
-            pid      => $PID,  # parent's pid
-            pid_file => $pid_file,
-         );
-      };
-      die "$EVAL_ERROR\n" if $EVAL_ERROR;
-      if ( !$daemonize ) {
-         $self->{pid_file_owner} = $PID;  # parent's pid
-      }
-   }
-
-   if ( $daemonize ) {
-      defined (my $child_pid = fork()) or die "Cannot fork: $OS_ERROR";
-      if ( $child_pid ) {
-         PTDEBUG && _d('Forked child', $child_pid);
-         $parent_exit->($child_pid) if $parent_exit;
-         exit 0;
-      }
-
-      POSIX::setsid() or die "Cannot start a new session: $OS_ERROR";
-      chdir '/'       or die "Cannot chdir to /: $OS_ERROR";
-
-      if ( $pid_file ) {
-         $self->_update_pid_file(
-            pid      => $PID,  # child's pid
-            pid_file => $pid_file,
-         );
-         $self->{pid_file_owner} = $PID;
-      }
-   }
-
-   if ( $daemonize || $force_log_file ) {
-      PTDEBUG && _d('Redirecting STDIN to /dev/null');
-      close STDIN;
-      open  STDIN, '/dev/null'
-         or die "Cannot reopen STDIN to /dev/null: $OS_ERROR";
-      if ( $log_file ) {
-         PTDEBUG && _d('Redirecting STDOUT and STDERR to', $log_file);
-         close STDOUT;
-         open  STDOUT, '>>', $log_file
-            or die "Cannot open log file $log_file: $OS_ERROR";
-         if ( $utf8 ) {
-            binmode(STDOUT, ':utf8')
-               or die "Can't binmode(STDOUT, ':utf8'): $OS_ERROR";
-         }
-
-
-         close STDERR;
-         open  STDERR, ">&STDOUT"
-            or die "Cannot dupe STDERR to STDOUT: $OS_ERROR";
-         if ( $utf8 ) {
-            binmode(STDERR, ':utf8')
-               or die "Can't binmode(STDERR, ':utf8'): $OS_ERROR";
-         }
-      }
-      else {
-         if ( -t STDOUT ) {
-            PTDEBUG && _d('No log file and STDOUT is a terminal;',
-               'redirecting to /dev/null');
-            close STDOUT;
-            open  STDOUT, '>', '/dev/null'
-               or die "Cannot reopen STDOUT to /dev/null: $OS_ERROR";
-         }
-         if ( -t STDERR ) {
-            PTDEBUG && _d('No log file and STDERR is a terminal;',
-               'redirecting to /dev/null');
-            close STDERR;
-            open  STDERR, '>', '/dev/null'
-               or die "Cannot reopen STDERR to /dev/null: $OS_ERROR";
-         }
-      }
-
-      $OUTPUT_AUTOFLUSH = 1;
-   }
-
-   PTDEBUG && _d('Daemon running');
-   return;
-}
-
-sub _make_pid_file {
-   my ($self, %args) = @_;
-   my @required_args = qw(pid pid_file);
-   foreach my $arg ( @required_args ) {
-      die "I need a $arg argument" unless $args{$arg};
-   };
-   my $pid      = $args{pid};
-   my $pid_file = $args{pid_file};
-
-   eval {
-      sysopen(PID_FH, $pid_file, O_RDWR|O_CREAT|O_EXCL) or die $OS_ERROR;
-      print PID_FH $PID, "\n";
-      close PID_FH;
-   };
-   if ( my $e = $EVAL_ERROR ) {
-      if ( $e =~ m/file exists/i ) {
-         my $old_pid = $self->_check_pid_file(
-            pid_file => $pid_file,
-            pid      => $PID,
-         );
-         if ( $old_pid ) {
-            warn "Overwriting PID file $pid_file because PID $old_pid "
-               . "is not running.\n";
-         }
-         $self->_update_pid_file(
-            pid      => $PID,
-            pid_file => $pid_file
-         );
-      }
-      else {
-         die "Error creating PID file $pid_file: $e\n";
-      }
-   }
-
-   return;
-}
-
-sub _check_pid_file {
-   my ($self, %args) = @_;
-   my @required_args = qw(pid_file pid);
-   foreach my $arg ( @required_args ) {
-      die "I need a $arg argument" unless $args{$arg};
-   };
-   my $pid_file = $args{pid_file};
-   my $pid      = $args{pid};
-
-   PTDEBUG && _d('Checking if PID in', $pid_file, 'is running');
-
-   if ( ! -f $pid_file ) {
-      PTDEBUG && _d('PID file', $pid_file, 'does not exist');
-      return;
-   }
-
-   open my $fh, '<', $pid_file
-      or die "Error opening $pid_file: $OS_ERROR";
-   my $existing_pid = do { local $/; <$fh> };
-   chomp($existing_pid) if $existing_pid;
-   close $fh
-      or die "Error closing $pid_file: $OS_ERROR";
-
-   if ( $existing_pid ) {
-      if ( $existing_pid == $pid ) {
-         warn "The current PID $pid already holds the PID file $pid_file\n";
-         return;
-      }
-      else {
-         PTDEBUG && _d('Checking if PID', $existing_pid, 'is running');
-         my $pid_is_alive = kill 0, $existing_pid;
-         if ( $pid_is_alive ) {
-            die "PID file $pid_file exists and PID $existing_pid is running\n";
-         }
-      }
-   }
-   else {
-      die "PID file $pid_file exists but it is empty.  Remove the file "
-         . "if the process is no longer running.\n";
-   }
-
-   return $existing_pid;
-}
-
-sub _update_pid_file {
-   my ($self, %args) = @_;
-   my @required_args = qw(pid pid_file);
-   foreach my $arg ( @required_args ) {
-      die "I need a $arg argument" unless $args{$arg};
-   };
-   my $pid      = $args{pid};
-   my $pid_file = $args{pid_file};
-
-   open my $fh, '>', $pid_file
-      or die "Cannot open $pid_file: $OS_ERROR";
-   print { $fh } $pid, "\n"
-      or die "Cannot print to $pid_file: $OS_ERROR";
-   close $fh
-      or warn "Cannot close $pid_file: $OS_ERROR";
-
-   return;
-}
-
-sub remove_pid_file {
-   my ($self, $pid_file) = @_;
-   $pid_file ||= $self->{pid_file};
-   if ( $pid_file && -f $pid_file ) {
-      unlink $self->{pid_file}
-         or warn "Cannot remove PID file $pid_file: $OS_ERROR";
-      PTDEBUG && _d('Removed PID file');
-   }
-   else {
-      PTDEBUG && _d('No PID to remove');
-   }
-   return;
-}
-
-sub DESTROY {
-   my ($self) = @_;
-
-   if ( $self->{pid_file_owner} == $PID ) {
-      $self->remove_pid_file();
-   }
-
-   return;
-}
-
-sub _d {
-   my ($package, undef, $line) = caller 0;
-   @_ = map { (my $temp = $_) =~ s/\n/\n# /g; $temp; }
-        map { defined $_ ? $_ : 'undef' }
-        @_;
-   print STDERR "# $package:$line $PID ", join(' ', @_), "\n";
-}
-
-1;
-}
-# ###########################################################################
-# End Daemon package
-# ###########################################################################
-
-# ###########################################################################
-# VersionParser package
-# This package is a copy without comments from the original.  The original
-# with comments and its test file can be found in the GitHub repository at,
-#   lib/VersionParser.pm
-#   t/lib/VersionParser.t
-# See https://github.com/percona/percona-toolkit for more information.
-# ###########################################################################
-{
-package VersionParser;
-
-use Lmo;
-use Scalar::Util qw(blessed);
-use English qw(-no_match_vars);
-use constant PTDEBUG => $ENV{PTDEBUG} || 0;
-
-use overload (
-   '""'     => "version",
-   '<=>'    => "cmp",
-   'cmp'    => "cmp",
-   fallback => 1,
-);
-
-use Carp ();
-
-has major => (
-    is       => 'ro',
-    isa      => 'Int',
-    required => 1,
-);
-
-has [qw( minor revision )] => (
-    is  => 'ro',
-    isa => 'Num',
-);
-
-has flavor => (
-    is      => 'ro',
-    isa     => 'Str',
-    default => sub { 'Unknown' },
-);
-
-has innodb_version => (
-    is      => 'ro',
-    isa     => 'Str',
-    default => sub { 'NO' },
-);
-
-sub series {
-   my $self = shift;
-   return $self->_join_version($self->major, $self->minor);
-}
-
-sub version {
-   my $self = shift;
-   return $self->_join_version($self->major, $self->minor, $self->revision);
-}
-
-sub is_in {
-   my ($self, $target) = @_;
-
-   return $self eq $target;
-}
-
-sub _join_version {
-    my ($self, @parts) = @_;
-
-    return join ".", map { my $c = $_; $c =~ s/^0\./0/; $c } grep defined, @parts;
-}
-sub _split_version {
-   my ($self, $str) = @_;
-   my @version_parts = map { s/^0(?=\d)/0./; $_ } $str =~ m/(\d+)/g;
-   return @version_parts[0..2];
-}
-
-sub normalized_version {
-   my ( $self ) = @_;
-   my $result = sprintf('%d%02d%02d', map { $_ || 0 } $self->major,
-                                                      $self->minor,
-                                                      $self->revision);
-   PTDEBUG && _d($self->version, 'normalizes to', $result);
-   return $result;
-}
-
-sub comment {
-   my ( $self, $cmd ) = @_;
-   my $v = $self->normalized_version();
-
-   return "/*!$v $cmd */"
-}
-
-my @methods = qw(major minor revision);
-sub cmp {
-   my ($left, $right) = @_;
-   my $right_obj = (blessed($right) && $right->isa(ref($left)))
-                   ? $right
-                   : ref($left)->new($right);
-
-   my $retval = 0;
-   for my $m ( @methods ) {
-      last unless defined($left->$m) && defined($right_obj->$m);
-      $retval = $left->$m <=> $right_obj->$m;
-      last if $retval;
-   }
-   return $retval;
-}
-
-sub BUILDARGS {
-   my $self = shift;
-
-   if ( @_ == 1 ) {
-      my %args;
-      if ( blessed($_[0]) && $_[0]->can("selectrow_hashref") ) {
-         PTDEBUG && _d("VersionParser got a dbh, trying to get the version");
-         my $dbh = $_[0];
-         local $dbh->{FetchHashKeyName} = 'NAME_lc';
-         my $query = eval {
-            $dbh->selectall_arrayref(q/SHOW VARIABLES LIKE 'version%'/, { Slice => {} })
-         };
-         if ( $query ) {
-            $query = { map { $_->{variable_name} => $_->{value} } @$query };
-            @args{@methods} = $self->_split_version($query->{version});
-            $args{flavor} = delete $query->{version_comment}
-                  if $query->{version_comment};
-         }
-         elsif ( eval { ($query) = $dbh->selectrow_array(q/SELECT VERSION()/) } ) {
-            @args{@methods} = $self->_split_version($query);
-         }
-         else {
-            Carp::confess("Couldn't get the version from the dbh while "
-                        . "creating a VersionParser object: $@");
-         }
-         $args{innodb_version} = eval { $self->_innodb_version($dbh) };
-      }
-      elsif ( !ref($_[0]) ) {
-         @args{@methods} = $self->_split_version($_[0]);
-      }
-
-      for my $method (@methods) {
-         delete $args{$method} unless defined $args{$method};
-      }
-      @_ = %args if %args;
-   }
-
-   return $self->SUPER::BUILDARGS(@_);
-}
-
-sub _innodb_version {
-   my ( $self, $dbh ) = @_;
-   return unless $dbh;
-   my $innodb_version = "NO";
-
-   my ($innodb) =
-      grep { $_->{engine} =~ m/InnoDB/i }
-      map  {
-         my %hash;
-         @hash{ map { lc $_ } keys %$_ } = values %$_;
-         \%hash;
-      }
-      @{ $dbh->selectall_arrayref("SHOW ENGINES", {Slice=>{}}) };
-   if ( $innodb ) {
-      PTDEBUG && _d("InnoDB support:", $innodb->{support});
-      if ( $innodb->{support} =~ m/YES|DEFAULT/i ) {
-         my $vars = $dbh->selectrow_hashref(
-            "SHOW VARIABLES LIKE 'innodb_version'");
-         $innodb_version = !$vars ? "BUILTIN"
-                         :          ($vars->{Value} || $vars->{value});
-      }
-      else {
-         $innodb_version = $innodb->{support};  # probably DISABLED or NO
-      }
-   }
-
-   PTDEBUG && _d("InnoDB version:", $innodb_version);
-   return $innodb_version;
-}
-
-sub _d {
-   my ($package, undef, $line) = caller 0;
-   @_ = map { (my $temp = $_) =~ s/\n/\n# /g; $temp; }
-        map { defined $_ ? $_ : 'undef' }
-        @_;
-   print STDERR "# $package:$line $PID ", join(' ', @_), "\n";
-}
-
-no Lmo;
-1;
-}
-# ###########################################################################
-# End VersionParser package
-# ###########################################################################
-
-# ###########################################################################
-# Transformers package
-# This package is a copy without comments from the original.  The original
-# with comments and its test file can be found in the GitHub repository at,
-#   lib/Transformers.pm
-#   t/lib/Transformers.t
-# See https://github.com/percona/percona-toolkit for more information.
-# ###########################################################################
-{
-package Transformers;
-
-use strict;
-use warnings FATAL => 'all';
-use English qw(-no_match_vars);
-use constant PTDEBUG => $ENV{PTDEBUG} || 0;
-
-use Time::Local qw(timegm timelocal);
-use Digest::MD5 qw(md5_hex);
-use B qw();
-
-BEGIN {
-   require Exporter;
-   our @ISA         = qw(Exporter);
-   our %EXPORT_TAGS = ();
-   our @EXPORT      = ();
-   our @EXPORT_OK   = qw(
-      micro_t
-      percentage_of
-      secs_to_time
-      time_to_secs
-      shorten
-      ts
-      parse_timestamp
-      unix_timestamp
-      any_unix_timestamp
-      make_checksum
-      crc32
-      encode_json
-   );
-}
-
-our $mysql_ts  = qr/(\d\d)(\d\d)(\d\d) +(\d+):(\d+):(\d+)(\.\d+)?/;
-our $proper_ts = qr/(\d\d\d\d)-(\d\d)-(\d\d)[T ](\d\d):(\d\d):(\d\d)(\.\d+)?/;
-our $n_ts      = qr/(\d{1,5})([shmd]?)/; # Limit \d{1,5} because \d{6} looks
-
-sub micro_t {
-   my ( $t, %args ) = @_;
-   my $p_ms = defined $args{p_ms} ? $args{p_ms} : 0;  # precision for ms vals
-   my $p_s  = defined $args{p_s}  ? $args{p_s}  : 0;  # precision for s vals
-   my $f;
-
-   $t = 0 if $t < 0;
-
-   $t = sprintf('%.17f', $t) if $t =~ /e/;
-
-   $t =~ s/\.(\d{1,6})\d*/\.$1/;
-
-   if ($t > 0 && $t <= 0.000999) {
-      $f = ($t * 1000000) . 'us';
-   }
-   elsif ($t >= 0.001000 && $t <= 0.999999) {
-      $f = sprintf("%.${p_ms}f", $t * 1000);
-      $f = ($f * 1) . 'ms'; # * 1 to remove insignificant zeros
-   }
-   elsif ($t >= 1) {
-      $f = sprintf("%.${p_s}f", $t);
-      $f = ($f * 1) . 's'; # * 1 to remove insignificant zeros
-   }
-   else {
-      $f = 0;  # $t should = 0 at this point
-   }
-
-   return $f;
-}
-
-sub percentage_of {
-   my ( $is, $of, %args ) = @_;
-   my $p   = $args{p} || 0; # float precision
-   my $fmt = $p ? "%.${p}f" : "%d";
-   return sprintf $fmt, ($is * 100) / ($of ||= 1);
-}
-
-sub secs_to_time {
-   my ( $secs, $fmt ) = @_;
-   $secs ||= 0;
-   return '00:00' unless $secs;
-
-   $fmt ||= $secs >= 86_400 ? 'd'
-          : $secs >= 3_600  ? 'h'
-          :                   'm';
-
-   return
-      $fmt eq 'd' ? sprintf(
-         "%d+%02d:%02d:%02d",
-         int($secs / 86_400),
-         int(($secs % 86_400) / 3_600),
-         int(($secs % 3_600) / 60),
-         $secs % 60)
-      : $fmt eq 'h' ? sprintf(
-         "%02d:%02d:%02d",
-         int(($secs % 86_400) / 3_600),
-         int(($secs % 3_600) / 60),
-         $secs % 60)
-      : sprintf(
-         "%02d:%02d",
-         int(($secs % 3_600) / 60),
-         $secs % 60);
-}
-
-sub time_to_secs {
-   my ( $val, $default_suffix ) = @_;
-   die "I need a val argument" unless defined $val;
-   my $t = 0;
-   my ( $prefix, $num, $suffix ) = $val =~ m/([+-]?)(\d+)([a-z])?$/;
-   $suffix = $suffix || $default_suffix || 's';
-   if ( $suffix =~ m/[smhd]/ ) {
-      $t = $suffix eq 's' ? $num * 1        # Seconds
-         : $suffix eq 'm' ? $num * 60       # Minutes
-         : $suffix eq 'h' ? $num * 3600     # Hours
-         :                  $num * 86400;   # Days
-
-      $t *= -1 if $prefix && $prefix eq '-';
-   }
-   else {
-      die "Invalid suffix for $val: $suffix";
-   }
-   return $t;
-}
-
-sub shorten {
-   my ( $num, %args ) = @_;
-   my $p = defined $args{p} ? $args{p} : 2;     # float precision
-   my $d = defined $args{d} ? $args{d} : 1_024; # divisor
-   my $n = 0;
-   my @units = ('', qw(k M G T P E Z Y));
-   while ( $num >= $d && $n < @units - 1 ) {
-      $num /= $d;
-      ++$n;
-   }
-   return sprintf(
-      $num =~ m/\./ || $n
-         ? '%1$.'.$p.'f%2$s'
-         : '%1$d',
-      $num, $units[$n]);
-}
-
-sub ts {
-   my ( $time, $gmt ) = @_;
-   my ( $sec, $min, $hour, $mday, $mon, $year )
-      = $gmt ? gmtime($time) : localtime($time);
-   $mon  += 1;
-   $year += 1900;
-   my $val = sprintf("%d-%02d-%02dT%02d:%02d:%02d",
-      $year, $mon, $mday, $hour, $min, $sec);
-   if ( my ($us) = $time =~ m/(\.\d+)$/ ) {
-      $us = sprintf("%.6f", $us);
-      $us =~ s/^0\././;
-      $val .= $us;
-   }
-   return $val;
-}
-
-sub parse_timestamp {
-   my ( $val ) = @_;
-   if ( my($y, $m, $d, $h, $i, $s, $f)
-         = $val =~ m/^$mysql_ts$/ )
-   {
-      return sprintf "%d-%02d-%02d %02d:%02d:"
-                     . (defined $f ? '%09.6f' : '%02d'),
-                     $y + 2000, $m, $d, $h, $i, (defined $f ? $s + $f : $s);
-   }
-   elsif ( $val =~ m/^$proper_ts$/ ) {
-      return $val;
-   }
-   return $val;
-}
-
-sub unix_timestamp {
-   my ( $val, $gmt ) = @_;
-   if ( my($y, $m, $d, $h, $i, $s, $us) = $val =~ m/^$proper_ts$/ ) {
-      $val = $gmt
-         ? timegm($s, $i, $h, $d, $m - 1, $y)
-         : timelocal($s, $i, $h, $d, $m - 1, $y);
-      if ( defined $us ) {
-         $us = sprintf('%.6f', $us);
-         $us =~ s/^0\././;
-         $val .= $us;
-      }
-   }
-   return $val;
-}
-
-sub any_unix_timestamp {
-   my ( $val, $callback ) = @_;
-
-   if ( my ($n, $suffix) = $val =~ m/^$n_ts$/ ) {
-      $n = $suffix eq 's' ? $n            # Seconds
-         : $suffix eq 'm' ? $n * 60       # Minutes
-         : $suffix eq 'h' ? $n * 3600     # Hours
-         : $suffix eq 'd' ? $n * 86400    # Days
-         :                  $n;           # default: Seconds
-      PTDEBUG && _d('ts is now - N[shmd]:', $n);
-      return time - $n;
-   }
-   elsif ( $val =~ m/^\d{9,}/ ) {
-      PTDEBUG && _d('ts is already a unix timestamp');
-      return $val;
-   }
-   elsif ( my ($ymd, $hms) = $val =~ m/^(\d{6})(?:\s+(\d+:\d+:\d+))?/ ) {
-      PTDEBUG && _d('ts is MySQL slow log timestamp');
-      $val .= ' 00:00:00' unless $hms;
-      return unix_timestamp(parse_timestamp($val));
-   }
-   elsif ( ($ymd, $hms) = $val =~ m/^(\d{4}-\d\d-\d\d)(?:[T ](\d+:\d+:\d+))?/) {
-      PTDEBUG && _d('ts is properly formatted timestamp');
-      $val .= ' 00:00:00' unless $hms;
-      return unix_timestamp($val);
-   }
-   else {
-      PTDEBUG && _d('ts is MySQL expression');
-      return $callback->($val) if $callback && ref $callback eq 'CODE';
-   }
-
-   PTDEBUG && _d('Unknown ts type:', $val);
-   return;
-}
-
-sub make_checksum {
-   my ( $val ) = @_;
-   my $checksum = uc md5_hex($val);
-   PTDEBUG && _d($checksum, 'checksum for', $val);
-   return $checksum;
-}
-
-sub crc32 {
-   my ( $string ) = @_;
-   return unless $string;
-   my $poly = 0xEDB88320;
-   my $crc  = 0xFFFFFFFF;
-   foreach my $char ( split(//, $string) ) {
-      my $comp = ($crc ^ ord($char)) & 0xFF;
-      for ( 1 .. 8 ) {
-         $comp = $comp & 1 ? $poly ^ ($comp >> 1) : $comp >> 1;
-      }
-      $crc = (($crc >> 8) & 0x00FFFFFF) ^ $comp;
-   }
-   return $crc ^ 0xFFFFFFFF;
-}
-
-my $got_json = eval { require JSON };
-sub encode_json {
-   return JSON::encode_json(@_) if $got_json;
-   my ( $data ) = @_;
-   return (object_to_json($data) || '');
-}
-
-
-sub object_to_json {
-   my ($obj) = @_;
-   my $type  = ref($obj);
-
-   if($type eq 'HASH'){
-      return hash_to_json($obj);
-   }
-   elsif($type eq 'ARRAY'){
-      return array_to_json($obj);
-   }
-   else {
-      return value_to_json($obj);
-   }
-}
-
-sub hash_to_json {
-   my ($obj) = @_;
-   my @res;
-   for my $k ( sort { $a cmp $b } keys %$obj ) {
-      push @res, string_to_json( $k )
-         .  ":"
-         . ( object_to_json( $obj->{$k} ) || value_to_json( $obj->{$k} ) );
-   }
-   return '{' . ( @res ? join( ",", @res ) : '' )  . '}';
-}
-
-sub array_to_json {
-   my ($obj) = @_;
-   my @res;
-
-   for my $v (@$obj) {
-      push @res, object_to_json($v) || value_to_json($v);
-   }
-
-   return '[' . ( @res ? join( ",", @res ) : '' ) . ']';
-}
-
-sub value_to_json {
-   my ($value) = @_;
-
-   return 'null' if(!defined $value);
-
-   my $b_obj = B::svref_2object(\$value);  # for round trip problem
-   my $flags = $b_obj->FLAGS;
-   return $value # as is
-      if $flags & ( B::SVp_IOK | B::SVp_NOK ) and !( $flags & B::SVp_POK ); # SvTYPE is IV or NV?
-
-   my $type = ref($value);
-
-   if( !$type ) {
-      return string_to_json($value);
-   }
-   else {
-      return 'null';
-   }
-
-}
-
-my %esc = (
-   "\n" => '\n',
-   "\r" => '\r',
-   "\t" => '\t',
-   "\f" => '\f',
-   "\b" => '\b',
-   "\"" => '\"',
-   "\\" => '\\\\',
-   "\'" => '\\\'',
-);
-
-sub string_to_json {
-   my ($arg) = @_;
-
-   $arg =~ s/([\x22\x5c\n\r\t\f\b])/$esc{$1}/g;
-   $arg =~ s/\//\\\//g;
-   $arg =~ s/([\x00-\x08\x0b\x0e-\x1f])/'\\u00' . unpack('H2', $1)/eg;
-
-   utf8::upgrade($arg);
-   utf8::encode($arg);
-
-   return '"' . $arg . '"';
-}
-
-sub _d {
-   my ($package, undef, $line) = caller 0;
-   @_ = map { (my $temp = $_) =~ s/\n/\n# /g; $temp; }
-        map { defined $_ ? $_ : 'undef' }
-        @_;
-   print STDERR "# $package:$line $PID ", join(' ', @_), "\n";
-}
-
-1;
-}
-# ###########################################################################
-# End Transformers package
-# ###########################################################################
-
-# ###########################################################################
-# This is a combination of modules and programs in one -- a runnable module.
-# http://www.perl.com/pub/a/2006/07/13/lightning-articles.html?page=last
-# Or, look it up in the Camel book on pages 642 and 643 in the 3rd edition.
-#
-# Check at the end of this package for the call to main() which actually runs
-# the program.
-# ###########################################################################
-package pt_slave_find;
-
-use strict;
-use warnings FATAL => 'all';
-use English qw(-no_match_vars);
-use constant PTDEBUG => $ENV{PTDEBUG} || 0;
-
-Transformers->import(qw(secs_to_time ts));
-
-sub main {
-   @ARGV = @_;  # set global ARGV for this package
-
-   # ########################################################################
-   # Get configuration information.
-   # ########################################################################
-   my $o = new OptionParser();
-   $o->get_specs();
-   $o->get_opts();
-
-   my $dp = $o->DSNParser();
-   $dp->prop('set-vars', $o->set_vars());
-
-   if ( $o->get('ask-pass') ) {
-      $o->set('password', OptionParser::prompt_noecho("Enter password: "));
-   }
-
-   my $dsn_defaults = $dp->parse_options($o);
-   my $master_dsn   = @ARGV ? $dp->parse(shift @ARGV, $dsn_defaults)
-                            : $dsn_defaults;
-   if ( !$master_dsn ) {
-      $o->save_error("Missing or invalid master host");
-   }
-
-   eval {
-      MasterSlave::check_recursion_method($o->get('recursion-method'));
-   };
-   if ( $EVAL_ERROR ) {
-      $o->save_error("Invalid --recursion-method: $EVAL_ERROR")
-   }
-
-   $o->usage_or_errors();
-
-   # ########################################################################
-   # If --pid, check it first since we'll die if it already exits.
-   # ########################################################################
-   my $daemon;
-   if ( $o->get('pid') ) {
-      # We're not daemoninzing, it just handles PID stuff.  Keep $daemon
-      # in the the scope of main() because when it's destroyed it automatically
-      # removes the PID file.
-      $daemon = new Daemon(
-         daemonize => 0, # not daemoninzing, just PID file
-         pid_file => $o->get('pid'),
-      );
-      $daemon->run();
-   }
-
-   # ########################################################################
-   # Connect and go to work.
-   # ########################################################################
-   my $dbh = $dp->get_dbh($dp->get_cxn_params($master_dsn), {AutoCommit => 1});
-
-   my $exit_status = 0;
-   my %slaves_found;
-   my $root;
-
-   # Despite the name, recursing to slaves actually begins at the specified
-   # server, so the named server may also be included.
-   my $ms = new MasterSlave(
-      OptionParser => $o,
-      DSNParser    => $dp,
-      Quoter       => "Quoter",
-   );
-   $ms->recurse_to_replicas(
-      {  dbh      => $dbh,
-         dsn      => $master_dsn,
-         callback => sub {
-            my ( $dsn, $dbh, $level, $parent ) = @_;
-            if ( !$parent ) {
-               $root = $dsn;
-            }
-            else {
-               my $p = $slaves_found{$dp->as_string($parent)};
-               push @{$p->{children}}, $dsn;
-            }
-            my $slave = $dp->as_string($dsn);
-            $slaves_found{$slave}        = $dsn;
-            $slaves_found{$slave}->{dbh} = $dbh;
-         },
-      }
-   );
-
-   # If the user relied on values from the defaults file, the $root hostname
-   # might not be defined.  Try to fill it in.
-   $root->{h} ||= $dp->get_hostname($dbh);
-
-   # Now that we've found them all, recurse through them and do stuff!
-   my %print_node_sub_for = (
-      hostname => \&print_node_hostname,
-      summary  => \&print_node_summary,
-   );
-   my $print_node = $print_node_sub_for{lc($o->get('report-format'))};
-   print_slaves(
-      node          => $root,
-      print_node    => $print_node,
-      MasterSlave   => $ms,
-      resolve_address => $o->get('resolve-address'),
-   );
-
-   return 0;
-}
-
-# ############################################################################
-# Subroutines
-# ############################################################################
-
-# Print master and slaves in a tree like:
-#    master:port
-#    +- slave1:port
-#       +- slave1-1:port
-#    +- slave2:port
-# The levels are thus:
-#    0
-#    +- 1
-#       +- 2
-#    +- 1
-sub print_slaves {
-   my ( %args ) = @_;
-   my ($ms, $node, $level, $print_node)
-      = @args{qw(MasterSlave node level print_node)};
-   die "I need a node" unless $node;
-   $level ||= 0;
-
-   PTDEBUG && _d("Printing slaves, starting level", $level);
-
-   # Print this node.
-   $print_node->(%args);
-
-   # If this node has slaves, print them.
-   if ( $node->{children} ) {
-      PTDEBUG && _d($ms->short_host($node), "has slaves");
-      my @slaves = reverse @{$node->{children}};
-      foreach my $slave ( @slaves ) {
-         print_slaves(%args, node=>$slave, level=>$level + 1);
-      }
-   }
-
-   return;
-}
-
-sub print_node_hostname {
-   my ( %args ) = @_;
-   my ($ms, $node, $level, $resolve_address) = @args{qw(MasterSlave node level resolve_address)};
-   die "I need a node" unless $node;
-   $level ||= 0;
-
-   # Strip out the noise.  We really only need to see the host and port, and if
-   # the port is default, we don't even need to see that.
-   my $host   = $ms->short_host($node);
-   my $prefix = $level ? (' ' x (($level-1)*3) . '+- ') : '';
-
-   PTDEBUG && _d('level', $level, 'host', $host);
-
-   print_host($prefix, $host, $resolve_address);
-
-   return;
-}
-
-sub print_node_summary {
-   my ( %args ) = @_;
-   my ($ms, $node, $level, $resolve_address)
-      = @args{qw(MasterSlave node level resolve_address)};
-   die "I need a node" unless $node;
-   $level ||= 0;
-
-   my $host   = $ms->short_host($node);
-   my $prefix = $level ? (' ' x (($level-1)*3) . '+- ') : '';
-   my $indent = ' ' x ($level * 3);
-
-   PTDEBUG && _d('level', $level, 'host', $host);
-
-   print_host($prefix, $host, $resolve_address);
-
-   my $dbh = $node->{dbh};
-   if ( !$dbh ) {
-      print $prefix . "Cannot connect to this slave\n";
-      return;
-   }
-   $dbh->{FetchHashKeyName} = 'NAME_lc';
-   
-   my $vp = VersionParser->new($dbh);
-   my $source_name = 'source';
-   my $replica_name = 'replica';
-   if ( $vp lt '8.1' || $vp->flavor() =~ m/maria/ ) {
-      $source_name = 'master';
-      $replica_name = 'slave';
-   }
-
-   # Build the summary line by line, then join and print the lines.
-   my @lines;
-   my $vars  = $dbh->selectall_hashref("SHOW VARIABLES", 'variable_name');
-   my $stats = $dbh->selectall_hashref("SHOW STATUS", 'variable_name');
-   my $ss    = $dbh->selectrow_hashref("SHOW ${replica_name} STATUS");
-   my $proc  = $dbh->selectall_hashref("SHOW PROCESSLIST", 'id');
-
-   push @lines, ['Version',   $vars->{version}->{value}];
-   push @lines, ['Server ID', $vars->{server_id}->{value}];
-
-   my $dhms    = secs_to_time($stats->{Uptime}->{value}) || '';
-   my $started = ts(time - $stats->{Uptime}->{value})    || '';
-   push @lines, ['Uptime', "$dhms (started $started)"];
-
-   my $n_slaves = 0;
-   if ( $proc ) {
-      map { $n_slaves++ if $proc->{$_}->{command} =~ m/Binlog Dump/i }
-         keys %$proc;
-   }
-   push @lines, [
-      'Replication',
-      ($ss ? "Is a slave, " : "Is not a slave, ")
-         . "has $n_slaves slaves connected, "
-         . "is " . (($vars->{read_only}->{value} || "") eq "ON" ? "" : "not ")
-         . "read_only"
-   ];
-
-   my $repl_filters = $ms->get_replication_filters(dbh=>$dbh);
-   push @lines, [
-      'Filters',
-      keys %$repl_filters ?
-         join('; ', map { "$_=$repl_filters->{$_}" } keys %$repl_filters) : ''
-   ];
-
-   push @lines, ['Binary logging',  $vars->{binlog_format}->{value}];
-
-   my $slave_status = '';
-   if ( $ss ) {
-      $slave_status = sprintf("%s seconds behind, %s, %s",
-         defined $ss->{"seconds_behind_${source_name}"} ? $ss->{"seconds_behind_${source_name}"} : '',
-         $ss->{"${replica_name}_io_running"}  eq 'Yes' && $ss->{"${replica_name}_sql_running"} eq 'Yes' ? 'running' : 'not running',
-          $ss->{last_errno} ? "error $ss->{last_errno}" : "no errors",
-      );
-   }
-   push @lines, ['Slave status', $slave_status];
-   push @lines, ['Slave mode',   $vars->{slave_exec_mode}->{value}];
-   push @lines, [
-      'Auto-increment',
-        "increment " . ($vars->{auto_increment_increment}->{value}|| '')
-      . ", offset "  . ($vars->{auto_increment_offset}->{value}   || '')
-   ];
-
-   my $innodb_version = VersionParser->new($dbh)->innodb_version();
-   push @lines, ['InnoDB version', $innodb_version];
-
-   my $line_fmt = "$indent%-15s %s";
-   print join("\n",
-         map { sprintf($line_fmt, $_->[0], defined $_->[1] ? $_->[1] : 'unknown') } @lines),
-      "\n";
-
-   return;
-}
-
-sub print_host {
-   my ($prefix, $host, $resolve_address) = @_;
-
-   my $hostname;
-   # resolve address to hostname if user requested it
-   if($resolve_address) {
-      use Socket;
-      my $without_port = $host;
-      $without_port =~ s/:\d*$//;  # strip port from ip address
-      my $packed = inet_aton($without_port);
-      if ($packed) {
-          $hostname = gethostbyaddr($packed, AF_INET);
-      }
-   }
-   if ($hostname) {
-       print "$prefix$host ($hostname)\n";
-   }
-   else {
-       print "$prefix$host\n";
-   }
-}
-
-sub _d {
-   my ($package, undef, $line) = caller 0;
-   @_ = map { (my $temp = $_) =~ s/\n/\n# /g; $temp; }
-        map { defined $_ ? $_ : 'undef' }
-        @_;
-   print STDERR "# $package:$line $PID ", join(' ', @_), "\n";
-}
-
-# ############################################################################
-# Run the program.
-# ############################################################################
-if ( !caller ) { exit main(@ARGV); }
-
-1; # Because this is a module as well as a script.
-
-# ############################################################################
-# Documentation.
-# ############################################################################
-
-=pod
-
-=head1 NAME
-
-pt-slave-find - Find and print replication hierarchy tree of MySQL slaves.
-
-=head1 SYNOPSIS
-
-Usage: pt-slave-find [OPTIONS] [DSN]
-
-pt-slave-find finds and prints a hierarchy tree of MySQL slaves.
-
-Examples:
-
-   pt-slave-find --host master-host
-
-=head1 RISKS
-
-Percona Toolkit is mature, proven in the real world, and well tested,
-but all database tools can pose a risk to the system and the database
-server.  Before using this tool, please:
-
-=over
-
-=item * Read the tool's documentation
-
-=item * Review the tool's known L<"BUGS">
-
-=item * Test the tool on a non-production server
-
-=item * Backup your production server and verify the backups
-
-=back
-
-=head1 DESCRIPTION
-
-pt-slave-find connects to a MySQL replication master and finds its slaves.
-Currently the only thing it can do is print a tree-like view of the replication
-hierarchy.
-
-The master host can be specified using one of two methods.  The first method is
-to use the standard connection-related command line options:
-L<"--defaults-file">, L<"--password">, L<"--host">, L<"--port">, L<"--socket">
-or L<"--user">.
-
-The second method to specify the master host is a DSN.  A DSN is a special
-syntax that can be either just a hostname (like C<server.domain.com> or
-C<1.2.3.4>), or a C<key=value,key=value> string. Keys are a single letter:
-
-   KEY MEANING
-   === =======
-   h   Connect to host
-   P   Port number to use for connection
-   S   Socket file to use for connection
-   u   User for login if not current user
-   p   Password to use when connecting
-   F   Only read default options from the given file
-
-C<pt-slave-find> reads all normal MySQL option files, such as ~/.my.cnf, so
-you may not need to specify username, password and other common options at all.
-
-=head1 EXIT STATUS
-
-An exit status of 0 (sometimes also called a return value or return code)
-indicates success.  Any other value represents the exit status of
-the Perl process itself.
-
-=head1 OPTIONS
-
-This tool accepts additional command-line arguments.  Refer to the
-L<"SYNOPSIS"> and usage information for details.
-
-=over
-
-=item --ask-pass
-
-Prompt for a password when connecting to MySQL.
-
-=item --charset
-
-short form: -A; type: string
-
-Default character set.  If the value is utf8, sets Perl's binmode on
-STDOUT to utf8, passes the mysql_enable_utf8 option to DBD::mysql, and
-runs SET NAMES UTF8 after connecting to MySQL.  Any other value sets
-binmode on STDOUT without the utf8 layer, and runs SET NAMES after
-connecting to MySQL.
-
-=item --config
-
-type: Array
-
-Read this comma-separated list of config files; if specified, this must be the
-first option on the command line.
-
-=item --database
-
-type: string; short form: -D
-
-Database to use.
-
-=item --defaults-file
-
-short form: -F; type: string
-
-Only read mysql options from the given file.  You must give an absolute
-pathname.
-
-=item --help
-
-Show help and exit.
-
-=item --host
-
-short form: -h; type: string
-
-Connect to host.
-
-=item --password
-
-short form: -p; type: string
-
-Password to use when connecting.
-If password contains commas they must be escaped with a backslash: "exam\,ple"
-
-=item --pid
-
-type: string
-
-Create the given PID file.  The tool won't start if the PID file already
-exists and the PID it contains is different than the current PID.  However,
-if the PID file exists and the PID it contains is no longer running, the
-tool will overwrite the PID file with the current PID.  The PID file is
-removed automatically when the tool exits.
-
-=item --port
-
-short form: -P; type: int
-
-Port number to use for connection.
-
-=item --recurse
-
-type: int
-
-Number of levels to recurse in the hierarchy.  Default is infinite.
-
-See L<"--recursion-method">.
-
-=item --recursion-method
-
-type: array; default: processlist,hosts
-
-Preferred recursion method used to find slaves.
-
-Possible methods are:
-
-  METHOD       USES
-  ===========  ==================
-  processlist  SHOW PROCESSLIST
-  hosts        SHOW SLAVE HOSTS
-  none         Do not find slaves
-
-The processlist method is preferred because SHOW SLAVE HOSTS is not reliable.
-However, the hosts method is required if the server uses a non-standard
-port (not 3306).  Usually pt-slave-find does the right thing and finds
-the slaves, but you may give a preferred method and it will be used first.
-If it doesn't find any slaves, the other methods will be tried.
-
-=item --report-format
-
-type: string; default: summary
-
-Set what information about the slaves is printed.  The report format can be
-one of the following:
-
-=over
-
-=item * hostname
-
-Print just the hostname name of the slaves.  It looks like:
-
-  127.0.0.1:12345
-  +- 127.0.0.1:12346
-     +- 127.0.0.1:12347
-
-=item * summary
-
-Print a summary of each slave's settings.  This report shows more information
-about each slave, like:
-
-  127.0.0.1:12345
-  Version         5.1.34-log
-  Server ID       12345
-  Uptime          04:56 (started 2010-06-17T11:21:22)
-  Replication     Is not a slave, has 1 slaves connected
-  Filters
-  Binary logging  STATEMENT
-  Slave status
-  Slave mode      STRICT
-  Auto-increment  increment 1, offset 1
-  +- 127.0.0.1:12346
-     Version         5.1.34-log
-     Server ID       12346
-     Uptime          04:54 (started 2010-06-17T11:21:24)
-     Replication     Is a slave, has 1 slaves connected
-     Filters
-     Binary logging  STATEMENT
-     Slave status    0 seconds behind, running, no errors
-     Slave mode      STRICT
-     Auto-increment  increment 1, offset 1
-
-=back
-
-=item --resolve-address
-
-Resolve ip-address to hostname. Report will print both IP and hostname.
-
-Example:
-
-   10.10.7.14 (dbase1.sample.net)
-
-Might delay runtime a few seconds.
-
-=item --slave-user
-
-type: string
-
-Sets the user to be used to connect to the slaves.
-This parameter allows you to have a different user with less privileges on the
-slaves but that user must exist on all slaves.
-
-=item --slave-password
-
-type: string
-
-Sets the password to be used to connect to the slaves.
-It can be used with --slave-user and the password for the user must be the same
-on all slaves.
-
-=item --set-vars
-
-type: Array
-
-Set the MySQL variables in this comma-separated list of C<variable=value> pairs.
-
-By default, the tool sets:
-
-=for comment ignore-pt-internal-value
-MAGIC_set_vars
-
-   wait_timeout=10000
-
-Variables specified on the command line override these defaults.  For
-example, specifying C<--set-vars wait_timeout=500> overrides the defaultvalue of C<10000>.
-
-The tool prints a warning and continues if a variable cannot be set.
-
-=item --socket
-
-short form: -S; type: string
-
-Socket file to use for connection.
-
-=item --user
-
-short form: -u; type: string
-
-User for login if not current user.
-
-=item --version
-
-Show version and exit.
-
-=back
-
-=head1 DSN OPTIONS
-
-These DSN options are used to create a DSN.  Each option is given like
-C<option=value>.  The options are case-sensitive, so P and p are not the
-same option.  There cannot be whitespace before or after the C<=> and
-if the value contains whitespace it must be quoted.  DSN options are
-comma-separated.  See the L<percona-toolkit> manpage for full details.
-
-=over
-
-=item * A
-
-dsn: charset; copy: yes
-
-Default character set.
-
-=item * D
-
-dsn: database; copy: yes
-
-Default database.
-
-=item * F
-
-dsn: mysql_read_default_file; copy: yes
-
-Only read default options from the given file
-
-=item * h
-
-dsn: host; copy: yes
-
-Connect to host.
-
-=item * p
-
-dsn: password; copy: yes
-
-Password to use when connecting.
-If password contains commas they must be escaped with a backslash: "exam\,ple"
-
-=item * P
-
-dsn: port; copy: yes
-
-Port number to use for connection.
-
-=item * S
-
-dsn: mysql_socket; copy: yes
-
-Socket file to use for connection.
-
-=item * u
-
-dsn: user; copy: yes
-
-User for login if not current user.
-
-=item * s
-
-dsn: mysql_ssl; copy: yes
-
-Create SSL connection
-
-=back
-
-=head1 ENVIRONMENT
-
-The environment variable C<PTDEBUG> enables verbose debugging output to STDERR.
-To enable debugging and capture all output to a file, run the tool like:
-
-   PTDEBUG=1 pt-slave-find ... > FILE 2>&1
-
-Be careful: debugging output is voluminous and can generate several megabytes
-of output.
-
-=head1 ATTENTION
-
-Using <PTDEBUG> might expose passwords. When debug is enabled, all command line
-parameters are shown in the output.
-
-=head1 SYSTEM REQUIREMENTS
-
-You need Perl, DBI, DBD::mysql, and some core packages that ought to be
-installed in any reasonably new version of Perl.
-
-=head1 BUGS
-
-For a list of known bugs, see L<https://jira.percona.com/projects/PT/issues>.
-
-Please report bugs at L<https://jira.percona.com/projects/PT>.
-Include the following information in your bug report:
-
-=over
-
-=item * Complete command-line used to run the tool
-
-=item * Tool L<"--version">
-
-=item * MySQL version of all servers involved
-
-=item * Output from the tool including STDERR
-
-=item * Input files (log/dump/config files, etc.)
-
-=back
-
-If possible, include debugging output by running the tool with C<PTDEBUG>;
-see L<"ENVIRONMENT">.
-
-=head1 DOWNLOADING
-
-Visit L<http://www.percona.com/software/percona-toolkit/> to download the
-latest release of Percona Toolkit.  Or, get the latest release from the
-command line:
-
-   wget percona.com/get/percona-toolkit.tar.gz
-
-   wget percona.com/get/percona-toolkit.rpm
-
-   wget percona.com/get/percona-toolkit.deb
-
-You can also get individual tools from the latest release:
-
-   wget percona.com/get/TOOL
-
-Replace C<TOOL> with the name of any tool.
-
-=head1 AUTHORS
-
-Baron Schwartz and Daniel Nichter
-
-=head1 ABOUT PERCONA TOOLKIT
-
-This tool is part of Percona Toolkit, a collection of advanced command-line
-tools for MySQL developed by Percona.  Percona Toolkit was forked from two
-projects in June, 2011: Maatkit and Aspersa.  Those projects were created by
-Baron Schwartz and primarily developed by him and Daniel Nichter.  Visit
-L<http://www.percona.com/software/> to learn about other free, open-source
-software from Percona.
-
-=head1 COPYRIGHT, LICENSE, AND WARRANTY
-
-This program is copyright 2011-2024 Percona LLC and/or its affiliates,
-2007-2011 Baron Schwartz.
-
-THIS PROGRAM IS PROVIDED "AS IS" AND WITHOUT ANY EXPRESS OR IMPLIED
-WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
-
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation, version 2; OR the Perl Artistic License.  On UNIX and similar
-systems, you can issue `man perlgpl' or `man perlartistic' to read these
-licenses.
-
-You should have received a copy of the GNU General Public License along with
-this program; if not, write to the Free Software Foundation, Inc., 59 Temple
-Place, Suite 330, Boston, MA  02111-1307  USA.
-
-=head1 VERSION
-
-pt-slave-find 3.6.0
-
-=cut
diff --git a/bin/pt-slave-find b/bin/pt-slave-find
new file mode 120000
index 000000000..e4d0cf0eb
--- /dev/null
+++ b/bin/pt-slave-find
@@ -0,0 +1 @@
+pt-replica-find
\ No newline at end of file
diff --git a/t/pt-replica-find/deprecation.t b/t/pt-replica-find/deprecation.t
new file mode 100644
index 000000000..4308f170e
--- /dev/null
+++ b/t/pt-replica-find/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-find";
+
+my $output;
+my $cnf = '/tmp/12346/my.sandbox.cnf';
+my $cmd = "$trunk/bin/pt-replica-find -F $cnf h=127.1";
+my $legacy_cmd = "$trunk/bin/pt-slave-find -F $cnf h=127.1";
+
+$output = `$cmd --help 2>&1`;
+unlike(
+   $output, 
+   qr/pt-slave-find is a link to pt-replica-find/, 
+   'Deprecation warning not printed for pt-replica-find'
+);
+
+$output = `$legacy_cmd --help 2>&1`;
+like(
+   $output, 
+   qr/pt-slave-find is a link to pt-replica-find/, 
+   'Deprecation warning printed for pt-slave-find'
+);
+
+done_testing();
+exit;
diff --git a/t/pt-replica-find/pt-replica-find.t b/t/pt-replica-find/pt-replica-find.t
new file mode 100644
index 000000000..77e9119e6
--- /dev/null
+++ b/t/pt-replica-find/pt-replica-find.t
@@ -0,0 +1,170 @@
+#!/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 Data::Dumper;
+
+use PerconaTest;
+use Sandbox;
+
+require "$trunk/bin/pt-replica-find";
+
+my $dp = new DSNParser(opts=>$dsn_opts);
+my $sb = new Sandbox(basedir => '/tmp', DSNParser => $dp);
+my $replica1_dbh = $sb->get_dbh_for('replica1');
+my $replica2_dbh = $sb->get_dbh_for('replica2');
+
+# This test is sensitive to ghost/old replicas created/destroyed by other
+# tests.  So we stop the replicas, restart the source, and start everything
+# again.  Hopefully this will return the env to its original state.
+$replica2_dbh->do("STOP ${replica_name}");
+$replica1_dbh->do("STOP ${replica_name}");
+diag(`/tmp/12345/stop >/dev/null`);
+diag(`/tmp/12345/start >/dev/null`);
+$replica1_dbh->do("START ${replica_name}");
+$replica2_dbh->do("START ${replica_name}");
+
+my $source_dbh = $sb->get_dbh_for('source');
+
+if ( !$source_dbh ) {
+   plan skip_all => 'Cannot connect to sandbox source';
+}
+elsif ( !$replica1_dbh ) {
+   plan skip_all => 'Cannot connect to sandbox replica';
+}
+elsif ( !$replica2_dbh ) {
+   plan skip_all => 'Cannot connect to second sandbox replica';
+}
+else {
+   plan tests => 10;
+}
+
+my @args = ('h=127.0.0.1,P=12345,u=msandbox,p=msandbox,s=1');
+
+my $output = `$trunk/bin/pt-replica-find --help`;
+like($output, qr/Prompt for a password/, 'It compiles');
+
+# Double check that we're setup correctly.
+my $row = $replica2_dbh->selectall_arrayref("SHOW ${replica_name} STATUS", {Slice => {}});
+is(
+   $row->[0]->{"${source_name}_port"},
+   '12346',
+   'replica2 is replica of replica1'
+) or diag(Dumper($row));
+
+$output = `$trunk/bin/pt-replica-find -h 127.0.0.1 -P 12345 -u msandbox -p msandbox s=1 --report-format hostname`;
+my $expected = <<EOF;
+127.0.0.1:12345
++- 127.0.0.1:12346
+   +- 127.0.0.1:12347
+EOF
+is($output, $expected, 'Source with replica and replica of replica');
+
+###############################################################################
+# Test --resolve-hostname option (we don't know the hostname of the test
+# machine so we settle for any non null string)
+###############################################################################
+$output = `$trunk/bin/pt-replica-find -h 127.0.0.1 -P 12345 -u msandbox -p msandbox --report-format hostname --resolve-address`;
+like (   
+   $output,
+   qr/127\.0\.0\.1:12345\s+\(\w+\)/s,
+   "--resolve-address option"
+) or diag($output);
+
+# #############################################################################
+# Until MasterSlave::find_replica_hosts() is improved to overcome the problems
+# with SHOW REPLICA HOSTS, this test won't work.
+# #############################################################################
+# Make replica2 replica of source.
+#diag(`../../mk-slave-move/mk-slave-move --sibling-of-master h=127.1,P=12347`);
+#$output = `perl ../mk-slave-find -h 127.0.0.1 -P 12345 -u msandbox -p msandbox`;
+#$expected = <<EOF;
+#127.0.0.1:12345
+#+- 127.0.0.1:12346
+#+- 127.0.0.1:12347
+#EOF
+#is($output, $expected, 'Source with two replicas');
+
+# #########################################################################
+# Issue 391: Add --pid option to all scripts
+# #########################################################################
+`touch /tmp/mk-script.pid`;
+$output = `$trunk/bin/pt-replica-find -h 127.0.0.1 -P 12345 -u msandbox -p msandbox --pid /tmp/mk-script.pid 2>&1`;
+like(
+   $output,
+   qr{PID file /tmp/mk-script.pid exists},
+   'Dies if PID file already exists (issue 391)'
+);
+`rm -rf /tmp/mk-script.pid`;
+
+
+# #############################################################################
+# Summary report format.
+# #############################################################################
+my $outfile = "/tmp/mk-replica-find-output.txt";
+#diag(`rm -rf $outfile >/dev/null`);
+diag(`rm -rf $outfile`);
+
+$output = output(
+   sub { pt_slave_find::main(@args) },
+   file => $outfile,
+);
+
+open my $fh, "<", $outfile or die $!;
+
+my $result = do { local $/; <$fh> }; #"
+
+$result =~ s/Version.*/Version/g;
+$result =~ s/Uptime.*/Uptime/g;
+$result =~ s/[0-9]* seconds/0 seconds/g;
+$result =~ s/Binary logging.*/Binary logging/g;
+$result =~ s/Replication     Is a slave, has 1 slaves connected, is.*/Replication     Is a slave, has 1 slaves connected, is/g;
+$result =~ s/Replication     Is a replica, has 1 replicas connected, is.*/Replication     Is a replica, has 1 replicas connected, is/g;
+
+my $innodb_re = qr/InnoDB version\s+(.*)/;
+my (@innodb_versions) = $result =~ /$innodb_re/g;
+$result =~ s/$innodb_re/InnoDB version  BUILTIN/g;
+
+my $source_version = VersionParser->new($source_dbh);
+my $replica_version  = VersionParser->new($replica1_dbh);
+my $replica2_version = VersionParser->new($replica2_dbh);
+
+is(
+   $innodb_versions[0],
+   $source_version->innodb_version(),
+   "pt-replica-find gets the right InnoDB version for the source"
+);
+
+is(
+   $innodb_versions[1],
+   $replica_version->innodb_version(),
+   "...and for the first replica"
+) or diag($output);
+
+is(
+   $innodb_versions[2],
+   $replica2_version->innodb_version(),
+   "...and for the second replica"
+);
+
+ok(
+   no_diff($result, ($sandbox_version ge '5.1'
+      ? "t/pt-replica-find/samples/summary001.txt"
+      : "t/pt-replica-find/samples/summary001-5.0.txt"), cmd_output => 1, keep_output => 1, update_samples => 1),
+   "Summary report format",
+);
+
+# #############################################################################
+# Done.
+# #############################################################################
+diag(`rm -rf $outfile >/dev/null`);
+ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox");
+exit;
diff --git a/t/pt-slave-find/pt-slave-find.t b/t/pt-replica-find/pt-slave-find.t
similarity index 97%
rename from t/pt-slave-find/pt-slave-find.t
rename to t/pt-replica-find/pt-slave-find.t
index 78b2f4c8d..797fbf41a 100644
--- a/t/pt-slave-find/pt-slave-find.t
+++ b/t/pt-replica-find/pt-slave-find.t
@@ -157,8 +157,8 @@ is(
 
 ok(
    no_diff($result, ($sandbox_version ge '5.1'
-      ? "t/pt-slave-find/samples/summary001.txt"
-      : "t/pt-slave-find/samples/summary001-5.0.txt"), cmd_output => 1, keep_output => 1, update_samples => 1),
+      ? "t/pt-replica-find/samples/summary001.txt"
+      : "t/pt-replica-find/samples/summary001-5.0.txt"), cmd_output => 1, keep_output => 1, update_samples => 1),
    "Summary report format",
 );
 
diff --git a/t/pt-slave-find/samples/summary001-5.0.txt b/t/pt-replica-find/samples/summary001-5.0.txt
similarity index 100%
rename from t/pt-slave-find/samples/summary001-5.0.txt
rename to t/pt-replica-find/samples/summary001-5.0.txt
diff --git a/t/pt-slave-find/samples/summary001.txt b/t/pt-replica-find/samples/summary001.txt
similarity index 100%
rename from t/pt-slave-find/samples/summary001.txt
rename to t/pt-replica-find/samples/summary001.txt

From 94bcfd2b69e7ae8df05542f7ea4d38586fb2b3ed Mon Sep 17 00:00:00 2001
From: Sveta Smirnova <sveta.smirnova@percona.com>
Date: Fri, 30 Aug 2024 18:45:28 +0300
Subject: [PATCH 18/31] PT-2340 - Support MySQL 8.4

- Updated documentation
---
 bin/pt-archiver                               |  66 +--
 bin/pt-config-diff                            |   8 +-
 bin/pt-deadlock-logger                        |  10 +-
 bin/pt-duplicate-key-checker                  |  21 +-
 bin/pt-find                                   |  41 +-
 bin/pt-fingerprint                            |   2 +-
 bin/pt-fk-error-logger                        |   6 +
 bin/pt-heartbeat                              | 166 +++---
 bin/pt-index-usage                            |  15 +-
 bin/pt-kill                                   |  37 +-
 bin/pt-online-schema-change                   |  36 +-
 bin/pt-pmp                                    |   5 +
 bin/pt-query-digest                           |  28 +-
 bin/pt-replica-find                           |  46 +-
 bin/pt-replica-restart                        | 138 ++---
 bin/pt-show-grants                            |   6 +
 bin/pt-slave-delay                            |   2 +-
 bin/pt-table-checksum                         | 185 +++----
 bin/pt-table-sync                             |  20 +-
 bin/pt-table-usage                            |   6 +
 bin/pt-upgrade                                |  14 +-
 bin/pt-variable-advisor                       |  45 +-
 bin/pt-visual-explain                         |  65 ++-
 .../_static/_templates/theme/relbar2.html     |   2 +-
 docs/percona-toolkit.pod                      |  12 +-
 docs/pt-galera-log-explainer.rst              | 247 +--------
 docs/pt-k8s-debug-collector.rst               | 192 +------
 docs/pt-mongodb-index-check.rst               |  73 +--
 docs/pt-mongodb-summary.rst                   | 169 +------
 docs/pt-pg-summary.rst                        | 476 +-----------------
 docs/release_notes.rst                        |   2 +-
 docs/version-check.rst                        |   2 +-
 lib/DuplicateKeyFinder.pm                     |   5 +-
 lib/TableParser.pm                            |   2 +-
 src/go/pt-galera-log-explainer/README.rst     |   5 +
 src/go/pt-k8s-debug-collector/README.rst      |   5 +
 src/go/pt-mongodb-index-check/README.rst      |   4 +
 src/go/pt-mongodb-summary/README.rst          |   4 +
 src/go/pt-pg-summary/README.rst               |  13 +-
 39 files changed, 565 insertions(+), 1616 deletions(-)
 mode change 100644 => 120000 docs/pt-galera-log-explainer.rst
 mode change 100644 => 120000 docs/pt-k8s-debug-collector.rst
 mode change 100644 => 120000 docs/pt-mongodb-index-check.rst
 mode change 100644 => 120000 docs/pt-mongodb-summary.rst
 mode change 100644 => 120000 docs/pt-pg-summary.rst

diff --git a/bin/pt-archiver b/bin/pt-archiver
index 78fba95a1..65b814914 100755
--- a/bin/pt-archiver
+++ b/bin/pt-archiver
@@ -7519,7 +7519,7 @@ sub do_with_retries {
 
 # Formats a row the same way SELECT INTO OUTFILE does by default.  This is
 # described in the LOAD DATA INFILE section of the MySQL manual,
-# http://dev.mysql.com/doc/refman/5.0/en/load-data.html
+# https://dev.mysql.com/doc/refman/8.4/en/load-data-local-security.html
 sub escape {
    my ($row, $fields_separated_by, $optionally_enclosed_by) = @_;
    $fields_separated_by ||= "\t";
@@ -7627,7 +7627,7 @@ server.  Before using this tool, please:
 
 =head1 DESCRIPTION
 
-pt-archiver is the tool I use to archive tables as described in
+pt-archiver is the tool to archive tables as described in
 L<https://web.archive.org/web/20071014031743/http://www.xaprb.com/blog/2006/05/02/how-to-write-efficient-archiving-and-purging-jobs-in-sql>.  The goal is a low-impact, forward-only
 job to nibble old data out of the table without impacting OLTP queries much.
 You can insert the data into another table, which need not be on the same
@@ -7687,7 +7687,7 @@ included.  The tool does not check for this!
 =item Non-cluster options
 
 Certain options may or may not work.  For example, if a cluster node
-is not also a slave, then L<"--check-replica-lag"> does not work.  And since PXC
+is not also a replica, then L<"--check-replica-lag"> does not work.  And since PXC
 tables are usually InnoDB, but InnoDB doesn't support C<INSERT DELAYED>, then
 L<"--delayed-insert"> does not work.  Other options may also not work, but
 the tool does not check them, therefore you should test archiving on a test
@@ -7846,12 +7846,12 @@ for the C<L> DSN option.
 type: string
 
 Channel name used when connected to a server using replication channels.
-Suppose you have two masters, master_a at port 12345, master_b at port 1236 and
-a slave connected to both masters using channels chan_master_a and chan_master_b.
-If you want to run pt-archiver to synchronize the slave against master_a, pt-archiver
-won't be able to determine what's the correct master since SHOW SLAVE STATUS
-will return 2 rows. In this case, you can use --channel=chan_master_a to specify
-the channel name to use in the SHOW SLAVE STATUS command.
+Suppose you have two sources, source_a at port 12345, source_b at port 1236 and
+a replica connected to both sources using channels chan_source_a and chan_source_b.
+If you want to run pt-archiver to synchronize the replica against source_a, pt-archiver
+won't be able to determine what's the correct source since SHOW REPLICA STATUS
+will return 2 rows. In this case, you can use --channel=chan_source_a to specify
+the channel name to use in the SHOW REPLICA STATUS command.
 
 =item --charset
 
@@ -7896,15 +7896,15 @@ To disable this check, specify --no-check-columns.
 type: time; default: 1s
 
 If L<"--check-replica-lag"> is given, this defines how long the tool pauses each
- time it discovers that a slave is lagging.
+ time it discovers that a replica is lagging.
  This check is performed every 100 rows.
 
 =item --check-replica-lag
 
 type: string; repeatable: yes
 
-Pause archiving until the specified DSN's slave lag is less than L<"--max-lag">.
-This option can be specified multiple times for checking more than one slave.
+Pause archiving until the specified DSN's replica lag is less than L<"--max-lag">.
+This option can be specified multiple times for checking more than one replica.
 
 =item --columns
 
@@ -8107,13 +8107,13 @@ This option is available for PXC versions 5.6 or higher.
 
 type: time; default: 1s
 
-Pause archiving if the slave given by L<"--check-replica-lag"> lags.
+Pause archiving if the replica given by L<"--check-replica-lag"> lags.
 
-This option causes pt-archiver to look at the slave every time it's about
-to fetch another row.  If the slave's lag is greater than the option's value,
-or if the slave isn't running (so its lag is NULL), pt-archiver sleeps
+This option causes pt-archiver to look at the replica every time it's about
+to fetch another row.  If the replica's lag is greater than the option's value,
+or if the replica isn't running (so its lag is NULL), pt-archiver sleeps
 for L<"--check-interval"> seconds and then looks at the lag again.  It repeats
-until the slave is caught up, then proceeds to fetch and archive the row.
+until the replica is caught up, then proceeds to fetch and archive the row.
 
 This option may eliminate the need for L<"--sleep"> or L<"--sleep-coef">.
 
@@ -8292,8 +8292,8 @@ server.  However, pt-archiver implements simple distributed transactions in
 code, so commits and rollbacks should happen as desired across the two
 connections.
 
-At this time I have not written any code to handle errors with transactional
-storage engines other than InnoDB.  Request that feature if you need it.
+At this time the tool does not handle errors with transactional storage engines
+other than InnoDB.  Request that feature if you need it.
 
 =item --run-time
 
@@ -8329,21 +8329,21 @@ stop archiving and exit.  The default is /tmp/pt-archiver-sentinel.  You
 might find this handy to stop cron jobs gracefully if necessary.  See also
 L<"--stop">.
 
-=item --slave-user
+=item --replica-user
 
 type: string
 
-Sets the user to be used to connect to the slaves.
+Sets the user to be used to connect to the replicas.
 This parameter allows you to have a different user with less privileges on the
-slaves but that user must exist on all slaves.
+replicas but that user must exist on all replicas.
 
-=item --slave-password
+=item --replica-password
 
 type: string
 
-Sets the password to be used to connect to the slaves.
-It can be used with --slave-user and the password for the user must be the same
-on all slaves.
+Sets the password to be used to connect to the replicas.
+It can be used with --replica-user and the password for the user must be the same
+on all replicas.
 
 =item --set-vars
 
@@ -8441,12 +8441,12 @@ discussion of how they interact with ascending indexes.
 The 'a' and 'b' options allow you to control how statements flow through the
 binary log.  If you specify the 'b' option, binary logging will be disabled on
 the specified connection.  If you specify the 'a' option, the connection will
-C<USE> the specified database, which you can use to prevent slaves from
+C<USE> the specified database, which you can use to prevent replicas from
 executing the binary log events with C<--replicate-ignore-db> options.  These
 two options can be used as different methods to achieve the same goal: archive
-data off the master, but leave it on the slave.  For example, you can run a
-purge job on the master and prevent it from happening on the slave using your
-method of choice.
+data off the replication source, but leave it on the replica.  For example, you
+can run a purge job on the replication source and prevent it from happening on the
+replica using your method of choice.
 
 B<WARNING>: Using a default options file (F) DSN option that defines a
 socket for L<"--source"> causes pt-archiver to connect to L<"--dest"> using
@@ -8521,9 +8521,9 @@ server, which for example is doing heavy OLTP work, you need to choose a good
 balance between transaction size and commit overhead.  Larger transactions
 create the possibility of more lock contention and deadlocks, but smaller
 transactions cause more frequent commit overhead, which can be significant.  To
-give an idea, on a small test set I worked with while writing pt-archiver, a
+give an idea, on a small test set worked with while writing pt-archiver, a
 value of 500 caused archiving to take about 2 seconds per 1000 rows on an
-otherwise quiet MySQL instance on my desktop machine, archiving to disk and to
+otherwise quiet MySQL instance on a desktop machine, archiving to disk and to
 another table.  Disabling transactions with a value of zero, which turns on
 autocommit, dropped performance to 38 seconds per thousand rows.
 
@@ -8669,7 +8669,7 @@ lead to weird situations, like the server allowing LOCAL INFILE, but
 the client throwing exceptions if it's used.
 
 However, as long as the server allows LOAD DATA, clients can easily
-re-enable it; See L<https://dev.mysql.com/doc/refman/5.0/en/load-data-local.html>
+re-enable it; See L<https://dev.mysql.com/doc/refman/en/load-data-local-security.html>
 and L<http://search.cpan.org/~capttofu/DBD-mysql/lib/DBD/mysql.pm>.
 This option does exactly that.
 
diff --git a/bin/pt-config-diff b/bin/pt-config-diff
index 0fd3821a3..434d5025d 100755
--- a/bin/pt-config-diff
+++ b/bin/pt-config-diff
@@ -5692,7 +5692,7 @@ There is no output when there are no differences.  When there are differences,
 pt-config-diff prints a report to STDOUT that looks similar to the following:
 
   2 config differences
-  Variable                  my.master.cnf   my.slave.cnf
+  Variable                  my.soource.cnf   my.replica.cnf
   ========================= =============== ===============
   datadir                   /tmp/12345/data /tmp/12346/data
   port                      12345           12346
@@ -5935,6 +5935,12 @@ dsn: user; copy: yes
 
 User for login if not current user.
 
+=item * s
+
+dsn: mysql_ssl; copy: yes
+
+Create SSL connection
+
 =back
 
 =head1 ENVIRONMENT
diff --git a/bin/pt-deadlock-logger b/bin/pt-deadlock-logger
index f144243be..f82577bf8 100755
--- a/bin/pt-deadlock-logger
+++ b/bin/pt-deadlock-logger
@@ -5383,8 +5383,8 @@ PROCESSLIST.
 
 =item txn_id
 
-The InnoDB transaction ID, which InnoDB expresses as two unsigned integers.  I
-have multiplied them out to be one number.
+The InnoDB transaction ID, which InnoDB expresses as two unsigned integers. The tool
+multiplies them out to be one number.
 
 =item txn_time
 
@@ -5711,6 +5711,12 @@ dsn: user; copy: yes
 
 User for login if not current user.
 
+=item * s
+
+dsn: mysql_ssl; copy: yes
+
+Create SSL connection
+
 =back
 
 =head1 ENVIRONMENT
diff --git a/bin/pt-duplicate-key-checker b/bin/pt-duplicate-key-checker
index 25df5f839..a1cdef407 100755
--- a/bin/pt-duplicate-key-checker
+++ b/bin/pt-duplicate-key-checker
@@ -584,7 +584,7 @@ sub get_keys {
          ddl          => $key_ddl,
       };
 
-      if ( ($engine || '') =~ m/InnoDB/i && !$clustered_key ) {
+      if ( ($engine || '') =~ m/(InnoDB)|(TokuDB)|(RocksDB)/i && !$clustered_key ) {
          my $this_key = $keys->{$name};
          if ( $this_key->{name} eq 'PRIMARY' ) {
             $clustered_key = 'PRIMARY';
@@ -2501,7 +2501,10 @@ sub get_duplicate_keys {
    if ( $clustered_key
         && $args{clustered}
         && $args{tbl_info}->{engine}
-        && $args{tbl_info}->{engine} =~ m/InnoDB/i )
+        && ( $args{tbl_info}->{engine} =~ m/InnoDB/i
+           || $args{tbl_info}->{engine} =~ m/TokuDB/i
+           || $args{tbl_info}->{engine} =~ m/RocksDB/i )
+        )
    {
       PTDEBUG && _d('Removing UNIQUE dupes of clustered key');
       push @dupes,
@@ -5460,7 +5463,7 @@ PK columns appended to secondary key is duplicate.
 
 Detects when a suffix of a secondary key is a leftmost prefix of the primary
 key, and treats it as a duplicate key.  Only detects this condition on storage
-engines whose primary keys are clustered (currently InnoDB and solidDB).
+engines whose primary keys are clustered (currently InnoDB, TokuDB and MyRocks).
 
 Clustered storage engines append the primary key columns to the leaf nodes of
 all secondary keys anyway, so you might consider it redundant to have them
@@ -5727,6 +5730,18 @@ dsn: user; copy: yes
 
 User for login if not current user.
 
+=item * s
+
+dsn: mysql_ssl; copy: yes
+
+Create SSL connection
+
+=item * s
+
+dsn: mysql_ssl; copy: yes
+
+Create SSL connection
+
 =back
 
 =head1 ENVIRONMENT
diff --git a/bin/pt-find b/bin/pt-find
index 6f66b5aa2..c3bdb7ec0 100755
--- a/bin/pt-find
+++ b/bin/pt-find
@@ -4481,9 +4481,9 @@ print their names:
 
   pt-find --ctime +1 --engine MyISAM
 
-Find InnoDB tables and convert them to MyISAM:
+Find MyISAM tables and convert them to InnoDB:
 
-  pt-find --engine InnoDB --exec "ALTER TABLE %D.%N ENGINE=MyISAM"
+  pt-find --engine MyISAM --exec "ALTER TABLE %D.%N ENGINE=InnoDB"
 
 Find tables created by a process that no longer exists, following the
 name_sid_pid naming convention, and remove them.
@@ -4728,8 +4728,8 @@ time.  It can take some time for MySQL to process all the SHOW queries, and
 pt-find can't do anything about that.  These measurements are as of the
 time they're taken.
 
-If you need some test that's not in this list, file a bug report and I'll
-enhance pt-find for you.  It's really easy.
+If you need some test that's not in this list, file a feature request at
+L<https://jira.percona.com/projects/PT>.
 
 =over
 
@@ -4807,14 +4807,11 @@ with.  And perhaps most importantly, if the connection no longer exists, you
 can assume the connection died without cleaning up its tables, and this table
 is a candidate for removal.
 
-This is how I manage scratch tables, and that's why I included this test in
-pt-find.
-
-The argument I use to L<"--connection-id"> is "\D_(\d+)$".  That finds tables
+The argument to use for L<"--connection-id"> is "\D_(\d+)$".  That finds tables
 with a series of numbers at the end, preceded by an underscore and some
-non-number character (the latter criterion prevents me from examining tables
+non-number character (the latter criterion prevents from examining tables
 with a date at the end, which people tend to do: baron_scratch_2007_05_07 for
-example).  It's better to keep the scratch tables separate of course.
+example).  It's better to keep the scratch tables separate.
 
 If you do this, make sure the user pt-find runs as has the PROCESS privilege!
 Otherwise it will only see connections from the same user, and might think some
@@ -4940,15 +4937,15 @@ Table name contains the server ID.  If you create temporary tables with the
 naming convention explained in L<"--connection-id">, but also add the server ID of the
 server on which the tables are created, then you can use this pattern match to
 ensure tables are dropped only on the server they're created on.  This prevents
-a table from being accidentally dropped on a slave while it's in use (provided
+a table from being accidentally dropped on a replica while it's in use (provided
 that your server IDs are all unique, which they should be for replication to
 work).
 
-For example, on the master (server ID 22) you create a table called
-scratch_table_22_12345.  If you see this table on the slave (server ID 23), you
+For example, on the replication source (server ID 22) you create a table called
+scratch_table_22_12345.  If you see this table on the replica (server ID 23), you
 might think it can be dropped safely if there's no such connection 12345.  But
 if you also force the name to match the server ID with C<--server-id '\D_(\d+)_\d+$'>,
-the table won't be dropped on the slave.
+the table won't be dropped on the replica.
 
 =item --tablesize
 
@@ -4998,8 +4995,8 @@ CREATE VIEW matches this pattern.
 =head2 ACTIONS
 
 The L<"--exec-plus"> action happens after everything else, but otherwise actions
-happen in an indeterminate order.  If you need determinism, file a bug report
-and I'll add this feature.
+happen in an indeterminate order.  If you need determinism, file a feature request
+at L<https://jira.percona.com/projects/PT>.
 
 =over
 
@@ -5031,8 +5028,7 @@ You might use this, for example, to drop all the tables you found:
 
    DROP TABLE %s
 
-This is sort of like GNU find's "-exec command {} +" syntax.  Only it's not
-totally cryptic.  And it doesn't require me to write a command-line parser.
+This is sort of like GNU find's "-exec command {} +" syntax.
 
 =item --print
 
@@ -5049,8 +5045,7 @@ Print format on the standard output, interpreting '\' escapes and '%'
 directives.  Escapes are backslashed characters, like \n and \t.  Perl
 interprets these, so you can use any escapes Perl knows about.  Directives are
 replaced by %s, and as of this writing, you can't add any special formatting
-instructions, like field widths or alignment (though I'm musing over ways to do
-that).
+instructions, like field widths or alignment.
 
 Here is a list of the directives.  Note that most of them simply come from
 columns of SHOW TABLE STATUS.  If the column is NULL or doesn't exist, you get
@@ -5142,6 +5137,12 @@ dsn: user; copy: yes
 
 User for login if not current user.
 
+=item * s
+
+dsn: mysql_ssl; copy: yes
+
+Create SSL connection
+
 =back
 
 =head1 ENVIRONMENT
diff --git a/bin/pt-fingerprint b/bin/pt-fingerprint
index 670fc5d1e..f2e489dbc 100755
--- a/bin/pt-fingerprint
+++ b/bin/pt-fingerprint
@@ -2075,7 +2075,7 @@ Query fingerprinting accommodates a great many special cases, which have proven
 necessary in the real world.  For example, an IN list with 5 literals is really
 equivalent to one with 4 literals, so lists of literals are collapsed to a
 single one.  If you want to understand more about how and why all of these cases
-are handled, please review the test cases in the Subversion repository.  If you
+are handled, please review the test cases in the Github repository.  If you
 find something that is not fingerprinted properly, please submit a bug report
 with a reproducible test case.  Here is a list of transformations during
 fingerprinting, which might not be exhaustive:
diff --git a/bin/pt-fk-error-logger b/bin/pt-fk-error-logger
index 0d7485f4a..1b2467c74 100755
--- a/bin/pt-fk-error-logger
+++ b/bin/pt-fk-error-logger
@@ -4699,6 +4699,12 @@ dsn: user; copy: yes
 
 User for login if not current user.
 
+=item * s
+
+dsn: mysql_ssl; copy: yes
+
+Create SSL connection
+
 =back
 
 =head1 ENVIRONMENT
diff --git a/bin/pt-heartbeat b/bin/pt-heartbeat
index 5bc70081d..aa05c3f11 100755
--- a/bin/pt-heartbeat
+++ b/bin/pt-heartbeat
@@ -6933,22 +6933,22 @@ pt-heartbeat - Monitor MySQL replication delay.
 Usage: pt-heartbeat [OPTIONS] [DSN] --update|--monitor|--check|--stop
 
 pt-heartbeat measures replication lag on a MySQL or PostgreSQL server.  You can
-use it to update a master or monitor a replica.  If possible, MySQL connection
-options are read from your .my.cnf file.
+use it to update a replication source or monitor a replica.  If possible, MySQL
+connection options are read from your .my.cnf file.
 
-Start daemonized process to update test.heartbeat table on master:
+Start daemonized process to update test.heartbeat table on replicaiton source:
 
-  pt-heartbeat -D test --update -h master-server --daemonize
+  pt-heartbeat -D test --update -h source-server --daemonize
 
-Monitor replication lag on slave:
+Monitor replication lag on replica:
 
-  pt-heartbeat -D test --monitor -h slave-server
+  pt-heartbeat -D test --monitor -h replica-server
 
-  pt-heartbeat -D test --monitor -h slave-server --dbi-driver Pg
+  pt-heartbeat -D test --monitor -h replica-server --dbi-driver Pg
 
-Check slave lag once and exit (using optional DSN to specify slave host):
+Check replica lag once and exit (using optional DSN to specify replica host):
 
-  pt-heartbeat -D test --check h=slave-server
+  pt-heartbeat -D test --check h=replica-server
 
 =head1 RISKS
 
@@ -6973,23 +6973,23 @@ server.  Before using this tool, please:
 pt-heartbeat is a two-part MySQL and PostgreSQL replication delay monitoring
 system that measures delay by looking at actual replicated data.  This
 avoids reliance on the replication mechanism itself, which is unreliable.  (For
-example, C<SHOW SLAVE STATUS> on MySQL).
+example, C<SHOW REPLICA STATUS> on MySQL).
 
 The first part is an L<"--update"> instance of pt-heartbeat that connects to
-a master and updates a timestamp ("heartbeat record") every L<"--interval">
-seconds.  Since the heartbeat table may contain records from multiple
-masters (see L<"MULTI-SLAVE HIERARCHY">), the server's ID (@@server_id) is
-used to identify records.
+a replicaiton source and updates a timestamp ("heartbeat record") every
+L<"--interval"> seconds.  Since the heartbeat table may contain records from
+multiple replication sources (see L<"MULTI-REPLICA HIERARCHY">), the server's ID
+(@@server_id) is used to identify records.
 
 The second part is a L<"--monitor"> or L<"--check"> instance of pt-heartbeat
-that connects to a slave, examines the replicated heartbeat record from its
-immediate master or the specified L<"--source-server-id">, and computes the
-difference from the current system time.  If replication between the slave and
-the master is delayed or broken, the computed difference will be greater than
+that connects to a replica, examines the replicated heartbeat record from its
+immediate source or the specified L<"--source-server-id">, and computes the
+difference from the current system time.  If replication between the replica and
+the source is delayed or broken, the computed difference will be greater than
 zero and potentially increase if L<"--monitor"> is specified.
 
-You must either manually create the heartbeat table on the master or use
-L<"--create-table">.  See L<"--create-table"> for the proper heartbeat
+You must either manually create the heartbeat table on the replication source or
+use L<"--create-table">.  See L<"--create-table"> for the proper heartbeat
 table structure.  The C<MEMORY> storage engine is suggested, but not
 required of course, for MySQL.
 
@@ -6998,16 +6998,16 @@ row is inserted if it doesn't exist.  This feature can be disabled with the
 L<"--[no]insert-heartbeat-row"> option in case the database user does not
 have INSERT privileges.
 
-pt-heartbeat depends only on the heartbeat record being replicated to the slave,
+pt-heartbeat depends only on the heartbeat record being replicated to the replica,
 so it works regardless of the replication mechanism (built-in replication, a
 system such as Continuent Tungsten, etc).  It works at any depth in the
-replication hierarchy; for example, it will reliably report how far a slave lags
-its master's master's master.  And if replication is stopped, it will continue
-to work and report (accurately!) that the slave is falling further and further
-behind the master.
+replication hierarchy; for example, it will reliably report how far a replica lags
+its source's source's source.  And if replication is stopped, it will continue
+to work and report (accurately!) that the replica is falling further and further
+behind the source.
 
 pt-heartbeat has a maximum resolution of 0.01 second.  The clocks on the
-master and slave servers must be closely synchronized via NTP.  By default,
+source and replica servers must be closely synchronized via NTP.  By default,
 L<"--update"> checks happen on the edge of the second (e.g. 00:01) and
 L<"--monitor"> checks happen halfway between seconds (e.g. 00:01.5).
 As long as the servers' clocks are closely synchronized and replication
@@ -7020,42 +7020,42 @@ not retry if it can't get a connection when it first starts.
 The L<"--dbi-driver"> option lets you use pt-heartbeat to monitor PostgreSQL
 as well.  It is reported to work well with Slony-1 replication.
 
-=head1 MULTI-SLAVE HIERARCHY
+=head1 MULTI-REPLICA HIERARCHY
 
-If the replication hierarchy has multiple slaves which are masters of
-other slaves, like "master -> slave1 -> slave2", L<"--update"> instances
-can be ran on the slaves as well as the master.  The default heartbeat
+If the replication hierarchy has multiple replicas which are sources of
+other replicas, like "source -> replica1 -> replica2", L<"--update"> instances
+can be ran on the replicas as well as the source.  The default heartbeat
 table (see L<"--create-table">) is keyed on the C<server_id> column, so
 each server will update the row where C<server_id=@@server_id>.
 
 For L<"--monitor"> and L<"--check">, if L<"--source-server-id"> is not
-specified, the tool tries to discover and use the slave's immediate master.
-If this fails, or if you want monitor lag from another master, then you can
+specified, the tool tries to discover and use the replica's immediate source.
+If this fails, or if you want monitor lag from another source, then you can
 specify the L<"--source-server-id"> to use.
 
-For example, if the replication hierarchy is "master -> slave1 -> slave2"
+For example, if the replication hierarchy is "source -> replica1 -> replica2"
 with corresponding server IDs 1, 2 and 3, you can:
 
-  pt-heartbeat --daemonize -D test --update -h master
-  pt-heartbeat --daemonize -D test --update -h slave1
+  pt-heartbeat --daemonize -D test --update -h source
+  pt-heartbeat --daemonize -D test --update -h replica1
 
-Then check (or monitor) the replication delay from master to slave2:
+Then check (or monitor) the replication delay from source to replica2:
 
-  pt-heartbeat -D test --source-server-id 1 --check slave2
+  pt-heartbeat -D test --source-server-id 1 --check replica2
 
-Or check the replication delay from slave1 to slave2:
+Or check the replication delay from replica1 to replica2:
 
-  pt-heartbeat -D test --source-server-id 2 --check slave2
+  pt-heartbeat -D test --source-server-id 2 --check replica2
 
-Stopping the L<"--update"> instance one slave1 will not affect the instance
-on master.
+Stopping the L<"--update"> instance one replica1 will not affect the instance
+on the source.
 
-=head1 MASTER AND SLAVE STATUS
+=head1 BINARY LOG (MASTER) AND REPLICA STATUS
 
 The default heartbeat table (see L<"--create-table">) has columns for saving
-information from C<SHOW MASTER STATUS> and C<SHOW SLAVE STATUS>.  These
-columns are optional.  If any are present, their corresponding information
-will be saved.
+information from C<SHOW BINARY LOG STATUS> (C<SHOW MASTER STATUS> before MySQL 8.4)
+and C<SHOW REPLICA STATUS>.  These columns are optional.  If any are present,
+their corresponding information will be saved.
 
 =head1 Percona XtraDB Cluster
 
@@ -7098,9 +7098,9 @@ utf8 layer, and runs SET NAMES after connecting to MySQL.
 
 =item --check
 
-Check slave delay once and exit.  If you also specify L<"--recurse">, the
-tool will try to discover slave's of the given slave and check and print
-their lag, too.  The hostname or IP and port for each slave is printed
+Check replica delay once and exit.  If you also specify L<"--recurse">, the
+tool will try to discover replica's of the given replica and check and print
+their lag, too.  The hostname or IP and port for each replica is printed
 before its delay.  L<"--recurse"> only works with MySQL.
 
 =item --check-read-only
@@ -7125,10 +7125,10 @@ be created with the following MAGIC_create_heartbeat table definition:
   CREATE TABLE heartbeat (
     ts                    varchar(26) NOT NULL,
     server_id             int unsigned NOT NULL PRIMARY KEY,
-    file                  varchar(255) DEFAULT NULL,    -- SHOW MASTER STATUS
-    position              bigint unsigned DEFAULT NULL, -- SHOW MASTER STATUS
-    relay_source_log_file varchar(255) DEFAULT NULL,    -- SHOW SLAVE STATUS
-    exec_source_log_pos   bigint unsigned DEFAULT NULL  -- SHOW SLAVE STATUS
+    file                  varchar(255) DEFAULT NULL,    -- SHOW BINARY LOG STATUS
+    position              bigint unsigned DEFAULT NULL, -- SHOW BINARY LOG STATUS
+    relay_source_log_file varchar(255) DEFAULT NULL,    -- SHOW REPLICA STATUS
+    exec_source_log_pos   bigint unsigned DEFAULT NULL  -- SHOW REPLICA STATUS
   );
 
 The heartbeat table requires at least one row.  If you manually create the
@@ -7141,7 +7141,7 @@ or if using L<"--utc">:
   INSERT INTO heartbeat (ts, server_id) VALUES (UTC_TIMESTAMP(), N);
 
 where C<N> is the server's ID; do not use @@server_id because it will replicate
-and slaves will insert their own server ID instead of the master's server ID.
+and replicas will insert their own server ID instead of the source's server ID.
 
 This is done automatically by L<"--create-table">.
 
@@ -7152,8 +7152,8 @@ A legacy version of the heartbeat table is still supported:
     ts datetime NOT NULL
   );
 
-Legacy tables do not support L<"--update"> instances on each slave
-of a multi-slave hierarchy like "master -> slave1 -> slave2".
+Legacy tables do not support L<"--update"> instances on each replica
+of a multi-replica hierarchy like "source -> replica1 -> replica2".
 To manually insert the one required row into a legacy table:
 
   INSERT INTO heartbeat (id, ts) VALUES (1, NOW());
@@ -7164,7 +7164,7 @@ or if using L<"--utc">:
 
 The tool automatically detects if the heartbeat table is legacy.
 
-See also L<"MULTI-SLAVE HIERARCHY">.
+See also L<"MULTI-REPLICA HIERARCHY">.
 
 =item --create-table-engine
 
@@ -7278,15 +7278,15 @@ Print all output to this file when daemonized.
 
 type: string
 
-Calculate delay from this master server ID for L<"--monitor"> or L<"--check">.
-If not given, pt-heartbeat attempts to connect to the server's master and
+Calculate delay from this source server ID for L<"--monitor"> or L<"--check">.
+If not given, pt-heartbeat attempts to connect to the server's source and
 determine its server id.
 
 =item --monitor
 
-Monitor slave delay continuously.
+Monitor replica delay continuously.
 
-Specifies that pt-heartbeat should check the slave's delay every second and
+Specifies that pt-heartbeat should check the replica's delay every second and
 report to STDOUT (or if L<"--file"> is given, to the file instead).  The output
 is the current delay followed by moving averages over the timeframe given in
 L<"--frames">.  For example,
@@ -7340,11 +7340,11 @@ server is found to be read-only. If unspecified, L<"--interval"> is used.
 
 type: int
 
-Check slaves recursively to this depth in L<"--check"> mode.
+Check replicas recursively to this depth in L<"--check"> mode.
 
-Try to discover slave servers recursively, to the specified depth.  After
+Try to discover replica servers recursively, to the specified depth.  After
 discovering servers, run the check on each one of them and print the hostname
-(if possible), followed by the slave delay.
+(if possible), followed by the replica delay.
 
 This currently works only with MySQL.  See L<"--recursion-method">.
 
@@ -7352,21 +7352,21 @@ This currently works only with MySQL.  See L<"--recursion-method">.
 
 type: array; default: processlist,hosts
 
-Preferred recursion method used to find slaves.
+Preferred recursion method used to find replicas.
 
 Possible methods are:
 
   METHOD       USES
   ===========  ==================
   processlist  SHOW PROCESSLIST
-  hosts        SHOW SLAVE HOSTS
-  none         Do not find slaves
+  hosts        SHOW REPLICA HOSTS
+  none         Do not find replicas
 
-The processlist method is preferred because SHOW SLAVE HOSTS is not reliable.
+The processlist method is preferred because SHOW REPLICA HOSTS is not reliable.
 However, the hosts method is required if the server uses a non-standard
 port (not 3306).  Usually pt-heartbeat does the right thing and finds
-the slaves, but you may give a preferred method and it will be used first.
-If it doesn't find any slaves, the other methods will be tried.
+the replicas, but you may give a preferred method and it will be used first.
+If it doesn't find any replicas, the other methods will be tried.
 
 =item --replace
 
@@ -7389,21 +7389,21 @@ type: string; default: /tmp/pt-heartbeat-sentinel
 
 Exit if this file exists.
 
-=item --slave-user
+=item --replica-user
 
 type: string
 
-Sets the user to be used to connect to the slaves.
+Sets the user to be used to connect to the replicas.
 This parameter allows you to have a different user with less privileges on the
-slaves but that user must exist on all slaves.
+replicas but that user must exist on all replicas.
 
-=item --slave-password
+=item --replica-password
 
 type: string
 
-Sets the password to be used to connect to the slaves.
-It can be used with --slave-user and the password for the user must be the same
-on all slaves.
+Sets the password to be used to connect to the replicas.
+It can be used with --replica-user and the password for the user must be the same
+on all replicas.
 
 =item --set-vars
 
@@ -7430,12 +7430,12 @@ type: float; default: 0.5
 How long to delay checks.
 
 The default is to delay checks one half second.  Since the update happens as
-soon as possible after the beginning of the second on the master, this allows
-one half second of replication delay before reporting that the slave lags the
-master by one second.  If your clocks are not completely accurate or there is
-some other reason you'd like to delay the slave more or less, you can tweak this
-value.  Try setting the C<PTDEBUG> environment variable to see the effect this
-has.
+soon as possible after the beginning of the second on the replication source,
+this allows one half second of replication delay before reporting that the
+replica lags the source by one second.  If your clocks are not completely
+accurate or there is some other reason you'd like to delay the replica  more
+or less, you can tweak this value. Try setting the C<PTDEBUG> environment
+variable to see the effect this has.
 
 =item --socket
 
@@ -7481,7 +7481,7 @@ See L<"--create-table">.
 
 =item --update
 
-Update a master's heartbeat.
+Update a replication source's heartbeat.
 
 =item --user
 
diff --git a/bin/pt-index-usage b/bin/pt-index-usage
index b3c4c78e3..83ff8596d 100755
--- a/bin/pt-index-usage
+++ b/bin/pt-index-usage
@@ -7170,12 +7170,7 @@ cases where it fails, submit a bug report and a reproducible test case.
 
 Queries that cannot be EXPLAINed will cause all subsequent queries with the
 same fingerprint to be blacklisted.  This is to reduce the work they cause, and
-prevent them from continuing to print error messages.  However, at least in
-this stage of the tool's development, it is my opinion that it's not a good
-idea to preemptively silence these, or prevent them from being EXPLAINed at
-all.  I am looking for lots of feedback on how to improve things like the
-query parsing.  So please submit your test cases based on the errors the tool
-prints!
+prevent them from continuing to print error messages.
 
 =head1 OUTPUT
 
@@ -7376,8 +7371,6 @@ should be careful if you use this feature on a production server.  It might
 increase load, or cause trouble if you don't want the server to be written to,
 or so on.
 
-This is a new feature.  It may change in future releases.
-
 After a run, you can query the usage tables to answer various questions about
 index usage.  The tables have the following CREATE TABLE definitions:
 
@@ -7661,6 +7654,12 @@ dsn: user; copy: yes
 
 User for login if not current user.
 
+=item * s
+
+dsn: mysql_ssl; copy: yes
+
+Create SSL connection
+
 =back
 
 =head1 ENVIRONMENT
diff --git a/bin/pt-kill b/bin/pt-kill
index e1fd36ab1..a50a22021 100755
--- a/bin/pt-kill
+++ b/bin/pt-kill
@@ -7876,9 +7876,9 @@ pt-kill - Kill MySQL queries that match certain criteria.
 Usage: pt-kill [OPTIONS] [DSN]
 
 pt-kill kills MySQL connections.  pt-kill connects to MySQL and gets queries
-from SHOW PROCESSLIST if no FILE is given.  Else, it reads queries from one
-or more FILE which contains the output of SHOW PROCESSLIST.  If FILE is -,
-pt-kill reads from STDIN.
+from SHOW PROCESSLIST unless option L<"--test-matching"> is given.  Else, it
+reads queries from one or more files which contains the output of SHOW PROCESSLIST.
+If file is -, pt-kill reads from STDIN.
 
 Kill queries running longer than 60s:
 
@@ -7988,8 +7988,8 @@ For example, using:
 
 will kill all queries having busy-time > 114 C<OR> where the command is C<Query> or C<Execute>
 
-If you want to kill only the queries where C<busy-time > 114> C<AND> the command is Query or
-Execute, you need to use L<"--kill-busy-commands>:
+If you want to kill only the queries where C<busy-time> is greater than 114 and the
+command is Query or Execute, you need to use L<"--kill-busy-commands">:
 
   --busy-time 114 --kill-busy-commands 'Query|Execute'
 
@@ -8132,7 +8132,7 @@ L<"--victims"> for an explanation of that term) requires that queries are
 grouped by the C<arg> attribute.  This creates classes of identical queries
 (stripped of comments).  So queries C<"SELECT c FROM t WHERE id=1"> and
 C<"SELECT c FROM t WHERE id=1"> are grouped into the same class, but
-query c<"SELECT c FROM t WHERE id=3"> is not identical to the first two
+query C<"SELECT c FROM t WHERE id=3"> is not identical to the first two
 queries so it is grouped into another class. Then when L<"--victims">
 C<all-but-oldest> is specified, all but the oldest query in each class is
 killed for each class of queries that matches the match criteria.
@@ -8320,21 +8320,21 @@ The presence of the file specified by L<"--sentinel"> will cause all
 running instances of pt-kill to exit.  You might find this handy to stop cron
 jobs gracefully if necessary.  See also L<"--stop">.
 
-=item --slave-user
+=item --replica-user
 
 type: string
 
-Sets the user to be used to connect to the slaves.
+Sets the user to be used to connect to the replicas.
 This parameter allows you to have a different user with less privileges on the
-slaves but that user must exist on all slaves.
+replicas but that user must exist on all replicas.
 
-=item --slave-password
+=item --replica-password
 
 type: string
 
-Sets the password to be used to connect to the slaves.
-It can be used with --slave-user and the password for the user must be the same
-on all slaves.
+Sets the password to be used to connect to the replicas.
+It can be used with --replica-user and the password for the user must be the same
+on all replicas.
 
 =item --set-vars
 
@@ -8585,7 +8585,7 @@ Common Command values are:
   Reset stmt
   Table Dump
 
-See L<http://dev.mysql.com/doc/refman/5.1/en/thread-commands.html> for a full
+See L<https://dev.mysql.com/doc/refman/en/general-thread-states.html> for a full
 list and description of Command values.
 
 =item --match-db
@@ -8650,7 +8650,8 @@ Allow matching and killing replication threads.
 
 By default, matches do not apply to replication threads; i.e. replication
 threads are completely ignored.  Specifying this option allows matches to
-match (and potentially kill) replication threads on masters and slaves.
+match (and potentially kill) replication threads on replication sources and
+replicas.
 
 =item --test-matching
 
@@ -8865,6 +8866,12 @@ User for login if not current user.
 
 Table to log actions in, if passed through --log-dsn.
 
+=item * s
+
+dsn: mysql_ssl; copy: yes
+
+Create SSL connection
+
 =back
 
 =head1 ENVIRONMENT
diff --git a/bin/pt-online-schema-change b/bin/pt-online-schema-change
index 7871d8ccd..9c9d0c784 100755
--- a/bin/pt-online-schema-change
+++ b/bin/pt-online-schema-change
@@ -12764,7 +12764,7 @@ You must specify C<--alter "DROP FOREIGN KEY _fk_foo">.
 =item *
 
 The tool does not use C<LOCK IN SHARE MODE> with MySQL 5.0 because it can
-cause a slave error which breaks replication:
+cause a replica error which breaks replication:
 
    Query caused different errors on master and slave. Error on master:
    'Deadlock found when trying to get lock; try restarting transaction' (1213),
@@ -12896,12 +12896,10 @@ See L<"--history"> and L<"--resume">.
 type: string
 
 Channel name used when connected to a server using replication channels.
-Suppose you have two masters, master_a at port 12345, master_b at port 1236 and
-a slave connected to both masters using channels chan_master_a and chan_master_b.
-If you want to run pt-table-sync to synchronize the slave against master_a, pt-table-sync
-won't be able to determine what's the correct master since SHOW SLAVE STATUS
-will return 2 rows. In this case, you can use --channel=chan_master_a to specify
-the channel name to use in the SHOW SLAVE STATUS command.
+Suppose you have two replication sources, source_a at port 12345, source_b at port 1236 and
+a replica connected to both sources using channels chan_source_a and chan_source_b.
+You can use --channel=chan_source_a to specify the channel name to use in the 
+SHOW REPLICA STATUS command that pt-online-schema-change uses to calculate replication lag.
 
 =item --charset
 
@@ -12994,8 +12992,8 @@ server options that filter replication, such as binlog_ignore_db and
 replicate_do_db.  If it finds any such filters, it aborts with an error.
 
 If the replicas are configured with any filtering options, you should be careful
-not to modify any databases or tables that exist on the master and not the
-replicas, because it could cause replication to fail.  For more information on
+not to modify any databases or tables that exist on the replication source and not
+the replicas, because it could cause replication to fail.  For more information on
 replication rules, see L<http://dev.mysql.com/doc/en/replication-rules.html>.
 
 =item --check-replica-lag
@@ -13297,7 +13295,7 @@ type: time; default: 1s
 
 Pause the data copy until all replicas' lag is less than this value.  After each
 data-copy query (each chunk), the tool looks at the replication lag of
-all replicas to which it connects, using Seconds_Behind_Master. If any replica
+all replicas to which it connects, using Seconds_Behind_Source. If any replica
 is lagging more than the value of this option, then the tool will sleep
 for L<"--check-interval"> seconds, then check all replicas again.  If you
 specify L<"--check-replica-lag">, then the tool only examines that server for
@@ -13445,9 +13443,7 @@ type: string
 
 Perl module file that defines a C<pt_online_schema_change_plugin> class.
 A plugin allows you to write a Perl module that can hook into many parts
-of pt-online-schema-change.  This requires a good knowledge of Perl and
-Percona Toolkit conventions, which are beyond this scope of this
-documentation.  Please contact Percona if you have questions or need help.
+of pt-online-schema-change.
 
 See L<"PLUGIN"> for more information.
 
@@ -13495,11 +13491,11 @@ Preferred recursion method for discovering replicas.  Possible methods are:
   METHOD       USES
   ===========  ==================
   processlist  SHOW PROCESSLIST
-  hosts        SHOW SLAVE HOSTS
+  hosts        SHOW REPLICAS (SHOW SLAVE HOSTS before MySQL 8.1)
   dsn=DSN      DSNs from a table
-  none         Do not find slaves
+  none         Do not find replicas
 
-The processlist method is the default, because SHOW SLAVE HOSTS is not
+The processlist method is the default, because SHOW REPLICAS is not
 reliable.  However, the hosts method can work better if the server uses a
 non-standard port (not 3306).  The tool usually does the right thing and
 finds all replicas, but you may give a preferred method and it will be used
@@ -13547,7 +13543,7 @@ Resume altering table from the last completed chunk. If the tool stops before it
 copying rows, this option makes copying resume from the last chunk copied.
 
 The option accepts ID of the failed job. This ID is printed when pt-online-schema-change
-is running with option L<i"--history"> and stored in the L<"--history-table">.
+is running with option L<"--history"> and stored in the L<"--history-table">.
 
 Warning! To use this option previous, failed, run of pt-online-schema-change should use options
 L<"--history">, L<"--nodrop-new-table">, and L<"--nodrop-triggers">. Otherwise,
@@ -13934,8 +13930,8 @@ Here's a plugin file template for all hooks:
 
    1;
 
-Notice that C<get_slave_lag> must return a function reference;
-ideally one that returns actual slave lag, not simply zero like in the example.
+Notice that C<get_replica_lag> must return a function reference;
+ideally one that returns actual replica lag, not simply zero like in the example.
 
 Here's an example that actually does something:
 
@@ -14091,7 +14087,7 @@ This tool works only on MySQL 5.0.2 and newer versions, because earlier versions
 do not support triggers. Also a number of permissions should be set on MySQL
 to make pt-online-schema-change operate as expected. PROCESS, SUPER, REPLICATION SLAVE
 global privileges, as well as SELECT, INSERT, UPDATE, DELETE, CREATE, DROP, ALTER,
-and TRIGGER table privileges should be granted on server. Slave needs only
+and TRIGGER table privileges should be granted on server. Replica needs only
 REPLICATION SLAVE and REPLICATION CLIENT privileges.
 
 =head1 BUGS
diff --git a/bin/pt-pmp b/bin/pt-pmp
index 275602194..808469ef3 100755
--- a/bin/pt-pmp
+++ b/bin/pt-pmp
@@ -856,6 +856,11 @@ tool to diagnose an unresponsive server, there is really no reason not to do
 this.  In addition to freezing the server, there is also some risk of the server
 crashing or performing badly after GDB detaches from it.
 
+Dumpers C<eu> and C<pteu> use eu-stack (L<https://sourceware.org/elfutils/>) instead of GDB.
+eu-stack collects stacks with minimal impact and does not cause same issues as GDB
+does. Dumpers C<eu> and C<pteu> are recommended to use instead of GDB and one of them
+will be default dumper in future versions.
+
 =head1 OPTIONS
 
 =over
diff --git a/bin/pt-query-digest b/bin/pt-query-digest
index fd4cc0137..c50db0dd3 100755
--- a/bin/pt-query-digest
+++ b/bin/pt-query-digest
@@ -16064,7 +16064,7 @@ MAGIC_create_history_table
    Rows_examined_stddev FLOAT,
    Rows_examined_median FLOAT,
    -- Percona extended slowlog attributes
-   -- http://www.percona.com/docs/wiki/patches:slow_extended
+   -- https://docs.percona.com/percona-server/8.0/slow-extended.html
    Rows_affected_sum             FLOAT,
    Rows_affected_min             FLOAT,
    Rows_affected_max             FLOAT,
@@ -16296,9 +16296,6 @@ The entire C<report> output can be disabled by specifying C<--no-report>
 (see L<"--[no]report">), and its sections can be disabled or rearranged
 by specifying L<"--report-format">.
 
-C<json> output was introduced in 2.2.1 and is still in development,
-so the data structure may change in future versions.
-
 =item --password
 
 short form: -p; type: string
@@ -16572,21 +16569,21 @@ queries.  A complete example:
 
   pt-query-digest --sample 2 --no-report --output slowlog slow.log
 
-=item --slave-user
+=item --replica-user
 
 type: string
 
-Sets the user to be used to connect to the slaves.
+Sets the user to be used to connect to the replicas.
 This parameter allows you to have a different user with less privileges on the
-slaves but that user must exist on all slaves.
+replicas but that user must exist on all replicas.
 
-=item --slave-password
+=item --replica-password
 
 type: string
 
-Sets the password to be used to connect to the slaves.
-It can be used with --slave-user and the password for the user must be the same
-on all slaves.
+Sets the password to be used to connect to the replicas.
+It can be used with --replica-user and the password for the user must be the same
+on all replicas.
 
 =item --set-vars
 
@@ -16755,7 +16752,8 @@ traffic without dropping packets on busy servers.  Dropped packets cause
 pt-query-digest to miss the response to a request, then see the response to a
 later request and assign the wrong execution time to the query.  You can change
 the filter to something like the following to help capture a subset of the
-queries.  (See L<http://www.mysqlperformanceblog.com/?p=6092> for details.)
+queries.  (See L<https://www.percona.com/blog/how-to-use-tcpdump-on-very-busy-hosts/>
+for details.)
 
   tcpdump -i any -s 65535 -x -n -q -tttt \
      'port 3306 and tcp[1] & 7 == 2 and tcp[3] & 7 == 2'
@@ -16961,6 +16959,12 @@ dsn: user; copy: yes
 
 User for login if not current user.
 
+=item * s
+
+dsn: mysql_ssl; copy: yes
+
+Create SSL connection
+
 =back
 
 =head1 ENVIRONMENT
diff --git a/bin/pt-replica-find b/bin/pt-replica-find
index 9a9637fec..be5bd8188 100755
--- a/bin/pt-replica-find
+++ b/bin/pt-replica-find
@@ -4347,17 +4347,17 @@ if ( !caller ) { exit main(@ARGV); }
 
 =head1 NAME
 
-pt-replica-find - Find and print replication hierarchy tree of MySQL slaves.
+pt-replica-find - Find and print replication hierarchy tree of MySQL replicas.
 
 =head1 SYNOPSIS
 
 Usage: pt-replica-find [OPTIONS] [DSN]
 
-pt-replica-find finds and prints a hierarchy tree of MySQL slaves.
+pt-replica-find finds and prints a hierarchy tree of MySQL replicas.
 
 Examples:
 
-   pt-replica-find --host master-host
+   pt-replica-find --host source-host
 
 =head1 RISKS
 
@@ -4379,16 +4379,16 @@ server.  Before using this tool, please:
 
 =head1 DESCRIPTION
 
-pt-replica-find connects to a MySQL replication master and finds its slaves.
+pt-replica-find connects to a MySQL replication source and finds its replicas.
 Currently the only thing it can do is print a tree-like view of the replication
 hierarchy.
 
-The master host can be specified using one of two methods.  The first method is
+The source host can be specified using one of two methods.  The first method is
 to use the standard connection-related command line options:
 L<"--defaults-file">, L<"--password">, L<"--host">, L<"--port">, L<"--socket">
 or L<"--user">.
 
-The second method to specify the master host is a DSN.  A DSN is a special
+The second method to specify the source host is a DSN.  A DSN is a special
 syntax that can be either just a hostname (like C<server.domain.com> or
 C<1.2.3.4>), or a C<key=value,key=value> string. Keys are a single letter:
 
@@ -4496,34 +4496,34 @@ See L<"--recursion-method">.
 
 type: array; default: processlist,hosts
 
-Preferred recursion method used to find slaves.
+Preferred recursion method used to find replicas.
 
 Possible methods are:
 
   METHOD       USES
   ===========  ==================
   processlist  SHOW PROCESSLIST
-  hosts        SHOW SLAVE HOSTS
-  none         Do not find slaves
+  hosts        SHOW REPLICAS (SHOW SLAVE HOSTS before MySQL 8.1)
+  none         Do not find replicas
 
-The processlist method is preferred because SHOW SLAVE HOSTS is not reliable.
+The processlist method is preferred because SHOW REPLICAS is not reliable.
 However, the hosts method is required if the server uses a non-standard
 port (not 3306).  Usually pt-replica-find does the right thing and finds
-the slaves, but you may give a preferred method and it will be used first.
-If it doesn't find any slaves, the other methods will be tried.
+the replicas, but you may give a preferred method and it will be used first.
+If it doesn't find any replicas, the other methods will be tried.
 
 =item --report-format
 
 type: string; default: summary
 
-Set what information about the slaves is printed.  The report format can be
+Set what information about the replicas is printed.  The report format can be
 one of the following:
 
 =over
 
 =item * hostname
 
-Print just the hostname name of the slaves.  It looks like:
+Print just the hostname name of the replicas.  It looks like:
 
   127.0.0.1:12345
   +- 127.0.0.1:12346
@@ -4531,8 +4531,8 @@ Print just the hostname name of the slaves.  It looks like:
 
 =item * summary
 
-Print a summary of each slave's settings.  This report shows more information
-about each slave, like:
+Print a summary of each replica's settings.  This report shows more information
+about each replica, like:
 
   127.0.0.1:12345
   Version         5.1.34-log
@@ -4567,21 +4567,21 @@ Example:
 
 Might delay runtime a few seconds.
 
-=item --slave-user
+=item --replica-user
 
 type: string
 
-Sets the user to be used to connect to the slaves.
+Sets the user to be used to connect to the replicas.
 This parameter allows you to have a different user with less privileges on the
-slaves but that user must exist on all slaves.
+replicas but that user must exist on all replicas.
 
-=item --slave-password
+=item --replica-password
 
 type: string
 
-Sets the password to be used to connect to the slaves.
-It can be used with --slave-user and the password for the user must be the same
-on all slaves.
+Sets the password to be used to connect to the replicas.
+It can be used with --replica-user and the password for the user must be the same
+on all replicas.
 
 =item --set-vars
 
diff --git a/bin/pt-replica-restart b/bin/pt-replica-restart
index da1cd4bf1..790a33539 100755
--- a/bin/pt-replica-restart
+++ b/bin/pt-replica-restart
@@ -5240,9 +5240,9 @@ sub main {
    $o->set('verbose', 0) if $o->get('quiet');
 
    if ( !$o->get('help') ) {
-      if ( $o->get('until-master') ) {
-         if ( $o->get('until-master') !~ m/^[.\w-]+,\d+$/ ) {
-            $o->save_error("Invalid --until-master argument, must be file,pos");
+      if ( $o->get('until-source') ) {
+         if ( $o->get('until-source') !~ m/^[.\w-]+,\d+$/ ) {
+            $o->save_error("Invalid --until-source argument, must be file,pos");
          }
       }
       if ( $o->get('until-relay') ) {
@@ -5442,8 +5442,8 @@ sub watch_server {
    }
 
    my $start_sql = $vp >= '4.0.5' ? "START ${replica_name}" : 'SLAVE START';
-   if ( $o->get('until-master') ) {
-      my ( $file, $pos ) = split(',', $o->get('until-master'));
+   if ( $o->get('until-source') ) {
+      my ( $file, $pos ) = split(',', $o->get('until-source'));
       $start_sql .= " UNTIL ${source_name}_LOG_FILE = '$file', ${source_name}_LOG_POS = $pos";
    }
    elsif ( $o->get('until-relay') ) {
@@ -5614,8 +5614,8 @@ sub watch_server {
          $stat->{last_error}        ||= '';
          $stat->{last_errno}        ||= 0;
 
-         if ( $o->get('until-master') && pos_ge($stat, $source_name, $source_name) ) {
-            die "Replica has advanced past " . $o->get('until-master')
+         if ( $o->get('until-source') && pos_ge($stat, $source_name, $source_name) ) {
+            die "Replica has advanced past " . $o->get('until-source')
                . " on master.\n";
          }
          elsif ( $o->get('until-relay') && pos_ge($stat, 'relay', $source_name) ) {
@@ -5788,7 +5788,7 @@ pt-replica-restart - Watch and restart MySQL replication after errors.
 
 Usage: pt-replica-restart [OPTIONS] [DSN]
 
-pt-replica-restart watches one or more MySQL replication slaves for
+pt-replica-restart watches one or more MySQL replication replicas for
 errors, and tries to restart replication if it stops.
 
 =head1 RISKS
@@ -5811,18 +5811,18 @@ server.  Before using this tool, please:
 
 =head1 DESCRIPTION
 
-pt-replica-restart watches one or more MySQL replication slaves and tries to skip
-statements that cause errors.  It polls slaves intelligently with an
+pt-replica-restart watches one or more MySQL replication replicas and tries to skip
+statements that cause errors.  It polls replicas intelligently with an
 exponentially varying sleep time.  You can specify errors to skip and run the
-slaves until a certain binlog position.
+replicas until a certain binlog position.
 
-Although this tool can help a slave advance past errors, you should not
-rely on it to "fix" replication.  If slave errors occur frequently or
+Although this tool can help a replica advance past errors, you should not
+rely on it to "fix" replication.  If replica errors occur frequently or
 unexpectedly, you should identify and fix the root cause.
 
 =head1 OUTPUT
 
-pt-replica-restart prints a line every time it sees the slave has an error.
+pt-replica-restart prints a line every time it sees the replica has an error.
 By default this line is: a timestamp, connection information, relay_log_file,
 relay_log_pos, and last_errno.
 You can add more information using the L<"--verbose"> option.
@@ -5830,7 +5830,7 @@ You can suppress all output using the L<"--quiet"> option.
 
 =head1 SLEEP
 
-pt-replica-restart sleeps intelligently between polling the slave.  The current
+pt-replica-restart sleeps intelligently between polling the replica.  The current
 sleep time varies.
 
 =over
@@ -5870,15 +5870,15 @@ introduced in MySQL 5.6.5.  It's important to keep in mind that:
 =item *
 
 pt-replica-restart will not skip transactions when multiple replication threads
-are being used (slave_parallel_workers > 0).  pt-replica-restart does not know
-what the GTID event is of the failed transaction of a specific slave thread.
+are being used (replica_parallel_workers > 0).  pt-replica-restart does not know
+what the GTID event is of the failed transaction of a specific replica thread.
 
 =item *
 
-The default behavior is to skip the next transaction from the slave's master.
+The default behavior is to skip the next transaction from the replica's source.
 Writes can originate on different servers, each with their own UUID.
 
-See L<"--master-uuid">.
+See L<"--source-uuid">.
 
 =back
 
@@ -5892,7 +5892,7 @@ servers to monitor.
 =head1 COMPATIBILITY
 
 pt-replica-restart should work on many versions of MySQL.  Lettercase of many
-output columns from SHOW SLAVE STATUS has changed over time, so it treats them
+output columns from SHOW REPLICA STATUS has changed over time, so it treats them
 all as lowercase.
 
 =head1 OPTIONS
@@ -5904,8 +5904,8 @@ L<"SYNOPSIS"> and usage information for details.
 
 =item --always
 
-Start slaves even when there is no error.  With this option enabled,
-pt-replica-restart will not let you stop the slave manually if you want to!
+Start replicas even when there is no error.  With this option enabled,
+pt-replica-restart will not let you stop the replica manually if you want to!
 
 =item --ask-pass
 
@@ -5925,14 +5925,14 @@ connecting to MySQL.
 
 default: yes
 
-Check the last relay log file and position before checking for slave errors.
+Check the last relay log file and position before checking for replica errors.
 
 By default pt-replica-restart will not doing anything (it will just sleep)
 if neither the relay log file nor the relay log position have changed since
 the last check.  This prevents infinite loops (i.e. restarting the same
 error in the same relay log file at the same relay log position).
 
-For certain slave errors, however, this check needs to be disabled by
+For certain replica errors, however, this check needs to be disabled by
 specifying C<--no-check-relay-log>.  Do not do this unless you know what
 you are doing!
 
@@ -5977,7 +5977,7 @@ Only restart this comma-separated list of errors.  Makes pt-replica-restart only
 try to restart if the error number is in this comma-separated list of errors.
 If it sees an error not in the list, it will exit.
 
-The error number is in the C<last_errno> column of C<SHOW SLAVE STATUS>.
+The error number is in the C<last_errno> column of C<SHOW REPLICA STATUS>.
 
 =item --error-text
 
@@ -5985,10 +5985,10 @@ type: string
 
 Only restart errors that match this pattern.  A Perl regular expression against
 which the error text, if any, is matched.  If the error text exists and matches,
-pt-replica-restart will try to restart the slave.  If it exists but doesn't match,
+pt-replica-restart will try to restart the replica.  If it exists but doesn't match,
 pt-replica-restart will exit.
 
-The error text is in the C<last_error> column of C<SHOW SLAVE STATUS>.
+The error text is in the C<last_error> column of C<SHOW REPLICA STATUS>.
 
 =item --help
 
@@ -6012,7 +6012,7 @@ type: float; default: 64
 
 Maximum sleep seconds.
 
-The maximum time pt-replica-restart will sleep before polling the slave again.
+The maximum time pt-replica-restart will sleep before polling the replica again.
 This is also the time that pt-replica-restart will wait for all other running
 instances to quit if both L<"--stop"> and L<"--monitor"> are specified.
 
@@ -6022,12 +6022,12 @@ See L<"SLEEP">.
 
 type: float; default: 0.015625
 
-The minimum time pt-replica-restart will sleep before polling the slave again.
+The minimum time pt-replica-restart will sleep before polling the replica again.
 See L<"SLEEP">.
 
 =item --monitor
 
-Whether to monitor the slave (default).  Unless you specify --monitor
+Whether to monitor the replica (default).  Unless you specify --monitor
 explicitly, L<"--stop"> will disable it.
 
 =item --password
@@ -6063,19 +6063,19 @@ Suppresses normal output (disables L<"--verbose">).
 
 type: int; default: 0
 
-Watch slaves of the specified server, up to the specified number of servers deep
-in the hierarchy.  The default depth of 0 means "just watch the slave
+Watch replicas of the specified server, up to the specified number of servers deep
+in the hierarchy.  The default depth of 0 means "just watch the replica
 specified."
 
 pt-replica-restart examines C<SHOW PROCESSLIST> and tries to determine which
-connections are from slaves, then connect to them.  See L<"--recursion-method">.
+connections are from replicas, then connect to them.  See L<"--recursion-method">.
 
-Recursion works by finding all slaves when the program starts, then watching
-them.  If there is more than one slave, C<pt-replica-restart> uses C<fork()> to
+Recursion works by finding all replicas when the program starts, then watching
+them.  If there is more than one replica, C<pt-replica-restart> uses C<fork()> to
 monitor them.
 
-This also works if you have configured your slaves to show up in C<SHOW SLAVE
-HOSTS>.  The minimal configuration for this is the C<report_host> parameter, but
+This also works if you have configured your replicas to show up in C<SHOW REPLICAS>.
+The minimal configuration for this is the C<report_host> parameter, but
 there are other "report" parameters as well for the port, username, and
 password.
 
@@ -6083,21 +6083,21 @@ password.
 
 type: array; default: processlist,hosts
 
-Preferred recursion method used to find slaves.
+Preferred recursion method used to find replicas.
 
 Possible methods are:
 
   METHOD       USES
   ===========  ==================
   processlist  SHOW PROCESSLIST
-  hosts        SHOW SLAVE HOSTS
-  none         Do not find slaves
+  hosts        SHOW REPLICAS (SHOW SLAVE HOSTS before MySQL 8.1)
+  none         Do not find replicas
 
-The processlist method is preferred because SHOW SLAVE HOSTS is not reliable.
+The processlist method is preferred because SHOW REPLCIAS is not reliable.
 However, the hosts method is required if the server uses a non-standard
 port (not 3306).  Usually pt-replica-restart does the right thing and finds
-the slaves, but you may give a preferred method and it will be used first.
-If it doesn't find any slaves, the other methods will be tried.
+the replicas, but you may give a preferred method and it will be used first.
+If it doesn't find any replicas, the other methods will be tried.
 
 =item --run-time
 
@@ -6113,21 +6113,21 @@ type: string; default: /tmp/pt-replica-restart-sentinel
 
 Exit if this file exists.
 
-=item --slave-user
+=item --replica-user
 
 type: string
 
-Sets the user to be used to connect to the slaves.
+Sets the user to be used to connect to the replicas.
 This parameter allows you to have a different user with less privileges on the
-slaves but that user must exist on all slaves.
+replicas but that user must exist on all replicas.
 
-=item --slave-password
+=item --replica-password
 
 type: string
 
-Sets the password to be used to connect to the slaves.
-It can be used with --slave-user and the password for the user must be the same
-on all slaves.
+Sets the password to be used to connect to the replicas.
+It can be used with --replica-user and the password for the user must be the same
+on all replicas.
 
 =item --set-vars
 
@@ -6151,7 +6151,7 @@ The tool prints a warning and continues if a variable cannot be set.
 
 type: int; default: 1
 
-Number of statements to skip when restarting the slave.
+Number of statements to skip when restarting the replica.
 
 =item --source-uuid
 
@@ -6161,15 +6161,15 @@ When using GTID, an empty transaction should be created in order to skip it.
 If writes are coming from different nodes in the replication tree above, it is
 not possible to know which event from which UUID to skip.
 
-By default, transactions from the slave's master (C<'Master_UUID'> from
-C<SHOW SLAVE STATUS>) are skipped.
+By default, transactions from the replica's source (C<'Source_UUID'> from
+C<SHOW REPLICA STATUS>) are skipped.
 
 For example, with
 
-  master1 -> slave1 -> slave2
+  source1 -> replica1 -> replica2
 
-When skipping events on slave2 that were written to master1, you must specify
-the UUID of master1, else the tool will use the UUID of slave1 by default.
+When skipping events on replica2 that were written to source1, you must specify
+the UUID of source1, else the tool will use the UUID of replica1 by default.
 
 See L<"GLOBAL TRANSACTION IDS">.
 
@@ -6177,7 +6177,7 @@ See L<"GLOBAL TRANSACTION IDS">.
 
 type: int; default: 1
 
-Initial sleep seconds between checking the slave.
+Initial sleep seconds between checking the replica.
 
 See L<"SLEEP">.
 
@@ -6212,27 +6212,27 @@ same C<cron> job).
 
 See also L<"--sentinel">.
 
-=item --until-master
+=item --until-source
 
 type: string
 
-Run until this master log file and position.  Start the slave, and retry if it
-fails, until it reaches the given replication coordinates.  The coordinates are
-the logfile and position on the master, given by relay_master_log_file,
-exec_master_log_pos.  The argument must be in the format "file,pos".  Separate
+Run until this source binary log file and position.  Start the replica, and retry
+if it fails, until it reaches the given replication coordinates.  The coordinates
+are the logfile and position on the source, given by relay_source_log_file,
+exec_source_log_pos.  The argument must be in the format "file,pos".  Separate
 the filename and position with a single comma and no space.
 
-This will also cause an UNTIL clause to be given to START SLAVE.
+This will also cause an UNTIL clause to be given to START REPLICA.
 
-After reaching this point, the slave should be stopped and pt-replica-restart
+After reaching this point, the replica should be stopped and pt-replica-restart
 will exit.
 
 =item --until-relay
 
 type: string
 
-Run until this relay log file and position.  Like L<"--until-master">, but in
-the slave's relay logs instead.  The coordinates are given by relay_log_file,
+Run until this relay log file and position.  Like L<"--until-source">, but in
+the replica's relay logs instead.  The coordinates are given by relay_log_file,
 relay_log_pos.
 
 =item --user
@@ -6346,6 +6346,12 @@ dsn: user; copy: yes
 
 User for login if not current user.
 
+=item * s
+
+dsn: mysql_ssl; copy: yes
+
+Create SSL connection
+
 =back
 
 =head1 ENVIRONMENT
diff --git a/bin/pt-show-grants b/bin/pt-show-grants
index 04a595a30..24c1c51fd 100755
--- a/bin/pt-show-grants
+++ b/bin/pt-show-grants
@@ -2621,6 +2621,12 @@ dsn: user; copy: yes
 
 User for login if not current user.
 
+=item * s
+
+dsn: mysql_ssl; copy: yes
+
+Create SSL connection
+
 =back
 
 =head1 ENVIRONMENT
diff --git a/bin/pt-slave-delay b/bin/pt-slave-delay
index f73bece52..3c19454e7 100755
--- a/bin/pt-slave-delay
+++ b/bin/pt-slave-delay
@@ -4858,7 +4858,7 @@ pt-slave-delay - Make a MySQL slave server lag behind its master.
 
 This tool is deprecated and will be removed in future releases. It does not support MySQL 8.1 or newer.
 
-Use built-in Delayed Replication instead: https://dev.mysql.com/doc/refman/8.4/en/replication-delayed.html
+Use built-in Delayed Replication instead: https://dev.mysql.com/doc/refman/en/replication-delayed.html
 
 =head1 SYNOPSIS
 
diff --git a/bin/pt-table-checksum b/bin/pt-table-checksum
index fa1d94d36..1b20250e7 100755
--- a/bin/pt-table-checksum
+++ b/bin/pt-table-checksum
@@ -12835,12 +12835,12 @@ pt-table-checksum - Verify MySQL replication integrity.
 Usage: pt-table-checksum [OPTIONS] [DSN]
 
 pt-table-checksum performs an online replication consistency check by executing
-checksum queries on the master, which produces different results on replicas
-that are inconsistent with the master.  The optional DSN specifies the master
-host.  The tool's L<"EXIT STATUS"> is non-zero if any differences are found,
+checksum queries on the replication source, which produces different results on
+replicas that are inconsistent with the source.  The optional DSN specifies the
+source host.  The tool's L<"EXIT STATUS"> is non-zero if any differences are found,
 or if any warnings or errors occur.
 
-The following command will connect to the replication master on localhost,
+The following command will connect to the replication source on localhost,
 checksum every table, and report the results on every detected replica:
 
    pt-table-checksum
@@ -12932,8 +12932,8 @@ than the desired number of rows. You can configure the sensitivity of this
 safeguard with the L<"--chunk-size-limit"> option. If a table will be
 checksummed in a single chunk because it has a small number of rows, then
 pt-table-checksum additionally verifies that the table isn't oversized on
-replicas.  This avoids the following scenario: a table is empty on the master
-but is very large on a replica, and is checksummed in a single large query,
+replicas.  This avoids the following scenario: a table is empty on the replication
+source but is very large on a replica, and is checksummed in a single large query,
 which causes a very long delay in replication.
 
 There are several other safeguards. For example, pt-table-checksum sets its
@@ -12965,27 +12965,27 @@ exit.  You can resume it as usual afterwards.
 After pt-table-checksum finishes checksumming all of the chunks in a table, it
 pauses and waits for all detected replicas to finish executing the checksum
 queries.  Once that is finished, it checks all of the replicas to see if they
-have the same data as the master, and then prints a line of output with the
+have the same data as the source, and then prints a line of output with the
 results.  You can see a sample of its output later in this documentation.
 
 The tool prints progress indicators during time-consuming operations.  It prints
 a progress indicator as each table is checksummed.  The progress is computed by
 the estimated number of rows in the table. It will also print a progress report
 when it pauses to wait for replication to catch up, and when it is waiting to
-check replicas for differences from the master.  You can make the output less
+check replicas for differences from the source.  You can make the output less
 verbose with the L<"--quiet"> option.
 
 If you wish, you can query the checksum tables manually to get a report of which
-tables and chunks have differences from the master.  The following query will
+tables and chunks have differences from the source.  The following query will
 report every database and table with differences, along with a summary of the
 number of chunks and rows possibly affected:
 
   SELECT db, tbl, SUM(this_cnt) AS total_rows, COUNT(*) AS chunks
   FROM percona.checksums
   WHERE (
-   master_cnt <> this_cnt
-   OR master_crc <> this_crc
-   OR ISNULL(master_crc) <> ISNULL(this_crc))
+   source_cnt <> this_cnt
+   OR source_crc <> this_crc
+   OR ISNULL(source_crc) <> ISNULL(this_crc))
   GROUP BY db, tbl;
 
 The table referenced in that query is the checksum table, where the checksums
@@ -13010,7 +13010,7 @@ collisions. On the other hand, C<CRC32> algorithm is faster and less CPU-intensi
 than C<MD5> and C<SHA1>.
 
 Related reading material:
-Percona Toolkit UDFs: L<https://www.percona.com/doc/percona-server/LATEST/management/udf_percona_toolkit.html>
+Percona Toolkit UDFs: L<https://docs.percona.com/percona-server/8.0/udf-percona-toolkit.html>
 How to avoid hash collisions when using MySQL’s CRC32 function: L<https://www.percona.com/blog/2014/10/13/how-to-avoid-hash-collisions-when-using-mysqls-crc32-function/>
 
 =head1 LIMITATIONS
@@ -13020,9 +13020,9 @@ How to avoid hash collisions when using MySQL’s CRC32 function: L<https://www.
 =item Replicas using row-based replication
 
 pt-table-checksum requires statement-based replication, and it sets
-C<binlog_format=STATEMENT> on the master, but due to a MySQL limitation
+C<binlog_format=STATEMENT> on the source, but due to a MySQL limitation
 replicas do not honor this change.  Therefore, checksums will not replicate
-past any replicas using row-based replication that are masters for
+past any replicas using row-based replication that are sources for
 further replicas.
 
 The tool automatically checks the C<binlog_format> on all servers.
@@ -13032,10 +13032,10 @@ See L<"--[no]check-binlog-format"> .
 
 =item Schema and table differences
 
-The tool presumes that schemas and tables are identical on the master and
+The tool presumes that schemas and tables are identical on the source and
 all replicas.  Replication will break if, for example, a replica does not
-have a schema that exists on the master (and that schema is checksummed),
-or if the structure of a table on a replica is different than on the master.
+have a schema that exists on the source (and that schema is checksummed),
+or if the structure of a table on a replica is different than on the source.
 
 =back
 
@@ -13045,7 +13045,7 @@ pt-table-checksum works with Percona XtraDB Cluster (PXC) 5.5.28-23.7 and newer.
 The number of possible Percona XtraDB Cluster setups is large given that
 it can be used with regular replication as well.  Therefore, only the setups
 listed below are supported and known to work.  Other setups, like cluster
-to cluster, are not support and probably don't work.
+to cluster, are not supported and probably don't work.
 
 Except where noted, all of the following supported setups require that you
 use the C<dsn> method for L<"--recursion-method"> to specify cluster nodes.
@@ -13068,9 +13068,9 @@ supported.  This applies to all supported setups.
 
 =item Single cluster with replicas
 
-Cluster nodes can also be regular masters and replicate to regular replicas.
-However, the tool can only detect diffs on a replica if ran on the replica's
-"master node".  For example, if the cluster setup is,
+Cluster nodes can also be regular replication sources and replicate to regular
+replicas. However, the tool can only detect diffs on a replica if ran on the
+replica's "source node".  For example, if the cluster setup is,
 
    node1 <-> node2 <-> node3
                |         |
@@ -13086,23 +13086,23 @@ cannot be checked (e.g. replica2 when running on node3).
 
 Replicas in this setup are still subject to L<"--[no]check-binlog-format">.
 
-=item Master to single cluster
+=item Replication source to single cluster
 
-It is possible for a regular master to replicate to a cluster, as if the
-cluster were one logical slave, like:
+It is possible for a regular source to replicate to a cluster, as if the
+cluster were one logical replica, like:
 
-   master -> node1 <-> node2 <-> node3
+   source -> node1 <-> node2 <-> node3
 
-The tool supports this setup but only if ran on the master and if all nodes
+The tool supports this setup but only if ran on the source and if all nodes
 in the cluster are consistent with the "direct replica" (node1 in this example)
-of the master.  For example, if all nodes have value "foo" for row 1 but
-the master has value "bar" for the same row, this diff will be detected.
+of the source.  For example, if all nodes have value "foo" for row 1 but
+the source has value "bar" for the same row, this diff will be detected.
 Or if only node1 has this diff, it will also be detected.  But if only node2
 or node3 has this diff, it will not be detected.  Therefore, this setup is
-used to check that the master and the cluster as a whole are consistent.
+used to check that the source and the cluster as a whole are consistent.
 
 In this setup, the tool can automatically detect the "direct replica" (node1)
-when ran on the master, so you do not have to use the C<dsn> method for
+when ran on the source, so you do not have to use the C<dsn> method for
 L<"--recursion-method"> because node1 will represent the entire cluster,
 which is why all other nodes must be consistent with it.
 
@@ -13148,7 +13148,7 @@ progress.
 
 =item DIFFS
 
-The number of chunks that differ from the master on one or more replicas.
+The number of chunks that differ from the source on one or more replicas.
 If C<--no-replicate-check> is specified, this column will always have zeros.
 If L<"--replicate-check-only"> is specified, then only tables with differences
 are printed.
@@ -13211,21 +13211,21 @@ The columns are as follows:
 
 =item TABLE
 
-The database and table that differs from the master.
+The database and table that differs from the source.
 
 =item CHUNK
 
-The chunk number of the table that differs from the master.
+The chunk number of the table that differs from the source.
 
 =item CNT_DIFF
 
 The number of chunk rows on the replica minus the number of chunk rows
-on the master.
+on the source.
 
 =item CRC_DIFF
 
 1 if the CRC of the chunk on the replica is different than the CRC of the
-chunk on the master, else 0.
+chunk on the source, else 0.
 
 =item CHUNK_INDEX
 
@@ -13260,7 +13260,7 @@ with these flags:
    ERROR                     1  A non-fatal error occurred
    ALREADY_RUNNING           2  --pid file exists and the PID is running
    CAUGHT_SIGNAL             4  Caught SIGHUP, SIGINT, SIGPIPE, or SIGTERM
-   NO_SLAVES_FOUND           8  No replicas or cluster nodes were found
+   NO_REPLICAS_FOUND         8  No replicas or cluster nodes were found
    TABLE_DIFF               16  At least one diff was found
    SKIP_CHUNK               32  At least one chunk was skipped
    SKIP_TABLE               64  At least one table was skipped
@@ -13292,12 +13292,13 @@ Prompt for a password when connecting to MySQL.
 type: string
 
 Channel name used when connected to a server using replication channels.
-Suppose you have two masters, master_a at port 12345, master_b at port 1236 and
-a slave connected to both masters using channels chan_master_a and chan_master_b.
-If you want to run pt-table-sync to synchronize the slave against master_a, pt-table-sync
-won't be able to determine what's the correct master since SHOW SLAVE STATUS
-will return 2 rows. In this case, you can use --channel=chan_master_a to specify
-the channel name to use in the SHOW SLAVE STATUS command.
+Suppose you have two replication sources, source_a at port 12345, source_b
+at port 1236 and a replica connected to both sources using channels chan_source_a
+and chan_source_b. If you want to run pt-table-sync to synchronize the replica 
+against source_a, pt-table-checksum won't be able to determine what's the correct
+source since SHOW REPLICA STATUS will return 2 rows. In this case, you can use 
+--channel=chan_source_a to specify the channel name to use in the SHOW REPLICA STATUS
+command.
 
 =item --[no]check-binlog-format
 
@@ -13365,8 +13366,8 @@ binlog_ignore_db and replicate_do_db.  If it finds any such filters,
 it aborts with an error.
 
 If the replicas are configured with any filtering options, you should be careful
-not to checksum any databases or tables that exist on the master and not the
-replicas.  Changes to such tables might normally be skipped on the replicas
+not to checksum any databases or tables that exist on the replication source and
+not the replicas.  Changes to such tables might normally be skipped on the replicas
 because of the filtering options, but the checksum queries modify the contents
 of the table that stores the checksums, not the tables whose data you are
 checksumming.  Therefore, these queries will be executed on the replica, and if
@@ -13386,11 +13387,11 @@ See also L<"REPLICA CHECKS">.
 type: string; group: Throttle
 
 Pause checksumming until this replica's lag is less than L<"--max-lag">.  The
-value is a DSN that inherits properties from the master host and the connection
+value is a DSN that inherits properties from the source host and the connection
 options (L<"--port">, L<"--user">, etc.).  By default, pt-table-checksum
 monitors lag on all connected replicas, but this option limits lag monitoring
 to the specified replica.  This is useful if certain replicas are intentionally
-lagged (with L<pt-slave-delay> for example), in which case you can specify
+lagged (with L<https://dev.mysql.com/doc/refman/en/replication-delayed.html> for example), in which case you can specify
 a normal replica to monitor.
 
 See also L<"REPLICA CHECKS">.
@@ -13399,11 +13400,11 @@ See also L<"REPLICA CHECKS">.
 
 default: yes; group: Safety
 
-Checks that tables on slaves exist and have all the checksum L<"--columns">.
-Tables missing on slaves or not having all the checksum L<"--columns"> can
+Checks that tables on replicas exist and have all the checksum L<"--columns">.
+Tables missing on replicas or not having all the checksum L<"--columns"> can
 cause the tool to break replication when it tries to check for differences.
 Only disable this check if you are aware of the risks and are sure that all
-tables on all slaves exist and are identical to the master.
+tables on all replicas exist and are identical to the source.
 
 =item --chunk-index
 
@@ -13570,6 +13571,8 @@ the table from which the tool resumes won't be emptied.
 To empty the entire replicate table, you must manually execute C<TRUNCATE TABLE>
 before running the tool.
 
+See also -L<"--truncate-replicate-table">.
+
 =item --engines
 
 short form: -e; type: hash; group: Filter
@@ -13682,10 +13685,10 @@ type: time; default: 1s; group: Throttle
 
 Pause checksumming until all replicas' lag is less than this value.  After each
 checksum query (each chunk), pt-table-checksum looks at the replication lag of
-all replicas to which it connects, using Seconds_Behind_Master. If any replica
+all replicas to which it connects, using Seconds_Behind_Source. If any replica
 is lagging more than the value of this option, then pt-table-checksum will sleep
 for L<"--check-interval"> seconds, then check all replicas again.  If you
-specify L<"--check-slave-lag">, then the tool only examines that server for
+specify L<"--check-replica-lag">, then the tool only examines that server for
 lag, not all servers.
 
 The tool waits forever for replicas to stop lagging.  If any replica is
@@ -13754,9 +13757,7 @@ type: string
 
 Perl module file that defines a C<pt_table_checksum_plugin> class.
 A plugin allows you to write a Perl module that can hook into many parts
-of pt-table-checksum.  This requires a good knowledge of Perl and
-Percona Toolkit conventions, which are beyond this scope of this
-documentation.  Please contact Percona if you have questions or need help.
+of pt-table-checksum.
 
 See L<"PLUGIN"> for more information.
 
@@ -13805,7 +13806,7 @@ Preferred recursion method for discovering replicas.  pt-table-checksum
 performs several L<"REPLICA CHECKS"> before and while running.
 
 Although replicas are not required to run pt-table-checksum, the tool
-cannot detect diffs on slaves that it cannot discover.  Therefore,
+cannot detect diffs on replicas that it cannot discover.  Therefore,
 a warning is printed and the L<"EXIT STATUS"> is non-zero if no replicas
 are found and the method is not C<none>.  If this happens, try a different
 recursion method, or use the C<dsn> method to specify the replicas to check.
@@ -13813,14 +13814,14 @@ recursion method, or use the C<dsn> method to specify the replicas to check.
 Possible methods are:
 
   METHOD       USES
-  ===========  =============================================
+  ===========  =================================================
   processlist  SHOW PROCESSLIST
-  hosts        SHOW SLAVE HOSTS
+  hosts        SHOW REPLICAS (SHOW SLAVE HOSTS before MySQL 8.1)
   cluster      SHOW STATUS LIKE 'wsrep\_incoming\_addresses'
   dsn=DSN      DSNs from a table
-  none         Do not find slaves
+  none         Do not find replicas
 
-The C<processlist> method is the default, because C<SHOW SLAVE HOSTS> is not
+The C<processlist> method is the default, because C<SHOW REPLICAS> is not
 reliable.  However, if the server uses a non-standard port (not 3306), then
 the C<hosts> method becomes the default because it works better in this case.
 
@@ -13837,7 +13838,7 @@ but this functionality is experimental.
 The C<dsn> method is special: rather than automatically discovering replicas,
 this method specifies a table with replica DSNs.  The tool will only connect
 to these replicas.  This method works best when replicas do not use the same
-MySQL username or password as the master, or when you want to prevent the tool
+MySQL username or password as the source, or when you want to prevent the tool
 from connecting to certain replicas.  The C<dsn> method is specified like:
 C<--recursion-method dsn=h=host,D=percona,t=dsns>.  The specified DSN must
 have D and t parts, or just a database-qualified t part, which specify the
@@ -13854,10 +13855,10 @@ DSNs are ordered by C<id>, but C<id> and C<parent_id> are otherwise ignored.
 The C<dsn> column contains a replica DSN like it would be given on the command
 line, for example: C<"h=replica_host,u=repl_user,p=repl_pass">.
 
-The C<none> method makes the tool ignore all slaves and cluster nodes. This
+The C<none> method makes the tool ignore all replicas and cluster nodes. This
 method is not recommended because it effectively disables the
 L<"REPLICA CHECKS"> and no differences can be found. It is useful, however, if
-you only need to write checksums on the master or a single cluster node. The
+you only need to write checksums on the source or a single cluster node. The
 safer alternative is C<--no-replicate-check>: the tool finds replicas and
 cluster nodes, performs the L<"REPLICA CHECKS">, but does not check for
 differences. See L<"--[no]replicate-check">.
@@ -13897,8 +13898,8 @@ are checksumming InnoDB tables, and you use MyISAM for this table, a deadlock
 will break replication, because the mixture of transactional and
 non-transactional tables in the checksum statements will cause it to be written
 to the binlog even though it had an error.  It will then replay without a
-deadlock on the replicas, and break replication with "different error on master
-and slave."  This is not a problem with pt-table-checksum; it's a problem with
+deadlock on the replicas, and break replication with "different error on source
+and replica."  This is not a problem with pt-table-checksum; it's a problem with
 MySQL replication, and you can read more about it in the MySQL manual.
 
 The replicate table is never checksummed (the tool automatically adds this
@@ -13910,7 +13911,7 @@ default: yes
 
 Check replicas for data differences after finishing each table.  The tool finds
 differences by executing a simple SELECT statement on all detected replicas.
-The query compares the replica's checksum results to the master's checksum
+The query compares the replica's checksum results to the source's checksum
 results.  It reports differences in the DIFFS column of the output.
 
 =item --replicate-check-only
@@ -13929,7 +13930,7 @@ type: int; default: 1
 Retry checksum comparison this many times when a difference is encountered.
 Only when a difference persists after this number of checks is it considered valid.
 Using this option with a value of 2 or more alleviates spurious differences that
-arise when using the --resume option.
+arise when using the L<"--resume"> option.
 
 =item --replicate-database
 
@@ -13972,31 +13973,31 @@ time it is ran.
 
 type: string; default: #
 
-The separator character used for CONCAT_WS().  This character is used to join
+The separator character used for C<CONCAT_WS()>.  This character is used to join
 the values of columns when checksumming.
 
 =item --skip-check-replica-lag
 
 type: DSN; repeatable: yes
 
-DSN to skip when checking slave lag. It can be used multiple times.
-Example: --skip-check-slave-lag h=127.1,P=12345 --skip-check-slave-lag h=127.1,P=12346
+DSN to skip when checking replica lag. It can be used multiple times.
+Example: C<--skip-check-replica-lag h=127.1,P=12345 --skip-check-replica-lag h=127.1,P=12346>
 
 =item --replica-user
 
 type: string
 
-Sets the user to be used to connect to the slaves.
+Sets the user to be used to connect to the replicas.
 This parameter allows you to have a different user with less privileges on the
-slaves but that user must exist on all slaves.
+replicas but that user must exist on all replicas.
 
 =item --replica-password
 
 type: string
 
-Sets the password to be used to connect to the slaves.
-It can be used with --replica-user and the password for the user must be the same
-on all slaves.
+Sets the password to be used to connect to the replicas.
+It can be used with L<"--replica-user"> and the password for the user must be the same
+on all replicas.
 
 =item --set-vars
 
@@ -14027,12 +14028,12 @@ Socket file to use for connection.
 
 type: float; default: 1.0
 
-When a master table is marked to be checksummed in only one chunk but a slave
+When a source table is marked to be checksummed in only one chunk but a replica
 table exceeds the maximum accepted size for this, the table is skipped.
 Since number of rows are often rough estimates, many times tables are skipped
 needlessly for very small differences.
 This option provides a max row excess tolerance to prevent this.
-For example a value of 1.2 will tolerate slave tables with up to 20% excess rows.
+For example a value of 1.2 will tolerate replica tables with up to 20% excess rows.
 
 =item --tables
 
@@ -14049,18 +14050,18 @@ Checksum only tables whose names match this Perl regex.
 
 =item --trim
 
-Add TRIM() to VARCHAR columns (helps when comparing 4.1 to >= 5.0).
+Add C<TRIM()> to C<VARCHAR> columns (helps when comparing 4.1 to >= 5.0).
 This is useful when you don't care about the trailing space differences between
 MySQL versions that vary in their handling of trailing spaces. MySQL 5.0 and
-later all retain trailing spaces in VARCHAR, while previous versions would
+later all retain trailing spaces in C<VARCHAR>, while previous versions would
 remove them.  These differences will cause false checksum differences.
 
 =item --truncate-replicate-table
 
 Truncate the replicate table before starting the checksum.
-This parameter differs from L<--empty-replicate-table> which only deletes the rows
+This parameter differs from L<"--[no]empty-replicate-table"> which only deletes the rows
 for the table being checksummed when starting the checksum for that table, while
-L<--truncate-replicate-table> will truncate the replicate table at the beginning of the
+L<"--truncate-replicate-table"> will truncate the replicate table at the beginning of the
 process and thus, all previous checksum information will be losti, even if the process
 stops due to an error.
 
@@ -14121,8 +14122,8 @@ keyword.  You might need to quote the value.  Here is an example:
 =head1 REPLICA CHECKS
 
 By default, pt-table-checksum attempts to find and connect to all replicas
-connected to the master host.  This automated process is called
-"slave recursion" and is controlled by the L<"--recursion-method"> and
+connected to the source host.  This automated process is called
+"replica recursion" and is controlled by the L<"--recursion-method"> and
 L<"--recurse"> options.  The tool performs these checks on all replicas:
 
 =over
@@ -14138,17 +14139,17 @@ disabled by specifying C<--no-check-replication-filters>.
 
 pt-table-checksum checks that the L<"--replicate"> table exists on all
 replicas, else checksumming can break replication when updates to the table
-on the master replicate to a replica that doesn't have the table.  This
+on the source replicate to a replica that doesn't have the table.  This
 check cannot be disabled, and the tool waits forever until the table
 exists on all replicas, printing L<"--progress"> messages while it waits.
 
 =item 3. Single chunk size
 
-If a table can be checksummed in a single chunk on the master,
+If a table can be checksummed in a single chunk on the source,
 pt-table-checksum will check that the table size on all replicas is less than
 L<"--chunk-size"> * L<"--chunk-size-limit">. This prevents a rare problem
-where the table on the master is empty or small, but on a replica it is much
-larger. In this case, the single chunk checksum on the master would overload
+where the table on the source is empty or small, but on a replica it is much
+larger. In this case, the single chunk checksum on the source would overload
 the replica.
 
 Another rare problem occurs when the table size on a replica is close to
@@ -14165,10 +14166,10 @@ This check cannot be disabled.
 =item 4. Lag
 
 After each chunk, pt-table-checksum checks the lag on all replicas, or only
-the replica specified by L<"--check-slave-lag">.  This helps the tool
+the replica specified by L<"--check-replica-lag">.  This helps the tool
 not to overload the replicas with checksum data.  There is no way to
 disable this check, but you can specify a single replica to check with
-L<"--check-slave-lag">, and if that replica is the fastest, it will help
+L<"--check-replica-lag">, and if that replica is the fastest, it will help
 prevent the tool from waiting too long for replica lag to abate.
 
 =item 5. Checksum chunks
@@ -14206,9 +14207,9 @@ to a hook, search for the hook's name in the tool's source code, like:
    # --plugin hook
    if ( $plugin && $plugin->can('init') ) {
       $plugin->init(
-         slaves         => $slaves,
-         slave_lag_cxns => $slave_lag_cxns,
-         repl_table     => $repl_table,
+         replicas         => $replicas,
+         replica_lag_cxns => $replica_lag_cxns,
+         repl_table       => $repl_table,
       );
    }
 
diff --git a/bin/pt-table-sync b/bin/pt-table-sync
index 88e76d567..711e4973a 100755
--- a/bin/pt-table-sync
+++ b/bin/pt-table-sync
@@ -12296,21 +12296,11 @@ Selects the entire table in one big stream and compares all columns.  Selects
 all columns.  Much less efficient than the other algorithms, but works when
 there is no suitable index for them to use.
 
-=item Future Plans
-
-Possibilities for future algorithms are TempTable (what I originally called
-bottom-up in earlier versions of this tool), DrillDown (what I originally
-called top-down), and GroupByPrefix (similar to how SqlYOG Job Agent works).
-Each algorithm has strengths and weaknesses.  If you'd like to implement your
-favorite technique for finding differences between two sources of data on
-possibly different servers, I'm willing to help.  The algorithms adhere to a
-simple interface that makes it pretty easy to write your own.
-
 =back
 
 =head1 BIDIRECTIONAL SYNCING
 
-Bidirectional syncing is a new, experimental feature.  To make it work
+Bidirectional syncing is an experimental feature.  To make it work
 reliably there are a number of strict limitations:
 
   * only works when syncing one server to other independent servers
@@ -12376,7 +12366,7 @@ These options are:
   * --conflict-comparison
   * --conflict-value
   * --conflict-threshold
-  * --conflict-error">  (optional)
+  * --conflict-error  (optional)
 
 Use L<"--print"> to test this option before L<"--execute">.  The printed
 SQL statements will have comments saying on which host the statement
@@ -12922,7 +12912,7 @@ Possible methods are:
   METHOD       USES
   ===========  ==================
   processlist  SHOW PROCESSLIST
-  hosts        SHOW REPLICAS
+  hosts        SHOW REPLICAS (SHOW SLAVE HOSTS before MySQL 8.1)
   none         Do not find replicas
 
 The processlist method is preferred because SHOW REPLICAS is not reliable.
@@ -12951,7 +12941,7 @@ L<pt-table-checksum>.  That is, it contains records of which tables (and ranges
 of values) differ between the source and replica.
 
 For each table and range of values that shows differences between the source and
-replica, C<pt-table-checksum> will sync that table, with the appropriate C<WHERE>
+replica, pt-table-sync will sync that table, with the appropriate C<WHERE>
 clause, to its source.
 
 This automatically sets L<"--wait"> to 60 and causes changes to be made on the
@@ -13141,7 +13131,7 @@ the tables.  The value is the number of seconds to wait before timing out (see
 also L<"--timeout-ok">).  Sets L<"--lock"> to 1 and L<"--[no]transaction"> to 0
 by default.  If you see an error such as the following,
 
-  MASTER_POS_WAIT returned -1
+  SOURCE_POS_WAIT returned -1
 
 It means the timeout was exceeded and you need to increase it.
 
diff --git a/bin/pt-table-usage b/bin/pt-table-usage
index c55a14813..08ae7bccb 100755
--- a/bin/pt-table-usage
+++ b/bin/pt-table-usage
@@ -8420,6 +8420,12 @@ dsn: user; copy: yes
 
 User for login if not current user.
 
+=item * s
+
+dsn: mysql_ssl; copy: yes
+
+Create SSL connection
+
 =back
 
 =head1 ENVIRONMENT
diff --git a/bin/pt-upgrade b/bin/pt-upgrade
index dd28b2da9..63f6255fa 100755
--- a/bin/pt-upgrade
+++ b/bin/pt-upgrade
@@ -10835,7 +10835,7 @@ while pt-upgrade is running, the report could contain more false-positives
 than legitimate differences.  B<pt-upgrade assumes that both MySQL servers
 are static, unchanging (except for any changes made by the tool if ran
 with C<--no-read-only>).>  A read-only workload shouldn't affect the tool,
-except maybe query times, so read-only slaves could be used.
+except maybe query times, so read-only replicas could be used.
 
 =head2 COMPARED TO
 
@@ -10874,8 +10874,8 @@ pt-upgrade runs with C<autocommit=1> by default.
 =head2 THROTTLING
 
 pt-upgrade has no throttling options because the tool should only be ran
-on dedicated testing or development servers.  B<Do not run pt-upgrade
-on production servers!>  Consequently, the tool is CPU, memory, disk, and
+on dedicated testing or development servers.  B<Do not run> pt-upgrade
+B<on production servers!>  Consequently, the tool is CPU, memory, disk, and
 network intensive.  It executes queries as fast as possible.
 
 =head1 QUERY DIFFERENCES
@@ -11418,7 +11418,7 @@ lead to weird situations, like the server allowing LOCAL INFILE, but
 the client throwing exceptions if it's used.
 
 However, as long as the server allows LOAD DATA, clients can easily
-re-enable it; See L<https://dev.mysql.com/doc/refman/5.0/en/load-data-local.html>
+re-enable it; See L<https://dev.mysql.com/doc/refman/en/load-data-local-security.html>
 and L<http://search.cpan.org/~capttofu/DBD-mysql/lib/DBD/mysql.pm>.
 This option does exactly that.
 
@@ -11451,6 +11451,12 @@ dsn: user; copy: yes
 
 User for login if not current user.
 
+=item * s
+
+dsn: mysql_ssl; copy: yes
+
+Create SSL connection
+
 =back
 
 =head1 ENVIRONMENT
diff --git a/bin/pt-variable-advisor b/bin/pt-variable-advisor
index 50178fca8..4228adf76 100755
--- a/bin/pt-variable-advisor
+++ b/bin/pt-variable-advisor
@@ -3863,7 +3863,12 @@ sub get_rules {
          return 1 if   ($mysql_version == '3'   && $mysql_version < '3.23'  )
                     || ($mysql_version == '4'   && $mysql_version < '4.1.20')
                     || ($mysql_version == '5.0' && $mysql_version < '5.0.37')
-                    || ($mysql_version == '5.1' && $mysql_version < '5.1.30');
+                    || ($mysql_version == '5.1' && $mysql_version < '5.1.30')
+                    || ($mysql_version == '5.5' && $mysql_version < '5.5.8')
+                    || ($mysql_version == '5.6' && $mysql_version < '5.6.10')
+                    || ($mysql_version == '5.7' && $mysql_version < '5.7.9')
+                    || ($mysql_version == '8.0' && $mysql_version < '8.0.11')
+                    ;
          return 0;
       },
    },
@@ -3873,7 +3878,7 @@ sub get_rules {
          my ( %args ) = @_;
          my $mysql_version = $args{mysql_version};
          return 0 unless $mysql_version;
-         return $mysql_version < '5.1' ? 1 : 0;  # 5.1.x
+         return $mysql_version < '8.0' ? 1 : 0;  # 8.x
       },
    },
 };
@@ -5530,10 +5535,6 @@ pt-variable-advisor examines C<SHOW VARIABLES> for bad values and settings
 according to the L<"RULES"> described below.  It reports on variables that
 match the rules, so you can find bad settings in your MySQL server.
 
-At the time of this release, pt-variable-advisor only examines
-C<SHOW VARIABLES>, but other input sources are planned like C<SHOW STATUS>
-and C<SHOW SLAVE STATUS>.
-
 =head1 RULES
 
 These are the rules that pt-variable-advisor will apply to SHOW VARIABLES.
@@ -5875,28 +5876,28 @@ necessary to change it.
 severity: warn
 
 Setting relay_log_space_limit can cause replicas to stop fetching binary logs
-from their master immediately. This could increase the risk that your data will
-be lost if the master crashes. If the replicas have encountered a limit on relay
-log space, then it is possible that the latest transactions exist only on the
-master and no replica has retrieved them.
+from their source immediately. This could increase the risk that your data will
+be lost if the replication source crashes. If the replicas have encountered a limit
+on relay log space, then it is possible that the latest transactions exist only
+on the source and no replica has retrieved them.
 
 =item slave_net_timeout
 
 severity: warn
 
 This variable is set too high.  This is too long to wait before
-noticing that the connection to the master has failed and retrying.  This
-should probably be set to 60 seconds or less.  It is also a good idea to
+noticing that the connection to the replication source has failed and retrying.
+This should probably be set to 60 seconds or less.  It is also a good idea to
 use pt-heartbeat to ensure that the connection does not appear to time out
-when the master is simply idle.
+when the source is simply idle.
 
 =item replica_net_timeout
 
 severity: warn
 
 This variable is set too high.  This is too long to wait before
-noticing that the connection to the source has failed and retrying.  This
-should probably be set to 60 seconds or less.  It is also a good idea to
+noticing that the connection to the replication source has failed and retrying.
+This should probably be set to 60 seconds or less.  It is also a good idea to
 use pt-heartbeat to ensure that the connection does not appear to time out
 when the source is simply idle.
 
@@ -5906,7 +5907,7 @@ severity: crit
 
 You should not set this option.  If replication is having errors,
 you need to find and resolve the cause of that; it is likely that your
-slave's data is different from the master.  You can find out with
+replica's data is different from the source.  You can find out with
 pt-table-checksum.
 
 =item replica_skip_errors
@@ -6060,13 +6061,15 @@ as tmp_table_size.
 
 severity: warn
 
-These are the recommended minimum version for each major release: 3.23, 4.1.20, 5.0.37, 5.1.30.
+These are the recommended minimum version for each major release: 3.23, 4.1.20,
+5.0.37, 5.1.30, 5.5.8, 5.6.10, 5.7.9, 8.0.11. This optiion does not complain
+about Innovation releases.
 
 =item end-of-life mysql version
 
 severity: note
 
-Every release older than 5.1 is now officially end-of-life.
+Every release older than 8.0 is now officially end-of-life.
 
 =back
 
@@ -6295,6 +6298,12 @@ dsn: user; copy: yes
 
 User for login if not current user.
 
+=item * s
+
+dsn: mysql_ssl; copy: yes
+
+Create SSL connection
+
 =back
 
 =head1 ENVIRONMENT
diff --git a/bin/pt-visual-explain b/bin/pt-visual-explain
index d6f7bc67b..6652f34d6 100755
--- a/bin/pt-visual-explain
+++ b/bin/pt-visual-explain
@@ -2656,9 +2656,7 @@ bookmark lookup into the film_actor table.
 =back
 
 For more information on how to read EXPLAIN output, please see
-L<http://dev.mysql.com/doc/en/explain.html>, and this talk titled
-"MySQL query optimizer internals and upcoming features in v. 5.2":
-from Timour Katchaounov, one of the MySQL developers: L<http://goo.gl/VIWvo>
+L<http://dev.mysql.com/doc/en/explain.html>.
 
 =head1 MODULES
 
@@ -2693,13 +2691,11 @@ trying to figure out how this works, but otherwise this section will probably
 not make your life richer.
 
 The tree can be built by examining the id, select_type, and table columns of
-each row.  Here's what I know about them:
+each row.
 
 The id column is the sequential number of the select.  This does not indicate
 nesting; it just comes from counting SELECT from the left of the SQL statement.
-It's like capturing parentheses in a regular expression.  A UNION RESULT row
-doesn't have an id, because it isn't a SELECT.  The source code actually refers
-to UNIONs as a fake_lex, as I recall.
+It's like capturing parentheses in a regular expression.
 
 If two adjacent rows have the same id value, they are joined with the standard
 single-sweep multi-join method.
@@ -2749,7 +2745,7 @@ access to the temporary table that holds the result of the subquery whose id is
 N.  If it says <unionN,..N> it's the same thing, but it refers to the results it
 UNIONs together.
 
-Finally, order matters.  If a row's id is less than the one before it, I think
+Finally, order matters.  If a row's id is less than the one before it,
 that means it is dependent on something other than the one before it.  For
 example,
 
@@ -2765,7 +2761,7 @@ example,
  |  3 | SUBQUERY    | film_actor |
  |  2 | SUBQUERY    | film       |
 
-If the results were in order 2-3-4, I think that would mean 3 is a subquery of
+If the results were in order 2-3-4, that would mean 3 is a subquery of
 2, 4 is a subquery of 3.  As it is, this means 4 is a subquery of the nearest
 previous recent row with a smaller id, which is 1.  Likewise for 3 and 2.
 
@@ -2802,8 +2798,8 @@ following:
  | NULL | UNION RESULT | <union5,6> |
  | NULL | UNION RESULT | <union1,4> |
 
-This would be a lot easier to work with if it looked like this (I've
-bracketed the id on rows I moved):
+This would be a lot easier to work with if it looked like this (we've
+bracketed the id on rows we moved):
 
  | id   | select_type  | table      |
  +------+--------------+------------+
@@ -2819,7 +2815,7 @@ bracketed the id on rows I moved):
 
 In fact, why not re-number all the ids, so the PRIMARY row becomes 2, and so on?
 That would make it even easier to read.  Unfortunately that would also have the
-effect of destroying the meaning of the id column, which I think is important to
+effect of destroying the meaning of the id column, which is important to
 preserve in the final tree.  Also, though it makes it easier to read, it doesn't
 make it easier to manipulate programmatically; so it's fine to leave them
 numbered as they are.
@@ -2831,7 +2827,7 @@ the slice of rows that should be child nodes in the tree: you just look for the
 first row whose ID is the same as the first number in the table.
 
 The next question is how to find the last row that should be a child node of a
-UNION or DERIVED.   I'll start with DERIVED, because the solution makes UNION
+UNION or DERIVED.   We'll start with DERIVED, because the solution makes UNION
 easy.
 
 Consider how MySQL numbers the SELECTs sequentially according to their position
@@ -2871,14 +2867,14 @@ Here's the output of EXPLAIN:
  | NULL | UNION RESULT | <union3,5> |
  |  2   | DERIVED      | film       |
 
-The siblings all have id 1, and the middle one I care about is derived3.
-(Notice MySQL doesn't execute them in the order I defined them, which is fine).
-Now notice that MySQL prints out the rows in the opposite order I defined the
-subqueries: 6, 3, 2.  It always seems to do this, and there might be other
+The siblings all have id 1, and the middle one we care about is derived3.
+(Notice MySQL doesn't execute them in the order they are defined, which is fine).
+Now notice that MySQL prints out the rows in the opposite order the subqueries
+were defined: 6, 3, 2.  It always seems to do this, and there might be other
 methods of finding the scope boundaries including looking for the lower boundary
-of the next largest sibling, but this is a good enough heuristic.  I am forced
-to rely on it for non-DERIVED subqueries, so I rely on it here too.  Therefore,
-I decide that everything greater than or equal to 3 belongs to the DERIVED
+of the next largest sibling, but this is a good enough heuristic.  We are forced
+to rely on it for non-DERIVED subqueries, so we rely on it here too.  Therefore,
+we decide that everything greater than or equal to 3 belongs to the DERIVED
 scope.
 
 The rule for UNION is simple: they consume the entire enclosing scope, and to
@@ -2894,8 +2890,8 @@ the enclosing scope's boundaries, and the rest is easy.  Notice in the example
 above, the UNION is over <union3,5>, which includes the row with id 4 -- it
 includes every row between 3 and 5.
 
-Finally, there are non-derived subqueries to deal with as well.  In this case I
-can't look at siblings to find the end of the scope as I did for DERIVED.  I
+Finally, there are non-derived subqueries to deal with as well.  In this case we
+can't look at siblings to find the end of the scope as we did for DERIVED.  We
 have to trust that MySQL executes depth-first.  Here's an example:
 
  explain
@@ -2950,16 +2946,14 @@ select 4 came first.  In other words, if EXPLAIN looked like this,
  |  4 | DEPENDENT SUBQUERY | actor      |
 
 I would be forced to assume upon seeing select 3 that select 4 is a subquery
-of it, rather than just being the next sibling in the enclosing scope.  If this
-is ever wrong, then the algorithm is wrong, and I don't see what could be done
-about it.
+of it, rather than just being the next sibling in the enclosing scope.
 
 UNION is a little more complicated than just "the entire scope is a UNION,"
 because the UNION might itself be inside an enclosing scope that's only
 indicated by the first item inside the UNION.  There are only three kinds of
 enclosing scopes: UNION, DERIVED, and SUBQUERY.  A UNION can't enclose a UNION,
-and a DERIVED has its own "scope markers," but a SUBQUERY can wholly enclose a
-UNION, like this strange example on the empty table t1:
+and a DERIVED has its own "scope markers," but a SUBQUERY in earlier versions
+could wholly enclose a UNION, like this strange example on the empty table t1:
 
  explain select * from t1 where not exists(
     (select t11.i from t1 t11) union (select t12.i from t1 t12));
@@ -2974,12 +2968,8 @@ UNION, like this strange example on the empty table t1:
 
 The UNION's backward references might make it look like the UNION encloses the
 subquery, but studying the query makes it clear this isn't the case.  So when a
-UNION's first row says SUBQUERY, it is this special case.
-
-By the way, I don't fully understand this query plan; there are 4 numbered
-SELECT in the plan, but only 3 in the query.  The parens around the UNIONs are
-meaningful.  Removing them will make the EXPLAIN different.  Please tell me how
-and why this works if you know.
+UNION's first row says SUBQUERY, it is this special case that we cannot repeat
+starting from MySQL 5.7.
 
 Armed with this knowledge, it's possible to use recursion to turn the
 parent-child relationship between all the rows into a tree representing the
@@ -3011,8 +3001,7 @@ The execution plan looks like a depth-first traversal of this tree:
 
 The JOIN might not be a JOIN.  It might be a subquery, for example.  This comes
 from the type column of EXPLAIN.  The documentation says this is a "join type,"
-but I think "access type" is more accurate, because it's "how MySQL accesses
-rows."
+but "access type" may be more accurate, because it's "how MySQL accesses rows."
 
 pt-visual-explain decorates the tree significantly more than just turning
 rows into nodes.  Each node may get a series of transformations that turn it
@@ -3217,6 +3206,12 @@ dsn: user; copy: yes
 
 User for login if not current user.
 
+=item * s
+
+dsn: mysql_ssl; copy: yes
+
+Create SSL connection
+
 =back
 
 =head1 ENVIRONMENT
diff --git a/config/sphinx-build/_static/_templates/theme/relbar2.html b/config/sphinx-build/_static/_templates/theme/relbar2.html
index 5c041e963..583bb6ce3 100644
--- a/config/sphinx-build/_static/_templates/theme/relbar2.html
+++ b/config/sphinx-build/_static/_templates/theme/relbar2.html
@@ -2,7 +2,7 @@
 <div class="md-content">
   <article class="md-content__inner md-typeset" role="main">
     <h4>Get Expert Help </h4>
-       <p>If you need assistance, visit the <a class="reference external" href="https://forums.percona.com/c/mongodb/percona-server-for-mongodb/17?utm_campaign=Doc%20pages" target="_blank">community forum</a> for comprehensive and free database knowledge.</p> 
+       <p>If you need assistance, visit the <a class="reference external" href="https://forums.percona.com/?utm_campaign=Doc%20pages" target="_blank">community forum</a> for comprehensive and free database knowledge.</p> 
        <p>Contact our <a class="reference external" href="https://www.percona.com/about/contact">Percona Database Experts</a> for professional support and services.</p>
          <hr>
          {# Add the last updated timestamp from git commits using gitstamp extension #}
diff --git a/docs/percona-toolkit.pod b/docs/percona-toolkit.pod
index 0f0db520f..48658d2e6 100644
--- a/docs/percona-toolkit.pod
+++ b/docs/percona-toolkit.pod
@@ -406,7 +406,7 @@ databases while running.
 =item F
 
 Defaults file for the MySQL client library (the C client library used by
-DBD::mysql, I<not Percona Toolkit itself>).  All tools all read the
+DBD::mysql, I<not Percona Toolkit itself>).  All tools read the
 C<[client]> section within the defaults file.  If you omit this, the standard
 defaults files will be read in the usual order.  "Standard" varies from system
 to system, because the filenames to read are compiled into the client library.
@@ -441,7 +441,7 @@ lead to weird situations, like the server allowing LOCAL INFILE, but
 the client throwing exceptions if it's used.
 
 However, as long as the server allows LOAD DATA, clients can easily
-re-enable it; see L<https://dev.mysql.com/doc/refman/5.0/en/load-data-local.html>
+re-enable it; see L<https://dev.mysql.com/doc/refman/en/load-data-local-security.html>
 and L<http://search.cpan.org/~capttofu/DBD-mysql/lib/DBD/mysql.pm>.
 This option does exactly that.
 
@@ -464,6 +464,10 @@ MySQL socket file to use for the connection (on Unix systems).
 
 MySQL username to use when connecting, if not current system user.
 
+=item s
+
+Create SSL connection
+
 =back
 
 =head2 BAREWORD
@@ -539,7 +543,7 @@ Include the following information in your bug report:
 
 =item * Tool C<--version>
 
-=item * MySQL version of all servers involved
+=item * MySQL, MongoDB, or PostgreSQL version of all servers involved
 
 =item * Output from the tool including STDERR
 
@@ -603,6 +607,6 @@ Place, Suite 330, Boston, MA  02111-1307  USA.
 
 =head1 VERSION
 
-Percona Toolkit v3.6.0 released 2024-05-25
+Percona Toolkit v3.6.0 released 2024-06-12
 
 =cut
diff --git a/docs/pt-galera-log-explainer.rst b/docs/pt-galera-log-explainer.rst
deleted file mode 100644
index 3b3cda00f..000000000
--- a/docs/pt-galera-log-explainer.rst
+++ /dev/null
@@ -1,246 +0,0 @@
-.. _pt-galera-log-explainer:
-
-==================================
-:program:`pt-galera-log-explainer`
-==================================
-
-Filter, aggregate and summarize multiple galera logs together.
-This is a toolbox to help navigating Galera logs.
-
-Usage
-=====
-
-.. code-block:: bash
-
-   pt-galera-log-explainer [--since=] [--until=] [-vv] [--merge-by-directory] [--pxc-operator] <command> <paths ...>
-
-
-Commands available
-==================
-
-list
-~~~~
-
-.. code-block:: bash
-
-    pt-galera-log-explainer [flags] list { --all | [--states] [--views] [--events] [--sst] [--applicative] } <paths ...>
-
-List key events in chronological order from any number of nodes (sst, view changes, general errors, maintenance operations)
-It will aggregates logs together by identifying them using node names, IPs and internal Galera identifiers. 
-
-
-
-It can be from a single node:
-
-.. code-block:: bash
-
-    pt-galera-log-explainer list --all --since 2023-01-05T03:24:26.000000Z /var/log/mysql/*.log
-
-or from multiple nodes.
-
-.. code-block:: bash
-
-    pt-galera-log-explainer list --all *.log
-
-You can filter by type of events
-
-.. code-block:: bash
-
-    pt-galera-log-explainer list --sst --views *.log
-
-whois
-~~~~~
-Find out information about nodes, using any type of information
-
-.. code-block:: bash
-
-    pt-galera-log-explainer [flags] whois [--json] [--type { nodename | ip | uuid | auto }] <information to search> <paths ...>
-
-
-.. code-block:: bash
-
-    pt-galera-log-explainer whois '218469b2' mysql.log
-    pt-galera-log-explainer whois '172.17.0.3' mysql.log
-    pt-galera-log-explainer whois 'galera-node2' mysql.log
-
-
-conflicts
-~~~~~~~~~
-
-List every replication failure votes (Galera 4)
-
-.. code-block:: bash
-
-    pt-galera-log-explainer conflicts [--json|--yaml] *.log
-
-ctx
-~~~
-
-Get the tool crafted context for a single log.
-It will contain everything the tool extracted from the log file: version, sst information, known uuid-ip-nodename mappings, ...
-
-.. code-block:: bash
-
-    pt-galera-log-explainer ctx mysql.log
-
-regex-list
-~~~~~~~~~~
-
-Will print every implemented regexes:
-* regex: the regex that will be used against the log files
-* internalRegex: the golang regex that will be used to extract piece of information
-* type: the regex group it belong to
-* verbosity: the required level of verbosity to which it will be printed
-
-.. code-block:: bash
-
-    pt-galera-log-explainer regex-list
-
-Available flags
-~~~~~~~~~~~~~~~
-
-``-h``, ``--help``               
-    Show help and exit.
-
-``--no-color``
-    Remove every color special characters 
-
-``--since``        
-    Only list events after this date. It will affect the regex applied to the logs.
-    Format: 2023-01-23T03:53:40Z (RFC3339)
-
-``--until``
-    Only list events before this date. This is only implemented in the tool loop, it does not alter regexes.
-    Format: 2023-01-23T03:53:40Z (RFC3339)
-
-``--merge-by-directory``
-    Instead of relying on extracted information, logs will be merged by their base directory 
-    It is useful when logs are very sparse and already organized by nodes.
-
-``--skip-merge``
-    Disable the ability to merge log files together. Can be used when every nodes have the same ``wsrep_node_name``
-
-``-v``, ``--verbosity``        
-    ``-v``: display in the timeline every mysql info the tool used
-    ``-vv``: internal tool debug
-
-``--pxc-operator``       
-    Analyze logs from Percona PXC operator. Operator logs should be automatically detected (see ``--skip-operator-detection``).
-    It will prevent logs from being merged together, add operator specific regexes, and fine-tune regexes for logs taken from ``pt-k8s-debug-collector``.
-    Off by default because it negatively impacts performance for non-k8s setups.
-
-``--skip-operator-detection``
-    Disable automatic detection of PXC operator logs. When detected, a message will be shown.
-    Detection is done using a prefix regex.
-
-``--exclude-regexes``
-    Remove regexes from analysis. Use ``pt-galera-log-explainer regex-list | jq .`` to have the list
-    
-``--grep-cmd``
-    grep v3 binary command path. For Darwin systems, it could need to be set to ``ggrep``
-    Default: ``grep``
-
-``--version``
-    Show version and exit.
-
-``--custom-regexes``
-    Add custom regexes, printed in magenta. Format: (golang regex string)=[optional static message to display].
-    If the static message is left empty, the captured string will be printed instead. Custom regexes are separated using semi-colon.
-    Example: ``--custom-regexes="Page cleaner took [0-9]*ms to flush [0-9]* pages=;doesn't recommend.*pxc_strict_mode=unsafe query used"``
-
-
-Example outputs
-===============
-
-.. code-block:: bash
-
-    $ pt-galera-log-explainer list --all --no-color --since=2023-03-12T19:41:28.493046Z --until=2023-03-12T19:44:59.855491Z tests/logs/upgrade/*
-    identifier                    172.17.0.2                                 node2                                   tests/logs/upgrade/node3.log            
-    current path                  tests/logs/upgrade/node1.log               tests/logs/upgrade/node2.log            tests/logs/upgrade/node3.log            
-    last known ip                 172.17.0.2                                                                                                                 
-    last known name                                                          node2                                                                           
-    mysql version                 8.0.28                                                                                                                     
-                                                                                                                                                             
-    2023-03-12T19:41:28.493046Z   starting(8.0.28)                           |                                       |                                       
-    2023-03-12T19:41:28.500789Z   started(cluster)                           |                                       |                                       
-    2023-03-12T19:43:17.630191Z   |                                          node3 joined                            |                                       
-    2023-03-12T19:43:17.630208Z   node3 joined                               |                                       |                                       
-    2023-03-12T19:43:17.630221Z   node2 joined                               |                                       |                                       
-    2023-03-12T19:43:17.630243Z   |                                          node1 joined                            |                                       
-    2023-03-12T19:43:17.634138Z   |                                          |                                       node2 joined                            
-    2023-03-12T19:43:17.634229Z   |                                          |                                       node1 joined                            
-    2023-03-12T19:43:17.643210Z   |                                          PRIMARY(n=3)                            |                                       
-    2023-03-12T19:43:17.648163Z   |                                          |                                       PRIMARY(n=3)                            
-    2023-03-12T19:43:18.130088Z   CLOSED -> OPEN                             |                                       |                                       
-    2023-03-12T19:43:18.130230Z   PRIMARY(n=3)                               |                                       |                                       
-    2023-03-12T19:43:18.130916Z   OPEN -> PRIMARY                            |                                       |                                       
-    2023-03-12T19:43:18.904410Z   will receive IST(seqno:178226792)          |                                       |                                       
-    2023-03-12T19:43:18.913328Z   |                                          |                                       node1 cannot find donor                 
-    2023-03-12T19:43:18.913429Z   node1 cannot find donor                    |                                       |                                       
-    2023-03-12T19:43:18.913565Z   |                                          node1 cannot find donor                 |                                       
-    2023-03-12T19:43:19.914122Z   |                                          |                                       node1 cannot find donor                 
-    2023-03-12T19:43:19.914259Z   node1 cannot find donor                    |                                       |                                       
-    2023-03-12T19:43:19.914362Z   |                                          node1 cannot find donor                 |                                       
-    2023-03-12T19:43:20.914957Z   |                                          |                                       (repeated x97)node1 cannot find donor   
-    2023-03-12T19:43:20.915143Z   (repeated x97)node1 cannot find donor      |                                       |                                       
-    2023-03-12T19:43:20.915262Z   |                                          (repeated x97)node1 cannot find donor   |                                       
-    2023-03-12T19:44:58.999603Z   |                                          |                                       node1 cannot find donor                 
-    2023-03-12T19:44:58.999791Z   node1 cannot find donor                    |                                       |                                       
-    2023-03-12T19:44:58.999891Z   |                                          node1 cannot find donor                 |                                       
-    2023-03-12T19:44:59.817822Z   timeout from donor in gtid/keyring stage   |                                       |                                       
-    2023-03-12T19:44:59.839692Z   SST error                                  |                                       |                                       
-    2023-03-12T19:44:59.840669Z   |                                          |                                       node2 joined                            
-    2023-03-12T19:44:59.840745Z   |                                          |                                       node1 left                              
-    2023-03-12T19:44:59.840933Z   |                                          node3 joined                            |                                       
-    2023-03-12T19:44:59.841034Z   |                                          node1 left                              |                                       
-    2023-03-12T19:44:59.841189Z   NON-PRIMARY(n=1)                           |                                       |                                       
-    2023-03-12T19:44:59.841292Z   PRIMARY -> OPEN                            |                                       |                                       
-    2023-03-12T19:44:59.841352Z   OPEN -> CLOSED                             |                                       |                                       
-    2023-03-12T19:44:59.841515Z   terminated                                 |                                       |                                       
-    2023-03-12T19:44:59.841529Z   former SST cancelled                       |                                       |                                       
-    2023-03-12T19:44:59.848349Z   |                                          |                                       node1 left                              
-    2023-03-12T19:44:59.848409Z   |                                          |                                       PRIMARY(n=2)                            
-    2023-03-12T19:44:59.855443Z   |                                          node1 left                              |                                       
-    2023-03-12T19:44:59.855491Z   |                                          PRIMARY(n=2)                            |                        
-
-    $ pt-galera-log-explainer whois 172.17.0.2 --no-color  tests/logs/upgrade/*
-    ip:
-    └── 172.17.0.2
-        ├── nodename:
-        │   └── node1 (2023-03-12 19:35:07.644683 +0000 UTC)
-        │
-        └── uuid:
-            ├── 1d3ea8f5 (2023-03-12 07:24:13.789261 +0000 UTC)
-            ├── 54ab931e (2023-03-12 07:43:08.563339 +0000 UTC)
-            ├── fecde235 (2023-03-12 08:46:48.963504 +0000 UTC)
-            ├── a07872e1 (2023-03-12 08:49:41.206124 +0000 UTC)
-            ├── 60da0bf9-aa9c (2023-03-12 12:29:48.873397 +0000 UTC)
-            ├── 35b62086-902c (2023-03-12 13:04:23.979636 +0000 UTC)
-            ├── ca2c2a5f-a82a (2023-03-12 19:35:05.878879 +0000 UTC)
-            └── eefb9c8a-b69a (2023-03-12 19:43:17.133756 +0000 UTC)
-
-
-
-Requirements
-============
-
-grep, version 3
-On Darwin based OS, grep is only version 2 due to license limitations. --grep-cmd can be used to point the correct grep binary, usually ggrep
-
-
-Compatibility
-=============
-
-* Percona XtraDB Cluster: 5.5 to 8.0
-* MariaDB Galera Cluster: 10.0 to 10.6
-* logs from PXC operator pods (error.log, recovery.log, post.processing.log)
-
-Known issues
-============
-
-* Nodes sharing the same ip, or nodes with identical names are not supported
-* Sparse files identification can be missed, resulting in many columns displayed. ``--merge-by-directory`` can be used, but files need to be organized already in separate directories
-  This is mainly when the log file does not contain enough information.
-* Some information will seems missed. Depending on the case, it may be simply unimplemented yet, or it was disabled later because it was found to be unreliable (node index numbers are not reliable for example)
-* Columns width are sometimes too large to be easily readable. This usually happens when printing SST events with long node names
-* When some display corner-cases seems broken (events not deduplicated, ...), it is because of extra hidden internal events.
diff --git a/docs/pt-galera-log-explainer.rst b/docs/pt-galera-log-explainer.rst
new file mode 120000
index 000000000..cd10655bc
--- /dev/null
+++ b/docs/pt-galera-log-explainer.rst
@@ -0,0 +1 @@
+../src/go/pt-galera-log-explainer/README.rst
\ No newline at end of file
diff --git a/docs/pt-k8s-debug-collector.rst b/docs/pt-k8s-debug-collector.rst
deleted file mode 100644
index 6b72ad16f..000000000
--- a/docs/pt-k8s-debug-collector.rst
+++ /dev/null
@@ -1,191 +0,0 @@
-.. _pt-k8s-debug-collector:
-
-==================================
-:program:`pt-k8s-debug-collector`
-==================================
-
-Collects debug data (logs, resource statuses etc.) from a k8s/OpenShift cluster. Data is packed into the ``cluster-dump.tar.gz`` archive in the current working directory.
-
-Data that will be collected
-===========================
-
-.. code-block:: bash
-
-   "pods",
-   "replicasets",
-   "deployments",
-   "statefulsets",
-   "replicationcontrollers",
-   "events",
-   "configmaps",
-   "cronjobs",
-   "jobs",
-   "podsecuritypolicies",
-   "poddisruptionbudgets",
-   "perconaxtradbbackups",
-   "perconaxtradbclusterbackups",
-   "perconaxtradbclusterrestores",
-   "perconaxtradbclusters",
-   "clusterrolebindings",
-   "clusterroles",
-   "rolebindings",
-   "roles",
-   "storageclasses",
-   "persistentvolumeclaims",
-   "persistentvolumes",
-   "modes",
-   "your-custom-resource" (depends on 'resource' flag)
-
-Data, collected for PXC
-~~~~~~~~~~~~~~~~~~~~~~~
-
-.. code-block:: bash
-
-   "perconaxtradbbackups",
-   "perconaxtradbclusterbackups",
-   "perconaxtradbclusterrestores",
-   "perconaxtradbclusters"
-
-Summary, collected for PXC (available in file summary.txt)
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-.. code-block:: bash
-
-   "pt-mysql-summary"
-
-Individual files, collected for PXC
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-.. code-block:: bash
-
-   "var/lib/mysql/mysqld-error.log",
-   "var/lib/mysql/innobackup.backup.log",
-   "var/lib/mysql/innobackup.move.log",
-   "var/lib/mysql/innobackup.prepare.log",
-   "var/lib/mysql/grastate.dat",
-   "var/lib/mysql/gvwstate.dat",
-   "var/lib/mysql/mysqld.post.processing.log",
-   "var/lib/mysql/auto.cnf"
-
-Data, collected for MySQL
-~~~~~~~~~~~~~~~~~~~~~~~~~
-
-.. code-block:: bash
-
-   "perconaservermysqlbackups",
-   "perconaservermysqlrestores",
-   "perconaservermysqls"
-
-Summary, collected for MySQL (available in file summary.txt)
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-.. code-block:: bash
-
-   "pt-mysql-summary"
-
-Data, collected for MongoDB
-~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-.. code-block:: bash
-
-   "perconaservermongodbbackups",
-   "perconaservermongodbrestores",
-   "perconaservermongodbs"
-
-Summary, collected for MongoDB (available in file summary.txt)
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-.. code-block:: bash
-
-   "pt-mongodb-summary"
-
-Data, collected for PostgreSQL
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-.. code-block:: bash
-
-   "perconapgclusters",
-   "pgclusters",
-   "pgpolicies",
-   "pgreplicas",
-   "pgtasks"
-
-Summary, collected for PostgreSQL (available in file summary.txt)
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-.. code-block:: bash
-
-   "pg_gather"
-
-Usage
-=====
-
-``pt-k8s-debug-collector <flags>``
-
-Supported Flags
-================
-
-``--resource``
-
-Targeted custom resource name. Supported values:
-
-* ``pxc`` - PXC
-
-* ``psmdb`` - MongoDB
-
-* ``pg`` - PostgreSQL Operator v1 (deprecated)
-
-* ``pgv2`` - PostgreSQL Operator v2
-
-* ``ps`` - MySQL
-
-* ``none`` - Collect only general Kubernetes data, do not collect anything specific to the particular operator).
-
-* ``auto`` - Auto-detect custom resource
-
-Default: ``auto``
-
-``--namespace``
-
-Targeted namespace. By default data will be collected from all namespaces
-
-``--cluster``
-
-Targeted cluster. By default data from all available clusters to be collected
-
-``--kubeconfig``
-
-Path to kubeconfig. Default configuration be used if none specified
-
-``--forwardport``
-
-Port to use when collecting database-specific summaries. By default, 3306 will be used for PXC and MySQL, 27017 for MongoDB, and 5432 for PostgreSQL
-
-``--version``
-
-Print version info
-
-Requirements
-============
-
-- Installed, configured, and available in PATH ``kubectl``
-- Installed, configured, and available in PATH ``pt-mysql-summary`` for PXC and MySQL
-- Installed, configured, and available in PATH ``mysql`` for PXC and MySQL
-- Installed, configured, and available in PATH ``pt-mongodb-summary`` for MongoDB
-- Installed, configured, and available in PATH ``psql`` for PostgreSQL
-
-Known Issues
-============
-
-On Kubernetes 1.21 - 1.24 warning is printed:
-
-.. code-block:: bash
-
-    2022/12/15 17:43:16 Error: get resource podsecuritypolicies in namespace default: error: <nil>, stderr: Warning: policy/v1beta1 PodSecurityPolicy is deprecated in v1.21+, unavailable in v1.25+
- , stdout: apiVersion: v1
-    items: []
-    kind: List
-    metadata:
-      resourceVersion: ""
-
-This warning is harmless and does not affect data collection. We will remove podsecuritypolicies once everyone upgrade to Kubernetes 1.25 or newer. Before that we advise to ignore this warning.
diff --git a/docs/pt-k8s-debug-collector.rst b/docs/pt-k8s-debug-collector.rst
new file mode 120000
index 000000000..23edde705
--- /dev/null
+++ b/docs/pt-k8s-debug-collector.rst
@@ -0,0 +1 @@
+../src/go/pt-k8s-debug-collector/README.rst
\ No newline at end of file
diff --git a/docs/pt-mongodb-index-check.rst b/docs/pt-mongodb-index-check.rst
deleted file mode 100644
index 3e31f0802..000000000
--- a/docs/pt-mongodb-index-check.rst
+++ /dev/null
@@ -1,72 +0,0 @@
-.. _pt-mongodb-index-check:
-
-=================================
-:program:`pt-mongodb-index-check`
-=================================
-
-Performs checks on MongoDB indexes.
-
-Checks available
-================
-
-Duplicated indexes
-~~~~~~~~~~~~~~~~~~
-
-Check for indexes that are the prefix of other indexes. For example if we have these 2 indexes
-
-.. code-block:: javascript
-
-   db.getSiblingDB("testdb").test_col.createIndex({"f1": 1, "f2": -1, "f3": 1, "f4": 1}, {"name": "idx_01"});
-   db.getSiblingDB("testdb").test_col.createIndex({"f1": 1, "f2": -1, "f3": 1}, {"name": "idx_02"});
-
-
-The index ``idx_02`` is the prefix of ``idx_01`` because it has the same
-keys in the same order so, ``idx_02`` can be dropped.
-
-Unused indexes.
-~~~~~~~~~~~~~~~
-
-This check gets the ``$indexstats`` for all indexes and reports those
-having ``accesses.ops`` = 0.
-
-Usage
-=====
-
-Run the program as ``pt-mongodb-index-check <command> [flags]``
-
-Available commands
-~~~~~~~~~~~~~~~~~~
-
-================ ==================================
-Command          Description
-================ ==================================
-check-duplicated Run checks for duplicated indexes.
-check-unused     Run check for unused indexes.
-check-all        Run all checks
-================ ==================================
-
-Available flags
-~~~~~~~~~~~~~~~
-
-+----------------------------+----------------------------------------+
-| Flag                       | Description                            |
-+============================+========================================+
-| –all-databases             | Check in all databases excluding       |
-|                            | system dbs.                            |
-+----------------------------+----------------------------------------+
-| –databases=DATABASES,…     | Comma separated list of databases to   |
-|                            | check.                                 |
-+----------------------------+----------------------------------------+
-| –all-collections           | Check in all collections in the        |
-|                            | selected databases.                    |
-+----------------------------+----------------------------------------+
-| –collections=COLLECTIONS,… | Comma separated list of collections to |
-|                            | check.                                 |
-+----------------------------+----------------------------------------+
-| –mongodb.uri=              | Connection URI                         |
-+----------------------------+----------------------------------------+
-| –json                      | Show output as JSON                    |
-+----------------------------+----------------------------------------+
-| –version                   | Show version information               |
-+----------------------------+----------------------------------------+
-
diff --git a/docs/pt-mongodb-index-check.rst b/docs/pt-mongodb-index-check.rst
new file mode 120000
index 000000000..7eef47ec3
--- /dev/null
+++ b/docs/pt-mongodb-index-check.rst
@@ -0,0 +1 @@
+../src/go/pt-mongodb-index-check/README.rst
\ No newline at end of file
diff --git a/docs/pt-mongodb-summary.rst b/docs/pt-mongodb-summary.rst
deleted file mode 100644
index 61c772ddf..000000000
--- a/docs/pt-mongodb-summary.rst
+++ /dev/null
@@ -1,168 +0,0 @@
-.. pt-mongodb-summary:
-
-=============================
-:program:`pt-mongodb-summary`
-=============================
-
-``pt-mongodb-summary`` collects information about a MongoDB cluster.
-It collects information from several sources
-to provide an overview of the cluster.
-
-Usage
-=====
-
-.. code-block:: bash
-
-   pt-mongodb-summary [OPTIONS] [HOST[:PORT]]
-
-By default, if you run ``pt-mongodb-summary`` without any parameters,
-it will try to connect to ``localhost`` on port ``27017``.
-The program collects information about MongoDB instances
-by running administration commands and formatting the output.
-
-.. note:: ``pt-mongodb-summary`` requires to be run by user
-   with the ``clusterAdmin`` or ``root`` built-in roles.
-
-.. note:: ``pt-mongodb-summary`` cannot collect statistics
-   from MongoDB instances that require connection via SSL.
-   Support for SSL will be added in the future.
-
-Options
--------
-
-``-a``, ``--auth-db``
-  Specifies the database used to establish credentials and privileges
-  with a MongoDB server.
-  By default, the ``admin`` database is used.
-
-``-f``, ``--output-format``
-  Specifies the report output format. Valid options are: ``text``, ``json``.
-  The default value is ``text``.
-
-``-p``, ``--password``
-  Specifies the password to use when connecting to a server
-  with authentication enabled.
-
-  Do not add a space between the option and its value: ``-p<password>``.
-
-  If you specify the option without any value,
-  ``pt-mongodb-summary`` will ask for password interactively.
-
-``-u``, ``--user``
-  Specifies the user name for connecting to a server
-  with authentication enabled.
-
-Output Example
-==============
-
-.. code-block:: none
-
-   # Instances ####################################################################################
-   ID    Host                         Type                                 ReplSet
-     0 localhost:17001                PRIMARY                                r1
-     1 localhost:17002                SECONDARY                              r1
-     2 localhost:17003                SECONDARY                              r1
-     0 localhost:18001                PRIMARY                                r2
-     1 localhost:18002                SECONDARY                              r2
-     2 localhost:18003                SECONDARY                              r2
-
-   # This host
-   # Mongo Executable #############################################################################
-          Path to executable | /home/karl/tmp/MongoDB32Labs/3.0/bin/mongos
-   # Report On 0 ########################################
-                        User | karl
-                   PID Owner | mongos
-                        Time | 2016-10-30 00:18:49 -0300 ART
-                    Hostname | karl-HP-ENVY
-                     Version | 3.0.11
-                    Built On | Linux x86_64
-                     Started | 2016-10-30 00:18:49 -0300 ART
-                     Datadir | /data/db
-                Process Type | mongos
-
-   # Running Ops ##################################################################################
-
-   Type         Min        Max        Avg
-   Insert           0          0          0/5s
-   Query            0          0          0/5s
-   Update           0          0          0/5s
-   Delete           0          0          0/5s
-   GetMore          0          0          0/5s
-   Command          0         22         16/5s
-
-   # Security #####################################################################################
-   Users 0
-   Roles 0
-   Auth  disabled
-   SSL   disabled
-
-
-   # Oplog ########################################################################################
-   Oplog Size     18660 Mb
-   Oplog Used     55 Mb
-   Oplog Length   0.91 hours
-   Last Election  2016-10-30 00:18:44 -0300 ART
-
-
-   # Cluster wide #################################################################################
-               Databases: 3
-             Collections: 17
-     Sharded Collections: 1
-   Unsharded Collections: 16
-       Sharded Data Size: 68 GB
-     Unsharded Data Size: 0 KB
-   # Balancer (per day)
-                 Success: 6
-                  Failed: 0
-                  Splits: 0
-                   Drops: 0
-
-Sections
---------
-
-Output is separated into the following sections:
-
-* **Instances**
-
-  This section lists all hosts connected to the current MongoDB instance.
-  For this, ``pt-mongodb-summary`` runs the ``listShards`` command
-  and then the ``replSetGetStatus`` on every instance
-  to collect its ID, type, and replica set.
-
-* **This host**
-
-  This section provides an overview of the current MongoDB instance
-  and the underlying OS.
-  For this, ``pt-mongodb-summary`` groups information
-  collected from ``hostInfo``, ``getCmdLineOpts``, ``serverStatus``,
-  and the OS process (by process ID).
-
-* **Running Ops**
-
-  This section provides minimum, maximum, and average operation counters
-  for ``insert``, ``query``, ``update``, ``delete``, ``getMore``,
-  and ``command`` operations.
-  For this, ``pt-mongodb-summary`` runs the ``serverStatus`` command
-  5 times at regular intervals (every second).
-
-* **Security**
-
-  This section provides information about the security settings.
-  For this, ``pt-mongodb-summary``, parses ``getCmdLineOpts`` output
-  and queries the ``admin.system.users``
-  and ``admin.system.roles`` collections.
-
-* **Oplog**
-
-  This section contains details about the MongoDB operations log (oplog).
-  For this, ``pt-mongodb-summary`` collects statistics
-  from the oplog on every host in the cluster,
-  and returns those with the smallest ``TimeDiffHours`` value.
-
-* **Cluster wide**
-
-  This section provides information about the number of sharded and
-  unsharded databases, collections, and their size.
-  For this, ``pt-mongodb-summary`` runs the ``listDatabases`` command
-  and then runs ``collStats`` for every collection in every database.
-
diff --git a/docs/pt-mongodb-summary.rst b/docs/pt-mongodb-summary.rst
new file mode 120000
index 000000000..135488139
--- /dev/null
+++ b/docs/pt-mongodb-summary.rst
@@ -0,0 +1 @@
+../src/go/pt-mongodb-summary/README.rst
\ No newline at end of file
diff --git a/docs/pt-pg-summary.rst b/docs/pt-pg-summary.rst
deleted file mode 100644
index 814291361..000000000
--- a/docs/pt-pg-summary.rst
+++ /dev/null
@@ -1,475 +0,0 @@
-========================
-:program:`pt-pg-summary`
-========================
-
-**pt-pg-summary** collects information about a PostgreSQL cluster.
-
-Usage
------
-
-``pt-pg-summary [options] [host:[port]]``
-
-Binaries
---------
-Please check the `releases <https://github.com/percona/toolkit-go/releases>`_ tab to download the binaries.
-
-Parameters
-^^^^^^^^^^
-
-+--------+---------------------------------+---------+----------------------------------------------------------------------------+
-| Short  | Long                            | Default | Description                                                                |
-+========+=================================+=========+============================================================================+
-|        | ``--help``                      |         | Show context-sensitive help (also try ``--help-long`` and ``--help-man``). |
-+--------+---------------------------------+---------+----------------------------------------------------------------------------+
-|        | ``--version``                   |         | Show application version.                                                  |
-+--------+---------------------------------+---------+----------------------------------------------------------------------------+
-|        | ``--databases=DATABASES``       |         | Summarize this comma-separated list of databases. All if not specified.    |
-+--------+---------------------------------+---------+----------------------------------------------------------------------------+
-| ``-h`` | ``--host=HOST``                 |         | Host to connect to or local Unix socket for connection                     |
-+--------+---------------------------------+---------+----------------------------------------------------------------------------+
-| ``-W`` | ``--password=PASSWORD``         |         | Password to use when connecting.                                           |
-+--------+---------------------------------+---------+----------------------------------------------------------------------------+
-| ``-p`` | ``--port=PORT``                 |         | Port number to use for connection.                                         |
-+--------+---------------------------------+---------+----------------------------------------------------------------------------+
-|        | ``--sleep=SLEEP``               | 10      | Seconds to sleep when gathering status counters.                           |
-+--------+---------------------------------+---------+----------------------------------------------------------------------------+
-| ``-U`` | ``--username=USERNAME``         |         | User for login if not current user.                                        |
-+--------+---------------------------------+---------+----------------------------------------------------------------------------+
-|        | ``--disable-ssl``               | true    | Disable SSL for the connection.                                            |
-+--------+---------------------------------+---------+----------------------------------------------------------------------------+
-|        | ``--verbose``                   | false   | Show verbose log.                                                          |
-+--------+---------------------------------+---------+----------------------------------------------------------------------------+
-|        | ``--debug``                     | false   | Show debug information in the logs.                                        |
-+--------+---------------------------------+---------+----------------------------------------------------------------------------+
-
-
-.. Currently hidden
-..       --list-encrypted-tables              Include a list of the encrypted tables in all databases
-..       --ask-pass                           Prompt for a password when connecting to PostgreSQL
-..       --config                             Config file
-..       --defaults-file                      Only read PostgreSQL options from the given file
-..       --read-samples                       Create a report from the files found in this directory
-..       --save-samples                       Save the data files used to generate the summary in this directory
-
-
-Output
-^^^^^^
-
-The output is grouped into these categories:
-
-AllDatabases
-    Selects ``datname`` from ``pg_database`` where ``datistemplate`` is false.
-
-ClusterInfo
-    Selects cluster information from ``pg_stat_activity``.
-
-ConnectedClients
-    Counts the connected clients by selecting from ``pg_stat_activity``.
-
-Connections
-    Selects ``state`` from ``pg_stat_activity`` and counts them.
-
-Counters
-    Selects various counter values from ``pg_stat_database``.
-
-DatabaseWaitEvents
-    Shows database wait events from ``pg_locks``, ``pg_stat_database``, ``pg_class``, and ``pg_stat_activity``.
-
-Databases
-    Shows the name and size of databases from ``pg_stat_database``.
-
-GlobalWaitEvents
-    Shows global wait evens from ``pg_stat_activity``.
-
-IndexCacheHitRatio
-    Shows index hit ratios from ``pg_statio_user_indexes``.
-
-PortAndDatadir
-    Shows port and data directory name from ``pg_settings``.
-
-ServerVersion
-    Shows the value of ``server_version_num``.
-
-Setting
-    Selects ``name`` and ``setting`` from ``pg_settings``.
-
-SlaveHosts10
-    Selects information for PostgreSQL version 10.
-
-SlaveHosts96
-    Selects information for PostgreSQL version 9.6.
-
-TableAccess
-    Shows table access information by selecting from ``pg_locks``, ``pg_stat_database`` and ``pg_class``.
-
-TableCacheHitRatio
-    Shows table cache hit ratio information from ``pg_statio_user_tables``.
-
-Tablespaces
-    Show owner and location from ``pg_catalog.pg_tablespace``.
-
-
-Output example
-""""""""""""""
-
-.. code-block:: html
-
-    ##### --- Database Port and Data_Directory --- ####
-    +----------------------+----------------------------------------------------+
-    |         Name         |                      Setting                       |
-    +----------------------+----------------------------------------------------+
-    | data_directory       | /var/lib/postgresql/data                           |
-    +----------------------+----------------------------------------------------+
-
-    ##### --- List of Tablespaces ---- ######
-    +----------------------+----------------------+----------------------------------------------------+
-    |         Name         |         Owner        |               Location                             |
-    +----------------------+----------------------+----------------------------------------------------+
-    | pg_default           | postgres             |                                                    |
-    | pg_global            | postgres             |                                                    |
-    +----------------------+----------------------+----------------------------------------------------+
-
-
-    ##### --- Cluster Information --- ####
-    +------------------------------------------------------------------------------------------------------+
-     Usename        : postgres
-     Time           : 2020-04-21 13:38:22.770077 +0000 UTC
-     Client Address : 172.19.0.1
-     Client Hostname:
-     Version        : PostgreSQL 9.6.17 on x86_64-pc-linux-gnu (Debian 9.6.17-2.pgdg90+1), compiled by
-     Started        : 2020-04-21 13:36:59.909175 +0000 UTC
-     Is Slave       : false
-    +------------------------------------------------------------------------------------------------------+
-
-    ##### --- Databases --- ####
-    +----------------------+------------+
-    |       Dat Name       |    Size    |
-    +----------------------+------------+
-    | postgres             |    7071 kB |
-    | template1            |    6961 kB |
-    | template0            |    6961 kB |
-    +----------------------+------------+
-
-    ##### --- Index Cache Hit Ratios --- ####
-
-    Database: postgres
-    +----------------------+------------+
-    |      Index Name      |    Ratio   |
-    +----------------------+------------+
-    | index hit rate       |      0.00  |
-    +----------------------+------------+
-
-    ##### --- Table Cache Hit Ratios --- ####
-    Database: postgres
-    +----------------------+------------+
-    |      Index Name      |    Ratio   |
-    +----------------------+------------+
-    | cache hit rate       |       0.00 |
-    +----------------------+------------+
-
-    ##### --- List of Wait_events for the entire Cluster - all-databases --- ####
-    No stats available
-
-    ##### --- List of users and client_addr or client_hostname connected to --all-databases --- ####
-    +----------------------+------------+---------+----------------------+---------+
-    |   Wait Event Type    |        Client        |         State        |  Count  |
-    +----------------------+------------+---------+----------------------+---------+
-    | postgres             | 172.19.0.1/32        | active               |       1 |
-    +----------------------+------------+---------+----------------------+---------+
-
-    ##### --- Counters diff after 10 seconds --- ####
-
-    +----------------------+-------------+------------+--------------+-------------+------------+-------------+------------+-------------+------------+------------+-----------+-----------+-----------+------------+
-    | Database             | Numbackends | XactCommit | XactRollback | BlksRead    | BlksHit    | TupReturned | TupFetched | TupInserted | TupUpdated | TupDeleted | Conflicts | TempFiles | TempBytes | Deadlocks  |
-    +----------------------+-------------+------------+--------------+-------------+------------+-------------+------------+-------------+------------+------------+-----------+-----------+-----------+------------+
-    | postgres             |       0     |       0    |       0      |       0     |       0    |       0     |       0    |       0     |       0    |       0    |       0   |       0   |       0   |       0    |
-    | template0            |       0     |       0    |       0      |       0     |       0    |       0     |       0    |       0     |       0    |       0    |       0   |       0   |       0   |       0    |
-    | template1            |       0     |       0    |       0      |       0     |       0    |       0     |       0    |       0     |       0    |       0    |       0   |       0   |       0   |       0    |
-    +----------------------+-------------+------------+--------------+-------------+------------+-------------+------------+-------------+------------+------------+-----------+-----------+-----------+------------+
-
-    ##### --- Table access per database --- ####
-    Database: postgres
-    +----------------------------------------------------+------+--------------------------------+---------+
-    |                       Relname                      | Kind |             Datname            |  Count  |
-    +----------------------------------------------------+------+--------------------------------+---------+
-    | pg_class                                           |   r  | postgres                       |       1 |
-    | pg_stat_database                                   |   v  | postgres                       |       1 |
-    | pg_locks                                           |   v  | postgres                       |       1 |
-    | pg_class_tblspc_relfilenode_index                  |   i  | postgres                       |       1 |
-    | pg_class_relname_nsp_index                         |   i  | postgres                       |       1 |
-    | pg_class_oid_index                                 |   i  | postgres                       |       1 |
-    +----------------------------------------------------+------+--------------------------------+---------+
-
-    ##### --- Instance settings --- ####
-                          Setting                                            Value
-    allow_system_table_mods                       : off
-    application_name                              :
-    archive_command                               : (disabled)
-    archive_mode                                  : off
-    archive_timeout                               : 0
-    array_nulls                                   : on
-    authentication_timeout                        : 60
-    autovacuum                                    : on
-    autovacuum_analyze_scale_factor               : 0.1
-    autovacuum_analyze_threshold                  : 50
-    autovacuum_freeze_max_age                     : 200000000
-    autovacuum_max_workers                        : 3
-    autovacuum_multixact_freeze_max_age           : 400000000
-    autovacuum_naptime                            : 60
-    autovacuum_vacuum_cost_delay                  : 20
-    autovacuum_vacuum_cost_limit                  : -1
-    autovacuum_vacuum_scale_factor                : 0.2
-    autovacuum_vacuum_threshold                   : 50
-    autovacuum_work_mem                           : -1
-    backend_flush_after                           : 0
-    backslash_quote                               : safe_encoding
-    bgwriter_delay                                : 200
-    bgwriter_flush_after                          : 64
-    bgwriter_lru_maxpages                         : 100
-    bgwriter_lru_multiplier                       : 2
-    block_size                                    : 8192
-    bonjour                                       : off
-    bonjour_name                                  :
-    bytea_output                                  : hex
-    check_function_bodies                         : on
-    checkpoint_completion_target                  : 0.5
-    checkpoint_flush_after                        : 32
-    checkpoint_timeout                            : 300
-    checkpoint_warning                            : 30
-    client_encoding                               : UTF8
-    client_min_messages                           : notice
-    cluster_name                                  :
-    commit_delay                                  : 0
-    commit_siblings                               : 5
-    config_file                                   : /var/lib/postgresql/data/postgresql.conf
-    constraint_exclusion                          : partition
-    cpu_index_tuple_cost                          : 0.005
-    cpu_operator_cost                             : 0.0025
-    cpu_tuple_cost                                : 0.01
-    cursor_tuple_fraction                         : 0.1
-    data_checksums                                : off
-    data_directory                                : /var/lib/postgresql/data
-    data_sync_retry                               : off
-    DateStyle                                     : ISO, MDY
-    db_user_namespace                             : off
-    deadlock_timeout                              : 1000
-    debug_assertions                              : off
-    debug_pretty_print                            : on
-    debug_print_parse                             : off
-    debug_print_plan                              : off
-    debug_print_rewritten                         : off
-    default_statistics_target                     : 100
-    default_tablespace                            :
-    default_text_search_config                    : pg_catalog.english
-    default_transaction_deferrable                : off
-    default_transaction_isolation                 : read committed
-    default_transaction_read_only                 : off
-    default_with_oids                             : off
-    dynamic_library_path                          : $libdir
-    dynamic_shared_memory_type                    : posix
-    effective_cache_size                          : 524288
-    effective_io_concurrency                      : 1
-    enable_bitmapscan                             : on
-    enable_hashagg                                : on
-    enable_hashjoin                               : on
-    enable_indexonlyscan                          : on
-    enable_indexscan                              : on
-    enable_material                               : on
-    enable_mergejoin                              : on
-    enable_nestloop                               : on
-    enable_seqscan                                : on
-    enable_sort                                   : on
-    enable_tidscan                                : on
-    escape_string_warning                         : on
-    event_source                                  : PostgreSQL
-    exit_on_error                                 : off
-    external_pid_file                             :
-    extra_float_digits                            : 2
-    force_parallel_mode                           : off
-    from_collapse_limit                           : 8
-    fsync                                         : on
-    full_page_writes                              : on
-    geqo                                          : on
-    geqo_effort                                   : 5
-    geqo_generations                              : 0
-    geqo_pool_size                                : 0
-    geqo_seed                                     : 0
-    geqo_selection_bias                           : 2
-    geqo_threshold                                : 12
-    gin_fuzzy_search_limit                        : 0
-    gin_pending_list_limit                        : 4096
-    hba_file                                      : /var/lib/postgresql/data/pg_hba.conf
-    hot_standby                                   : off
-    hot_standby_feedback                          : off
-    huge_pages                                    : try
-    ident_file                                    : /var/lib/postgresql/data/pg_ident.conf
-    idle_in_transaction_session_timeout           : 0
-    ignore_checksum_failure                       : off
-    ignore_system_indexes                         : off
-    integer_datetimes                             : on
-    IntervalStyle                                 : postgres
-    join_collapse_limit                           : 8
-    krb_caseins_users                             : off
-    krb_server_keyfile                            : FILE:/etc/postgresql-common/krb5.keytab
-    lc_collate                                    : en_US.utf8
-    lc_ctype                                      : en_US.utf8
-    lc_messages                                   : en_US.utf8
-    lc_monetary                                   : en_US.utf8
-    lc_numeric                                    : en_US.utf8
-    lc_time                                       : en_US.utf8
-    listen_addresses                              : *
-    lo_compat_privileges                          : off
-    local_preload_libraries                       :
-    lock_timeout                                  : 0
-    log_autovacuum_min_duration                   : -1
-    log_checkpoints                               : off
-    log_connections                               : off
-    log_destination                               : stderr
-    log_directory                                 : pg_log
-    log_disconnections                            : off
-    log_duration                                  : off
-    log_error_verbosity                           : default
-    log_executor_stats                            : off
-    log_file_mode                                 : 0600
-    log_filename                                  : postgresql-%Y-%m-%d_%H%M%S.log
-    log_hostname                                  : off
-    log_line_prefix                               :
-    log_lock_waits                                : off
-    log_min_duration_statement                    : -1
-    log_min_error_statement                       : error
-    log_min_messages                              : warning
-    log_parser_stats                              : off
-    log_planner_stats                             : off
-    log_replication_commands                      : off
-    log_rotation_age                              : 1440
-    log_rotation_size                             : 10240
-    log_statement                                 : none
-    log_statement_stats                           : off
-    log_temp_files                                : -1
-    log_timezone                                  : Etc/UTC
-    log_truncate_on_rotation                      : off
-    logging_collector                             : off
-    maintenance_work_mem                          : 65536
-    max_connections                               : 100
-    max_files_per_process                         : 1000
-    max_function_args                             : 100
-    max_identifier_length                         : 63
-    max_index_keys                                : 32
-    max_locks_per_transaction                     : 64
-    max_parallel_workers_per_gather               : 0
-    max_pred_locks_per_transaction                : 64
-    max_prepared_transactions                     : 0
-    max_replication_slots                         : 0
-    max_stack_depth                               : 2048
-    max_standby_archive_delay                     : 30000
-    max_standby_streaming_delay                   : 30000
-    max_wal_senders                               : 0
-    max_wal_size                                  : 64
-    max_worker_processes                          : 8
-    min_parallel_relation_size                    : 1024
-    min_wal_size                                  : 5
-    old_snapshot_threshold                        : -1
-    operator_precedence_warning                   : off
-    parallel_setup_cost                           : 1000
-    parallel_tuple_cost                           : 0.1
-    password_encryption                           : on
-    port                                          : 5432
-    post_auth_delay                               : 0
-    pre_auth_delay                                : 0
-    quote_all_identifiers                         : off
-    random_page_cost                              : 4
-    replacement_sort_tuples                       : 150000
-    restart_after_crash                           : on
-    row_security                                  : on
-    search_path                                   : "$user", public
-    segment_size                                  : 131072
-    seq_page_cost                                 : 1
-    server_encoding                               : UTF8
-    server_version                                : 9.6.17
-    server_version_num                            : 90617
-    session_preload_libraries                     :
-    session_replication_role                      : origin
-    shared_buffers                                : 16384
-    shared_preload_libraries                      :
-    sql_inheritance                               : on
-    ssl                                           : off
-    ssl_ca_file                                   :
-    ssl_cert_file                                 : server.crt
-    ssl_ciphers                                   : HIGH:MEDIUM:+3DES:!aNULL
-    ssl_crl_file                                  :
-    ssl_ecdh_curve                                : prime256v1
-    ssl_key_file                                  : server.key
-    ssl_prefer_server_ciphers                     : on
-    standard_conforming_strings                   : on
-    statement_timeout                             : 0
-    stats_temp_directory                          : pg_stat_tmp
-    superuser_reserved_connections                : 3
-    synchronize_seqscans                          : on
-    synchronous_commit                            : on
-    synchronous_standby_names                     :
-    syslog_facility                               : local0
-    syslog_ident                                  : postgres
-    syslog_sequence_numbers                       : on
-    syslog_split_messages                         : on
-    tcp_keepalives_count                          : 9
-    tcp_keepalives_idle                           : 7200
-    tcp_keepalives_interval                       : 75
-    temp_buffers                                  : 1024
-    temp_file_limit                               : -1
-    temp_tablespaces                              :
-    TimeZone                                      : Etc/UTC
-    timezone_abbreviations                        : Default
-    trace_notify                                  : off
-    trace_recovery_messages                       : log
-    trace_sort                                    : off
-    track_activities                              : on
-    track_activity_query_size                     : 1024
-    track_commit_timestamp                        : off
-    track_counts                                  : on
-    track_functions                               : none
-    track_io_timing                               : off
-    transaction_deferrable                        : off
-    transaction_isolation                         : read committed
-    transaction_read_only                         : off
-    transform_null_equals                         : off
-    unix_socket_directories                       : /var/run/postgresql
-    unix_socket_group                             :
-    unix_socket_permissions                       : 0777
-    update_process_title                          : on
-    vacuum_cost_delay                             : 0
-    vacuum_cost_limit                             : 200
-    vacuum_cost_page_dirty                        : 20
-    vacuum_cost_page_hit                          : 1
-    vacuum_cost_page_miss                         : 10
-    vacuum_defer_cleanup_age                      : 0
-    vacuum_freeze_min_age                         : 50000000
-    vacuum_freeze_table_age                       : 150000000
-    vacuum_multixact_freeze_min_age               : 5000000
-    vacuum_multixact_freeze_table_age             : 150000000
-    wal_block_size                                : 8192
-    wal_buffers                                   : 512
-    wal_compression                               : off
-    wal_keep_segments                             : 0
-    wal_level                                     : minimal
-    wal_log_hints                                 : off
-    wal_receiver_status_interval                  : 10
-    wal_receiver_timeout                          : 60000
-    wal_retrieve_retry_interval                   : 5000
-    wal_segment_size                              : 2048
-    wal_sender_timeout                            : 60000
-    wal_sync_method                               : fdatasync
-    wal_writer_delay                              : 200
-    wal_writer_flush_after                        : 128
-    work_mem                                      : 4096
-    xmlbinary                                     : base64
-    xmloption                                     : content
-    zero_damaged_pages                            : off
-
-    ##### --- Processes start up command --- ####
-    No postgres process found
-
-Minimum auth role
-^^^^^^^^^^^^^^^^^
-
-This program needs to run some commands like ``getShardMap`` and to be able to run those commands
-it needs to run under a user with the ``clusterAdmin`` or ``root`` built-in roles.
diff --git a/docs/pt-pg-summary.rst b/docs/pt-pg-summary.rst
new file mode 120000
index 000000000..7661eb1b3
--- /dev/null
+++ b/docs/pt-pg-summary.rst
@@ -0,0 +1 @@
+../src/go/pt-pg-summary/README.rst
\ No newline at end of file
diff --git a/docs/release_notes.rst b/docs/release_notes.rst
index d8eb3669c..c29b0bb8d 100644
--- a/docs/release_notes.rst
+++ b/docs/release_notes.rst
@@ -1,4 +1,4 @@
-Percona Toolkit
+Release Notes
 ***************
 
 v3.6.0 released 2024-06-12
diff --git a/docs/version-check.rst b/docs/version-check.rst
index 0ba8e5dc5..279d43a56 100644
--- a/docs/version-check.rst
+++ b/docs/version-check.rst
@@ -80,7 +80,7 @@ in case of |pt| `this can be done <https://www.percona.com/doc/percona-toolkit/L
   # Disable Version Check for all tools:
   no-version-check
 
-In case of |pxb| this can be done `in its configuration file <https://www.percona.com/doc/percona-xtrabackup/2.4/using_xtrabackup/configuring.htm>`_ in a similar way::
+In case of |pxb| this can be done `in its configuration file <https://docs.percona.com/percona-xtrabackup/2.4/using_xtrabackup/configuring.html>`_ in a similar way::
 
   [xtrabackup]
   no-version-check
diff --git a/lib/DuplicateKeyFinder.pm b/lib/DuplicateKeyFinder.pm
index 34fa71e7b..0f977c4d8 100644
--- a/lib/DuplicateKeyFinder.pm
+++ b/lib/DuplicateKeyFinder.pm
@@ -154,7 +154,10 @@ sub get_duplicate_keys {
    if ( $clustered_key
         && $args{clustered}
         && $args{tbl_info}->{engine}
-        && $args{tbl_info}->{engine} =~ m/InnoDB/i )
+        && ( $args{tbl_info}->{engine} =~ m/InnoDB/i
+           || $args{tbl_info}->{engine} =~ m/TokuDB/i
+           || $args{tbl_info}->{engine} =~ m/RocksDB/i )
+        )
    {
       PTDEBUG && _d('Removing UNIQUE dupes of clustered key');
       push @dupes,
diff --git a/lib/TableParser.pm b/lib/TableParser.pm
index 1644a6d19..c6c05ec41 100644
--- a/lib/TableParser.pm
+++ b/lib/TableParser.pm
@@ -457,7 +457,7 @@ sub get_keys {
       };
 
       # Find clustered key (issue 295).
-      if ( ($engine || '') =~ m/InnoDB/i && !$clustered_key ) {
+      if ( ($engine || '') =~ m/(InnoDB)|(TokuDB)|(RocksDB)/i && !$clustered_key ) {
          my $this_key = $keys->{$name};
          if ( $this_key->{name} eq 'PRIMARY' ) {
             $clustered_key = 'PRIMARY';
diff --git a/src/go/pt-galera-log-explainer/README.rst b/src/go/pt-galera-log-explainer/README.rst
index 3b3cda00f..6b4f2a365 100644
--- a/src/go/pt-galera-log-explainer/README.rst
+++ b/src/go/pt-galera-log-explainer/README.rst
@@ -244,3 +244,8 @@ Known issues
 * Some information will seems missed. Depending on the case, it may be simply unimplemented yet, or it was disabled later because it was found to be unreliable (node index numbers are not reliable for example)
 * Columns width are sometimes too large to be easily readable. This usually happens when printing SST events with long node names
 * When some display corner-cases seems broken (events not deduplicated, ...), it is because of extra hidden internal events.
+
+Authors
+=======
+
+Yoann La Cancellera
diff --git a/src/go/pt-k8s-debug-collector/README.rst b/src/go/pt-k8s-debug-collector/README.rst
index 6b72ad16f..e2e6012e1 100644
--- a/src/go/pt-k8s-debug-collector/README.rst
+++ b/src/go/pt-k8s-debug-collector/README.rst
@@ -189,3 +189,8 @@ On Kubernetes 1.21 - 1.24 warning is printed:
       resourceVersion: ""
 
 This warning is harmless and does not affect data collection. We will remove podsecuritypolicies once everyone upgrade to Kubernetes 1.25 or newer. Before that we advise to ignore this warning.
+
+Authors
+=======
+
+Max Dudin, Andrii Dema, Carlos Salguero, Sveta Smirnova
diff --git a/src/go/pt-mongodb-index-check/README.rst b/src/go/pt-mongodb-index-check/README.rst
index 3e31f0802..6969f8274 100644
--- a/src/go/pt-mongodb-index-check/README.rst
+++ b/src/go/pt-mongodb-index-check/README.rst
@@ -70,3 +70,7 @@ Available flags
 | –version                   | Show version information               |
 +----------------------------+----------------------------------------+
 
+Authors
+=======
+
+Carlos Salguero
diff --git a/src/go/pt-mongodb-summary/README.rst b/src/go/pt-mongodb-summary/README.rst
index a6b3bb769..05b53c8ca 100644
--- a/src/go/pt-mongodb-summary/README.rst
+++ b/src/go/pt-mongodb-summary/README.rst
@@ -96,3 +96,7 @@ Minimum auth role
 This program needs to run some commands like ``getShardMap`` and to be able to run those commands
 it needs to run under a user with the ``clusterAdmin`` or ``root`` built-in roles.
 
+Authors
+=======
+
+Carlos Salguero
diff --git a/src/go/pt-pg-summary/README.rst b/src/go/pt-pg-summary/README.rst
index 754b03e73..6f070e33f 100644
--- a/src/go/pt-pg-summary/README.rst
+++ b/src/go/pt-pg-summary/README.rst
@@ -1,5 +1,7 @@
-pt-pg-summary
-=============
+========================
+:program:`pt-pg-summary`
+========================
+
 **pt-pg-summary** collects information about a PostgreSQL cluster.
 
 Usage
@@ -23,7 +25,7 @@ Parameters
 +--------+---------------------------------+---------+----------------------------------------------------------------------------+
 |        | ``--databases=DATABASES``       |         | Summarize this comma-separated list of databases. All if not specified.    |
 +--------+---------------------------------+---------+----------------------------------------------------------------------------+
-| ``-h`` | ``--host=HOST``                 |         | Host to connect to.                                                        |
+| ``-h`` | ``--host=HOST``                 |         | Host to connect to or local Unix socket for connection                     |
 +--------+---------------------------------+---------+----------------------------------------------------------------------------+
 | ``-W`` | ``--password=PASSWORD``         |         | Password to use when connecting.                                           |
 +--------+---------------------------------+---------+----------------------------------------------------------------------------+
@@ -471,3 +473,8 @@ Minimum auth role
 
 This program needs to run some commands like ``getShardMap`` and to be able to run those commands
 it needs to run under a user with the ``clusterAdmin`` or ``root`` built-in roles.
+
+Authors
+=======
+
+Carlos Salguero

From d03bd604a1d59a49e5a65c051efb8e66c543e98a Mon Sep 17 00:00:00 2001
From: Sveta Smirnova <sveta.smirnova@percona.com>
Date: Wed, 4 Sep 2024 14:32:15 +0300
Subject: [PATCH 19/31] PT-2340 - Support MySQL 8.4

- Fixed typos
- Added tests for MyRocks and TokuDB clustered indexes into t/pt-duplicate-key-checker/clustered_keys.t
- Updated modules
---
 bin/pt-archiver                             |  2 +-
 bin/pt-find                                 |  2 +-
 bin/pt-heartbeat                            |  2 +-
 bin/pt-index-usage                          |  2 +-
 bin/pt-kill                                 |  2 +-
 bin/pt-online-schema-change                 |  2 +-
 bin/pt-query-digest                         |  2 +-
 bin/pt-table-checksum                       |  2 +-
 bin/pt-table-sync                           |  2 +-
 lib/MasterSlave.pm                          |  2 +-
 lib/VariableAdvisorRules.pm                 |  9 +++-
 sandbox/start-sandbox                       |  9 +++-
 t/pt-duplicate-key-checker/clustered_keys.t | 48 ++++++++++++++++++++-
 t/pt-slave-delay/standard_options.t         |  2 +-
 14 files changed, 72 insertions(+), 16 deletions(-)

diff --git a/bin/pt-archiver b/bin/pt-archiver
index 65b814914..26d4c40d4 100755
--- a/bin/pt-archiver
+++ b/bin/pt-archiver
@@ -2197,7 +2197,7 @@ sub get_keys {
          ddl          => $key_ddl,
       };
 
-      if ( ($engine || '') =~ m/InnoDB/i && !$clustered_key ) {
+      if ( ($engine || '') =~ m/(InnoDB)|(TokuDB)|(RocksDB)/i && !$clustered_key ) {
          my $this_key = $keys->{$name};
          if ( $this_key->{name} eq 'PRIMARY' ) {
             $clustered_key = 'PRIMARY';
diff --git a/bin/pt-find b/bin/pt-find
index c3bdb7ec0..d2d71d762 100755
--- a/bin/pt-find
+++ b/bin/pt-find
@@ -2141,7 +2141,7 @@ sub get_keys {
          ddl          => $key_ddl,
       };
 
-      if ( ($engine || '') =~ m/InnoDB/i && !$clustered_key ) {
+      if ( ($engine || '') =~ m/(InnoDB)|(TokuDB)|(RocksDB)/i && !$clustered_key ) {
          my $this_key = $keys->{$name};
          if ( $this_key->{name} eq 'PRIMARY' ) {
             $clustered_key = 'PRIMARY';
diff --git a/bin/pt-heartbeat b/bin/pt-heartbeat
index aa05c3f11..5ed48dcc9 100755
--- a/bin/pt-heartbeat
+++ b/bin/pt-heartbeat
@@ -4045,7 +4045,7 @@ sub get_keys {
          ddl          => $key_ddl,
       };
 
-      if ( ($engine || '') =~ m/InnoDB/i && !$clustered_key ) {
+      if ( ($engine || '') =~ m/(InnoDB)|(TokuDB)|(RocksDB)/i && !$clustered_key ) {
          my $this_key = $keys->{$name};
          if ( $this_key->{name} eq 'PRIMARY' ) {
             $clustered_key = 'PRIMARY';
diff --git a/bin/pt-index-usage b/bin/pt-index-usage
index 83ff8596d..e852e3d61 100755
--- a/bin/pt-index-usage
+++ b/bin/pt-index-usage
@@ -3393,7 +3393,7 @@ sub get_keys {
          ddl          => $key_ddl,
       };
 
-      if ( ($engine || '') =~ m/InnoDB/i && !$clustered_key ) {
+      if ( ($engine || '') =~ m/(InnoDB)|(TokuDB)|(RocksDB)/i && !$clustered_key ) {
          my $this_key = $keys->{$name};
          if ( $this_key->{name} eq 'PRIMARY' ) {
             $clustered_key = 'PRIMARY';
diff --git a/bin/pt-kill b/bin/pt-kill
index a50a22021..7a6f3d918 100755
--- a/bin/pt-kill
+++ b/bin/pt-kill
@@ -3267,7 +3267,7 @@ sub get_keys {
          ddl          => $key_ddl,
       };
 
-      if ( ($engine || '') =~ m/InnoDB/i && !$clustered_key ) {
+      if ( ($engine || '') =~ m/(InnoDB)|(TokuDB)|(RocksDB)/i && !$clustered_key ) {
          my $this_key = $keys->{$name};
          if ( $this_key->{name} eq 'PRIMARY' ) {
             $clustered_key = 'PRIMARY';
diff --git a/bin/pt-online-schema-change b/bin/pt-online-schema-change
index 9c9d0c784..0d985f5da 100755
--- a/bin/pt-online-schema-change
+++ b/bin/pt-online-schema-change
@@ -3583,7 +3583,7 @@ sub get_keys {
          ddl          => $key_ddl,
       };
 
-      if ( ($engine || '') =~ m/InnoDB/i && !$clustered_key ) {
+      if ( ($engine || '') =~ m/(InnoDB)|(TokuDB)|(RocksDB)/i && !$clustered_key ) {
          my $this_key = $keys->{$name};
          if ( $this_key->{name} eq 'PRIMARY' ) {
             $clustered_key = 'PRIMARY';
diff --git a/bin/pt-query-digest b/bin/pt-query-digest
index c50db0dd3..7dd3e57a8 100755
--- a/bin/pt-query-digest
+++ b/bin/pt-query-digest
@@ -9144,7 +9144,7 @@ sub get_keys {
          ddl          => $key_ddl,
       };
 
-      if ( ($engine || '') =~ m/InnoDB/i && !$clustered_key ) {
+      if ( ($engine || '') =~ m/(InnoDB)|(TokuDB)|(RocksDB)/i && !$clustered_key ) {
          my $this_key = $keys->{$name};
          if ( $this_key->{name} eq 'PRIMARY' ) {
             $clustered_key = 'PRIMARY';
diff --git a/bin/pt-table-checksum b/bin/pt-table-checksum
index 1b20250e7..62fa8ee39 100755
--- a/bin/pt-table-checksum
+++ b/bin/pt-table-checksum
@@ -4777,7 +4777,7 @@ sub get_keys {
          ddl          => $key_ddl,
       };
 
-      if ( ($engine || '') =~ m/InnoDB/i && !$clustered_key ) {
+      if ( ($engine || '') =~ m/(InnoDB)|(TokuDB)|(RocksDB)/i && !$clustered_key ) {
          my $this_key = $keys->{$name};
          if ( $this_key->{name} eq 'PRIMARY' ) {
             $clustered_key = 'PRIMARY';
diff --git a/bin/pt-table-sync b/bin/pt-table-sync
index 711e4973a..4a85f9061 100755
--- a/bin/pt-table-sync
+++ b/bin/pt-table-sync
@@ -3121,7 +3121,7 @@ sub get_keys {
          ddl          => $key_ddl,
       };
 
-      if ( ($engine || '') =~ m/InnoDB/i && !$clustered_key ) {
+      if ( ($engine || '') =~ m/(InnoDB)|(TokuDB)|(RocksDB)/i && !$clustered_key ) {
          my $this_key = $keys->{$name};
          if ( $this_key->{name} eq 'PRIMARY' ) {
             $clustered_key = 'PRIMARY';
diff --git a/lib/MasterSlave.pm b/lib/MasterSlave.pm
index 308a7686a..ece8beac5 100644
--- a/lib/MasterSlave.pm
+++ b/lib/MasterSlave.pm
@@ -562,7 +562,7 @@ sub get_replica_status {
   }
 }
 
-# Gets SHOW SOURCE STATUS, with column names all lowercased, as a hashref.
+# Gets SHOW BINARY LOGS, with column names all lowercased, as a hashref.
 sub get_source_status {
    my ( $self, $dbh ) = @_;
 
diff --git a/lib/VariableAdvisorRules.pm b/lib/VariableAdvisorRules.pm
index 5ac4c88d8..72a5732a5 100644
--- a/lib/VariableAdvisorRules.pm
+++ b/lib/VariableAdvisorRules.pm
@@ -567,7 +567,12 @@ sub get_rules {
          return 1 if   ($mysql_version == '3'   && $mysql_version < '3.23'  )
                     || ($mysql_version == '4'   && $mysql_version < '4.1.20')
                     || ($mysql_version == '5.0' && $mysql_version < '5.0.37')
-                    || ($mysql_version == '5.1' && $mysql_version < '5.1.30');
+                    || ($mysql_version == '5.1' && $mysql_version < '5.1.30')
+                    || ($mysql_version == '5.5' && $mysql_version < '5.5.8')
+                    || ($mysql_version == '5.6' && $mysql_version < '5.6.10')
+                    || ($mysql_version == '5.7' && $mysql_version < '5.7.9')
+                    || ($mysql_version == '8.0' && $mysql_version < '8.0.11')
+                    ;
          return 0;
       },
    },
@@ -577,7 +582,7 @@ sub get_rules {
          my ( %args ) = @_;
          my $mysql_version = $args{mysql_version};
          return 0 unless $mysql_version;
-         return $mysql_version < '5.1' ? 1 : 0;  # 5.1.x
+         return $mysql_version < '8.0' ? 1 : 0;  # 8.x
       },
    },
 };
diff --git a/sandbox/start-sandbox b/sandbox/start-sandbox
index f93cd7a28..4c01bfbb5 100755
--- a/sandbox/start-sandbox
+++ b/sandbox/start-sandbox
@@ -233,10 +233,15 @@ make_sandbox() {
     if [ -x "$PERCONA_TOOLKIT_SANDBOX/bin/ps-admin" ]; then
         # try to enable RocksDB. Only available on Percona Server 5.7.19+
         if [ "$version" > "5.6" -a -n "$ENABLE_ROCKSDB" ]; then
+            sudo rm -f /tmp/ps-admin.err
             $PERCONA_TOOLKIT_SANDBOX/bin/ps-admin --enable-rocksdb -u root -pmsandbox -h 127.1 -P $port
         fi
-        if [ "$version" > "5.6" -a -n "$ENABLE_TOKUDB" ]; then
-            sudo $PERCONA_TOOLKIT_SANDBOX/bin/ps-admin --enable-tokudb -u root -pmsandbox -h 127.1 -P $port
+        if [ -n "$ENABLE_TOKUDB" ]; then
+            $PERCONA_TOOLKIT_BRANCH/util/version_cmp $minor_version "8.0.28-19"
+            if [[ "$?" < "2" ]] && [[ "$version" > "5.6" ]]; then
+                sudo rm -f /tmp/ps-admin.err
+                sudo $PERCONA_TOOLKIT_SANDBOX/bin/ps-admin --enable-tokudb -u root -pmsandbox -h 127.1 -P $port
+            fi
         fi
     fi
 
diff --git a/t/pt-duplicate-key-checker/clustered_keys.t b/t/pt-duplicate-key-checker/clustered_keys.t
index cec74240c..f175fec4d 100644
--- a/t/pt-duplicate-key-checker/clustered_keys.t
+++ b/t/pt-duplicate-key-checker/clustered_keys.t
@@ -53,9 +53,55 @@ ok(
                                  : "$sample/issue_295.txt"),
       transform_sample => $transform_int
    ),
-   "Shorten, not remove, clustered dupes"
+   "Shorten, not remove, clustered dupes - InnoDB"
 ) or diag($test_diff);
 
+SKIP: {
+   skip "This test requires TokuDB", 1 if ( !$sb->has_engine('source', 'TokuDB') ) ;
+
+   $dbh->do('SET binlog_format="ROW"');
+   $dbh->do('ALTER TABLE issue_295.t ENGINE=TokuDB');
+
+   ok(
+      no_diff(
+         sub { pt_duplicate_key_checker::main(@args, qw(-d issue_295)) },
+         "$sample/issue_295-51.txt",
+         transform_sample => $transform_int
+      ),
+      "Shorten, not remove, clustered dupes - TokuDB"
+   )  or diag($test_diff);
+}
+
+SKIP: {
+   skip "This test requires MyRocks", 1 if ( !$sb->has_engine('source', 'ROCKSDB') ) ;
+
+   $dbh->do('SET binlog_format="ROW"');
+   $dbh->do('ALTER TABLE issue_295.t ENGINE=ROCKSDB');
+
+   # MyRocks returns 0 rows istead of 1 in 5.7
+   # As a result, wrong size duplicate indexes reported
+   # We are not going to fix this, because 5.7 is EOL
+   my $transform_len = undef;
+   if ( $sandbox_version ge '5.7' && $sandbox_version lt '8.0' ) {
+      $transform_len = sub {
+         my $txt = slurp_file(shift);
+         $txt =~ s/Size Duplicate Indexes   0/Size Duplicate Indexes   8/g;
+         print $txt;
+      };
+   }
+
+   ok(
+      no_diff(
+         sub { pt_duplicate_key_checker::main(@args, qw(-d issue_295)) },
+         "$sample/issue_295-51.txt",
+         transform_sample => $transform_int,
+         transform_result => $transform_len,
+      ),
+      "Shorten, not remove, clustered dupes - MyRocks"
+   )  or diag($test_diff);
+
+}
+
 # #############################################################################
 # Error if InnoDB table has no PK or unique indexes
 # https://bugs.launchpad.net/percona-toolkit/+bug/1036804
diff --git a/t/pt-slave-delay/standard_options.t b/t/pt-slave-delay/standard_options.t
index ff47c6440..b99291dad 100644
--- a/t/pt-slave-delay/standard_options.t
+++ b/t/pt-slave-delay/standard_options.t
@@ -37,7 +37,7 @@ my $pid_file = "/tmp/pt-slave-delay-test.$PID";
 
 # Check daemonization.  This test used to print to STDOUT, causing
 # false-positive test errors.  The output isn't needed.  The tool
-# said "Reconnected to slave" every time it did SHOW SLAVE STATUS,
+# said "Reconnected to slave" every time it did SHOW REPLICA STATUS,
 # so needlessly.  That was removed.  Now it will print stuff when
 # we kill the process, which we don't want either.
 system("$cmd --delay 1m --interval 1s --run-time 5s --daemonize --pid $pid_file >/dev/null 2>&1");

From c3f327d53b5121e6c12712f33e5014129d4f8b3d Mon Sep 17 00:00:00 2001
From: Sveta Smirnova <sveta.smirnova@percona.com>
Date: Thu, 5 Sep 2024 16:45:45 +0300
Subject: [PATCH 20/31] PT-2340 - Support MySQL 8.4

- Updated tests for pt-variable-advisor and lib/VariableAdvisorRules
---
 t/lib/VariableAdvisorRules.t                           |  6 +++---
 t/pt-variable-advisor/samples/vars001-ignore-rules.txt |  2 ++
 .../samples/vars001-verbose-verbose.txt                |  4 +++-
 t/pt-variable-advisor/samples/vars001-verbose.txt      |  4 +++-
 t/pt-variable-advisor/samples/vars001.txt              |  2 ++
 t/pt-variable-advisor/samples/vars002.txt              |  2 ++
 t/pt-variable-advisor/show_variables_static.t          | 10 +++++-----
 7 files changed, 20 insertions(+), 10 deletions(-)

diff --git a/t/lib/VariableAdvisorRules.t b/t/lib/VariableAdvisorRules.t
index fdb18564f..90e57d1ef 100644
--- a/t/lib/VariableAdvisorRules.t
+++ b/t/lib/VariableAdvisorRules.t
@@ -160,7 +160,7 @@ my @cases = (
    {  name   => "innodb_max_dirty_pages_pct",
       vars   => [qw(innodb_max_dirty_pages_pct 89)],
       mysql_version => VersionParser->new('5.1.59'),
-      advice => [qw(innodb_max_dirty_pages_pct)],
+      advice => ['innodb_max_dirty_pages_pct', 'end-of-life mysql version'],
    },
    {  name   => "key_buffer_size",
       vars   => [qw(key_buffer_size 8388608)],
@@ -378,11 +378,11 @@ my @cases = (
    },
    {  name          => "old mysql version 5.1.29",
       mysql_version => VersionParser->new('5.1.29'),
-      advice        => ['old mysql version'],
+      advice        => ['old mysql version', 'end-of-life mysql version'],
    },
    {  name          => "old mysql version 5.5.0",
       mysql_version => VersionParser->new('5.5.0'),
-      advice        => [],
+      advice        => ['old mysql version', 'end-of-life mysql version'],
    },
 );
 
diff --git a/t/pt-variable-advisor/samples/vars001-ignore-rules.txt b/t/pt-variable-advisor/samples/vars001-ignore-rules.txt
index ac5c2aacd..11fde699d 100644
--- a/t/pt-variable-advisor/samples/vars001-ignore-rules.txt
+++ b/t/pt-variable-advisor/samples/vars001-ignore-rules.txt
@@ -16,3 +16,5 @@
 
 # NOTE innodb_flush_method: Most production database servers that use InnoDB should set innodb_flush_method to O_DIRECT to avoid double-buffering, unless the I/O system is very low performance.
 
+# NOTE end-of-life mysql version: Every release older than 8.0 is now officially end-of-life.
+
diff --git a/t/pt-variable-advisor/samples/vars001-verbose-verbose.txt b/t/pt-variable-advisor/samples/vars001-verbose-verbose.txt
index 075bbe611..ab31bc718 100644
--- a/t/pt-variable-advisor/samples/vars001-verbose-verbose.txt
+++ b/t/pt-variable-advisor/samples/vars001-verbose-verbose.txt
@@ -8,7 +8,7 @@
 
 # NOTE port: The server is listening on a non-default port.
 
-# WARN slave_net_timeout: This variable is set too high.  This is too long to wait before noticing that the connection to the master has failed and retrying.  This should probably be set to 60 seconds or less.  It is also a good idea to use pt-heartbeat to ensure that the connection does not appear to time out when the master is simply idle.
+# WARN slave_net_timeout: This variable is set too high.  This is too long to wait before noticing that the connection to the replication source has failed and retrying. This should probably be set to 60 seconds or less.  It is also a good idea to use pt-heartbeat to ensure that the connection does not appear to time out when the source is simply idle.
 
 # WARN expire_logs_days: Binary logs are enabled, but automatic purging is not enabled.  If you do not purge binary logs, your disk will fill up.  If you delete binary logs externally to MySQL, you will cause unwanted behaviors. Always ask MySQL to purge obsolete logs, never delete them externally.
 
@@ -20,3 +20,5 @@
 
 # WARN sync_binlog: Binary logging is enabled, but sync_binlog isn't configured so that every transaction is flushed to the binary log for durability.
 
+# NOTE end-of-life mysql version: Every release older than 8.0 is now officially end-of-life.
+
diff --git a/t/pt-variable-advisor/samples/vars001-verbose.txt b/t/pt-variable-advisor/samples/vars001-verbose.txt
index 2447917d7..f53769c25 100644
--- a/t/pt-variable-advisor/samples/vars001-verbose.txt
+++ b/t/pt-variable-advisor/samples/vars001-verbose.txt
@@ -8,7 +8,7 @@
 
 # NOTE port: The server is listening on a non-default port. 
 
-# WARN slave_net_timeout: This variable is set too high. This is too long to wait before noticing that the connection to the master has failed and retrying.
+# WARN slave_net_timeout: This variable is set too high. This is too long to wait before noticing that the connection to the replication source has failed and retrying.
 
 # WARN expire_logs_days: Binary logs are enabled, but automatic purging is not enabled. If you do not purge binary logs, your disk will fill up.
 
@@ -20,3 +20,5 @@
 
 # WARN sync_binlog: Binary logging is enabled, but sync_binlog isn't configured so that every transaction is flushed to the binary log for durability. 
 
+# NOTE end-of-life mysql version: Every release older than 8.0 is now officially end-of-life. 
+
diff --git a/t/pt-variable-advisor/samples/vars001.txt b/t/pt-variable-advisor/samples/vars001.txt
index 273a8960c..3900726ff 100644
--- a/t/pt-variable-advisor/samples/vars001.txt
+++ b/t/pt-variable-advisor/samples/vars001.txt
@@ -20,3 +20,5 @@
 
 # WARN sync_binlog: Binary logging is enabled, but sync_binlog isn't configured so that every transaction is flushed to the binary log for durability.
 
+# NOTE end-of-life mysql version: Every release older than 8.0 is now officially end-of-life.
+
diff --git a/t/pt-variable-advisor/samples/vars002.txt b/t/pt-variable-advisor/samples/vars002.txt
index d500767e9..8613db298 100644
--- a/t/pt-variable-advisor/samples/vars002.txt
+++ b/t/pt-variable-advisor/samples/vars002.txt
@@ -18,3 +18,5 @@
 
 # WARN sync_binlog: Binary logging is enabled, but sync_binlog isn't configured so that every transaction is flushed to the binary log for durability.
 
+# NOTE end-of-life mysql version: Every release older than 8.0 is now officially end-of-life.
+
diff --git a/t/pt-variable-advisor/show_variables_static.t b/t/pt-variable-advisor/show_variables_static.t
index e31669dcb..f1026c374 100644
--- a/t/pt-variable-advisor/show_variables_static.t
+++ b/t/pt-variable-advisor/show_variables_static.t
@@ -27,7 +27,7 @@ ok(
       "t/pt-variable-advisor/samples/vars001.txt",
    ),
    "vars001.txt"
-);
+) or diag($test_diff);
 
 ok(
    no_diff(
@@ -36,7 +36,7 @@ ok(
       "t/pt-variable-advisor/samples/vars002.txt",
    ),
    "vars002.txt"
-);
+) or diag($test_diff);
 
 ok(
    no_diff(
@@ -45,7 +45,7 @@ ok(
       "t/pt-variable-advisor/samples/vars001-verbose.txt",
    ),
    "vars001.txt --verbose"
-);
+) or diag($test_diff);
 
 ok(
    no_diff(
@@ -54,7 +54,7 @@ ok(
       "t/pt-variable-advisor/samples/vars001-verbose-verbose.txt",
    ),
    "vars001.txt --verbose --verbose"
-);
+) or diag($test_diff);
 
 ok(
    no_diff(
@@ -64,7 +64,7 @@ ok(
       "t/pt-variable-advisor/samples/vars001-ignore-rules.txt",
    ),
    "--ignore-rules"
-);
+) or diag($test_diff);
 
 my ($output) = full_output(sub {
     pt_variable_advisor::main(@args,

From ea6bd7750195cc5eb07879ae14a242b12d0d6a5f Mon Sep 17 00:00:00 2001
From: Sveta Smirnova <sveta.smirnova@percona.com>
Date: Fri, 6 Sep 2024 13:08:45 +0300
Subject: [PATCH 21/31] PT-2340 - Support MySQL 8.4

- Moved data collection for THP from lib/bash/report_system_info.sh to lib/bash/collect_system_info.sh, so pt-summary reports THP status on the machine where samples were collected, not on the machine where an engineer examines samples.
---
 bin/pt-summary                                |   20 +-
 lib/bash/collect_system_info.sh               |    3 +
 lib/bash/report_system_info.sh                |   18 +-
 t/lib/bash/report_system_info.sh              |    4 -
 t/pt-summary/pt-summary.t                     |    6 +-
 t/pt-summary/samples/Linux/008/dmesg_file     | 1109 +++++++++
 t/pt-summary/samples/Linux/008/dmidecode      |    2 +
 t/pt-summary/samples/Linux/008/ip             |   60 +
 t/pt-summary/samples/Linux/008/lspci_file     |   22 +
 t/pt-summary/samples/Linux/008/lvs.stderr     |    2 +
 t/pt-summary/samples/Linux/008/memory         |   58 +
 t/pt-summary/samples/Linux/008/mounted_fs     |   25 +
 t/pt-summary/samples/Linux/008/netstat        |  213 ++
 t/pt-summary/samples/Linux/008/notable_procs  |    5 +
 t/pt-summary/samples/Linux/008/partitioning   |   12 +
 .../samples/Linux/008/proc_cpuinfo_copy       |  448 ++++
 t/pt-summary/samples/Linux/008/processes      |   10 +
 t/pt-summary/samples/Linux/008/summary        |   23 +
 t/pt-summary/samples/Linux/008/sysctl         | 2010 +++++++++++++++++
 .../samples/Linux/008/transparent_hugepage    |    1 +
 t/pt-summary/samples/Linux/008/uptime         |    1 +
 t/pt-summary/samples/Linux/008/vmstat         |    7 +
 t/pt-summary/samples/Linux/009/dmesg_file     | 1109 +++++++++
 t/pt-summary/samples/Linux/009/dmidecode      |    2 +
 t/pt-summary/samples/Linux/009/ip             |   60 +
 t/pt-summary/samples/Linux/009/lspci_file     |   22 +
 t/pt-summary/samples/Linux/009/lvs.stderr     |    2 +
 t/pt-summary/samples/Linux/009/memory         |   58 +
 t/pt-summary/samples/Linux/009/mounted_fs     |   25 +
 t/pt-summary/samples/Linux/009/netstat        |  230 ++
 t/pt-summary/samples/Linux/009/notable_procs  |    5 +
 t/pt-summary/samples/Linux/009/partitioning   |   12 +
 .../samples/Linux/009/proc_cpuinfo_copy       |  448 ++++
 t/pt-summary/samples/Linux/009/processes      |   10 +
 t/pt-summary/samples/Linux/009/summary        |   23 +
 t/pt-summary/samples/Linux/009/sysctl         | 2010 +++++++++++++++++
 .../samples/Linux/009/transparent_hugepage    |    1 +
 t/pt-summary/samples/Linux/009/uptime         |    1 +
 t/pt-summary/samples/Linux/009/vmstat         |    7 +
 t/pt-summary/samples/Linux/output_002.txt     |    1 -
 t/pt-summary/samples/Linux/output_003.txt     |    1 -
 t/pt-summary/samples/Linux/output_005.txt     |    1 -
 t/pt-summary/samples/Linux/output_006.txt     |    1 -
 t/pt-summary/samples/Linux/output_007.txt     |    1 -
 t/pt-summary/samples/Linux/output_008.txt     |  201 ++
 t/pt-summary/samples/Linux/output_009.txt     |  212 ++
 46 files changed, 8470 insertions(+), 32 deletions(-)
 create mode 100644 t/pt-summary/samples/Linux/008/dmesg_file
 create mode 100644 t/pt-summary/samples/Linux/008/dmidecode
 create mode 100644 t/pt-summary/samples/Linux/008/ip
 create mode 100644 t/pt-summary/samples/Linux/008/lspci_file
 create mode 100644 t/pt-summary/samples/Linux/008/lvs.stderr
 create mode 100644 t/pt-summary/samples/Linux/008/memory
 create mode 100644 t/pt-summary/samples/Linux/008/mounted_fs
 create mode 100644 t/pt-summary/samples/Linux/008/netstat
 create mode 100644 t/pt-summary/samples/Linux/008/notable_procs
 create mode 100644 t/pt-summary/samples/Linux/008/partitioning
 create mode 100644 t/pt-summary/samples/Linux/008/proc_cpuinfo_copy
 create mode 100644 t/pt-summary/samples/Linux/008/processes
 create mode 100644 t/pt-summary/samples/Linux/008/summary
 create mode 100644 t/pt-summary/samples/Linux/008/sysctl
 create mode 100644 t/pt-summary/samples/Linux/008/transparent_hugepage
 create mode 100644 t/pt-summary/samples/Linux/008/uptime
 create mode 100644 t/pt-summary/samples/Linux/008/vmstat
 create mode 100644 t/pt-summary/samples/Linux/009/dmesg_file
 create mode 100644 t/pt-summary/samples/Linux/009/dmidecode
 create mode 100644 t/pt-summary/samples/Linux/009/ip
 create mode 100644 t/pt-summary/samples/Linux/009/lspci_file
 create mode 100644 t/pt-summary/samples/Linux/009/lvs.stderr
 create mode 100644 t/pt-summary/samples/Linux/009/memory
 create mode 100644 t/pt-summary/samples/Linux/009/mounted_fs
 create mode 100644 t/pt-summary/samples/Linux/009/netstat
 create mode 100644 t/pt-summary/samples/Linux/009/notable_procs
 create mode 100644 t/pt-summary/samples/Linux/009/partitioning
 create mode 100644 t/pt-summary/samples/Linux/009/proc_cpuinfo_copy
 create mode 100644 t/pt-summary/samples/Linux/009/processes
 create mode 100644 t/pt-summary/samples/Linux/009/summary
 create mode 100644 t/pt-summary/samples/Linux/009/sysctl
 create mode 100644 t/pt-summary/samples/Linux/009/transparent_hugepage
 create mode 100644 t/pt-summary/samples/Linux/009/uptime
 create mode 100644 t/pt-summary/samples/Linux/009/vmstat
 create mode 100644 t/pt-summary/samples/Linux/output_008.txt
 create mode 100644 t/pt-summary/samples/Linux/output_009.txt

diff --git a/bin/pt-summary b/bin/pt-summary
index 06cf86285..dd61a9f4d 100755
--- a/bin/pt-summary
+++ b/bin/pt-summary
@@ -906,6 +906,8 @@ collect_system_data () { local PTFUNCNAME=collect_system_data;
 
    fio_status_minus_a "$data_dir/fusion-io_card"
 
+   cat /sys/kernel/mm/transparent_hugepage/enabled >"$data_dir/transparent_hugepage" 2>/dev/null
+
    for file in $data_dir/*; do
       [ "$file" = "vmstat" ] && continue
       [ ! -s "$file" ] && rm "$file"
@@ -2338,23 +2340,21 @@ report_system_summary () { local PTFUNCNAME=report_system_summary;
                                        "$platform"
 
    section "Memory management"
-   report_transparent_huge_pages
+   report_transparent_huge_pages "$data_dir/transparent_hugepage"
 
    section "The End"
 }
 
 report_transparent_huge_pages () {
+   local file="$1"
 
-  if [ -f /sys/kernel/mm/transparent_hugepage/enabled ]; then
-    CONTENT_TRANSHP=$(</sys/kernel/mm/transparent_hugepage/enabled)
-    STATUS_THP_SYSTEM=$(echo $CONTENT_TRANSHP | grep -cv '\[never\]')
-  fi
-  if [ $STATUS_THP_SYSTEM = 0 ]; then
-    echo "Transparent huge pages are currently disabled on the system."
-  else
-    echo "Transparent huge pages are enabled."
-  fi
+   [ -e "$file" ] || return
 
+   if [ $(grep -cv '\[never\]' $file) = 0 ]; then
+      echo "Transparent huge pages are currently disabled on the system."
+   else
+      echo "Transparent huge pages are enabled."
+   fi
 }
 
 # ###########################################################################
diff --git a/lib/bash/collect_system_info.sh b/lib/bash/collect_system_info.sh
index 98a918425..a3a84bf93 100644
--- a/lib/bash/collect_system_info.sh
+++ b/lib/bash/collect_system_info.sh
@@ -137,6 +137,9 @@ collect_system_data () { local PTFUNCNAME=collect_system_data;
    # Fusion-io cards
    fio_status_minus_a "$data_dir/fusion-io_card"
 
+   # THP
+   cat /sys/kernel/mm/transparent_hugepage/enabled >"$data_dir/transparent_hugepage" 2>/dev/null
+
    # Clean the data directory, don't leave empty files
    for file in $data_dir/*; do
       # The vmstat file gets special treatmeant, see above.
diff --git a/lib/bash/report_system_info.sh b/lib/bash/report_system_info.sh
index 38afca120..af75e262f 100644
--- a/lib/bash/report_system_info.sh
+++ b/lib/bash/report_system_info.sh
@@ -1137,7 +1137,7 @@ report_system_summary () { local PTFUNCNAME=report_system_summary;
                                        "$platform"
 
    section "Memory management"
-   report_transparent_huge_pages
+   report_transparent_huge_pages "$data_dir/transparent_hugepage"
 
    # ########################################################################
    # All done.  Signal the end so it's explicit.
@@ -1146,17 +1146,15 @@ report_system_summary () { local PTFUNCNAME=report_system_summary;
 }
 
 report_transparent_huge_pages () {
+   local file="$1"
 
-  if [ -f /sys/kernel/mm/transparent_hugepage/enabled ]; then
-    CONTENT_TRANSHP=$(</sys/kernel/mm/transparent_hugepage/enabled)
-    STATUS_THP_SYSTEM=$(echo $CONTENT_TRANSHP | grep -cv '\[never\]')
-  fi
-  if [ $STATUS_THP_SYSTEM = 0 ]; then
-    echo "Transparent huge pages are currently disabled on the system."
-  else
-    echo "Transparent huge pages are enabled."
-  fi
+   [ -e "$file" ] || return
 
+   if [ $(grep -cv '\[never\]' $file) = 0 ]; then
+      echo "Transparent huge pages are currently disabled on the system."
+   else
+      echo "Transparent huge pages are enabled."
+   fi
 }
 
 # ###########################################################################
diff --git a/t/lib/bash/report_system_info.sh b/t/lib/bash/report_system_info.sh
index e988edfbe..46dc0ef79 100644
--- a/t/lib/bash/report_system_info.sh
+++ b/t/lib/bash/report_system_info.sh
@@ -1356,7 +1356,6 @@ Architecture | CPU = 32-bit, OS = 32-bit
  0 0 0   58164  339792     0   0   0   0     0   0   0   0  230  107  229  0  3 97
  0 0 0   58164  339792     0   0   0   0     0   0   0   0  231  115  229  0  5 95
 # Memory management ##########################################
-Transparent huge pages are enabled.
 # The End ####################################################
 EOF
 report_system_summary "$samples/BSD/freebsd_001" | tail -n +3 > "$PT_TMPDIR/got"
@@ -1412,7 +1411,6 @@ Architecture | CPU = 32-bit, OS = 32-bit
  0 0 0  78564  21364    0   0   0    0    0    0  0  0  101   11   9  0 0 100
  0 0 0  78564  21364    0   0   0    0    0    0  0  0  101   11  10  0 0 100
 # Memory management ##########################################
-Transparent huge pages are enabled.
 # The End ####################################################
 EOF
 report_system_summary "$samples/BSD/netbsd_001" | tail -n +3 > "$PT_TMPDIR/got"
@@ -1466,7 +1464,6 @@ Architecture | CPU = 32-bit, OS = 32-bit
  0 0 0   7496  191456 1272   0   0   0   0   0   0   0  256  1973   50  2 12 85
  0 0 0   7496  191456   11   0   0   0   0   0   0   0  230    23   12  0  0 100
 # Memory management ##########################################
-Transparent huge pages are enabled.
 # The End ####################################################
 EOF
 report_system_summary "$samples/BSD/openbsd_001" | tail -n +3  > "$PT_TMPDIR/got"
@@ -1591,7 +1588,6 @@ Unable to collect information
    1  0     0    0     0   150    225    225   1   1  95   3    
    0  0     0    0     0   150    250    250   1   0  99   0    
 # Memory management ##########################################
-Transparent huge pages are enabled.
 # The End ####################################################
 EOF
 
diff --git a/t/pt-summary/pt-summary.t b/t/pt-summary/pt-summary.t
index fdb4c5441..8a8fc43b9 100644
--- a/t/pt-summary/pt-summary.t
+++ b/t/pt-summary/pt-summary.t
@@ -14,15 +14,15 @@ use PerconaTest;
 
 my ($tool) = $PROGRAM_NAME =~ m/([\w-]+)\.t$/;
 
-use Test::More tests => 5;
+use Test::More tests => 7;
 
-for my $i (2..3,5..7) {
+for my $i (2..3,5..9) {
    ok(
       no_diff(
          sub { print `LC_NUMERIC=POSIX $trunk/bin/pt-summary --read-samples "$trunk/t/pt-summary/samples/Linux/00$i/" | tail -n+3` },
          "t/pt-summary/samples/Linux/output_00$i.txt"),
       "--read-samples samples/Linux/00$i works",
-   );
+   ) or diag($test_diff);
 }
 
 exit;
diff --git a/t/pt-summary/samples/Linux/008/dmesg_file b/t/pt-summary/samples/Linux/008/dmesg_file
new file mode 100644
index 000000000..27e3667a2
--- /dev/null
+++ b/t/pt-summary/samples/Linux/008/dmesg_file
@@ -0,0 +1,1109 @@
+[    0.000000] kernel: microcode: updated early: 0x41c -> 0x433, date = 2023-12-05
+[    0.000000] kernel: Linux version 6.5.0-35-generic (buildd@lcy02-amd64-079) (x86_64-linux-gnu-gcc-12 (Ubuntu 12.3.0-1ubuntu1~22.04) 12.3.0, GNU ld (GNU Binutils for Ubuntu) 2.38) #35~22.04.1-Ubuntu SMP PREEMPT_DYNAMIC Tue May  7 09:00:52 UTC 2 (Ubuntu 6.5.0-35.35~22.04.1-generic 6.5.13)
+[    0.000000] kernel: Command line: BOOT_IMAGE=/vmlinuz-6.5.0-35-generic root=/dev/mapper/vgubuntu-root ro quiet splash vt.handoff=7
+[    0.000000] kernel: KERNEL supported cpus:
+[    0.000000] kernel:   Intel GenuineIntel
+[    0.000000] kernel:   AMD AuthenticAMD
+[    0.000000] kernel:   Hygon HygonGenuine
+[    0.000000] kernel:   Centaur CentaurHauls
+[    0.000000] kernel:   zhaoxin   Shanghai  
+[    0.000000] kernel: x86/split lock detection: #AC: crashing the kernel on kernel split_locks and warning on user-space split_locks
+[    0.000000] kernel: BIOS-provided physical RAM map:
+[    0.000000] kernel: BIOS-e820: [mem 0x0000000000000000-0x0000000000000fff] reserved
+[    0.000000] kernel: BIOS-e820: [mem 0x0000000000001000-0x000000000009ffff] usable
+[    0.000000] kernel: BIOS-e820: [mem 0x00000000000a0000-0x00000000000fffff] reserved
+[    0.000000] kernel: BIOS-e820: [mem 0x0000000000100000-0x0000000076936fff] usable
+[    0.000000] kernel: BIOS-e820: [mem 0x0000000076937000-0x000000007694afff] ACPI data
+[    0.000000] kernel: BIOS-e820: [mem 0x000000007694b000-0x000000007694cfff] reserved
+[    0.000000] kernel: BIOS-e820: [mem 0x000000007694d000-0x000000007694dfff] usable
+[    0.000000] kernel: BIOS-e820: [mem 0x000000007694e000-0x0000000076950fff] reserved
+[    0.000000] kernel: BIOS-e820: [mem 0x0000000076951000-0x0000000076952fff] usable
+[    0.000000] kernel: BIOS-e820: [mem 0x0000000076953000-0x0000000076953fff] reserved
+[    0.000000] kernel: BIOS-e820: [mem 0x0000000076954000-0x0000000076954fff] usable
+[    0.000000] kernel: BIOS-e820: [mem 0x0000000076955000-0x00000000803fffff] reserved
+[    0.000000] kernel: BIOS-e820: [mem 0x00000000ff610000-0x00000000ff64ffff] reserved
+[    0.000000] kernel: BIOS-e820: [mem 0x0000000100000000-0x000000107ecaffff] usable
+[    0.000000] kernel: BIOS-e820: [mem 0x000000107ecb0000-0x000000107ecb1fff] ACPI data
+[    0.000000] kernel: BIOS-e820: [mem 0x000000107ecb2000-0x000000107ecc1fff] usable
+[    0.000000] kernel: BIOS-e820: [mem 0x000000107ecc2000-0x000000107ecc2fff] reserved
+[    0.000000] kernel: BIOS-e820: [mem 0x000000107ecc3000-0x000000107ecc4fff] usable
+[    0.000000] kernel: BIOS-e820: [mem 0x000000107ecc5000-0x000000107ecc5fff] ACPI data
+[    0.000000] kernel: BIOS-e820: [mem 0x000000107ecc6000-0x000000107f806fff] usable
+[    0.000000] kernel: BIOS-e820: [mem 0x000000107f807000-0x000000107f808fff] reserved
+[    0.000000] kernel: BIOS-e820: [mem 0x000000107f809000-0x000000107f81afff] usable
+[    0.000000] kernel: BIOS-e820: [mem 0x000000107f81b000-0x000000107f822fff] ACPI NVS
+[    0.000000] kernel: BIOS-e820: [mem 0x000000107f823000-0x000000107f88ffff] usable
+[    0.000000] kernel: BIOS-e820: [mem 0x000000107f890000-0x000000107f893fff] reserved
+[    0.000000] kernel: BIOS-e820: [mem 0x000000107f894000-0x000000107f8a8fff] usable
+[    0.000000] kernel: BIOS-e820: [mem 0x000000107f8a9000-0x000000107f8b2fff] reserved
+[    0.000000] kernel: BIOS-e820: [mem 0x000000107f8b3000-0x000000107f8b3fff] usable
+[    0.000000] kernel: BIOS-e820: [mem 0x000000107f8b4000-0x000000107f8b6fff] reserved
+[    0.000000] kernel: BIOS-e820: [mem 0x000000107f8b7000-0x000000107f8b7fff] usable
+[    0.000000] kernel: BIOS-e820: [mem 0x000000107f8b8000-0x000000107f8bafff] reserved
+[    0.000000] kernel: BIOS-e820: [mem 0x000000107f8bb000-0x000000107f8c5fff] usable
+[    0.000000] kernel: BIOS-e820: [mem 0x000000107f8c6000-0x000000107f8c9fff] reserved
+[    0.000000] kernel: BIOS-e820: [mem 0x000000107f8ca000-0x000000107f8d4fff] usable
+[    0.000000] kernel: BIOS-e820: [mem 0x000000107f8d5000-0x000000107f913fff] reserved
+[    0.000000] kernel: BIOS-e820: [mem 0x000000107f914000-0x000000107f914fff] usable
+[    0.000000] kernel: BIOS-e820: [mem 0x000000107f915000-0x000000107f918fff] reserved
+[    0.000000] kernel: BIOS-e820: [mem 0x000000107f919000-0x000000107f934fff] usable
+[    0.000000] kernel: BIOS-e820: [mem 0x000000107f935000-0x000000107f939fff] reserved
+[    0.000000] kernel: BIOS-e820: [mem 0x000000107f93a000-0x000000107f93dfff] usable
+[    0.000000] kernel: BIOS-e820: [mem 0x000000107f93e000-0x000000107f94efff] reserved
+[    0.000000] kernel: BIOS-e820: [mem 0x000000107f94f000-0x000000107f95dfff] usable
+[    0.000000] kernel: BIOS-e820: [mem 0x000000107f95e000-0x000000107f95efff] reserved
+[    0.000000] kernel: BIOS-e820: [mem 0x000000107f95f000-0x000000107f962fff] usable
+[    0.000000] kernel: BIOS-e820: [mem 0x000000107f963000-0x000000107f963fff] reserved
+[    0.000000] kernel: BIOS-e820: [mem 0x000000107f964000-0x000000107fbfffff] usable
+[    0.000000] kernel: NX (Execute Disable) protection: active
+[    0.000000] kernel: efi: EFI v2.7 by EDK II
+[    0.000000] kernel: efi: SMBIOS=0x76950000 SMBIOS 3.0=0x107f963000 ACPI=0x7694a000 ACPI 2.0=0x7694a014 TPMFinalLog=0x107f81b000 MEMATTR=0x107ecad018 MOKvar=0x107ecc2000 RNG=0x107ecc5b18 TPMEventLog=0x107eca9018 
+[    0.000000] kernel: random: crng init done
+[    0.000000] kernel: efi: Remove mem128: MMIO range=[0xff610000-0xff64ffff] (0MB) from e820 map
+[    0.000000] kernel: e820: remove [mem 0xff610000-0xff64ffff] reserved
+[    0.000000] kernel: secureboot: Secure boot disabled
+[    0.000000] kernel: SMBIOS 3.3.0 present.
+[    0.000000] kernel: DMI: System76 Galago Pro/Galago Pro, BIOS 2022-11-21_b337ac6 11/14/2022
+[    0.000000] kernel: tsc: Detected 2500.000 MHz processor
+[    0.000000] kernel: tsc: Detected 2496.000 MHz TSC
+[    0.000005] kernel: e820: update [mem 0x00000000-0x00000fff] usable ==> reserved
+[    0.000008] kernel: e820: remove [mem 0x000a0000-0x000fffff] usable
+[    0.000031] kernel: last_pfn = 0x107fc00 max_arch_pfn = 0x400000000
+[    0.000037] kernel: MTRR map: 8 entries (3 fixed + 5 variable; max 23), built from 10 variable MTRRs
+[    0.000040] kernel: x86/PAT: Configuration [0-7]: WB  WC  UC- UC  WB  WP  UC- WT  
+[    0.000906] kernel: last_pfn = 0x76955 max_arch_pfn = 0x400000000
+[    0.009848] kernel: Using GB pages for direct mapping
+[    0.009849] kernel: Incomplete global flushes, disabling PCID
+[    0.010864] kernel: secureboot: Secure boot disabled
+[    0.010865] kernel: RAMDISK: [mem 0x107691c000-0x107e54afff]
+[    0.010874] kernel: ACPI: Early table checksum verification disabled
+[    0.010878] kernel: ACPI: RSDP 0x000000007694A014 000024 (v02 COREv4)
+[    0.010885] kernel: ACPI: XSDT 0x000000107ECC5F18 00006C (v01 COREv4 COREBOOT 00000000      01000013)
+[    0.010893] kernel: ACPI: FACP 0x0000000076948000 000114 (v06 COREv4 COREBOOT 00000000 CORE 20220331)
+[    0.010900] kernel: ACPI: DSDT 0x0000000076942000 0054CE (v02 COREv4 COREBOOT 20110725 INTL 20220331)
+[    0.010905] kernel: ACPI: FACS 0x0000000076972240 000040
+[    0.010909] kernel: ACPI: SSDT 0x000000007693D000 004D8A (v02 COREv4 COREBOOT 0000002A CORE 20220331)
+[    0.010913] kernel: ACPI: MCFG 0x000000007693C000 00003C (v01 COREv4 COREBOOT 00000000 CORE 20220331)
+[    0.010917] kernel: ACPI: TPM2 0x000000007693B000 00004C (v04 COREv4 COREBOOT 00000000 CORE 20220331)
+[    0.010921] kernel: ACPI: LPIT 0x000000007693A000 000094 (v00 COREv4 COREBOOT 0000002A CORE 20220331)
+[    0.010925] kernel: ACPI: APIC 0x0000000076939000 0000D2 (v03 COREv4 COREBOOT 00000000 CORE 20220331)
+[    0.010929] kernel: ACPI: DMAR 0x0000000076938000 000088 (v01 COREv4 COREBOOT 00000000 CORE 20220331)
+[    0.010933] kernel: ACPI: HPET 0x0000000076937000 000038 (v01 COREv4 COREBOOT 00000000 CORE 20220331)
+[    0.010936] kernel: ACPI: BGRT 0x000000107ECC5018 000038 (v00 INTEL      EDK2 00001720 PTL  00000002)
+[    0.010940] kernel: ACPI: Reserving FACP table memory at [mem 0x76948000-0x76948113]
+[    0.010942] kernel: ACPI: Reserving DSDT table memory at [mem 0x76942000-0x769474cd]
+[    0.010943] kernel: ACPI: Reserving FACS table memory at [mem 0x76972240-0x7697227f]
+[    0.010945] kernel: ACPI: Reserving SSDT table memory at [mem 0x7693d000-0x76941d89]
+[    0.010946] kernel: ACPI: Reserving MCFG table memory at [mem 0x7693c000-0x7693c03b]
+[    0.010947] kernel: ACPI: Reserving TPM2 table memory at [mem 0x7693b000-0x7693b04b]
+[    0.010948] kernel: ACPI: Reserving LPIT table memory at [mem 0x7693a000-0x7693a093]
+[    0.010949] kernel: ACPI: Reserving APIC table memory at [mem 0x76939000-0x769390d1]
+[    0.010950] kernel: ACPI: Reserving DMAR table memory at [mem 0x76938000-0x76938087]
+[    0.010951] kernel: ACPI: Reserving HPET table memory at [mem 0x76937000-0x76937037]
+[    0.010952] kernel: ACPI: Reserving BGRT table memory at [mem 0x107ecc5018-0x107ecc504f]
+[    0.011202] kernel: No NUMA configuration found
+[    0.011203] kernel: Faking a node at [mem 0x0000000000000000-0x000000107fbfffff]
+[    0.011213] kernel: NODE_DATA(0) allocated [mem 0x107ebd7000-0x107ec01fff]
+[    0.011459] kernel: Zone ranges:
+[    0.011460] kernel:   DMA      [mem 0x0000000000001000-0x0000000000ffffff]
+[    0.011462] kernel:   DMA32    [mem 0x0000000001000000-0x00000000ffffffff]
+[    0.011464] kernel:   Normal   [mem 0x0000000100000000-0x000000107fbfffff]
+[    0.011465] kernel:   Device   empty
+[    0.011467] kernel: Movable zone start for each node
+[    0.011468] kernel: Early memory node ranges
+[    0.011469] kernel:   node   0: [mem 0x0000000000001000-0x000000000009ffff]
+[    0.011471] kernel:   node   0: [mem 0x0000000000100000-0x0000000076936fff]
+[    0.011472] kernel:   node   0: [mem 0x000000007694d000-0x000000007694dfff]
+[    0.011473] kernel:   node   0: [mem 0x0000000076951000-0x0000000076952fff]
+[    0.011474] kernel:   node   0: [mem 0x0000000076954000-0x0000000076954fff]
+[    0.011475] kernel:   node   0: [mem 0x0000000100000000-0x000000107ecaffff]
+[    0.011480] kernel:   node   0: [mem 0x000000107ecb2000-0x000000107ecc1fff]
+[    0.011481] kernel:   node   0: [mem 0x000000107ecc3000-0x000000107ecc4fff]
+[    0.011481] kernel:   node   0: [mem 0x000000107ecc6000-0x000000107f806fff]
+[    0.011482] kernel:   node   0: [mem 0x000000107f809000-0x000000107f81afff]
+[    0.011483] kernel:   node   0: [mem 0x000000107f823000-0x000000107f88ffff]
+[    0.011484] kernel:   node   0: [mem 0x000000107f894000-0x000000107f8a8fff]
+[    0.011485] kernel:   node   0: [mem 0x000000107f8b3000-0x000000107f8b3fff]
+[    0.011486] kernel:   node   0: [mem 0x000000107f8b7000-0x000000107f8b7fff]
+[    0.011486] kernel:   node   0: [mem 0x000000107f8bb000-0x000000107f8c5fff]
+[    0.011487] kernel:   node   0: [mem 0x000000107f8ca000-0x000000107f8d4fff]
+[    0.011488] kernel:   node   0: [mem 0x000000107f914000-0x000000107f914fff]
+[    0.011489] kernel:   node   0: [mem 0x000000107f919000-0x000000107f934fff]
+[    0.011490] kernel:   node   0: [mem 0x000000107f93a000-0x000000107f93dfff]
+[    0.011491] kernel:   node   0: [mem 0x000000107f94f000-0x000000107f95dfff]
+[    0.011491] kernel:   node   0: [mem 0x000000107f95f000-0x000000107f962fff]
+[    0.011492] kernel:   node   0: [mem 0x000000107f964000-0x000000107fbfffff]
+[    0.011494] kernel: Initmem setup node 0 [mem 0x0000000000001000-0x000000107fbfffff]
+[    0.011498] kernel: On node 0, zone DMA: 1 pages in unavailable ranges
+[    0.011518] kernel: On node 0, zone DMA: 96 pages in unavailable ranges
+[    0.013910] kernel: On node 0, zone DMA32: 22 pages in unavailable ranges
+[    0.013912] kernel: On node 0, zone DMA32: 3 pages in unavailable ranges
+[    0.013913] kernel: On node 0, zone DMA32: 1 pages in unavailable ranges
+[    0.098297] kernel: On node 0, zone Normal: 5803 pages in unavailable ranges
+[    0.098299] kernel: On node 0, zone Normal: 2 pages in unavailable ranges
+[    0.098300] kernel: On node 0, zone Normal: 1 pages in unavailable ranges
+[    0.098314] kernel: On node 0, zone Normal: 1 pages in unavailable ranges
+[    0.098314] kernel: On node 0, zone Normal: 2 pages in unavailable ranges
+[    0.098316] kernel: On node 0, zone Normal: 8 pages in unavailable ranges
+[    0.098316] kernel: On node 0, zone Normal: 4 pages in unavailable ranges
+[    0.098317] kernel: On node 0, zone Normal: 10 pages in unavailable ranges
+[    0.098318] kernel: On node 0, zone Normal: 3 pages in unavailable ranges
+[    0.098319] kernel: On node 0, zone Normal: 3 pages in unavailable ranges
+[    0.098320] kernel: On node 0, zone Normal: 4 pages in unavailable ranges
+[    0.098321] kernel: On node 0, zone Normal: 63 pages in unavailable ranges
+[    0.098322] kernel: On node 0, zone Normal: 4 pages in unavailable ranges
+[    0.098323] kernel: On node 0, zone Normal: 5 pages in unavailable ranges
+[    0.098324] kernel: On node 0, zone Normal: 17 pages in unavailable ranges
+[    0.098325] kernel: On node 0, zone Normal: 1 pages in unavailable ranges
+[    0.098329] kernel: On node 0, zone Normal: 1 pages in unavailable ranges
+[    0.098335] kernel: On node 0, zone Normal: 1024 pages in unavailable ranges
+[    0.098360] kernel: Reserving Intel graphics memory at [mem 0x7c800000-0x803fffff]
+[    0.099522] kernel: ACPI: PM-Timer IO Port: 0x1808
+[    0.099531] kernel: ACPI: LAPIC_NMI (acpi_id[0xff] high edge lint[0x1])
+[    0.099571] kernel: IOAPIC[0]: apic_id 2, version 32, address 0xfec00000, GSI 0-119
+[    0.099574] kernel: ACPI: INT_SRC_OVR (bus 0 bus_irq 0 global_irq 2 dfl dfl)
+[    0.099576] kernel: ACPI: INT_SRC_OVR (bus 0 bus_irq 9 global_irq 9 high level)
+[    0.099582] kernel: ACPI: Using ACPI (MADT) for SMP configuration information
+[    0.099583] kernel: ACPI: HPET id: 0x8086a701 base: 0xfed00000
+[    0.099592] kernel: e820: update [mem 0x107ec02000-0x107ec50fff] usable ==> reserved
+[    0.099618] kernel: TSC deadline timer available
+[    0.099619] kernel: smpboot: Allowing 16 CPUs, 0 hotplug CPUs
+[    0.099669] kernel: PM: hibernation: Registered nosave memory: [mem 0x00000000-0x00000fff]
+[    0.099672] kernel: PM: hibernation: Registered nosave memory: [mem 0x000a0000-0x000fffff]
+[    0.099675] kernel: PM: hibernation: Registered nosave memory: [mem 0x76937000-0x7694afff]
+[    0.099676] kernel: PM: hibernation: Registered nosave memory: [mem 0x7694b000-0x7694cfff]
+[    0.099678] kernel: PM: hibernation: Registered nosave memory: [mem 0x7694e000-0x76950fff]
+[    0.099680] kernel: PM: hibernation: Registered nosave memory: [mem 0x76953000-0x76953fff]
+[    0.099682] kernel: PM: hibernation: Registered nosave memory: [mem 0x76955000-0x803fffff]
+[    0.099683] kernel: PM: hibernation: Registered nosave memory: [mem 0x80400000-0xffffffff]
+[    0.099686] kernel: PM: hibernation: Registered nosave memory: [mem 0x107ec02000-0x107ec50fff]
+[    0.099688] kernel: PM: hibernation: Registered nosave memory: [mem 0x107ecb0000-0x107ecb1fff]
+[    0.099690] kernel: PM: hibernation: Registered nosave memory: [mem 0x107ecc2000-0x107ecc2fff]
+[    0.099693] kernel: PM: hibernation: Registered nosave memory: [mem 0x107ecc5000-0x107ecc5fff]
+[    0.099695] kernel: PM: hibernation: Registered nosave memory: [mem 0x107f807000-0x107f808fff]
+[    0.099697] kernel: PM: hibernation: Registered nosave memory: [mem 0x107f81b000-0x107f822fff]
+[    0.099699] kernel: PM: hibernation: Registered nosave memory: [mem 0x107f890000-0x107f893fff]
+[    0.099702] kernel: PM: hibernation: Registered nosave memory: [mem 0x107f8a9000-0x107f8b2fff]
+[    0.099704] kernel: PM: hibernation: Registered nosave memory: [mem 0x107f8b4000-0x107f8b6fff]
+[    0.099706] kernel: PM: hibernation: Registered nosave memory: [mem 0x107f8b8000-0x107f8bafff]
+[    0.099709] kernel: PM: hibernation: Registered nosave memory: [mem 0x107f8c6000-0x107f8c9fff]
+[    0.099711] kernel: PM: hibernation: Registered nosave memory: [mem 0x107f8d5000-0x107f913fff]
+[    0.099714] kernel: PM: hibernation: Registered nosave memory: [mem 0x107f915000-0x107f918fff]
+[    0.099716] kernel: PM: hibernation: Registered nosave memory: [mem 0x107f935000-0x107f939fff]
+[    0.099718] kernel: PM: hibernation: Registered nosave memory: [mem 0x107f93e000-0x107f94efff]
+[    0.099721] kernel: PM: hibernation: Registered nosave memory: [mem 0x107f95e000-0x107f95efff]
+[    0.099723] kernel: PM: hibernation: Registered nosave memory: [mem 0x107f963000-0x107f963fff]
+[    0.099725] kernel: [mem 0x80400000-0xffffffff] available for PCI devices
+[    0.099727] kernel: Booting paravirtualized kernel on bare hardware
+[    0.099729] kernel: clocksource: refined-jiffies: mask: 0xffffffff max_cycles: 0xffffffff, max_idle_ns: 7645519600211568 ns
+[    0.099738] kernel: setup_percpu: NR_CPUS:8192 nr_cpumask_bits:16 nr_cpu_ids:16 nr_node_ids:1
+[    0.100327] kernel: percpu: Embedded 63 pages/cpu s221184 r8192 d28672 u262144
+[    0.100336] kernel: pcpu-alloc: s221184 r8192 d28672 u262144 alloc=1*2097152
+[    0.100338] kernel: pcpu-alloc: [0] 00 01 02 03 04 05 06 07 [0] 08 09 10 11 12 13 14 15 
+[    0.100376] kernel: Kernel command line: BOOT_IMAGE=/vmlinuz-6.5.0-35-generic root=/dev/mapper/vgubuntu-root ro quiet splash vt.handoff=7
+[    0.100453] kernel: Unknown kernel command line parameters "splash BOOT_IMAGE=/vmlinuz-6.5.0-35-generic", will be passed to user space.
+[    0.105784] kernel: Dentry cache hash table entries: 8388608 (order: 14, 67108864 bytes, linear)
+[    0.108450] kernel: Inode-cache hash table entries: 4194304 (order: 13, 33554432 bytes, linear)
+[    0.108703] kernel: Fallback order for Node 0: 0 
+[    0.108707] kernel: Built 1 zonelists, mobility grouping on.  Total pages: 16473637
+[    0.108709] kernel: Policy zone: Normal
+[    0.108715] kernel: mem auto-init: stack:all(zero), heap alloc:on, heap free:off
+[    0.108724] kernel: software IO TLB: area num 16.
+[    0.230610] kernel: Memory: 65515516K/66949476K available (20480K kernel code, 4266K rwdata, 13192K rodata, 4816K init, 17372K bss, 1433700K reserved, 0K cma-reserved)
+[    0.230909] kernel: SLUB: HWalign=64, Order=0-3, MinObjects=0, CPUs=16, Nodes=1
+[    0.230940] kernel: ftrace: allocating 55276 entries in 216 pages
+[    0.239880] kernel: ftrace: allocated 216 pages with 4 groups
+[    0.240689] kernel: Dynamic Preempt: voluntary
+[    0.240742] kernel: rcu: Preemptible hierarchical RCU implementation.
+[    0.240747] kernel: rcu:         RCU restricting CPUs from NR_CPUS=8192 to nr_cpu_ids=16.
+[    0.240751] kernel:         Trampoline variant of Tasks RCU enabled.
+[    0.240754] kernel:         Rude variant of Tasks RCU enabled.
+[    0.240754] kernel:         Tracing variant of Tasks RCU enabled.
+[    0.240756] kernel: rcu: RCU calculated value of scheduler-enlistment delay is 25 jiffies.
+[    0.240757] kernel: rcu: Adjusting geometry for rcu_fanout_leaf=16, nr_cpu_ids=16
+[    0.243656] kernel: NR_IRQS: 524544, nr_irqs: 2184, preallocated irqs: 16
+[    0.243972] kernel: rcu: srcu_init: Setting srcu_struct sizes based on contention.
+[    0.244200] kernel: spurious 8259A interrupt: IRQ7.
+[    0.244241] kernel: Console: colour dummy device 80x25
+[    0.244244] kernel: printk: console [tty0] enabled
+[    0.244296] kernel: ACPI: Core revision 20230331
+[    0.244372] kernel: hpet: HPET dysfunctional in PC10. Force disabled.
+[    0.244373] kernel: APIC: Switch to symmetric I/O mode setup
+[    0.244376] kernel: DMAR: Host address width 39
+[    0.244377] kernel: DMAR: DRHD base: 0x000000fed90000 flags: 0x0
+[    0.244383] kernel: DMAR: dmar0: reg_base_addr fed90000 ver 4:0 cap 1c0000c40660462 ecap 29a00f0505e
+[    0.244386] kernel: DMAR: DRHD base: 0x000000fed91000 flags: 0x1
+[    0.244391] kernel: DMAR: dmar1: reg_base_addr fed91000 ver 5:0 cap d2008c40660462 ecap f050da
+[    0.244394] kernel: DMAR: RMRR base: 0x0000007c000000 end: 0x000000803fffff
+[    0.244396] kernel: DMAR-IR: IOAPIC id 2 under DRHD base  0xfed91000 IOMMU 1
+[    0.244398] kernel: DMAR-IR: HPET id 0 under DRHD base 0xfed91000
+[    0.244399] kernel: DMAR-IR: Queued invalidation will be enabled to support x2apic and Intr-remapping.
+[    0.246277] kernel: DMAR-IR: Enabled IRQ remapping in x2apic mode
+[    0.246280] kernel: x2apic enabled
+[    0.246293] kernel: Switched APIC routing to cluster x2apic.
+[    0.251290] kernel: clocksource: tsc-early: mask: 0xffffffffffffffff max_cycles: 0x23fa772cf26, max_idle_ns: 440795269835 ns
+[    0.251299] kernel: Calibrating delay loop (skipped), value calculated using timer frequency.. 4992.00 BogoMIPS (lpj=9984000)
+[    0.251369] kernel: CPU0: Thermal monitoring enabled (TM1)
+[    0.251371] kernel: x86/cpu: User Mode Instruction Prevention (UMIP) activated
+[    0.251505] kernel: process: using mwait in idle threads
+[    0.251508] kernel: Last level iTLB entries: 4KB 0, 2MB 0, 4MB 0
+[    0.251510] kernel: Last level dTLB entries: 4KB 0, 2MB 0, 4MB 0, 1GB 0
+[    0.251514] kernel: Spectre V1 : Mitigation: usercopy/swapgs barriers and __user pointer sanitization
+[    0.251517] kernel: Spectre V2 : Mitigation: Enhanced / Automatic IBRS
+[    0.251518] kernel: Spectre V2 : Spectre v2 / SpectreRSB mitigation: Filling RSB on context switch
+[    0.251519] kernel: Spectre V2 : Spectre v2 / PBRSB-eIBRS: Retire a single CALL on VMEXIT
+[    0.251521] kernel: Spectre V2 : mitigation: Enabling conditional Indirect Branch Prediction Barrier
+[    0.251523] kernel: Speculative Store Bypass: Mitigation: Speculative Store Bypass disabled via prctl
+[    0.251535] kernel: x86/fpu: Supporting XSAVE feature 0x001: 'x87 floating point registers'
+[    0.251536] kernel: x86/fpu: Supporting XSAVE feature 0x002: 'SSE registers'
+[    0.251537] kernel: x86/fpu: Supporting XSAVE feature 0x004: 'AVX registers'
+[    0.251538] kernel: x86/fpu: Supporting XSAVE feature 0x200: 'Protection Keys User registers'
+[    0.251540] kernel: x86/fpu: xstate_offset[2]:  576, xstate_sizes[2]:  256
+[    0.251541] kernel: x86/fpu: xstate_offset[9]:  832, xstate_sizes[9]:    8
+[    0.251542] kernel: x86/fpu: Enabled xstate features 0x207, context size is 840 bytes, using 'compacted' format.
+[    0.255295] kernel: Freeing SMP alternatives memory: 44K
+[    0.255295] kernel: pid_max: default: 32768 minimum: 301
+[    0.255295] kernel: LSM: initializing lsm=lockdown,capability,landlock,yama,apparmor,integrity
+[    0.255295] kernel: landlock: Up and running.
+[    0.255295] kernel: Yama: becoming mindful.
+[    0.255295] kernel: AppArmor: AppArmor initialized
+[    0.255295] kernel: Mount-cache hash table entries: 131072 (order: 8, 1048576 bytes, linear)
+[    0.255295] kernel: Mountpoint-cache hash table entries: 131072 (order: 8, 1048576 bytes, linear)
+[    0.255295] kernel: smpboot: CPU0: 12th Gen Intel(R) Core(TM) i7-1260P (family: 0x6, model: 0x9a, stepping: 0x3)
+[    0.255295] kernel: RCU Tasks: Setting shift to 4 and lim to 1 rcu_task_cb_adjust=1.
+[    0.255295] kernel: RCU Tasks Rude: Setting shift to 4 and lim to 1 rcu_task_cb_adjust=1.
+[    0.255295] kernel: RCU Tasks Trace: Setting shift to 4 and lim to 1 rcu_task_cb_adjust=1.
+[    0.255295] kernel: Performance Events: XSAVE Architectural LBR, PEBS fmt4+-baseline,  AnyThread deprecated, Alderlake Hybrid events, 32-deep LBR, full-width counters, Intel PMU driver.
+[    0.255295] kernel: core: cpu_core PMU driver: 
+[    0.255295] kernel: ... version:                5
+[    0.255295] kernel: ... bit width:              48
+[    0.255295] kernel: ... generic registers:      8
+[    0.255295] kernel: ... value mask:             0000ffffffffffff
+[    0.255295] kernel: ... max period:             00007fffffffffff
+[    0.255295] kernel: ... fixed-purpose events:   4
+[    0.255295] kernel: ... event mask:             0001000f000000ff
+[    0.255295] kernel: signal: max sigframe size: 3632
+[    0.255295] kernel: Estimated ratio of average max frequency by base frequency (times 1024): 1556
+[    0.255295] kernel: rcu: Hierarchical SRCU implementation.
+[    0.255295] kernel: rcu:         Max phase no-delay instances is 1000.
+[    0.255295] kernel: NMI watchdog: Enabled. Permanently consumes one hw-PMU counter.
+[    0.255295] kernel: smp: Bringing up secondary CPUs ...
+[    0.255295] kernel: smpboot: x86: Booting SMP configuration:
+[    0.255295] kernel: .... node  #0, CPUs:        #2  #4  #6  #8  #9 #10 #11 #12 #13 #14 #15
+[    0.011164] kernel: core: cpu_atom PMU driver: PEBS-via-PT 
+[    0.011164] kernel: ... version:                5
+[    0.011164] kernel: ... bit width:              48
+[    0.011164] kernel: ... generic registers:      6
+[    0.011164] kernel: ... value mask:             0000ffffffffffff
+[    0.011164] kernel: ... max period:             00007fffffffffff
+[    0.011164] kernel: ... fixed-purpose events:   3
+[    0.011164] kernel: ... event mask:             000000070000003f
+[    0.268619] kernel:   #1  #3  #5  #7
+[    0.273112] kernel: smp: Brought up 1 node, 16 CPUs
+[    0.273112] kernel: smpboot: Max logical packages: 1
+[    0.273112] kernel: smpboot: Total of 16 processors activated (79872.00 BogoMIPS)
+[    0.277023] kernel: devtmpfs: initialized
+[    0.277023] kernel: x86/mm: Memory block size: 2048MB
+[    0.277023] kernel: ACPI: PM: Registering ACPI NVS region [mem 0x107f81b000-0x107f822fff] (32768 bytes)
+[    0.277023] kernel: clocksource: jiffies: mask: 0xffffffff max_cycles: 0xffffffff, max_idle_ns: 7645041785100000 ns
+[    0.277023] kernel: futex hash table entries: 4096 (order: 6, 262144 bytes, linear)
+[    0.277023] kernel: pinctrl core: initialized pinctrl subsystem
+[    0.277023] kernel: PM: RTC time: 04:06:19, date: 2024-06-03
+[    0.277023] kernel: NET: Registered PF_NETLINK/PF_ROUTE protocol family
+[    0.277023] kernel: DMA: preallocated 4096 KiB GFP_KERNEL pool for atomic allocations
+[    0.279451] kernel: DMA: preallocated 4096 KiB GFP_KERNEL|GFP_DMA pool for atomic allocations
+[    0.279838] kernel: DMA: preallocated 4096 KiB GFP_KERNEL|GFP_DMA32 pool for atomic allocations
+[    0.279847] kernel: audit: initializing netlink subsys (disabled)
+[    0.279854] kernel: audit: type=2000 audit(1717387579.028:1): state=initialized audit_enabled=0 res=1
+[    0.279854] kernel: thermal_sys: Registered thermal governor 'fair_share'
+[    0.279854] kernel: thermal_sys: Registered thermal governor 'bang_bang'
+[    0.279854] kernel: thermal_sys: Registered thermal governor 'step_wise'
+[    0.279854] kernel: thermal_sys: Registered thermal governor 'user_space'
+[    0.279854] kernel: thermal_sys: Registered thermal governor 'power_allocator'
+[    0.279854] kernel: EISA bus registered
+[    0.279854] kernel: cpuidle: using governor ladder
+[    0.279854] kernel: cpuidle: using governor menu
+[    0.279854] kernel: acpiphp: ACPI Hot Plug PCI Controller Driver version: 0.5
+[    0.279854] kernel: PCI: MMCONFIG for domain 0000 [bus 00-ff] at [mem 0xc0000000-0xcfffffff] (base 0xc0000000)
+[    0.279854] kernel: PCI: not using MMCONFIG
+[    0.279854] kernel: PCI: Using configuration type 1 for base access
+[    0.279854] kernel: kprobes: kprobe jump-optimization is enabled. All kprobes are optimized if possible.
+[    0.279898] kernel: HugeTLB: registered 1.00 GiB page size, pre-allocated 0 pages
+[    0.279901] kernel: HugeTLB: 16380 KiB vmemmap can be freed for a 1.00 GiB page
+[    0.279903] kernel: HugeTLB: registered 2.00 MiB page size, pre-allocated 0 pages
+[    0.279904] kernel: HugeTLB: 28 KiB vmemmap can be freed for a 2.00 MiB page
+[    0.280413] kernel: ACPI: Added _OSI(Module Device)
+[    0.280414] kernel: ACPI: Added _OSI(Processor Device)
+[    0.280416] kernel: ACPI: Added _OSI(3.0 _SCP Extensions)
+[    0.280417] kernel: ACPI: Added _OSI(Processor Aggregator Device)
+[    0.289202] kernel: ACPI: 2 ACPI AML tables successfully acquired and loaded
+[    0.323600] kernel: ACPI: USB4 _OSC: OS supports USB3+ DisplayPort+ PCIe+ XDomain+
+[    0.323602] kernel: ACPI: USB4 _OSC: OS controls USB3+ DisplayPort+ PCIe+ XDomain+
+[    0.323817] kernel: ACPI: EC: EC started
+[    0.323818] kernel: ACPI: EC: interrupt blocked
+[    0.416064] kernel: ACPI: EC: EC_CMD/EC_SC=0x66, EC_DATA=0x62
+[    0.416068] kernel: ACPI: \_SB_.PCI0.LPCB.EC0_: Boot DSDT EC used to handle transactions
+[    0.416071] kernel: ACPI: Interpreter enabled
+[    0.416096] kernel: ACPI: PM: (supports S0 S1 S4 S5)
+[    0.416098] kernel: ACPI: Using IOAPIC for interrupt routing
+[    0.416388] kernel: PCI: MMCONFIG for domain 0000 [bus 00-ff] at [mem 0xc0000000-0xcfffffff] (base 0xc0000000)
+[    0.416599] kernel: PCI: MMCONFIG at [mem 0xc0000000-0xcfffffff] reserved as ACPI motherboard resource
+[    0.416611] kernel: PCI: Using host bridge windows from ACPI; if necessary, use "pci=nocrs" and report a bug
+[    0.416612] kernel: PCI: Using E820 reservations for host bridge windows
+[    0.416769] kernel: ACPI: Enabled 2 GPEs in block 00 to 7F
+[    0.418073] kernel: ACPI: \_SB_.PCI0.RP10.RTD3: New power resource
+[    0.428625] kernel: ACPI: \_SB_.PCI0.TBT0: New power resource
+[    0.428653] kernel: ACPI: \_SB_.PCI0.TBT1: New power resource
+[    0.428676] kernel: ACPI: \_SB_.PCI0.D3C_: New power resource
+[    0.457362] kernel: ACPI: PCI Root Bridge [PCI0] (domain 0000 [bus 00-ff])
+[    0.457369] kernel: acpi PNP0A08:00: _OSC: OS supports [ExtendedConfig ASPM ClockPM Segments MSI EDR HPX-Type3]
+[    0.457397] kernel: acpi PNP0A08:00: _OSC: OS now controls [PCIeHotplug SHPCHotplug PME AER PCIeCapability LTR DPC]
+[    0.458352] kernel: PCI host bridge to bus 0000:00
+[    0.458354] kernel: pci_bus 0000:00: root bus resource [io  0x0000-0x0cf7 window]
+[    0.458356] kernel: pci_bus 0000:00: root bus resource [io  0x0d00-0xffff window]
+[    0.458359] kernel: pci_bus 0000:00: root bus resource [mem 0x000a0000-0x000fffff window]
+[    0.458361] kernel: pci_bus 0000:00: root bus resource [mem 0x80400000-0xdfffffff window]
+[    0.458362] kernel: pci_bus 0000:00: root bus resource [mem 0x107fc00000-0x7fffffffff window]
+[    0.458364] kernel: pci_bus 0000:00: root bus resource [mem 0xfc800000-0xfe7fffff window]
+[    0.458365] kernel: pci_bus 0000:00: root bus resource [mem 0xfed40000-0xfed47fff window]
+[    0.458366] kernel: pci_bus 0000:00: root bus resource [bus 00-ff]
+[    0.458401] kernel: pci 0000:00:00.0: [8086:4621] type 00 class 0x060000
+[    0.458561] kernel: pci 0000:00:02.0: [8086:46a6] type 00 class 0x030000
+[    0.458572] kernel: pci 0000:00:02.0: reg 0x10: [mem 0x81000000-0x81ffffff 64bit]
+[    0.458580] kernel: pci 0000:00:02.0: reg 0x18: [mem 0x90000000-0x9fffffff 64bit pref]
+[    0.458586] kernel: pci 0000:00:02.0: reg 0x20: [io  0x1000-0x103f]
+[    0.458605] kernel: pci 0000:00:02.0: BAR 2: assigned to efifb
+[    0.458607] kernel: pci 0000:00:02.0: DMAR: Skip IOMMU disabling for graphics
+[    0.458611] kernel: pci 0000:00:02.0: Video device with shadowed ROM at [mem 0x000c0000-0x000dffff]
+[    0.458644] kernel: pci 0000:00:02.0: reg 0x344: [mem 0x00000000-0x00ffffff 64bit]
+[    0.458646] kernel: pci 0000:00:02.0: VF(n) BAR0 space: [mem 0x00000000-0x06ffffff 64bit] (contains BAR0 for 7 VFs)
+[    0.458652] kernel: pci 0000:00:02.0: reg 0x34c: [mem 0x00000000-0x1fffffff 64bit pref]
+[    0.458653] kernel: pci 0000:00:02.0: VF(n) BAR2 space: [mem 0x00000000-0xdfffffff 64bit pref] (contains BAR2 for 7 VFs)
+[    0.458785] kernel: pci 0000:00:06.0: [8086:464d] type 01 class 0x060400
+[    0.458907] kernel: pci 0000:00:06.0: PME# supported from D0 D3hot D3cold
+[    0.458947] kernel: pci 0000:00:06.0: PTM enabled (root), 4ns granularity
+[    0.459094] kernel: pci 0000:00:07.0: [8086:466e] type 01 class 0x060400
+[    0.459148] kernel: pci 0000:00:07.0: Overriding RP PIO Log Size to 4
+[    0.459194] kernel: pci 0000:00:07.0: PME# supported from D0 D3hot D3cold
+[    0.459383] kernel: pci 0000:00:0a.0: [8086:467d] type 00 class 0x118000
+[    0.459393] kernel: pci 0000:00:0a.0: reg 0x10: [mem 0x80860000-0x80867fff 64bit]
+[    0.459419] kernel: pci 0000:00:0a.0: enabling Extended Tags
+[    0.459521] kernel: pci 0000:00:0d.0: [8086:461e] type 00 class 0x0c0330
+[    0.459533] kernel: pci 0000:00:0d.0: reg 0x10: [mem 0x80840000-0x8084ffff 64bit]
+[    0.459587] kernel: pci 0000:00:0d.0: PME# supported from D3hot D3cold
+[    0.459697] kernel: pci 0000:00:0d.2: [8086:463e] type 00 class 0x0c0340
+[    0.459710] kernel: pci 0000:00:0d.2: reg 0x10: [mem 0x80800000-0x8083ffff 64bit]
+[    0.459719] kernel: pci 0000:00:0d.2: reg 0x18: [mem 0x80874000-0x80874fff 64bit]
+[    0.459759] kernel: pci 0000:00:0d.2: supports D1 D2
+[    0.459760] kernel: pci 0000:00:0d.2: PME# supported from D0 D1 D2 D3hot D3cold
+[    0.459878] kernel: pci 0000:00:14.0: [8086:51ed] type 00 class 0x0c0330
+[    0.459902] kernel: pci 0000:00:14.0: reg 0x10: [mem 0x80850000-0x8085ffff 64bit]
+[    0.460003] kernel: pci 0000:00:14.0: PME# supported from D3hot D3cold
+[    0.460102] kernel: pci 0000:00:14.2: [8086:51ef] type 00 class 0x050000
+[    0.460128] kernel: pci 0000:00:14.2: reg 0x10: [mem 0xfe010000-0xfe013fff 64bit]
+[    0.460146] kernel: pci 0000:00:14.2: reg 0x18: [mem 0x80875000-0x80875fff 64bit]
+[    0.460367] kernel: pci 0000:00:14.3: [8086:51f0] type 00 class 0x028000
+[    0.460434] kernel: pci 0000:00:14.3: reg 0x10: [mem 0x8086c000-0x8086ffff 64bit]
+[    0.460646] kernel: pci 0000:00:14.3: PME# supported from D0 D3hot D3cold
+[    0.460900] kernel: pci 0000:00:15.0: [8086:51e8] type 00 class 0x0c8000
+[    0.460951] kernel: pci 0000:00:15.0: reg 0x10: [mem 0x80876000-0x80876fff 64bit]
+[    0.461191] kernel: pci 0000:00:15.1: [8086:51e9] type 00 class 0x0c8000
+[    0.461242] kernel: pci 0000:00:15.1: reg 0x10: [mem 0x80877000-0x80877fff 64bit]
+[    0.461489] kernel: pci 0000:00:16.0: [8086:51e0] type 00 class 0x078000
+[    0.461518] kernel: pci 0000:00:16.0: reg 0x10: [mem 0x80878000-0x80878fff 64bit]
+[    0.461632] kernel: pci 0000:00:16.0: PME# supported from D3hot
+[    0.461746] kernel: pci 0000:00:1d.0: [8086:51b0] type 01 class 0x060400
+[    0.461864] kernel: pci 0000:00:1d.0: PME# supported from D0 D3hot D3cold
+[    0.461901] kernel: pci 0000:00:1d.0: PTM enabled (root), 4ns granularity
+[    0.462017] kernel: pci 0000:00:1d.1: [8086:51b1] type 01 class 0x060400
+[    0.462133] kernel: pci 0000:00:1d.1: PME# supported from D0 D3hot D3cold
+[    0.462169] kernel: pci 0000:00:1d.1: PTM enabled (root), 4ns granularity
+[    0.462308] kernel: pci 0000:00:1f.0: [8086:5182] type 00 class 0x060100
+[    0.462516] kernel: pci 0000:00:1f.3: [8086:51c8] type 00 class 0x040300
+[    0.462565] kernel: pci 0000:00:1f.3: reg 0x10: [mem 0x80870000-0x80873fff 64bit]
+[    0.462638] kernel: pci 0000:00:1f.3: reg 0x20: [mem 0x80700000-0x807fffff 64bit]
+[    0.462751] kernel: pci 0000:00:1f.3: PME# supported from D3hot D3cold
+[    0.462897] kernel: pci 0000:00:1f.4: [8086:51a3] type 00 class 0x0c0500
+[    0.462925] kernel: pci 0000:00:1f.4: reg 0x10: [mem 0x8087a000-0x8087a0ff 64bit]
+[    0.462961] kernel: pci 0000:00:1f.4: reg 0x20: [io  0xefa0-0xefbf]
+[    0.463055] kernel: pci 0000:00:1f.5: [8086:51a4] type 00 class 0x0c8000
+[    0.463077] kernel: pci 0000:00:1f.5: reg 0x10: [mem 0x80879000-0x80879fff]
+[    0.463309] kernel: pci 0000:01:00.0: [15b7:5030] type 00 class 0x010802
+[    0.463325] kernel: pci 0000:01:00.0: reg 0x10: [mem 0x80400000-0x80403fff 64bit]
+[    0.463532] kernel: pci 0000:00:06.0: PCI bridge to [bus 01]
+[    0.463536] kernel: pci 0000:00:06.0:   bridge window [mem 0x80400000-0x804fffff]
+[    0.463579] kernel: pci 0000:00:07.0: PCI bridge to [bus 02-2c]
+[    0.463582] kernel: pci 0000:00:07.0:   bridge window [io  0x2000-0x3fff]
+[    0.463585] kernel: pci 0000:00:07.0:   bridge window [mem 0x82000000-0x8e1fffff]
+[    0.463590] kernel: pci 0000:00:07.0:   bridge window [mem 0x107fc00000-0x109bbfffff 64bit pref]
+[    0.463736] kernel: pci 0000:2d:00.0: [1217:8621] type 00 class 0x080501
+[    0.463763] kernel: pci 0000:2d:00.0: reg 0x10: [mem 0x80500000-0x80500fff]
+[    0.463777] kernel: pci 0000:2d:00.0: reg 0x14: [mem 0x80501000-0x805017ff]
+[    0.463950] kernel: pci 0000:2d:00.0: PME# supported from D3hot D3cold
+[    0.475440] kernel: pci 0000:00:1d.0: PCI bridge to [bus 2d]
+[    0.475446] kernel: pci 0000:00:1d.0:   bridge window [mem 0x80500000-0x805fffff]
+[    0.475526] kernel: pci 0000:2e:00.0: [10ec:8168] type 00 class 0x020000
+[    0.475553] kernel: pci 0000:2e:00.0: reg 0x10: [io  0x4000-0x40ff]
+[    0.475590] kernel: pci 0000:2e:00.0: reg 0x18: [mem 0x80604000-0x80604fff 64bit]
+[    0.475613] kernel: pci 0000:2e:00.0: reg 0x20: [mem 0x80600000-0x80603fff 64bit]
+[    0.475752] kernel: pci 0000:2e:00.0: supports D1 D2
+[    0.475753] kernel: pci 0000:2e:00.0: PME# supported from D0 D1 D2 D3hot D3cold
+[    0.476010] kernel: pci 0000:00:1d.1: PCI bridge to [bus 2e]
+[    0.476013] kernel: pci 0000:00:1d.1:   bridge window [io  0x4000-0x4fff]
+[    0.476017] kernel: pci 0000:00:1d.1:   bridge window [mem 0x80600000-0x806fffff]
+[    0.476893] kernel: ACPI Error: AE_NOT_FOUND, While resolving a named reference package element - \_SB_.PCI0.SRAM (20230331/dspkginit-438)
+[    0.476901] kernel: fbcon: Taking over console
+[    0.476936] kernel: ACPI Error: AE_NOT_FOUND, While resolving a named reference package element - \_SB_.PCI0.HEC1 (20230331/dspkginit-438)
+[    0.476983] kernel: ACPI Error: AE_NOT_FOUND, While resolving a named reference package element - \_SB_.PCI0.FSPI (20230331/dspkginit-438)
+[    0.477087] kernel: ACPI Error: AE_NOT_FOUND, While resolving a named reference package element - \_SB_.PCI0.PEG0.MCHC (20230331/dspkginit-438)
+[    0.477098] kernel: ACPI Error: AE_NOT_FOUND, While resolving a named reference package element - \_SB_.PCI0.RP09.MCHC (20230331/dspkginit-438)
+[    0.477109] kernel: ACPI Error: AE_NOT_FOUND, While resolving a named reference package element - \_SB_.PCI0.RP10.MCHC (20230331/dspkginit-438)
+[    0.477221] kernel: Low-power S0 idle used by default for system suspend
+[    0.479845] kernel: ACPI: EC: interrupt unblocked
+[    0.479846] kernel: ACPI: EC: event unblocked
+[    0.479861] kernel: ACPI: EC: EC_CMD/EC_SC=0x66, EC_DATA=0x62
+[    0.479862] kernel: ACPI: EC: GPE=0x6e
+[    0.479863] kernel: ACPI: \_SB_.PCI0.LPCB.EC0_: Boot DSDT EC initialization complete
+[    0.479865] kernel: ACPI: \_SB_.PCI0.LPCB.EC0_: EC: Used to handle transactions and events
+[    0.479941] kernel: iommu: Default domain type: Translated
+[    0.479941] kernel: iommu: DMA domain TLB invalidation policy: lazy mode
+[    0.479941] kernel: SCSI subsystem initialized
+[    0.479941] kernel: libata version 3.00 loaded.
+[    0.479941] kernel: ACPI: bus type USB registered
+[    0.479941] kernel: usbcore: registered new interface driver usbfs
+[    0.479941] kernel: usbcore: registered new interface driver hub
+[    0.479941] kernel: usbcore: registered new device driver usb
+[    0.479941] kernel: pps_core: LinuxPPS API ver. 1 registered
+[    0.479941] kernel: pps_core: Software ver. 5.3.6 - Copyright 2005-2007 Rodolfo Giometti <giometti@linux.it>
+[    0.479941] kernel: PTP clock support registered
+[    0.479941] kernel: EDAC MC: Ver: 3.0.0
+[    0.480356] kernel: efivars: Registered efivars operations
+[    0.480356] kernel: NetLabel: Initializing
+[    0.480356] kernel: NetLabel:  domain hash size = 128
+[    0.480356] kernel: NetLabel:  protocols = UNLABELED CIPSOv4 CALIPSO
+[    0.480356] kernel: NetLabel:  unlabeled traffic allowed by default
+[    0.480356] kernel: mctp: management component transport protocol core
+[    0.480356] kernel: NET: Registered PF_MCTP protocol family
+[    0.480356] kernel: PCI: Using ACPI for IRQ routing
+[    0.502677] kernel: PCI: pci_cache_line_size set to 64 bytes
+[    0.503536] kernel: e820: reserve RAM buffer [mem 0x76937000-0x77ffffff]
+[    0.503540] kernel: e820: reserve RAM buffer [mem 0x7694e000-0x77ffffff]
+[    0.503542] kernel: e820: reserve RAM buffer [mem 0x76953000-0x77ffffff]
+[    0.503543] kernel: e820: reserve RAM buffer [mem 0x76955000-0x77ffffff]
+[    0.503544] kernel: e820: reserve RAM buffer [mem 0x107ec02000-0x107fffffff]
+[    0.503550] kernel: e820: reserve RAM buffer [mem 0x107ecb0000-0x107fffffff]
+[    0.503556] kernel: e820: reserve RAM buffer [mem 0x107ecc2000-0x107fffffff]
+[    0.503561] kernel: e820: reserve RAM buffer [mem 0x107ecc5000-0x107fffffff]
+[    0.503566] kernel: e820: reserve RAM buffer [mem 0x107f807000-0x107fffffff]
+[    0.503571] kernel: e820: reserve RAM buffer [mem 0x107f81b000-0x107fffffff]
+[    0.503576] kernel: e820: reserve RAM buffer [mem 0x107f890000-0x107fffffff]
+[    0.503580] kernel: e820: reserve RAM buffer [mem 0x107f8a9000-0x107fffffff]
+[    0.503584] kernel: e820: reserve RAM buffer [mem 0x107f8b4000-0x107fffffff]
+[    0.503588] kernel: e820: reserve RAM buffer [mem 0x107f8b8000-0x107fffffff]
+[    0.503592] kernel: e820: reserve RAM buffer [mem 0x107f8c6000-0x107fffffff]
+[    0.503595] kernel: e820: reserve RAM buffer [mem 0x107f8d5000-0x107fffffff]
+[    0.503598] kernel: e820: reserve RAM buffer [mem 0x107f915000-0x107fffffff]
+[    0.503601] kernel: e820: reserve RAM buffer [mem 0x107f935000-0x107fffffff]
+[    0.503604] kernel: e820: reserve RAM buffer [mem 0x107f93e000-0x107fffffff]
+[    0.503606] kernel: e820: reserve RAM buffer [mem 0x107f95e000-0x107fffffff]
+[    0.503608] kernel: e820: reserve RAM buffer [mem 0x107f963000-0x107fffffff]
+[    0.503609] kernel: e820: reserve RAM buffer [mem 0x107fc00000-0x107fffffff]
+[    0.503688] kernel: pci 0000:00:02.0: vgaarb: setting as boot VGA device
+[    0.503688] kernel: pci 0000:00:02.0: vgaarb: bridge control possible
+[    0.503688] kernel: pci 0000:00:02.0: vgaarb: VGA device added: decodes=io+mem,owns=io+mem,locks=none
+[    0.503688] kernel: vgaarb: loaded
+[    0.504426] kernel: clocksource: Switched to clocksource tsc-early
+[    0.512989] kernel: VFS: Disk quotas dquot_6.6.0
+[    0.513006] kernel: VFS: Dquot-cache hash table entries: 512 (order 0, 4096 bytes)
+[    0.513132] kernel: AppArmor: AppArmor Filesystem Enabled
+[    0.513148] kernel: pnp: PnP ACPI init
+[    0.513310] kernel: pnp 00:00: disabling [mem 0xc0000000-0xcfffffff] because it overlaps 0000:00:02.0 BAR 9 [mem 0x00000000-0xdfffffff 64bit pref]
+[    0.513345] kernel: system 00:00: [mem 0xfedc0000-0xfeddffff] has been reserved
+[    0.513347] kernel: system 00:00: [mem 0xfeda0000-0xfeda0fff] has been reserved
+[    0.513349] kernel: system 00:00: [mem 0xfeda1000-0xfeda1fff] has been reserved
+[    0.513350] kernel: system 00:00: [mem 0xfed90000-0xfed93fff] could not be reserved
+[    0.513352] kernel: system 00:00: [mem 0xfe000000-0xffffffff] could not be reserved
+[    0.513354] kernel: system 00:00: [mem 0xf8000000-0xf9ffffff] has been reserved
+[    0.513355] kernel: system 00:00: [mem 0xfee00000-0xfeefffff] has been reserved
+[    0.513357] kernel: system 00:00: [mem 0xfed00000-0xfed003ff] has been reserved
+[    0.513407] kernel: system 00:01: [mem 0xfed00000-0xfed003ff] has been reserved
+[    0.513442] kernel: system 00:02: [io  0x1800-0x18fe] has been reserved
+[    0.515056] kernel: pnp: PnP ACPI: found 6 devices
+[    0.520709] kernel: clocksource: acpi_pm: mask: 0xffffff max_cycles: 0xffffff, max_idle_ns: 2085701024 ns
+[    0.520779] kernel: NET: Registered PF_INET protocol family
+[    0.520986] kernel: IP idents hash table entries: 262144 (order: 9, 2097152 bytes, linear)
+[    0.524507] kernel: tcp_listen_portaddr_hash hash table entries: 32768 (order: 7, 524288 bytes, linear)
+[    0.524564] kernel: Table-perturb hash table entries: 65536 (order: 6, 262144 bytes, linear)
+[    0.524962] kernel: TCP established hash table entries: 524288 (order: 10, 4194304 bytes, linear)
+[    0.525543] kernel: TCP bind hash table entries: 65536 (order: 9, 2097152 bytes, linear)
+[    0.525717] kernel: TCP: Hash tables configured (established 524288 bind 65536)
+[    0.525961] kernel: MPTCP token hash table entries: 65536 (order: 8, 1572864 bytes, linear)
+[    0.526154] kernel: UDP hash table entries: 32768 (order: 8, 1048576 bytes, linear)
+[    0.526316] kernel: UDP-Lite hash table entries: 32768 (order: 8, 1048576 bytes, linear)
+[    0.526429] kernel: NET: Registered PF_UNIX/PF_LOCAL protocol family
+[    0.526436] kernel: NET: Registered PF_XDP protocol family
+[    0.526443] kernel: pci_bus 0000:00: max bus depth: 1 pci_try_num: 2
+[    0.526454] kernel: pci 0000:00:02.0: BAR 9: assigned [mem 0x10a0000000-0x117fffffff 64bit pref]
+[    0.526459] kernel: pci 0000:00:02.0: BAR 7: assigned [mem 0x1180000000-0x1186ffffff 64bit]
+[    0.526462] kernel: pci 0000:00:1d.0: BAR 15: assigned [mem 0x109bc00000-0x109bdfffff 64bit pref]
+[    0.526465] kernel: pci 0000:00:1d.0: BAR 13: assigned [io  0x5000-0x5fff]
+[    0.526468] kernel: pci 0000:00:06.0: PCI bridge to [bus 01]
+[    0.526485] kernel: pci 0000:00:06.0:   bridge window [mem 0x80400000-0x804fffff]
+[    0.526506] kernel: pci 0000:00:07.0: PCI bridge to [bus 02-2c]
+[    0.526508] kernel: pci 0000:00:07.0:   bridge window [io  0x2000-0x3fff]
+[    0.526513] kernel: pci 0000:00:07.0:   bridge window [mem 0x82000000-0x8e1fffff]
+[    0.526516] kernel: pci 0000:00:07.0:   bridge window [mem 0x107fc00000-0x109bbfffff 64bit pref]
+[    0.526521] kernel: pci 0000:00:1d.0: PCI bridge to [bus 2d]
+[    0.526525] kernel: pci 0000:00:1d.0:   bridge window [io  0x5000-0x5fff]
+[    0.526530] kernel: pci 0000:00:1d.0:   bridge window [mem 0x80500000-0x805fffff]
+[    0.526534] kernel: pci 0000:00:1d.0:   bridge window [mem 0x109bc00000-0x109bdfffff 64bit pref]
+[    0.526540] kernel: pci 0000:00:1d.1: PCI bridge to [bus 2e]
+[    0.526542] kernel: pci 0000:00:1d.1:   bridge window [io  0x4000-0x4fff]
+[    0.526547] kernel: pci 0000:00:1d.1:   bridge window [mem 0x80600000-0x806fffff]
+[    0.526556] kernel: pci_bus 0000:00: resource 4 [io  0x0000-0x0cf7 window]
+[    0.526558] kernel: pci_bus 0000:00: resource 5 [io  0x0d00-0xffff window]
+[    0.526559] kernel: pci_bus 0000:00: resource 6 [mem 0x000a0000-0x000fffff window]
+[    0.526561] kernel: pci_bus 0000:00: resource 7 [mem 0x80400000-0xdfffffff window]
+[    0.526562] kernel: pci_bus 0000:00: resource 8 [mem 0x107fc00000-0x7fffffffff window]
+[    0.526563] kernel: pci_bus 0000:00: resource 9 [mem 0xfc800000-0xfe7fffff window]
+[    0.526565] kernel: pci_bus 0000:00: resource 10 [mem 0xfed40000-0xfed47fff window]
+[    0.526566] kernel: pci_bus 0000:01: resource 1 [mem 0x80400000-0x804fffff]
+[    0.526568] kernel: pci_bus 0000:02: resource 0 [io  0x2000-0x3fff]
+[    0.526569] kernel: pci_bus 0000:02: resource 1 [mem 0x82000000-0x8e1fffff]
+[    0.526570] kernel: pci_bus 0000:02: resource 2 [mem 0x107fc00000-0x109bbfffff 64bit pref]
+[    0.526572] kernel: pci_bus 0000:2d: resource 0 [io  0x5000-0x5fff]
+[    0.526573] kernel: pci_bus 0000:2d: resource 1 [mem 0x80500000-0x805fffff]
+[    0.526574] kernel: pci_bus 0000:2d: resource 2 [mem 0x109bc00000-0x109bdfffff 64bit pref]
+[    0.526576] kernel: pci_bus 0000:2e: resource 0 [io  0x4000-0x4fff]
+[    0.526577] kernel: pci_bus 0000:2e: resource 1 [mem 0x80600000-0x806fffff]
+[    0.528274] kernel: PCI: CLS 64 bytes, default 64
+[    0.528282] kernel: DMAR: Intel-IOMMU force enabled due to platform opt in
+[    0.528290] kernel: DMAR: No ATSR found
+[    0.528290] kernel: DMAR: No SATC found
+[    0.528291] kernel: DMAR: IOMMU feature fl1gp_support inconsistent
+[    0.528293] kernel: DMAR: IOMMU feature pgsel_inv inconsistent
+[    0.528294] kernel: DMAR: IOMMU feature nwfs inconsistent
+[    0.528294] kernel: DMAR: IOMMU feature dit inconsistent
+[    0.528295] kernel: DMAR: IOMMU feature sc_support inconsistent
+[    0.528296] kernel: DMAR: IOMMU feature dev_iotlb_support inconsistent
+[    0.528297] kernel: DMAR: dmar0: Using Queued invalidation
+[    0.528301] kernel: DMAR: dmar1: Using Queued invalidation
+[    0.528347] kernel: Trying to unpack rootfs image as initramfs...
+[    0.528484] kernel: pci 0000:00:02.0: Adding to iommu group 0
+[    0.528515] kernel: pci 0000:00:00.0: Adding to iommu group 1
+[    0.528526] kernel: pci 0000:00:06.0: Adding to iommu group 2
+[    0.528537] kernel: pci 0000:00:07.0: Adding to iommu group 3
+[    0.528545] kernel: pci 0000:00:0a.0: Adding to iommu group 4
+[    0.528561] kernel: pci 0000:00:0d.0: Adding to iommu group 5
+[    0.528569] kernel: pci 0000:00:0d.2: Adding to iommu group 5
+[    0.528584] kernel: pci 0000:00:14.0: Adding to iommu group 6
+[    0.528593] kernel: pci 0000:00:14.2: Adding to iommu group 6
+[    0.528602] kernel: pci 0000:00:14.3: Adding to iommu group 7
+[    0.528617] kernel: pci 0000:00:15.0: Adding to iommu group 8
+[    0.528626] kernel: pci 0000:00:15.1: Adding to iommu group 8
+[    0.528637] kernel: pci 0000:00:16.0: Adding to iommu group 9
+[    0.528651] kernel: pci 0000:00:1d.0: Adding to iommu group 10
+[    0.528664] kernel: pci 0000:00:1d.1: Adding to iommu group 11
+[    0.528687] kernel: pci 0000:00:1f.0: Adding to iommu group 12
+[    0.528697] kernel: pci 0000:00:1f.3: Adding to iommu group 12
+[    0.528707] kernel: pci 0000:00:1f.4: Adding to iommu group 12
+[    0.528717] kernel: pci 0000:00:1f.5: Adding to iommu group 12
+[    0.528727] kernel: pci 0000:01:00.0: Adding to iommu group 13
+[    0.528738] kernel: pci 0000:2d:00.0: Adding to iommu group 14
+[    0.528748] kernel: pci 0000:2e:00.0: Adding to iommu group 15
+[    0.528898] kernel: DMAR: Intel(R) Virtualization Technology for Directed I/O
+[    0.528899] kernel: PCI-DMA: Using software bounce buffering for IO (SWIOTLB)
+[    0.528900] kernel: software IO TLB: mapped [mem 0x00000000728cb000-0x00000000768cb000] (64MB)
+[    0.529317] kernel: clocksource: tsc: mask: 0xffffffffffffffff max_cycles: 0x23fa772cf26, max_idle_ns: 440795269835 ns
+[    0.529343] kernel: clocksource: Switched to clocksource tsc
+[    0.530014] kernel: Initialise system trusted keyrings
+[    0.530022] kernel: Key type blacklist registered
+[    0.530078] kernel: workingset: timestamp_bits=36 max_order=24 bucket_order=0
+[    0.530091] kernel: zbud: loaded
+[    0.530320] kernel: squashfs: version 4.0 (2009/01/31) Phillip Lougher
+[    0.530418] kernel: fuse: init (API version 7.38)
+[    0.530566] kernel: integrity: Platform Keyring initialized
+[    0.530570] kernel: integrity: Machine keyring initialized
+[    0.537738] kernel: Key type asymmetric registered
+[    0.537740] kernel: Asymmetric key parser 'x509' registered
+[    0.537754] kernel: Block layer SCSI generic (bsg) driver version 0.4 loaded (major 243)
+[    0.537814] kernel: io scheduler mq-deadline registered
+[    0.538540] kernel: pcieport 0000:00:06.0: PME: Signaling with IRQ 122
+[    0.538923] kernel: pcieport 0000:00:07.0: PME: Signaling with IRQ 123
+[    0.539001] kernel: pcieport 0000:00:07.0: AER: enabled with IRQ 123
+[    0.539018] kernel: pcieport 0000:00:07.0: pciehp: Slot #3 AttnBtn- PwrCtrl- MRL- AttnInd- PwrInd- HotPlug+ Surprise+ Interlock- NoCompl+ IbPresDis- LLActRep+
+[    0.539093] kernel: pcieport 0000:00:07.0: DPC: enabled with IRQ 123
+[    0.539095] kernel: pcieport 0000:00:07.0: DPC: error containment capabilities: Int Msg #0, RPExt+ PoisonedTLP- SwTrigger- RP PIO Log 4, DL_ActiveErr-
+[    0.539511] kernel: pcieport 0000:00:1d.0: PME: Signaling with IRQ 124
+[    0.539582] kernel: pcieport 0000:00:1d.0: AER: enabled with IRQ 124
+[    0.539602] kernel: pcieport 0000:00:1d.0: pciehp: Slot #8 AttnBtn- PwrCtrl- MRL- AttnInd- PwrInd- HotPlug+ Surprise+ Interlock- NoCompl+ IbPresDis- LLActRep+
+[    0.540056] kernel: pcieport 0000:00:1d.1: PME: Signaling with IRQ 125
+[    0.540127] kernel: pcieport 0000:00:1d.1: AER: enabled with IRQ 125
+[    0.540226] kernel: shpchp: Standard Hot Plug PCI Controller Driver version: 0.4
+[    0.540277] kernel: efifb: probing for efifb
+[    0.540296] kernel: efifb: showing boot graphics
+[    0.541668] kernel: efifb: framebuffer at 0x90000000, using 8100k, total 8100k
+[    0.541670] kernel: efifb: mode is 1920x1080x32, linelength=7680, pages=1
+[    0.541671] kernel: efifb: scrolling: redraw
+[    0.541672] kernel: efifb: Truecolor: size=8:8:8:8, shift=24:16:8:0
+[    0.541759] kernel: Console: switching to colour frame buffer device 240x67
+[    0.543314] kernel: fb0: EFI VGA frame buffer device
+[    0.544299] kernel: ACPI: AC: AC Adapter [AC] (on-line)
+[    0.544356] kernel: input: Power Button as /devices/LNXSYSTM:00/LNXSYBUS:00/PNP0C0C:00/input/input0
+[    0.544472] kernel: ACPI: button: Power Button [PWRB]
+[    0.544500] kernel: input: Sleep Button as /devices/LNXSYSTM:00/LNXSYBUS:00/PNP0C0E:00/input/input1
+[    0.544613] kernel: ACPI: button: Sleep Button [SLPB]
+[    0.544642] kernel: input: Lid Switch as /devices/LNXSYSTM:00/LNXSYBUS:00/PNP0C0D:00/input/input2
+[    0.544678] kernel: ACPI: button: Lid Switch [LID0]
+[    0.544705] kernel: input: Power Button as /devices/LNXSYSTM:00/LNXPWRBN:00/input/input3
+[    0.544890] kernel: ACPI: button: Power Button [PWRF]
+[    0.546398] kernel: Serial: 8250/16550 driver, 32 ports, IRQ sharing enabled
+[    0.548471] kernel: hpet_acpi_add: no address or irqs in _CRS
+[    0.548484] kernel: Linux agpgart interface v0.103
+[    0.553003] kernel: tpm_tis MSFT0101:00: 2.0 TPM (device-id 0x1B, rev-id 22)
+[    0.616376] kernel: ACPI: battery: Slot [BAT0] (battery present)
+[    1.133733] kernel: loop: module loaded
+[    1.133976] kernel: tun: Universal TUN/TAP device driver, 1.6
+[    1.134052] kernel: PPP generic driver version 2.4.2
+[    1.134209] kernel: i8042: PNP: PS/2 Controller [PNP0303:PS2K,PNP0f13:PS2M] at 0x60,0x64 irq 1,12
+[    1.144708] kernel: serio: i8042 KBD port at 0x60,0x64 irq 1
+[    1.144712] kernel: serio: i8042 AUX port at 0x60,0x64 irq 12
+[    1.144934] kernel: mousedev: PS/2 mouse device common for all mice
+[    1.145498] kernel: rtc_cmos 00:03: RTC can wake from S4
+[    1.146292] kernel: rtc_cmos 00:03: registered as rtc0
+[    1.146457] kernel: rtc_cmos 00:03: setting system clock to 2024-06-03T04:06:20 UTC (1717387580)
+[    1.146489] kernel: rtc_cmos 00:03: alarms up to one month, 242 bytes nvram
+[    1.146496] kernel: i2c_dev: i2c /dev entries driver
+[    1.147760] kernel: device-mapper: core: CONFIG_IMA_DISABLE_HTABLE is disabled. Duplicate IMA measurements will not be recorded in the IMA log.
+[    1.147780] kernel: device-mapper: uevent: version 1.0.3
+[    1.147931] kernel: device-mapper: ioctl: 4.48.0-ioctl (2023-03-01) initialised: dm-devel@redhat.com
+[    1.147965] kernel: platform eisa.0: Probing EISA bus 0
+[    1.147968] kernel: platform eisa.0: EISA: Cannot allocate resource for mainboard
+[    1.147969] kernel: platform eisa.0: Cannot allocate resource for EISA slot 1
+[    1.147971] kernel: platform eisa.0: Cannot allocate resource for EISA slot 2
+[    1.147972] kernel: platform eisa.0: Cannot allocate resource for EISA slot 3
+[    1.147973] kernel: platform eisa.0: Cannot allocate resource for EISA slot 4
+[    1.147974] kernel: platform eisa.0: Cannot allocate resource for EISA slot 5
+[    1.147975] kernel: platform eisa.0: Cannot allocate resource for EISA slot 6
+[    1.147976] kernel: platform eisa.0: Cannot allocate resource for EISA slot 7
+[    1.147977] kernel: platform eisa.0: Cannot allocate resource for EISA slot 8
+[    1.147978] kernel: platform eisa.0: EISA: Detected 0 cards
+[    1.147982] kernel: intel_pstate: Intel P-state driver initializing
+[    1.149039] kernel: input: AT Translated Set 2 keyboard as /devices/platform/i8042/serio0/input/input4
+[    1.149658] kernel: intel_pstate: HWP enabled
+[    1.150348] kernel: ledtrig-cpu: registered to indicate activity on CPUs
+[    1.150429] kernel: intel_pmc_core INT33A1:00:  initialized
+[    1.150494] kernel: drop_monitor: Initializing network drop monitor service
+[    1.159603] kernel: NET: Registered PF_INET6 protocol family
+[    1.191447] kernel: Freeing initrd memory: 127164K
+[    1.195137] kernel: Segment Routing with IPv6
+[    1.195145] kernel: In-situ OAM (IOAM) with IPv6
+[    1.195164] kernel: NET: Registered PF_PACKET protocol family
+[    1.195248] kernel: Key type dns_resolver registered
+[    1.197404] kernel: microcode: Microcode Update Driver: v2.2.
+[    1.197410] kernel: IPI shorthand broadcast: enabled
+[    1.198066] kernel: sched_clock: Marking stable (1190238609, 7164497)->(1242720162, -45317056)
+[    1.198541] kernel: registered taskstats version 1
+[    1.199737] kernel: Loading compiled-in X.509 certificates
+[    1.200208] kernel: Loaded X.509 cert 'Build time autogenerated kernel key: 73705a51282eea04e7eb4bef93768faf542bd3c0'
+[    1.200431] kernel: Loaded X.509 cert 'Canonical Ltd. Live Patch Signing: 14df34d1a87cf37625abec039ef2bf521249b969'
+[    1.200651] kernel: Loaded X.509 cert 'Canonical Ltd. Kernel Module Signing: 88f752e560a1e0737e31163a466ad7b70a850c19'
+[    1.200652] kernel: blacklist: Loading compiled-in revocation X.509 certificates
+[    1.200660] kernel: Loaded X.509 cert 'Canonical Ltd. Secure Boot Signing: 61482aa2830d0ab2ad5af10b7250da9033ddcef0'
+[    1.200668] kernel: Loaded X.509 cert 'Canonical Ltd. Secure Boot Signing (2017): 242ade75ac4a15e50d50c84b0d45ff3eae707a03'
+[    1.200674] kernel: Loaded X.509 cert 'Canonical Ltd. Secure Boot Signing (ESM 2018): 365188c1d374d6b07c3c8f240f8ef722433d6a8b'
+[    1.200680] kernel: Loaded X.509 cert 'Canonical Ltd. Secure Boot Signing (2019): c0746fd6c5da3ae827864651ad66ae47fe24b3e8'
+[    1.200687] kernel: Loaded X.509 cert 'Canonical Ltd. Secure Boot Signing (2021 v1): a8d54bbb3825cfb94fa13c9f8a594a195c107b8d'
+[    1.200693] kernel: Loaded X.509 cert 'Canonical Ltd. Secure Boot Signing (2021 v2): 4cf046892d6fd3c9a5b03f98d845f90851dc6a8c'
+[    1.200700] kernel: Loaded X.509 cert 'Canonical Ltd. Secure Boot Signing (2021 v3): 100437bb6de6e469b581e61cd66bce3ef4ed53af'
+[    1.200710] kernel: Loaded X.509 cert 'Canonical Ltd. Secure Boot Signing (Ubuntu Core 2019): c1d57b8f6b743f23ee41f4f7ee292f06eecadfb9'
+[    1.201574] kernel: Key type .fscrypt registered
+[    1.201575] kernel: Key type fscrypt-provisioning registered
+[    1.201601] kernel: Key type trusted registered
+[    1.204428] kernel: Key type encrypted registered
+[    1.204431] kernel: AppArmor: AppArmor sha1 policy hashing enabled
+[    1.204455] kernel: Loading compiled-in module X.509 certificates
+[    1.204738] kernel: Loaded X.509 cert 'Build time autogenerated kernel key: 73705a51282eea04e7eb4bef93768faf542bd3c0'
+[    1.204739] kernel: ima: Allocated hash algorithm: sha1
+[    1.249894] kernel: ima: No architecture policies found
+[    1.249918] kernel: evm: Initialising EVM extended attributes:
+[    1.249920] kernel: evm: security.selinux
+[    1.249922] kernel: evm: security.SMACK64
+[    1.249924] kernel: evm: security.SMACK64EXEC
+[    1.249925] kernel: evm: security.SMACK64TRANSMUTE
+[    1.249926] kernel: evm: security.SMACK64MMAP
+[    1.249927] kernel: evm: security.apparmor
+[    1.249929] kernel: evm: security.ima
+[    1.249930] kernel: evm: security.capability
+[    1.249931] kernel: evm: HMAC attrs: 0x1
+[    1.250566] kernel: PM:   Magic number: 12:709:109
+[    1.255853] kernel: RAS: Correctable Errors collector initialized.
+[    1.255939] kernel: clk: Disabling unused clocks
+[    1.263480] kernel: Freeing unused decrypted memory: 2036K
+[    1.264110] kernel: Freeing unused kernel image (initmem) memory: 4816K
+[    1.283317] kernel: Write protecting the kernel read-only data: 34816k
+[    1.284111] kernel: Freeing unused kernel image (rodata/data gap) memory: 1144K
+[    1.293223] kernel: x86/mm: Checked W+X mappings: passed, no W+X pages found.
+[    1.293226] kernel: Run /init as init process
+[    1.293227] kernel:   with arguments:
+[    1.293227] kernel:     /init
+[    1.293228] kernel:     splash
+[    1.293228] kernel:   with environment:
+[    1.293229] kernel:     HOME=/
+[    1.293229] kernel:     TERM=linux
+[    1.293229] kernel:     BOOT_IMAGE=/vmlinuz-6.5.0-35-generic
+[    1.333617] kernel: hid: raw HID events driver (C) Jiri Kosina
+[    1.335872] kernel: xhci_hcd 0000:00:0d.0: xHCI Host Controller
+[    1.335880] kernel: xhci_hcd 0000:00:0d.0: new USB bus registered, assigned bus number 1
+[    1.336931] kernel: xhci_hcd 0000:00:0d.0: hcc params 0x20007fc1 hci version 0x120 quirks 0x0000000200009810
+[    1.337127] kernel: xhci_hcd 0000:00:0d.0: xHCI Host Controller
+[    1.337129] kernel: xhci_hcd 0000:00:0d.0: new USB bus registered, assigned bus number 2
+[    1.337131] kernel: xhci_hcd 0000:00:0d.0: Host supports USB 3.2 Enhanced SuperSpeed
+[    1.337159] kernel: usb usb1: New USB device found, idVendor=1d6b, idProduct=0002, bcdDevice= 6.05
+[    1.337161] kernel: usb usb1: New USB device strings: Mfr=3, Product=2, SerialNumber=1
+[    1.337161] kernel: usb usb1: Product: xHCI Host Controller
+[    1.337162] kernel: usb usb1: Manufacturer: Linux 6.5.0-35-generic xhci-hcd
+[    1.337163] kernel: usb usb1: SerialNumber: 0000:00:0d.0
+[    1.337253] kernel: hub 1-0:1.0: USB hub found
+[    1.337261] kernel: hub 1-0:1.0: 1 port detected
+[    1.337477] kernel: sdhci: Secure Digital Host Controller Interface driver
+[    1.337479] kernel: sdhci: Copyright(c) Pierre Ossman
+[    1.337699] kernel: usb usb2: New USB device found, idVendor=1d6b, idProduct=0003, bcdDevice= 6.05
+[    1.337703] kernel: usb usb2: New USB device strings: Mfr=3, Product=2, SerialNumber=1
+[    1.337705] kernel: usb usb2: Product: xHCI Host Controller
+[    1.337707] kernel: usb usb2: Manufacturer: Linux 6.5.0-35-generic xhci-hcd
+[    1.337708] kernel: usb usb2: SerialNumber: 0000:00:0d.0
+[    1.338041] kernel: hub 2-0:1.0: USB hub found
+[    1.338052] kernel: hub 2-0:1.0: 1 port detected
+[    1.338094] kernel: i801_smbus 0000:00:1f.4: SPD Write Disable is set
+[    1.338138] kernel: i801_smbus 0000:00:1f.4: SMBus using PCI interrupt
+[    1.338589] kernel: xhci_hcd 0000:00:14.0: xHCI Host Controller
+[    1.338598] kernel: xhci_hcd 0000:00:14.0: new USB bus registered, assigned bus number 3
+[    1.338632] kernel: i2c i2c-0: 2/2 memory slots populated (from DMI)
+[    1.339064] kernel: i2c i2c-0: Successfully instantiated SPD at 0x50
+[    1.339421] kernel: idma64 idma64.0: Found Intel integrated DMA 64-bit
+[    1.339700] kernel: xhci_hcd 0000:00:14.0: hcc params 0x20007fc1 hci version 0x120 quirks 0x0000100200009810
+[    1.339984] kernel: xhci_hcd 0000:00:14.0: xHCI Host Controller
+[    1.339988] kernel: xhci_hcd 0000:00:14.0: new USB bus registered, assigned bus number 4
+[    1.339990] kernel: xhci_hcd 0000:00:14.0: Host supports USB 3.1 Enhanced SuperSpeed
+[    1.340029] kernel: usb usb3: New USB device found, idVendor=1d6b, idProduct=0002, bcdDevice= 6.05
+[    1.340032] kernel: usb usb3: New USB device strings: Mfr=3, Product=2, SerialNumber=1
+[    1.340033] kernel: usb usb3: Product: xHCI Host Controller
+[    1.340034] kernel: usb usb3: Manufacturer: Linux 6.5.0-35-generic xhci-hcd
+[    1.340035] kernel: usb usb3: SerialNumber: 0000:00:14.0
+[    1.340177] kernel: hub 3-0:1.0: USB hub found
+[    1.340198] kernel: hub 3-0:1.0: 12 ports detected
+[    1.340572] kernel: usb usb4: New USB device found, idVendor=1d6b, idProduct=0003, bcdDevice= 6.05
+[    1.340574] kernel: usb usb4: New USB device strings: Mfr=3, Product=2, SerialNumber=1
+[    1.340576] kernel: usb usb4: Product: xHCI Host Controller
+[    1.340577] kernel: usb usb4: Manufacturer: Linux 6.5.0-35-generic xhci-hcd
+[    1.340578] kernel: usb usb4: SerialNumber: 0000:00:14.0
+[    1.340660] kernel: hub 4-0:1.0: USB hub found
+[    1.340678] kernel: hub 4-0:1.0: 4 ports detected
+[    1.340755] kernel: usb: port power management may be unreliable
+[    1.341605] kernel: idma64 idma64.1: Found Intel integrated DMA 64-bit
+[    1.349109] kernel: ACPI: bus type thunderbolt registered
+[    1.356688] kernel: r8169 0000:2e:00.0 eth0: RTL8168h/8111h, d4:93:90:24:37:9a, XID 541, IRQ 145
+[    1.356691] kernel: r8169 0000:2e:00.0 eth0: jumbo features [frames: 9194 bytes, tx checksumming: ko]
+[    1.359799] kernel: cryptd: max_cpu_qlen set to 1000
+[    1.360071] kernel: nvme nvme0: pci function 0000:01:00.0
+[    1.360075] kernel: ACPI: bus type drm_connector registered
+[    1.361102] kernel: pcieport 0000:00:06.0: can't derive routing for PCI INT A
+[    1.361105] kernel: nvme 0000:01:00.0: PCI INT A: no GSI - using ISA IRQ 11
+[    1.402667] kernel: nvme nvme0: 16/0/0 default/read/poll queues
+[    1.408078] kernel:  nvme0n1: p1 p2 p3
+[    1.426883] kernel: sdhci-pci 0000:2d:00.0: SDHCI controller found [1217:8621] (rev 1)
+[    1.428020] kernel: mmc0: SDHCI controller on PCI [0000:2d:00.0] using ADMA
+[    1.428797] kernel: input: ELAN0412:00 04F3:3240 Mouse as /devices/pci0000:00/0000:00:15.0/i2c_designware.0/i2c-1/i2c-ELAN0412:00/0018:04F3:3240.0001/input/input6
+[    1.428940] kernel: input: ELAN0412:00 04F3:3240 Touchpad as /devices/pci0000:00/0000:00:15.0/i2c_designware.0/i2c-1/i2c-ELAN0412:00/0018:04F3:3240.0001/input/input8
+[    1.429051] kernel: hid-generic 0018:04F3:3240.0001: input,hidraw0: I2C HID v1.00 Mouse [ELAN0412:00 04F3:3240] on i2c-ELAN0412:00
+[    1.433169] kernel: AVX2 version of gcm_enc/dec engaged.
+[    1.433209] kernel: AES CTR mode by8 optimization enabled
+[    1.463382] kernel: r8169 0000:2e:00.0 enp46s0: renamed from eth0
+[    1.607322] kernel: usb 3-1: new full-speed USB device number 2 using xhci_hcd
+[    1.678787] kernel: i915 0000:00:02.0: [drm] VT-d active for gfx access
+[    1.678848] kernel: Console: switching to colour dummy device 80x25
+[    1.678876] kernel: i915 0000:00:02.0: vgaarb: deactivate vga console
+[    1.678910] kernel: i915 0000:00:02.0: [drm] Using Transparent Hugepages
+[    1.731949] kernel: i915 0000:00:02.0: vgaarb: changed VGA decodes: olddecodes=io+mem,decodes=io+mem:owns=io+mem
+[    1.735747] kernel: i915 0000:00:02.0: [drm] Finished loading DMC firmware i915/adlp_dmc.bin (v2.20)
+[    1.747661] kernel: i915 0000:00:02.0: [drm] GT0: GuC firmware i915/adlp_guc_70.bin version 70.5.1
+[    1.747665] kernel: i915 0000:00:02.0: [drm] GT0: HuC firmware i915/tgl_huc.bin version 7.9.3
+[    1.762698] kernel: i915 0000:00:02.0: [drm] GT0: HuC: authenticated for all workloads
+[    1.763074] kernel: usb 3-1: New USB device found, idVendor=046d, idProduct=c52f, bcdDevice=30.00
+[    1.763093] kernel: usb 3-1: New USB device strings: Mfr=1, Product=2, SerialNumber=0
+[    1.763096] kernel: usb 3-1: Product: USB Receiver
+[    1.763098] kernel: usb 3-1: Manufacturer: Logitech
+[    1.763539] kernel: i915 0000:00:02.0: [drm] GT0: GUC: submission enabled
+[    1.763544] kernel: i915 0000:00:02.0: [drm] GT0: GUC: SLPC enabled
+[    1.764142] kernel: i915 0000:00:02.0: [drm] GT0: GUC: RC enabled
+[    1.765164] kernel: i915 0000:00:02.0: [drm] Protected Xe Path (PXP) protected content support initialized
+[    1.891330] kernel: usb 3-7: new high-speed USB device number 3 using xhci_hcd
+[    2.055982] kernel: usb 3-7: New USB device found, idVendor=5986, idProduct=9102, bcdDevice= 6.01
+[    2.055993] kernel: usb 3-7: New USB device strings: Mfr=2, Product=1, SerialNumber=0
+[    2.055996] kernel: usb 3-7: Product: BisonCam,NB Pro
+[    2.055999] kernel: usb 3-7: Manufacturer: Sonix Technology Co., Ltd.
+[    2.183338] kernel: usb 3-10: new full-speed USB device number 4 using xhci_hcd
+[    2.333968] kernel: usb 3-10: New USB device found, idVendor=8087, idProduct=0026, bcdDevice= 0.02
+[    2.333978] kernel: usb 3-10: New USB device strings: Mfr=0, Product=0, SerialNumber=0
+[    2.342146] kernel: input: Logitech USB Receiver as /devices/pci0000:00/0000:00:14.0/usb3/3-1/3-1:1.0/0003:046D:C52F.0002/input/input10
+[    2.342290] kernel: hid-generic 0003:046D:C52F.0002: input,hidraw1: USB HID v1.11 Mouse [Logitech USB Receiver] on usb-0000:00:14.0-1/input0
+[    2.343481] kernel: input: Logitech USB Receiver Consumer Control as /devices/pci0000:00/0000:00:14.0/usb3/3-1/3-1:1.1/0003:046D:C52F.0003/input/input11
+[    2.404036] kernel: hid-generic 0003:046D:C52F.0003: input,hiddev0,hidraw2: USB HID v1.11 Device [Logitech USB Receiver] on usb-0000:00:14.0-1/input1
+[    2.404122] kernel: usbcore: registered new interface driver usbhid
+[    2.404125] kernel: usbhid: USB HID core driver
+[    2.452140] kernel: logitech-djreceiver 0003:046D:C52F.0002: hidraw1: USB HID v1.11 Mouse [Logitech USB Receiver] on usb-0000:00:14.0-1/input0
+[    2.548714] kernel: logitech-djreceiver 0003:046D:C52F.0003: hiddev0,hidraw2: USB HID v1.11 Device [Logitech USB Receiver] on usb-0000:00:14.0-1/input1
+[    2.609154] kernel: logitech-djreceiver 0003:046D:C52F.0003: device of type eQUAD step 4 DJ (0x04) connected on slot 1
+[    2.609879] kernel: input: Logitech Wireless Mouse PID:4080 Mouse as /devices/pci0000:00/0000:00:14.0/usb3/3-1/3-1:1.1/0003:046D:C52F.0003/0003:046D:4080.0004/input/input14
+[    2.610365] kernel: input: Logitech Wireless Mouse PID:4080 Consumer Control as /devices/pci0000:00/0000:00:14.0/usb3/3-1/3-1:1.1/0003:046D:C52F.0003/0003:046D:4080.0004/input/input15
+[    2.610483] kernel: hid-generic 0003:046D:4080.0004: input,hidraw3: USB HID v1.11 Mouse [Logitech Wireless Mouse PID:4080] on usb-0000:00:14.0-1/input1:1
+[    2.713588] kernel: input: Logitech M350 as /devices/pci0000:00/0000:00:14.0/usb3/3-1/3-1:1.1/0003:046D:C52F.0003/0003:046D:4080.0004/input/input19
+[    2.714035] kernel: logitech-hidpp-device 0003:046D:4080.0004: input,hidraw3: USB HID v1.11 Mouse [Logitech M350] on usb-0000:00:14.0-1/input1:1
+[    3.453282] kernel: i915 0000:00:02.0: [drm] Skipping intel_backlight registration
+[    3.454464] kernel: [drm] Initialized i915 1.6.0 20201103 for 0000:00:02.0 on minor 0
+[    3.454768] kernel: ACPI: video: Video Device [GFX0] (multi-head: yes  rom: no  post: no)
+[    3.454884] kernel: input: Video Bus as /devices/LNXSYSTM:00/LNXSYBUS:00/PNP0A08:00/LNXVIDEO:00/input/input20
+[    3.484075] kernel: acpi device:03: registered as cooling_device16
+[    3.486087] kernel: fbcon: i915drmfb (fb0) is primary device
+[    3.500845] kernel: Console: switching to colour frame buffer device 240x67
+[    3.520078] kernel: i915 0000:00:02.0: [drm] fb0: i915drmfb frame buffer device
+[   11.808288] kernel: EXT4-fs (dm-1): mounted filesystem 577da86c-d59d-4e17-97d8-bf7e6b1a5cf1 ro with ordered data mode. Quota mode: none.
+[   11.905769] systemd[1]: Inserted module 'autofs4'
+[   11.915985] systemd[1]: systemd 249.11-0ubuntu3.12 running in system mode (+PAM +AUDIT +SELINUX +APPARMOR +IMA +SMACK +SECCOMP +GCRYPT +GNUTLS +OPENSSL +ACL +BLKID +CURL +ELFUTILS +FIDO2 +IDN2 -IDN +IPTC +KMOD +LIBCRYPTSETUP +LIBFDISK +PCRE2 -PWQUALITY -P11KIT -QRENCODE +BZIP2 +LZ4 +XZ +ZLIB +ZSTD -XKBCOMMON +UTMP +SYSVINIT default-hierarchy=unified)
+[   11.916040] systemd[1]: Detected architecture x86-64.
+[   11.916630] systemd[1]: Hostname set to <s76>.
+[   11.959394] kernel: systemd[1]: memfd_create() called without MFD_EXEC or MFD_NOEXEC_SEAL set
+[   12.139594] systemd[1]: Queued start job for default target Graphical Interface.
+[   12.185937] systemd[1]: Created slice Slice /system/modprobe.
+[   12.186668] systemd[1]: Created slice Slice /system/postgresql.
+[   12.187137] systemd[1]: Created slice Cryptsetup Units Slice.
+[   12.187595] systemd[1]: Created slice Slice /system/systemd-fsck.
+[   12.187905] systemd[1]: Created slice User and Session Slice.
+[   12.188004] systemd[1]: Started Forward Password Requests to Wall Directory Watch.
+[   12.188228] systemd[1]: Set up automount Arbitrary Executable File Formats File System Automount Point.
+[   12.188328] systemd[1]: Reached target User and Group Name Lookups.
+[   12.188345] systemd[1]: Reached target Remote File Systems.
+[   12.188358] systemd[1]: Reached target Slice Units.
+[   12.188382] systemd[1]: Reached target Mounting snaps.
+[   12.188414] systemd[1]: Reached target Local Verity Protected Volumes.
+[   12.188494] systemd[1]: Listening on Device-mapper event daemon FIFOs.
+[   12.188617] systemd[1]: Listening on LVM2 poll daemon socket.
+[   12.189157] systemd[1]: Listening on Syslog Socket.
+[   12.189236] systemd[1]: Listening on fsck to fsckd communication Socket.
+[   12.189278] systemd[1]: Listening on initctl Compatibility Named Pipe.
+[   12.189442] systemd[1]: Listening on Journal Audit Socket.
+[   12.189507] systemd[1]: Listening on Journal Socket (/dev/log).
+[   12.189590] systemd[1]: Listening on Journal Socket.
+[   12.189695] systemd[1]: Listening on udev Control Socket.
+[   12.189770] systemd[1]: Listening on udev Kernel Socket.
+[   12.190596] systemd[1]: Mounting Huge Pages File System...
+[   12.191363] systemd[1]: Mounting POSIX Message Queue File System...
+[   12.192128] systemd[1]: Mounting Kernel Debug File System...
+[   12.192918] systemd[1]: Mounting Kernel Trace File System...
+[   12.194439] systemd[1]: Starting Journal Service...
+[   12.194531] systemd[1]: Finished Availability of block devices.
+[   12.195116] systemd[1]: Starting Set the console keyboard layout...
+[   12.195688] systemd[1]: Starting Create List of Static Device Nodes...
+[   12.196253] systemd[1]: Starting Monitoring of LVM2 mirrors, snapshots etc. using dmeventd or progress polling...
+[   12.196811] systemd[1]: Starting Load Kernel Module configfs...
+[   12.197671] systemd[1]: Starting Load Kernel Module drm...
+[   12.198342] systemd[1]: Starting Load Kernel Module efi_pstore...
+[   12.198935] systemd[1]: Starting Load Kernel Module fuse...
+[   12.199829] systemd[1]: Started Nameserver information manager.
+[   12.200016] systemd[1]: Condition check resulted in File System Check on Root Device being skipped.
+[   12.200987] systemd[1]: Starting Load Kernel Modules...
+[   12.201512] kernel: pstore: Using crash dump compression: deflate
+[   12.201670] systemd[1]: Starting Remount Root and Kernel File Systems...
+[   12.201792] kernel: pstore: Registered efi_pstore as persistent store backend
+[   12.202542] systemd[1]: Starting Coldplug All udev Devices...
+[   12.203777] systemd[1]: Mounted Huge Pages File System.
+[   12.203889] systemd[1]: Mounted POSIX Message Queue File System.
+[   12.203980] systemd[1]: Mounted Kernel Debug File System.
+[   12.204066] systemd[1]: Mounted Kernel Trace File System.
+[   12.204384] systemd[1]: Finished Create List of Static Device Nodes.
+[   12.204616] systemd[1]: modprobe@configfs.service: Deactivated successfully.
+[   12.204820] systemd[1]: Finished Load Kernel Module configfs.
+[   12.204971] systemd[1]: modprobe@drm.service: Deactivated successfully.
+[   12.205089] systemd[1]: Finished Load Kernel Module drm.
+[   12.205189] systemd[1]: modprobe@efi_pstore.service: Deactivated successfully.
+[   12.205297] systemd[1]: Finished Load Kernel Module efi_pstore.
+[   12.205399] systemd[1]: modprobe@fuse.service: Deactivated successfully.
+[   12.205513] systemd[1]: Finished Load Kernel Module fuse.
+[   12.206258] systemd[1]: Mounting FUSE Control File System...
+[   12.206773] systemd[1]: Mounting Kernel Configuration File System...
+[   12.207629] systemd[1]: Mounted FUSE Control File System.
+[   12.208102] systemd[1]: Mounted Kernel Configuration File System.
+[   12.209356] kernel: lp: driver loaded but no devices found
+[   12.211629] kernel: ppdev: user-space parallel port driver
+[   12.220884] systemd[1]: Finished Load Kernel Modules.
+[   12.221007] systemd[1]: Started Journal Service.
+[   12.273299] kernel: EXT4-fs (dm-1): re-mounted 577da86c-d59d-4e17-97d8-bf7e6b1a5cf1 r/w. Quota mode: none.
+[   12.294867] kernel: loop0: detected capacity change from 0 to 8
+[   12.295133] kernel: loop1: detected capacity change from 0 to 20128
+[   12.295740] kernel: loop2: detected capacity change from 0 to 20656
+[   12.296642] kernel: loop3: detected capacity change from 0 to 215872
+[   12.297160] kernel: loop4: detected capacity change from 0 to 212976
+[   12.298118] kernel: loop5: detected capacity change from 0 to 113992
+[   12.298768] kernel: loop6: detected capacity change from 0 to 113992
+[   12.299452] kernel: loop7: detected capacity change from 0 to 130960
+[   12.300146] kernel: loop8: detected capacity change from 0 to 130960
+[   12.300839] kernel: loop9: detected capacity change from 0 to 151992
+[   12.301509] kernel: loop10: detected capacity change from 0 to 152040
+[   12.302242] kernel: loop11: detected capacity change from 0 to 135488
+[   12.302812] kernel: loop12: detected capacity change from 0 to 135520
+[   12.303866] kernel: loop13: detected capacity change from 0 to 87144
+[   12.304366] kernel: loop14: detected capacity change from 0 to 87144
+[   12.305233] kernel: loop15: detected capacity change from 0 to 716168
+[   12.306059] kernel: loop16: detected capacity change from 0 to 716176
+[   12.307181] kernel: loop17: detected capacity change from 0 to 1017816
+[   12.308209] kernel: loop18: detected capacity change from 0 to 1034424
+[   12.309116] kernel: loop19: detected capacity change from 0 to 187776
+[   12.310118] kernel: loop20: detected capacity change from 0 to 36288
+[   12.310935] kernel: loop21: detected capacity change from 0 to 36288
+[   12.311668] kernel: loop22: detected capacity change from 0 to 26472
+[   12.312773] kernel: loop23: detected capacity change from 0 to 25240
+[   12.313268] kernel: loop24: detected capacity change from 0 to 79328
+[   12.313850] kernel: loop25: detected capacity change from 0 to 79520
+[   12.314889] kernel: loop26: detected capacity change from 0 to 952
+[   12.315818] kernel: loop27: detected capacity change from 0 to 904
+[   12.317039] kernel: loop28: detected capacity change from 0 to 52280
+[   12.317616] kernel: loop29: detected capacity change from 0 to 52280
+[   12.359827] kernel: input: Intel HID events as /devices/platform/INT33D5:00/input/input21
+[   12.360013] kernel: intel-hid INT33D5:00: failed to enable HID power button
+[   12.367264] kernel: EDAC MC0: Giving out device to module igen6_edac controller Intel_client_SoC MC#0: DEV 0000:00:00.0 (INTERRUPT)
+[   12.367355] kernel: EDAC MC1: Giving out device to module igen6_edac controller Intel_client_SoC MC#1: DEV 0000:00:00.0 (INTERRUPT)
+[   12.367376] kernel: EDAC igen6 MC1: HANDLING IBECC MEMORY ERROR
+[   12.367377] kernel: EDAC igen6 MC1: ADDR 0x7fffffffe0 
+[   12.367378] kernel: EDAC igen6 MC0: HANDLING IBECC MEMORY ERROR
+[   12.367379] kernel: EDAC igen6 MC0: ADDR 0x7fffffffe0 
+[   12.367428] kernel: EDAC igen6: v2.5.1
+[   12.368112] kernel: input: System76 ACPI Hotkeys as /devices/LNXSYSTM:00/LNXSYBUS:00/17761776:00/input/input22
+[   12.368276] kernel: ACPI: battery: new extension: System76 Battery Extension
+[   12.376267] kernel: ee1004 0-0050: 512 byte EE1004-compliant SPD EEPROM, read-only
+[   12.383289] kernel: mc: Linux media interface: v0.10
+[   12.384402] kernel: spi-nor spi0.0: gd25q256 (32768 Kbytes)
+[   12.462717] kernel: Adding 1998844k swap on /dev/mapper/vgubuntu-swap_1.  Priority:-2 extents:1 across:1998844k SSFS
+[   12.480400] kernel: Bluetooth: Core ver 2.22
+[   12.480424] kernel: NET: Registered PF_BLUETOOTH protocol family
+[   12.480425] kernel: Bluetooth: HCI device and connection manager initialized
+[   12.480430] kernel: Bluetooth: HCI socket layer initialized
+[   12.480431] kernel: Bluetooth: L2CAP socket layer initialized
+[   12.480434] kernel: Bluetooth: SCO socket layer initialized
+[   12.481064] kernel: cfg80211: Loading compiled-in X.509 certificates for regulatory database
+[   12.481713] kernel: Loaded X.509 cert 'sforshee: 00b28ddf47aef9cea7'
+[   12.482096] kernel: Loaded X.509 cert 'wens: 61c038651aabdcf94bd0ac7ff06c7248db18c600'
+[   12.482787] kernel: Creating 1 MTD partitions on "0000:00:1f.5":
+[   12.482794] kernel: 0x000000000000-0x000002000000 : "BIOS"
+[   12.489609] kernel: mei_pxp 0000:00:16.0-fbf6fcf1-96cf-4e2e-a6a6-1bab8cbe36b1: bound 0000:00:02.0 (ops i915_pxp_tee_component_ops [i915])
+[   12.490609] kernel: mei_hdcp 0000:00:16.0-b638ab7e-94e2-4ea2-a552-d1c54b627f04: bound 0000:00:02.0 (ops i915_hdcp_ops [i915])
+[   12.491613] kernel: RAPL PMU: API unit is 2^-32 Joules, 4 fixed counters, 655360 ms ovfl timer
+[   12.491618] kernel: RAPL PMU: hw unit of domain pp0-core 2^-14 Joules
+[   12.491620] kernel: RAPL PMU: hw unit of domain package 2^-14 Joules
+[   12.491622] kernel: RAPL PMU: hw unit of domain pp1-gpu 2^-14 Joules
+[   12.491623] kernel: RAPL PMU: hw unit of domain psys 2^-14 Joules
+[   12.500260] kernel: videodev: Linux video capture interface: v2.00
+[   12.501301] kernel: Intel(R) Wireless WiFi driver for Linux
+[   12.503851] kernel: iwlwifi 0000:00:14.3: Detected crf-id 0x1300504, cnv-id 0x80400 wfpm id 0x80000030
+[   12.503895] kernel: iwlwifi 0000:00:14.3: PCI dev 51f0/0074, rev=0x370, rfid=0x10a100
+[   12.507158] kernel: iwlwifi 0000:00:14.3: api flags index 2 larger than supported by driver
+[   12.507181] kernel: iwlwifi 0000:00:14.3: TLV_FW_FSEQ_VERSION: FSEQ Version: 0.0.2.41
+[   12.507537] kernel: iwlwifi 0000:00:14.3: loaded firmware version 83.e8f84e98.0 so-a0-hr-b0-83.ucode op_mode iwlmvm
+[   12.509304] kernel: usb 3-7: Found UVC 1.00 device BisonCam,NB Pro (5986:9102)
+[   12.516280] kernel: usbcore: registered new interface driver uvcvideo
+[   12.523245] kernel: EXT4-fs (nvme0n1p2): mounted filesystem 6fa3e9cc-de78-44d1-854a-74f1e13463cd r/w with ordered data mode. Quota mode: none.
+[   12.590821] kernel: iwlwifi 0000:00:14.3: Detected Intel(R) Wi-Fi 6 AX201 160MHz, REV=0x370
+[   12.590881] kernel: thermal thermal_zone0: failed to read out thermal zone (-61)
+[   12.593133] kernel: audit: type=1400 audit(1717387591.943:2): apparmor="STATUS" operation="profile_load" profile="unconfined" name="libreoffice-xpdfimport" pid=1033 comm="apparmor_parser"
+[   12.593163] kernel: audit: type=1400 audit(1717387591.943:3): apparmor="STATUS" operation="profile_load" profile="unconfined" name="libreoffice-senddoc" pid=1031 comm="apparmor_parser"
+[   12.593446] kernel: audit: type=1400 audit(1717387591.943:4): apparmor="STATUS" operation="profile_load" profile="unconfined" name="libreoffice-oosplash" pid=1030 comm="apparmor_parser"
+[   12.593560] kernel: audit: type=1400 audit(1717387591.943:5): apparmor="STATUS" operation="profile_load" profile="unconfined" name="lsb_release" pid=1021 comm="apparmor_parser"
+[   12.593671] kernel: audit: type=1400 audit(1717387591.943:6): apparmor="STATUS" operation="profile_load" profile="unconfined" name="nvidia_modprobe" pid=1022 comm="apparmor_parser"
+[   12.593674] kernel: audit: type=1400 audit(1717387591.943:7): apparmor="STATUS" operation="profile_load" profile="unconfined" name="nvidia_modprobe//kmod" pid=1022 comm="apparmor_parser"
+[   12.593873] kernel: audit: type=1400 audit(1717387591.943:8): apparmor="STATUS" operation="profile_load" profile="unconfined" name="/usr/bin/man" pid=1028 comm="apparmor_parser"
+[   12.593874] kernel: audit: type=1400 audit(1717387591.943:9): apparmor="STATUS" operation="profile_load" profile="unconfined" name="man_filter" pid=1028 comm="apparmor_parser"
+[   12.593879] kernel: audit: type=1400 audit(1717387591.943:10): apparmor="STATUS" operation="profile_load" profile="unconfined" name="man_groff" pid=1028 comm="apparmor_parser"
+[   12.594167] kernel: audit: type=1400 audit(1717387591.943:11): apparmor="STATUS" operation="profile_load" profile="unconfined" name="/usr/sbin/cups-browsed" pid=1035 comm="apparmor_parser"
+[   12.600421] kernel: iwlwifi 0000:00:14.3: WRT: Invalid buffer destination
+[   12.603534] kernel: snd_hda_intel 0000:00:1f.3: bound 0000:00:02.0 (ops i915_audio_component_bind_ops [i915])
+[   12.610241] kernel: input: ELAN0412:00 04F3:3240 Mouse as /devices/pci0000:00/0000:00:15.0/i2c_designware.0/i2c-1/i2c-ELAN0412:00/0018:04F3:3240.0001/input/input23
+[   12.610366] kernel: input: ELAN0412:00 04F3:3240 Touchpad as /devices/pci0000:00/0000:00:15.0/i2c_designware.0/i2c-1/i2c-ELAN0412:00/0018:04F3:3240.0001/input/input25
+[   12.610484] kernel: hid-multitouch 0018:04F3:3240.0001: input,hidraw0: I2C HID v1.00 Mouse [ELAN0412:00 04F3:3240] on i2c-ELAN0412:00
+[   12.611518] kernel: usbcore: registered new interface driver btusb
+[   12.613072] kernel: Bluetooth: hci0: Device revision is 2
+[   12.613076] kernel: Bluetooth: hci0: Secure boot is enabled
+[   12.613077] kernel: Bluetooth: hci0: OTP lock is enabled
+[   12.613077] kernel: Bluetooth: hci0: API lock is enabled
+[   12.613078] kernel: Bluetooth: hci0: Debug lock is disabled
+[   12.613079] kernel: Bluetooth: hci0: Minimum firmware build 1 week 10 2014
+[   12.613080] kernel: Bluetooth: hci0: Bootloader timestamp 2019.40 buildtype 1 build 38
+[   12.613690] kernel: intel_tcc_cooling: Programmable TCC Offset detected
+[   12.615235] kernel: Bluetooth: hci0: Found device firmware: intel/ibt-0040-4150.sfi
+[   12.615250] kernel: Bluetooth: hci0: Boot Address: 0x100800
+[   12.615252] kernel: Bluetooth: hci0: Firmware Version: 107-51.22
+[   12.624717] kernel: intel_rapl_msr: PL4 support detected.
+[   12.624748] kernel: intel_rapl_common: Found RAPL domain package
+[   12.624751] kernel: intel_rapl_common: Found RAPL domain core
+[   12.624753] kernel: intel_rapl_common: Found RAPL domain uncore
+[   12.624755] kernel: intel_rapl_common: Found RAPL domain psys
+[   12.643023] kernel: snd_hda_codec_realtek hdaudioC0D0: autoconfig for ALC256: line_outs=1 (0x14/0x0/0x0/0x0/0x0) type:speaker
+[   12.643030] kernel: snd_hda_codec_realtek hdaudioC0D0:    speaker_outs=0 (0x0/0x0/0x0/0x0/0x0)
+[   12.643033] kernel: snd_hda_codec_realtek hdaudioC0D0:    hp_outs=1 (0x21/0x0/0x0/0x0/0x0)
+[   12.643035] kernel: snd_hda_codec_realtek hdaudioC0D0:    mono: mono_out=0x0
+[   12.643036] kernel: snd_hda_codec_realtek hdaudioC0D0:    inputs:
+[   12.643038] kernel: snd_hda_codec_realtek hdaudioC0D0:      Headset Mic=0x19
+[   12.643040] kernel: snd_hda_codec_realtek hdaudioC0D0:      Internal Mic=0x12
+[   12.704858] kernel: iwlwifi 0000:00:14.3: WFPM_UMAC_PD_NOTIFICATION: 0x20
+[   12.704905] kernel: iwlwifi 0000:00:14.3: WFPM_LMAC2_PD_NOTIFICATION: 0x1f
+[   12.704913] kernel: iwlwifi 0000:00:14.3: WFPM_AUTH_KEY_0: 0x90
+[   12.704922] kernel: iwlwifi 0000:00:14.3: CNVI_SCU_SEQ_DATA_DW9: 0x10
+[   12.704976] kernel: iwlwifi 0000:00:14.3: Detected RF HR B5, rfid=0x10a100
+[   12.706326] kernel: iwlwifi 0000:00:14.3: RFIm is deactivated, reason = 4
+[   12.708984] kernel: input: HDA Intel PCH Front Headphone as /devices/pci0000:00/0000:00:1f.3/sound/card0/input26
+[   12.709018] kernel: input: HDA Intel PCH HDMI/DP,pcm=3 as /devices/pci0000:00/0000:00:1f.3/sound/card0/input27
+[   12.709047] kernel: input: HDA Intel PCH HDMI/DP,pcm=7 as /devices/pci0000:00/0000:00:1f.3/sound/card0/input28
+[   12.709068] kernel: input: HDA Intel PCH HDMI/DP,pcm=8 as /devices/pci0000:00/0000:00:1f.3/sound/card0/input29
+[   12.709088] kernel: input: HDA Intel PCH HDMI/DP,pcm=9 as /devices/pci0000:00/0000:00:1f.3/sound/card0/input30
+[   12.772298] kernel: iwlwifi 0000:00:14.3: base HW address: 74:04:f1:a1:0a:4a
+[   12.831366] kernel: iwlwifi 0000:00:14.3 wlp0s20f3: renamed from wlan0
+[   12.861124] kernel: Bluetooth: BNEP (Ethernet Emulation) ver 1.3
+[   12.861129] kernel: Bluetooth: BNEP filters: protocol multicast
+[   12.861134] kernel: Bluetooth: BNEP socket layer initialized
+[   13.011197] kernel: Generic FE-GE Realtek PHY r8169-0-2e00:00: attached PHY driver (mii_bus:phy_addr=r8169-0-2e00:00, irq=MAC)
+[   13.215418] kernel: r8169 0000:2e:00.0 enp46s0: Link is Down
+[   13.226533] kernel: iwlwifi 0000:00:14.3: WRT: Invalid buffer destination
+[   13.326153] kernel: iwlwifi 0000:00:14.3: WFPM_UMAC_PD_NOTIFICATION: 0x20
+[   13.326200] kernel: iwlwifi 0000:00:14.3: WFPM_LMAC2_PD_NOTIFICATION: 0x1f
+[   13.326209] kernel: iwlwifi 0000:00:14.3: WFPM_AUTH_KEY_0: 0x90
+[   13.326219] kernel: iwlwifi 0000:00:14.3: CNVI_SCU_SEQ_DATA_DW9: 0x10
+[   13.327607] kernel: iwlwifi 0000:00:14.3: RFIm is deactivated, reason = 4
+[   13.337602] kernel: iwlwifi 0000:00:14.3: RFIm is deactivated, reason = 4
+[   13.396950] kernel: iwlwifi 0000:00:14.3: Registered PHC clock: iwlwifi-PTP, with index: 0
+[   14.034442] kernel: Bluetooth: hci0: Waiting for firmware download to complete
+[   14.035040] kernel: Bluetooth: hci0: Firmware loaded in 1386523 usecs
+[   14.035109] kernel: Bluetooth: hci0: Waiting for device to boot
+[   14.051043] kernel: Bluetooth: hci0: Device booted in 15582 usecs
+[   14.051051] kernel: Bluetooth: hci0: Malformed MSFT vendor event: 0x02
+[   14.051432] kernel: Bluetooth: hci0: Found Intel DDC parameters: intel/ibt-0040-4150.ddc
+[   14.053050] kernel: Bluetooth: hci0: Applying Intel DDC parameters completed
+[   14.056074] kernel: Bluetooth: hci0: Firmware timestamp 2022.51 buildtype 1 build 56683
+[   14.125123] kernel: Bluetooth: MGMT ver 1.22
+[   14.128387] kernel: NET: Registered PF_ALG protocol family
+[   14.172143] kernel: Bluetooth: hci0: Bad flag given (0x1) vs supported (0x0)
+[   14.306291] kernel: loop30: detected capacity change from 0 to 8
+[   14.458996] kernel: rfkill: input handler disabled
+[   17.290646] kernel: wlp0s20f3: authenticate with 10:0c:6b:ac:e2:02
+[   17.296108] kernel: wlp0s20f3: send auth to 10:0c:6b:ac:e2:02 (try 1/3)
+[   17.322727] kernel: wlp0s20f3: authenticated
+[   17.323185] kernel: wlp0s20f3: associate with 10:0c:6b:ac:e2:02 (try 1/3)
+[   17.326012] kernel: wlp0s20f3: RX AssocResp from 10:0c:6b:ac:e2:02 (capab=0x1411 status=0 aid=3)
+[   17.333358] kernel: wlp0s20f3: associated
+[   17.333395] kernel: wlp0s20f3: Limiting TX power to 30 (30 - 0) dBm as advertised by 10:0c:6b:ac:e2:02
+[   17.343690] kernel: iwlwifi 0000:00:14.3: Unhandled alg: 0x707
+[   17.343991] kernel: iwlwifi 0000:00:14.3: Unhandled alg: 0x707
+[   17.344257] kernel: iwlwifi 0000:00:14.3: Unhandled alg: 0x707
+[   17.344471] kernel: iwlwifi 0000:00:14.3: Unhandled alg: 0x707
+[   17.344744] kernel: iwlwifi 0000:00:14.3: Unhandled alg: 0x707
+[   17.344977] kernel: iwlwifi 0000:00:14.3: Unhandled alg: 0x707
+[   17.345276] kernel: iwlwifi 0000:00:14.3: Unhandled alg: 0x707
+[   17.345481] kernel: iwlwifi 0000:00:14.3: Unhandled alg: 0x707
diff --git a/t/pt-summary/samples/Linux/008/dmidecode b/t/pt-summary/samples/Linux/008/dmidecode
new file mode 100644
index 000000000..3136ea5be
--- /dev/null
+++ b/t/pt-summary/samples/Linux/008/dmidecode
@@ -0,0 +1,2 @@
+# dmidecode 3.3
+Scanning /dev/mem for entry point.
diff --git a/t/pt-summary/samples/Linux/008/ip b/t/pt-summary/samples/Linux/008/ip
new file mode 100644
index 000000000..899eb5bd0
--- /dev/null
+++ b/t/pt-summary/samples/Linux/008/ip
@@ -0,0 +1,60 @@
+1: lo: <LOOPBACK,UP,LOWER_UP> mtu 65536 qdisc noqueue state UNKNOWN mode DEFAULT group default qlen 1000
+    link/loopback 00:00:00:00:00:00 brd 00:00:00:00:00:00
+    RX:    bytes   packets errors dropped  missed   mcast           
+    115989449047 172919620      0       0       0       0 
+    TX:    bytes   packets errors dropped carrier collsns           
+    115989449047 172919620      0       0       0       0 
+2: enp46s0: <NO-CARRIER,BROADCAST,MULTICAST,UP> mtu 1500 qdisc fq_codel state DOWN mode DEFAULT group default qlen 1000
+    link/ether d4:93:90:24:37:9a brd ff:ff:ff:ff:ff:ff
+    RX:  bytes packets errors dropped  missed   mcast           
+             0       0      0       0       0       0 
+    TX:  bytes packets errors dropped carrier collsns           
+             0       0      0       0       0       0 
+3: wlp0s20f3: <BROADCAST,MULTICAST,UP,LOWER_UP> mtu 1500 qdisc noqueue state UP mode DORMANT group default qlen 1000
+    link/ether 74:04:f1:a1:0a:4a brd ff:ff:ff:ff:ff:ff
+    RX:    bytes   packets errors dropped  missed   mcast           
+    139028693227 148731340      0       0       0       0 
+    TX:    bytes   packets errors dropped carrier collsns           
+     28590341931  76994965      0       0       0       0 
+4: docker0: <BROADCAST,MULTICAST,UP,LOWER_UP> mtu 1500 qdisc noqueue state UP mode DEFAULT group default 
+    link/ether 02:42:b8:3a:02:a2 brd ff:ff:ff:ff:ff:ff
+    RX:   bytes  packets errors dropped  missed   mcast           
+    11877645833 11924304      0       0       0       0 
+    TX:   bytes  packets errors dropped carrier collsns           
+    31877741375 13996405      0       0       0       0 
+5: br-a7c7f1777df1: <NO-CARRIER,BROADCAST,MULTICAST,UP> mtu 1500 qdisc noqueue state DOWN mode DEFAULT group default 
+    link/ether 02:42:50:6b:d9:e7 brd ff:ff:ff:ff:ff:ff
+    RX:  bytes packets errors dropped  missed   mcast           
+             0       0      0       0       0       0 
+    TX:  bytes packets errors dropped carrier collsns           
+             0       0      0       0       0       0 
+605: veth0655c9f@if604: <BROADCAST,MULTICAST,UP,LOWER_UP> mtu 1500 qdisc noqueue master docker0 state UP mode DEFAULT group default 
+    link/ether fe:18:1e:af:9f:6b brd ff:ff:ff:ff:ff:ff link-netnsid 0
+    RX:  bytes packets errors dropped  missed   mcast           
+    1165853970 1043143      0       0       0       0 
+    TX:  bytes packets errors dropped carrier collsns           
+    2529991901 1272919      0       0       0       0 
+607: vethd189986@if606: <BROADCAST,MULTICAST,UP,LOWER_UP> mtu 1500 qdisc noqueue master br-79118f7d5a92 state UP mode DEFAULT group default 
+    link/ether 5e:65:38:50:f8:1a brd ff:ff:ff:ff:ff:ff link-netnsid 2
+    RX:  bytes packets errors dropped  missed   mcast           
+      52384734  264137      0       0       0       0 
+    TX:  bytes packets errors dropped carrier collsns           
+     634211290  307449      0       0       0       0 
+609: veth2655c84@if608: <BROADCAST,MULTICAST,UP,LOWER_UP> mtu 1500 qdisc noqueue master br-79118f7d5a92 state UP mode DEFAULT group default 
+    link/ether be:d1:21:fd:d2:fb brd ff:ff:ff:ff:ff:ff link-netnsid 1
+    RX:  bytes packets errors dropped  missed   mcast           
+     545367170  259337      0       0       0       0 
+    TX:  bytes packets errors dropped carrier collsns           
+      51744978  243675      0       0       0       0 
+613: wg0: <POINTOPOINT,NOARP,UP,LOWER_UP> mtu 1420 qdisc noqueue state UNKNOWN mode DEFAULT group default qlen 1000
+    link/none 
+    RX:  bytes packets errors dropped  missed   mcast           
+      12587560   25727      0       0       0       0 
+    TX:  bytes packets errors dropped carrier collsns           
+       4950996   25268      0       0       0       0 
+358: br-79118f7d5a92: <BROADCAST,MULTICAST,UP,LOWER_UP> mtu 1500 qdisc noqueue state UP mode DEFAULT group default 
+    link/ether 02:42:3c:6b:97:eb brd ff:ff:ff:ff:ff:ff
+    RX:  bytes packets errors dropped  missed   mcast           
+      16084288  236901      0       0       0       0 
+    TX:  bytes packets errors dropped carrier collsns           
+     792726533  362130      0       0       0       0 
diff --git a/t/pt-summary/samples/Linux/008/lspci_file b/t/pt-summary/samples/Linux/008/lspci_file
new file mode 100644
index 000000000..9e9a8a65e
--- /dev/null
+++ b/t/pt-summary/samples/Linux/008/lspci_file
@@ -0,0 +1,22 @@
+00:00.0 Host bridge: Intel Corporation Device 4621 (rev 02)
+00:02.0 VGA compatible controller: Intel Corporation Alder Lake-P Integrated Graphics Controller (rev 0c)
+00:06.0 PCI bridge: Intel Corporation 12th Gen Core Processor PCI Express x4 Controller #0 (rev 02)
+00:07.0 PCI bridge: Intel Corporation Alder Lake-P Thunderbolt 4 PCI Express Root Port #0 (rev 02)
+00:0a.0 Signal processing controller: Intel Corporation Platform Monitoring Technology (rev 01)
+00:0d.0 USB controller: Intel Corporation Alder Lake-P Thunderbolt 4 USB Controller (rev 02)
+00:0d.2 USB controller: Intel Corporation Alder Lake-P Thunderbolt 4 NHI #0 (rev 02)
+00:14.0 USB controller: Intel Corporation Alder Lake PCH USB 3.2 xHCI Host Controller (rev 01)
+00:14.2 RAM memory: Intel Corporation Alder Lake PCH Shared SRAM (rev 01)
+00:14.3 Network controller: Intel Corporation Alder Lake-P PCH CNVi WiFi (rev 01)
+00:15.0 Serial bus controller: Intel Corporation Alder Lake PCH Serial IO I2C Controller #0 (rev 01)
+00:15.1 Serial bus controller: Intel Corporation Alder Lake PCH Serial IO I2C Controller #1 (rev 01)
+00:16.0 Communication controller: Intel Corporation Alder Lake PCH HECI Controller (rev 01)
+00:1d.0 PCI bridge: Intel Corporation Device 51b0 (rev 01)
+00:1d.1 PCI bridge: Intel Corporation Device 51b1 (rev 01)
+00:1f.0 ISA bridge: Intel Corporation Alder Lake PCH eSPI Controller (rev 01)
+00:1f.3 Audio device: Intel Corporation Alder Lake PCH-P High Definition Audio Controller (rev 01)
+00:1f.4 SMBus: Intel Corporation Alder Lake PCH-P SMBus Host Controller (rev 01)
+00:1f.5 Serial bus controller: Intel Corporation Alder Lake-P PCH SPI Controller (rev 01)
+01:00.0 Non-Volatile memory controller: Sandisk Corp Device 5030 (rev 01)
+2d:00.0 SD Host controller: O2 Micro, Inc. SD/MMC Card Reader Controller (rev 01)
+2e:00.0 Ethernet controller: Realtek Semiconductor Co., Ltd. RTL8111/8168/8411 PCI Express Gigabit Ethernet Controller (rev 15)
diff --git a/t/pt-summary/samples/Linux/008/lvs.stderr b/t/pt-summary/samples/Linux/008/lvs.stderr
new file mode 100644
index 000000000..9fc81f7e2
--- /dev/null
+++ b/t/pt-summary/samples/Linux/008/lvs.stderr
@@ -0,0 +1,2 @@
+  WARNING: Running as a non-root user. Functionality may be unavailable.
+  /run/lock/lvm/P_global:aux: open failed: Permission denied
diff --git a/t/pt-summary/samples/Linux/008/memory b/t/pt-summary/samples/Linux/008/memory
new file mode 100644
index 000000000..9edcb8ddb
--- /dev/null
+++ b/t/pt-summary/samples/Linux/008/memory
@@ -0,0 +1,58 @@
+               total        used        free      shared  buff/cache   available
+Mem:     67255779328 27568713728  1688006656  2944208896 37999058944 36280082432
+Swap:     2046816256  2034712576    12103680
+MemTotal:       65679472 kB
+MemFree:         1648444 kB
+MemAvailable:   35429768 kB
+Buffers:         1634228 kB
+Cached:         31564712 kB
+SwapCached:        32792 kB
+Active:         22046576 kB
+Inactive:       34366156 kB
+Active(anon):   18361800 kB
+Inactive(anon):  7554796 kB
+Active(file):    3684776 kB
+Inactive(file): 26811360 kB
+Unevictable:     1545296 kB
+Mlocked:           28280 kB
+SwapTotal:       1998844 kB
+SwapFree:          11820 kB
+Zswap:                 0 kB
+Zswapped:              0 kB
+Dirty:             16372 kB
+Writeback:             0 kB
+AnonPages:      24615424 kB
+Mapped:          2818096 kB
+Shmem:           2875204 kB
+KReclaimable:    3909516 kB
+Slab:            4679996 kB
+SReclaimable:    3909516 kB
+SUnreclaim:       770480 kB
+KernelStack:       88160 kB
+PageTables:       452064 kB
+SecPageTables:         0 kB
+NFS_Unstable:          0 kB
+Bounce:                0 kB
+WritebackTmp:          0 kB
+CommitLimit:    34838580 kB
+Committed_AS:   76927980 kB
+VmallocTotal:   34359738367 kB
+VmallocUsed:      465528 kB
+VmallocChunk:          0 kB
+Percpu:            27776 kB
+HardwareCorrupted:     0 kB
+AnonHugePages:    219136 kB
+ShmemHugePages:  1208320 kB
+ShmemPmdMapped:        0 kB
+FileHugePages:         0 kB
+FilePmdMapped:         0 kB
+Unaccepted:            0 kB
+HugePages_Total:       0
+HugePages_Free:        0
+HugePages_Rsvd:        0
+HugePages_Surp:        0
+Hugepagesize:       2048 kB
+Hugetlb:               0 kB
+DirectMap4k:      821992 kB
+DirectMap2M:    32573440 kB
+DirectMap1G:    33554432 kB
diff --git a/t/pt-summary/samples/Linux/008/mounted_fs b/t/pt-summary/samples/Linux/008/mounted_fs
new file mode 100644
index 000000000..2ae4b2820
--- /dev/null
+++ b/t/pt-summary/samples/Linux/008/mounted_fs
@@ -0,0 +1,25 @@
+/dev/fuse 250G 0 250G 0% /run/user/1000/keybase/kbfs on /run/user/1000/keybase/kbfs type fuse (rw,nosuid,nodev,relatime,user_id=1000,group_id=1000)
+/dev/mapper/vgubuntu-root 3,6T 1,5T 2,0T 43% / on / type ext4 (rw,relatime,errors=remount-ro)
+/dev/nvme0n1p1 511M 291M 221M 57% /boot/efi on /boot/efi type vfat (rw,relatime,fmask=0077,dmask=0077,codepage=437,iocharset=iso8859-1,shortname=mixed,errors=remount-ro)
+/dev/nvme0n1p2 1,7G 305M 1,3G 20% /boot on /boot type ext4 (rw,relatime)
+efivarfs 64K 27K 33K 45% /sys/firmware/efi/efivars on /sys/firmware/efi/efivars type efivarfs (rw,nosuid,nodev,noexec,relatime)
+tmpfs 32G 699M 31G 3% /dev/shm on /dev/shm type tmpfs (rw,nosuid,nodev,inode64)
+tmpfs 32G 699M 31G 3% /dev/shm on /run/lock type tmpfs (rw,nosuid,nodev,noexec,relatime,size=5120k,inode64)
+tmpfs 32G 699M 31G 3% /dev/shm on /run/snapd/ns type tmpfs (rw,nosuid,nodev,noexec,relatime,size=6567948k,mode=755,inode64)
+tmpfs 32G 699M 31G 3% /dev/shm on /run type tmpfs (rw,nosuid,nodev,noexec,relatime,size=6567948k,mode=755,inode64)
+tmpfs 32G 699M 31G 3% /dev/shm on /run/user/1000 type tmpfs (rw,nosuid,nodev,relatime,size=6567944k,nr_inodes=1641986,mode=700,uid=1000,gid=1000,inode64)
+tmpfs 5,0M 4,0K 5,0M 1% /run/lock on /dev/shm type tmpfs (rw,nosuid,nodev,inode64)
+tmpfs 5,0M 4,0K 5,0M 1% /run/lock on /run/lock type tmpfs (rw,nosuid,nodev,noexec,relatime,size=5120k,inode64)
+tmpfs 5,0M 4,0K 5,0M 1% /run/lock on /run/snapd/ns type tmpfs (rw,nosuid,nodev,noexec,relatime,size=6567948k,mode=755,inode64)
+tmpfs 5,0M 4,0K 5,0M 1% /run/lock on /run type tmpfs (rw,nosuid,nodev,noexec,relatime,size=6567948k,mode=755,inode64)
+tmpfs 5,0M 4,0K 5,0M 1% /run/lock on /run/user/1000 type tmpfs (rw,nosuid,nodev,relatime,size=6567944k,nr_inodes=1641986,mode=700,uid=1000,gid=1000,inode64)
+tmpfs 6,3G 11M 6,3G 1% /run/user/1000 on /dev/shm type tmpfs (rw,nosuid,nodev,inode64)
+tmpfs 6,3G 11M 6,3G 1% /run/user/1000 on /run/lock type tmpfs (rw,nosuid,nodev,noexec,relatime,size=5120k,inode64)
+tmpfs 6,3G 11M 6,3G 1% /run/user/1000 on /run/snapd/ns type tmpfs (rw,nosuid,nodev,noexec,relatime,size=6567948k,mode=755,inode64)
+tmpfs 6,3G 11M 6,3G 1% /run/user/1000 on /run type tmpfs (rw,nosuid,nodev,noexec,relatime,size=6567948k,mode=755,inode64)
+tmpfs 6,3G 11M 6,3G 1% /run/user/1000 on /run/user/1000 type tmpfs (rw,nosuid,nodev,relatime,size=6567944k,nr_inodes=1641986,mode=700,uid=1000,gid=1000,inode64)
+tmpfs 6,3G 2,7M 6,3G 1% /run on /dev/shm type tmpfs (rw,nosuid,nodev,inode64)
+tmpfs 6,3G 2,7M 6,3G 1% /run on /run/lock type tmpfs (rw,nosuid,nodev,noexec,relatime,size=5120k,inode64)
+tmpfs 6,3G 2,7M 6,3G 1% /run on /run/snapd/ns type tmpfs (rw,nosuid,nodev,noexec,relatime,size=6567948k,mode=755,inode64)
+tmpfs 6,3G 2,7M 6,3G 1% /run on /run type tmpfs (rw,nosuid,nodev,noexec,relatime,size=6567948k,mode=755,inode64)
+tmpfs 6,3G 2,7M 6,3G 1% /run on /run/user/1000 type tmpfs (rw,nosuid,nodev,relatime,size=6567944k,nr_inodes=1641986,mode=700,uid=1000,gid=1000,inode64)
diff --git a/t/pt-summary/samples/Linux/008/netstat b/t/pt-summary/samples/Linux/008/netstat
new file mode 100644
index 000000000..74bd9b149
--- /dev/null
+++ b/t/pt-summary/samples/Linux/008/netstat
@@ -0,0 +1,213 @@
+Active Internet connections (servers and established)
+Proto Recv-Q Send-Q Local Address           Foreign Address         State       PID/Program name    
+tcp        0      0 127.0.0.1:12519         0.0.0.0:*               LISTEN      -                   
+tcp        0      0 127.0.0.1:42841         0.0.0.0:*               LISTEN      -                   
+tcp        0      0 127.0.0.1:42002         0.0.0.0:*               LISTEN      -                   
+tcp        0      0 127.0.0.1:42003         0.0.0.0:*               LISTEN      -                   
+tcp        0      0 127.0.0.1:42000         0.0.0.0:*               LISTEN      -                   
+tcp        0      0 127.0.0.1:42001         0.0.0.0:*               LISTEN      -                   
+tcp        0      0 127.0.0.53:53           0.0.0.0:*               LISTEN      -                   
+tcp        0      0 127.0.0.1:7777          0.0.0.0:*               LISTEN      -                   
+tcp        0      0 127.0.0.1:40098         0.0.0.0:*               LISTEN      3135169/kbfsfuse    
+tcp        0      0 127.0.0.1:37117         0.0.0.0:*               LISTEN      -                   
+tcp        0      0 0.0.0.0:17500           0.0.0.0:*               LISTEN      2837239/dropbox     
+tcp        0      0 127.0.0.1:5432          0.0.0.0:*               LISTEN      -                   
+tcp        0      0 127.0.0.1:631           0.0.0.0:*               LISTEN      -                   
+tcp        0      0 0.0.0.0:9123            0.0.0.0:*               LISTEN      -                   
+tcp        0      0 0.0.0.0:8281            0.0.0.0:*               LISTEN      -                   
+tcp        0      0 0.0.0.0:8383            0.0.0.0:*               LISTEN      -                   
+tcp        0      0 0.0.0.0:9900            0.0.0.0:*               LISTEN      -                   
+tcp        0      0 127.0.0.1:27017         0.0.0.0:*               LISTEN      -                   
+tcp        0      0 0.0.0.0:22              0.0.0.0:*               LISTEN      -                   
+tcp        0      0 0.0.0.0:443             0.0.0.0:*               LISTEN      -                   
+tcp        0      0 0.0.0.0:6032            0.0.0.0:*               LISTEN      -                   
+tcp        0      0 0.0.0.0:6033            0.0.0.0:*               LISTEN      -                   
+tcp        0      0 0.0.0.0:6033            0.0.0.0:*               LISTEN      -                   
+tcp        0      0 0.0.0.0:6033            0.0.0.0:*               LISTEN      -                   
+tcp        0      0 0.0.0.0:6033            0.0.0.0:*               LISTEN      -                   
+tcp        0      0 127.0.0.1:17603         0.0.0.0:*               LISTEN      2837239/dropbox     
+tcp        0      0 127.0.0.1:17600         0.0.0.0:*               LISTEN      2837239/dropbox     
+tcp        0      0 127.0.0.1:17553         0.0.0.0:*               LISTEN      3135130/keybase     
+tcp        0      0 192.168.55.2:33644      89.253.240.17:993       ESTABLISHED 3668124/thunderbird 
+tcp        0      0 192.168.55.2:40942      44.208.19.176:443       ESTABLISHED 2224410/firefox     
+tcp        0      1 192.168.55.2:44586      52.35.150.14:443        SYN_SENT    2224410/firefox     
+tcp        0      0 192.168.55.2:43180      173.194.220.108:993     ESTABLISHED 3668124/thunderbird 
+tcp        0      0 192.168.55.2:50852      89.253.240.17:143       ESTABLISHED 3668124/thunderbird 
+tcp        0      0 192.168.55.2:53066      91.105.192.100:443      ESTABLISHED 1712863/Telegram    
+tcp        0      0 127.0.0.1:44464         127.0.0.1:12345         ESTABLISHED 3060170/mysqld      
+tcp        0      0 127.0.0.1:57436         127.0.0.1:12347         ESTABLISHED 3036479/mysqld      
+tcp        0      0 192.168.55.2:50428      173.194.220.108:993     ESTABLISHED 3668124/thunderbird 
+tcp        0      0 192.168.55.2:38864      35.75.32.93:443         ESTABLISHED 622088/Slack --stan 
+tcp        0      0 192.168.55.2:60536      209.85.233.104:443      ESTABLISHED 2224410/firefox     
+tcp        0      0 192.168.55.2:54002      18.205.222.128:443      ESTABLISHED -                   
+tcp        0      0 127.0.0.1:33532         127.0.0.1:42002         ESTABLISHED -                   
+tcp        0      0 192.168.55.2:59960      188.114.99.233:443      ESTABLISHED 2224410/firefox     
+tcp        0      0 192.168.55.2:50432      173.194.220.108:993     ESTABLISHED 3668124/thunderbird 
+tcp        0      0 192.168.55.2:44788      52.57.79.4:443          ESTABLISHED 2147311/chrome --ty 
+tcp        0      0 10.0.0.5:37084          162.125.21.3:443        ESTABLISHED 2837239/dropbox     
+tcp        0      0 192.168.55.2:38858      35.75.32.93:443         ESTABLISHED 622088/Slack --stan 
+tcp        0      0 192.168.55.2:55814      3.68.61.181:443         ESTABLISHED 622088/Slack --stan 
+tcp       25      0 192.168.55.2:36048      170.114.52.66:443       CLOSE_WAIT  2504953/zoom        
+tcp        0      0 127.0.0.1:51212         127.0.0.1:3306          TIME_WAIT   -                   
+tcp        0      0 10.0.0.5:54900          162.125.21.3:443        ESTABLISHED 2837239/dropbox     
+tcp        0      0 127.0.0.1:60112         127.0.0.1:42003         ESTABLISHED -                   
+tcp        0      0 127.0.0.1:46804         127.0.0.1:3306          TIME_WAIT   -                   
+tcp        0      0 127.0.0.1:56798         127.0.0.1:3306          TIME_WAIT   -                   
+tcp        0      0 192.168.55.2:36068      185.166.143.36:443      ESTABLISHED 2224410/firefox     
+tcp        0      0 192.168.55.2:55146      35.75.32.93:443         ESTABLISHED 622088/Slack --stan 
+tcp        0      0 10.0.0.5:37220          10.0.0.5:4647           ESTABLISHED -                   
+tcp        0  58696 10.0.0.5:51578          162.125.21.3:443        ESTABLISHED 2837239/dropbox     
+tcp        0      0 192.168.55.2:53128      188.114.98.233:443      ESTABLISHED 2224410/firefox     
+tcp        0      0 192.168.55.2:38856      35.75.32.93:443         ESTABLISHED 622088/Slack --stan 
+tcp        0      0 127.0.0.1:54838         127.0.0.1:42003         ESTABLISHED -                   
+tcp        0      0 127.0.0.1:45766         127.0.0.1:3306          ESTABLISHED -                   
+tcp        0      0 127.0.0.1:46698         127.0.0.1:3306          TIME_WAIT   -                   
+tcp        0      0 127.0.0.1:45790         127.0.0.1:3306          ESTABLISHED -                   
+tcp        0      0 192.168.55.2:34472      142.251.1.138:443       ESTABLISHED 2147311/chrome --ty 
+tcp        0      0 192.168.55.2:53054      91.105.192.100:443      ESTABLISHED 1712863/Telegram    
+tcp        0      0 127.0.0.1:45774         127.0.0.1:3306          TIME_WAIT   -                   
+tcp        0      0 127.0.0.1:54650         127.0.0.1:12345         ESTABLISHED 3060170/mysqld      
+tcp        0      0 127.0.0.1:56786         127.0.0.1:3306          TIME_WAIT   -                   
+tcp        0      0 192.168.55.2:46696      140.82.113.26:443       ESTABLISHED 2224410/firefox     
+tcp        0      0 192.168.55.2:36956      34.202.253.140:443      ESTABLISHED 622088/Slack --stan 
+tcp        0      0 192.168.55.2:53480      173.194.221.94:443      ESTABLISHED 2224410/firefox     
+tcp        0      0 127.0.0.1:45762         127.0.0.1:3306          ESTABLISHED -                   
+tcp        0      0 127.0.0.1:54598         127.0.0.1:42002         ESTABLISHED -                   
+tcp        0      0 10.0.0.5:58674          213.180.204.148:443     ESTABLISHED 8568/yandex-disk    
+tcp        0      0 127.0.0.1:42003         127.0.0.1:54838         ESTABLISHED -                   
+tcp        0      0 127.0.0.1:42000         127.0.0.1:52316         ESTABLISHED -                   
+tcp        0      0 192.168.55.2:57628      108.157.214.118:443     ESTABLISHED 2224410/firefox     
+tcp        0      0 192.168.55.2:58080      142.250.184.131:443     ESTABLISHED 2224410/firefox     
+tcp        0      0 127.0.0.1:52316         127.0.0.1:42000         ESTABLISHED -                   
+tcp        0      0 10.0.0.5:33806          162.125.21.3:443        ESTABLISHED 2837239/dropbox     
+tcp        0      0 192.168.55.2:40532      170.114.4.224:443       ESTABLISHED 2504953/zoom        
+tcp        0      0 10.0.0.5:60740          162.125.21.3:443        ESTABLISHED 2837239/dropbox     
+tcp        0      0 127.0.0.1:42790         127.0.0.1:3306          TIME_WAIT   -                   
+tcp        0      0 127.0.0.1:55080         127.0.0.1:3306          TIME_WAIT   -                   
+tcp        0      0 127.0.0.1:46828         127.0.0.1:3306          ESTABLISHED -                   
+tcp        0      0 127.0.0.1:57438         127.0.0.1:12347         ESTABLISHED 3036479/mysqld      
+tcp        0      0 127.0.0.1:55116         127.0.0.1:3306          TIME_WAIT   -                   
+tcp        0      0 127.0.0.1:58618         127.0.0.1:42001         ESTABLISHED -                   
+tcp        0      0 192.168.55.2:44004      108.157.214.53:443      ESTABLISHED 2147311/chrome --ty 
+tcp        0      0 172.17.0.1:38122        172.17.0.2:443          ESTABLISHED -                   
+tcp        0      0 127.0.0.1:46682         127.0.0.1:3306          ESTABLISHED -                   
+tcp        0      0 172.17.0.1:33276        172.17.0.2:443          ESTABLISHED -                   
+tcp        0      0 127.0.0.1:42001         127.0.0.1:58618         ESTABLISHED -                   
+tcp        0      0 127.0.0.1:35434         127.0.0.1:3306          TIME_WAIT   -                   
+tcp        0      0 192.168.55.2:43190      173.194.220.108:993     ESTABLISHED 3668124/thunderbird 
+tcp        0      0 192.168.55.2:60080      54.159.113.253:443      ESTABLISHED 3135169/kbfsfuse    
+tcp        0      0 192.168.55.2:33476      52.193.110.50:443       ESTABLISHED 622088/Slack --stan 
+tcp        0      0 127.0.0.1:42001         127.0.0.1:41588         ESTABLISHED -                   
+tcp        0      0 172.17.0.1:38132        172.17.0.2:443          ESTABLISHED -                   
+tcp        0      0 192.168.55.2:37404      162.125.69.13:443       ESTABLISHED 2837239/dropbox     
+tcp       25      0 192.168.55.2:57194      52.84.151.38:443        CLOSE_WAIT  2504953/zoom        
+tcp        0      0 192.168.55.2:50414      173.194.220.108:993     ESTABLISHED 3668124/thunderbird 
+tcp        0      0 192.168.55.2:55152      35.75.32.93:443         ESTABLISHED 622088/Slack --stan 
+tcp        0      0 10.0.0.5:52942          213.180.204.148:443     ESTABLISHED 616951/yandex-disk  
+tcp        1      0 127.0.0.1:60442         127.0.0.1:12347         CLOSE_WAIT  3036479/mysqld      
+tcp        0      0 192.168.55.2:36288      18.190.135.240:443      ESTABLISHED 2147311/chrome --ty 
+tcp       25      0 192.168.55.2:49858      170.114.52.2:443        CLOSE_WAIT  2504953/zoom        
+tcp        0      0 192.168.55.2:50244      172.64.152.233:443      ESTABLISHED 2224410/firefox     
+tcp        0      0 10.0.0.5:38802          162.125.21.3:443        ESTABLISHED 2837239/dropbox     
+tcp       13      0 10.0.0.5:34986          10.0.0.1:139            CLOSE_WAIT  37531/gvfsd-smb-bro 
+tcp        0      0 127.0.0.1:46704         127.0.0.1:3306          TIME_WAIT   -                   
+tcp        0      0 192.168.55.2:53080      91.105.192.100:443      ESTABLISHED 1712863/Telegram    
+tcp        0      0 192.168.55.2:58942      3.124.19.111:443        ESTABLISHED 2147311/chrome --ty 
+tcp        0      0 192.168.55.2:53948      74.125.205.188:5228     ESTABLISHED 2147311/chrome --ty 
+tcp        0      0 127.0.0.1:37416         127.0.0.1:12347         ESTABLISHED 3060170/mysqld      
+tcp        0      0 192.168.55.2:47012      52.73.62.51:443         ESTABLISHED -                   
+tcp        0      0 127.0.0.1:45788         127.0.0.1:3306          TIME_WAIT   -                   
+tcp        0      0 192.168.55.2:53074      91.105.192.100:443      ESTABLISHED 1712863/Telegram    
+tcp        0      0 192.168.55.2:36618      162.125.21.2:443        ESTABLISHED 2837239/dropbox     
+tcp        0      0 192.168.55.2:55440      3.68.61.181:443         ESTABLISHED 622088/Slack --stan 
+tcp        0      1 192.168.55.2:44600      52.35.150.14:443        SYN_SENT    2224410/firefox     
+tcp        0      0 127.0.0.1:41588         127.0.0.1:42001         ESTABLISHED -                   
+tcp        0      0 127.0.0.1:42802         127.0.0.1:3306          TIME_WAIT   -                   
+tcp        0      0 127.0.0.1:54652         127.0.0.1:12345         ESTABLISHED 3060170/mysqld      
+tcp        0      0 192.168.55.2:34910      64.233.162.188:5228     ESTABLISHED 2147311/chrome --ty 
+tcp        0      0 10.0.0.5:55240          162.125.21.3:443        ESTABLISHED 2837239/dropbox     
+tcp        0      0 10.0.0.5:36148          162.125.21.3:443        ESTABLISHED 2837239/dropbox     
+tcp       25      0 192.168.55.2:49844      170.114.52.2:443        CLOSE_WAIT  2504953/zoom        
+tcp        0      0 127.0.0.1:34666         127.0.0.1:12346         ESTABLISHED 3035305/mysqld      
+tcp        0      0 127.0.0.1:57612         127.0.0.1:42001         ESTABLISHED -                   
+tcp        0      1 192.168.55.2:45836      52.35.150.14:443        SYN_SENT    2224410/firefox     
+tcp        0      0 192.168.55.2:49218      38.111.114.11:993       ESTABLISHED 3668124/thunderbird 
+tcp        0      0 192.168.55.2:53098      91.105.192.100:443      ESTABLISHED 1712863/Telegram    
+tcp        0      0 127.0.0.1:42003         127.0.0.1:60112         ESTABLISHED -                   
+tcp        0      0 127.0.0.1:46818         127.0.0.1:3306          TIME_WAIT   -                   
+tcp        0      0 192.168.55.2:53082      91.105.192.100:443      ESTABLISHED 1712863/Telegram    
+tcp        0      0 127.0.0.1:54826         127.0.0.1:42003         ESTABLISHED -                   
+tcp        0      0 10.0.0.5:37224          10.0.0.5:4647           ESTABLISHED -                   
+tcp        0      0 192.168.55.2:55324      54.158.119.218:443      ESTABLISHED 3135169/kbfsfuse    
+tcp        0      0 192.168.55.2:50438      206.247.115.239:5091    ESTABLISHED 2504953/zoom        
+tcp        0      0 127.0.0.1:55066         127.0.0.1:3306          TIME_WAIT   -                   
+tcp        0      0 192.168.55.2:57734      188.114.98.233:443      TIME_WAIT   -                   
+tcp        0      0 127.0.0.1:56296         127.0.0.1:3306          TIME_WAIT   -                   
+tcp        0      0 192.168.55.2:55130      35.75.32.93:443         ESTABLISHED 622088/Slack --stan 
+tcp        0      0 192.168.55.2:51354      54.147.17.17:443        ESTABLISHED 3135130/keybase     
+tcp        0      0 192.168.55.2:50970      149.154.167.51:443      ESTABLISHED 1712863/Telegram    
+tcp        0      0 192.168.55.2:53104      91.105.192.100:443      ESTABLISHED 1712863/Telegram    
+tcp        0      0 192.168.55.2:46678      34.107.243.93:443       ESTABLISHED 2224410/firefox     
+tcp        0      0 127.0.0.1:36028         127.0.0.1:3306          ESTABLISHED -                   
+tcp        0      0 127.0.0.1:46796         127.0.0.1:3306          ESTABLISHED -                   
+tcp        0      0 127.0.0.1:42002         127.0.0.1:33532         ESTABLISHED -                   
+tcp        0      0 192.168.55.2:45184      162.125.69.12:443       ESTABLISHED 2837239/dropbox     
+tcp        1      0 127.0.0.1:59430         127.0.0.1:12347         CLOSE_WAIT  3036479/mysqld      
+tcp        0   4778 10.0.0.5:40148          162.125.6.20:443        ESTABLISHED 2837239/dropbox     
+tcp        0      0 127.0.0.1:35428         127.0.0.1:3306          TIME_WAIT   -                   
+tcp        0      0 192.168.55.2:42080      157.240.205.60:443      ESTABLISHED 2147311/chrome --ty 
+tcp        0      0 127.0.0.1:42002         127.0.0.1:54598         ESTABLISHED -                   
+tcp        0      0 127.0.0.1:47960         127.0.0.1:42002         ESTABLISHED -                   
+tcp        0      0 127.0.0.1:37430         127.0.0.1:12347         ESTABLISHED 3060170/mysqld      
+tcp        0      0 192.168.55.2:38774      77.223.96.250:443       ESTABLISHED 2224410/firefox     
+tcp        0      0 127.0.0.1:42003         127.0.0.1:54826         ESTABLISHED -                   
+tcp        0      0 127.0.0.1:42002         127.0.0.1:47960         ESTABLISHED -                   
+tcp        1      0 127.0.0.1:59438         127.0.0.1:12347         CLOSE_WAIT  3036479/mysqld      
+tcp        0      0 192.168.55.2:55414      3.68.61.181:443         ESTABLISHED 622088/Slack --stan 
+tcp        0      0 192.168.55.2:58580      188.114.99.233:443      TIME_WAIT   -                   
+tcp        0      0 172.17.0.1:44894        172.17.0.2:443          ESTABLISHED -                   
+tcp        0      0 192.168.55.2:55950      170.114.15.227:443      ESTABLISHED 2504953/zoom        
+tcp        1      0 127.0.0.1:57442         127.0.0.1:12347         CLOSE_WAIT  3036479/mysqld      
+tcp        0      0 192.168.255.22:35056    213.180.204.148:443     ESTABLISHED 1932374/yandex-disk 
+tcp        0      0 127.0.0.1:51230         127.0.0.1:3306          TIME_WAIT   -                   
+tcp        0      0 192.168.55.2:43440      194.85.125.1:443        ESTABLISHED 2224410/firefox     
+tcp        0      0 172.17.0.1:42368        172.17.0.2:443          ESTABLISHED -                   
+tcp        0      0 127.0.0.1:42001         127.0.0.1:57612         ESTABLISHED -                   
+tcp6       0      0 :::17500                :::*                    LISTEN      2837239/dropbox     
+tcp6       0      0 :::9123                 :::*                    LISTEN      -                   
+tcp6       0      0 :::8281                 :::*                    LISTEN      -                   
+tcp6       0      0 :::8383                 :::*                    LISTEN      -                   
+tcp6       0      0 :::9900                 :::*                    LISTEN      -                   
+tcp6       0      0 ::1:631                 :::*                    LISTEN      -                   
+tcp6       0      0 :::12345                :::*                    LISTEN      3036479/mysqld      
+tcp6       0      0 :::12346                :::*                    LISTEN      3060170/mysqld      
+tcp6       0      0 :::12347                :::*                    LISTEN      3035305/mysqld      
+tcp6       0      0 :::3306                 :::*                    LISTEN      -                   
+tcp6       0      0 :::22                   :::*                    LISTEN      -                   
+tcp6       0      0 :::33060                :::*                    LISTEN      -                   
+tcp6       0      0 :::443                  :::*                    LISTEN      -                   
+tcp6       0      0 :::1716                 :::*                    LISTEN      7748/kdeconnectd    
+tcp6       0      0 :::8080                 :::*                    LISTEN      -                   
+tcp6       0      0 :::4648                 :::*                    LISTEN      -                   
+tcp6       0      0 :::4646                 :::*                    LISTEN      -                   
+tcp6       0      0 :::4647                 :::*                    LISTEN      -                   
+tcp6       0      0 127.0.0.1:12347         127.0.0.1:57436         ESTABLISHED 3035305/mysqld      
+tcp6       0      0 127.0.0.1:12345         127.0.0.1:44464         ESTABLISHED 3036479/mysqld      
+tcp6       0      0 127.0.0.1:3306          127.0.0.1:36028         ESTABLISHED -                   
+tcp6       0      0 10.0.0.5:4647           10.0.0.5:37224          ESTABLISHED -                   
+tcp6       0      0 127.0.0.1:3306          127.0.0.1:45762         ESTABLISHED -                   
+tcp6       0      0 127.0.0.1:12347         127.0.0.1:37416         ESTABLISHED 3035305/mysqld      
+tcp6       0      0 127.0.0.1:3306          127.0.0.1:46828         ESTABLISHED -                   
+tcp6       0      0 127.0.0.1:3306          127.0.0.1:45766         ESTABLISHED -                   
+tcp6       0      0 10.0.0.5:4647           10.0.0.5:37220          ESTABLISHED -                   
+tcp6       0      0 127.0.0.1:12347         127.0.0.1:37430         ESTABLISHED 3035305/mysqld      
+tcp6       0      0 127.0.0.1:12345         127.0.0.1:54652         ESTABLISHED 3036479/mysqld      
+tcp6       0      0 127.0.0.1:3306          127.0.0.1:46682         ESTABLISHED -                   
+tcp6       0      0 127.0.0.1:3306          127.0.0.1:56798         TIME_WAIT   -                   
+tcp6       0      0 127.0.0.1:3306          127.0.0.1:46796         ESTABLISHED -                   
+tcp6       0      0 127.0.0.1:12347         127.0.0.1:57438         ESTABLISHED 3035305/mysqld      
+tcp6       0      0 127.0.0.1:3306          127.0.0.1:35434         TIME_WAIT   -                   
+tcp6       0      0 127.0.0.1:12346         127.0.0.1:34666         ESTABLISHED 3060170/mysqld      
+tcp6       0      0 127.0.0.1:3306          127.0.0.1:46818         TIME_WAIT   -                   
+tcp6       0      0 127.0.0.1:12345         127.0.0.1:54650         ESTABLISHED 3036479/mysqld      
+tcp6       0      0 127.0.0.1:3306          127.0.0.1:45790         ESTABLISHED -                   
diff --git a/t/pt-summary/samples/Linux/008/notable_procs b/t/pt-summary/samples/Linux/008/notable_procs
new file mode 100644
index 000000000..ced71a345
--- /dev/null
+++ b/t/pt-summary/samples/Linux/008/notable_procs
@@ -0,0 +1,5 @@
+  PID    OOM    COMMAND
+    ?      ?    sshd doesn't appear to be running
+1499134    -17    multipathd
+2849628    -17    nomad
+3202899    -17    sshd
diff --git a/t/pt-summary/samples/Linux/008/partitioning b/t/pt-summary/samples/Linux/008/partitioning
new file mode 100644
index 000000000..f530bb49c
--- /dev/null
+++ b/t/pt-summary/samples/Linux/008/partitioning
@@ -0,0 +1,12 @@
+Disk /dev/nvme0n1: 3,64 TiB, 4000787030016 bytes, 7814037168 sectors
+Disk model: WD_BLACK SN850X 4000GB                  
+Units: sectors of 1 * 512 = 512 bytes
+Sector size (logical/physical): 512 bytes / 512 bytes
+I/O size (minimum/optimal): 512 bytes / 512 bytes
+Disklabel type: gpt
+Disk identifier: F57C2A9B-3E4B-49BA-BA83-3D206D23C1F6
+
+Device           Start        End    Sectors  Size Type
+/dev/nvme0n1p1    2048    1050623    1048576  512M EFI System
+/dev/nvme0n1p2 1050624    4550655    3500032  1,7G Linux filesystem
+/dev/nvme0n1p3 4550656 7814035455 7809484800  3,6T Linux filesystem
diff --git a/t/pt-summary/samples/Linux/008/proc_cpuinfo_copy b/t/pt-summary/samples/Linux/008/proc_cpuinfo_copy
new file mode 100644
index 000000000..2caa2e89c
--- /dev/null
+++ b/t/pt-summary/samples/Linux/008/proc_cpuinfo_copy
@@ -0,0 +1,448 @@
+processor	: 0
+vendor_id	: GenuineIntel
+cpu family	: 6
+model		: 154
+model name	: 12th Gen Intel(R) Core(TM) i7-1260P
+stepping	: 3
+microcode	: 0x433
+cpu MHz		: 2672.558
+cache size	: 18432 KB
+physical id	: 0
+siblings	: 16
+core id		: 0
+cpu cores	: 12
+apicid		: 0
+initial apicid	: 0
+fpu		: yes
+fpu_exception	: yes
+cpuid level	: 32
+wp		: yes
+flags		: fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe syscall nx pdpe1gb rdtscp lm constant_tsc art arch_perfmon pebs bts rep_good nopl xtopology nonstop_tsc cpuid aperfmperf tsc_known_freq pni pclmulqdq dtes64 monitor ds_cpl vmx smx est tm2 ssse3 sdbg fma cx16 xtpr pdcm sse4_1 sse4_2 x2apic movbe popcnt tsc_deadline_timer aes xsave avx f16c rdrand lahf_lm abm 3dnowprefetch cpuid_fault epb ssbd ibrs ibpb stibp ibrs_enhanced tpr_shadow flexpriority ept vpid ept_ad fsgsbase tsc_adjust bmi1 avx2 smep bmi2 erms invpcid rdseed adx smap clflushopt clwb intel_pt sha_ni xsaveopt xsavec xgetbv1 xsaves split_lock_detect avx_vnni dtherm ida arat pln pts hwp hwp_notify hwp_act_window hwp_epp hwp_pkg_req hfi vnmi umip pku ospke waitpkg gfni vaes vpclmulqdq rdpid movdiri movdir64b fsrm md_clear serialize arch_lbr ibt flush_l1d arch_capabilities
+vmx flags	: vnmi preemption_timer posted_intr invvpid ept_x_only ept_ad ept_1gb flexpriority apicv tsc_offset vtpr mtf vapic ept vpid unrestricted_guest vapic_reg vid ple shadow_vmcs ept_mode_based_exec tsc_scaling usr_wait_pause
+bugs		: coma tlb_mmatch spectre_v1 spectre_v2 spec_store_bypass swapgs eibrs_pbrsb bhi
+bogomips	: 4992.00
+clflush size	: 64
+cache_alignment	: 64
+address sizes	: 39 bits physical, 48 bits virtual
+power management:
+
+processor	: 1
+vendor_id	: GenuineIntel
+cpu family	: 6
+model		: 154
+model name	: 12th Gen Intel(R) Core(TM) i7-1260P
+stepping	: 3
+microcode	: 0x433
+cpu MHz		: 2780.294
+cache size	: 18432 KB
+physical id	: 0
+siblings	: 16
+core id		: 0
+cpu cores	: 12
+apicid		: 1
+initial apicid	: 1
+fpu		: yes
+fpu_exception	: yes
+cpuid level	: 32
+wp		: yes
+flags		: fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe syscall nx pdpe1gb rdtscp lm constant_tsc art arch_perfmon pebs bts rep_good nopl xtopology nonstop_tsc cpuid aperfmperf tsc_known_freq pni pclmulqdq dtes64 monitor ds_cpl vmx smx est tm2 ssse3 sdbg fma cx16 xtpr pdcm sse4_1 sse4_2 x2apic movbe popcnt tsc_deadline_timer aes xsave avx f16c rdrand lahf_lm abm 3dnowprefetch cpuid_fault epb ssbd ibrs ibpb stibp ibrs_enhanced tpr_shadow flexpriority ept vpid ept_ad fsgsbase tsc_adjust bmi1 avx2 smep bmi2 erms invpcid rdseed adx smap clflushopt clwb intel_pt sha_ni xsaveopt xsavec xgetbv1 xsaves split_lock_detect avx_vnni dtherm ida arat pln pts hwp hwp_notify hwp_act_window hwp_epp hwp_pkg_req hfi vnmi umip pku ospke waitpkg gfni vaes vpclmulqdq rdpid movdiri movdir64b fsrm md_clear serialize arch_lbr ibt flush_l1d arch_capabilities
+vmx flags	: vnmi preemption_timer posted_intr invvpid ept_x_only ept_ad ept_1gb flexpriority apicv tsc_offset vtpr mtf vapic ept vpid unrestricted_guest vapic_reg vid ple shadow_vmcs ept_mode_based_exec tsc_scaling usr_wait_pause
+bugs		: coma tlb_mmatch spectre_v1 spectre_v2 spec_store_bypass swapgs eibrs_pbrsb bhi
+bogomips	: 4992.00
+clflush size	: 64
+cache_alignment	: 64
+address sizes	: 39 bits physical, 48 bits virtual
+power management:
+
+processor	: 2
+vendor_id	: GenuineIntel
+cpu family	: 6
+model		: 154
+model name	: 12th Gen Intel(R) Core(TM) i7-1260P
+stepping	: 3
+microcode	: 0x433
+cpu MHz		: 2800.000
+cache size	: 18432 KB
+physical id	: 0
+siblings	: 16
+core id		: 4
+cpu cores	: 12
+apicid		: 8
+initial apicid	: 8
+fpu		: yes
+fpu_exception	: yes
+cpuid level	: 32
+wp		: yes
+flags		: fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe syscall nx pdpe1gb rdtscp lm constant_tsc art arch_perfmon pebs bts rep_good nopl xtopology nonstop_tsc cpuid aperfmperf tsc_known_freq pni pclmulqdq dtes64 monitor ds_cpl vmx smx est tm2 ssse3 sdbg fma cx16 xtpr pdcm sse4_1 sse4_2 x2apic movbe popcnt tsc_deadline_timer aes xsave avx f16c rdrand lahf_lm abm 3dnowprefetch cpuid_fault epb ssbd ibrs ibpb stibp ibrs_enhanced tpr_shadow flexpriority ept vpid ept_ad fsgsbase tsc_adjust bmi1 avx2 smep bmi2 erms invpcid rdseed adx smap clflushopt clwb intel_pt sha_ni xsaveopt xsavec xgetbv1 xsaves split_lock_detect avx_vnni dtherm ida arat pln pts hwp hwp_notify hwp_act_window hwp_epp hwp_pkg_req hfi vnmi umip pku ospke waitpkg gfni vaes vpclmulqdq rdpid movdiri movdir64b fsrm md_clear serialize arch_lbr ibt flush_l1d arch_capabilities
+vmx flags	: vnmi preemption_timer posted_intr invvpid ept_x_only ept_ad ept_1gb flexpriority apicv tsc_offset vtpr mtf vapic ept vpid unrestricted_guest vapic_reg vid ple shadow_vmcs ept_mode_based_exec tsc_scaling usr_wait_pause
+bugs		: coma tlb_mmatch spectre_v1 spectre_v2 spec_store_bypass swapgs eibrs_pbrsb bhi
+bogomips	: 4992.00
+clflush size	: 64
+cache_alignment	: 64
+address sizes	: 39 bits physical, 48 bits virtual
+power management:
+
+processor	: 3
+vendor_id	: GenuineIntel
+cpu family	: 6
+model		: 154
+model name	: 12th Gen Intel(R) Core(TM) i7-1260P
+stepping	: 3
+microcode	: 0x433
+cpu MHz		: 2800.000
+cache size	: 18432 KB
+physical id	: 0
+siblings	: 16
+core id		: 4
+cpu cores	: 12
+apicid		: 9
+initial apicid	: 9
+fpu		: yes
+fpu_exception	: yes
+cpuid level	: 32
+wp		: yes
+flags		: fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe syscall nx pdpe1gb rdtscp lm constant_tsc art arch_perfmon pebs bts rep_good nopl xtopology nonstop_tsc cpuid aperfmperf tsc_known_freq pni pclmulqdq dtes64 monitor ds_cpl vmx smx est tm2 ssse3 sdbg fma cx16 xtpr pdcm sse4_1 sse4_2 x2apic movbe popcnt tsc_deadline_timer aes xsave avx f16c rdrand lahf_lm abm 3dnowprefetch cpuid_fault epb ssbd ibrs ibpb stibp ibrs_enhanced tpr_shadow flexpriority ept vpid ept_ad fsgsbase tsc_adjust bmi1 avx2 smep bmi2 erms invpcid rdseed adx smap clflushopt clwb intel_pt sha_ni xsaveopt xsavec xgetbv1 xsaves split_lock_detect avx_vnni dtherm ida arat pln pts hwp hwp_notify hwp_act_window hwp_epp hwp_pkg_req hfi vnmi umip pku ospke waitpkg gfni vaes vpclmulqdq rdpid movdiri movdir64b fsrm md_clear serialize arch_lbr ibt flush_l1d arch_capabilities
+vmx flags	: vnmi preemption_timer posted_intr invvpid ept_x_only ept_ad ept_1gb flexpriority apicv tsc_offset vtpr mtf vapic ept vpid unrestricted_guest vapic_reg vid ple shadow_vmcs ept_mode_based_exec tsc_scaling usr_wait_pause
+bugs		: coma tlb_mmatch spectre_v1 spectre_v2 spec_store_bypass swapgs eibrs_pbrsb bhi
+bogomips	: 4992.00
+clflush size	: 64
+cache_alignment	: 64
+address sizes	: 39 bits physical, 48 bits virtual
+power management:
+
+processor	: 4
+vendor_id	: GenuineIntel
+cpu family	: 6
+model		: 154
+model name	: 12th Gen Intel(R) Core(TM) i7-1260P
+stepping	: 3
+microcode	: 0x433
+cpu MHz		: 2800.000
+cache size	: 18432 KB
+physical id	: 0
+siblings	: 16
+core id		: 8
+cpu cores	: 12
+apicid		: 16
+initial apicid	: 16
+fpu		: yes
+fpu_exception	: yes
+cpuid level	: 32
+wp		: yes
+flags		: fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe syscall nx pdpe1gb rdtscp lm constant_tsc art arch_perfmon pebs bts rep_good nopl xtopology nonstop_tsc cpuid aperfmperf tsc_known_freq pni pclmulqdq dtes64 monitor ds_cpl vmx smx est tm2 ssse3 sdbg fma cx16 xtpr pdcm sse4_1 sse4_2 x2apic movbe popcnt tsc_deadline_timer aes xsave avx f16c rdrand lahf_lm abm 3dnowprefetch cpuid_fault epb ssbd ibrs ibpb stibp ibrs_enhanced tpr_shadow flexpriority ept vpid ept_ad fsgsbase tsc_adjust bmi1 avx2 smep bmi2 erms invpcid rdseed adx smap clflushopt clwb intel_pt sha_ni xsaveopt xsavec xgetbv1 xsaves split_lock_detect avx_vnni dtherm ida arat pln pts hwp hwp_notify hwp_act_window hwp_epp hwp_pkg_req hfi vnmi umip pku ospke waitpkg gfni vaes vpclmulqdq rdpid movdiri movdir64b fsrm md_clear serialize arch_lbr ibt flush_l1d arch_capabilities
+vmx flags	: vnmi preemption_timer posted_intr invvpid ept_x_only ept_ad ept_1gb flexpriority apicv tsc_offset vtpr mtf vapic ept vpid unrestricted_guest vapic_reg vid ple shadow_vmcs ept_mode_based_exec tsc_scaling usr_wait_pause
+bugs		: coma tlb_mmatch spectre_v1 spectre_v2 spec_store_bypass swapgs eibrs_pbrsb bhi
+bogomips	: 4992.00
+clflush size	: 64
+cache_alignment	: 64
+address sizes	: 39 bits physical, 48 bits virtual
+power management:
+
+processor	: 5
+vendor_id	: GenuineIntel
+cpu family	: 6
+model		: 154
+model name	: 12th Gen Intel(R) Core(TM) i7-1260P
+stepping	: 3
+microcode	: 0x433
+cpu MHz		: 2900.000
+cache size	: 18432 KB
+physical id	: 0
+siblings	: 16
+core id		: 8
+cpu cores	: 12
+apicid		: 17
+initial apicid	: 17
+fpu		: yes
+fpu_exception	: yes
+cpuid level	: 32
+wp		: yes
+flags		: fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe syscall nx pdpe1gb rdtscp lm constant_tsc art arch_perfmon pebs bts rep_good nopl xtopology nonstop_tsc cpuid aperfmperf tsc_known_freq pni pclmulqdq dtes64 monitor ds_cpl vmx smx est tm2 ssse3 sdbg fma cx16 xtpr pdcm sse4_1 sse4_2 x2apic movbe popcnt tsc_deadline_timer aes xsave avx f16c rdrand lahf_lm abm 3dnowprefetch cpuid_fault epb ssbd ibrs ibpb stibp ibrs_enhanced tpr_shadow flexpriority ept vpid ept_ad fsgsbase tsc_adjust bmi1 avx2 smep bmi2 erms invpcid rdseed adx smap clflushopt clwb intel_pt sha_ni xsaveopt xsavec xgetbv1 xsaves split_lock_detect avx_vnni dtherm ida arat pln pts hwp hwp_notify hwp_act_window hwp_epp hwp_pkg_req hfi vnmi umip pku ospke waitpkg gfni vaes vpclmulqdq rdpid movdiri movdir64b fsrm md_clear serialize arch_lbr ibt flush_l1d arch_capabilities
+vmx flags	: vnmi preemption_timer posted_intr invvpid ept_x_only ept_ad ept_1gb flexpriority apicv tsc_offset vtpr mtf vapic ept vpid unrestricted_guest vapic_reg vid ple shadow_vmcs ept_mode_based_exec tsc_scaling usr_wait_pause
+bugs		: coma tlb_mmatch spectre_v1 spectre_v2 spec_store_bypass swapgs eibrs_pbrsb bhi
+bogomips	: 4992.00
+clflush size	: 64
+cache_alignment	: 64
+address sizes	: 39 bits physical, 48 bits virtual
+power management:
+
+processor	: 6
+vendor_id	: GenuineIntel
+cpu family	: 6
+model		: 154
+model name	: 12th Gen Intel(R) Core(TM) i7-1260P
+stepping	: 3
+microcode	: 0x433
+cpu MHz		: 2800.000
+cache size	: 18432 KB
+physical id	: 0
+siblings	: 16
+core id		: 12
+cpu cores	: 12
+apicid		: 24
+initial apicid	: 24
+fpu		: yes
+fpu_exception	: yes
+cpuid level	: 32
+wp		: yes
+flags		: fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe syscall nx pdpe1gb rdtscp lm constant_tsc art arch_perfmon pebs bts rep_good nopl xtopology nonstop_tsc cpuid aperfmperf tsc_known_freq pni pclmulqdq dtes64 monitor ds_cpl vmx smx est tm2 ssse3 sdbg fma cx16 xtpr pdcm sse4_1 sse4_2 x2apic movbe popcnt tsc_deadline_timer aes xsave avx f16c rdrand lahf_lm abm 3dnowprefetch cpuid_fault epb ssbd ibrs ibpb stibp ibrs_enhanced tpr_shadow flexpriority ept vpid ept_ad fsgsbase tsc_adjust bmi1 avx2 smep bmi2 erms invpcid rdseed adx smap clflushopt clwb intel_pt sha_ni xsaveopt xsavec xgetbv1 xsaves split_lock_detect avx_vnni dtherm ida arat pln pts hwp hwp_notify hwp_act_window hwp_epp hwp_pkg_req hfi vnmi umip pku ospke waitpkg gfni vaes vpclmulqdq rdpid movdiri movdir64b fsrm md_clear serialize arch_lbr ibt flush_l1d arch_capabilities
+vmx flags	: vnmi preemption_timer posted_intr invvpid ept_x_only ept_ad ept_1gb flexpriority apicv tsc_offset vtpr mtf vapic ept vpid unrestricted_guest vapic_reg vid ple shadow_vmcs ept_mode_based_exec tsc_scaling usr_wait_pause
+bugs		: coma tlb_mmatch spectre_v1 spectre_v2 spec_store_bypass swapgs eibrs_pbrsb bhi
+bogomips	: 4992.00
+clflush size	: 64
+cache_alignment	: 64
+address sizes	: 39 bits physical, 48 bits virtual
+power management:
+
+processor	: 7
+vendor_id	: GenuineIntel
+cpu family	: 6
+model		: 154
+model name	: 12th Gen Intel(R) Core(TM) i7-1260P
+stepping	: 3
+microcode	: 0x433
+cpu MHz		: 2800.007
+cache size	: 18432 KB
+physical id	: 0
+siblings	: 16
+core id		: 12
+cpu cores	: 12
+apicid		: 25
+initial apicid	: 25
+fpu		: yes
+fpu_exception	: yes
+cpuid level	: 32
+wp		: yes
+flags		: fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe syscall nx pdpe1gb rdtscp lm constant_tsc art arch_perfmon pebs bts rep_good nopl xtopology nonstop_tsc cpuid aperfmperf tsc_known_freq pni pclmulqdq dtes64 monitor ds_cpl vmx smx est tm2 ssse3 sdbg fma cx16 xtpr pdcm sse4_1 sse4_2 x2apic movbe popcnt tsc_deadline_timer aes xsave avx f16c rdrand lahf_lm abm 3dnowprefetch cpuid_fault epb ssbd ibrs ibpb stibp ibrs_enhanced tpr_shadow flexpriority ept vpid ept_ad fsgsbase tsc_adjust bmi1 avx2 smep bmi2 erms invpcid rdseed adx smap clflushopt clwb intel_pt sha_ni xsaveopt xsavec xgetbv1 xsaves split_lock_detect avx_vnni dtherm ida arat pln pts hwp hwp_notify hwp_act_window hwp_epp hwp_pkg_req hfi vnmi umip pku ospke waitpkg gfni vaes vpclmulqdq rdpid movdiri movdir64b fsrm md_clear serialize arch_lbr ibt flush_l1d arch_capabilities
+vmx flags	: vnmi preemption_timer posted_intr invvpid ept_x_only ept_ad ept_1gb flexpriority apicv tsc_offset vtpr mtf vapic ept vpid unrestricted_guest vapic_reg vid ple shadow_vmcs ept_mode_based_exec tsc_scaling usr_wait_pause
+bugs		: coma tlb_mmatch spectre_v1 spectre_v2 spec_store_bypass swapgs eibrs_pbrsb bhi
+bogomips	: 4992.00
+clflush size	: 64
+cache_alignment	: 64
+address sizes	: 39 bits physical, 48 bits virtual
+power management:
+
+processor	: 8
+vendor_id	: GenuineIntel
+cpu family	: 6
+model		: 154
+model name	: 12th Gen Intel(R) Core(TM) i7-1260P
+stepping	: 3
+microcode	: 0x433
+cpu MHz		: 2300.017
+cache size	: 18432 KB
+physical id	: 0
+siblings	: 16
+core id		: 16
+cpu cores	: 12
+apicid		: 32
+initial apicid	: 32
+fpu		: yes
+fpu_exception	: yes
+cpuid level	: 32
+wp		: yes
+flags		: fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe syscall nx pdpe1gb rdtscp lm constant_tsc art arch_perfmon pebs bts rep_good nopl xtopology nonstop_tsc cpuid aperfmperf tsc_known_freq pni pclmulqdq dtes64 monitor ds_cpl vmx smx est tm2 ssse3 sdbg fma cx16 xtpr pdcm sse4_1 sse4_2 x2apic movbe popcnt tsc_deadline_timer aes xsave avx f16c rdrand lahf_lm abm 3dnowprefetch cpuid_fault epb ssbd ibrs ibpb stibp ibrs_enhanced tpr_shadow flexpriority ept vpid ept_ad fsgsbase tsc_adjust bmi1 avx2 smep bmi2 erms invpcid rdseed adx smap clflushopt clwb intel_pt sha_ni xsaveopt xsavec xgetbv1 xsaves split_lock_detect avx_vnni dtherm ida arat pln pts hwp hwp_notify hwp_act_window hwp_epp hwp_pkg_req hfi vnmi umip pku ospke waitpkg gfni vaes vpclmulqdq rdpid movdiri movdir64b fsrm md_clear serialize arch_lbr ibt flush_l1d arch_capabilities
+vmx flags	: vnmi preemption_timer posted_intr invvpid ept_x_only ept_ad ept_1gb flexpriority apicv tsc_offset vtpr mtf vapic ept vpid unrestricted_guest vapic_reg vid ple shadow_vmcs ept_mode_based_exec tsc_scaling usr_wait_pause
+bugs		: coma tlb_mmatch spectre_v1 spectre_v2 spec_store_bypass swapgs eibrs_pbrsb bhi
+bogomips	: 4992.00
+clflush size	: 64
+cache_alignment	: 64
+address sizes	: 39 bits physical, 48 bits virtual
+power management:
+
+processor	: 9
+vendor_id	: GenuineIntel
+cpu family	: 6
+model		: 154
+model name	: 12th Gen Intel(R) Core(TM) i7-1260P
+stepping	: 3
+microcode	: 0x433
+cpu MHz		: 2299.975
+cache size	: 18432 KB
+physical id	: 0
+siblings	: 16
+core id		: 17
+cpu cores	: 12
+apicid		: 34
+initial apicid	: 34
+fpu		: yes
+fpu_exception	: yes
+cpuid level	: 32
+wp		: yes
+flags		: fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe syscall nx pdpe1gb rdtscp lm constant_tsc art arch_perfmon pebs bts rep_good nopl xtopology nonstop_tsc cpuid aperfmperf tsc_known_freq pni pclmulqdq dtes64 monitor ds_cpl vmx smx est tm2 ssse3 sdbg fma cx16 xtpr pdcm sse4_1 sse4_2 x2apic movbe popcnt tsc_deadline_timer aes xsave avx f16c rdrand lahf_lm abm 3dnowprefetch cpuid_fault epb ssbd ibrs ibpb stibp ibrs_enhanced tpr_shadow flexpriority ept vpid ept_ad fsgsbase tsc_adjust bmi1 avx2 smep bmi2 erms invpcid rdseed adx smap clflushopt clwb intel_pt sha_ni xsaveopt xsavec xgetbv1 xsaves split_lock_detect avx_vnni dtherm ida arat pln pts hwp hwp_notify hwp_act_window hwp_epp hwp_pkg_req hfi vnmi umip pku ospke waitpkg gfni vaes vpclmulqdq rdpid movdiri movdir64b fsrm md_clear serialize arch_lbr ibt flush_l1d arch_capabilities
+vmx flags	: vnmi preemption_timer posted_intr invvpid ept_x_only ept_ad ept_1gb flexpriority apicv tsc_offset vtpr mtf vapic ept vpid unrestricted_guest vapic_reg vid ple shadow_vmcs ept_mode_based_exec tsc_scaling usr_wait_pause
+bugs		: coma tlb_mmatch spectre_v1 spectre_v2 spec_store_bypass swapgs eibrs_pbrsb bhi
+bogomips	: 4992.00
+clflush size	: 64
+cache_alignment	: 64
+address sizes	: 39 bits physical, 48 bits virtual
+power management:
+
+processor	: 10
+vendor_id	: GenuineIntel
+cpu family	: 6
+model		: 154
+model name	: 12th Gen Intel(R) Core(TM) i7-1260P
+stepping	: 3
+microcode	: 0x433
+cpu MHz		: 2300.091
+cache size	: 18432 KB
+physical id	: 0
+siblings	: 16
+core id		: 18
+cpu cores	: 12
+apicid		: 36
+initial apicid	: 36
+fpu		: yes
+fpu_exception	: yes
+cpuid level	: 32
+wp		: yes
+flags		: fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe syscall nx pdpe1gb rdtscp lm constant_tsc art arch_perfmon pebs bts rep_good nopl xtopology nonstop_tsc cpuid aperfmperf tsc_known_freq pni pclmulqdq dtes64 monitor ds_cpl vmx smx est tm2 ssse3 sdbg fma cx16 xtpr pdcm sse4_1 sse4_2 x2apic movbe popcnt tsc_deadline_timer aes xsave avx f16c rdrand lahf_lm abm 3dnowprefetch cpuid_fault epb ssbd ibrs ibpb stibp ibrs_enhanced tpr_shadow flexpriority ept vpid ept_ad fsgsbase tsc_adjust bmi1 avx2 smep bmi2 erms invpcid rdseed adx smap clflushopt clwb intel_pt sha_ni xsaveopt xsavec xgetbv1 xsaves split_lock_detect avx_vnni dtherm ida arat pln pts hwp hwp_notify hwp_act_window hwp_epp hwp_pkg_req hfi vnmi umip pku ospke waitpkg gfni vaes vpclmulqdq rdpid movdiri movdir64b fsrm md_clear serialize arch_lbr ibt flush_l1d arch_capabilities
+vmx flags	: vnmi preemption_timer posted_intr invvpid ept_x_only ept_ad ept_1gb flexpriority apicv tsc_offset vtpr mtf vapic ept vpid unrestricted_guest vapic_reg vid ple shadow_vmcs ept_mode_based_exec tsc_scaling usr_wait_pause
+bugs		: coma tlb_mmatch spectre_v1 spectre_v2 spec_store_bypass swapgs eibrs_pbrsb bhi
+bogomips	: 4992.00
+clflush size	: 64
+cache_alignment	: 64
+address sizes	: 39 bits physical, 48 bits virtual
+power management:
+
+processor	: 11
+vendor_id	: GenuineIntel
+cpu family	: 6
+model		: 154
+model name	: 12th Gen Intel(R) Core(TM) i7-1260P
+stepping	: 3
+microcode	: 0x433
+cpu MHz		: 2299.998
+cache size	: 18432 KB
+physical id	: 0
+siblings	: 16
+core id		: 19
+cpu cores	: 12
+apicid		: 38
+initial apicid	: 38
+fpu		: yes
+fpu_exception	: yes
+cpuid level	: 32
+wp		: yes
+flags		: fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe syscall nx pdpe1gb rdtscp lm constant_tsc art arch_perfmon pebs bts rep_good nopl xtopology nonstop_tsc cpuid aperfmperf tsc_known_freq pni pclmulqdq dtes64 monitor ds_cpl vmx smx est tm2 ssse3 sdbg fma cx16 xtpr pdcm sse4_1 sse4_2 x2apic movbe popcnt tsc_deadline_timer aes xsave avx f16c rdrand lahf_lm abm 3dnowprefetch cpuid_fault epb ssbd ibrs ibpb stibp ibrs_enhanced tpr_shadow flexpriority ept vpid ept_ad fsgsbase tsc_adjust bmi1 avx2 smep bmi2 erms invpcid rdseed adx smap clflushopt clwb intel_pt sha_ni xsaveopt xsavec xgetbv1 xsaves split_lock_detect avx_vnni dtherm ida arat pln pts hwp hwp_notify hwp_act_window hwp_epp hwp_pkg_req hfi vnmi umip pku ospke waitpkg gfni vaes vpclmulqdq rdpid movdiri movdir64b fsrm md_clear serialize arch_lbr ibt flush_l1d arch_capabilities
+vmx flags	: vnmi preemption_timer posted_intr invvpid ept_x_only ept_ad ept_1gb flexpriority apicv tsc_offset vtpr mtf vapic ept vpid unrestricted_guest vapic_reg vid ple shadow_vmcs ept_mode_based_exec tsc_scaling usr_wait_pause
+bugs		: coma tlb_mmatch spectre_v1 spectre_v2 spec_store_bypass swapgs eibrs_pbrsb bhi
+bogomips	: 4992.00
+clflush size	: 64
+cache_alignment	: 64
+address sizes	: 39 bits physical, 48 bits virtual
+power management:
+
+processor	: 12
+vendor_id	: GenuineIntel
+cpu family	: 6
+model		: 154
+model name	: 12th Gen Intel(R) Core(TM) i7-1260P
+stepping	: 3
+microcode	: 0x433
+cpu MHz		: 2299.997
+cache size	: 18432 KB
+physical id	: 0
+siblings	: 16
+core id		: 20
+cpu cores	: 12
+apicid		: 40
+initial apicid	: 40
+fpu		: yes
+fpu_exception	: yes
+cpuid level	: 32
+wp		: yes
+flags		: fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe syscall nx pdpe1gb rdtscp lm constant_tsc art arch_perfmon pebs bts rep_good nopl xtopology nonstop_tsc cpuid aperfmperf tsc_known_freq pni pclmulqdq dtes64 monitor ds_cpl vmx smx est tm2 ssse3 sdbg fma cx16 xtpr pdcm sse4_1 sse4_2 x2apic movbe popcnt tsc_deadline_timer aes xsave avx f16c rdrand lahf_lm abm 3dnowprefetch cpuid_fault epb ssbd ibrs ibpb stibp ibrs_enhanced tpr_shadow flexpriority ept vpid ept_ad fsgsbase tsc_adjust bmi1 avx2 smep bmi2 erms invpcid rdseed adx smap clflushopt clwb intel_pt sha_ni xsaveopt xsavec xgetbv1 xsaves split_lock_detect avx_vnni dtherm ida arat pln pts hwp hwp_notify hwp_act_window hwp_epp hwp_pkg_req hfi vnmi umip pku ospke waitpkg gfni vaes vpclmulqdq rdpid movdiri movdir64b fsrm md_clear serialize arch_lbr ibt flush_l1d arch_capabilities
+vmx flags	: vnmi preemption_timer posted_intr invvpid ept_x_only ept_ad ept_1gb flexpriority apicv tsc_offset vtpr mtf vapic ept vpid unrestricted_guest vapic_reg vid ple shadow_vmcs ept_mode_based_exec tsc_scaling usr_wait_pause
+bugs		: coma tlb_mmatch spectre_v1 spectre_v2 spec_store_bypass swapgs eibrs_pbrsb bhi
+bogomips	: 4992.00
+clflush size	: 64
+cache_alignment	: 64
+address sizes	: 39 bits physical, 48 bits virtual
+power management:
+
+processor	: 13
+vendor_id	: GenuineIntel
+cpu family	: 6
+model		: 154
+model name	: 12th Gen Intel(R) Core(TM) i7-1260P
+stepping	: 3
+microcode	: 0x433
+cpu MHz		: 2300.012
+cache size	: 18432 KB
+physical id	: 0
+siblings	: 16
+core id		: 21
+cpu cores	: 12
+apicid		: 42
+initial apicid	: 42
+fpu		: yes
+fpu_exception	: yes
+cpuid level	: 32
+wp		: yes
+flags		: fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe syscall nx pdpe1gb rdtscp lm constant_tsc art arch_perfmon pebs bts rep_good nopl xtopology nonstop_tsc cpuid aperfmperf tsc_known_freq pni pclmulqdq dtes64 monitor ds_cpl vmx smx est tm2 ssse3 sdbg fma cx16 xtpr pdcm sse4_1 sse4_2 x2apic movbe popcnt tsc_deadline_timer aes xsave avx f16c rdrand lahf_lm abm 3dnowprefetch cpuid_fault epb ssbd ibrs ibpb stibp ibrs_enhanced tpr_shadow flexpriority ept vpid ept_ad fsgsbase tsc_adjust bmi1 avx2 smep bmi2 erms invpcid rdseed adx smap clflushopt clwb intel_pt sha_ni xsaveopt xsavec xgetbv1 xsaves split_lock_detect avx_vnni dtherm ida arat pln pts hwp hwp_notify hwp_act_window hwp_epp hwp_pkg_req hfi vnmi umip pku ospke waitpkg gfni vaes vpclmulqdq rdpid movdiri movdir64b fsrm md_clear serialize arch_lbr ibt flush_l1d arch_capabilities
+vmx flags	: vnmi preemption_timer posted_intr invvpid ept_x_only ept_ad ept_1gb flexpriority apicv tsc_offset vtpr mtf vapic ept vpid unrestricted_guest vapic_reg vid ple shadow_vmcs ept_mode_based_exec tsc_scaling usr_wait_pause
+bugs		: coma tlb_mmatch spectre_v1 spectre_v2 spec_store_bypass swapgs eibrs_pbrsb bhi
+bogomips	: 4992.00
+clflush size	: 64
+cache_alignment	: 64
+address sizes	: 39 bits physical, 48 bits virtual
+power management:
+
+processor	: 14
+vendor_id	: GenuineIntel
+cpu family	: 6
+model		: 154
+model name	: 12th Gen Intel(R) Core(TM) i7-1260P
+stepping	: 3
+microcode	: 0x433
+cpu MHz		: 2299.894
+cache size	: 18432 KB
+physical id	: 0
+siblings	: 16
+core id		: 22
+cpu cores	: 12
+apicid		: 44
+initial apicid	: 44
+fpu		: yes
+fpu_exception	: yes
+cpuid level	: 32
+wp		: yes
+flags		: fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe syscall nx pdpe1gb rdtscp lm constant_tsc art arch_perfmon pebs bts rep_good nopl xtopology nonstop_tsc cpuid aperfmperf tsc_known_freq pni pclmulqdq dtes64 monitor ds_cpl vmx smx est tm2 ssse3 sdbg fma cx16 xtpr pdcm sse4_1 sse4_2 x2apic movbe popcnt tsc_deadline_timer aes xsave avx f16c rdrand lahf_lm abm 3dnowprefetch cpuid_fault epb ssbd ibrs ibpb stibp ibrs_enhanced tpr_shadow flexpriority ept vpid ept_ad fsgsbase tsc_adjust bmi1 avx2 smep bmi2 erms invpcid rdseed adx smap clflushopt clwb intel_pt sha_ni xsaveopt xsavec xgetbv1 xsaves split_lock_detect avx_vnni dtherm ida arat pln pts hwp hwp_notify hwp_act_window hwp_epp hwp_pkg_req hfi vnmi umip pku ospke waitpkg gfni vaes vpclmulqdq rdpid movdiri movdir64b fsrm md_clear serialize arch_lbr ibt flush_l1d arch_capabilities
+vmx flags	: vnmi preemption_timer posted_intr invvpid ept_x_only ept_ad ept_1gb flexpriority apicv tsc_offset vtpr mtf vapic ept vpid unrestricted_guest vapic_reg vid ple shadow_vmcs ept_mode_based_exec tsc_scaling usr_wait_pause
+bugs		: coma tlb_mmatch spectre_v1 spectre_v2 spec_store_bypass swapgs eibrs_pbrsb bhi
+bogomips	: 4992.00
+clflush size	: 64
+cache_alignment	: 64
+address sizes	: 39 bits physical, 48 bits virtual
+power management:
+
+processor	: 15
+vendor_id	: GenuineIntel
+cpu family	: 6
+model		: 154
+model name	: 12th Gen Intel(R) Core(TM) i7-1260P
+stepping	: 3
+microcode	: 0x433
+cpu MHz		: 2300.011
+cache size	: 18432 KB
+physical id	: 0
+siblings	: 16
+core id		: 23
+cpu cores	: 12
+apicid		: 46
+initial apicid	: 46
+fpu		: yes
+fpu_exception	: yes
+cpuid level	: 32
+wp		: yes
+flags		: fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe syscall nx pdpe1gb rdtscp lm constant_tsc art arch_perfmon pebs bts rep_good nopl xtopology nonstop_tsc cpuid aperfmperf tsc_known_freq pni pclmulqdq dtes64 monitor ds_cpl vmx smx est tm2 ssse3 sdbg fma cx16 xtpr pdcm sse4_1 sse4_2 x2apic movbe popcnt tsc_deadline_timer aes xsave avx f16c rdrand lahf_lm abm 3dnowprefetch cpuid_fault epb ssbd ibrs ibpb stibp ibrs_enhanced tpr_shadow flexpriority ept vpid ept_ad fsgsbase tsc_adjust bmi1 avx2 smep bmi2 erms invpcid rdseed adx smap clflushopt clwb intel_pt sha_ni xsaveopt xsavec xgetbv1 xsaves split_lock_detect avx_vnni dtherm ida arat pln pts hwp hwp_notify hwp_act_window hwp_epp hwp_pkg_req hfi vnmi umip pku ospke waitpkg gfni vaes vpclmulqdq rdpid movdiri movdir64b fsrm md_clear serialize arch_lbr ibt flush_l1d arch_capabilities
+vmx flags	: vnmi preemption_timer posted_intr invvpid ept_x_only ept_ad ept_1gb flexpriority apicv tsc_offset vtpr mtf vapic ept vpid unrestricted_guest vapic_reg vid ple shadow_vmcs ept_mode_based_exec tsc_scaling usr_wait_pause
+bugs		: coma tlb_mmatch spectre_v1 spectre_v2 spec_store_bypass swapgs eibrs_pbrsb bhi
+bogomips	: 4992.00
+clflush size	: 64
+cache_alignment	: 64
+address sizes	: 39 bits physical, 48 bits virtual
+power management:
+
diff --git a/t/pt-summary/samples/Linux/008/processes b/t/pt-summary/samples/Linux/008/processes
new file mode 100644
index 000000000..c6cf393b2
--- /dev/null
+++ b/t/pt-summary/samples/Linux/008/processes
@@ -0,0 +1,10 @@
+    PID USER      PR  NI    VIRT    RES    SHR S  %CPU  %MEM     TIME+ COMMAND
+2407273 sveta     20   0   64144  46012  13824 R 100,0   0,1   5061:20 perl
+2410420 sveta     20   0   64140  46184  13952 R 100,0   0,1   5059:23 perl
+ 783789 sveta     20   0 2822620 506824  42752 S  94,1   0,8   5786:40 mysqld
+2408748 sveta     20   0   64136  46068  14080 R  94,1   0,1   5060:24 perl
+2419768 sveta     20   0   64140  46088  13952 R  94,1   0,1   5055:00 perl
+2504338 root      20   0 3183396 578628 283160 S  94,1   0,9  47:38.67 s1-agent
+2504336 root      20   0  289740 127780  25600 S  52,9   0,2   9:50.52 s1-scan+
+   7288 sveta     20   0 2688236 139560  46968 S   5,9   0,2   1028:47 Xorg
+ 622143 sveta     20   0 1132,2g 682008  88376 S   5,9   1,0 117:46.23 slack
diff --git a/t/pt-summary/samples/Linux/008/summary b/t/pt-summary/samples/Linux/008/summary
new file mode 100644
index 000000000..1043b456e
--- /dev/null
+++ b/t/pt-summary/samples/Linux/008/summary
@@ -0,0 +1,23 @@
+platform    Linux
+hostname    s76
+kernel    6.5.0-35-generic
+release    Ubuntu 22.04.4 LTS (jammy)
+CPU_ARCH    64-bit
+OS_ARCH    64-bit
+virt    No virtualization detected
+vendor    
+rss    38597050368
+raid_controller    No RAID controller detected
+threading    NPTL 2.35
+getenforce    No SELinux detected
+swappiness    60
+dirtypolicy    20, 10
+dirtystatus     0, 0
+numa-available    
+numa-policy    
+numa-preferred-node    
+internal::disks    dm-0 dm-1 dm-2 nvme0n1
+internal::nvme0n1    [none] 1023
+dentry-state    3350735	3155181	45	0	2247869	0
+file-nr    35904	0	9223372036854775807
+inode-nr    1417972	554725
diff --git a/t/pt-summary/samples/Linux/008/sysctl b/t/pt-summary/samples/Linux/008/sysctl
new file mode 100644
index 000000000..c190b1eac
--- /dev/null
+++ b/t/pt-summary/samples/Linux/008/sysctl
@@ -0,0 +1,2010 @@
+abi.vsyscall32 = 1
+debug.exception-trace = 1
+debug.kprobes-optimization = 1
+dev.cdrom.autoclose = 1
+dev.cdrom.autoeject = 0
+dev.cdrom.check_media = 0
+dev.cdrom.debug = 0
+dev.cdrom.info = CD-ROM information, Id: cdrom.c 3.20 2003/12/17
+dev.cdrom.info = 
+dev.cdrom.info = drive name:	
+dev.cdrom.info = drive speed:	
+dev.cdrom.info = drive # of slots:
+dev.cdrom.info = Can close tray:	
+dev.cdrom.info = Can open tray:	
+dev.cdrom.info = Can lock tray:	
+dev.cdrom.info = Can change speed:
+dev.cdrom.info = Can select disk:
+dev.cdrom.info = Can read multisession:
+dev.cdrom.info = Can read MCN:	
+dev.cdrom.info = Reports media changed:
+dev.cdrom.info = Can play audio:	
+dev.cdrom.info = Can write CD-R:	
+dev.cdrom.info = Can write CD-RW:
+dev.cdrom.info = Can read DVD:	
+dev.cdrom.info = Can write DVD-R:
+dev.cdrom.info = Can write DVD-RAM:
+dev.cdrom.info = Can read MRW:	
+dev.cdrom.info = Can write MRW:	
+dev.cdrom.info = Can write RAM:	
+dev.cdrom.info = 
+dev.cdrom.info = 
+dev.cdrom.lock = 0
+dev.hpet.max-user-freq = 64
+dev.i915.oa_max_sample_rate = 100000
+dev.i915.perf_stream_paranoid = 1
+dev.mac_hid.mouse_button2_keycode = 97
+dev.mac_hid.mouse_button3_keycode = 100
+dev.mac_hid.mouse_button_emulation = 0
+dev.parport.default.spintime = 500
+dev.parport.default.timeslice = 200
+dev.raid.speed_limit_max = 200000
+dev.raid.speed_limit_min = 1000
+dev.scsi.logging_level = 0
+dev.tty.ldisc_autoload = 1
+dev.tty.legacy_tiocsti = 1
+fs.aio-max-nr = 65536
+fs.aio-nr = 13745
+fs.binfmt_misc.python3/10 = enabled
+fs.binfmt_misc.python3/10 = interpreter /usr/bin/python3.10
+fs.binfmt_misc.python3/10 = flags: 
+fs.binfmt_misc.python3/10 = offset 0
+fs.binfmt_misc.python3/10 = magic 6f0d0d0a
+fs.binfmt_misc.status = enabled
+fs.dentry-state = 3350716	3155161	45	0	2247870	0
+fs.dir-notify-enable = 1
+fs.epoll.max_user_watches = 14590731
+fs.fanotify.max_queued_events = 16384
+fs.fanotify.max_user_groups = 128
+fs.fanotify.max_user_marks = 530989
+fs.file-max = 9223372036854775807
+fs.file-nr = 35872	0	9223372036854775807
+fs.inode-nr = 1417952	554725
+fs.inode-state = 1417952	554725	0	0	0	0	0
+fs.inotify.max_queued_events = 16384
+fs.inotify.max_user_instances = 128
+fs.inotify.max_user_watches = 65536
+fs.lease-break-time = 45
+fs.leases-enable = 1
+fs.mount-max = 100000
+fs.mqueue.msg_default = 10
+fs.mqueue.msg_max = 10
+fs.mqueue.msgsize_default = 8192
+fs.mqueue.msgsize_max = 8192
+fs.mqueue.queues_max = 256
+fs.nr_open = 1048576
+fs.overflowgid = 65534
+fs.overflowuid = 65534
+fs.pipe-max-size = 1048576
+fs.pipe-user-pages-hard = 0
+fs.pipe-user-pages-soft = 16384
+fs.protected_fifos = 1
+fs.protected_hardlinks = 1
+fs.protected_regular = 2
+fs.protected_symlinks = 1
+fs.quota.allocated_dquots = 0
+fs.quota.cache_hits = 0
+fs.quota.drops = 0
+fs.quota.free_dquots = 0
+fs.quota.lookups = 0
+fs.quota.reads = 0
+fs.quota.syncs = 2592
+fs.quota.writes = 0
+fs.suid_dumpable = 2
+fs.verity.require_signatures = 0
+kernel.acct = 4	2	30
+kernel.acpi_video_flags = 0
+kernel.apparmor_restrict_unprivileged_unconfined = 0
+kernel.apparmor_restrict_unprivileged_userns = 0
+kernel.arch = x86_64
+kernel.auto_msgmni = 0
+kernel.bootloader_type = 6
+kernel.bootloader_version = 38
+kernel.bpf_stats_enabled = 0
+kernel.cap_last_cap = 40
+kernel.core_pattern = |/usr/share/apport/apport -p%p -s%s -c%c -d%d -P%P -u%u -g%g -- %E
+kernel.core_pipe_limit = 10
+kernel.core_uses_pid = 1
+kernel.ctrl-alt-del = 0
+kernel.dmesg_restrict = 1
+kernel.domainname = (none)
+kernel.firmware_config.force_sysfs_fallback = 0
+kernel.firmware_config.ignore_sysfs_fallback = 0
+kernel.ftrace_dump_on_oops = 0
+kernel.ftrace_enabled = 1
+kernel.hardlockup_all_cpu_backtrace = 0
+kernel.hardlockup_panic = 0
+kernel.hostname = s76
+kernel.hotplug = 
+kernel.hung_task_all_cpu_backtrace = 0
+kernel.hung_task_check_count = 4194304
+kernel.hung_task_check_interval_secs = 0
+kernel.hung_task_panic = 0
+kernel.hung_task_timeout_secs = 120
+kernel.hung_task_warnings = 10
+kernel.io_delay_type = 1
+kernel.io_uring_disabled = 0
+kernel.io_uring_group = -1
+kernel.kexec_load_disabled = 0
+kernel.kexec_load_limit_panic = -1
+kernel.kexec_load_limit_reboot = -1
+kernel.keys.gc_delay = 300
+kernel.keys.maxbytes = 20000
+kernel.keys.maxkeys = 200
+kernel.keys.persistent_keyring_expiry = 259200
+kernel.keys.root_maxbytes = 25000000
+kernel.keys.root_maxkeys = 1000000
+kernel.kptr_restrict = 1
+kernel.max_lock_depth = 1024
+kernel.max_rcu_stall_to_panic = 0
+kernel.modprobe = /sbin/modprobe
+kernel.modules_disabled = 0
+kernel.msg_next_id = -1
+kernel.msgmax = 8192
+kernel.msgmnb = 16384
+kernel.msgmni = 32000
+kernel.ngroups_max = 65536
+kernel.nmi_watchdog = 1
+kernel.ns_last_pid = 3367165
+kernel.numa_balancing = 0
+kernel.numa_balancing_promote_rate_limit_MBps = 65536
+kernel.oops_all_cpu_backtrace = 0
+kernel.oops_limit = 10000
+kernel.osrelease = 6.5.0-35-generic
+kernel.ostype = Linux
+kernel.overflowgid = 65534
+kernel.overflowuid = 65534
+kernel.panic = 0
+kernel.panic_on_io_nmi = 0
+kernel.panic_on_oops = 0
+kernel.panic_on_rcu_stall = 0
+kernel.panic_on_unrecovered_nmi = 0
+kernel.panic_on_warn = 0
+kernel.panic_print = 0
+kernel.perf_cpu_time_max_percent = 25
+kernel.perf_event_max_contexts_per_stack = 8
+kernel.perf_event_max_sample_rate = 26250
+kernel.perf_event_max_stack = 127
+kernel.perf_event_mlock_kb = 516
+kernel.perf_event_paranoid = 1
+kernel.pid_max = 4194304
+kernel.poweroff_cmd = /sbin/poweroff
+kernel.print-fatal-signals = 0
+kernel.printk = 4	4	1	7
+kernel.printk_delay = 0
+kernel.printk_devkmsg = on
+kernel.printk_ratelimit = 5
+kernel.printk_ratelimit_burst = 10
+kernel.pty.max = 4096
+kernel.pty.nr = 6
+kernel.pty.reserve = 1024
+kernel.random.boot_id = 31d4dc04-94fc-4b44-9ad0-60aa785f573d
+kernel.random.entropy_avail = 256
+kernel.random.poolsize = 256
+kernel.random.urandom_min_reseed_secs = 60
+kernel.random.uuid = 3929c0a5-7495-462b-a1d3-3ed715eb0167
+kernel.random.write_wakeup_threshold = 256
+kernel.randomize_va_space = 2
+kernel.real-root-dev = 0
+kernel.sched_autogroup_enabled = 1
+kernel.sched_cfs_bandwidth_slice_us = 5000
+kernel.sched_child_runs_first = 0
+kernel.sched_deadline_period_max_us = 4194304
+kernel.sched_deadline_period_min_us = 100
+kernel.sched_energy_aware = 1
+kernel.sched_itmt_enabled = 1
+kernel.sched_rr_timeslice_ms = 100
+kernel.sched_rt_period_us = 1000000
+kernel.sched_rt_runtime_us = 950000
+kernel.sched_schedstats = 0
+kernel.sched_util_clamp_max = 1024
+kernel.sched_util_clamp_min = 1024
+kernel.sched_util_clamp_min_rt_default = 1024
+kernel.seccomp.actions_avail = kill_process kill_thread trap errno user_notif trace log allow
+kernel.seccomp.actions_logged = kill_process kill_thread trap errno user_notif trace log
+kernel.sem = 32000	1024000000	500	32000
+kernel.sem_next_id = -1
+kernel.shm_next_id = -1
+kernel.shm_rmid_forced = 0
+kernel.shmall = 18446744073692774399
+kernel.shmmax = 18446744073692774399
+kernel.shmmni = 4096
+kernel.soft_watchdog = 1
+kernel.softlockup_all_cpu_backtrace = 0
+kernel.softlockup_panic = 0
+kernel.split_lock_mitigate = 1
+kernel.stack_tracer_enabled = 0
+kernel.sysctl_writes_strict = 1
+kernel.sysrq = 176
+kernel.tainted = 512
+kernel.task_delayacct = 0
+kernel.threads-max = 512064
+kernel.timer_migration = 1
+kernel.traceoff_on_warning = 0
+kernel.tracepoint_printk = 0
+kernel.unknown_nmi_panic = 0
+kernel.unprivileged_bpf_disabled = 2
+kernel.unprivileged_userns_clone = 1
+kernel.user_events_max = 32768
+kernel.version = #35~22.04.1-Ubuntu SMP PREEMPT_DYNAMIC Tue May  7 09:00:52 UTC 2
+kernel.warn_limit = 0
+kernel.watchdog = 1
+kernel.watchdog_cpumask = 0-15
+kernel.watchdog_thresh = 10
+kernel.yama.ptrace_scope = 0
+net.bridge.bridge-nf-call-arptables = 1
+net.bridge.bridge-nf-call-ip6tables = 1
+net.bridge.bridge-nf-call-iptables = 1
+net.bridge.bridge-nf-filter-pppoe-tagged = 0
+net.bridge.bridge-nf-filter-vlan-tagged = 0
+net.bridge.bridge-nf-pass-vlan-input-dev = 0
+net.core.bpf_jit_enable = 1
+net.core.busy_poll = 0
+net.core.busy_read = 0
+net.core.default_qdisc = fq_codel
+net.core.dev_weight = 64
+net.core.dev_weight_rx_bias = 1
+net.core.dev_weight_tx_bias = 1
+net.core.devconf_inherit_init_net = 0
+net.core.fb_tunnels_only_for_init_net = 0
+net.core.flow_limit_cpu_bitmap = 0000
+net.core.flow_limit_table_len = 4096
+net.core.gro_normal_batch = 8
+net.core.high_order_alloc_disable = 0
+net.core.max_skb_frags = 17
+net.core.message_burst = 10
+net.core.message_cost = 5
+net.core.netdev_budget = 300
+net.core.netdev_budget_usecs = 8000
+net.core.netdev_max_backlog = 1000
+net.core.netdev_rss_key = 68:87:a5:6d:f6:e8:62:a0:01:85:a6:1a:c2:fb:d3:e0:ca:d9:b7:ad:8f:ff:78:4c:ab:57:54:de:2a:9c:92:12:1e:96:c5:34:9a:97:95:aa:d9:b9:9a:86:49:cf:99:a0:54:07:50:97
+net.core.netdev_tstamp_prequeue = 1
+net.core.netdev_unregister_timeout_secs = 10
+net.core.optmem_max = 20480
+net.core.rmem_default = 212992
+net.core.rmem_max = 212992
+net.core.rps_default_mask = 0000
+net.core.rps_sock_flow_entries = 0
+net.core.skb_defer_max = 64
+net.core.somaxconn = 4096
+net.core.tstamp_allow_data = 1
+net.core.txrehash = 1
+net.core.warnings = 0
+net.core.wmem_default = 212992
+net.core.wmem_max = 212992
+net.core.xfrm_acq_expires = 30
+net.core.xfrm_aevent_etime = 10
+net.core.xfrm_aevent_rseqth = 2
+net.core.xfrm_larval_drop = 1
+net.ipv4.cipso_cache_bucket_size = 10
+net.ipv4.cipso_cache_enable = 1
+net.ipv4.cipso_rbm_optfmt = 0
+net.ipv4.cipso_rbm_strictvalid = 1
+net.ipv4.conf.all.accept_local = 0
+net.ipv4.conf.all.accept_redirects = 0
+net.ipv4.conf.all.accept_source_route = 0
+net.ipv4.conf.all.arp_accept = 0
+net.ipv4.conf.all.arp_announce = 0
+net.ipv4.conf.all.arp_evict_nocarrier = 1
+net.ipv4.conf.all.arp_filter = 0
+net.ipv4.conf.all.arp_ignore = 0
+net.ipv4.conf.all.arp_notify = 0
+net.ipv4.conf.all.bc_forwarding = 0
+net.ipv4.conf.all.bootp_relay = 0
+net.ipv4.conf.all.disable_policy = 0
+net.ipv4.conf.all.disable_xfrm = 0
+net.ipv4.conf.all.drop_gratuitous_arp = 0
+net.ipv4.conf.all.drop_unicast_in_l2_multicast = 0
+net.ipv4.conf.all.force_igmp_version = 0
+net.ipv4.conf.all.forwarding = 1
+net.ipv4.conf.all.igmpv2_unsolicited_report_interval = 10000
+net.ipv4.conf.all.igmpv3_unsolicited_report_interval = 1000
+net.ipv4.conf.all.ignore_routes_with_linkdown = 0
+net.ipv4.conf.all.log_martians = 0
+net.ipv4.conf.all.mc_forwarding = 0
+net.ipv4.conf.all.medium_id = 0
+net.ipv4.conf.all.promote_secondaries = 0
+net.ipv4.conf.all.proxy_arp = 0
+net.ipv4.conf.all.proxy_arp_pvlan = 0
+net.ipv4.conf.all.route_localnet = 0
+net.ipv4.conf.all.rp_filter = 2
+net.ipv4.conf.all.secure_redirects = 1
+net.ipv4.conf.all.send_redirects = 0
+net.ipv4.conf.all.shared_media = 1
+net.ipv4.conf.all.src_valid_mark = 1
+net.ipv4.conf.all.tag = 0
+net.ipv4.conf.br-79118f7d5a92.accept_local = 0
+net.ipv4.conf.br-79118f7d5a92.accept_redirects = 1
+net.ipv4.conf.br-79118f7d5a92.accept_source_route = 0
+net.ipv4.conf.br-79118f7d5a92.arp_accept = 0
+net.ipv4.conf.br-79118f7d5a92.arp_announce = 0
+net.ipv4.conf.br-79118f7d5a92.arp_evict_nocarrier = 1
+net.ipv4.conf.br-79118f7d5a92.arp_filter = 0
+net.ipv4.conf.br-79118f7d5a92.arp_ignore = 0
+net.ipv4.conf.br-79118f7d5a92.arp_notify = 0
+net.ipv4.conf.br-79118f7d5a92.bc_forwarding = 0
+net.ipv4.conf.br-79118f7d5a92.bootp_relay = 0
+net.ipv4.conf.br-79118f7d5a92.disable_policy = 0
+net.ipv4.conf.br-79118f7d5a92.disable_xfrm = 0
+net.ipv4.conf.br-79118f7d5a92.drop_gratuitous_arp = 0
+net.ipv4.conf.br-79118f7d5a92.drop_unicast_in_l2_multicast = 0
+net.ipv4.conf.br-79118f7d5a92.force_igmp_version = 0
+net.ipv4.conf.br-79118f7d5a92.forwarding = 1
+net.ipv4.conf.br-79118f7d5a92.igmpv2_unsolicited_report_interval = 10000
+net.ipv4.conf.br-79118f7d5a92.igmpv3_unsolicited_report_interval = 1000
+net.ipv4.conf.br-79118f7d5a92.ignore_routes_with_linkdown = 0
+net.ipv4.conf.br-79118f7d5a92.log_martians = 0
+net.ipv4.conf.br-79118f7d5a92.mc_forwarding = 0
+net.ipv4.conf.br-79118f7d5a92.medium_id = 0
+net.ipv4.conf.br-79118f7d5a92.promote_secondaries = 1
+net.ipv4.conf.br-79118f7d5a92.proxy_arp = 0
+net.ipv4.conf.br-79118f7d5a92.proxy_arp_pvlan = 0
+net.ipv4.conf.br-79118f7d5a92.route_localnet = 0
+net.ipv4.conf.br-79118f7d5a92.rp_filter = 2
+net.ipv4.conf.br-79118f7d5a92.secure_redirects = 1
+net.ipv4.conf.br-79118f7d5a92.send_redirects = 1
+net.ipv4.conf.br-79118f7d5a92.shared_media = 1
+net.ipv4.conf.br-79118f7d5a92.src_valid_mark = 0
+net.ipv4.conf.br-79118f7d5a92.tag = 0
+net.ipv4.conf.br-a7c7f1777df1.accept_local = 0
+net.ipv4.conf.br-a7c7f1777df1.accept_redirects = 1
+net.ipv4.conf.br-a7c7f1777df1.accept_source_route = 0
+net.ipv4.conf.br-a7c7f1777df1.arp_accept = 0
+net.ipv4.conf.br-a7c7f1777df1.arp_announce = 0
+net.ipv4.conf.br-a7c7f1777df1.arp_evict_nocarrier = 1
+net.ipv4.conf.br-a7c7f1777df1.arp_filter = 0
+net.ipv4.conf.br-a7c7f1777df1.arp_ignore = 0
+net.ipv4.conf.br-a7c7f1777df1.arp_notify = 0
+net.ipv4.conf.br-a7c7f1777df1.bc_forwarding = 0
+net.ipv4.conf.br-a7c7f1777df1.bootp_relay = 0
+net.ipv4.conf.br-a7c7f1777df1.disable_policy = 0
+net.ipv4.conf.br-a7c7f1777df1.disable_xfrm = 0
+net.ipv4.conf.br-a7c7f1777df1.drop_gratuitous_arp = 0
+net.ipv4.conf.br-a7c7f1777df1.drop_unicast_in_l2_multicast = 0
+net.ipv4.conf.br-a7c7f1777df1.force_igmp_version = 0
+net.ipv4.conf.br-a7c7f1777df1.forwarding = 1
+net.ipv4.conf.br-a7c7f1777df1.igmpv2_unsolicited_report_interval = 10000
+net.ipv4.conf.br-a7c7f1777df1.igmpv3_unsolicited_report_interval = 1000
+net.ipv4.conf.br-a7c7f1777df1.ignore_routes_with_linkdown = 0
+net.ipv4.conf.br-a7c7f1777df1.log_martians = 0
+net.ipv4.conf.br-a7c7f1777df1.mc_forwarding = 0
+net.ipv4.conf.br-a7c7f1777df1.medium_id = 0
+net.ipv4.conf.br-a7c7f1777df1.promote_secondaries = 1
+net.ipv4.conf.br-a7c7f1777df1.proxy_arp = 0
+net.ipv4.conf.br-a7c7f1777df1.proxy_arp_pvlan = 0
+net.ipv4.conf.br-a7c7f1777df1.route_localnet = 0
+net.ipv4.conf.br-a7c7f1777df1.rp_filter = 2
+net.ipv4.conf.br-a7c7f1777df1.secure_redirects = 1
+net.ipv4.conf.br-a7c7f1777df1.send_redirects = 1
+net.ipv4.conf.br-a7c7f1777df1.shared_media = 1
+net.ipv4.conf.br-a7c7f1777df1.src_valid_mark = 0
+net.ipv4.conf.br-a7c7f1777df1.tag = 0
+net.ipv4.conf.default.accept_local = 0
+net.ipv4.conf.default.accept_redirects = 1
+net.ipv4.conf.default.accept_source_route = 0
+net.ipv4.conf.default.arp_accept = 0
+net.ipv4.conf.default.arp_announce = 0
+net.ipv4.conf.default.arp_evict_nocarrier = 1
+net.ipv4.conf.default.arp_filter = 0
+net.ipv4.conf.default.arp_ignore = 0
+net.ipv4.conf.default.arp_notify = 0
+net.ipv4.conf.default.bc_forwarding = 0
+net.ipv4.conf.default.bootp_relay = 0
+net.ipv4.conf.default.disable_policy = 0
+net.ipv4.conf.default.disable_xfrm = 0
+net.ipv4.conf.default.drop_gratuitous_arp = 0
+net.ipv4.conf.default.drop_unicast_in_l2_multicast = 0
+net.ipv4.conf.default.force_igmp_version = 0
+net.ipv4.conf.default.forwarding = 1
+net.ipv4.conf.default.igmpv2_unsolicited_report_interval = 10000
+net.ipv4.conf.default.igmpv3_unsolicited_report_interval = 1000
+net.ipv4.conf.default.ignore_routes_with_linkdown = 0
+net.ipv4.conf.default.log_martians = 0
+net.ipv4.conf.default.mc_forwarding = 0
+net.ipv4.conf.default.medium_id = 0
+net.ipv4.conf.default.promote_secondaries = 1
+net.ipv4.conf.default.proxy_arp = 0
+net.ipv4.conf.default.proxy_arp_pvlan = 0
+net.ipv4.conf.default.route_localnet = 0
+net.ipv4.conf.default.rp_filter = 2
+net.ipv4.conf.default.secure_redirects = 1
+net.ipv4.conf.default.send_redirects = 1
+net.ipv4.conf.default.shared_media = 1
+net.ipv4.conf.default.src_valid_mark = 0
+net.ipv4.conf.default.tag = 0
+net.ipv4.conf.docker0.accept_local = 0
+net.ipv4.conf.docker0.accept_redirects = 1
+net.ipv4.conf.docker0.accept_source_route = 0
+net.ipv4.conf.docker0.arp_accept = 0
+net.ipv4.conf.docker0.arp_announce = 0
+net.ipv4.conf.docker0.arp_evict_nocarrier = 1
+net.ipv4.conf.docker0.arp_filter = 0
+net.ipv4.conf.docker0.arp_ignore = 0
+net.ipv4.conf.docker0.arp_notify = 0
+net.ipv4.conf.docker0.bc_forwarding = 0
+net.ipv4.conf.docker0.bootp_relay = 0
+net.ipv4.conf.docker0.disable_policy = 0
+net.ipv4.conf.docker0.disable_xfrm = 0
+net.ipv4.conf.docker0.drop_gratuitous_arp = 0
+net.ipv4.conf.docker0.drop_unicast_in_l2_multicast = 0
+net.ipv4.conf.docker0.force_igmp_version = 0
+net.ipv4.conf.docker0.forwarding = 1
+net.ipv4.conf.docker0.igmpv2_unsolicited_report_interval = 10000
+net.ipv4.conf.docker0.igmpv3_unsolicited_report_interval = 1000
+net.ipv4.conf.docker0.ignore_routes_with_linkdown = 0
+net.ipv4.conf.docker0.log_martians = 0
+net.ipv4.conf.docker0.mc_forwarding = 0
+net.ipv4.conf.docker0.medium_id = 0
+net.ipv4.conf.docker0.promote_secondaries = 1
+net.ipv4.conf.docker0.proxy_arp = 0
+net.ipv4.conf.docker0.proxy_arp_pvlan = 0
+net.ipv4.conf.docker0.route_localnet = 0
+net.ipv4.conf.docker0.rp_filter = 2
+net.ipv4.conf.docker0.secure_redirects = 1
+net.ipv4.conf.docker0.send_redirects = 1
+net.ipv4.conf.docker0.shared_media = 1
+net.ipv4.conf.docker0.src_valid_mark = 0
+net.ipv4.conf.docker0.tag = 0
+net.ipv4.conf.enp46s0.accept_local = 0
+net.ipv4.conf.enp46s0.accept_redirects = 1
+net.ipv4.conf.enp46s0.accept_source_route = 0
+net.ipv4.conf.enp46s0.arp_accept = 0
+net.ipv4.conf.enp46s0.arp_announce = 0
+net.ipv4.conf.enp46s0.arp_evict_nocarrier = 1
+net.ipv4.conf.enp46s0.arp_filter = 0
+net.ipv4.conf.enp46s0.arp_ignore = 0
+net.ipv4.conf.enp46s0.arp_notify = 0
+net.ipv4.conf.enp46s0.bc_forwarding = 0
+net.ipv4.conf.enp46s0.bootp_relay = 0
+net.ipv4.conf.enp46s0.disable_policy = 0
+net.ipv4.conf.enp46s0.disable_xfrm = 0
+net.ipv4.conf.enp46s0.drop_gratuitous_arp = 0
+net.ipv4.conf.enp46s0.drop_unicast_in_l2_multicast = 0
+net.ipv4.conf.enp46s0.force_igmp_version = 0
+net.ipv4.conf.enp46s0.forwarding = 1
+net.ipv4.conf.enp46s0.igmpv2_unsolicited_report_interval = 10000
+net.ipv4.conf.enp46s0.igmpv3_unsolicited_report_interval = 1000
+net.ipv4.conf.enp46s0.ignore_routes_with_linkdown = 0
+net.ipv4.conf.enp46s0.log_martians = 0
+net.ipv4.conf.enp46s0.mc_forwarding = 0
+net.ipv4.conf.enp46s0.medium_id = 0
+net.ipv4.conf.enp46s0.promote_secondaries = 1
+net.ipv4.conf.enp46s0.proxy_arp = 0
+net.ipv4.conf.enp46s0.proxy_arp_pvlan = 0
+net.ipv4.conf.enp46s0.route_localnet = 0
+net.ipv4.conf.enp46s0.rp_filter = 2
+net.ipv4.conf.enp46s0.secure_redirects = 1
+net.ipv4.conf.enp46s0.send_redirects = 1
+net.ipv4.conf.enp46s0.shared_media = 1
+net.ipv4.conf.enp46s0.src_valid_mark = 0
+net.ipv4.conf.enp46s0.tag = 0
+net.ipv4.conf.lo.accept_local = 0
+net.ipv4.conf.lo.accept_redirects = 1
+net.ipv4.conf.lo.accept_source_route = 0
+net.ipv4.conf.lo.arp_accept = 0
+net.ipv4.conf.lo.arp_announce = 0
+net.ipv4.conf.lo.arp_evict_nocarrier = 1
+net.ipv4.conf.lo.arp_filter = 0
+net.ipv4.conf.lo.arp_ignore = 0
+net.ipv4.conf.lo.arp_notify = 0
+net.ipv4.conf.lo.bc_forwarding = 0
+net.ipv4.conf.lo.bootp_relay = 0
+net.ipv4.conf.lo.disable_policy = 1
+net.ipv4.conf.lo.disable_xfrm = 1
+net.ipv4.conf.lo.drop_gratuitous_arp = 0
+net.ipv4.conf.lo.drop_unicast_in_l2_multicast = 0
+net.ipv4.conf.lo.force_igmp_version = 0
+net.ipv4.conf.lo.forwarding = 1
+net.ipv4.conf.lo.igmpv2_unsolicited_report_interval = 10000
+net.ipv4.conf.lo.igmpv3_unsolicited_report_interval = 1000
+net.ipv4.conf.lo.ignore_routes_with_linkdown = 0
+net.ipv4.conf.lo.log_martians = 0
+net.ipv4.conf.lo.mc_forwarding = 0
+net.ipv4.conf.lo.medium_id = 0
+net.ipv4.conf.lo.promote_secondaries = 1
+net.ipv4.conf.lo.proxy_arp = 0
+net.ipv4.conf.lo.proxy_arp_pvlan = 0
+net.ipv4.conf.lo.route_localnet = 0
+net.ipv4.conf.lo.rp_filter = 2
+net.ipv4.conf.lo.secure_redirects = 1
+net.ipv4.conf.lo.send_redirects = 1
+net.ipv4.conf.lo.shared_media = 1
+net.ipv4.conf.lo.src_valid_mark = 0
+net.ipv4.conf.lo.tag = 0
+net.ipv4.conf.veth0655c9f.accept_local = 0
+net.ipv4.conf.veth0655c9f.accept_redirects = 1
+net.ipv4.conf.veth0655c9f.accept_source_route = 0
+net.ipv4.conf.veth0655c9f.arp_accept = 0
+net.ipv4.conf.veth0655c9f.arp_announce = 0
+net.ipv4.conf.veth0655c9f.arp_evict_nocarrier = 1
+net.ipv4.conf.veth0655c9f.arp_filter = 0
+net.ipv4.conf.veth0655c9f.arp_ignore = 0
+net.ipv4.conf.veth0655c9f.arp_notify = 0
+net.ipv4.conf.veth0655c9f.bc_forwarding = 0
+net.ipv4.conf.veth0655c9f.bootp_relay = 0
+net.ipv4.conf.veth0655c9f.disable_policy = 0
+net.ipv4.conf.veth0655c9f.disable_xfrm = 0
+net.ipv4.conf.veth0655c9f.drop_gratuitous_arp = 0
+net.ipv4.conf.veth0655c9f.drop_unicast_in_l2_multicast = 0
+net.ipv4.conf.veth0655c9f.force_igmp_version = 0
+net.ipv4.conf.veth0655c9f.forwarding = 1
+net.ipv4.conf.veth0655c9f.igmpv2_unsolicited_report_interval = 10000
+net.ipv4.conf.veth0655c9f.igmpv3_unsolicited_report_interval = 1000
+net.ipv4.conf.veth0655c9f.ignore_routes_with_linkdown = 0
+net.ipv4.conf.veth0655c9f.log_martians = 0
+net.ipv4.conf.veth0655c9f.mc_forwarding = 0
+net.ipv4.conf.veth0655c9f.medium_id = 0
+net.ipv4.conf.veth0655c9f.promote_secondaries = 1
+net.ipv4.conf.veth0655c9f.proxy_arp = 0
+net.ipv4.conf.veth0655c9f.proxy_arp_pvlan = 0
+net.ipv4.conf.veth0655c9f.route_localnet = 0
+net.ipv4.conf.veth0655c9f.rp_filter = 2
+net.ipv4.conf.veth0655c9f.secure_redirects = 1
+net.ipv4.conf.veth0655c9f.send_redirects = 1
+net.ipv4.conf.veth0655c9f.shared_media = 1
+net.ipv4.conf.veth0655c9f.src_valid_mark = 0
+net.ipv4.conf.veth0655c9f.tag = 0
+net.ipv4.conf.veth2655c84.accept_local = 0
+net.ipv4.conf.veth2655c84.accept_redirects = 1
+net.ipv4.conf.veth2655c84.accept_source_route = 0
+net.ipv4.conf.veth2655c84.arp_accept = 0
+net.ipv4.conf.veth2655c84.arp_announce = 0
+net.ipv4.conf.veth2655c84.arp_evict_nocarrier = 1
+net.ipv4.conf.veth2655c84.arp_filter = 0
+net.ipv4.conf.veth2655c84.arp_ignore = 0
+net.ipv4.conf.veth2655c84.arp_notify = 0
+net.ipv4.conf.veth2655c84.bc_forwarding = 0
+net.ipv4.conf.veth2655c84.bootp_relay = 0
+net.ipv4.conf.veth2655c84.disable_policy = 0
+net.ipv4.conf.veth2655c84.disable_xfrm = 0
+net.ipv4.conf.veth2655c84.drop_gratuitous_arp = 0
+net.ipv4.conf.veth2655c84.drop_unicast_in_l2_multicast = 0
+net.ipv4.conf.veth2655c84.force_igmp_version = 0
+net.ipv4.conf.veth2655c84.forwarding = 1
+net.ipv4.conf.veth2655c84.igmpv2_unsolicited_report_interval = 10000
+net.ipv4.conf.veth2655c84.igmpv3_unsolicited_report_interval = 1000
+net.ipv4.conf.veth2655c84.ignore_routes_with_linkdown = 0
+net.ipv4.conf.veth2655c84.log_martians = 0
+net.ipv4.conf.veth2655c84.mc_forwarding = 0
+net.ipv4.conf.veth2655c84.medium_id = 0
+net.ipv4.conf.veth2655c84.promote_secondaries = 1
+net.ipv4.conf.veth2655c84.proxy_arp = 0
+net.ipv4.conf.veth2655c84.proxy_arp_pvlan = 0
+net.ipv4.conf.veth2655c84.route_localnet = 0
+net.ipv4.conf.veth2655c84.rp_filter = 2
+net.ipv4.conf.veth2655c84.secure_redirects = 1
+net.ipv4.conf.veth2655c84.send_redirects = 1
+net.ipv4.conf.veth2655c84.shared_media = 1
+net.ipv4.conf.veth2655c84.src_valid_mark = 0
+net.ipv4.conf.veth2655c84.tag = 0
+net.ipv4.conf.vethd189986.accept_local = 0
+net.ipv4.conf.vethd189986.accept_redirects = 1
+net.ipv4.conf.vethd189986.accept_source_route = 0
+net.ipv4.conf.vethd189986.arp_accept = 0
+net.ipv4.conf.vethd189986.arp_announce = 0
+net.ipv4.conf.vethd189986.arp_evict_nocarrier = 1
+net.ipv4.conf.vethd189986.arp_filter = 0
+net.ipv4.conf.vethd189986.arp_ignore = 0
+net.ipv4.conf.vethd189986.arp_notify = 0
+net.ipv4.conf.vethd189986.bc_forwarding = 0
+net.ipv4.conf.vethd189986.bootp_relay = 0
+net.ipv4.conf.vethd189986.disable_policy = 0
+net.ipv4.conf.vethd189986.disable_xfrm = 0
+net.ipv4.conf.vethd189986.drop_gratuitous_arp = 0
+net.ipv4.conf.vethd189986.drop_unicast_in_l2_multicast = 0
+net.ipv4.conf.vethd189986.force_igmp_version = 0
+net.ipv4.conf.vethd189986.forwarding = 1
+net.ipv4.conf.vethd189986.igmpv2_unsolicited_report_interval = 10000
+net.ipv4.conf.vethd189986.igmpv3_unsolicited_report_interval = 1000
+net.ipv4.conf.vethd189986.ignore_routes_with_linkdown = 0
+net.ipv4.conf.vethd189986.log_martians = 0
+net.ipv4.conf.vethd189986.mc_forwarding = 0
+net.ipv4.conf.vethd189986.medium_id = 0
+net.ipv4.conf.vethd189986.promote_secondaries = 1
+net.ipv4.conf.vethd189986.proxy_arp = 0
+net.ipv4.conf.vethd189986.proxy_arp_pvlan = 0
+net.ipv4.conf.vethd189986.route_localnet = 0
+net.ipv4.conf.vethd189986.rp_filter = 2
+net.ipv4.conf.vethd189986.secure_redirects = 1
+net.ipv4.conf.vethd189986.send_redirects = 1
+net.ipv4.conf.vethd189986.shared_media = 1
+net.ipv4.conf.vethd189986.src_valid_mark = 0
+net.ipv4.conf.vethd189986.tag = 0
+net.ipv4.conf.wg0.accept_local = 0
+net.ipv4.conf.wg0.accept_redirects = 1
+net.ipv4.conf.wg0.accept_source_route = 0
+net.ipv4.conf.wg0.arp_accept = 0
+net.ipv4.conf.wg0.arp_announce = 0
+net.ipv4.conf.wg0.arp_evict_nocarrier = 1
+net.ipv4.conf.wg0.arp_filter = 0
+net.ipv4.conf.wg0.arp_ignore = 0
+net.ipv4.conf.wg0.arp_notify = 0
+net.ipv4.conf.wg0.bc_forwarding = 0
+net.ipv4.conf.wg0.bootp_relay = 0
+net.ipv4.conf.wg0.disable_policy = 0
+net.ipv4.conf.wg0.disable_xfrm = 0
+net.ipv4.conf.wg0.drop_gratuitous_arp = 0
+net.ipv4.conf.wg0.drop_unicast_in_l2_multicast = 0
+net.ipv4.conf.wg0.force_igmp_version = 0
+net.ipv4.conf.wg0.forwarding = 1
+net.ipv4.conf.wg0.igmpv2_unsolicited_report_interval = 10000
+net.ipv4.conf.wg0.igmpv3_unsolicited_report_interval = 1000
+net.ipv4.conf.wg0.ignore_routes_with_linkdown = 0
+net.ipv4.conf.wg0.log_martians = 0
+net.ipv4.conf.wg0.mc_forwarding = 0
+net.ipv4.conf.wg0.medium_id = 0
+net.ipv4.conf.wg0.promote_secondaries = 1
+net.ipv4.conf.wg0.proxy_arp = 0
+net.ipv4.conf.wg0.proxy_arp_pvlan = 0
+net.ipv4.conf.wg0.route_localnet = 0
+net.ipv4.conf.wg0.rp_filter = 2
+net.ipv4.conf.wg0.secure_redirects = 1
+net.ipv4.conf.wg0.send_redirects = 0
+net.ipv4.conf.wg0.shared_media = 1
+net.ipv4.conf.wg0.src_valid_mark = 0
+net.ipv4.conf.wg0.tag = 0
+net.ipv4.conf.wlp0s20f3.accept_local = 0
+net.ipv4.conf.wlp0s20f3.accept_redirects = 1
+net.ipv4.conf.wlp0s20f3.accept_source_route = 0
+net.ipv4.conf.wlp0s20f3.arp_accept = 0
+net.ipv4.conf.wlp0s20f3.arp_announce = 0
+net.ipv4.conf.wlp0s20f3.arp_evict_nocarrier = 1
+net.ipv4.conf.wlp0s20f3.arp_filter = 0
+net.ipv4.conf.wlp0s20f3.arp_ignore = 0
+net.ipv4.conf.wlp0s20f3.arp_notify = 0
+net.ipv4.conf.wlp0s20f3.bc_forwarding = 0
+net.ipv4.conf.wlp0s20f3.bootp_relay = 0
+net.ipv4.conf.wlp0s20f3.disable_policy = 0
+net.ipv4.conf.wlp0s20f3.disable_xfrm = 0
+net.ipv4.conf.wlp0s20f3.drop_gratuitous_arp = 0
+net.ipv4.conf.wlp0s20f3.drop_unicast_in_l2_multicast = 0
+net.ipv4.conf.wlp0s20f3.force_igmp_version = 0
+net.ipv4.conf.wlp0s20f3.forwarding = 1
+net.ipv4.conf.wlp0s20f3.igmpv2_unsolicited_report_interval = 10000
+net.ipv4.conf.wlp0s20f3.igmpv3_unsolicited_report_interval = 1000
+net.ipv4.conf.wlp0s20f3.ignore_routes_with_linkdown = 0
+net.ipv4.conf.wlp0s20f3.log_martians = 0
+net.ipv4.conf.wlp0s20f3.mc_forwarding = 0
+net.ipv4.conf.wlp0s20f3.medium_id = 0
+net.ipv4.conf.wlp0s20f3.promote_secondaries = 1
+net.ipv4.conf.wlp0s20f3.proxy_arp = 0
+net.ipv4.conf.wlp0s20f3.proxy_arp_pvlan = 0
+net.ipv4.conf.wlp0s20f3.route_localnet = 0
+net.ipv4.conf.wlp0s20f3.rp_filter = 2
+net.ipv4.conf.wlp0s20f3.secure_redirects = 1
+net.ipv4.conf.wlp0s20f3.send_redirects = 1
+net.ipv4.conf.wlp0s20f3.shared_media = 1
+net.ipv4.conf.wlp0s20f3.src_valid_mark = 0
+net.ipv4.conf.wlp0s20f3.tag = 0
+net.ipv4.fib_multipath_hash_fields = 7
+net.ipv4.fib_multipath_hash_policy = 0
+net.ipv4.fib_multipath_use_neigh = 0
+net.ipv4.fib_notify_on_flag_change = 0
+net.ipv4.fib_sync_mem = 524288
+net.ipv4.fwmark_reflect = 0
+net.ipv4.icmp_echo_enable_probe = 0
+net.ipv4.icmp_echo_ignore_all = 0
+net.ipv4.icmp_echo_ignore_broadcasts = 1
+net.ipv4.icmp_errors_use_inbound_ifaddr = 0
+net.ipv4.icmp_ignore_bogus_error_responses = 1
+net.ipv4.icmp_msgs_burst = 50
+net.ipv4.icmp_msgs_per_sec = 1000
+net.ipv4.icmp_ratelimit = 1000
+net.ipv4.icmp_ratemask = 6168
+net.ipv4.igmp_link_local_mcast_reports = 1
+net.ipv4.igmp_max_memberships = 20
+net.ipv4.igmp_max_msf = 10
+net.ipv4.igmp_qrv = 2
+net.ipv4.inet_peer_maxttl = 600
+net.ipv4.inet_peer_minttl = 120
+net.ipv4.inet_peer_threshold = 65664
+net.ipv4.ip_autobind_reuse = 0
+net.ipv4.ip_default_ttl = 64
+net.ipv4.ip_dynaddr = 0
+net.ipv4.ip_early_demux = 1
+net.ipv4.ip_forward = 1
+net.ipv4.ip_forward_update_priority = 1
+net.ipv4.ip_forward_use_pmtu = 0
+net.ipv4.ip_local_port_range = 32768	60999
+net.ipv4.ip_local_reserved_ports = 
+net.ipv4.ip_no_pmtu_disc = 0
+net.ipv4.ip_nonlocal_bind = 0
+net.ipv4.ip_unprivileged_port_start = 1024
+net.ipv4.ipfrag_high_thresh = 4194304
+net.ipv4.ipfrag_low_thresh = 3145728
+net.ipv4.ipfrag_max_dist = 64
+net.ipv4.ipfrag_secret_interval = 0
+net.ipv4.ipfrag_time = 30
+net.ipv4.neigh.br-79118f7d5a92.anycast_delay = 100
+net.ipv4.neigh.br-79118f7d5a92.app_solicit = 0
+net.ipv4.neigh.br-79118f7d5a92.base_reachable_time_ms = 30000
+net.ipv4.neigh.br-79118f7d5a92.delay_first_probe_time = 5
+net.ipv4.neigh.br-79118f7d5a92.gc_stale_time = 60
+net.ipv4.neigh.br-79118f7d5a92.interval_probe_time_ms = 5000
+net.ipv4.neigh.br-79118f7d5a92.locktime = 100
+net.ipv4.neigh.br-79118f7d5a92.mcast_resolicit = 0
+net.ipv4.neigh.br-79118f7d5a92.mcast_solicit = 3
+net.ipv4.neigh.br-79118f7d5a92.proxy_delay = 80
+net.ipv4.neigh.br-79118f7d5a92.proxy_qlen = 64
+net.ipv4.neigh.br-79118f7d5a92.retrans_time_ms = 1000
+net.ipv4.neigh.br-79118f7d5a92.ucast_solicit = 3
+net.ipv4.neigh.br-79118f7d5a92.unres_qlen = 101
+net.ipv4.neigh.br-79118f7d5a92.unres_qlen_bytes = 212992
+net.ipv4.neigh.br-a7c7f1777df1.anycast_delay = 100
+net.ipv4.neigh.br-a7c7f1777df1.app_solicit = 0
+net.ipv4.neigh.br-a7c7f1777df1.base_reachable_time_ms = 30000
+net.ipv4.neigh.br-a7c7f1777df1.delay_first_probe_time = 5
+net.ipv4.neigh.br-a7c7f1777df1.gc_stale_time = 60
+net.ipv4.neigh.br-a7c7f1777df1.interval_probe_time_ms = 5000
+net.ipv4.neigh.br-a7c7f1777df1.locktime = 100
+net.ipv4.neigh.br-a7c7f1777df1.mcast_resolicit = 0
+net.ipv4.neigh.br-a7c7f1777df1.mcast_solicit = 3
+net.ipv4.neigh.br-a7c7f1777df1.proxy_delay = 80
+net.ipv4.neigh.br-a7c7f1777df1.proxy_qlen = 64
+net.ipv4.neigh.br-a7c7f1777df1.retrans_time_ms = 1000
+net.ipv4.neigh.br-a7c7f1777df1.ucast_solicit = 3
+net.ipv4.neigh.br-a7c7f1777df1.unres_qlen = 101
+net.ipv4.neigh.br-a7c7f1777df1.unres_qlen_bytes = 212992
+net.ipv4.neigh.default.anycast_delay = 100
+net.ipv4.neigh.default.app_solicit = 0
+net.ipv4.neigh.default.base_reachable_time_ms = 30000
+net.ipv4.neigh.default.delay_first_probe_time = 5
+net.ipv4.neigh.default.gc_interval = 30
+net.ipv4.neigh.default.gc_stale_time = 60
+net.ipv4.neigh.default.gc_thresh1 = 128
+net.ipv4.neigh.default.gc_thresh2 = 512
+net.ipv4.neigh.default.gc_thresh3 = 1024
+net.ipv4.neigh.default.interval_probe_time_ms = 5000
+net.ipv4.neigh.default.locktime = 100
+net.ipv4.neigh.default.mcast_resolicit = 0
+net.ipv4.neigh.default.mcast_solicit = 3
+net.ipv4.neigh.default.proxy_delay = 80
+net.ipv4.neigh.default.proxy_qlen = 64
+net.ipv4.neigh.default.retrans_time_ms = 1000
+net.ipv4.neigh.default.ucast_solicit = 3
+net.ipv4.neigh.default.unres_qlen = 101
+net.ipv4.neigh.default.unres_qlen_bytes = 212992
+net.ipv4.neigh.docker0.anycast_delay = 100
+net.ipv4.neigh.docker0.app_solicit = 0
+net.ipv4.neigh.docker0.base_reachable_time_ms = 30000
+net.ipv4.neigh.docker0.delay_first_probe_time = 5
+net.ipv4.neigh.docker0.gc_stale_time = 60
+net.ipv4.neigh.docker0.interval_probe_time_ms = 5000
+net.ipv4.neigh.docker0.locktime = 100
+net.ipv4.neigh.docker0.mcast_resolicit = 0
+net.ipv4.neigh.docker0.mcast_solicit = 3
+net.ipv4.neigh.docker0.proxy_delay = 80
+net.ipv4.neigh.docker0.proxy_qlen = 64
+net.ipv4.neigh.docker0.retrans_time_ms = 1000
+net.ipv4.neigh.docker0.ucast_solicit = 3
+net.ipv4.neigh.docker0.unres_qlen = 101
+net.ipv4.neigh.docker0.unres_qlen_bytes = 212992
+net.ipv4.neigh.enp46s0.anycast_delay = 100
+net.ipv4.neigh.enp46s0.app_solicit = 0
+net.ipv4.neigh.enp46s0.base_reachable_time_ms = 30000
+net.ipv4.neigh.enp46s0.delay_first_probe_time = 5
+net.ipv4.neigh.enp46s0.gc_stale_time = 60
+net.ipv4.neigh.enp46s0.interval_probe_time_ms = 5000
+net.ipv4.neigh.enp46s0.locktime = 100
+net.ipv4.neigh.enp46s0.mcast_resolicit = 0
+net.ipv4.neigh.enp46s0.mcast_solicit = 3
+net.ipv4.neigh.enp46s0.proxy_delay = 80
+net.ipv4.neigh.enp46s0.proxy_qlen = 64
+net.ipv4.neigh.enp46s0.retrans_time_ms = 1000
+net.ipv4.neigh.enp46s0.ucast_solicit = 3
+net.ipv4.neigh.enp46s0.unres_qlen = 101
+net.ipv4.neigh.enp46s0.unres_qlen_bytes = 212992
+net.ipv4.neigh.lo.anycast_delay = 100
+net.ipv4.neigh.lo.app_solicit = 0
+net.ipv4.neigh.lo.base_reachable_time_ms = 30000
+net.ipv4.neigh.lo.delay_first_probe_time = 5
+net.ipv4.neigh.lo.gc_stale_time = 60
+net.ipv4.neigh.lo.interval_probe_time_ms = 5000
+net.ipv4.neigh.lo.locktime = 100
+net.ipv4.neigh.lo.mcast_resolicit = 0
+net.ipv4.neigh.lo.mcast_solicit = 3
+net.ipv4.neigh.lo.proxy_delay = 80
+net.ipv4.neigh.lo.proxy_qlen = 64
+net.ipv4.neigh.lo.retrans_time_ms = 1000
+net.ipv4.neigh.lo.ucast_solicit = 3
+net.ipv4.neigh.lo.unres_qlen = 101
+net.ipv4.neigh.lo.unres_qlen_bytes = 212992
+net.ipv4.neigh.veth0655c9f.anycast_delay = 100
+net.ipv4.neigh.veth0655c9f.app_solicit = 0
+net.ipv4.neigh.veth0655c9f.base_reachable_time_ms = 30000
+net.ipv4.neigh.veth0655c9f.delay_first_probe_time = 5
+net.ipv4.neigh.veth0655c9f.gc_stale_time = 60
+net.ipv4.neigh.veth0655c9f.interval_probe_time_ms = 5000
+net.ipv4.neigh.veth0655c9f.locktime = 100
+net.ipv4.neigh.veth0655c9f.mcast_resolicit = 0
+net.ipv4.neigh.veth0655c9f.mcast_solicit = 3
+net.ipv4.neigh.veth0655c9f.proxy_delay = 80
+net.ipv4.neigh.veth0655c9f.proxy_qlen = 64
+net.ipv4.neigh.veth0655c9f.retrans_time_ms = 1000
+net.ipv4.neigh.veth0655c9f.ucast_solicit = 3
+net.ipv4.neigh.veth0655c9f.unres_qlen = 101
+net.ipv4.neigh.veth0655c9f.unres_qlen_bytes = 212992
+net.ipv4.neigh.veth2655c84.anycast_delay = 100
+net.ipv4.neigh.veth2655c84.app_solicit = 0
+net.ipv4.neigh.veth2655c84.base_reachable_time_ms = 30000
+net.ipv4.neigh.veth2655c84.delay_first_probe_time = 5
+net.ipv4.neigh.veth2655c84.gc_stale_time = 60
+net.ipv4.neigh.veth2655c84.interval_probe_time_ms = 5000
+net.ipv4.neigh.veth2655c84.locktime = 100
+net.ipv4.neigh.veth2655c84.mcast_resolicit = 0
+net.ipv4.neigh.veth2655c84.mcast_solicit = 3
+net.ipv4.neigh.veth2655c84.proxy_delay = 80
+net.ipv4.neigh.veth2655c84.proxy_qlen = 64
+net.ipv4.neigh.veth2655c84.retrans_time_ms = 1000
+net.ipv4.neigh.veth2655c84.ucast_solicit = 3
+net.ipv4.neigh.veth2655c84.unres_qlen = 101
+net.ipv4.neigh.veth2655c84.unres_qlen_bytes = 212992
+net.ipv4.neigh.vethd189986.anycast_delay = 100
+net.ipv4.neigh.vethd189986.app_solicit = 0
+net.ipv4.neigh.vethd189986.base_reachable_time_ms = 30000
+net.ipv4.neigh.vethd189986.delay_first_probe_time = 5
+net.ipv4.neigh.vethd189986.gc_stale_time = 60
+net.ipv4.neigh.vethd189986.interval_probe_time_ms = 5000
+net.ipv4.neigh.vethd189986.locktime = 100
+net.ipv4.neigh.vethd189986.mcast_resolicit = 0
+net.ipv4.neigh.vethd189986.mcast_solicit = 3
+net.ipv4.neigh.vethd189986.proxy_delay = 80
+net.ipv4.neigh.vethd189986.proxy_qlen = 64
+net.ipv4.neigh.vethd189986.retrans_time_ms = 1000
+net.ipv4.neigh.vethd189986.ucast_solicit = 3
+net.ipv4.neigh.vethd189986.unres_qlen = 101
+net.ipv4.neigh.vethd189986.unres_qlen_bytes = 212992
+net.ipv4.neigh.wg0.anycast_delay = 100
+net.ipv4.neigh.wg0.app_solicit = 0
+net.ipv4.neigh.wg0.base_reachable_time_ms = 30000
+net.ipv4.neigh.wg0.delay_first_probe_time = 5
+net.ipv4.neigh.wg0.gc_stale_time = 60
+net.ipv4.neigh.wg0.interval_probe_time_ms = 5000
+net.ipv4.neigh.wg0.locktime = 100
+net.ipv4.neigh.wg0.mcast_resolicit = 0
+net.ipv4.neigh.wg0.mcast_solicit = 3
+net.ipv4.neigh.wg0.proxy_delay = 80
+net.ipv4.neigh.wg0.proxy_qlen = 64
+net.ipv4.neigh.wg0.retrans_time_ms = 1000
+net.ipv4.neigh.wg0.ucast_solicit = 3
+net.ipv4.neigh.wg0.unres_qlen = 101
+net.ipv4.neigh.wg0.unres_qlen_bytes = 212992
+net.ipv4.neigh.wlp0s20f3.anycast_delay = 100
+net.ipv4.neigh.wlp0s20f3.app_solicit = 0
+net.ipv4.neigh.wlp0s20f3.base_reachable_time_ms = 30000
+net.ipv4.neigh.wlp0s20f3.delay_first_probe_time = 5
+net.ipv4.neigh.wlp0s20f3.gc_stale_time = 60
+net.ipv4.neigh.wlp0s20f3.interval_probe_time_ms = 5000
+net.ipv4.neigh.wlp0s20f3.locktime = 100
+net.ipv4.neigh.wlp0s20f3.mcast_resolicit = 0
+net.ipv4.neigh.wlp0s20f3.mcast_solicit = 3
+net.ipv4.neigh.wlp0s20f3.proxy_delay = 80
+net.ipv4.neigh.wlp0s20f3.proxy_qlen = 64
+net.ipv4.neigh.wlp0s20f3.retrans_time_ms = 1000
+net.ipv4.neigh.wlp0s20f3.ucast_solicit = 3
+net.ipv4.neigh.wlp0s20f3.unres_qlen = 101
+net.ipv4.neigh.wlp0s20f3.unres_qlen_bytes = 212992
+net.ipv4.nexthop_compat_mode = 1
+net.ipv4.ping_group_range = 0	2147483647
+net.ipv4.raw_l3mdev_accept = 1
+net.ipv4.route.error_burst = 1250
+net.ipv4.route.error_cost = 250
+net.ipv4.route.gc_elasticity = 8
+net.ipv4.route.gc_interval = 60
+net.ipv4.route.gc_min_interval = 0
+net.ipv4.route.gc_min_interval_ms = 500
+net.ipv4.route.gc_thresh = -1
+net.ipv4.route.gc_timeout = 300
+net.ipv4.route.max_size = 2147483647
+net.ipv4.route.min_adv_mss = 256
+net.ipv4.route.min_pmtu = 552
+net.ipv4.route.mtu_expires = 600
+net.ipv4.route.redirect_load = 5
+net.ipv4.route.redirect_number = 9
+net.ipv4.route.redirect_silence = 5120
+net.ipv4.tcp_abort_on_overflow = 0
+net.ipv4.tcp_adv_win_scale = 1
+net.ipv4.tcp_allowed_congestion_control = reno cubic
+net.ipv4.tcp_app_win = 31
+net.ipv4.tcp_autocorking = 1
+net.ipv4.tcp_available_congestion_control = reno cubic
+net.ipv4.tcp_available_ulp = espintcp mptcp tls
+net.ipv4.tcp_base_mss = 1024
+net.ipv4.tcp_challenge_ack_limit = 2147483647
+net.ipv4.tcp_child_ehash_entries = 0
+net.ipv4.tcp_comp_sack_delay_ns = 1000000
+net.ipv4.tcp_comp_sack_nr = 44
+net.ipv4.tcp_comp_sack_slack_ns = 100000
+net.ipv4.tcp_congestion_control = cubic
+net.ipv4.tcp_dsack = 1
+net.ipv4.tcp_early_demux = 1
+net.ipv4.tcp_early_retrans = 3
+net.ipv4.tcp_ecn = 2
+net.ipv4.tcp_ecn_fallback = 1
+net.ipv4.tcp_ehash_entries = 524288
+net.ipv4.tcp_fack = 0
+net.ipv4.tcp_fastopen = 1
+net.ipv4.tcp_fastopen_blackhole_timeout_sec = 0
+net.ipv4.tcp_fin_timeout = 60
+net.ipv4.tcp_frto = 2
+net.ipv4.tcp_fwmark_accept = 0
+net.ipv4.tcp_invalid_ratelimit = 500
+net.ipv4.tcp_keepalive_intvl = 75
+net.ipv4.tcp_keepalive_probes = 9
+net.ipv4.tcp_keepalive_time = 7200
+net.ipv4.tcp_l3mdev_accept = 0
+net.ipv4.tcp_limit_output_bytes = 1048576
+net.ipv4.tcp_low_latency = 0
+net.ipv4.tcp_max_orphans = 262144
+net.ipv4.tcp_max_reordering = 300
+net.ipv4.tcp_max_syn_backlog = 4096
+net.ipv4.tcp_max_tw_buckets = 262144
+net.ipv4.tcp_mem = 765768	1021025	1531536
+net.ipv4.tcp_migrate_req = 0
+net.ipv4.tcp_min_rtt_wlen = 300
+net.ipv4.tcp_min_snd_mss = 48
+net.ipv4.tcp_min_tso_segs = 2
+net.ipv4.tcp_moderate_rcvbuf = 1
+net.ipv4.tcp_mtu_probe_floor = 48
+net.ipv4.tcp_mtu_probing = 0
+net.ipv4.tcp_no_metrics_save = 0
+net.ipv4.tcp_no_ssthresh_metrics_save = 1
+net.ipv4.tcp_notsent_lowat = 4294967295
+net.ipv4.tcp_orphan_retries = 0
+net.ipv4.tcp_pacing_ca_ratio = 120
+net.ipv4.tcp_pacing_ss_ratio = 200
+net.ipv4.tcp_plb_cong_thresh = 128
+net.ipv4.tcp_plb_enabled = 0
+net.ipv4.tcp_plb_idle_rehash_rounds = 3
+net.ipv4.tcp_plb_rehash_rounds = 12
+net.ipv4.tcp_plb_suspend_rto_sec = 60
+net.ipv4.tcp_probe_interval = 600
+net.ipv4.tcp_probe_threshold = 8
+net.ipv4.tcp_recovery = 1
+net.ipv4.tcp_reflect_tos = 0
+net.ipv4.tcp_reordering = 3
+net.ipv4.tcp_retrans_collapse = 1
+net.ipv4.tcp_retries1 = 3
+net.ipv4.tcp_retries2 = 15
+net.ipv4.tcp_rfc1337 = 0
+net.ipv4.tcp_rmem = 4096	131072	6291456
+net.ipv4.tcp_sack = 1
+net.ipv4.tcp_shrink_window = 0
+net.ipv4.tcp_slow_start_after_idle = 1
+net.ipv4.tcp_stdurg = 0
+net.ipv4.tcp_syn_linear_timeouts = 4
+net.ipv4.tcp_syn_retries = 6
+net.ipv4.tcp_synack_retries = 5
+net.ipv4.tcp_syncookies = 1
+net.ipv4.tcp_thin_linear_timeouts = 0
+net.ipv4.tcp_timestamps = 1
+net.ipv4.tcp_tso_rtt_log = 9
+net.ipv4.tcp_tso_win_divisor = 3
+net.ipv4.tcp_tw_reuse = 2
+net.ipv4.tcp_window_scaling = 1
+net.ipv4.tcp_wmem = 4096	16384	4194304
+net.ipv4.tcp_workaround_signed_windows = 0
+net.ipv4.udp_child_hash_entries = 0
+net.ipv4.udp_early_demux = 1
+net.ipv4.udp_hash_entries = 32768
+net.ipv4.udp_l3mdev_accept = 0
+net.ipv4.udp_mem = 1531536	2042051	3063072
+net.ipv4.udp_rmem_min = 4096
+net.ipv4.udp_wmem_min = 4096
+net.ipv4.xfrm4_gc_thresh = 32768
+net.ipv6.anycast_src_echo_reply = 0
+net.ipv6.auto_flowlabels = 1
+net.ipv6.bindv6only = 0
+net.ipv6.calipso_cache_bucket_size = 10
+net.ipv6.calipso_cache_enable = 1
+net.ipv6.conf.all.accept_dad = 0
+net.ipv6.conf.all.accept_ra = 1
+net.ipv6.conf.all.accept_ra_defrtr = 1
+net.ipv6.conf.all.accept_ra_from_local = 0
+net.ipv6.conf.all.accept_ra_min_hop_limit = 1
+net.ipv6.conf.all.accept_ra_min_lft = 0
+net.ipv6.conf.all.accept_ra_mtu = 1
+net.ipv6.conf.all.accept_ra_pinfo = 1
+net.ipv6.conf.all.accept_ra_rt_info_max_plen = 0
+net.ipv6.conf.all.accept_ra_rt_info_min_plen = 0
+net.ipv6.conf.all.accept_ra_rtr_pref = 1
+net.ipv6.conf.all.accept_redirects = 1
+net.ipv6.conf.all.accept_source_route = 0
+net.ipv6.conf.all.accept_untracked_na = 0
+net.ipv6.conf.all.addr_gen_mode = 0
+net.ipv6.conf.all.autoconf = 1
+net.ipv6.conf.all.dad_transmits = 1
+net.ipv6.conf.all.disable_ipv6 = 0
+net.ipv6.conf.all.disable_policy = 0
+net.ipv6.conf.all.drop_unicast_in_l2_multicast = 0
+net.ipv6.conf.all.drop_unsolicited_na = 0
+net.ipv6.conf.all.enhanced_dad = 1
+net.ipv6.conf.all.force_mld_version = 0
+net.ipv6.conf.all.force_tllao = 0
+net.ipv6.conf.all.forwarding = 0
+net.ipv6.conf.all.hop_limit = 64
+net.ipv6.conf.all.ignore_routes_with_linkdown = 0
+net.ipv6.conf.all.ioam6_enabled = 0
+net.ipv6.conf.all.ioam6_id = 65535
+net.ipv6.conf.all.ioam6_id_wide = 4294967295
+net.ipv6.conf.all.keep_addr_on_down = 0
+net.ipv6.conf.all.max_addresses = 16
+net.ipv6.conf.all.max_desync_factor = 600
+net.ipv6.conf.all.mc_forwarding = 0
+net.ipv6.conf.all.mldv1_unsolicited_report_interval = 10000
+net.ipv6.conf.all.mldv2_unsolicited_report_interval = 1000
+net.ipv6.conf.all.mtu = 1280
+net.ipv6.conf.all.ndisc_evict_nocarrier = 1
+net.ipv6.conf.all.ndisc_notify = 0
+net.ipv6.conf.all.ndisc_tclass = 0
+net.ipv6.conf.all.proxy_ndp = 0
+net.ipv6.conf.all.ra_defrtr_metric = 1024
+net.ipv6.conf.all.regen_max_retry = 3
+net.ipv6.conf.all.router_probe_interval = 60
+net.ipv6.conf.all.router_solicitation_delay = 1
+net.ipv6.conf.all.router_solicitation_interval = 4
+net.ipv6.conf.all.router_solicitation_max_interval = 3600
+net.ipv6.conf.all.router_solicitations = -1
+net.ipv6.conf.all.rpl_seg_enabled = 0
+net.ipv6.conf.all.seg6_enabled = 0
+net.ipv6.conf.all.seg6_require_hmac = 0
+net.ipv6.conf.all.suppress_frag_ndisc = 1
+net.ipv6.conf.all.temp_prefered_lft = 86400
+net.ipv6.conf.all.temp_valid_lft = 604800
+net.ipv6.conf.all.use_oif_addrs_only = 0
+net.ipv6.conf.all.use_tempaddr = 2
+net.ipv6.conf.br-79118f7d5a92.accept_dad = 1
+net.ipv6.conf.br-79118f7d5a92.accept_ra = 0
+net.ipv6.conf.br-79118f7d5a92.accept_ra_defrtr = 1
+net.ipv6.conf.br-79118f7d5a92.accept_ra_from_local = 0
+net.ipv6.conf.br-79118f7d5a92.accept_ra_min_hop_limit = 1
+net.ipv6.conf.br-79118f7d5a92.accept_ra_min_lft = 0
+net.ipv6.conf.br-79118f7d5a92.accept_ra_mtu = 1
+net.ipv6.conf.br-79118f7d5a92.accept_ra_pinfo = 1
+net.ipv6.conf.br-79118f7d5a92.accept_ra_rt_info_max_plen = 0
+net.ipv6.conf.br-79118f7d5a92.accept_ra_rt_info_min_plen = 0
+net.ipv6.conf.br-79118f7d5a92.accept_ra_rtr_pref = 1
+net.ipv6.conf.br-79118f7d5a92.accept_redirects = 1
+net.ipv6.conf.br-79118f7d5a92.accept_source_route = 0
+net.ipv6.conf.br-79118f7d5a92.accept_untracked_na = 0
+net.ipv6.conf.br-79118f7d5a92.addr_gen_mode = 0
+net.ipv6.conf.br-79118f7d5a92.autoconf = 1
+net.ipv6.conf.br-79118f7d5a92.dad_transmits = 1
+net.ipv6.conf.br-79118f7d5a92.disable_ipv6 = 0
+net.ipv6.conf.br-79118f7d5a92.disable_policy = 0
+net.ipv6.conf.br-79118f7d5a92.drop_unicast_in_l2_multicast = 0
+net.ipv6.conf.br-79118f7d5a92.drop_unsolicited_na = 0
+net.ipv6.conf.br-79118f7d5a92.enhanced_dad = 1
+net.ipv6.conf.br-79118f7d5a92.force_mld_version = 0
+net.ipv6.conf.br-79118f7d5a92.force_tllao = 0
+net.ipv6.conf.br-79118f7d5a92.forwarding = 0
+net.ipv6.conf.br-79118f7d5a92.hop_limit = 64
+net.ipv6.conf.br-79118f7d5a92.ignore_routes_with_linkdown = 0
+net.ipv6.conf.br-79118f7d5a92.ioam6_enabled = 0
+net.ipv6.conf.br-79118f7d5a92.ioam6_id = 65535
+net.ipv6.conf.br-79118f7d5a92.ioam6_id_wide = 4294967295
+net.ipv6.conf.br-79118f7d5a92.keep_addr_on_down = 0
+net.ipv6.conf.br-79118f7d5a92.max_addresses = 16
+net.ipv6.conf.br-79118f7d5a92.max_desync_factor = 600
+net.ipv6.conf.br-79118f7d5a92.mc_forwarding = 0
+net.ipv6.conf.br-79118f7d5a92.mldv1_unsolicited_report_interval = 10000
+net.ipv6.conf.br-79118f7d5a92.mldv2_unsolicited_report_interval = 1000
+net.ipv6.conf.br-79118f7d5a92.mtu = 1500
+net.ipv6.conf.br-79118f7d5a92.ndisc_evict_nocarrier = 1
+net.ipv6.conf.br-79118f7d5a92.ndisc_notify = 0
+net.ipv6.conf.br-79118f7d5a92.ndisc_tclass = 0
+net.ipv6.conf.br-79118f7d5a92.proxy_ndp = 0
+net.ipv6.conf.br-79118f7d5a92.ra_defrtr_metric = 1024
+net.ipv6.conf.br-79118f7d5a92.regen_max_retry = 3
+net.ipv6.conf.br-79118f7d5a92.router_probe_interval = 60
+net.ipv6.conf.br-79118f7d5a92.router_solicitation_delay = 1
+net.ipv6.conf.br-79118f7d5a92.router_solicitation_interval = 4
+net.ipv6.conf.br-79118f7d5a92.router_solicitation_max_interval = 3600
+net.ipv6.conf.br-79118f7d5a92.router_solicitations = -1
+net.ipv6.conf.br-79118f7d5a92.rpl_seg_enabled = 0
+net.ipv6.conf.br-79118f7d5a92.seg6_enabled = 0
+net.ipv6.conf.br-79118f7d5a92.seg6_require_hmac = 0
+net.ipv6.conf.br-79118f7d5a92.suppress_frag_ndisc = 1
+net.ipv6.conf.br-79118f7d5a92.temp_prefered_lft = 86400
+net.ipv6.conf.br-79118f7d5a92.temp_valid_lft = 604800
+net.ipv6.conf.br-79118f7d5a92.use_oif_addrs_only = 0
+net.ipv6.conf.br-79118f7d5a92.use_tempaddr = 2
+net.ipv6.conf.br-a7c7f1777df1.accept_dad = 1
+net.ipv6.conf.br-a7c7f1777df1.accept_ra = 0
+net.ipv6.conf.br-a7c7f1777df1.accept_ra_defrtr = 1
+net.ipv6.conf.br-a7c7f1777df1.accept_ra_from_local = 0
+net.ipv6.conf.br-a7c7f1777df1.accept_ra_min_hop_limit = 1
+net.ipv6.conf.br-a7c7f1777df1.accept_ra_min_lft = 0
+net.ipv6.conf.br-a7c7f1777df1.accept_ra_mtu = 1
+net.ipv6.conf.br-a7c7f1777df1.accept_ra_pinfo = 1
+net.ipv6.conf.br-a7c7f1777df1.accept_ra_rt_info_max_plen = 0
+net.ipv6.conf.br-a7c7f1777df1.accept_ra_rt_info_min_plen = 0
+net.ipv6.conf.br-a7c7f1777df1.accept_ra_rtr_pref = 1
+net.ipv6.conf.br-a7c7f1777df1.accept_redirects = 1
+net.ipv6.conf.br-a7c7f1777df1.accept_source_route = 0
+net.ipv6.conf.br-a7c7f1777df1.accept_untracked_na = 0
+net.ipv6.conf.br-a7c7f1777df1.addr_gen_mode = 0
+net.ipv6.conf.br-a7c7f1777df1.autoconf = 1
+net.ipv6.conf.br-a7c7f1777df1.dad_transmits = 1
+net.ipv6.conf.br-a7c7f1777df1.disable_ipv6 = 0
+net.ipv6.conf.br-a7c7f1777df1.disable_policy = 0
+net.ipv6.conf.br-a7c7f1777df1.drop_unicast_in_l2_multicast = 0
+net.ipv6.conf.br-a7c7f1777df1.drop_unsolicited_na = 0
+net.ipv6.conf.br-a7c7f1777df1.enhanced_dad = 1
+net.ipv6.conf.br-a7c7f1777df1.force_mld_version = 0
+net.ipv6.conf.br-a7c7f1777df1.force_tllao = 0
+net.ipv6.conf.br-a7c7f1777df1.forwarding = 0
+net.ipv6.conf.br-a7c7f1777df1.hop_limit = 64
+net.ipv6.conf.br-a7c7f1777df1.ignore_routes_with_linkdown = 0
+net.ipv6.conf.br-a7c7f1777df1.ioam6_enabled = 0
+net.ipv6.conf.br-a7c7f1777df1.ioam6_id = 65535
+net.ipv6.conf.br-a7c7f1777df1.ioam6_id_wide = 4294967295
+net.ipv6.conf.br-a7c7f1777df1.keep_addr_on_down = 0
+net.ipv6.conf.br-a7c7f1777df1.max_addresses = 16
+net.ipv6.conf.br-a7c7f1777df1.max_desync_factor = 600
+net.ipv6.conf.br-a7c7f1777df1.mc_forwarding = 0
+net.ipv6.conf.br-a7c7f1777df1.mldv1_unsolicited_report_interval = 10000
+net.ipv6.conf.br-a7c7f1777df1.mldv2_unsolicited_report_interval = 1000
+net.ipv6.conf.br-a7c7f1777df1.mtu = 1500
+net.ipv6.conf.br-a7c7f1777df1.ndisc_evict_nocarrier = 1
+net.ipv6.conf.br-a7c7f1777df1.ndisc_notify = 0
+net.ipv6.conf.br-a7c7f1777df1.ndisc_tclass = 0
+net.ipv6.conf.br-a7c7f1777df1.proxy_ndp = 0
+net.ipv6.conf.br-a7c7f1777df1.ra_defrtr_metric = 1024
+net.ipv6.conf.br-a7c7f1777df1.regen_max_retry = 3
+net.ipv6.conf.br-a7c7f1777df1.router_probe_interval = 60
+net.ipv6.conf.br-a7c7f1777df1.router_solicitation_delay = 1
+net.ipv6.conf.br-a7c7f1777df1.router_solicitation_interval = 4
+net.ipv6.conf.br-a7c7f1777df1.router_solicitation_max_interval = 3600
+net.ipv6.conf.br-a7c7f1777df1.router_solicitations = -1
+net.ipv6.conf.br-a7c7f1777df1.rpl_seg_enabled = 0
+net.ipv6.conf.br-a7c7f1777df1.seg6_enabled = 0
+net.ipv6.conf.br-a7c7f1777df1.seg6_require_hmac = 0
+net.ipv6.conf.br-a7c7f1777df1.suppress_frag_ndisc = 1
+net.ipv6.conf.br-a7c7f1777df1.temp_prefered_lft = 86400
+net.ipv6.conf.br-a7c7f1777df1.temp_valid_lft = 604800
+net.ipv6.conf.br-a7c7f1777df1.use_oif_addrs_only = 0
+net.ipv6.conf.br-a7c7f1777df1.use_tempaddr = 2
+net.ipv6.conf.default.accept_dad = 1
+net.ipv6.conf.default.accept_ra = 1
+net.ipv6.conf.default.accept_ra_defrtr = 1
+net.ipv6.conf.default.accept_ra_from_local = 0
+net.ipv6.conf.default.accept_ra_min_hop_limit = 1
+net.ipv6.conf.default.accept_ra_min_lft = 0
+net.ipv6.conf.default.accept_ra_mtu = 1
+net.ipv6.conf.default.accept_ra_pinfo = 1
+net.ipv6.conf.default.accept_ra_rt_info_max_plen = 0
+net.ipv6.conf.default.accept_ra_rt_info_min_plen = 0
+net.ipv6.conf.default.accept_ra_rtr_pref = 1
+net.ipv6.conf.default.accept_redirects = 1
+net.ipv6.conf.default.accept_source_route = 0
+net.ipv6.conf.default.accept_untracked_na = 0
+net.ipv6.conf.default.addr_gen_mode = 0
+net.ipv6.conf.default.autoconf = 1
+net.ipv6.conf.default.dad_transmits = 1
+net.ipv6.conf.default.disable_ipv6 = 0
+net.ipv6.conf.default.disable_policy = 0
+net.ipv6.conf.default.drop_unicast_in_l2_multicast = 0
+net.ipv6.conf.default.drop_unsolicited_na = 0
+net.ipv6.conf.default.enhanced_dad = 1
+net.ipv6.conf.default.force_mld_version = 0
+net.ipv6.conf.default.force_tllao = 0
+net.ipv6.conf.default.forwarding = 0
+net.ipv6.conf.default.hop_limit = 64
+net.ipv6.conf.default.ignore_routes_with_linkdown = 0
+net.ipv6.conf.default.ioam6_enabled = 0
+net.ipv6.conf.default.ioam6_id = 65535
+net.ipv6.conf.default.ioam6_id_wide = 4294967295
+net.ipv6.conf.default.keep_addr_on_down = 0
+net.ipv6.conf.default.max_addresses = 16
+net.ipv6.conf.default.max_desync_factor = 600
+net.ipv6.conf.default.mc_forwarding = 0
+net.ipv6.conf.default.mldv1_unsolicited_report_interval = 10000
+net.ipv6.conf.default.mldv2_unsolicited_report_interval = 1000
+net.ipv6.conf.default.mtu = 1280
+net.ipv6.conf.default.ndisc_evict_nocarrier = 1
+net.ipv6.conf.default.ndisc_notify = 0
+net.ipv6.conf.default.ndisc_tclass = 0
+net.ipv6.conf.default.proxy_ndp = 0
+net.ipv6.conf.default.ra_defrtr_metric = 1024
+net.ipv6.conf.default.regen_max_retry = 3
+net.ipv6.conf.default.router_probe_interval = 60
+net.ipv6.conf.default.router_solicitation_delay = 1
+net.ipv6.conf.default.router_solicitation_interval = 4
+net.ipv6.conf.default.router_solicitation_max_interval = 3600
+net.ipv6.conf.default.router_solicitations = -1
+net.ipv6.conf.default.rpl_seg_enabled = 0
+net.ipv6.conf.default.seg6_enabled = 0
+net.ipv6.conf.default.seg6_require_hmac = 0
+net.ipv6.conf.default.suppress_frag_ndisc = 1
+net.ipv6.conf.default.temp_prefered_lft = 86400
+net.ipv6.conf.default.temp_valid_lft = 604800
+net.ipv6.conf.default.use_oif_addrs_only = 0
+net.ipv6.conf.default.use_tempaddr = 2
+net.ipv6.conf.docker0.accept_dad = 1
+net.ipv6.conf.docker0.accept_ra = 0
+net.ipv6.conf.docker0.accept_ra_defrtr = 1
+net.ipv6.conf.docker0.accept_ra_from_local = 0
+net.ipv6.conf.docker0.accept_ra_min_hop_limit = 1
+net.ipv6.conf.docker0.accept_ra_min_lft = 0
+net.ipv6.conf.docker0.accept_ra_mtu = 1
+net.ipv6.conf.docker0.accept_ra_pinfo = 1
+net.ipv6.conf.docker0.accept_ra_rt_info_max_plen = 0
+net.ipv6.conf.docker0.accept_ra_rt_info_min_plen = 0
+net.ipv6.conf.docker0.accept_ra_rtr_pref = 1
+net.ipv6.conf.docker0.accept_redirects = 1
+net.ipv6.conf.docker0.accept_source_route = 0
+net.ipv6.conf.docker0.accept_untracked_na = 0
+net.ipv6.conf.docker0.addr_gen_mode = 0
+net.ipv6.conf.docker0.autoconf = 1
+net.ipv6.conf.docker0.dad_transmits = 1
+net.ipv6.conf.docker0.disable_ipv6 = 0
+net.ipv6.conf.docker0.disable_policy = 0
+net.ipv6.conf.docker0.drop_unicast_in_l2_multicast = 0
+net.ipv6.conf.docker0.drop_unsolicited_na = 0
+net.ipv6.conf.docker0.enhanced_dad = 1
+net.ipv6.conf.docker0.force_mld_version = 0
+net.ipv6.conf.docker0.force_tllao = 0
+net.ipv6.conf.docker0.forwarding = 0
+net.ipv6.conf.docker0.hop_limit = 64
+net.ipv6.conf.docker0.ignore_routes_with_linkdown = 0
+net.ipv6.conf.docker0.ioam6_enabled = 0
+net.ipv6.conf.docker0.ioam6_id = 65535
+net.ipv6.conf.docker0.ioam6_id_wide = 4294967295
+net.ipv6.conf.docker0.keep_addr_on_down = 0
+net.ipv6.conf.docker0.max_addresses = 16
+net.ipv6.conf.docker0.max_desync_factor = 600
+net.ipv6.conf.docker0.mc_forwarding = 0
+net.ipv6.conf.docker0.mldv1_unsolicited_report_interval = 10000
+net.ipv6.conf.docker0.mldv2_unsolicited_report_interval = 1000
+net.ipv6.conf.docker0.mtu = 1500
+net.ipv6.conf.docker0.ndisc_evict_nocarrier = 1
+net.ipv6.conf.docker0.ndisc_notify = 0
+net.ipv6.conf.docker0.ndisc_tclass = 0
+net.ipv6.conf.docker0.proxy_ndp = 0
+net.ipv6.conf.docker0.ra_defrtr_metric = 1024
+net.ipv6.conf.docker0.regen_max_retry = 3
+net.ipv6.conf.docker0.router_probe_interval = 60
+net.ipv6.conf.docker0.router_solicitation_delay = 1
+net.ipv6.conf.docker0.router_solicitation_interval = 4
+net.ipv6.conf.docker0.router_solicitation_max_interval = 3600
+net.ipv6.conf.docker0.router_solicitations = -1
+net.ipv6.conf.docker0.rpl_seg_enabled = 0
+net.ipv6.conf.docker0.seg6_enabled = 0
+net.ipv6.conf.docker0.seg6_require_hmac = 0
+net.ipv6.conf.docker0.suppress_frag_ndisc = 1
+net.ipv6.conf.docker0.temp_prefered_lft = 86400
+net.ipv6.conf.docker0.temp_valid_lft = 604800
+net.ipv6.conf.docker0.use_oif_addrs_only = 0
+net.ipv6.conf.docker0.use_tempaddr = 2
+net.ipv6.conf.enp46s0.accept_dad = 1
+net.ipv6.conf.enp46s0.accept_ra = 0
+net.ipv6.conf.enp46s0.accept_ra_defrtr = 1
+net.ipv6.conf.enp46s0.accept_ra_from_local = 0
+net.ipv6.conf.enp46s0.accept_ra_min_hop_limit = 1
+net.ipv6.conf.enp46s0.accept_ra_min_lft = 0
+net.ipv6.conf.enp46s0.accept_ra_mtu = 1
+net.ipv6.conf.enp46s0.accept_ra_pinfo = 1
+net.ipv6.conf.enp46s0.accept_ra_rt_info_max_plen = 0
+net.ipv6.conf.enp46s0.accept_ra_rt_info_min_plen = 0
+net.ipv6.conf.enp46s0.accept_ra_rtr_pref = 1
+net.ipv6.conf.enp46s0.accept_redirects = 1
+net.ipv6.conf.enp46s0.accept_source_route = 0
+net.ipv6.conf.enp46s0.accept_untracked_na = 0
+net.ipv6.conf.enp46s0.addr_gen_mode = 1
+net.ipv6.conf.enp46s0.autoconf = 1
+net.ipv6.conf.enp46s0.dad_transmits = 1
+net.ipv6.conf.enp46s0.disable_ipv6 = 0
+net.ipv6.conf.enp46s0.disable_policy = 0
+net.ipv6.conf.enp46s0.drop_unicast_in_l2_multicast = 0
+net.ipv6.conf.enp46s0.drop_unsolicited_na = 0
+net.ipv6.conf.enp46s0.enhanced_dad = 1
+net.ipv6.conf.enp46s0.force_mld_version = 0
+net.ipv6.conf.enp46s0.force_tllao = 0
+net.ipv6.conf.enp46s0.forwarding = 0
+net.ipv6.conf.enp46s0.hop_limit = 64
+net.ipv6.conf.enp46s0.ignore_routes_with_linkdown = 0
+net.ipv6.conf.enp46s0.ioam6_enabled = 0
+net.ipv6.conf.enp46s0.ioam6_id = 65535
+net.ipv6.conf.enp46s0.ioam6_id_wide = 4294967295
+net.ipv6.conf.enp46s0.keep_addr_on_down = 0
+net.ipv6.conf.enp46s0.max_addresses = 16
+net.ipv6.conf.enp46s0.max_desync_factor = 600
+net.ipv6.conf.enp46s0.mc_forwarding = 0
+net.ipv6.conf.enp46s0.mldv1_unsolicited_report_interval = 10000
+net.ipv6.conf.enp46s0.mldv2_unsolicited_report_interval = 1000
+net.ipv6.conf.enp46s0.mtu = 1500
+net.ipv6.conf.enp46s0.ndisc_evict_nocarrier = 1
+net.ipv6.conf.enp46s0.ndisc_notify = 0
+net.ipv6.conf.enp46s0.ndisc_tclass = 0
+net.ipv6.conf.enp46s0.proxy_ndp = 0
+net.ipv6.conf.enp46s0.ra_defrtr_metric = 1024
+net.ipv6.conf.enp46s0.regen_max_retry = 3
+net.ipv6.conf.enp46s0.router_probe_interval = 60
+net.ipv6.conf.enp46s0.router_solicitation_delay = 1
+net.ipv6.conf.enp46s0.router_solicitation_interval = 4
+net.ipv6.conf.enp46s0.router_solicitation_max_interval = 3600
+net.ipv6.conf.enp46s0.router_solicitations = -1
+net.ipv6.conf.enp46s0.rpl_seg_enabled = 0
+net.ipv6.conf.enp46s0.seg6_enabled = 0
+net.ipv6.conf.enp46s0.seg6_require_hmac = 0
+net.ipv6.conf.enp46s0.suppress_frag_ndisc = 1
+net.ipv6.conf.enp46s0.temp_prefered_lft = 86400
+net.ipv6.conf.enp46s0.temp_valid_lft = 604800
+net.ipv6.conf.enp46s0.use_oif_addrs_only = 0
+net.ipv6.conf.enp46s0.use_tempaddr = 0
+net.ipv6.conf.lo.accept_dad = -1
+net.ipv6.conf.lo.accept_ra = 1
+net.ipv6.conf.lo.accept_ra_defrtr = 1
+net.ipv6.conf.lo.accept_ra_from_local = 0
+net.ipv6.conf.lo.accept_ra_min_hop_limit = 1
+net.ipv6.conf.lo.accept_ra_min_lft = 0
+net.ipv6.conf.lo.accept_ra_mtu = 1
+net.ipv6.conf.lo.accept_ra_pinfo = 1
+net.ipv6.conf.lo.accept_ra_rt_info_max_plen = 0
+net.ipv6.conf.lo.accept_ra_rt_info_min_plen = 0
+net.ipv6.conf.lo.accept_ra_rtr_pref = 1
+net.ipv6.conf.lo.accept_redirects = 1
+net.ipv6.conf.lo.accept_source_route = 0
+net.ipv6.conf.lo.accept_untracked_na = 0
+net.ipv6.conf.lo.addr_gen_mode = 0
+net.ipv6.conf.lo.autoconf = 1
+net.ipv6.conf.lo.dad_transmits = 1
+net.ipv6.conf.lo.disable_ipv6 = 0
+net.ipv6.conf.lo.disable_policy = 0
+net.ipv6.conf.lo.drop_unicast_in_l2_multicast = 0
+net.ipv6.conf.lo.drop_unsolicited_na = 0
+net.ipv6.conf.lo.enhanced_dad = 1
+net.ipv6.conf.lo.force_mld_version = 0
+net.ipv6.conf.lo.force_tllao = 0
+net.ipv6.conf.lo.forwarding = 0
+net.ipv6.conf.lo.hop_limit = 64
+net.ipv6.conf.lo.ignore_routes_with_linkdown = 0
+net.ipv6.conf.lo.ioam6_enabled = 0
+net.ipv6.conf.lo.ioam6_id = 65535
+net.ipv6.conf.lo.ioam6_id_wide = 4294967295
+net.ipv6.conf.lo.keep_addr_on_down = 0
+net.ipv6.conf.lo.max_addresses = 16
+net.ipv6.conf.lo.max_desync_factor = 600
+net.ipv6.conf.lo.mc_forwarding = 0
+net.ipv6.conf.lo.mldv1_unsolicited_report_interval = 10000
+net.ipv6.conf.lo.mldv2_unsolicited_report_interval = 1000
+net.ipv6.conf.lo.mtu = 65536
+net.ipv6.conf.lo.ndisc_evict_nocarrier = 1
+net.ipv6.conf.lo.ndisc_notify = 0
+net.ipv6.conf.lo.ndisc_tclass = 0
+net.ipv6.conf.lo.proxy_ndp = 0
+net.ipv6.conf.lo.ra_defrtr_metric = 1024
+net.ipv6.conf.lo.regen_max_retry = 3
+net.ipv6.conf.lo.router_probe_interval = 60
+net.ipv6.conf.lo.router_solicitation_delay = 1
+net.ipv6.conf.lo.router_solicitation_interval = 4
+net.ipv6.conf.lo.router_solicitation_max_interval = 3600
+net.ipv6.conf.lo.router_solicitations = -1
+net.ipv6.conf.lo.rpl_seg_enabled = 0
+net.ipv6.conf.lo.seg6_enabled = 0
+net.ipv6.conf.lo.seg6_require_hmac = 0
+net.ipv6.conf.lo.suppress_frag_ndisc = 1
+net.ipv6.conf.lo.temp_prefered_lft = 86400
+net.ipv6.conf.lo.temp_valid_lft = 604800
+net.ipv6.conf.lo.use_oif_addrs_only = 0
+net.ipv6.conf.lo.use_tempaddr = -1
+net.ipv6.conf.veth0655c9f.accept_dad = 1
+net.ipv6.conf.veth0655c9f.accept_ra = 1
+net.ipv6.conf.veth0655c9f.accept_ra_defrtr = 1
+net.ipv6.conf.veth0655c9f.accept_ra_from_local = 0
+net.ipv6.conf.veth0655c9f.accept_ra_min_hop_limit = 1
+net.ipv6.conf.veth0655c9f.accept_ra_min_lft = 0
+net.ipv6.conf.veth0655c9f.accept_ra_mtu = 1
+net.ipv6.conf.veth0655c9f.accept_ra_pinfo = 1
+net.ipv6.conf.veth0655c9f.accept_ra_rt_info_max_plen = 0
+net.ipv6.conf.veth0655c9f.accept_ra_rt_info_min_plen = 0
+net.ipv6.conf.veth0655c9f.accept_ra_rtr_pref = 1
+net.ipv6.conf.veth0655c9f.accept_redirects = 1
+net.ipv6.conf.veth0655c9f.accept_source_route = 0
+net.ipv6.conf.veth0655c9f.accept_untracked_na = 0
+net.ipv6.conf.veth0655c9f.addr_gen_mode = 0
+net.ipv6.conf.veth0655c9f.autoconf = 1
+net.ipv6.conf.veth0655c9f.dad_transmits = 1
+net.ipv6.conf.veth0655c9f.disable_ipv6 = 0
+net.ipv6.conf.veth0655c9f.disable_policy = 0
+net.ipv6.conf.veth0655c9f.drop_unicast_in_l2_multicast = 0
+net.ipv6.conf.veth0655c9f.drop_unsolicited_na = 0
+net.ipv6.conf.veth0655c9f.enhanced_dad = 1
+net.ipv6.conf.veth0655c9f.force_mld_version = 0
+net.ipv6.conf.veth0655c9f.force_tllao = 0
+net.ipv6.conf.veth0655c9f.forwarding = 0
+net.ipv6.conf.veth0655c9f.hop_limit = 64
+net.ipv6.conf.veth0655c9f.ignore_routes_with_linkdown = 0
+net.ipv6.conf.veth0655c9f.ioam6_enabled = 0
+net.ipv6.conf.veth0655c9f.ioam6_id = 65535
+net.ipv6.conf.veth0655c9f.ioam6_id_wide = 4294967295
+net.ipv6.conf.veth0655c9f.keep_addr_on_down = 0
+net.ipv6.conf.veth0655c9f.max_addresses = 16
+net.ipv6.conf.veth0655c9f.max_desync_factor = 600
+net.ipv6.conf.veth0655c9f.mc_forwarding = 0
+net.ipv6.conf.veth0655c9f.mldv1_unsolicited_report_interval = 10000
+net.ipv6.conf.veth0655c9f.mldv2_unsolicited_report_interval = 1000
+net.ipv6.conf.veth0655c9f.mtu = 1500
+net.ipv6.conf.veth0655c9f.ndisc_evict_nocarrier = 1
+net.ipv6.conf.veth0655c9f.ndisc_notify = 0
+net.ipv6.conf.veth0655c9f.ndisc_tclass = 0
+net.ipv6.conf.veth0655c9f.proxy_ndp = 0
+net.ipv6.conf.veth0655c9f.ra_defrtr_metric = 1024
+net.ipv6.conf.veth0655c9f.regen_max_retry = 3
+net.ipv6.conf.veth0655c9f.router_probe_interval = 60
+net.ipv6.conf.veth0655c9f.router_solicitation_delay = 1
+net.ipv6.conf.veth0655c9f.router_solicitation_interval = 4
+net.ipv6.conf.veth0655c9f.router_solicitation_max_interval = 3600
+net.ipv6.conf.veth0655c9f.router_solicitations = -1
+net.ipv6.conf.veth0655c9f.rpl_seg_enabled = 0
+net.ipv6.conf.veth0655c9f.seg6_enabled = 0
+net.ipv6.conf.veth0655c9f.seg6_require_hmac = 0
+net.ipv6.conf.veth0655c9f.suppress_frag_ndisc = 1
+net.ipv6.conf.veth0655c9f.temp_prefered_lft = 86400
+net.ipv6.conf.veth0655c9f.temp_valid_lft = 604800
+net.ipv6.conf.veth0655c9f.use_oif_addrs_only = 0
+net.ipv6.conf.veth0655c9f.use_tempaddr = 2
+net.ipv6.conf.veth2655c84.accept_dad = 1
+net.ipv6.conf.veth2655c84.accept_ra = 1
+net.ipv6.conf.veth2655c84.accept_ra_defrtr = 1
+net.ipv6.conf.veth2655c84.accept_ra_from_local = 0
+net.ipv6.conf.veth2655c84.accept_ra_min_hop_limit = 1
+net.ipv6.conf.veth2655c84.accept_ra_min_lft = 0
+net.ipv6.conf.veth2655c84.accept_ra_mtu = 1
+net.ipv6.conf.veth2655c84.accept_ra_pinfo = 1
+net.ipv6.conf.veth2655c84.accept_ra_rt_info_max_plen = 0
+net.ipv6.conf.veth2655c84.accept_ra_rt_info_min_plen = 0
+net.ipv6.conf.veth2655c84.accept_ra_rtr_pref = 1
+net.ipv6.conf.veth2655c84.accept_redirects = 1
+net.ipv6.conf.veth2655c84.accept_source_route = 0
+net.ipv6.conf.veth2655c84.accept_untracked_na = 0
+net.ipv6.conf.veth2655c84.addr_gen_mode = 0
+net.ipv6.conf.veth2655c84.autoconf = 1
+net.ipv6.conf.veth2655c84.dad_transmits = 1
+net.ipv6.conf.veth2655c84.disable_ipv6 = 0
+net.ipv6.conf.veth2655c84.disable_policy = 0
+net.ipv6.conf.veth2655c84.drop_unicast_in_l2_multicast = 0
+net.ipv6.conf.veth2655c84.drop_unsolicited_na = 0
+net.ipv6.conf.veth2655c84.enhanced_dad = 1
+net.ipv6.conf.veth2655c84.force_mld_version = 0
+net.ipv6.conf.veth2655c84.force_tllao = 0
+net.ipv6.conf.veth2655c84.forwarding = 0
+net.ipv6.conf.veth2655c84.hop_limit = 64
+net.ipv6.conf.veth2655c84.ignore_routes_with_linkdown = 0
+net.ipv6.conf.veth2655c84.ioam6_enabled = 0
+net.ipv6.conf.veth2655c84.ioam6_id = 65535
+net.ipv6.conf.veth2655c84.ioam6_id_wide = 4294967295
+net.ipv6.conf.veth2655c84.keep_addr_on_down = 0
+net.ipv6.conf.veth2655c84.max_addresses = 16
+net.ipv6.conf.veth2655c84.max_desync_factor = 600
+net.ipv6.conf.veth2655c84.mc_forwarding = 0
+net.ipv6.conf.veth2655c84.mldv1_unsolicited_report_interval = 10000
+net.ipv6.conf.veth2655c84.mldv2_unsolicited_report_interval = 1000
+net.ipv6.conf.veth2655c84.mtu = 1500
+net.ipv6.conf.veth2655c84.ndisc_evict_nocarrier = 1
+net.ipv6.conf.veth2655c84.ndisc_notify = 0
+net.ipv6.conf.veth2655c84.ndisc_tclass = 0
+net.ipv6.conf.veth2655c84.proxy_ndp = 0
+net.ipv6.conf.veth2655c84.ra_defrtr_metric = 1024
+net.ipv6.conf.veth2655c84.regen_max_retry = 3
+net.ipv6.conf.veth2655c84.router_probe_interval = 60
+net.ipv6.conf.veth2655c84.router_solicitation_delay = 1
+net.ipv6.conf.veth2655c84.router_solicitation_interval = 4
+net.ipv6.conf.veth2655c84.router_solicitation_max_interval = 3600
+net.ipv6.conf.veth2655c84.router_solicitations = -1
+net.ipv6.conf.veth2655c84.rpl_seg_enabled = 0
+net.ipv6.conf.veth2655c84.seg6_enabled = 0
+net.ipv6.conf.veth2655c84.seg6_require_hmac = 0
+net.ipv6.conf.veth2655c84.suppress_frag_ndisc = 1
+net.ipv6.conf.veth2655c84.temp_prefered_lft = 86400
+net.ipv6.conf.veth2655c84.temp_valid_lft = 604800
+net.ipv6.conf.veth2655c84.use_oif_addrs_only = 0
+net.ipv6.conf.veth2655c84.use_tempaddr = 2
+net.ipv6.conf.vethd189986.accept_dad = 1
+net.ipv6.conf.vethd189986.accept_ra = 1
+net.ipv6.conf.vethd189986.accept_ra_defrtr = 1
+net.ipv6.conf.vethd189986.accept_ra_from_local = 0
+net.ipv6.conf.vethd189986.accept_ra_min_hop_limit = 1
+net.ipv6.conf.vethd189986.accept_ra_min_lft = 0
+net.ipv6.conf.vethd189986.accept_ra_mtu = 1
+net.ipv6.conf.vethd189986.accept_ra_pinfo = 1
+net.ipv6.conf.vethd189986.accept_ra_rt_info_max_plen = 0
+net.ipv6.conf.vethd189986.accept_ra_rt_info_min_plen = 0
+net.ipv6.conf.vethd189986.accept_ra_rtr_pref = 1
+net.ipv6.conf.vethd189986.accept_redirects = 1
+net.ipv6.conf.vethd189986.accept_source_route = 0
+net.ipv6.conf.vethd189986.accept_untracked_na = 0
+net.ipv6.conf.vethd189986.addr_gen_mode = 0
+net.ipv6.conf.vethd189986.autoconf = 1
+net.ipv6.conf.vethd189986.dad_transmits = 1
+net.ipv6.conf.vethd189986.disable_ipv6 = 0
+net.ipv6.conf.vethd189986.disable_policy = 0
+net.ipv6.conf.vethd189986.drop_unicast_in_l2_multicast = 0
+net.ipv6.conf.vethd189986.drop_unsolicited_na = 0
+net.ipv6.conf.vethd189986.enhanced_dad = 1
+net.ipv6.conf.vethd189986.force_mld_version = 0
+net.ipv6.conf.vethd189986.force_tllao = 0
+net.ipv6.conf.vethd189986.forwarding = 0
+net.ipv6.conf.vethd189986.hop_limit = 64
+net.ipv6.conf.vethd189986.ignore_routes_with_linkdown = 0
+net.ipv6.conf.vethd189986.ioam6_enabled = 0
+net.ipv6.conf.vethd189986.ioam6_id = 65535
+net.ipv6.conf.vethd189986.ioam6_id_wide = 4294967295
+net.ipv6.conf.vethd189986.keep_addr_on_down = 0
+net.ipv6.conf.vethd189986.max_addresses = 16
+net.ipv6.conf.vethd189986.max_desync_factor = 600
+net.ipv6.conf.vethd189986.mc_forwarding = 0
+net.ipv6.conf.vethd189986.mldv1_unsolicited_report_interval = 10000
+net.ipv6.conf.vethd189986.mldv2_unsolicited_report_interval = 1000
+net.ipv6.conf.vethd189986.mtu = 1500
+net.ipv6.conf.vethd189986.ndisc_evict_nocarrier = 1
+net.ipv6.conf.vethd189986.ndisc_notify = 0
+net.ipv6.conf.vethd189986.ndisc_tclass = 0
+net.ipv6.conf.vethd189986.proxy_ndp = 0
+net.ipv6.conf.vethd189986.ra_defrtr_metric = 1024
+net.ipv6.conf.vethd189986.regen_max_retry = 3
+net.ipv6.conf.vethd189986.router_probe_interval = 60
+net.ipv6.conf.vethd189986.router_solicitation_delay = 1
+net.ipv6.conf.vethd189986.router_solicitation_interval = 4
+net.ipv6.conf.vethd189986.router_solicitation_max_interval = 3600
+net.ipv6.conf.vethd189986.router_solicitations = -1
+net.ipv6.conf.vethd189986.rpl_seg_enabled = 0
+net.ipv6.conf.vethd189986.seg6_enabled = 0
+net.ipv6.conf.vethd189986.seg6_require_hmac = 0
+net.ipv6.conf.vethd189986.suppress_frag_ndisc = 1
+net.ipv6.conf.vethd189986.temp_prefered_lft = 86400
+net.ipv6.conf.vethd189986.temp_valid_lft = 604800
+net.ipv6.conf.vethd189986.use_oif_addrs_only = 0
+net.ipv6.conf.vethd189986.use_tempaddr = 2
+net.ipv6.conf.wg0.accept_dad = -1
+net.ipv6.conf.wg0.accept_ra = 1
+net.ipv6.conf.wg0.accept_ra_defrtr = 1
+net.ipv6.conf.wg0.accept_ra_from_local = 0
+net.ipv6.conf.wg0.accept_ra_min_hop_limit = 1
+net.ipv6.conf.wg0.accept_ra_min_lft = 0
+net.ipv6.conf.wg0.accept_ra_mtu = 1
+net.ipv6.conf.wg0.accept_ra_pinfo = 1
+net.ipv6.conf.wg0.accept_ra_rt_info_max_plen = 0
+net.ipv6.conf.wg0.accept_ra_rt_info_min_plen = 0
+net.ipv6.conf.wg0.accept_ra_rtr_pref = 1
+net.ipv6.conf.wg0.accept_redirects = 1
+net.ipv6.conf.wg0.accept_source_route = 0
+net.ipv6.conf.wg0.accept_untracked_na = 0
+net.ipv6.conf.wg0.addr_gen_mode = 1
+net.ipv6.conf.wg0.autoconf = 1
+net.ipv6.conf.wg0.dad_transmits = 1
+net.ipv6.conf.wg0.disable_ipv6 = 0
+net.ipv6.conf.wg0.disable_policy = 0
+net.ipv6.conf.wg0.drop_unicast_in_l2_multicast = 0
+net.ipv6.conf.wg0.drop_unsolicited_na = 0
+net.ipv6.conf.wg0.enhanced_dad = 1
+net.ipv6.conf.wg0.force_mld_version = 0
+net.ipv6.conf.wg0.force_tllao = 0
+net.ipv6.conf.wg0.forwarding = 0
+net.ipv6.conf.wg0.hop_limit = 64
+net.ipv6.conf.wg0.ignore_routes_with_linkdown = 0
+net.ipv6.conf.wg0.ioam6_enabled = 0
+net.ipv6.conf.wg0.ioam6_id = 65535
+net.ipv6.conf.wg0.ioam6_id_wide = 4294967295
+net.ipv6.conf.wg0.keep_addr_on_down = 0
+net.ipv6.conf.wg0.max_addresses = 16
+net.ipv6.conf.wg0.max_desync_factor = 600
+net.ipv6.conf.wg0.mc_forwarding = 0
+net.ipv6.conf.wg0.mldv1_unsolicited_report_interval = 10000
+net.ipv6.conf.wg0.mldv2_unsolicited_report_interval = 1000
+net.ipv6.conf.wg0.mtu = 1420
+net.ipv6.conf.wg0.ndisc_evict_nocarrier = 1
+net.ipv6.conf.wg0.ndisc_notify = 0
+net.ipv6.conf.wg0.ndisc_tclass = 0
+net.ipv6.conf.wg0.proxy_ndp = 0
+net.ipv6.conf.wg0.ra_defrtr_metric = 1024
+net.ipv6.conf.wg0.regen_max_retry = 3
+net.ipv6.conf.wg0.router_probe_interval = 60
+net.ipv6.conf.wg0.router_solicitation_delay = 1
+net.ipv6.conf.wg0.router_solicitation_interval = 4
+net.ipv6.conf.wg0.router_solicitation_max_interval = 3600
+net.ipv6.conf.wg0.router_solicitations = -1
+net.ipv6.conf.wg0.rpl_seg_enabled = 0
+net.ipv6.conf.wg0.seg6_enabled = 0
+net.ipv6.conf.wg0.seg6_require_hmac = 0
+net.ipv6.conf.wg0.suppress_frag_ndisc = 1
+net.ipv6.conf.wg0.temp_prefered_lft = 86400
+net.ipv6.conf.wg0.temp_valid_lft = 604800
+net.ipv6.conf.wg0.use_oif_addrs_only = 0
+net.ipv6.conf.wg0.use_tempaddr = -1
+net.ipv6.conf.wlp0s20f3.accept_dad = 1
+net.ipv6.conf.wlp0s20f3.accept_ra = 0
+net.ipv6.conf.wlp0s20f3.accept_ra_defrtr = 1
+net.ipv6.conf.wlp0s20f3.accept_ra_from_local = 0
+net.ipv6.conf.wlp0s20f3.accept_ra_min_hop_limit = 1
+net.ipv6.conf.wlp0s20f3.accept_ra_min_lft = 0
+net.ipv6.conf.wlp0s20f3.accept_ra_mtu = 1
+net.ipv6.conf.wlp0s20f3.accept_ra_pinfo = 1
+net.ipv6.conf.wlp0s20f3.accept_ra_rt_info_max_plen = 0
+net.ipv6.conf.wlp0s20f3.accept_ra_rt_info_min_plen = 0
+net.ipv6.conf.wlp0s20f3.accept_ra_rtr_pref = 1
+net.ipv6.conf.wlp0s20f3.accept_redirects = 1
+net.ipv6.conf.wlp0s20f3.accept_source_route = 0
+net.ipv6.conf.wlp0s20f3.accept_untracked_na = 0
+net.ipv6.conf.wlp0s20f3.addr_gen_mode = 1
+net.ipv6.conf.wlp0s20f3.autoconf = 1
+net.ipv6.conf.wlp0s20f3.dad_transmits = 1
+net.ipv6.conf.wlp0s20f3.disable_ipv6 = 0
+net.ipv6.conf.wlp0s20f3.disable_policy = 0
+net.ipv6.conf.wlp0s20f3.drop_unicast_in_l2_multicast = 0
+net.ipv6.conf.wlp0s20f3.drop_unsolicited_na = 0
+net.ipv6.conf.wlp0s20f3.enhanced_dad = 1
+net.ipv6.conf.wlp0s20f3.force_mld_version = 0
+net.ipv6.conf.wlp0s20f3.force_tllao = 0
+net.ipv6.conf.wlp0s20f3.forwarding = 0
+net.ipv6.conf.wlp0s20f3.hop_limit = 64
+net.ipv6.conf.wlp0s20f3.ignore_routes_with_linkdown = 0
+net.ipv6.conf.wlp0s20f3.ioam6_enabled = 0
+net.ipv6.conf.wlp0s20f3.ioam6_id = 65535
+net.ipv6.conf.wlp0s20f3.ioam6_id_wide = 4294967295
+net.ipv6.conf.wlp0s20f3.keep_addr_on_down = 0
+net.ipv6.conf.wlp0s20f3.max_addresses = 16
+net.ipv6.conf.wlp0s20f3.max_desync_factor = 600
+net.ipv6.conf.wlp0s20f3.mc_forwarding = 0
+net.ipv6.conf.wlp0s20f3.mldv1_unsolicited_report_interval = 10000
+net.ipv6.conf.wlp0s20f3.mldv2_unsolicited_report_interval = 1000
+net.ipv6.conf.wlp0s20f3.mtu = 1500
+net.ipv6.conf.wlp0s20f3.ndisc_evict_nocarrier = 1
+net.ipv6.conf.wlp0s20f3.ndisc_notify = 0
+net.ipv6.conf.wlp0s20f3.ndisc_tclass = 0
+net.ipv6.conf.wlp0s20f3.proxy_ndp = 0
+net.ipv6.conf.wlp0s20f3.ra_defrtr_metric = 1024
+net.ipv6.conf.wlp0s20f3.regen_max_retry = 3
+net.ipv6.conf.wlp0s20f3.router_probe_interval = 60
+net.ipv6.conf.wlp0s20f3.router_solicitation_delay = 1
+net.ipv6.conf.wlp0s20f3.router_solicitation_interval = 4
+net.ipv6.conf.wlp0s20f3.router_solicitation_max_interval = 3600
+net.ipv6.conf.wlp0s20f3.router_solicitations = -1
+net.ipv6.conf.wlp0s20f3.rpl_seg_enabled = 0
+net.ipv6.conf.wlp0s20f3.seg6_enabled = 0
+net.ipv6.conf.wlp0s20f3.seg6_require_hmac = 0
+net.ipv6.conf.wlp0s20f3.suppress_frag_ndisc = 1
+net.ipv6.conf.wlp0s20f3.temp_prefered_lft = 86400
+net.ipv6.conf.wlp0s20f3.temp_valid_lft = 604800
+net.ipv6.conf.wlp0s20f3.use_oif_addrs_only = 0
+net.ipv6.conf.wlp0s20f3.use_tempaddr = 2
+net.ipv6.fib_multipath_hash_fields = 7
+net.ipv6.fib_multipath_hash_policy = 0
+net.ipv6.fib_notify_on_flag_change = 0
+net.ipv6.flowlabel_consistency = 1
+net.ipv6.flowlabel_reflect = 0
+net.ipv6.flowlabel_state_ranges = 0
+net.ipv6.fwmark_reflect = 0
+net.ipv6.icmp.echo_ignore_all = 0
+net.ipv6.icmp.echo_ignore_anycast = 0
+net.ipv6.icmp.echo_ignore_multicast = 0
+net.ipv6.icmp.error_anycast_as_unicast = 0
+net.ipv6.icmp.ratelimit = 1000
+net.ipv6.icmp.ratemask = 0-1,3-127
+net.ipv6.idgen_delay = 1
+net.ipv6.idgen_retries = 3
+net.ipv6.ioam6_id = 16777215
+net.ipv6.ioam6_id_wide = 72057594037927935
+net.ipv6.ip6frag_high_thresh = 4194304
+net.ipv6.ip6frag_low_thresh = 3145728
+net.ipv6.ip6frag_secret_interval = 0
+net.ipv6.ip6frag_time = 60
+net.ipv6.ip_nonlocal_bind = 0
+net.ipv6.max_dst_opts_length = 2147483647
+net.ipv6.max_dst_opts_number = 8
+net.ipv6.max_hbh_length = 2147483647
+net.ipv6.max_hbh_opts_number = 8
+net.ipv6.mld_max_msf = 64
+net.ipv6.mld_qrv = 2
+net.ipv6.neigh.br-79118f7d5a92.anycast_delay = 100
+net.ipv6.neigh.br-79118f7d5a92.app_solicit = 0
+net.ipv6.neigh.br-79118f7d5a92.base_reachable_time_ms = 30000
+net.ipv6.neigh.br-79118f7d5a92.delay_first_probe_time = 5
+net.ipv6.neigh.br-79118f7d5a92.gc_stale_time = 60
+net.ipv6.neigh.br-79118f7d5a92.interval_probe_time_ms = 5000
+net.ipv6.neigh.br-79118f7d5a92.locktime = 0
+net.ipv6.neigh.br-79118f7d5a92.mcast_resolicit = 0
+net.ipv6.neigh.br-79118f7d5a92.mcast_solicit = 3
+net.ipv6.neigh.br-79118f7d5a92.proxy_delay = 80
+net.ipv6.neigh.br-79118f7d5a92.proxy_qlen = 64
+net.ipv6.neigh.br-79118f7d5a92.retrans_time_ms = 1000
+net.ipv6.neigh.br-79118f7d5a92.ucast_solicit = 3
+net.ipv6.neigh.br-79118f7d5a92.unres_qlen = 101
+net.ipv6.neigh.br-79118f7d5a92.unres_qlen_bytes = 212992
+net.ipv6.neigh.br-a7c7f1777df1.anycast_delay = 100
+net.ipv6.neigh.br-a7c7f1777df1.app_solicit = 0
+net.ipv6.neigh.br-a7c7f1777df1.base_reachable_time_ms = 30000
+net.ipv6.neigh.br-a7c7f1777df1.delay_first_probe_time = 5
+net.ipv6.neigh.br-a7c7f1777df1.gc_stale_time = 60
+net.ipv6.neigh.br-a7c7f1777df1.interval_probe_time_ms = 5000
+net.ipv6.neigh.br-a7c7f1777df1.locktime = 0
+net.ipv6.neigh.br-a7c7f1777df1.mcast_resolicit = 0
+net.ipv6.neigh.br-a7c7f1777df1.mcast_solicit = 3
+net.ipv6.neigh.br-a7c7f1777df1.proxy_delay = 80
+net.ipv6.neigh.br-a7c7f1777df1.proxy_qlen = 64
+net.ipv6.neigh.br-a7c7f1777df1.retrans_time_ms = 1000
+net.ipv6.neigh.br-a7c7f1777df1.ucast_solicit = 3
+net.ipv6.neigh.br-a7c7f1777df1.unres_qlen = 101
+net.ipv6.neigh.br-a7c7f1777df1.unres_qlen_bytes = 212992
+net.ipv6.neigh.default.anycast_delay = 100
+net.ipv6.neigh.default.app_solicit = 0
+net.ipv6.neigh.default.base_reachable_time_ms = 30000
+net.ipv6.neigh.default.delay_first_probe_time = 5
+net.ipv6.neigh.default.gc_interval = 30
+net.ipv6.neigh.default.gc_stale_time = 60
+net.ipv6.neigh.default.gc_thresh1 = 128
+net.ipv6.neigh.default.gc_thresh2 = 512
+net.ipv6.neigh.default.gc_thresh3 = 1024
+net.ipv6.neigh.default.interval_probe_time_ms = 5000
+net.ipv6.neigh.default.locktime = 0
+net.ipv6.neigh.default.mcast_resolicit = 0
+net.ipv6.neigh.default.mcast_solicit = 3
+net.ipv6.neigh.default.proxy_delay = 80
+net.ipv6.neigh.default.proxy_qlen = 64
+net.ipv6.neigh.default.retrans_time_ms = 1000
+net.ipv6.neigh.default.ucast_solicit = 3
+net.ipv6.neigh.default.unres_qlen = 101
+net.ipv6.neigh.default.unres_qlen_bytes = 212992
+net.ipv6.neigh.docker0.anycast_delay = 100
+net.ipv6.neigh.docker0.app_solicit = 0
+net.ipv6.neigh.docker0.base_reachable_time_ms = 30000
+net.ipv6.neigh.docker0.delay_first_probe_time = 5
+net.ipv6.neigh.docker0.gc_stale_time = 60
+net.ipv6.neigh.docker0.interval_probe_time_ms = 5000
+net.ipv6.neigh.docker0.locktime = 0
+net.ipv6.neigh.docker0.mcast_resolicit = 0
+net.ipv6.neigh.docker0.mcast_solicit = 3
+net.ipv6.neigh.docker0.proxy_delay = 80
+net.ipv6.neigh.docker0.proxy_qlen = 64
+net.ipv6.neigh.docker0.retrans_time_ms = 1000
+net.ipv6.neigh.docker0.ucast_solicit = 3
+net.ipv6.neigh.docker0.unres_qlen = 101
+net.ipv6.neigh.docker0.unres_qlen_bytes = 212992
+net.ipv6.neigh.enp46s0.anycast_delay = 100
+net.ipv6.neigh.enp46s0.app_solicit = 0
+net.ipv6.neigh.enp46s0.base_reachable_time_ms = 30000
+net.ipv6.neigh.enp46s0.delay_first_probe_time = 5
+net.ipv6.neigh.enp46s0.gc_stale_time = 60
+net.ipv6.neigh.enp46s0.interval_probe_time_ms = 5000
+net.ipv6.neigh.enp46s0.locktime = 0
+net.ipv6.neigh.enp46s0.mcast_resolicit = 0
+net.ipv6.neigh.enp46s0.mcast_solicit = 3
+net.ipv6.neigh.enp46s0.proxy_delay = 80
+net.ipv6.neigh.enp46s0.proxy_qlen = 64
+net.ipv6.neigh.enp46s0.retrans_time_ms = 1000
+net.ipv6.neigh.enp46s0.ucast_solicit = 3
+net.ipv6.neigh.enp46s0.unres_qlen = 101
+net.ipv6.neigh.enp46s0.unres_qlen_bytes = 212992
+net.ipv6.neigh.lo.anycast_delay = 100
+net.ipv6.neigh.lo.app_solicit = 0
+net.ipv6.neigh.lo.base_reachable_time_ms = 30000
+net.ipv6.neigh.lo.delay_first_probe_time = 5
+net.ipv6.neigh.lo.gc_stale_time = 60
+net.ipv6.neigh.lo.interval_probe_time_ms = 5000
+net.ipv6.neigh.lo.locktime = 0
+net.ipv6.neigh.lo.mcast_resolicit = 0
+net.ipv6.neigh.lo.mcast_solicit = 3
+net.ipv6.neigh.lo.proxy_delay = 80
+net.ipv6.neigh.lo.proxy_qlen = 64
+net.ipv6.neigh.lo.retrans_time_ms = 1000
+net.ipv6.neigh.lo.ucast_solicit = 3
+net.ipv6.neigh.lo.unres_qlen = 101
+net.ipv6.neigh.lo.unres_qlen_bytes = 212992
+net.ipv6.neigh.veth0655c9f.anycast_delay = 100
+net.ipv6.neigh.veth0655c9f.app_solicit = 0
+net.ipv6.neigh.veth0655c9f.base_reachable_time_ms = 30000
+net.ipv6.neigh.veth0655c9f.delay_first_probe_time = 5
+net.ipv6.neigh.veth0655c9f.gc_stale_time = 60
+net.ipv6.neigh.veth0655c9f.interval_probe_time_ms = 5000
+net.ipv6.neigh.veth0655c9f.locktime = 0
+net.ipv6.neigh.veth0655c9f.mcast_resolicit = 0
+net.ipv6.neigh.veth0655c9f.mcast_solicit = 3
+net.ipv6.neigh.veth0655c9f.proxy_delay = 80
+net.ipv6.neigh.veth0655c9f.proxy_qlen = 64
+net.ipv6.neigh.veth0655c9f.retrans_time_ms = 1000
+net.ipv6.neigh.veth0655c9f.ucast_solicit = 3
+net.ipv6.neigh.veth0655c9f.unres_qlen = 101
+net.ipv6.neigh.veth0655c9f.unres_qlen_bytes = 212992
+net.ipv6.neigh.veth2655c84.anycast_delay = 100
+net.ipv6.neigh.veth2655c84.app_solicit = 0
+net.ipv6.neigh.veth2655c84.base_reachable_time_ms = 30000
+net.ipv6.neigh.veth2655c84.delay_first_probe_time = 5
+net.ipv6.neigh.veth2655c84.gc_stale_time = 60
+net.ipv6.neigh.veth2655c84.interval_probe_time_ms = 5000
+net.ipv6.neigh.veth2655c84.locktime = 0
+net.ipv6.neigh.veth2655c84.mcast_resolicit = 0
+net.ipv6.neigh.veth2655c84.mcast_solicit = 3
+net.ipv6.neigh.veth2655c84.proxy_delay = 80
+net.ipv6.neigh.veth2655c84.proxy_qlen = 64
+net.ipv6.neigh.veth2655c84.retrans_time_ms = 1000
+net.ipv6.neigh.veth2655c84.ucast_solicit = 3
+net.ipv6.neigh.veth2655c84.unres_qlen = 101
+net.ipv6.neigh.veth2655c84.unres_qlen_bytes = 212992
+net.ipv6.neigh.vethd189986.anycast_delay = 100
+net.ipv6.neigh.vethd189986.app_solicit = 0
+net.ipv6.neigh.vethd189986.base_reachable_time_ms = 30000
+net.ipv6.neigh.vethd189986.delay_first_probe_time = 5
+net.ipv6.neigh.vethd189986.gc_stale_time = 60
+net.ipv6.neigh.vethd189986.interval_probe_time_ms = 5000
+net.ipv6.neigh.vethd189986.locktime = 0
+net.ipv6.neigh.vethd189986.mcast_resolicit = 0
+net.ipv6.neigh.vethd189986.mcast_solicit = 3
+net.ipv6.neigh.vethd189986.proxy_delay = 80
+net.ipv6.neigh.vethd189986.proxy_qlen = 64
+net.ipv6.neigh.vethd189986.retrans_time_ms = 1000
+net.ipv6.neigh.vethd189986.ucast_solicit = 3
+net.ipv6.neigh.vethd189986.unres_qlen = 101
+net.ipv6.neigh.vethd189986.unres_qlen_bytes = 212992
+net.ipv6.neigh.wg0.anycast_delay = 100
+net.ipv6.neigh.wg0.app_solicit = 0
+net.ipv6.neigh.wg0.base_reachable_time_ms = 30000
+net.ipv6.neigh.wg0.delay_first_probe_time = 5
+net.ipv6.neigh.wg0.gc_stale_time = 60
+net.ipv6.neigh.wg0.interval_probe_time_ms = 5000
+net.ipv6.neigh.wg0.locktime = 0
+net.ipv6.neigh.wg0.mcast_resolicit = 0
+net.ipv6.neigh.wg0.mcast_solicit = 3
+net.ipv6.neigh.wg0.proxy_delay = 80
+net.ipv6.neigh.wg0.proxy_qlen = 64
+net.ipv6.neigh.wg0.retrans_time_ms = 1000
+net.ipv6.neigh.wg0.ucast_solicit = 3
+net.ipv6.neigh.wg0.unres_qlen = 101
+net.ipv6.neigh.wg0.unres_qlen_bytes = 212992
+net.ipv6.neigh.wlp0s20f3.anycast_delay = 100
+net.ipv6.neigh.wlp0s20f3.app_solicit = 0
+net.ipv6.neigh.wlp0s20f3.base_reachable_time_ms = 30000
+net.ipv6.neigh.wlp0s20f3.delay_first_probe_time = 5
+net.ipv6.neigh.wlp0s20f3.gc_stale_time = 60
+net.ipv6.neigh.wlp0s20f3.interval_probe_time_ms = 5000
+net.ipv6.neigh.wlp0s20f3.locktime = 0
+net.ipv6.neigh.wlp0s20f3.mcast_resolicit = 0
+net.ipv6.neigh.wlp0s20f3.mcast_solicit = 3
+net.ipv6.neigh.wlp0s20f3.proxy_delay = 80
+net.ipv6.neigh.wlp0s20f3.proxy_qlen = 64
+net.ipv6.neigh.wlp0s20f3.retrans_time_ms = 1000
+net.ipv6.neigh.wlp0s20f3.ucast_solicit = 3
+net.ipv6.neigh.wlp0s20f3.unres_qlen = 101
+net.ipv6.neigh.wlp0s20f3.unres_qlen_bytes = 212992
+net.ipv6.route.gc_elasticity = 9
+net.ipv6.route.gc_interval = 30
+net.ipv6.route.gc_min_interval = 0
+net.ipv6.route.gc_min_interval_ms = 500
+net.ipv6.route.gc_thresh = 1024
+net.ipv6.route.gc_timeout = 60
+net.ipv6.route.max_size = 2147483647
+net.ipv6.route.min_adv_mss = 1220
+net.ipv6.route.mtu_expires = 600
+net.ipv6.route.skip_notify_on_dev_down = 0
+net.ipv6.seg6_flowlabel = 0
+net.ipv6.xfrm6_gc_thresh = 32768
+net.mptcp.add_addr_timeout = 120
+net.mptcp.allow_join_initial_addr_port = 1
+net.mptcp.checksum_enabled = 0
+net.mptcp.enabled = 1
+net.mptcp.pm_type = 0
+net.mptcp.stale_loss_cnt = 4
+net.netfilter.nf_conntrack_acct = 0
+net.netfilter.nf_conntrack_buckets = 262144
+net.netfilter.nf_conntrack_checksum = 1
+net.netfilter.nf_conntrack_count = 1421
+net.netfilter.nf_conntrack_dccp_loose = 1
+net.netfilter.nf_conntrack_dccp_timeout_closereq = 64
+net.netfilter.nf_conntrack_dccp_timeout_closing = 64
+net.netfilter.nf_conntrack_dccp_timeout_open = 43200
+net.netfilter.nf_conntrack_dccp_timeout_partopen = 480
+net.netfilter.nf_conntrack_dccp_timeout_request = 240
+net.netfilter.nf_conntrack_dccp_timeout_respond = 480
+net.netfilter.nf_conntrack_dccp_timeout_timewait = 240
+net.netfilter.nf_conntrack_events = 2
+net.netfilter.nf_conntrack_expect_max = 4096
+net.netfilter.nf_conntrack_frag6_high_thresh = 4194304
+net.netfilter.nf_conntrack_frag6_low_thresh = 3145728
+net.netfilter.nf_conntrack_frag6_timeout = 60
+net.netfilter.nf_conntrack_generic_timeout = 600
+net.netfilter.nf_conntrack_gre_timeout = 30
+net.netfilter.nf_conntrack_gre_timeout_stream = 180
+net.netfilter.nf_conntrack_icmp_timeout = 30
+net.netfilter.nf_conntrack_icmpv6_timeout = 30
+net.netfilter.nf_conntrack_log_invalid = 0
+net.netfilter.nf_conntrack_max = 262144
+net.netfilter.nf_conntrack_sctp_timeout_closed = 10
+net.netfilter.nf_conntrack_sctp_timeout_cookie_echoed = 3
+net.netfilter.nf_conntrack_sctp_timeout_cookie_wait = 3
+net.netfilter.nf_conntrack_sctp_timeout_established = 210
+net.netfilter.nf_conntrack_sctp_timeout_heartbeat_sent = 30
+net.netfilter.nf_conntrack_sctp_timeout_shutdown_ack_sent = 3
+net.netfilter.nf_conntrack_sctp_timeout_shutdown_recd = 3
+net.netfilter.nf_conntrack_sctp_timeout_shutdown_sent = 3
+net.netfilter.nf_conntrack_tcp_be_liberal = 0
+net.netfilter.nf_conntrack_tcp_ignore_invalid_rst = 0
+net.netfilter.nf_conntrack_tcp_loose = 1
+net.netfilter.nf_conntrack_tcp_max_retrans = 3
+net.netfilter.nf_conntrack_tcp_timeout_close = 10
+net.netfilter.nf_conntrack_tcp_timeout_close_wait = 60
+net.netfilter.nf_conntrack_tcp_timeout_established = 432000
+net.netfilter.nf_conntrack_tcp_timeout_fin_wait = 120
+net.netfilter.nf_conntrack_tcp_timeout_last_ack = 30
+net.netfilter.nf_conntrack_tcp_timeout_max_retrans = 300
+net.netfilter.nf_conntrack_tcp_timeout_syn_recv = 60
+net.netfilter.nf_conntrack_tcp_timeout_syn_sent = 120
+net.netfilter.nf_conntrack_tcp_timeout_time_wait = 120
+net.netfilter.nf_conntrack_tcp_timeout_unacknowledged = 300
+net.netfilter.nf_conntrack_timestamp = 0
+net.netfilter.nf_conntrack_udp_timeout = 30
+net.netfilter.nf_conntrack_udp_timeout_stream = 120
+net.netfilter.nf_flowtable_tcp_timeout = 30
+net.netfilter.nf_flowtable_udp_timeout = 30
+net.netfilter.nf_hooks_lwtunnel = 0
+net.netfilter.nf_log.0 = NONE
+net.netfilter.nf_log.1 = NONE
+net.netfilter.nf_log.10 = NONE
+net.netfilter.nf_log.2 = NONE
+net.netfilter.nf_log.3 = NONE
+net.netfilter.nf_log.4 = NONE
+net.netfilter.nf_log.5 = NONE
+net.netfilter.nf_log.6 = NONE
+net.netfilter.nf_log.7 = NONE
+net.netfilter.nf_log.8 = NONE
+net.netfilter.nf_log.9 = NONE
+net.netfilter.nf_log_all_netns = 0
+net.nf_conntrack_max = 262144
+net.unix.max_dgram_qlen = 512
+user.max_cgroup_namespaces = 256032
+user.max_fanotify_groups = 128
+user.max_fanotify_marks = 530989
+user.max_inotify_instances = 128
+user.max_inotify_watches = 65536
+user.max_ipc_namespaces = 256032
+user.max_mnt_namespaces = 256032
+user.max_net_namespaces = 256032
+user.max_pid_namespaces = 256032
+user.max_time_namespaces = 256032
+user.max_user_namespaces = 256032
+user.max_uts_namespaces = 256032
+vm.admin_reserve_kbytes = 8192
+vm.compact_unevictable_allowed = 1
+vm.compaction_proactiveness = 20
+vm.dirty_background_bytes = 0
+vm.dirty_background_ratio = 10
+vm.dirty_bytes = 0
+vm.dirty_expire_centisecs = 3000
+vm.dirty_ratio = 20
+vm.dirty_writeback_centisecs = 500
+vm.dirtytime_expire_seconds = 43200
+vm.extfrag_threshold = 500
+vm.hugetlb_optimize_vmemmap = 0
+vm.hugetlb_shm_group = 0
+vm.laptop_mode = 0
+vm.legacy_va_layout = 0
+vm.lowmem_reserve_ratio = 256	256	32	0	0
+vm.max_map_count = 65530
+vm.memfd_noexec = 0
+vm.memory_failure_early_kill = 0
+vm.memory_failure_recovery = 1
+vm.min_free_kbytes = 32368
+vm.min_slab_ratio = 5
+vm.min_unmapped_ratio = 1
+vm.mmap_min_addr = 65536
+vm.nr_hugepages = 0
+vm.nr_hugepages_mempolicy = 0
+vm.nr_overcommit_hugepages = 0
+vm.numa_stat = 1
+vm.numa_zonelist_order = Node
+vm.oom_dump_tasks = 1
+vm.oom_kill_allocating_task = 0
+vm.overcommit_kbytes = 0
+vm.overcommit_memory = 0
+vm.overcommit_ratio = 50
+vm.page-cluster = 3
+vm.page_lock_unfairness = 5
+vm.panic_on_oom = 0
+vm.percpu_pagelist_high_fraction = 0
+vm.stat_interval = 1
+vm.swappiness = 60
+vm.unprivileged_userfaultfd = 0
+vm.user_reserve_kbytes = 131072
+vm.vfs_cache_pressure = 100
+vm.watermark_boost_factor = 15000
+vm.watermark_scale_factor = 10
+vm.zone_reclaim_mode = 0
diff --git a/t/pt-summary/samples/Linux/008/transparent_hugepage b/t/pt-summary/samples/Linux/008/transparent_hugepage
new file mode 100644
index 000000000..f78f78fc3
--- /dev/null
+++ b/t/pt-summary/samples/Linux/008/transparent_hugepage
@@ -0,0 +1 @@
+always madvise [never]
diff --git a/t/pt-summary/samples/Linux/008/uptime b/t/pt-summary/samples/Linux/008/uptime
new file mode 100644
index 000000000..165e3f70b
--- /dev/null
+++ b/t/pt-summary/samples/Linux/008/uptime
@@ -0,0 +1 @@
+ 12:49:32 up 95 days,  5:41,  1 user,  load average: 7,27, 6,88, 6,86
diff --git a/t/pt-summary/samples/Linux/008/vmstat b/t/pt-summary/samples/Linux/008/vmstat
new file mode 100644
index 000000000..a8760f762
--- /dev/null
+++ b/t/pt-summary/samples/Linux/008/vmstat
@@ -0,0 +1,7 @@
+procs -----------memory---------- ---swap-- -----io---- -system-- ------cpu-----
+ r  b   swpd   free   buff  cache   si   so    bi    bo   in   cs us sy id wa st
+ 8  0 1987024 1728860 1634228 35461060    0    0    31   201    1    1 12  2 86  0  0
+ 9  0 1987024 1723704 1634232 35461388    0    0     8  1856 14001 52574 39  3 58  0  0
+ 5  1 1987024 1739456 1634232 35467300    0    0     0   508 14126 22083 39  1 60  0  0
+ 5  0 1987024 1735904 1634232 35467108    0    0     0   860 16294 21162 34  1 65  0  0
+ 5  0 1987024 1746816 1634232 35467920    0    0     0   360 18427 25539 36  2 63  0  0
diff --git a/t/pt-summary/samples/Linux/009/dmesg_file b/t/pt-summary/samples/Linux/009/dmesg_file
new file mode 100644
index 000000000..27e3667a2
--- /dev/null
+++ b/t/pt-summary/samples/Linux/009/dmesg_file
@@ -0,0 +1,1109 @@
+[    0.000000] kernel: microcode: updated early: 0x41c -> 0x433, date = 2023-12-05
+[    0.000000] kernel: Linux version 6.5.0-35-generic (buildd@lcy02-amd64-079) (x86_64-linux-gnu-gcc-12 (Ubuntu 12.3.0-1ubuntu1~22.04) 12.3.0, GNU ld (GNU Binutils for Ubuntu) 2.38) #35~22.04.1-Ubuntu SMP PREEMPT_DYNAMIC Tue May  7 09:00:52 UTC 2 (Ubuntu 6.5.0-35.35~22.04.1-generic 6.5.13)
+[    0.000000] kernel: Command line: BOOT_IMAGE=/vmlinuz-6.5.0-35-generic root=/dev/mapper/vgubuntu-root ro quiet splash vt.handoff=7
+[    0.000000] kernel: KERNEL supported cpus:
+[    0.000000] kernel:   Intel GenuineIntel
+[    0.000000] kernel:   AMD AuthenticAMD
+[    0.000000] kernel:   Hygon HygonGenuine
+[    0.000000] kernel:   Centaur CentaurHauls
+[    0.000000] kernel:   zhaoxin   Shanghai  
+[    0.000000] kernel: x86/split lock detection: #AC: crashing the kernel on kernel split_locks and warning on user-space split_locks
+[    0.000000] kernel: BIOS-provided physical RAM map:
+[    0.000000] kernel: BIOS-e820: [mem 0x0000000000000000-0x0000000000000fff] reserved
+[    0.000000] kernel: BIOS-e820: [mem 0x0000000000001000-0x000000000009ffff] usable
+[    0.000000] kernel: BIOS-e820: [mem 0x00000000000a0000-0x00000000000fffff] reserved
+[    0.000000] kernel: BIOS-e820: [mem 0x0000000000100000-0x0000000076936fff] usable
+[    0.000000] kernel: BIOS-e820: [mem 0x0000000076937000-0x000000007694afff] ACPI data
+[    0.000000] kernel: BIOS-e820: [mem 0x000000007694b000-0x000000007694cfff] reserved
+[    0.000000] kernel: BIOS-e820: [mem 0x000000007694d000-0x000000007694dfff] usable
+[    0.000000] kernel: BIOS-e820: [mem 0x000000007694e000-0x0000000076950fff] reserved
+[    0.000000] kernel: BIOS-e820: [mem 0x0000000076951000-0x0000000076952fff] usable
+[    0.000000] kernel: BIOS-e820: [mem 0x0000000076953000-0x0000000076953fff] reserved
+[    0.000000] kernel: BIOS-e820: [mem 0x0000000076954000-0x0000000076954fff] usable
+[    0.000000] kernel: BIOS-e820: [mem 0x0000000076955000-0x00000000803fffff] reserved
+[    0.000000] kernel: BIOS-e820: [mem 0x00000000ff610000-0x00000000ff64ffff] reserved
+[    0.000000] kernel: BIOS-e820: [mem 0x0000000100000000-0x000000107ecaffff] usable
+[    0.000000] kernel: BIOS-e820: [mem 0x000000107ecb0000-0x000000107ecb1fff] ACPI data
+[    0.000000] kernel: BIOS-e820: [mem 0x000000107ecb2000-0x000000107ecc1fff] usable
+[    0.000000] kernel: BIOS-e820: [mem 0x000000107ecc2000-0x000000107ecc2fff] reserved
+[    0.000000] kernel: BIOS-e820: [mem 0x000000107ecc3000-0x000000107ecc4fff] usable
+[    0.000000] kernel: BIOS-e820: [mem 0x000000107ecc5000-0x000000107ecc5fff] ACPI data
+[    0.000000] kernel: BIOS-e820: [mem 0x000000107ecc6000-0x000000107f806fff] usable
+[    0.000000] kernel: BIOS-e820: [mem 0x000000107f807000-0x000000107f808fff] reserved
+[    0.000000] kernel: BIOS-e820: [mem 0x000000107f809000-0x000000107f81afff] usable
+[    0.000000] kernel: BIOS-e820: [mem 0x000000107f81b000-0x000000107f822fff] ACPI NVS
+[    0.000000] kernel: BIOS-e820: [mem 0x000000107f823000-0x000000107f88ffff] usable
+[    0.000000] kernel: BIOS-e820: [mem 0x000000107f890000-0x000000107f893fff] reserved
+[    0.000000] kernel: BIOS-e820: [mem 0x000000107f894000-0x000000107f8a8fff] usable
+[    0.000000] kernel: BIOS-e820: [mem 0x000000107f8a9000-0x000000107f8b2fff] reserved
+[    0.000000] kernel: BIOS-e820: [mem 0x000000107f8b3000-0x000000107f8b3fff] usable
+[    0.000000] kernel: BIOS-e820: [mem 0x000000107f8b4000-0x000000107f8b6fff] reserved
+[    0.000000] kernel: BIOS-e820: [mem 0x000000107f8b7000-0x000000107f8b7fff] usable
+[    0.000000] kernel: BIOS-e820: [mem 0x000000107f8b8000-0x000000107f8bafff] reserved
+[    0.000000] kernel: BIOS-e820: [mem 0x000000107f8bb000-0x000000107f8c5fff] usable
+[    0.000000] kernel: BIOS-e820: [mem 0x000000107f8c6000-0x000000107f8c9fff] reserved
+[    0.000000] kernel: BIOS-e820: [mem 0x000000107f8ca000-0x000000107f8d4fff] usable
+[    0.000000] kernel: BIOS-e820: [mem 0x000000107f8d5000-0x000000107f913fff] reserved
+[    0.000000] kernel: BIOS-e820: [mem 0x000000107f914000-0x000000107f914fff] usable
+[    0.000000] kernel: BIOS-e820: [mem 0x000000107f915000-0x000000107f918fff] reserved
+[    0.000000] kernel: BIOS-e820: [mem 0x000000107f919000-0x000000107f934fff] usable
+[    0.000000] kernel: BIOS-e820: [mem 0x000000107f935000-0x000000107f939fff] reserved
+[    0.000000] kernel: BIOS-e820: [mem 0x000000107f93a000-0x000000107f93dfff] usable
+[    0.000000] kernel: BIOS-e820: [mem 0x000000107f93e000-0x000000107f94efff] reserved
+[    0.000000] kernel: BIOS-e820: [mem 0x000000107f94f000-0x000000107f95dfff] usable
+[    0.000000] kernel: BIOS-e820: [mem 0x000000107f95e000-0x000000107f95efff] reserved
+[    0.000000] kernel: BIOS-e820: [mem 0x000000107f95f000-0x000000107f962fff] usable
+[    0.000000] kernel: BIOS-e820: [mem 0x000000107f963000-0x000000107f963fff] reserved
+[    0.000000] kernel: BIOS-e820: [mem 0x000000107f964000-0x000000107fbfffff] usable
+[    0.000000] kernel: NX (Execute Disable) protection: active
+[    0.000000] kernel: efi: EFI v2.7 by EDK II
+[    0.000000] kernel: efi: SMBIOS=0x76950000 SMBIOS 3.0=0x107f963000 ACPI=0x7694a000 ACPI 2.0=0x7694a014 TPMFinalLog=0x107f81b000 MEMATTR=0x107ecad018 MOKvar=0x107ecc2000 RNG=0x107ecc5b18 TPMEventLog=0x107eca9018 
+[    0.000000] kernel: random: crng init done
+[    0.000000] kernel: efi: Remove mem128: MMIO range=[0xff610000-0xff64ffff] (0MB) from e820 map
+[    0.000000] kernel: e820: remove [mem 0xff610000-0xff64ffff] reserved
+[    0.000000] kernel: secureboot: Secure boot disabled
+[    0.000000] kernel: SMBIOS 3.3.0 present.
+[    0.000000] kernel: DMI: System76 Galago Pro/Galago Pro, BIOS 2022-11-21_b337ac6 11/14/2022
+[    0.000000] kernel: tsc: Detected 2500.000 MHz processor
+[    0.000000] kernel: tsc: Detected 2496.000 MHz TSC
+[    0.000005] kernel: e820: update [mem 0x00000000-0x00000fff] usable ==> reserved
+[    0.000008] kernel: e820: remove [mem 0x000a0000-0x000fffff] usable
+[    0.000031] kernel: last_pfn = 0x107fc00 max_arch_pfn = 0x400000000
+[    0.000037] kernel: MTRR map: 8 entries (3 fixed + 5 variable; max 23), built from 10 variable MTRRs
+[    0.000040] kernel: x86/PAT: Configuration [0-7]: WB  WC  UC- UC  WB  WP  UC- WT  
+[    0.000906] kernel: last_pfn = 0x76955 max_arch_pfn = 0x400000000
+[    0.009848] kernel: Using GB pages for direct mapping
+[    0.009849] kernel: Incomplete global flushes, disabling PCID
+[    0.010864] kernel: secureboot: Secure boot disabled
+[    0.010865] kernel: RAMDISK: [mem 0x107691c000-0x107e54afff]
+[    0.010874] kernel: ACPI: Early table checksum verification disabled
+[    0.010878] kernel: ACPI: RSDP 0x000000007694A014 000024 (v02 COREv4)
+[    0.010885] kernel: ACPI: XSDT 0x000000107ECC5F18 00006C (v01 COREv4 COREBOOT 00000000      01000013)
+[    0.010893] kernel: ACPI: FACP 0x0000000076948000 000114 (v06 COREv4 COREBOOT 00000000 CORE 20220331)
+[    0.010900] kernel: ACPI: DSDT 0x0000000076942000 0054CE (v02 COREv4 COREBOOT 20110725 INTL 20220331)
+[    0.010905] kernel: ACPI: FACS 0x0000000076972240 000040
+[    0.010909] kernel: ACPI: SSDT 0x000000007693D000 004D8A (v02 COREv4 COREBOOT 0000002A CORE 20220331)
+[    0.010913] kernel: ACPI: MCFG 0x000000007693C000 00003C (v01 COREv4 COREBOOT 00000000 CORE 20220331)
+[    0.010917] kernel: ACPI: TPM2 0x000000007693B000 00004C (v04 COREv4 COREBOOT 00000000 CORE 20220331)
+[    0.010921] kernel: ACPI: LPIT 0x000000007693A000 000094 (v00 COREv4 COREBOOT 0000002A CORE 20220331)
+[    0.010925] kernel: ACPI: APIC 0x0000000076939000 0000D2 (v03 COREv4 COREBOOT 00000000 CORE 20220331)
+[    0.010929] kernel: ACPI: DMAR 0x0000000076938000 000088 (v01 COREv4 COREBOOT 00000000 CORE 20220331)
+[    0.010933] kernel: ACPI: HPET 0x0000000076937000 000038 (v01 COREv4 COREBOOT 00000000 CORE 20220331)
+[    0.010936] kernel: ACPI: BGRT 0x000000107ECC5018 000038 (v00 INTEL      EDK2 00001720 PTL  00000002)
+[    0.010940] kernel: ACPI: Reserving FACP table memory at [mem 0x76948000-0x76948113]
+[    0.010942] kernel: ACPI: Reserving DSDT table memory at [mem 0x76942000-0x769474cd]
+[    0.010943] kernel: ACPI: Reserving FACS table memory at [mem 0x76972240-0x7697227f]
+[    0.010945] kernel: ACPI: Reserving SSDT table memory at [mem 0x7693d000-0x76941d89]
+[    0.010946] kernel: ACPI: Reserving MCFG table memory at [mem 0x7693c000-0x7693c03b]
+[    0.010947] kernel: ACPI: Reserving TPM2 table memory at [mem 0x7693b000-0x7693b04b]
+[    0.010948] kernel: ACPI: Reserving LPIT table memory at [mem 0x7693a000-0x7693a093]
+[    0.010949] kernel: ACPI: Reserving APIC table memory at [mem 0x76939000-0x769390d1]
+[    0.010950] kernel: ACPI: Reserving DMAR table memory at [mem 0x76938000-0x76938087]
+[    0.010951] kernel: ACPI: Reserving HPET table memory at [mem 0x76937000-0x76937037]
+[    0.010952] kernel: ACPI: Reserving BGRT table memory at [mem 0x107ecc5018-0x107ecc504f]
+[    0.011202] kernel: No NUMA configuration found
+[    0.011203] kernel: Faking a node at [mem 0x0000000000000000-0x000000107fbfffff]
+[    0.011213] kernel: NODE_DATA(0) allocated [mem 0x107ebd7000-0x107ec01fff]
+[    0.011459] kernel: Zone ranges:
+[    0.011460] kernel:   DMA      [mem 0x0000000000001000-0x0000000000ffffff]
+[    0.011462] kernel:   DMA32    [mem 0x0000000001000000-0x00000000ffffffff]
+[    0.011464] kernel:   Normal   [mem 0x0000000100000000-0x000000107fbfffff]
+[    0.011465] kernel:   Device   empty
+[    0.011467] kernel: Movable zone start for each node
+[    0.011468] kernel: Early memory node ranges
+[    0.011469] kernel:   node   0: [mem 0x0000000000001000-0x000000000009ffff]
+[    0.011471] kernel:   node   0: [mem 0x0000000000100000-0x0000000076936fff]
+[    0.011472] kernel:   node   0: [mem 0x000000007694d000-0x000000007694dfff]
+[    0.011473] kernel:   node   0: [mem 0x0000000076951000-0x0000000076952fff]
+[    0.011474] kernel:   node   0: [mem 0x0000000076954000-0x0000000076954fff]
+[    0.011475] kernel:   node   0: [mem 0x0000000100000000-0x000000107ecaffff]
+[    0.011480] kernel:   node   0: [mem 0x000000107ecb2000-0x000000107ecc1fff]
+[    0.011481] kernel:   node   0: [mem 0x000000107ecc3000-0x000000107ecc4fff]
+[    0.011481] kernel:   node   0: [mem 0x000000107ecc6000-0x000000107f806fff]
+[    0.011482] kernel:   node   0: [mem 0x000000107f809000-0x000000107f81afff]
+[    0.011483] kernel:   node   0: [mem 0x000000107f823000-0x000000107f88ffff]
+[    0.011484] kernel:   node   0: [mem 0x000000107f894000-0x000000107f8a8fff]
+[    0.011485] kernel:   node   0: [mem 0x000000107f8b3000-0x000000107f8b3fff]
+[    0.011486] kernel:   node   0: [mem 0x000000107f8b7000-0x000000107f8b7fff]
+[    0.011486] kernel:   node   0: [mem 0x000000107f8bb000-0x000000107f8c5fff]
+[    0.011487] kernel:   node   0: [mem 0x000000107f8ca000-0x000000107f8d4fff]
+[    0.011488] kernel:   node   0: [mem 0x000000107f914000-0x000000107f914fff]
+[    0.011489] kernel:   node   0: [mem 0x000000107f919000-0x000000107f934fff]
+[    0.011490] kernel:   node   0: [mem 0x000000107f93a000-0x000000107f93dfff]
+[    0.011491] kernel:   node   0: [mem 0x000000107f94f000-0x000000107f95dfff]
+[    0.011491] kernel:   node   0: [mem 0x000000107f95f000-0x000000107f962fff]
+[    0.011492] kernel:   node   0: [mem 0x000000107f964000-0x000000107fbfffff]
+[    0.011494] kernel: Initmem setup node 0 [mem 0x0000000000001000-0x000000107fbfffff]
+[    0.011498] kernel: On node 0, zone DMA: 1 pages in unavailable ranges
+[    0.011518] kernel: On node 0, zone DMA: 96 pages in unavailable ranges
+[    0.013910] kernel: On node 0, zone DMA32: 22 pages in unavailable ranges
+[    0.013912] kernel: On node 0, zone DMA32: 3 pages in unavailable ranges
+[    0.013913] kernel: On node 0, zone DMA32: 1 pages in unavailable ranges
+[    0.098297] kernel: On node 0, zone Normal: 5803 pages in unavailable ranges
+[    0.098299] kernel: On node 0, zone Normal: 2 pages in unavailable ranges
+[    0.098300] kernel: On node 0, zone Normal: 1 pages in unavailable ranges
+[    0.098314] kernel: On node 0, zone Normal: 1 pages in unavailable ranges
+[    0.098314] kernel: On node 0, zone Normal: 2 pages in unavailable ranges
+[    0.098316] kernel: On node 0, zone Normal: 8 pages in unavailable ranges
+[    0.098316] kernel: On node 0, zone Normal: 4 pages in unavailable ranges
+[    0.098317] kernel: On node 0, zone Normal: 10 pages in unavailable ranges
+[    0.098318] kernel: On node 0, zone Normal: 3 pages in unavailable ranges
+[    0.098319] kernel: On node 0, zone Normal: 3 pages in unavailable ranges
+[    0.098320] kernel: On node 0, zone Normal: 4 pages in unavailable ranges
+[    0.098321] kernel: On node 0, zone Normal: 63 pages in unavailable ranges
+[    0.098322] kernel: On node 0, zone Normal: 4 pages in unavailable ranges
+[    0.098323] kernel: On node 0, zone Normal: 5 pages in unavailable ranges
+[    0.098324] kernel: On node 0, zone Normal: 17 pages in unavailable ranges
+[    0.098325] kernel: On node 0, zone Normal: 1 pages in unavailable ranges
+[    0.098329] kernel: On node 0, zone Normal: 1 pages in unavailable ranges
+[    0.098335] kernel: On node 0, zone Normal: 1024 pages in unavailable ranges
+[    0.098360] kernel: Reserving Intel graphics memory at [mem 0x7c800000-0x803fffff]
+[    0.099522] kernel: ACPI: PM-Timer IO Port: 0x1808
+[    0.099531] kernel: ACPI: LAPIC_NMI (acpi_id[0xff] high edge lint[0x1])
+[    0.099571] kernel: IOAPIC[0]: apic_id 2, version 32, address 0xfec00000, GSI 0-119
+[    0.099574] kernel: ACPI: INT_SRC_OVR (bus 0 bus_irq 0 global_irq 2 dfl dfl)
+[    0.099576] kernel: ACPI: INT_SRC_OVR (bus 0 bus_irq 9 global_irq 9 high level)
+[    0.099582] kernel: ACPI: Using ACPI (MADT) for SMP configuration information
+[    0.099583] kernel: ACPI: HPET id: 0x8086a701 base: 0xfed00000
+[    0.099592] kernel: e820: update [mem 0x107ec02000-0x107ec50fff] usable ==> reserved
+[    0.099618] kernel: TSC deadline timer available
+[    0.099619] kernel: smpboot: Allowing 16 CPUs, 0 hotplug CPUs
+[    0.099669] kernel: PM: hibernation: Registered nosave memory: [mem 0x00000000-0x00000fff]
+[    0.099672] kernel: PM: hibernation: Registered nosave memory: [mem 0x000a0000-0x000fffff]
+[    0.099675] kernel: PM: hibernation: Registered nosave memory: [mem 0x76937000-0x7694afff]
+[    0.099676] kernel: PM: hibernation: Registered nosave memory: [mem 0x7694b000-0x7694cfff]
+[    0.099678] kernel: PM: hibernation: Registered nosave memory: [mem 0x7694e000-0x76950fff]
+[    0.099680] kernel: PM: hibernation: Registered nosave memory: [mem 0x76953000-0x76953fff]
+[    0.099682] kernel: PM: hibernation: Registered nosave memory: [mem 0x76955000-0x803fffff]
+[    0.099683] kernel: PM: hibernation: Registered nosave memory: [mem 0x80400000-0xffffffff]
+[    0.099686] kernel: PM: hibernation: Registered nosave memory: [mem 0x107ec02000-0x107ec50fff]
+[    0.099688] kernel: PM: hibernation: Registered nosave memory: [mem 0x107ecb0000-0x107ecb1fff]
+[    0.099690] kernel: PM: hibernation: Registered nosave memory: [mem 0x107ecc2000-0x107ecc2fff]
+[    0.099693] kernel: PM: hibernation: Registered nosave memory: [mem 0x107ecc5000-0x107ecc5fff]
+[    0.099695] kernel: PM: hibernation: Registered nosave memory: [mem 0x107f807000-0x107f808fff]
+[    0.099697] kernel: PM: hibernation: Registered nosave memory: [mem 0x107f81b000-0x107f822fff]
+[    0.099699] kernel: PM: hibernation: Registered nosave memory: [mem 0x107f890000-0x107f893fff]
+[    0.099702] kernel: PM: hibernation: Registered nosave memory: [mem 0x107f8a9000-0x107f8b2fff]
+[    0.099704] kernel: PM: hibernation: Registered nosave memory: [mem 0x107f8b4000-0x107f8b6fff]
+[    0.099706] kernel: PM: hibernation: Registered nosave memory: [mem 0x107f8b8000-0x107f8bafff]
+[    0.099709] kernel: PM: hibernation: Registered nosave memory: [mem 0x107f8c6000-0x107f8c9fff]
+[    0.099711] kernel: PM: hibernation: Registered nosave memory: [mem 0x107f8d5000-0x107f913fff]
+[    0.099714] kernel: PM: hibernation: Registered nosave memory: [mem 0x107f915000-0x107f918fff]
+[    0.099716] kernel: PM: hibernation: Registered nosave memory: [mem 0x107f935000-0x107f939fff]
+[    0.099718] kernel: PM: hibernation: Registered nosave memory: [mem 0x107f93e000-0x107f94efff]
+[    0.099721] kernel: PM: hibernation: Registered nosave memory: [mem 0x107f95e000-0x107f95efff]
+[    0.099723] kernel: PM: hibernation: Registered nosave memory: [mem 0x107f963000-0x107f963fff]
+[    0.099725] kernel: [mem 0x80400000-0xffffffff] available for PCI devices
+[    0.099727] kernel: Booting paravirtualized kernel on bare hardware
+[    0.099729] kernel: clocksource: refined-jiffies: mask: 0xffffffff max_cycles: 0xffffffff, max_idle_ns: 7645519600211568 ns
+[    0.099738] kernel: setup_percpu: NR_CPUS:8192 nr_cpumask_bits:16 nr_cpu_ids:16 nr_node_ids:1
+[    0.100327] kernel: percpu: Embedded 63 pages/cpu s221184 r8192 d28672 u262144
+[    0.100336] kernel: pcpu-alloc: s221184 r8192 d28672 u262144 alloc=1*2097152
+[    0.100338] kernel: pcpu-alloc: [0] 00 01 02 03 04 05 06 07 [0] 08 09 10 11 12 13 14 15 
+[    0.100376] kernel: Kernel command line: BOOT_IMAGE=/vmlinuz-6.5.0-35-generic root=/dev/mapper/vgubuntu-root ro quiet splash vt.handoff=7
+[    0.100453] kernel: Unknown kernel command line parameters "splash BOOT_IMAGE=/vmlinuz-6.5.0-35-generic", will be passed to user space.
+[    0.105784] kernel: Dentry cache hash table entries: 8388608 (order: 14, 67108864 bytes, linear)
+[    0.108450] kernel: Inode-cache hash table entries: 4194304 (order: 13, 33554432 bytes, linear)
+[    0.108703] kernel: Fallback order for Node 0: 0 
+[    0.108707] kernel: Built 1 zonelists, mobility grouping on.  Total pages: 16473637
+[    0.108709] kernel: Policy zone: Normal
+[    0.108715] kernel: mem auto-init: stack:all(zero), heap alloc:on, heap free:off
+[    0.108724] kernel: software IO TLB: area num 16.
+[    0.230610] kernel: Memory: 65515516K/66949476K available (20480K kernel code, 4266K rwdata, 13192K rodata, 4816K init, 17372K bss, 1433700K reserved, 0K cma-reserved)
+[    0.230909] kernel: SLUB: HWalign=64, Order=0-3, MinObjects=0, CPUs=16, Nodes=1
+[    0.230940] kernel: ftrace: allocating 55276 entries in 216 pages
+[    0.239880] kernel: ftrace: allocated 216 pages with 4 groups
+[    0.240689] kernel: Dynamic Preempt: voluntary
+[    0.240742] kernel: rcu: Preemptible hierarchical RCU implementation.
+[    0.240747] kernel: rcu:         RCU restricting CPUs from NR_CPUS=8192 to nr_cpu_ids=16.
+[    0.240751] kernel:         Trampoline variant of Tasks RCU enabled.
+[    0.240754] kernel:         Rude variant of Tasks RCU enabled.
+[    0.240754] kernel:         Tracing variant of Tasks RCU enabled.
+[    0.240756] kernel: rcu: RCU calculated value of scheduler-enlistment delay is 25 jiffies.
+[    0.240757] kernel: rcu: Adjusting geometry for rcu_fanout_leaf=16, nr_cpu_ids=16
+[    0.243656] kernel: NR_IRQS: 524544, nr_irqs: 2184, preallocated irqs: 16
+[    0.243972] kernel: rcu: srcu_init: Setting srcu_struct sizes based on contention.
+[    0.244200] kernel: spurious 8259A interrupt: IRQ7.
+[    0.244241] kernel: Console: colour dummy device 80x25
+[    0.244244] kernel: printk: console [tty0] enabled
+[    0.244296] kernel: ACPI: Core revision 20230331
+[    0.244372] kernel: hpet: HPET dysfunctional in PC10. Force disabled.
+[    0.244373] kernel: APIC: Switch to symmetric I/O mode setup
+[    0.244376] kernel: DMAR: Host address width 39
+[    0.244377] kernel: DMAR: DRHD base: 0x000000fed90000 flags: 0x0
+[    0.244383] kernel: DMAR: dmar0: reg_base_addr fed90000 ver 4:0 cap 1c0000c40660462 ecap 29a00f0505e
+[    0.244386] kernel: DMAR: DRHD base: 0x000000fed91000 flags: 0x1
+[    0.244391] kernel: DMAR: dmar1: reg_base_addr fed91000 ver 5:0 cap d2008c40660462 ecap f050da
+[    0.244394] kernel: DMAR: RMRR base: 0x0000007c000000 end: 0x000000803fffff
+[    0.244396] kernel: DMAR-IR: IOAPIC id 2 under DRHD base  0xfed91000 IOMMU 1
+[    0.244398] kernel: DMAR-IR: HPET id 0 under DRHD base 0xfed91000
+[    0.244399] kernel: DMAR-IR: Queued invalidation will be enabled to support x2apic and Intr-remapping.
+[    0.246277] kernel: DMAR-IR: Enabled IRQ remapping in x2apic mode
+[    0.246280] kernel: x2apic enabled
+[    0.246293] kernel: Switched APIC routing to cluster x2apic.
+[    0.251290] kernel: clocksource: tsc-early: mask: 0xffffffffffffffff max_cycles: 0x23fa772cf26, max_idle_ns: 440795269835 ns
+[    0.251299] kernel: Calibrating delay loop (skipped), value calculated using timer frequency.. 4992.00 BogoMIPS (lpj=9984000)
+[    0.251369] kernel: CPU0: Thermal monitoring enabled (TM1)
+[    0.251371] kernel: x86/cpu: User Mode Instruction Prevention (UMIP) activated
+[    0.251505] kernel: process: using mwait in idle threads
+[    0.251508] kernel: Last level iTLB entries: 4KB 0, 2MB 0, 4MB 0
+[    0.251510] kernel: Last level dTLB entries: 4KB 0, 2MB 0, 4MB 0, 1GB 0
+[    0.251514] kernel: Spectre V1 : Mitigation: usercopy/swapgs barriers and __user pointer sanitization
+[    0.251517] kernel: Spectre V2 : Mitigation: Enhanced / Automatic IBRS
+[    0.251518] kernel: Spectre V2 : Spectre v2 / SpectreRSB mitigation: Filling RSB on context switch
+[    0.251519] kernel: Spectre V2 : Spectre v2 / PBRSB-eIBRS: Retire a single CALL on VMEXIT
+[    0.251521] kernel: Spectre V2 : mitigation: Enabling conditional Indirect Branch Prediction Barrier
+[    0.251523] kernel: Speculative Store Bypass: Mitigation: Speculative Store Bypass disabled via prctl
+[    0.251535] kernel: x86/fpu: Supporting XSAVE feature 0x001: 'x87 floating point registers'
+[    0.251536] kernel: x86/fpu: Supporting XSAVE feature 0x002: 'SSE registers'
+[    0.251537] kernel: x86/fpu: Supporting XSAVE feature 0x004: 'AVX registers'
+[    0.251538] kernel: x86/fpu: Supporting XSAVE feature 0x200: 'Protection Keys User registers'
+[    0.251540] kernel: x86/fpu: xstate_offset[2]:  576, xstate_sizes[2]:  256
+[    0.251541] kernel: x86/fpu: xstate_offset[9]:  832, xstate_sizes[9]:    8
+[    0.251542] kernel: x86/fpu: Enabled xstate features 0x207, context size is 840 bytes, using 'compacted' format.
+[    0.255295] kernel: Freeing SMP alternatives memory: 44K
+[    0.255295] kernel: pid_max: default: 32768 minimum: 301
+[    0.255295] kernel: LSM: initializing lsm=lockdown,capability,landlock,yama,apparmor,integrity
+[    0.255295] kernel: landlock: Up and running.
+[    0.255295] kernel: Yama: becoming mindful.
+[    0.255295] kernel: AppArmor: AppArmor initialized
+[    0.255295] kernel: Mount-cache hash table entries: 131072 (order: 8, 1048576 bytes, linear)
+[    0.255295] kernel: Mountpoint-cache hash table entries: 131072 (order: 8, 1048576 bytes, linear)
+[    0.255295] kernel: smpboot: CPU0: 12th Gen Intel(R) Core(TM) i7-1260P (family: 0x6, model: 0x9a, stepping: 0x3)
+[    0.255295] kernel: RCU Tasks: Setting shift to 4 and lim to 1 rcu_task_cb_adjust=1.
+[    0.255295] kernel: RCU Tasks Rude: Setting shift to 4 and lim to 1 rcu_task_cb_adjust=1.
+[    0.255295] kernel: RCU Tasks Trace: Setting shift to 4 and lim to 1 rcu_task_cb_adjust=1.
+[    0.255295] kernel: Performance Events: XSAVE Architectural LBR, PEBS fmt4+-baseline,  AnyThread deprecated, Alderlake Hybrid events, 32-deep LBR, full-width counters, Intel PMU driver.
+[    0.255295] kernel: core: cpu_core PMU driver: 
+[    0.255295] kernel: ... version:                5
+[    0.255295] kernel: ... bit width:              48
+[    0.255295] kernel: ... generic registers:      8
+[    0.255295] kernel: ... value mask:             0000ffffffffffff
+[    0.255295] kernel: ... max period:             00007fffffffffff
+[    0.255295] kernel: ... fixed-purpose events:   4
+[    0.255295] kernel: ... event mask:             0001000f000000ff
+[    0.255295] kernel: signal: max sigframe size: 3632
+[    0.255295] kernel: Estimated ratio of average max frequency by base frequency (times 1024): 1556
+[    0.255295] kernel: rcu: Hierarchical SRCU implementation.
+[    0.255295] kernel: rcu:         Max phase no-delay instances is 1000.
+[    0.255295] kernel: NMI watchdog: Enabled. Permanently consumes one hw-PMU counter.
+[    0.255295] kernel: smp: Bringing up secondary CPUs ...
+[    0.255295] kernel: smpboot: x86: Booting SMP configuration:
+[    0.255295] kernel: .... node  #0, CPUs:        #2  #4  #6  #8  #9 #10 #11 #12 #13 #14 #15
+[    0.011164] kernel: core: cpu_atom PMU driver: PEBS-via-PT 
+[    0.011164] kernel: ... version:                5
+[    0.011164] kernel: ... bit width:              48
+[    0.011164] kernel: ... generic registers:      6
+[    0.011164] kernel: ... value mask:             0000ffffffffffff
+[    0.011164] kernel: ... max period:             00007fffffffffff
+[    0.011164] kernel: ... fixed-purpose events:   3
+[    0.011164] kernel: ... event mask:             000000070000003f
+[    0.268619] kernel:   #1  #3  #5  #7
+[    0.273112] kernel: smp: Brought up 1 node, 16 CPUs
+[    0.273112] kernel: smpboot: Max logical packages: 1
+[    0.273112] kernel: smpboot: Total of 16 processors activated (79872.00 BogoMIPS)
+[    0.277023] kernel: devtmpfs: initialized
+[    0.277023] kernel: x86/mm: Memory block size: 2048MB
+[    0.277023] kernel: ACPI: PM: Registering ACPI NVS region [mem 0x107f81b000-0x107f822fff] (32768 bytes)
+[    0.277023] kernel: clocksource: jiffies: mask: 0xffffffff max_cycles: 0xffffffff, max_idle_ns: 7645041785100000 ns
+[    0.277023] kernel: futex hash table entries: 4096 (order: 6, 262144 bytes, linear)
+[    0.277023] kernel: pinctrl core: initialized pinctrl subsystem
+[    0.277023] kernel: PM: RTC time: 04:06:19, date: 2024-06-03
+[    0.277023] kernel: NET: Registered PF_NETLINK/PF_ROUTE protocol family
+[    0.277023] kernel: DMA: preallocated 4096 KiB GFP_KERNEL pool for atomic allocations
+[    0.279451] kernel: DMA: preallocated 4096 KiB GFP_KERNEL|GFP_DMA pool for atomic allocations
+[    0.279838] kernel: DMA: preallocated 4096 KiB GFP_KERNEL|GFP_DMA32 pool for atomic allocations
+[    0.279847] kernel: audit: initializing netlink subsys (disabled)
+[    0.279854] kernel: audit: type=2000 audit(1717387579.028:1): state=initialized audit_enabled=0 res=1
+[    0.279854] kernel: thermal_sys: Registered thermal governor 'fair_share'
+[    0.279854] kernel: thermal_sys: Registered thermal governor 'bang_bang'
+[    0.279854] kernel: thermal_sys: Registered thermal governor 'step_wise'
+[    0.279854] kernel: thermal_sys: Registered thermal governor 'user_space'
+[    0.279854] kernel: thermal_sys: Registered thermal governor 'power_allocator'
+[    0.279854] kernel: EISA bus registered
+[    0.279854] kernel: cpuidle: using governor ladder
+[    0.279854] kernel: cpuidle: using governor menu
+[    0.279854] kernel: acpiphp: ACPI Hot Plug PCI Controller Driver version: 0.5
+[    0.279854] kernel: PCI: MMCONFIG for domain 0000 [bus 00-ff] at [mem 0xc0000000-0xcfffffff] (base 0xc0000000)
+[    0.279854] kernel: PCI: not using MMCONFIG
+[    0.279854] kernel: PCI: Using configuration type 1 for base access
+[    0.279854] kernel: kprobes: kprobe jump-optimization is enabled. All kprobes are optimized if possible.
+[    0.279898] kernel: HugeTLB: registered 1.00 GiB page size, pre-allocated 0 pages
+[    0.279901] kernel: HugeTLB: 16380 KiB vmemmap can be freed for a 1.00 GiB page
+[    0.279903] kernel: HugeTLB: registered 2.00 MiB page size, pre-allocated 0 pages
+[    0.279904] kernel: HugeTLB: 28 KiB vmemmap can be freed for a 2.00 MiB page
+[    0.280413] kernel: ACPI: Added _OSI(Module Device)
+[    0.280414] kernel: ACPI: Added _OSI(Processor Device)
+[    0.280416] kernel: ACPI: Added _OSI(3.0 _SCP Extensions)
+[    0.280417] kernel: ACPI: Added _OSI(Processor Aggregator Device)
+[    0.289202] kernel: ACPI: 2 ACPI AML tables successfully acquired and loaded
+[    0.323600] kernel: ACPI: USB4 _OSC: OS supports USB3+ DisplayPort+ PCIe+ XDomain+
+[    0.323602] kernel: ACPI: USB4 _OSC: OS controls USB3+ DisplayPort+ PCIe+ XDomain+
+[    0.323817] kernel: ACPI: EC: EC started
+[    0.323818] kernel: ACPI: EC: interrupt blocked
+[    0.416064] kernel: ACPI: EC: EC_CMD/EC_SC=0x66, EC_DATA=0x62
+[    0.416068] kernel: ACPI: \_SB_.PCI0.LPCB.EC0_: Boot DSDT EC used to handle transactions
+[    0.416071] kernel: ACPI: Interpreter enabled
+[    0.416096] kernel: ACPI: PM: (supports S0 S1 S4 S5)
+[    0.416098] kernel: ACPI: Using IOAPIC for interrupt routing
+[    0.416388] kernel: PCI: MMCONFIG for domain 0000 [bus 00-ff] at [mem 0xc0000000-0xcfffffff] (base 0xc0000000)
+[    0.416599] kernel: PCI: MMCONFIG at [mem 0xc0000000-0xcfffffff] reserved as ACPI motherboard resource
+[    0.416611] kernel: PCI: Using host bridge windows from ACPI; if necessary, use "pci=nocrs" and report a bug
+[    0.416612] kernel: PCI: Using E820 reservations for host bridge windows
+[    0.416769] kernel: ACPI: Enabled 2 GPEs in block 00 to 7F
+[    0.418073] kernel: ACPI: \_SB_.PCI0.RP10.RTD3: New power resource
+[    0.428625] kernel: ACPI: \_SB_.PCI0.TBT0: New power resource
+[    0.428653] kernel: ACPI: \_SB_.PCI0.TBT1: New power resource
+[    0.428676] kernel: ACPI: \_SB_.PCI0.D3C_: New power resource
+[    0.457362] kernel: ACPI: PCI Root Bridge [PCI0] (domain 0000 [bus 00-ff])
+[    0.457369] kernel: acpi PNP0A08:00: _OSC: OS supports [ExtendedConfig ASPM ClockPM Segments MSI EDR HPX-Type3]
+[    0.457397] kernel: acpi PNP0A08:00: _OSC: OS now controls [PCIeHotplug SHPCHotplug PME AER PCIeCapability LTR DPC]
+[    0.458352] kernel: PCI host bridge to bus 0000:00
+[    0.458354] kernel: pci_bus 0000:00: root bus resource [io  0x0000-0x0cf7 window]
+[    0.458356] kernel: pci_bus 0000:00: root bus resource [io  0x0d00-0xffff window]
+[    0.458359] kernel: pci_bus 0000:00: root bus resource [mem 0x000a0000-0x000fffff window]
+[    0.458361] kernel: pci_bus 0000:00: root bus resource [mem 0x80400000-0xdfffffff window]
+[    0.458362] kernel: pci_bus 0000:00: root bus resource [mem 0x107fc00000-0x7fffffffff window]
+[    0.458364] kernel: pci_bus 0000:00: root bus resource [mem 0xfc800000-0xfe7fffff window]
+[    0.458365] kernel: pci_bus 0000:00: root bus resource [mem 0xfed40000-0xfed47fff window]
+[    0.458366] kernel: pci_bus 0000:00: root bus resource [bus 00-ff]
+[    0.458401] kernel: pci 0000:00:00.0: [8086:4621] type 00 class 0x060000
+[    0.458561] kernel: pci 0000:00:02.0: [8086:46a6] type 00 class 0x030000
+[    0.458572] kernel: pci 0000:00:02.0: reg 0x10: [mem 0x81000000-0x81ffffff 64bit]
+[    0.458580] kernel: pci 0000:00:02.0: reg 0x18: [mem 0x90000000-0x9fffffff 64bit pref]
+[    0.458586] kernel: pci 0000:00:02.0: reg 0x20: [io  0x1000-0x103f]
+[    0.458605] kernel: pci 0000:00:02.0: BAR 2: assigned to efifb
+[    0.458607] kernel: pci 0000:00:02.0: DMAR: Skip IOMMU disabling for graphics
+[    0.458611] kernel: pci 0000:00:02.0: Video device with shadowed ROM at [mem 0x000c0000-0x000dffff]
+[    0.458644] kernel: pci 0000:00:02.0: reg 0x344: [mem 0x00000000-0x00ffffff 64bit]
+[    0.458646] kernel: pci 0000:00:02.0: VF(n) BAR0 space: [mem 0x00000000-0x06ffffff 64bit] (contains BAR0 for 7 VFs)
+[    0.458652] kernel: pci 0000:00:02.0: reg 0x34c: [mem 0x00000000-0x1fffffff 64bit pref]
+[    0.458653] kernel: pci 0000:00:02.0: VF(n) BAR2 space: [mem 0x00000000-0xdfffffff 64bit pref] (contains BAR2 for 7 VFs)
+[    0.458785] kernel: pci 0000:00:06.0: [8086:464d] type 01 class 0x060400
+[    0.458907] kernel: pci 0000:00:06.0: PME# supported from D0 D3hot D3cold
+[    0.458947] kernel: pci 0000:00:06.0: PTM enabled (root), 4ns granularity
+[    0.459094] kernel: pci 0000:00:07.0: [8086:466e] type 01 class 0x060400
+[    0.459148] kernel: pci 0000:00:07.0: Overriding RP PIO Log Size to 4
+[    0.459194] kernel: pci 0000:00:07.0: PME# supported from D0 D3hot D3cold
+[    0.459383] kernel: pci 0000:00:0a.0: [8086:467d] type 00 class 0x118000
+[    0.459393] kernel: pci 0000:00:0a.0: reg 0x10: [mem 0x80860000-0x80867fff 64bit]
+[    0.459419] kernel: pci 0000:00:0a.0: enabling Extended Tags
+[    0.459521] kernel: pci 0000:00:0d.0: [8086:461e] type 00 class 0x0c0330
+[    0.459533] kernel: pci 0000:00:0d.0: reg 0x10: [mem 0x80840000-0x8084ffff 64bit]
+[    0.459587] kernel: pci 0000:00:0d.0: PME# supported from D3hot D3cold
+[    0.459697] kernel: pci 0000:00:0d.2: [8086:463e] type 00 class 0x0c0340
+[    0.459710] kernel: pci 0000:00:0d.2: reg 0x10: [mem 0x80800000-0x8083ffff 64bit]
+[    0.459719] kernel: pci 0000:00:0d.2: reg 0x18: [mem 0x80874000-0x80874fff 64bit]
+[    0.459759] kernel: pci 0000:00:0d.2: supports D1 D2
+[    0.459760] kernel: pci 0000:00:0d.2: PME# supported from D0 D1 D2 D3hot D3cold
+[    0.459878] kernel: pci 0000:00:14.0: [8086:51ed] type 00 class 0x0c0330
+[    0.459902] kernel: pci 0000:00:14.0: reg 0x10: [mem 0x80850000-0x8085ffff 64bit]
+[    0.460003] kernel: pci 0000:00:14.0: PME# supported from D3hot D3cold
+[    0.460102] kernel: pci 0000:00:14.2: [8086:51ef] type 00 class 0x050000
+[    0.460128] kernel: pci 0000:00:14.2: reg 0x10: [mem 0xfe010000-0xfe013fff 64bit]
+[    0.460146] kernel: pci 0000:00:14.2: reg 0x18: [mem 0x80875000-0x80875fff 64bit]
+[    0.460367] kernel: pci 0000:00:14.3: [8086:51f0] type 00 class 0x028000
+[    0.460434] kernel: pci 0000:00:14.3: reg 0x10: [mem 0x8086c000-0x8086ffff 64bit]
+[    0.460646] kernel: pci 0000:00:14.3: PME# supported from D0 D3hot D3cold
+[    0.460900] kernel: pci 0000:00:15.0: [8086:51e8] type 00 class 0x0c8000
+[    0.460951] kernel: pci 0000:00:15.0: reg 0x10: [mem 0x80876000-0x80876fff 64bit]
+[    0.461191] kernel: pci 0000:00:15.1: [8086:51e9] type 00 class 0x0c8000
+[    0.461242] kernel: pci 0000:00:15.1: reg 0x10: [mem 0x80877000-0x80877fff 64bit]
+[    0.461489] kernel: pci 0000:00:16.0: [8086:51e0] type 00 class 0x078000
+[    0.461518] kernel: pci 0000:00:16.0: reg 0x10: [mem 0x80878000-0x80878fff 64bit]
+[    0.461632] kernel: pci 0000:00:16.0: PME# supported from D3hot
+[    0.461746] kernel: pci 0000:00:1d.0: [8086:51b0] type 01 class 0x060400
+[    0.461864] kernel: pci 0000:00:1d.0: PME# supported from D0 D3hot D3cold
+[    0.461901] kernel: pci 0000:00:1d.0: PTM enabled (root), 4ns granularity
+[    0.462017] kernel: pci 0000:00:1d.1: [8086:51b1] type 01 class 0x060400
+[    0.462133] kernel: pci 0000:00:1d.1: PME# supported from D0 D3hot D3cold
+[    0.462169] kernel: pci 0000:00:1d.1: PTM enabled (root), 4ns granularity
+[    0.462308] kernel: pci 0000:00:1f.0: [8086:5182] type 00 class 0x060100
+[    0.462516] kernel: pci 0000:00:1f.3: [8086:51c8] type 00 class 0x040300
+[    0.462565] kernel: pci 0000:00:1f.3: reg 0x10: [mem 0x80870000-0x80873fff 64bit]
+[    0.462638] kernel: pci 0000:00:1f.3: reg 0x20: [mem 0x80700000-0x807fffff 64bit]
+[    0.462751] kernel: pci 0000:00:1f.3: PME# supported from D3hot D3cold
+[    0.462897] kernel: pci 0000:00:1f.4: [8086:51a3] type 00 class 0x0c0500
+[    0.462925] kernel: pci 0000:00:1f.4: reg 0x10: [mem 0x8087a000-0x8087a0ff 64bit]
+[    0.462961] kernel: pci 0000:00:1f.4: reg 0x20: [io  0xefa0-0xefbf]
+[    0.463055] kernel: pci 0000:00:1f.5: [8086:51a4] type 00 class 0x0c8000
+[    0.463077] kernel: pci 0000:00:1f.5: reg 0x10: [mem 0x80879000-0x80879fff]
+[    0.463309] kernel: pci 0000:01:00.0: [15b7:5030] type 00 class 0x010802
+[    0.463325] kernel: pci 0000:01:00.0: reg 0x10: [mem 0x80400000-0x80403fff 64bit]
+[    0.463532] kernel: pci 0000:00:06.0: PCI bridge to [bus 01]
+[    0.463536] kernel: pci 0000:00:06.0:   bridge window [mem 0x80400000-0x804fffff]
+[    0.463579] kernel: pci 0000:00:07.0: PCI bridge to [bus 02-2c]
+[    0.463582] kernel: pci 0000:00:07.0:   bridge window [io  0x2000-0x3fff]
+[    0.463585] kernel: pci 0000:00:07.0:   bridge window [mem 0x82000000-0x8e1fffff]
+[    0.463590] kernel: pci 0000:00:07.0:   bridge window [mem 0x107fc00000-0x109bbfffff 64bit pref]
+[    0.463736] kernel: pci 0000:2d:00.0: [1217:8621] type 00 class 0x080501
+[    0.463763] kernel: pci 0000:2d:00.0: reg 0x10: [mem 0x80500000-0x80500fff]
+[    0.463777] kernel: pci 0000:2d:00.0: reg 0x14: [mem 0x80501000-0x805017ff]
+[    0.463950] kernel: pci 0000:2d:00.0: PME# supported from D3hot D3cold
+[    0.475440] kernel: pci 0000:00:1d.0: PCI bridge to [bus 2d]
+[    0.475446] kernel: pci 0000:00:1d.0:   bridge window [mem 0x80500000-0x805fffff]
+[    0.475526] kernel: pci 0000:2e:00.0: [10ec:8168] type 00 class 0x020000
+[    0.475553] kernel: pci 0000:2e:00.0: reg 0x10: [io  0x4000-0x40ff]
+[    0.475590] kernel: pci 0000:2e:00.0: reg 0x18: [mem 0x80604000-0x80604fff 64bit]
+[    0.475613] kernel: pci 0000:2e:00.0: reg 0x20: [mem 0x80600000-0x80603fff 64bit]
+[    0.475752] kernel: pci 0000:2e:00.0: supports D1 D2
+[    0.475753] kernel: pci 0000:2e:00.0: PME# supported from D0 D1 D2 D3hot D3cold
+[    0.476010] kernel: pci 0000:00:1d.1: PCI bridge to [bus 2e]
+[    0.476013] kernel: pci 0000:00:1d.1:   bridge window [io  0x4000-0x4fff]
+[    0.476017] kernel: pci 0000:00:1d.1:   bridge window [mem 0x80600000-0x806fffff]
+[    0.476893] kernel: ACPI Error: AE_NOT_FOUND, While resolving a named reference package element - \_SB_.PCI0.SRAM (20230331/dspkginit-438)
+[    0.476901] kernel: fbcon: Taking over console
+[    0.476936] kernel: ACPI Error: AE_NOT_FOUND, While resolving a named reference package element - \_SB_.PCI0.HEC1 (20230331/dspkginit-438)
+[    0.476983] kernel: ACPI Error: AE_NOT_FOUND, While resolving a named reference package element - \_SB_.PCI0.FSPI (20230331/dspkginit-438)
+[    0.477087] kernel: ACPI Error: AE_NOT_FOUND, While resolving a named reference package element - \_SB_.PCI0.PEG0.MCHC (20230331/dspkginit-438)
+[    0.477098] kernel: ACPI Error: AE_NOT_FOUND, While resolving a named reference package element - \_SB_.PCI0.RP09.MCHC (20230331/dspkginit-438)
+[    0.477109] kernel: ACPI Error: AE_NOT_FOUND, While resolving a named reference package element - \_SB_.PCI0.RP10.MCHC (20230331/dspkginit-438)
+[    0.477221] kernel: Low-power S0 idle used by default for system suspend
+[    0.479845] kernel: ACPI: EC: interrupt unblocked
+[    0.479846] kernel: ACPI: EC: event unblocked
+[    0.479861] kernel: ACPI: EC: EC_CMD/EC_SC=0x66, EC_DATA=0x62
+[    0.479862] kernel: ACPI: EC: GPE=0x6e
+[    0.479863] kernel: ACPI: \_SB_.PCI0.LPCB.EC0_: Boot DSDT EC initialization complete
+[    0.479865] kernel: ACPI: \_SB_.PCI0.LPCB.EC0_: EC: Used to handle transactions and events
+[    0.479941] kernel: iommu: Default domain type: Translated
+[    0.479941] kernel: iommu: DMA domain TLB invalidation policy: lazy mode
+[    0.479941] kernel: SCSI subsystem initialized
+[    0.479941] kernel: libata version 3.00 loaded.
+[    0.479941] kernel: ACPI: bus type USB registered
+[    0.479941] kernel: usbcore: registered new interface driver usbfs
+[    0.479941] kernel: usbcore: registered new interface driver hub
+[    0.479941] kernel: usbcore: registered new device driver usb
+[    0.479941] kernel: pps_core: LinuxPPS API ver. 1 registered
+[    0.479941] kernel: pps_core: Software ver. 5.3.6 - Copyright 2005-2007 Rodolfo Giometti <giometti@linux.it>
+[    0.479941] kernel: PTP clock support registered
+[    0.479941] kernel: EDAC MC: Ver: 3.0.0
+[    0.480356] kernel: efivars: Registered efivars operations
+[    0.480356] kernel: NetLabel: Initializing
+[    0.480356] kernel: NetLabel:  domain hash size = 128
+[    0.480356] kernel: NetLabel:  protocols = UNLABELED CIPSOv4 CALIPSO
+[    0.480356] kernel: NetLabel:  unlabeled traffic allowed by default
+[    0.480356] kernel: mctp: management component transport protocol core
+[    0.480356] kernel: NET: Registered PF_MCTP protocol family
+[    0.480356] kernel: PCI: Using ACPI for IRQ routing
+[    0.502677] kernel: PCI: pci_cache_line_size set to 64 bytes
+[    0.503536] kernel: e820: reserve RAM buffer [mem 0x76937000-0x77ffffff]
+[    0.503540] kernel: e820: reserve RAM buffer [mem 0x7694e000-0x77ffffff]
+[    0.503542] kernel: e820: reserve RAM buffer [mem 0x76953000-0x77ffffff]
+[    0.503543] kernel: e820: reserve RAM buffer [mem 0x76955000-0x77ffffff]
+[    0.503544] kernel: e820: reserve RAM buffer [mem 0x107ec02000-0x107fffffff]
+[    0.503550] kernel: e820: reserve RAM buffer [mem 0x107ecb0000-0x107fffffff]
+[    0.503556] kernel: e820: reserve RAM buffer [mem 0x107ecc2000-0x107fffffff]
+[    0.503561] kernel: e820: reserve RAM buffer [mem 0x107ecc5000-0x107fffffff]
+[    0.503566] kernel: e820: reserve RAM buffer [mem 0x107f807000-0x107fffffff]
+[    0.503571] kernel: e820: reserve RAM buffer [mem 0x107f81b000-0x107fffffff]
+[    0.503576] kernel: e820: reserve RAM buffer [mem 0x107f890000-0x107fffffff]
+[    0.503580] kernel: e820: reserve RAM buffer [mem 0x107f8a9000-0x107fffffff]
+[    0.503584] kernel: e820: reserve RAM buffer [mem 0x107f8b4000-0x107fffffff]
+[    0.503588] kernel: e820: reserve RAM buffer [mem 0x107f8b8000-0x107fffffff]
+[    0.503592] kernel: e820: reserve RAM buffer [mem 0x107f8c6000-0x107fffffff]
+[    0.503595] kernel: e820: reserve RAM buffer [mem 0x107f8d5000-0x107fffffff]
+[    0.503598] kernel: e820: reserve RAM buffer [mem 0x107f915000-0x107fffffff]
+[    0.503601] kernel: e820: reserve RAM buffer [mem 0x107f935000-0x107fffffff]
+[    0.503604] kernel: e820: reserve RAM buffer [mem 0x107f93e000-0x107fffffff]
+[    0.503606] kernel: e820: reserve RAM buffer [mem 0x107f95e000-0x107fffffff]
+[    0.503608] kernel: e820: reserve RAM buffer [mem 0x107f963000-0x107fffffff]
+[    0.503609] kernel: e820: reserve RAM buffer [mem 0x107fc00000-0x107fffffff]
+[    0.503688] kernel: pci 0000:00:02.0: vgaarb: setting as boot VGA device
+[    0.503688] kernel: pci 0000:00:02.0: vgaarb: bridge control possible
+[    0.503688] kernel: pci 0000:00:02.0: vgaarb: VGA device added: decodes=io+mem,owns=io+mem,locks=none
+[    0.503688] kernel: vgaarb: loaded
+[    0.504426] kernel: clocksource: Switched to clocksource tsc-early
+[    0.512989] kernel: VFS: Disk quotas dquot_6.6.0
+[    0.513006] kernel: VFS: Dquot-cache hash table entries: 512 (order 0, 4096 bytes)
+[    0.513132] kernel: AppArmor: AppArmor Filesystem Enabled
+[    0.513148] kernel: pnp: PnP ACPI init
+[    0.513310] kernel: pnp 00:00: disabling [mem 0xc0000000-0xcfffffff] because it overlaps 0000:00:02.0 BAR 9 [mem 0x00000000-0xdfffffff 64bit pref]
+[    0.513345] kernel: system 00:00: [mem 0xfedc0000-0xfeddffff] has been reserved
+[    0.513347] kernel: system 00:00: [mem 0xfeda0000-0xfeda0fff] has been reserved
+[    0.513349] kernel: system 00:00: [mem 0xfeda1000-0xfeda1fff] has been reserved
+[    0.513350] kernel: system 00:00: [mem 0xfed90000-0xfed93fff] could not be reserved
+[    0.513352] kernel: system 00:00: [mem 0xfe000000-0xffffffff] could not be reserved
+[    0.513354] kernel: system 00:00: [mem 0xf8000000-0xf9ffffff] has been reserved
+[    0.513355] kernel: system 00:00: [mem 0xfee00000-0xfeefffff] has been reserved
+[    0.513357] kernel: system 00:00: [mem 0xfed00000-0xfed003ff] has been reserved
+[    0.513407] kernel: system 00:01: [mem 0xfed00000-0xfed003ff] has been reserved
+[    0.513442] kernel: system 00:02: [io  0x1800-0x18fe] has been reserved
+[    0.515056] kernel: pnp: PnP ACPI: found 6 devices
+[    0.520709] kernel: clocksource: acpi_pm: mask: 0xffffff max_cycles: 0xffffff, max_idle_ns: 2085701024 ns
+[    0.520779] kernel: NET: Registered PF_INET protocol family
+[    0.520986] kernel: IP idents hash table entries: 262144 (order: 9, 2097152 bytes, linear)
+[    0.524507] kernel: tcp_listen_portaddr_hash hash table entries: 32768 (order: 7, 524288 bytes, linear)
+[    0.524564] kernel: Table-perturb hash table entries: 65536 (order: 6, 262144 bytes, linear)
+[    0.524962] kernel: TCP established hash table entries: 524288 (order: 10, 4194304 bytes, linear)
+[    0.525543] kernel: TCP bind hash table entries: 65536 (order: 9, 2097152 bytes, linear)
+[    0.525717] kernel: TCP: Hash tables configured (established 524288 bind 65536)
+[    0.525961] kernel: MPTCP token hash table entries: 65536 (order: 8, 1572864 bytes, linear)
+[    0.526154] kernel: UDP hash table entries: 32768 (order: 8, 1048576 bytes, linear)
+[    0.526316] kernel: UDP-Lite hash table entries: 32768 (order: 8, 1048576 bytes, linear)
+[    0.526429] kernel: NET: Registered PF_UNIX/PF_LOCAL protocol family
+[    0.526436] kernel: NET: Registered PF_XDP protocol family
+[    0.526443] kernel: pci_bus 0000:00: max bus depth: 1 pci_try_num: 2
+[    0.526454] kernel: pci 0000:00:02.0: BAR 9: assigned [mem 0x10a0000000-0x117fffffff 64bit pref]
+[    0.526459] kernel: pci 0000:00:02.0: BAR 7: assigned [mem 0x1180000000-0x1186ffffff 64bit]
+[    0.526462] kernel: pci 0000:00:1d.0: BAR 15: assigned [mem 0x109bc00000-0x109bdfffff 64bit pref]
+[    0.526465] kernel: pci 0000:00:1d.0: BAR 13: assigned [io  0x5000-0x5fff]
+[    0.526468] kernel: pci 0000:00:06.0: PCI bridge to [bus 01]
+[    0.526485] kernel: pci 0000:00:06.0:   bridge window [mem 0x80400000-0x804fffff]
+[    0.526506] kernel: pci 0000:00:07.0: PCI bridge to [bus 02-2c]
+[    0.526508] kernel: pci 0000:00:07.0:   bridge window [io  0x2000-0x3fff]
+[    0.526513] kernel: pci 0000:00:07.0:   bridge window [mem 0x82000000-0x8e1fffff]
+[    0.526516] kernel: pci 0000:00:07.0:   bridge window [mem 0x107fc00000-0x109bbfffff 64bit pref]
+[    0.526521] kernel: pci 0000:00:1d.0: PCI bridge to [bus 2d]
+[    0.526525] kernel: pci 0000:00:1d.0:   bridge window [io  0x5000-0x5fff]
+[    0.526530] kernel: pci 0000:00:1d.0:   bridge window [mem 0x80500000-0x805fffff]
+[    0.526534] kernel: pci 0000:00:1d.0:   bridge window [mem 0x109bc00000-0x109bdfffff 64bit pref]
+[    0.526540] kernel: pci 0000:00:1d.1: PCI bridge to [bus 2e]
+[    0.526542] kernel: pci 0000:00:1d.1:   bridge window [io  0x4000-0x4fff]
+[    0.526547] kernel: pci 0000:00:1d.1:   bridge window [mem 0x80600000-0x806fffff]
+[    0.526556] kernel: pci_bus 0000:00: resource 4 [io  0x0000-0x0cf7 window]
+[    0.526558] kernel: pci_bus 0000:00: resource 5 [io  0x0d00-0xffff window]
+[    0.526559] kernel: pci_bus 0000:00: resource 6 [mem 0x000a0000-0x000fffff window]
+[    0.526561] kernel: pci_bus 0000:00: resource 7 [mem 0x80400000-0xdfffffff window]
+[    0.526562] kernel: pci_bus 0000:00: resource 8 [mem 0x107fc00000-0x7fffffffff window]
+[    0.526563] kernel: pci_bus 0000:00: resource 9 [mem 0xfc800000-0xfe7fffff window]
+[    0.526565] kernel: pci_bus 0000:00: resource 10 [mem 0xfed40000-0xfed47fff window]
+[    0.526566] kernel: pci_bus 0000:01: resource 1 [mem 0x80400000-0x804fffff]
+[    0.526568] kernel: pci_bus 0000:02: resource 0 [io  0x2000-0x3fff]
+[    0.526569] kernel: pci_bus 0000:02: resource 1 [mem 0x82000000-0x8e1fffff]
+[    0.526570] kernel: pci_bus 0000:02: resource 2 [mem 0x107fc00000-0x109bbfffff 64bit pref]
+[    0.526572] kernel: pci_bus 0000:2d: resource 0 [io  0x5000-0x5fff]
+[    0.526573] kernel: pci_bus 0000:2d: resource 1 [mem 0x80500000-0x805fffff]
+[    0.526574] kernel: pci_bus 0000:2d: resource 2 [mem 0x109bc00000-0x109bdfffff 64bit pref]
+[    0.526576] kernel: pci_bus 0000:2e: resource 0 [io  0x4000-0x4fff]
+[    0.526577] kernel: pci_bus 0000:2e: resource 1 [mem 0x80600000-0x806fffff]
+[    0.528274] kernel: PCI: CLS 64 bytes, default 64
+[    0.528282] kernel: DMAR: Intel-IOMMU force enabled due to platform opt in
+[    0.528290] kernel: DMAR: No ATSR found
+[    0.528290] kernel: DMAR: No SATC found
+[    0.528291] kernel: DMAR: IOMMU feature fl1gp_support inconsistent
+[    0.528293] kernel: DMAR: IOMMU feature pgsel_inv inconsistent
+[    0.528294] kernel: DMAR: IOMMU feature nwfs inconsistent
+[    0.528294] kernel: DMAR: IOMMU feature dit inconsistent
+[    0.528295] kernel: DMAR: IOMMU feature sc_support inconsistent
+[    0.528296] kernel: DMAR: IOMMU feature dev_iotlb_support inconsistent
+[    0.528297] kernel: DMAR: dmar0: Using Queued invalidation
+[    0.528301] kernel: DMAR: dmar1: Using Queued invalidation
+[    0.528347] kernel: Trying to unpack rootfs image as initramfs...
+[    0.528484] kernel: pci 0000:00:02.0: Adding to iommu group 0
+[    0.528515] kernel: pci 0000:00:00.0: Adding to iommu group 1
+[    0.528526] kernel: pci 0000:00:06.0: Adding to iommu group 2
+[    0.528537] kernel: pci 0000:00:07.0: Adding to iommu group 3
+[    0.528545] kernel: pci 0000:00:0a.0: Adding to iommu group 4
+[    0.528561] kernel: pci 0000:00:0d.0: Adding to iommu group 5
+[    0.528569] kernel: pci 0000:00:0d.2: Adding to iommu group 5
+[    0.528584] kernel: pci 0000:00:14.0: Adding to iommu group 6
+[    0.528593] kernel: pci 0000:00:14.2: Adding to iommu group 6
+[    0.528602] kernel: pci 0000:00:14.3: Adding to iommu group 7
+[    0.528617] kernel: pci 0000:00:15.0: Adding to iommu group 8
+[    0.528626] kernel: pci 0000:00:15.1: Adding to iommu group 8
+[    0.528637] kernel: pci 0000:00:16.0: Adding to iommu group 9
+[    0.528651] kernel: pci 0000:00:1d.0: Adding to iommu group 10
+[    0.528664] kernel: pci 0000:00:1d.1: Adding to iommu group 11
+[    0.528687] kernel: pci 0000:00:1f.0: Adding to iommu group 12
+[    0.528697] kernel: pci 0000:00:1f.3: Adding to iommu group 12
+[    0.528707] kernel: pci 0000:00:1f.4: Adding to iommu group 12
+[    0.528717] kernel: pci 0000:00:1f.5: Adding to iommu group 12
+[    0.528727] kernel: pci 0000:01:00.0: Adding to iommu group 13
+[    0.528738] kernel: pci 0000:2d:00.0: Adding to iommu group 14
+[    0.528748] kernel: pci 0000:2e:00.0: Adding to iommu group 15
+[    0.528898] kernel: DMAR: Intel(R) Virtualization Technology for Directed I/O
+[    0.528899] kernel: PCI-DMA: Using software bounce buffering for IO (SWIOTLB)
+[    0.528900] kernel: software IO TLB: mapped [mem 0x00000000728cb000-0x00000000768cb000] (64MB)
+[    0.529317] kernel: clocksource: tsc: mask: 0xffffffffffffffff max_cycles: 0x23fa772cf26, max_idle_ns: 440795269835 ns
+[    0.529343] kernel: clocksource: Switched to clocksource tsc
+[    0.530014] kernel: Initialise system trusted keyrings
+[    0.530022] kernel: Key type blacklist registered
+[    0.530078] kernel: workingset: timestamp_bits=36 max_order=24 bucket_order=0
+[    0.530091] kernel: zbud: loaded
+[    0.530320] kernel: squashfs: version 4.0 (2009/01/31) Phillip Lougher
+[    0.530418] kernel: fuse: init (API version 7.38)
+[    0.530566] kernel: integrity: Platform Keyring initialized
+[    0.530570] kernel: integrity: Machine keyring initialized
+[    0.537738] kernel: Key type asymmetric registered
+[    0.537740] kernel: Asymmetric key parser 'x509' registered
+[    0.537754] kernel: Block layer SCSI generic (bsg) driver version 0.4 loaded (major 243)
+[    0.537814] kernel: io scheduler mq-deadline registered
+[    0.538540] kernel: pcieport 0000:00:06.0: PME: Signaling with IRQ 122
+[    0.538923] kernel: pcieport 0000:00:07.0: PME: Signaling with IRQ 123
+[    0.539001] kernel: pcieport 0000:00:07.0: AER: enabled with IRQ 123
+[    0.539018] kernel: pcieport 0000:00:07.0: pciehp: Slot #3 AttnBtn- PwrCtrl- MRL- AttnInd- PwrInd- HotPlug+ Surprise+ Interlock- NoCompl+ IbPresDis- LLActRep+
+[    0.539093] kernel: pcieport 0000:00:07.0: DPC: enabled with IRQ 123
+[    0.539095] kernel: pcieport 0000:00:07.0: DPC: error containment capabilities: Int Msg #0, RPExt+ PoisonedTLP- SwTrigger- RP PIO Log 4, DL_ActiveErr-
+[    0.539511] kernel: pcieport 0000:00:1d.0: PME: Signaling with IRQ 124
+[    0.539582] kernel: pcieport 0000:00:1d.0: AER: enabled with IRQ 124
+[    0.539602] kernel: pcieport 0000:00:1d.0: pciehp: Slot #8 AttnBtn- PwrCtrl- MRL- AttnInd- PwrInd- HotPlug+ Surprise+ Interlock- NoCompl+ IbPresDis- LLActRep+
+[    0.540056] kernel: pcieport 0000:00:1d.1: PME: Signaling with IRQ 125
+[    0.540127] kernel: pcieport 0000:00:1d.1: AER: enabled with IRQ 125
+[    0.540226] kernel: shpchp: Standard Hot Plug PCI Controller Driver version: 0.4
+[    0.540277] kernel: efifb: probing for efifb
+[    0.540296] kernel: efifb: showing boot graphics
+[    0.541668] kernel: efifb: framebuffer at 0x90000000, using 8100k, total 8100k
+[    0.541670] kernel: efifb: mode is 1920x1080x32, linelength=7680, pages=1
+[    0.541671] kernel: efifb: scrolling: redraw
+[    0.541672] kernel: efifb: Truecolor: size=8:8:8:8, shift=24:16:8:0
+[    0.541759] kernel: Console: switching to colour frame buffer device 240x67
+[    0.543314] kernel: fb0: EFI VGA frame buffer device
+[    0.544299] kernel: ACPI: AC: AC Adapter [AC] (on-line)
+[    0.544356] kernel: input: Power Button as /devices/LNXSYSTM:00/LNXSYBUS:00/PNP0C0C:00/input/input0
+[    0.544472] kernel: ACPI: button: Power Button [PWRB]
+[    0.544500] kernel: input: Sleep Button as /devices/LNXSYSTM:00/LNXSYBUS:00/PNP0C0E:00/input/input1
+[    0.544613] kernel: ACPI: button: Sleep Button [SLPB]
+[    0.544642] kernel: input: Lid Switch as /devices/LNXSYSTM:00/LNXSYBUS:00/PNP0C0D:00/input/input2
+[    0.544678] kernel: ACPI: button: Lid Switch [LID0]
+[    0.544705] kernel: input: Power Button as /devices/LNXSYSTM:00/LNXPWRBN:00/input/input3
+[    0.544890] kernel: ACPI: button: Power Button [PWRF]
+[    0.546398] kernel: Serial: 8250/16550 driver, 32 ports, IRQ sharing enabled
+[    0.548471] kernel: hpet_acpi_add: no address or irqs in _CRS
+[    0.548484] kernel: Linux agpgart interface v0.103
+[    0.553003] kernel: tpm_tis MSFT0101:00: 2.0 TPM (device-id 0x1B, rev-id 22)
+[    0.616376] kernel: ACPI: battery: Slot [BAT0] (battery present)
+[    1.133733] kernel: loop: module loaded
+[    1.133976] kernel: tun: Universal TUN/TAP device driver, 1.6
+[    1.134052] kernel: PPP generic driver version 2.4.2
+[    1.134209] kernel: i8042: PNP: PS/2 Controller [PNP0303:PS2K,PNP0f13:PS2M] at 0x60,0x64 irq 1,12
+[    1.144708] kernel: serio: i8042 KBD port at 0x60,0x64 irq 1
+[    1.144712] kernel: serio: i8042 AUX port at 0x60,0x64 irq 12
+[    1.144934] kernel: mousedev: PS/2 mouse device common for all mice
+[    1.145498] kernel: rtc_cmos 00:03: RTC can wake from S4
+[    1.146292] kernel: rtc_cmos 00:03: registered as rtc0
+[    1.146457] kernel: rtc_cmos 00:03: setting system clock to 2024-06-03T04:06:20 UTC (1717387580)
+[    1.146489] kernel: rtc_cmos 00:03: alarms up to one month, 242 bytes nvram
+[    1.146496] kernel: i2c_dev: i2c /dev entries driver
+[    1.147760] kernel: device-mapper: core: CONFIG_IMA_DISABLE_HTABLE is disabled. Duplicate IMA measurements will not be recorded in the IMA log.
+[    1.147780] kernel: device-mapper: uevent: version 1.0.3
+[    1.147931] kernel: device-mapper: ioctl: 4.48.0-ioctl (2023-03-01) initialised: dm-devel@redhat.com
+[    1.147965] kernel: platform eisa.0: Probing EISA bus 0
+[    1.147968] kernel: platform eisa.0: EISA: Cannot allocate resource for mainboard
+[    1.147969] kernel: platform eisa.0: Cannot allocate resource for EISA slot 1
+[    1.147971] kernel: platform eisa.0: Cannot allocate resource for EISA slot 2
+[    1.147972] kernel: platform eisa.0: Cannot allocate resource for EISA slot 3
+[    1.147973] kernel: platform eisa.0: Cannot allocate resource for EISA slot 4
+[    1.147974] kernel: platform eisa.0: Cannot allocate resource for EISA slot 5
+[    1.147975] kernel: platform eisa.0: Cannot allocate resource for EISA slot 6
+[    1.147976] kernel: platform eisa.0: Cannot allocate resource for EISA slot 7
+[    1.147977] kernel: platform eisa.0: Cannot allocate resource for EISA slot 8
+[    1.147978] kernel: platform eisa.0: EISA: Detected 0 cards
+[    1.147982] kernel: intel_pstate: Intel P-state driver initializing
+[    1.149039] kernel: input: AT Translated Set 2 keyboard as /devices/platform/i8042/serio0/input/input4
+[    1.149658] kernel: intel_pstate: HWP enabled
+[    1.150348] kernel: ledtrig-cpu: registered to indicate activity on CPUs
+[    1.150429] kernel: intel_pmc_core INT33A1:00:  initialized
+[    1.150494] kernel: drop_monitor: Initializing network drop monitor service
+[    1.159603] kernel: NET: Registered PF_INET6 protocol family
+[    1.191447] kernel: Freeing initrd memory: 127164K
+[    1.195137] kernel: Segment Routing with IPv6
+[    1.195145] kernel: In-situ OAM (IOAM) with IPv6
+[    1.195164] kernel: NET: Registered PF_PACKET protocol family
+[    1.195248] kernel: Key type dns_resolver registered
+[    1.197404] kernel: microcode: Microcode Update Driver: v2.2.
+[    1.197410] kernel: IPI shorthand broadcast: enabled
+[    1.198066] kernel: sched_clock: Marking stable (1190238609, 7164497)->(1242720162, -45317056)
+[    1.198541] kernel: registered taskstats version 1
+[    1.199737] kernel: Loading compiled-in X.509 certificates
+[    1.200208] kernel: Loaded X.509 cert 'Build time autogenerated kernel key: 73705a51282eea04e7eb4bef93768faf542bd3c0'
+[    1.200431] kernel: Loaded X.509 cert 'Canonical Ltd. Live Patch Signing: 14df34d1a87cf37625abec039ef2bf521249b969'
+[    1.200651] kernel: Loaded X.509 cert 'Canonical Ltd. Kernel Module Signing: 88f752e560a1e0737e31163a466ad7b70a850c19'
+[    1.200652] kernel: blacklist: Loading compiled-in revocation X.509 certificates
+[    1.200660] kernel: Loaded X.509 cert 'Canonical Ltd. Secure Boot Signing: 61482aa2830d0ab2ad5af10b7250da9033ddcef0'
+[    1.200668] kernel: Loaded X.509 cert 'Canonical Ltd. Secure Boot Signing (2017): 242ade75ac4a15e50d50c84b0d45ff3eae707a03'
+[    1.200674] kernel: Loaded X.509 cert 'Canonical Ltd. Secure Boot Signing (ESM 2018): 365188c1d374d6b07c3c8f240f8ef722433d6a8b'
+[    1.200680] kernel: Loaded X.509 cert 'Canonical Ltd. Secure Boot Signing (2019): c0746fd6c5da3ae827864651ad66ae47fe24b3e8'
+[    1.200687] kernel: Loaded X.509 cert 'Canonical Ltd. Secure Boot Signing (2021 v1): a8d54bbb3825cfb94fa13c9f8a594a195c107b8d'
+[    1.200693] kernel: Loaded X.509 cert 'Canonical Ltd. Secure Boot Signing (2021 v2): 4cf046892d6fd3c9a5b03f98d845f90851dc6a8c'
+[    1.200700] kernel: Loaded X.509 cert 'Canonical Ltd. Secure Boot Signing (2021 v3): 100437bb6de6e469b581e61cd66bce3ef4ed53af'
+[    1.200710] kernel: Loaded X.509 cert 'Canonical Ltd. Secure Boot Signing (Ubuntu Core 2019): c1d57b8f6b743f23ee41f4f7ee292f06eecadfb9'
+[    1.201574] kernel: Key type .fscrypt registered
+[    1.201575] kernel: Key type fscrypt-provisioning registered
+[    1.201601] kernel: Key type trusted registered
+[    1.204428] kernel: Key type encrypted registered
+[    1.204431] kernel: AppArmor: AppArmor sha1 policy hashing enabled
+[    1.204455] kernel: Loading compiled-in module X.509 certificates
+[    1.204738] kernel: Loaded X.509 cert 'Build time autogenerated kernel key: 73705a51282eea04e7eb4bef93768faf542bd3c0'
+[    1.204739] kernel: ima: Allocated hash algorithm: sha1
+[    1.249894] kernel: ima: No architecture policies found
+[    1.249918] kernel: evm: Initialising EVM extended attributes:
+[    1.249920] kernel: evm: security.selinux
+[    1.249922] kernel: evm: security.SMACK64
+[    1.249924] kernel: evm: security.SMACK64EXEC
+[    1.249925] kernel: evm: security.SMACK64TRANSMUTE
+[    1.249926] kernel: evm: security.SMACK64MMAP
+[    1.249927] kernel: evm: security.apparmor
+[    1.249929] kernel: evm: security.ima
+[    1.249930] kernel: evm: security.capability
+[    1.249931] kernel: evm: HMAC attrs: 0x1
+[    1.250566] kernel: PM:   Magic number: 12:709:109
+[    1.255853] kernel: RAS: Correctable Errors collector initialized.
+[    1.255939] kernel: clk: Disabling unused clocks
+[    1.263480] kernel: Freeing unused decrypted memory: 2036K
+[    1.264110] kernel: Freeing unused kernel image (initmem) memory: 4816K
+[    1.283317] kernel: Write protecting the kernel read-only data: 34816k
+[    1.284111] kernel: Freeing unused kernel image (rodata/data gap) memory: 1144K
+[    1.293223] kernel: x86/mm: Checked W+X mappings: passed, no W+X pages found.
+[    1.293226] kernel: Run /init as init process
+[    1.293227] kernel:   with arguments:
+[    1.293227] kernel:     /init
+[    1.293228] kernel:     splash
+[    1.293228] kernel:   with environment:
+[    1.293229] kernel:     HOME=/
+[    1.293229] kernel:     TERM=linux
+[    1.293229] kernel:     BOOT_IMAGE=/vmlinuz-6.5.0-35-generic
+[    1.333617] kernel: hid: raw HID events driver (C) Jiri Kosina
+[    1.335872] kernel: xhci_hcd 0000:00:0d.0: xHCI Host Controller
+[    1.335880] kernel: xhci_hcd 0000:00:0d.0: new USB bus registered, assigned bus number 1
+[    1.336931] kernel: xhci_hcd 0000:00:0d.0: hcc params 0x20007fc1 hci version 0x120 quirks 0x0000000200009810
+[    1.337127] kernel: xhci_hcd 0000:00:0d.0: xHCI Host Controller
+[    1.337129] kernel: xhci_hcd 0000:00:0d.0: new USB bus registered, assigned bus number 2
+[    1.337131] kernel: xhci_hcd 0000:00:0d.0: Host supports USB 3.2 Enhanced SuperSpeed
+[    1.337159] kernel: usb usb1: New USB device found, idVendor=1d6b, idProduct=0002, bcdDevice= 6.05
+[    1.337161] kernel: usb usb1: New USB device strings: Mfr=3, Product=2, SerialNumber=1
+[    1.337161] kernel: usb usb1: Product: xHCI Host Controller
+[    1.337162] kernel: usb usb1: Manufacturer: Linux 6.5.0-35-generic xhci-hcd
+[    1.337163] kernel: usb usb1: SerialNumber: 0000:00:0d.0
+[    1.337253] kernel: hub 1-0:1.0: USB hub found
+[    1.337261] kernel: hub 1-0:1.0: 1 port detected
+[    1.337477] kernel: sdhci: Secure Digital Host Controller Interface driver
+[    1.337479] kernel: sdhci: Copyright(c) Pierre Ossman
+[    1.337699] kernel: usb usb2: New USB device found, idVendor=1d6b, idProduct=0003, bcdDevice= 6.05
+[    1.337703] kernel: usb usb2: New USB device strings: Mfr=3, Product=2, SerialNumber=1
+[    1.337705] kernel: usb usb2: Product: xHCI Host Controller
+[    1.337707] kernel: usb usb2: Manufacturer: Linux 6.5.0-35-generic xhci-hcd
+[    1.337708] kernel: usb usb2: SerialNumber: 0000:00:0d.0
+[    1.338041] kernel: hub 2-0:1.0: USB hub found
+[    1.338052] kernel: hub 2-0:1.0: 1 port detected
+[    1.338094] kernel: i801_smbus 0000:00:1f.4: SPD Write Disable is set
+[    1.338138] kernel: i801_smbus 0000:00:1f.4: SMBus using PCI interrupt
+[    1.338589] kernel: xhci_hcd 0000:00:14.0: xHCI Host Controller
+[    1.338598] kernel: xhci_hcd 0000:00:14.0: new USB bus registered, assigned bus number 3
+[    1.338632] kernel: i2c i2c-0: 2/2 memory slots populated (from DMI)
+[    1.339064] kernel: i2c i2c-0: Successfully instantiated SPD at 0x50
+[    1.339421] kernel: idma64 idma64.0: Found Intel integrated DMA 64-bit
+[    1.339700] kernel: xhci_hcd 0000:00:14.0: hcc params 0x20007fc1 hci version 0x120 quirks 0x0000100200009810
+[    1.339984] kernel: xhci_hcd 0000:00:14.0: xHCI Host Controller
+[    1.339988] kernel: xhci_hcd 0000:00:14.0: new USB bus registered, assigned bus number 4
+[    1.339990] kernel: xhci_hcd 0000:00:14.0: Host supports USB 3.1 Enhanced SuperSpeed
+[    1.340029] kernel: usb usb3: New USB device found, idVendor=1d6b, idProduct=0002, bcdDevice= 6.05
+[    1.340032] kernel: usb usb3: New USB device strings: Mfr=3, Product=2, SerialNumber=1
+[    1.340033] kernel: usb usb3: Product: xHCI Host Controller
+[    1.340034] kernel: usb usb3: Manufacturer: Linux 6.5.0-35-generic xhci-hcd
+[    1.340035] kernel: usb usb3: SerialNumber: 0000:00:14.0
+[    1.340177] kernel: hub 3-0:1.0: USB hub found
+[    1.340198] kernel: hub 3-0:1.0: 12 ports detected
+[    1.340572] kernel: usb usb4: New USB device found, idVendor=1d6b, idProduct=0003, bcdDevice= 6.05
+[    1.340574] kernel: usb usb4: New USB device strings: Mfr=3, Product=2, SerialNumber=1
+[    1.340576] kernel: usb usb4: Product: xHCI Host Controller
+[    1.340577] kernel: usb usb4: Manufacturer: Linux 6.5.0-35-generic xhci-hcd
+[    1.340578] kernel: usb usb4: SerialNumber: 0000:00:14.0
+[    1.340660] kernel: hub 4-0:1.0: USB hub found
+[    1.340678] kernel: hub 4-0:1.0: 4 ports detected
+[    1.340755] kernel: usb: port power management may be unreliable
+[    1.341605] kernel: idma64 idma64.1: Found Intel integrated DMA 64-bit
+[    1.349109] kernel: ACPI: bus type thunderbolt registered
+[    1.356688] kernel: r8169 0000:2e:00.0 eth0: RTL8168h/8111h, d4:93:90:24:37:9a, XID 541, IRQ 145
+[    1.356691] kernel: r8169 0000:2e:00.0 eth0: jumbo features [frames: 9194 bytes, tx checksumming: ko]
+[    1.359799] kernel: cryptd: max_cpu_qlen set to 1000
+[    1.360071] kernel: nvme nvme0: pci function 0000:01:00.0
+[    1.360075] kernel: ACPI: bus type drm_connector registered
+[    1.361102] kernel: pcieport 0000:00:06.0: can't derive routing for PCI INT A
+[    1.361105] kernel: nvme 0000:01:00.0: PCI INT A: no GSI - using ISA IRQ 11
+[    1.402667] kernel: nvme nvme0: 16/0/0 default/read/poll queues
+[    1.408078] kernel:  nvme0n1: p1 p2 p3
+[    1.426883] kernel: sdhci-pci 0000:2d:00.0: SDHCI controller found [1217:8621] (rev 1)
+[    1.428020] kernel: mmc0: SDHCI controller on PCI [0000:2d:00.0] using ADMA
+[    1.428797] kernel: input: ELAN0412:00 04F3:3240 Mouse as /devices/pci0000:00/0000:00:15.0/i2c_designware.0/i2c-1/i2c-ELAN0412:00/0018:04F3:3240.0001/input/input6
+[    1.428940] kernel: input: ELAN0412:00 04F3:3240 Touchpad as /devices/pci0000:00/0000:00:15.0/i2c_designware.0/i2c-1/i2c-ELAN0412:00/0018:04F3:3240.0001/input/input8
+[    1.429051] kernel: hid-generic 0018:04F3:3240.0001: input,hidraw0: I2C HID v1.00 Mouse [ELAN0412:00 04F3:3240] on i2c-ELAN0412:00
+[    1.433169] kernel: AVX2 version of gcm_enc/dec engaged.
+[    1.433209] kernel: AES CTR mode by8 optimization enabled
+[    1.463382] kernel: r8169 0000:2e:00.0 enp46s0: renamed from eth0
+[    1.607322] kernel: usb 3-1: new full-speed USB device number 2 using xhci_hcd
+[    1.678787] kernel: i915 0000:00:02.0: [drm] VT-d active for gfx access
+[    1.678848] kernel: Console: switching to colour dummy device 80x25
+[    1.678876] kernel: i915 0000:00:02.0: vgaarb: deactivate vga console
+[    1.678910] kernel: i915 0000:00:02.0: [drm] Using Transparent Hugepages
+[    1.731949] kernel: i915 0000:00:02.0: vgaarb: changed VGA decodes: olddecodes=io+mem,decodes=io+mem:owns=io+mem
+[    1.735747] kernel: i915 0000:00:02.0: [drm] Finished loading DMC firmware i915/adlp_dmc.bin (v2.20)
+[    1.747661] kernel: i915 0000:00:02.0: [drm] GT0: GuC firmware i915/adlp_guc_70.bin version 70.5.1
+[    1.747665] kernel: i915 0000:00:02.0: [drm] GT0: HuC firmware i915/tgl_huc.bin version 7.9.3
+[    1.762698] kernel: i915 0000:00:02.0: [drm] GT0: HuC: authenticated for all workloads
+[    1.763074] kernel: usb 3-1: New USB device found, idVendor=046d, idProduct=c52f, bcdDevice=30.00
+[    1.763093] kernel: usb 3-1: New USB device strings: Mfr=1, Product=2, SerialNumber=0
+[    1.763096] kernel: usb 3-1: Product: USB Receiver
+[    1.763098] kernel: usb 3-1: Manufacturer: Logitech
+[    1.763539] kernel: i915 0000:00:02.0: [drm] GT0: GUC: submission enabled
+[    1.763544] kernel: i915 0000:00:02.0: [drm] GT0: GUC: SLPC enabled
+[    1.764142] kernel: i915 0000:00:02.0: [drm] GT0: GUC: RC enabled
+[    1.765164] kernel: i915 0000:00:02.0: [drm] Protected Xe Path (PXP) protected content support initialized
+[    1.891330] kernel: usb 3-7: new high-speed USB device number 3 using xhci_hcd
+[    2.055982] kernel: usb 3-7: New USB device found, idVendor=5986, idProduct=9102, bcdDevice= 6.01
+[    2.055993] kernel: usb 3-7: New USB device strings: Mfr=2, Product=1, SerialNumber=0
+[    2.055996] kernel: usb 3-7: Product: BisonCam,NB Pro
+[    2.055999] kernel: usb 3-7: Manufacturer: Sonix Technology Co., Ltd.
+[    2.183338] kernel: usb 3-10: new full-speed USB device number 4 using xhci_hcd
+[    2.333968] kernel: usb 3-10: New USB device found, idVendor=8087, idProduct=0026, bcdDevice= 0.02
+[    2.333978] kernel: usb 3-10: New USB device strings: Mfr=0, Product=0, SerialNumber=0
+[    2.342146] kernel: input: Logitech USB Receiver as /devices/pci0000:00/0000:00:14.0/usb3/3-1/3-1:1.0/0003:046D:C52F.0002/input/input10
+[    2.342290] kernel: hid-generic 0003:046D:C52F.0002: input,hidraw1: USB HID v1.11 Mouse [Logitech USB Receiver] on usb-0000:00:14.0-1/input0
+[    2.343481] kernel: input: Logitech USB Receiver Consumer Control as /devices/pci0000:00/0000:00:14.0/usb3/3-1/3-1:1.1/0003:046D:C52F.0003/input/input11
+[    2.404036] kernel: hid-generic 0003:046D:C52F.0003: input,hiddev0,hidraw2: USB HID v1.11 Device [Logitech USB Receiver] on usb-0000:00:14.0-1/input1
+[    2.404122] kernel: usbcore: registered new interface driver usbhid
+[    2.404125] kernel: usbhid: USB HID core driver
+[    2.452140] kernel: logitech-djreceiver 0003:046D:C52F.0002: hidraw1: USB HID v1.11 Mouse [Logitech USB Receiver] on usb-0000:00:14.0-1/input0
+[    2.548714] kernel: logitech-djreceiver 0003:046D:C52F.0003: hiddev0,hidraw2: USB HID v1.11 Device [Logitech USB Receiver] on usb-0000:00:14.0-1/input1
+[    2.609154] kernel: logitech-djreceiver 0003:046D:C52F.0003: device of type eQUAD step 4 DJ (0x04) connected on slot 1
+[    2.609879] kernel: input: Logitech Wireless Mouse PID:4080 Mouse as /devices/pci0000:00/0000:00:14.0/usb3/3-1/3-1:1.1/0003:046D:C52F.0003/0003:046D:4080.0004/input/input14
+[    2.610365] kernel: input: Logitech Wireless Mouse PID:4080 Consumer Control as /devices/pci0000:00/0000:00:14.0/usb3/3-1/3-1:1.1/0003:046D:C52F.0003/0003:046D:4080.0004/input/input15
+[    2.610483] kernel: hid-generic 0003:046D:4080.0004: input,hidraw3: USB HID v1.11 Mouse [Logitech Wireless Mouse PID:4080] on usb-0000:00:14.0-1/input1:1
+[    2.713588] kernel: input: Logitech M350 as /devices/pci0000:00/0000:00:14.0/usb3/3-1/3-1:1.1/0003:046D:C52F.0003/0003:046D:4080.0004/input/input19
+[    2.714035] kernel: logitech-hidpp-device 0003:046D:4080.0004: input,hidraw3: USB HID v1.11 Mouse [Logitech M350] on usb-0000:00:14.0-1/input1:1
+[    3.453282] kernel: i915 0000:00:02.0: [drm] Skipping intel_backlight registration
+[    3.454464] kernel: [drm] Initialized i915 1.6.0 20201103 for 0000:00:02.0 on minor 0
+[    3.454768] kernel: ACPI: video: Video Device [GFX0] (multi-head: yes  rom: no  post: no)
+[    3.454884] kernel: input: Video Bus as /devices/LNXSYSTM:00/LNXSYBUS:00/PNP0A08:00/LNXVIDEO:00/input/input20
+[    3.484075] kernel: acpi device:03: registered as cooling_device16
+[    3.486087] kernel: fbcon: i915drmfb (fb0) is primary device
+[    3.500845] kernel: Console: switching to colour frame buffer device 240x67
+[    3.520078] kernel: i915 0000:00:02.0: [drm] fb0: i915drmfb frame buffer device
+[   11.808288] kernel: EXT4-fs (dm-1): mounted filesystem 577da86c-d59d-4e17-97d8-bf7e6b1a5cf1 ro with ordered data mode. Quota mode: none.
+[   11.905769] systemd[1]: Inserted module 'autofs4'
+[   11.915985] systemd[1]: systemd 249.11-0ubuntu3.12 running in system mode (+PAM +AUDIT +SELINUX +APPARMOR +IMA +SMACK +SECCOMP +GCRYPT +GNUTLS +OPENSSL +ACL +BLKID +CURL +ELFUTILS +FIDO2 +IDN2 -IDN +IPTC +KMOD +LIBCRYPTSETUP +LIBFDISK +PCRE2 -PWQUALITY -P11KIT -QRENCODE +BZIP2 +LZ4 +XZ +ZLIB +ZSTD -XKBCOMMON +UTMP +SYSVINIT default-hierarchy=unified)
+[   11.916040] systemd[1]: Detected architecture x86-64.
+[   11.916630] systemd[1]: Hostname set to <s76>.
+[   11.959394] kernel: systemd[1]: memfd_create() called without MFD_EXEC or MFD_NOEXEC_SEAL set
+[   12.139594] systemd[1]: Queued start job for default target Graphical Interface.
+[   12.185937] systemd[1]: Created slice Slice /system/modprobe.
+[   12.186668] systemd[1]: Created slice Slice /system/postgresql.
+[   12.187137] systemd[1]: Created slice Cryptsetup Units Slice.
+[   12.187595] systemd[1]: Created slice Slice /system/systemd-fsck.
+[   12.187905] systemd[1]: Created slice User and Session Slice.
+[   12.188004] systemd[1]: Started Forward Password Requests to Wall Directory Watch.
+[   12.188228] systemd[1]: Set up automount Arbitrary Executable File Formats File System Automount Point.
+[   12.188328] systemd[1]: Reached target User and Group Name Lookups.
+[   12.188345] systemd[1]: Reached target Remote File Systems.
+[   12.188358] systemd[1]: Reached target Slice Units.
+[   12.188382] systemd[1]: Reached target Mounting snaps.
+[   12.188414] systemd[1]: Reached target Local Verity Protected Volumes.
+[   12.188494] systemd[1]: Listening on Device-mapper event daemon FIFOs.
+[   12.188617] systemd[1]: Listening on LVM2 poll daemon socket.
+[   12.189157] systemd[1]: Listening on Syslog Socket.
+[   12.189236] systemd[1]: Listening on fsck to fsckd communication Socket.
+[   12.189278] systemd[1]: Listening on initctl Compatibility Named Pipe.
+[   12.189442] systemd[1]: Listening on Journal Audit Socket.
+[   12.189507] systemd[1]: Listening on Journal Socket (/dev/log).
+[   12.189590] systemd[1]: Listening on Journal Socket.
+[   12.189695] systemd[1]: Listening on udev Control Socket.
+[   12.189770] systemd[1]: Listening on udev Kernel Socket.
+[   12.190596] systemd[1]: Mounting Huge Pages File System...
+[   12.191363] systemd[1]: Mounting POSIX Message Queue File System...
+[   12.192128] systemd[1]: Mounting Kernel Debug File System...
+[   12.192918] systemd[1]: Mounting Kernel Trace File System...
+[   12.194439] systemd[1]: Starting Journal Service...
+[   12.194531] systemd[1]: Finished Availability of block devices.
+[   12.195116] systemd[1]: Starting Set the console keyboard layout...
+[   12.195688] systemd[1]: Starting Create List of Static Device Nodes...
+[   12.196253] systemd[1]: Starting Monitoring of LVM2 mirrors, snapshots etc. using dmeventd or progress polling...
+[   12.196811] systemd[1]: Starting Load Kernel Module configfs...
+[   12.197671] systemd[1]: Starting Load Kernel Module drm...
+[   12.198342] systemd[1]: Starting Load Kernel Module efi_pstore...
+[   12.198935] systemd[1]: Starting Load Kernel Module fuse...
+[   12.199829] systemd[1]: Started Nameserver information manager.
+[   12.200016] systemd[1]: Condition check resulted in File System Check on Root Device being skipped.
+[   12.200987] systemd[1]: Starting Load Kernel Modules...
+[   12.201512] kernel: pstore: Using crash dump compression: deflate
+[   12.201670] systemd[1]: Starting Remount Root and Kernel File Systems...
+[   12.201792] kernel: pstore: Registered efi_pstore as persistent store backend
+[   12.202542] systemd[1]: Starting Coldplug All udev Devices...
+[   12.203777] systemd[1]: Mounted Huge Pages File System.
+[   12.203889] systemd[1]: Mounted POSIX Message Queue File System.
+[   12.203980] systemd[1]: Mounted Kernel Debug File System.
+[   12.204066] systemd[1]: Mounted Kernel Trace File System.
+[   12.204384] systemd[1]: Finished Create List of Static Device Nodes.
+[   12.204616] systemd[1]: modprobe@configfs.service: Deactivated successfully.
+[   12.204820] systemd[1]: Finished Load Kernel Module configfs.
+[   12.204971] systemd[1]: modprobe@drm.service: Deactivated successfully.
+[   12.205089] systemd[1]: Finished Load Kernel Module drm.
+[   12.205189] systemd[1]: modprobe@efi_pstore.service: Deactivated successfully.
+[   12.205297] systemd[1]: Finished Load Kernel Module efi_pstore.
+[   12.205399] systemd[1]: modprobe@fuse.service: Deactivated successfully.
+[   12.205513] systemd[1]: Finished Load Kernel Module fuse.
+[   12.206258] systemd[1]: Mounting FUSE Control File System...
+[   12.206773] systemd[1]: Mounting Kernel Configuration File System...
+[   12.207629] systemd[1]: Mounted FUSE Control File System.
+[   12.208102] systemd[1]: Mounted Kernel Configuration File System.
+[   12.209356] kernel: lp: driver loaded but no devices found
+[   12.211629] kernel: ppdev: user-space parallel port driver
+[   12.220884] systemd[1]: Finished Load Kernel Modules.
+[   12.221007] systemd[1]: Started Journal Service.
+[   12.273299] kernel: EXT4-fs (dm-1): re-mounted 577da86c-d59d-4e17-97d8-bf7e6b1a5cf1 r/w. Quota mode: none.
+[   12.294867] kernel: loop0: detected capacity change from 0 to 8
+[   12.295133] kernel: loop1: detected capacity change from 0 to 20128
+[   12.295740] kernel: loop2: detected capacity change from 0 to 20656
+[   12.296642] kernel: loop3: detected capacity change from 0 to 215872
+[   12.297160] kernel: loop4: detected capacity change from 0 to 212976
+[   12.298118] kernel: loop5: detected capacity change from 0 to 113992
+[   12.298768] kernel: loop6: detected capacity change from 0 to 113992
+[   12.299452] kernel: loop7: detected capacity change from 0 to 130960
+[   12.300146] kernel: loop8: detected capacity change from 0 to 130960
+[   12.300839] kernel: loop9: detected capacity change from 0 to 151992
+[   12.301509] kernel: loop10: detected capacity change from 0 to 152040
+[   12.302242] kernel: loop11: detected capacity change from 0 to 135488
+[   12.302812] kernel: loop12: detected capacity change from 0 to 135520
+[   12.303866] kernel: loop13: detected capacity change from 0 to 87144
+[   12.304366] kernel: loop14: detected capacity change from 0 to 87144
+[   12.305233] kernel: loop15: detected capacity change from 0 to 716168
+[   12.306059] kernel: loop16: detected capacity change from 0 to 716176
+[   12.307181] kernel: loop17: detected capacity change from 0 to 1017816
+[   12.308209] kernel: loop18: detected capacity change from 0 to 1034424
+[   12.309116] kernel: loop19: detected capacity change from 0 to 187776
+[   12.310118] kernel: loop20: detected capacity change from 0 to 36288
+[   12.310935] kernel: loop21: detected capacity change from 0 to 36288
+[   12.311668] kernel: loop22: detected capacity change from 0 to 26472
+[   12.312773] kernel: loop23: detected capacity change from 0 to 25240
+[   12.313268] kernel: loop24: detected capacity change from 0 to 79328
+[   12.313850] kernel: loop25: detected capacity change from 0 to 79520
+[   12.314889] kernel: loop26: detected capacity change from 0 to 952
+[   12.315818] kernel: loop27: detected capacity change from 0 to 904
+[   12.317039] kernel: loop28: detected capacity change from 0 to 52280
+[   12.317616] kernel: loop29: detected capacity change from 0 to 52280
+[   12.359827] kernel: input: Intel HID events as /devices/platform/INT33D5:00/input/input21
+[   12.360013] kernel: intel-hid INT33D5:00: failed to enable HID power button
+[   12.367264] kernel: EDAC MC0: Giving out device to module igen6_edac controller Intel_client_SoC MC#0: DEV 0000:00:00.0 (INTERRUPT)
+[   12.367355] kernel: EDAC MC1: Giving out device to module igen6_edac controller Intel_client_SoC MC#1: DEV 0000:00:00.0 (INTERRUPT)
+[   12.367376] kernel: EDAC igen6 MC1: HANDLING IBECC MEMORY ERROR
+[   12.367377] kernel: EDAC igen6 MC1: ADDR 0x7fffffffe0 
+[   12.367378] kernel: EDAC igen6 MC0: HANDLING IBECC MEMORY ERROR
+[   12.367379] kernel: EDAC igen6 MC0: ADDR 0x7fffffffe0 
+[   12.367428] kernel: EDAC igen6: v2.5.1
+[   12.368112] kernel: input: System76 ACPI Hotkeys as /devices/LNXSYSTM:00/LNXSYBUS:00/17761776:00/input/input22
+[   12.368276] kernel: ACPI: battery: new extension: System76 Battery Extension
+[   12.376267] kernel: ee1004 0-0050: 512 byte EE1004-compliant SPD EEPROM, read-only
+[   12.383289] kernel: mc: Linux media interface: v0.10
+[   12.384402] kernel: spi-nor spi0.0: gd25q256 (32768 Kbytes)
+[   12.462717] kernel: Adding 1998844k swap on /dev/mapper/vgubuntu-swap_1.  Priority:-2 extents:1 across:1998844k SSFS
+[   12.480400] kernel: Bluetooth: Core ver 2.22
+[   12.480424] kernel: NET: Registered PF_BLUETOOTH protocol family
+[   12.480425] kernel: Bluetooth: HCI device and connection manager initialized
+[   12.480430] kernel: Bluetooth: HCI socket layer initialized
+[   12.480431] kernel: Bluetooth: L2CAP socket layer initialized
+[   12.480434] kernel: Bluetooth: SCO socket layer initialized
+[   12.481064] kernel: cfg80211: Loading compiled-in X.509 certificates for regulatory database
+[   12.481713] kernel: Loaded X.509 cert 'sforshee: 00b28ddf47aef9cea7'
+[   12.482096] kernel: Loaded X.509 cert 'wens: 61c038651aabdcf94bd0ac7ff06c7248db18c600'
+[   12.482787] kernel: Creating 1 MTD partitions on "0000:00:1f.5":
+[   12.482794] kernel: 0x000000000000-0x000002000000 : "BIOS"
+[   12.489609] kernel: mei_pxp 0000:00:16.0-fbf6fcf1-96cf-4e2e-a6a6-1bab8cbe36b1: bound 0000:00:02.0 (ops i915_pxp_tee_component_ops [i915])
+[   12.490609] kernel: mei_hdcp 0000:00:16.0-b638ab7e-94e2-4ea2-a552-d1c54b627f04: bound 0000:00:02.0 (ops i915_hdcp_ops [i915])
+[   12.491613] kernel: RAPL PMU: API unit is 2^-32 Joules, 4 fixed counters, 655360 ms ovfl timer
+[   12.491618] kernel: RAPL PMU: hw unit of domain pp0-core 2^-14 Joules
+[   12.491620] kernel: RAPL PMU: hw unit of domain package 2^-14 Joules
+[   12.491622] kernel: RAPL PMU: hw unit of domain pp1-gpu 2^-14 Joules
+[   12.491623] kernel: RAPL PMU: hw unit of domain psys 2^-14 Joules
+[   12.500260] kernel: videodev: Linux video capture interface: v2.00
+[   12.501301] kernel: Intel(R) Wireless WiFi driver for Linux
+[   12.503851] kernel: iwlwifi 0000:00:14.3: Detected crf-id 0x1300504, cnv-id 0x80400 wfpm id 0x80000030
+[   12.503895] kernel: iwlwifi 0000:00:14.3: PCI dev 51f0/0074, rev=0x370, rfid=0x10a100
+[   12.507158] kernel: iwlwifi 0000:00:14.3: api flags index 2 larger than supported by driver
+[   12.507181] kernel: iwlwifi 0000:00:14.3: TLV_FW_FSEQ_VERSION: FSEQ Version: 0.0.2.41
+[   12.507537] kernel: iwlwifi 0000:00:14.3: loaded firmware version 83.e8f84e98.0 so-a0-hr-b0-83.ucode op_mode iwlmvm
+[   12.509304] kernel: usb 3-7: Found UVC 1.00 device BisonCam,NB Pro (5986:9102)
+[   12.516280] kernel: usbcore: registered new interface driver uvcvideo
+[   12.523245] kernel: EXT4-fs (nvme0n1p2): mounted filesystem 6fa3e9cc-de78-44d1-854a-74f1e13463cd r/w with ordered data mode. Quota mode: none.
+[   12.590821] kernel: iwlwifi 0000:00:14.3: Detected Intel(R) Wi-Fi 6 AX201 160MHz, REV=0x370
+[   12.590881] kernel: thermal thermal_zone0: failed to read out thermal zone (-61)
+[   12.593133] kernel: audit: type=1400 audit(1717387591.943:2): apparmor="STATUS" operation="profile_load" profile="unconfined" name="libreoffice-xpdfimport" pid=1033 comm="apparmor_parser"
+[   12.593163] kernel: audit: type=1400 audit(1717387591.943:3): apparmor="STATUS" operation="profile_load" profile="unconfined" name="libreoffice-senddoc" pid=1031 comm="apparmor_parser"
+[   12.593446] kernel: audit: type=1400 audit(1717387591.943:4): apparmor="STATUS" operation="profile_load" profile="unconfined" name="libreoffice-oosplash" pid=1030 comm="apparmor_parser"
+[   12.593560] kernel: audit: type=1400 audit(1717387591.943:5): apparmor="STATUS" operation="profile_load" profile="unconfined" name="lsb_release" pid=1021 comm="apparmor_parser"
+[   12.593671] kernel: audit: type=1400 audit(1717387591.943:6): apparmor="STATUS" operation="profile_load" profile="unconfined" name="nvidia_modprobe" pid=1022 comm="apparmor_parser"
+[   12.593674] kernel: audit: type=1400 audit(1717387591.943:7): apparmor="STATUS" operation="profile_load" profile="unconfined" name="nvidia_modprobe//kmod" pid=1022 comm="apparmor_parser"
+[   12.593873] kernel: audit: type=1400 audit(1717387591.943:8): apparmor="STATUS" operation="profile_load" profile="unconfined" name="/usr/bin/man" pid=1028 comm="apparmor_parser"
+[   12.593874] kernel: audit: type=1400 audit(1717387591.943:9): apparmor="STATUS" operation="profile_load" profile="unconfined" name="man_filter" pid=1028 comm="apparmor_parser"
+[   12.593879] kernel: audit: type=1400 audit(1717387591.943:10): apparmor="STATUS" operation="profile_load" profile="unconfined" name="man_groff" pid=1028 comm="apparmor_parser"
+[   12.594167] kernel: audit: type=1400 audit(1717387591.943:11): apparmor="STATUS" operation="profile_load" profile="unconfined" name="/usr/sbin/cups-browsed" pid=1035 comm="apparmor_parser"
+[   12.600421] kernel: iwlwifi 0000:00:14.3: WRT: Invalid buffer destination
+[   12.603534] kernel: snd_hda_intel 0000:00:1f.3: bound 0000:00:02.0 (ops i915_audio_component_bind_ops [i915])
+[   12.610241] kernel: input: ELAN0412:00 04F3:3240 Mouse as /devices/pci0000:00/0000:00:15.0/i2c_designware.0/i2c-1/i2c-ELAN0412:00/0018:04F3:3240.0001/input/input23
+[   12.610366] kernel: input: ELAN0412:00 04F3:3240 Touchpad as /devices/pci0000:00/0000:00:15.0/i2c_designware.0/i2c-1/i2c-ELAN0412:00/0018:04F3:3240.0001/input/input25
+[   12.610484] kernel: hid-multitouch 0018:04F3:3240.0001: input,hidraw0: I2C HID v1.00 Mouse [ELAN0412:00 04F3:3240] on i2c-ELAN0412:00
+[   12.611518] kernel: usbcore: registered new interface driver btusb
+[   12.613072] kernel: Bluetooth: hci0: Device revision is 2
+[   12.613076] kernel: Bluetooth: hci0: Secure boot is enabled
+[   12.613077] kernel: Bluetooth: hci0: OTP lock is enabled
+[   12.613077] kernel: Bluetooth: hci0: API lock is enabled
+[   12.613078] kernel: Bluetooth: hci0: Debug lock is disabled
+[   12.613079] kernel: Bluetooth: hci0: Minimum firmware build 1 week 10 2014
+[   12.613080] kernel: Bluetooth: hci0: Bootloader timestamp 2019.40 buildtype 1 build 38
+[   12.613690] kernel: intel_tcc_cooling: Programmable TCC Offset detected
+[   12.615235] kernel: Bluetooth: hci0: Found device firmware: intel/ibt-0040-4150.sfi
+[   12.615250] kernel: Bluetooth: hci0: Boot Address: 0x100800
+[   12.615252] kernel: Bluetooth: hci0: Firmware Version: 107-51.22
+[   12.624717] kernel: intel_rapl_msr: PL4 support detected.
+[   12.624748] kernel: intel_rapl_common: Found RAPL domain package
+[   12.624751] kernel: intel_rapl_common: Found RAPL domain core
+[   12.624753] kernel: intel_rapl_common: Found RAPL domain uncore
+[   12.624755] kernel: intel_rapl_common: Found RAPL domain psys
+[   12.643023] kernel: snd_hda_codec_realtek hdaudioC0D0: autoconfig for ALC256: line_outs=1 (0x14/0x0/0x0/0x0/0x0) type:speaker
+[   12.643030] kernel: snd_hda_codec_realtek hdaudioC0D0:    speaker_outs=0 (0x0/0x0/0x0/0x0/0x0)
+[   12.643033] kernel: snd_hda_codec_realtek hdaudioC0D0:    hp_outs=1 (0x21/0x0/0x0/0x0/0x0)
+[   12.643035] kernel: snd_hda_codec_realtek hdaudioC0D0:    mono: mono_out=0x0
+[   12.643036] kernel: snd_hda_codec_realtek hdaudioC0D0:    inputs:
+[   12.643038] kernel: snd_hda_codec_realtek hdaudioC0D0:      Headset Mic=0x19
+[   12.643040] kernel: snd_hda_codec_realtek hdaudioC0D0:      Internal Mic=0x12
+[   12.704858] kernel: iwlwifi 0000:00:14.3: WFPM_UMAC_PD_NOTIFICATION: 0x20
+[   12.704905] kernel: iwlwifi 0000:00:14.3: WFPM_LMAC2_PD_NOTIFICATION: 0x1f
+[   12.704913] kernel: iwlwifi 0000:00:14.3: WFPM_AUTH_KEY_0: 0x90
+[   12.704922] kernel: iwlwifi 0000:00:14.3: CNVI_SCU_SEQ_DATA_DW9: 0x10
+[   12.704976] kernel: iwlwifi 0000:00:14.3: Detected RF HR B5, rfid=0x10a100
+[   12.706326] kernel: iwlwifi 0000:00:14.3: RFIm is deactivated, reason = 4
+[   12.708984] kernel: input: HDA Intel PCH Front Headphone as /devices/pci0000:00/0000:00:1f.3/sound/card0/input26
+[   12.709018] kernel: input: HDA Intel PCH HDMI/DP,pcm=3 as /devices/pci0000:00/0000:00:1f.3/sound/card0/input27
+[   12.709047] kernel: input: HDA Intel PCH HDMI/DP,pcm=7 as /devices/pci0000:00/0000:00:1f.3/sound/card0/input28
+[   12.709068] kernel: input: HDA Intel PCH HDMI/DP,pcm=8 as /devices/pci0000:00/0000:00:1f.3/sound/card0/input29
+[   12.709088] kernel: input: HDA Intel PCH HDMI/DP,pcm=9 as /devices/pci0000:00/0000:00:1f.3/sound/card0/input30
+[   12.772298] kernel: iwlwifi 0000:00:14.3: base HW address: 74:04:f1:a1:0a:4a
+[   12.831366] kernel: iwlwifi 0000:00:14.3 wlp0s20f3: renamed from wlan0
+[   12.861124] kernel: Bluetooth: BNEP (Ethernet Emulation) ver 1.3
+[   12.861129] kernel: Bluetooth: BNEP filters: protocol multicast
+[   12.861134] kernel: Bluetooth: BNEP socket layer initialized
+[   13.011197] kernel: Generic FE-GE Realtek PHY r8169-0-2e00:00: attached PHY driver (mii_bus:phy_addr=r8169-0-2e00:00, irq=MAC)
+[   13.215418] kernel: r8169 0000:2e:00.0 enp46s0: Link is Down
+[   13.226533] kernel: iwlwifi 0000:00:14.3: WRT: Invalid buffer destination
+[   13.326153] kernel: iwlwifi 0000:00:14.3: WFPM_UMAC_PD_NOTIFICATION: 0x20
+[   13.326200] kernel: iwlwifi 0000:00:14.3: WFPM_LMAC2_PD_NOTIFICATION: 0x1f
+[   13.326209] kernel: iwlwifi 0000:00:14.3: WFPM_AUTH_KEY_0: 0x90
+[   13.326219] kernel: iwlwifi 0000:00:14.3: CNVI_SCU_SEQ_DATA_DW9: 0x10
+[   13.327607] kernel: iwlwifi 0000:00:14.3: RFIm is deactivated, reason = 4
+[   13.337602] kernel: iwlwifi 0000:00:14.3: RFIm is deactivated, reason = 4
+[   13.396950] kernel: iwlwifi 0000:00:14.3: Registered PHC clock: iwlwifi-PTP, with index: 0
+[   14.034442] kernel: Bluetooth: hci0: Waiting for firmware download to complete
+[   14.035040] kernel: Bluetooth: hci0: Firmware loaded in 1386523 usecs
+[   14.035109] kernel: Bluetooth: hci0: Waiting for device to boot
+[   14.051043] kernel: Bluetooth: hci0: Device booted in 15582 usecs
+[   14.051051] kernel: Bluetooth: hci0: Malformed MSFT vendor event: 0x02
+[   14.051432] kernel: Bluetooth: hci0: Found Intel DDC parameters: intel/ibt-0040-4150.ddc
+[   14.053050] kernel: Bluetooth: hci0: Applying Intel DDC parameters completed
+[   14.056074] kernel: Bluetooth: hci0: Firmware timestamp 2022.51 buildtype 1 build 56683
+[   14.125123] kernel: Bluetooth: MGMT ver 1.22
+[   14.128387] kernel: NET: Registered PF_ALG protocol family
+[   14.172143] kernel: Bluetooth: hci0: Bad flag given (0x1) vs supported (0x0)
+[   14.306291] kernel: loop30: detected capacity change from 0 to 8
+[   14.458996] kernel: rfkill: input handler disabled
+[   17.290646] kernel: wlp0s20f3: authenticate with 10:0c:6b:ac:e2:02
+[   17.296108] kernel: wlp0s20f3: send auth to 10:0c:6b:ac:e2:02 (try 1/3)
+[   17.322727] kernel: wlp0s20f3: authenticated
+[   17.323185] kernel: wlp0s20f3: associate with 10:0c:6b:ac:e2:02 (try 1/3)
+[   17.326012] kernel: wlp0s20f3: RX AssocResp from 10:0c:6b:ac:e2:02 (capab=0x1411 status=0 aid=3)
+[   17.333358] kernel: wlp0s20f3: associated
+[   17.333395] kernel: wlp0s20f3: Limiting TX power to 30 (30 - 0) dBm as advertised by 10:0c:6b:ac:e2:02
+[   17.343690] kernel: iwlwifi 0000:00:14.3: Unhandled alg: 0x707
+[   17.343991] kernel: iwlwifi 0000:00:14.3: Unhandled alg: 0x707
+[   17.344257] kernel: iwlwifi 0000:00:14.3: Unhandled alg: 0x707
+[   17.344471] kernel: iwlwifi 0000:00:14.3: Unhandled alg: 0x707
+[   17.344744] kernel: iwlwifi 0000:00:14.3: Unhandled alg: 0x707
+[   17.344977] kernel: iwlwifi 0000:00:14.3: Unhandled alg: 0x707
+[   17.345276] kernel: iwlwifi 0000:00:14.3: Unhandled alg: 0x707
+[   17.345481] kernel: iwlwifi 0000:00:14.3: Unhandled alg: 0x707
diff --git a/t/pt-summary/samples/Linux/009/dmidecode b/t/pt-summary/samples/Linux/009/dmidecode
new file mode 100644
index 000000000..3136ea5be
--- /dev/null
+++ b/t/pt-summary/samples/Linux/009/dmidecode
@@ -0,0 +1,2 @@
+# dmidecode 3.3
+Scanning /dev/mem for entry point.
diff --git a/t/pt-summary/samples/Linux/009/ip b/t/pt-summary/samples/Linux/009/ip
new file mode 100644
index 000000000..42303c7a5
--- /dev/null
+++ b/t/pt-summary/samples/Linux/009/ip
@@ -0,0 +1,60 @@
+1: lo: <LOOPBACK,UP,LOWER_UP> mtu 65536 qdisc noqueue state UNKNOWN mode DEFAULT group default qlen 1000
+    link/loopback 00:00:00:00:00:00 brd 00:00:00:00:00:00
+    RX:    bytes   packets errors dropped  missed   mcast           
+    116015626073 172946768      0       0       0       0 
+    TX:    bytes   packets errors dropped carrier collsns           
+    116015626073 172946768      0       0       0       0 
+2: enp46s0: <NO-CARRIER,BROADCAST,MULTICAST,UP> mtu 1500 qdisc fq_codel state DOWN mode DEFAULT group default qlen 1000
+    link/ether d4:93:90:24:37:9a brd ff:ff:ff:ff:ff:ff
+    RX:  bytes packets errors dropped  missed   mcast           
+             0       0      0       0       0       0 
+    TX:  bytes packets errors dropped carrier collsns           
+             0       0      0       0       0       0 
+3: wlp0s20f3: <BROADCAST,MULTICAST,UP,LOWER_UP> mtu 1500 qdisc noqueue state UP mode DORMANT group default qlen 1000
+    link/ether 74:04:f1:a1:0a:4a brd ff:ff:ff:ff:ff:ff
+    RX:    bytes   packets errors dropped  missed   mcast           
+    139034106833 148742623      0       0       0       0 
+    TX:    bytes   packets errors dropped carrier collsns           
+     28592926142  77005550      0       0       0       0 
+4: docker0: <BROADCAST,MULTICAST,UP,LOWER_UP> mtu 1500 qdisc noqueue state UP mode DEFAULT group default 
+    link/ether 02:42:b8:3a:02:a2 brd ff:ff:ff:ff:ff:ff
+    RX:   bytes  packets errors dropped  missed   mcast           
+    11881867716 11928012      0       0       0       0 
+    TX:   bytes  packets errors dropped carrier collsns           
+    31887104008 14000997      0       0       0       0 
+5: br-a7c7f1777df1: <NO-CARRIER,BROADCAST,MULTICAST,UP> mtu 1500 qdisc noqueue state DOWN mode DEFAULT group default 
+    link/ether 02:42:50:6b:d9:e7 brd ff:ff:ff:ff:ff:ff
+    RX:  bytes packets errors dropped  missed   mcast           
+             0       0      0       0       0       0 
+    TX:  bytes packets errors dropped carrier collsns           
+             0       0      0       0       0       0 
+605: veth0655c9f@if604: <BROADCAST,MULTICAST,UP,LOWER_UP> mtu 1500 qdisc noqueue master docker0 state UP mode DEFAULT group default 
+    link/ether fe:18:1e:af:9f:6b brd ff:ff:ff:ff:ff:ff link-netnsid 0
+    RX:  bytes packets errors dropped  missed   mcast           
+    1170127765 1046851      0       0       0       0 
+    TX:  bytes packets errors dropped carrier collsns           
+    2539354604 1277512      0       0       0       0 
+607: vethd189986@if606: <BROADCAST,MULTICAST,UP,LOWER_UP> mtu 1500 qdisc noqueue master br-79118f7d5a92 state UP mode DEFAULT group default 
+    link/ether 5e:65:38:50:f8:1a brd ff:ff:ff:ff:ff:ff link-netnsid 2
+    RX:  bytes packets errors dropped  missed   mcast           
+      52568948  265022      0       0       0       0 
+    TX:  bytes packets errors dropped carrier collsns           
+     636234838  308474      0       0       0       0 
+609: veth2655c84@if608: <BROADCAST,MULTICAST,UP,LOWER_UP> mtu 1500 qdisc noqueue master br-79118f7d5a92 state UP mode DEFAULT group default 
+    link/ether be:d1:21:fd:d2:fb brd ff:ff:ff:ff:ff:ff link-netnsid 1
+    RX:  bytes packets errors dropped  missed   mcast           
+     547370949  260278      0       0       0       0 
+    TX:  bytes packets errors dropped carrier collsns           
+      51931644  244548      0       0       0       0 
+613: wg0: <POINTOPOINT,NOARP,UP,LOWER_UP> mtu 1420 qdisc noqueue state UNKNOWN mode DEFAULT group default qlen 1000
+    link/none 
+    RX:  bytes packets errors dropped  missed   mcast           
+      17516184   36901      0       0       0       0 
+    TX:  bytes packets errors dropped carrier collsns           
+       6867412   35663      0       0       0       0 
+358: br-79118f7d5a92: <BROADCAST,MULTICAST,UP,LOWER_UP> mtu 1500 qdisc noqueue state UP mode DEFAULT group default 
+    link/ether 02:42:3c:6b:97:eb brd ff:ff:ff:ff:ff:ff
+    RX:  bytes packets errors dropped  missed   mcast           
+      16088026  236947      0       0       0       0 
+    TX:  bytes packets errors dropped carrier collsns           
+     792746302  362214      0       0       0       0 
diff --git a/t/pt-summary/samples/Linux/009/lspci_file b/t/pt-summary/samples/Linux/009/lspci_file
new file mode 100644
index 000000000..9e9a8a65e
--- /dev/null
+++ b/t/pt-summary/samples/Linux/009/lspci_file
@@ -0,0 +1,22 @@
+00:00.0 Host bridge: Intel Corporation Device 4621 (rev 02)
+00:02.0 VGA compatible controller: Intel Corporation Alder Lake-P Integrated Graphics Controller (rev 0c)
+00:06.0 PCI bridge: Intel Corporation 12th Gen Core Processor PCI Express x4 Controller #0 (rev 02)
+00:07.0 PCI bridge: Intel Corporation Alder Lake-P Thunderbolt 4 PCI Express Root Port #0 (rev 02)
+00:0a.0 Signal processing controller: Intel Corporation Platform Monitoring Technology (rev 01)
+00:0d.0 USB controller: Intel Corporation Alder Lake-P Thunderbolt 4 USB Controller (rev 02)
+00:0d.2 USB controller: Intel Corporation Alder Lake-P Thunderbolt 4 NHI #0 (rev 02)
+00:14.0 USB controller: Intel Corporation Alder Lake PCH USB 3.2 xHCI Host Controller (rev 01)
+00:14.2 RAM memory: Intel Corporation Alder Lake PCH Shared SRAM (rev 01)
+00:14.3 Network controller: Intel Corporation Alder Lake-P PCH CNVi WiFi (rev 01)
+00:15.0 Serial bus controller: Intel Corporation Alder Lake PCH Serial IO I2C Controller #0 (rev 01)
+00:15.1 Serial bus controller: Intel Corporation Alder Lake PCH Serial IO I2C Controller #1 (rev 01)
+00:16.0 Communication controller: Intel Corporation Alder Lake PCH HECI Controller (rev 01)
+00:1d.0 PCI bridge: Intel Corporation Device 51b0 (rev 01)
+00:1d.1 PCI bridge: Intel Corporation Device 51b1 (rev 01)
+00:1f.0 ISA bridge: Intel Corporation Alder Lake PCH eSPI Controller (rev 01)
+00:1f.3 Audio device: Intel Corporation Alder Lake PCH-P High Definition Audio Controller (rev 01)
+00:1f.4 SMBus: Intel Corporation Alder Lake PCH-P SMBus Host Controller (rev 01)
+00:1f.5 Serial bus controller: Intel Corporation Alder Lake-P PCH SPI Controller (rev 01)
+01:00.0 Non-Volatile memory controller: Sandisk Corp Device 5030 (rev 01)
+2d:00.0 SD Host controller: O2 Micro, Inc. SD/MMC Card Reader Controller (rev 01)
+2e:00.0 Ethernet controller: Realtek Semiconductor Co., Ltd. RTL8111/8168/8411 PCI Express Gigabit Ethernet Controller (rev 15)
diff --git a/t/pt-summary/samples/Linux/009/lvs.stderr b/t/pt-summary/samples/Linux/009/lvs.stderr
new file mode 100644
index 000000000..9fc81f7e2
--- /dev/null
+++ b/t/pt-summary/samples/Linux/009/lvs.stderr
@@ -0,0 +1,2 @@
+  WARNING: Running as a non-root user. Functionality may be unavailable.
+  /run/lock/lvm/P_global:aux: open failed: Permission denied
diff --git a/t/pt-summary/samples/Linux/009/memory b/t/pt-summary/samples/Linux/009/memory
new file mode 100644
index 000000000..71a7dc68d
--- /dev/null
+++ b/t/pt-summary/samples/Linux/009/memory
@@ -0,0 +1,58 @@
+               total        used        free      shared  buff/cache   available
+Mem:     67255779328 27916754944  1452535808  2943787008 37886488576 36032970752
+Swap:     2046816256  2034708480    12107776
+MemTotal:       65679472 kB
+MemFree:         1418492 kB
+MemAvailable:   35188448 kB
+Buffers:         1633964 kB
+Cached:         31454736 kB
+SwapCached:        32820 kB
+Active:         22152924 kB
+Inactive:       34496636 kB
+Active(anon):   18511036 kB
+Inactive(anon):  7548424 kB
+Active(file):    3641888 kB
+Inactive(file): 26948212 kB
+Unevictable:     1541420 kB
+Mlocked:           28280 kB
+SwapTotal:       1998844 kB
+SwapFree:          11824 kB
+Zswap:                 0 kB
+Zswapped:              0 kB
+Dirty:             16096 kB
+Writeback:           244 kB
+AnonPages:      24943904 kB
+Mapped:          2825552 kB
+Shmem:           2874792 kB
+KReclaimable:    3909824 kB
+Slab:            4681048 kB
+SReclaimable:    3909824 kB
+SUnreclaim:       771224 kB
+KernelStack:       88672 kB
+PageTables:       453388 kB
+SecPageTables:         0 kB
+NFS_Unstable:          0 kB
+Bounce:                0 kB
+WritebackTmp:          0 kB
+CommitLimit:    34838580 kB
+Committed_AS:   77099812 kB
+VmallocTotal:   34359738367 kB
+VmallocUsed:      465984 kB
+VmallocChunk:          0 kB
+Percpu:            27776 kB
+HardwareCorrupted:     0 kB
+AnonHugePages:    217088 kB
+ShmemHugePages:  1181696 kB
+ShmemPmdMapped:        0 kB
+FileHugePages:         0 kB
+FilePmdMapped:         0 kB
+Unaccepted:            0 kB
+HugePages_Total:       0
+HugePages_Free:        0
+HugePages_Rsvd:        0
+HugePages_Surp:        0
+Hugepagesize:       2048 kB
+Hugetlb:               0 kB
+DirectMap4k:      821992 kB
+DirectMap2M:    32573440 kB
+DirectMap1G:    33554432 kB
diff --git a/t/pt-summary/samples/Linux/009/mounted_fs b/t/pt-summary/samples/Linux/009/mounted_fs
new file mode 100644
index 000000000..0123cc449
--- /dev/null
+++ b/t/pt-summary/samples/Linux/009/mounted_fs
@@ -0,0 +1,25 @@
+/dev/fuse 250G 0 250G 0% /run/user/1000/keybase/kbfs on /run/user/1000/keybase/kbfs type fuse (rw,nosuid,nodev,relatime,user_id=1000,group_id=1000)
+/dev/mapper/vgubuntu-root 3,6T 1,5T 2,0T 43% / on / type ext4 (rw,relatime,errors=remount-ro)
+/dev/nvme0n1p1 511M 291M 221M 57% /boot/efi on /boot/efi type vfat (rw,relatime,fmask=0077,dmask=0077,codepage=437,iocharset=iso8859-1,shortname=mixed,errors=remount-ro)
+/dev/nvme0n1p2 1,7G 305M 1,3G 20% /boot on /boot type ext4 (rw,relatime)
+efivarfs 64K 27K 33K 45% /sys/firmware/efi/efivars on /sys/firmware/efi/efivars type efivarfs (rw,nosuid,nodev,noexec,relatime)
+tmpfs 32G 703M 31G 3% /dev/shm on /dev/shm type tmpfs (rw,nosuid,nodev,inode64)
+tmpfs 32G 703M 31G 3% /dev/shm on /run/lock type tmpfs (rw,nosuid,nodev,noexec,relatime,size=5120k,inode64)
+tmpfs 32G 703M 31G 3% /dev/shm on /run/snapd/ns type tmpfs (rw,nosuid,nodev,noexec,relatime,size=6567948k,mode=755,inode64)
+tmpfs 32G 703M 31G 3% /dev/shm on /run type tmpfs (rw,nosuid,nodev,noexec,relatime,size=6567948k,mode=755,inode64)
+tmpfs 32G 703M 31G 3% /dev/shm on /run/user/1000 type tmpfs (rw,nosuid,nodev,relatime,size=6567944k,nr_inodes=1641986,mode=700,uid=1000,gid=1000,inode64)
+tmpfs 5,0M 4,0K 5,0M 1% /run/lock on /dev/shm type tmpfs (rw,nosuid,nodev,inode64)
+tmpfs 5,0M 4,0K 5,0M 1% /run/lock on /run/lock type tmpfs (rw,nosuid,nodev,noexec,relatime,size=5120k,inode64)
+tmpfs 5,0M 4,0K 5,0M 1% /run/lock on /run/snapd/ns type tmpfs (rw,nosuid,nodev,noexec,relatime,size=6567948k,mode=755,inode64)
+tmpfs 5,0M 4,0K 5,0M 1% /run/lock on /run type tmpfs (rw,nosuid,nodev,noexec,relatime,size=6567948k,mode=755,inode64)
+tmpfs 5,0M 4,0K 5,0M 1% /run/lock on /run/user/1000 type tmpfs (rw,nosuid,nodev,relatime,size=6567944k,nr_inodes=1641986,mode=700,uid=1000,gid=1000,inode64)
+tmpfs 6,3G 11M 6,3G 1% /run/user/1000 on /dev/shm type tmpfs (rw,nosuid,nodev,inode64)
+tmpfs 6,3G 11M 6,3G 1% /run/user/1000 on /run/lock type tmpfs (rw,nosuid,nodev,noexec,relatime,size=5120k,inode64)
+tmpfs 6,3G 11M 6,3G 1% /run/user/1000 on /run/snapd/ns type tmpfs (rw,nosuid,nodev,noexec,relatime,size=6567948k,mode=755,inode64)
+tmpfs 6,3G 11M 6,3G 1% /run/user/1000 on /run type tmpfs (rw,nosuid,nodev,noexec,relatime,size=6567948k,mode=755,inode64)
+tmpfs 6,3G 11M 6,3G 1% /run/user/1000 on /run/user/1000 type tmpfs (rw,nosuid,nodev,relatime,size=6567944k,nr_inodes=1641986,mode=700,uid=1000,gid=1000,inode64)
+tmpfs 6,3G 2,7M 6,3G 1% /run on /dev/shm type tmpfs (rw,nosuid,nodev,inode64)
+tmpfs 6,3G 2,7M 6,3G 1% /run on /run/lock type tmpfs (rw,nosuid,nodev,noexec,relatime,size=5120k,inode64)
+tmpfs 6,3G 2,7M 6,3G 1% /run on /run/snapd/ns type tmpfs (rw,nosuid,nodev,noexec,relatime,size=6567948k,mode=755,inode64)
+tmpfs 6,3G 2,7M 6,3G 1% /run on /run type tmpfs (rw,nosuid,nodev,noexec,relatime,size=6567948k,mode=755,inode64)
+tmpfs 6,3G 2,7M 6,3G 1% /run on /run/user/1000 type tmpfs (rw,nosuid,nodev,relatime,size=6567944k,nr_inodes=1641986,mode=700,uid=1000,gid=1000,inode64)
diff --git a/t/pt-summary/samples/Linux/009/netstat b/t/pt-summary/samples/Linux/009/netstat
new file mode 100644
index 000000000..1f221d586
--- /dev/null
+++ b/t/pt-summary/samples/Linux/009/netstat
@@ -0,0 +1,230 @@
+Active Internet connections (servers and established)
+Proto Recv-Q Send-Q Local Address           Foreign Address         State       PID/Program name    
+tcp        0      0 127.0.0.1:12519         0.0.0.0:*               LISTEN      -                   
+tcp        0      0 127.0.0.1:42841         0.0.0.0:*               LISTEN      -                   
+tcp        0      0 127.0.0.1:42002         0.0.0.0:*               LISTEN      -                   
+tcp        0      0 127.0.0.1:42003         0.0.0.0:*               LISTEN      -                   
+tcp        0      0 127.0.0.1:42000         0.0.0.0:*               LISTEN      -                   
+tcp        0      0 127.0.0.1:42001         0.0.0.0:*               LISTEN      -                   
+tcp        0      0 127.0.0.53:53           0.0.0.0:*               LISTEN      -                   
+tcp        0      0 127.0.0.1:7777          0.0.0.0:*               LISTEN      -                   
+tcp        0      0 127.0.0.1:40098         0.0.0.0:*               LISTEN      3135169/kbfsfuse    
+tcp        0      0 127.0.0.1:37117         0.0.0.0:*               LISTEN      -                   
+tcp        0      0 0.0.0.0:17500           0.0.0.0:*               LISTEN      2837239/dropbox     
+tcp        0      0 127.0.0.1:5432          0.0.0.0:*               LISTEN      -                   
+tcp        0      0 127.0.0.1:631           0.0.0.0:*               LISTEN      -                   
+tcp        0      0 0.0.0.0:9123            0.0.0.0:*               LISTEN      -                   
+tcp        0      0 0.0.0.0:8281            0.0.0.0:*               LISTEN      -                   
+tcp        0      0 0.0.0.0:8383            0.0.0.0:*               LISTEN      -                   
+tcp        0      0 0.0.0.0:9900            0.0.0.0:*               LISTEN      -                   
+tcp        0      0 127.0.0.1:27017         0.0.0.0:*               LISTEN      -                   
+tcp        0      0 0.0.0.0:22              0.0.0.0:*               LISTEN      -                   
+tcp        0      0 0.0.0.0:443             0.0.0.0:*               LISTEN      -                   
+tcp        0      0 0.0.0.0:6032            0.0.0.0:*               LISTEN      -                   
+tcp        0      0 0.0.0.0:6033            0.0.0.0:*               LISTEN      -                   
+tcp        0      0 0.0.0.0:6033            0.0.0.0:*               LISTEN      -                   
+tcp        0      0 0.0.0.0:6033            0.0.0.0:*               LISTEN      -                   
+tcp        0      0 0.0.0.0:6033            0.0.0.0:*               LISTEN      -                   
+tcp        0      0 127.0.0.1:17603         0.0.0.0:*               LISTEN      2837239/dropbox     
+tcp        0      0 127.0.0.1:17600         0.0.0.0:*               LISTEN      2837239/dropbox     
+tcp        0      0 127.0.0.1:17553         0.0.0.0:*               LISTEN      3135130/keybase     
+tcp        0      0 192.168.55.2:33644      89.253.240.17:993       ESTABLISHED 3668124/thunderbird 
+tcp        0      0 192.168.55.2:43180      173.194.220.108:993     ESTABLISHED 3668124/thunderbird 
+tcp        0      0 127.0.0.1:33328         127.0.0.1:3306          TIME_WAIT   -                   
+tcp        0      0 192.168.55.2:59258      188.114.99.233:443      ESTABLISHED 2224410/firefox     
+tcp        0      0 192.168.55.2:50852      89.253.240.17:143       ESTABLISHED 3668124/thunderbird 
+tcp        0      0 192.168.55.2:35408      91.105.192.100:443      ESTABLISHED 1712863/Telegram    
+tcp        0      0 127.0.0.1:44464         127.0.0.1:12345         ESTABLISHED 3060170/mysqld      
+tcp        0      0 127.0.0.1:57436         127.0.0.1:12347         ESTABLISHED 3036479/mysqld      
+tcp        0      0 192.168.55.2:51512      142.250.150.154:443     TIME_WAIT   -                   
+tcp        0      0 192.168.55.2:50428      173.194.220.108:993     ESTABLISHED 3668124/thunderbird 
+tcp        0      0 192.168.55.2:38864      35.75.32.93:443         ESTABLISHED 622088/Slack --stan 
+tcp        0      0 192.168.55.2:47024      34.120.208.123:443      TIME_WAIT   -                   
+tcp        0      0 192.168.55.2:54002      18.205.222.128:443      ESTABLISHED -                   
+tcp        0      0 127.0.0.1:33532         127.0.0.1:42002         ESTABLISHED -                   
+tcp        0      0 192.168.55.2:59960      188.114.99.233:443      ESTABLISHED 2224410/firefox     
+tcp        0      0 192.168.55.2:50432      173.194.220.108:993     ESTABLISHED 3668124/thunderbird 
+tcp        0      0 192.168.55.2:44788      52.57.79.4:443          ESTABLISHED 2147311/chrome --ty 
+tcp        0      0 10.0.0.5:37084          162.125.21.3:443        ESTABLISHED 2837239/dropbox     
+tcp        0      0 192.168.55.2:60592      108.157.214.47:443      ESTABLISHED 2147311/chrome --ty 
+tcp        0      0 192.168.55.2:38858      35.75.32.93:443         ESTABLISHED 622088/Slack --stan 
+tcp        0      0 192.168.55.2:55814      3.68.61.181:443         ESTABLISHED 622088/Slack --stan 
+tcp        0      0 192.168.55.2:59296      173.194.73.94:443       TIME_WAIT   -                   
+tcp       25      0 192.168.55.2:36048      170.114.52.66:443       CLOSE_WAIT  2504953/zoom        
+tcp        0      0 192.168.55.2:35426      91.105.192.100:443      ESTABLISHED 1712863/Telegram    
+tcp        0      0 10.0.0.5:54900          162.125.21.3:443        ESTABLISHED 2837239/dropbox     
+tcp        0      0 192.168.55.2:42500      108.177.14.94:443       TIME_WAIT   -                   
+tcp        0      0 192.168.55.2:50742      34.110.207.168:443      TIME_WAIT   -                   
+tcp        0      0 127.0.0.1:60112         127.0.0.1:42003         ESTABLISHED -                   
+tcp        0      0 192.168.55.2:36068      185.166.143.36:443      ESTABLISHED 2224410/firefox     
+tcp        0      0 127.0.0.1:50738         127.0.0.1:3306          TIME_WAIT   -                   
+tcp        0      0 192.168.55.2:35410      91.105.192.100:443      ESTABLISHED 1712863/Telegram    
+tcp        0      0 172.17.0.1:51720        172.17.0.2:443          ESTABLISHED -                   
+tcp        0      0 192.168.55.2:55146      35.75.32.93:443         ESTABLISHED 622088/Slack --stan 
+tcp        0      0 10.0.0.5:37220          10.0.0.5:4647           ESTABLISHED -                   
+tcp        0      1 192.168.55.2:45210      52.35.150.14:443        SYN_SENT    2224410/firefox     
+tcp        0      0 192.168.55.2:35784      54.86.147.85:443        ESTABLISHED 2147311/chrome --ty 
+tcp        0      0 192.168.55.2:34582      149.154.167.51:443      ESTABLISHED 1712863/Telegram    
+tcp        0      0 127.0.0.1:43756         127.0.0.1:3306          TIME_WAIT   -                   
+tcp        0      0 127.0.0.1:46308         127.0.0.1:3306          ESTABLISHED -                   
+tcp        0      0 192.168.55.2:60592      216.58.213.113:443      TIME_WAIT   -                   
+tcp        0      0 192.168.55.2:53128      188.114.98.233:443      ESTABLISHED 2224410/firefox     
+tcp        0      0 192.168.55.2:38856      35.75.32.93:443         ESTABLISHED 622088/Slack --stan 
+tcp        0      0 127.0.0.1:54838         127.0.0.1:42003         ESTABLISHED -                   
+tcp        0      0 192.168.55.2:43214      23.20.17.147:443        ESTABLISHED 2147311/chrome --ty 
+tcp        0      0 192.168.55.2:45224      108.157.214.111:443     ESTABLISHED 2147311/chrome --ty 
+tcp        0      0 127.0.0.1:37676         127.0.0.1:3306          TIME_WAIT   -                   
+tcp        0      0 192.168.55.2:35392      91.105.192.100:443      ESTABLISHED 1712863/Telegram    
+tcp        0      0 127.0.0.1:33302         127.0.0.1:3306          TIME_WAIT   -                   
+tcp        0      0 192.168.55.2:34472      142.251.1.138:443       ESTABLISHED 2147311/chrome --ty 
+tcp        0      0 127.0.0.1:46418         127.0.0.1:42000         ESTABLISHED -                   
+tcp        0      0 127.0.0.1:32870         127.0.0.1:3306          TIME_WAIT   -                   
+tcp        0      0 192.168.55.2:37972      3.164.240.62:443        TIME_WAIT   -                   
+tcp        0      0 192.168.55.2:49282      173.194.222.94:443      TIME_WAIT   -                   
+tcp        0      0 127.0.0.1:54650         127.0.0.1:12345         ESTABLISHED 3060170/mysqld      
+tcp        0      0 192.168.55.2:36956      34.202.253.140:443      ESTABLISHED 622088/Slack --stan 
+tcp        0      0 127.0.0.1:55670         127.0.0.1:3306          TIME_WAIT   -                   
+tcp        0      0 127.0.0.1:50728         127.0.0.1:3306          TIME_WAIT   -                   
+tcp        0      1 192.168.55.2:50806      157.240.205.174:443     SYN_SENT    2147311/chrome --ty 
+tcp        0      0 127.0.0.1:42000         127.0.0.1:46418         ESTABLISHED -                   
+tcp        0      0 127.0.0.1:54598         127.0.0.1:42002         ESTABLISHED -                   
+tcp        0      0 10.0.0.5:58674          213.180.204.148:443     ESTABLISHED 8568/yandex-disk    
+tcp        0      0 127.0.0.1:42003         127.0.0.1:54838         ESTABLISHED -                   
+tcp        0      0 192.168.55.2:48518      162.125.21.3:443        ESTABLISHED 2837239/dropbox     
+tcp        0      0 127.0.0.1:46284         127.0.0.1:3306          TIME_WAIT   -                   
+tcp        0      0 192.168.55.2:53242      35.74.138.212:443       ESTABLISHED 622088/Slack --stan 
+tcp        0      0 10.0.0.5:33806          162.125.21.3:443        ESTABLISHED 2837239/dropbox     
+tcp        0      0 192.168.55.2:40532      170.114.4.224:443       ESTABLISHED 2504953/zoom        
+tcp        0      0 192.168.55.2:37980      3.164.240.62:443        TIME_WAIT   -                   
+tcp        0      0 10.0.0.5:60740          162.125.21.3:443        ESTABLISHED 2837239/dropbox     
+tcp        0      0 192.168.55.2:42486      108.177.14.94:443       TIME_WAIT   -                   
+tcp        0      0 127.0.0.1:57438         127.0.0.1:12347         ESTABLISHED 3036479/mysqld      
+tcp        0      0 127.0.0.1:58618         127.0.0.1:42001         ESTABLISHED -                   
+tcp        0      0 127.0.0.1:50754         127.0.0.1:3306          ESTABLISHED -                   
+tcp        0      0 127.0.0.1:43240         127.0.0.1:3306          TIME_WAIT   -                   
+tcp        0      0 127.0.0.1:42001         127.0.0.1:58618         ESTABLISHED -                   
+tcp        0      0 192.168.55.2:53250      35.74.138.212:443       ESTABLISHED 622088/Slack --stan 
+tcp        0      0 192.168.55.2:43190      173.194.220.108:993     ESTABLISHED 3668124/thunderbird 
+tcp        0      0 192.168.55.2:60080      54.159.113.253:443      ESTABLISHED 3135169/kbfsfuse    
+tcp        0      0 192.168.55.2:33476      52.193.110.50:443       ESTABLISHED 622088/Slack --stan 
+tcp        0      0 127.0.0.1:42001         127.0.0.1:41588         ESTABLISHED -                   
+tcp       25      0 192.168.55.2:57194      52.84.151.38:443        CLOSE_WAIT  2504953/zoom        
+tcp        0      0 192.168.55.2:50414      173.194.220.108:993     ESTABLISHED 3668124/thunderbird 
+tcp        0      0 192.168.55.2:40774      54.159.239.26:443       ESTABLISHED 2147311/chrome --ty 
+tcp        0      0 192.168.55.2:49554      108.157.52.95:443       TIME_WAIT   -                   
+tcp        0      0 192.168.55.2:55152      35.75.32.93:443         ESTABLISHED 622088/Slack --stan 
+tcp        0      0 192.168.55.2:54482      52.73.238.236:443       ESTABLISHED 2224410/firefox     
+tcp        0      0 192.168.55.2:43900      142.251.140.14:443      TIME_WAIT   -                   
+tcp        0      0 10.0.0.5:52942          213.180.204.148:443     ESTABLISHED 616951/yandex-disk  
+tcp        1      0 127.0.0.1:60442         127.0.0.1:12347         CLOSE_WAIT  3036479/mysqld      
+tcp        0      0 192.168.55.2:36288      18.190.135.240:443      ESTABLISHED 2147311/chrome --ty 
+tcp       25      0 192.168.55.2:49858      170.114.52.2:443        CLOSE_WAIT  2504953/zoom        
+tcp        0      0 192.168.55.2:50244      172.64.152.233:443      ESTABLISHED 2224410/firefox     
+tcp        0      0 10.0.0.5:38802          162.125.21.3:443        ESTABLISHED 2837239/dropbox     
+tcp       13      0 10.0.0.5:34986          10.0.0.1:139            CLOSE_WAIT  37531/gvfsd-smb-bro 
+tcp        0      0 192.168.55.2:35416      91.105.192.100:443      ESTABLISHED 1712863/Telegram    
+tcp        0      0 192.168.55.2:53948      74.125.205.188:5228     ESTABLISHED 2147311/chrome --ty 
+tcp        0      0 127.0.0.1:37416         127.0.0.1:12347         ESTABLISHED 3060170/mysqld      
+tcp        0      0 192.168.55.2:47012      52.73.62.51:443         ESTABLISHED -                   
+tcp        0      0 192.168.55.2:36618      162.125.21.2:443        ESTABLISHED 2837239/dropbox     
+tcp        0      0 127.0.0.1:33316         127.0.0.1:3306          TIME_WAIT   -                   
+tcp        0      0 192.168.55.2:55440      3.68.61.181:443         ESTABLISHED 622088/Slack --stan 
+tcp        0      0 127.0.0.1:41588         127.0.0.1:42001         ESTABLISHED -                   
+tcp        0      0 127.0.0.1:54652         127.0.0.1:12345         ESTABLISHED 3060170/mysqld      
+tcp        0      0 192.168.55.2:34910      64.233.162.188:5228     ESTABLISHED 2147311/chrome --ty 
+tcp        0      0 10.0.0.5:55240          162.125.21.3:443        ESTABLISHED 2837239/dropbox     
+tcp        0      0 10.0.0.5:36148          162.125.21.3:443        ESTABLISHED 2837239/dropbox     
+tcp       25      0 192.168.55.2:49844      170.114.52.2:443        CLOSE_WAIT  2504953/zoom        
+tcp        0      0 127.0.0.1:34666         127.0.0.1:12346         ESTABLISHED 3035305/mysqld      
+tcp        0      0 127.0.0.1:57612         127.0.0.1:42001         ESTABLISHED -                   
+tcp        0      0 172.17.0.1:58414        172.17.0.2:443          ESTABLISHED -                   
+tcp        0      1 192.168.55.2:50810      157.240.205.174:443     SYN_SENT    2147311/chrome --ty 
+tcp        0      0 192.168.55.2:49218      38.111.114.11:993       ESTABLISHED 3668124/thunderbird 
+tcp        0      0 192.168.55.2:53752      188.114.98.233:443      ESTABLISHED 2224410/firefox     
+tcp        0      0 127.0.0.1:43254         127.0.0.1:3306          TIME_WAIT   -                   
+tcp        0      0 192.168.55.2:35440      91.105.192.100:443      ESTABLISHED 1712863/Telegram    
+tcp        0      0 127.0.0.1:42003         127.0.0.1:60112         ESTABLISHED -                   
+tcp        0      0 127.0.0.1:54826         127.0.0.1:42003         ESTABLISHED -                   
+tcp        0      0 10.0.0.5:37224          10.0.0.5:4647           ESTABLISHED -                   
+tcp        0      0 192.168.55.2:55324      54.158.119.218:443      ESTABLISHED 3135169/kbfsfuse    
+tcp        0      0 192.168.55.2:50438      206.247.115.239:5091    ESTABLISHED 2504953/zoom        
+tcp        0      0 127.0.0.1:55674         127.0.0.1:3306          TIME_WAIT   -                   
+tcp        0      0 127.0.0.1:50720         127.0.0.1:3306          ESTABLISHED -                   
+tcp        0      0 192.168.55.2:49180      34.117.188.166:443      ESTABLISHED 2224410/firefox     
+tcp        0      0 192.168.55.2:55130      35.75.32.93:443         ESTABLISHED 622088/Slack --stan 
+tcp        0      0 192.168.55.2:51354      54.147.17.17:443        ESTABLISHED 3135130/keybase     
+tcp        0      0 127.0.0.1:43796         127.0.0.1:3306          TIME_WAIT   -                   
+tcp        0      0 192.168.55.2:49168      34.117.188.166:443      TIME_WAIT   -                   
+tcp        0      0 192.168.55.2:46678      34.107.243.93:443       ESTABLISHED 2224410/firefox     
+tcp        0      0 127.0.0.1:36028         127.0.0.1:3306          ESTABLISHED -                   
+tcp        0      0 127.0.0.1:32854         127.0.0.1:3306          TIME_WAIT   -                   
+tcp        0      0 127.0.0.1:46836         127.0.0.1:3306          TIME_WAIT   -                   
+tcp        0      0 127.0.0.1:37640         127.0.0.1:3306          TIME_WAIT   -                   
+tcp        0      0 192.168.55.2:59538      140.82.114.25:443       ESTABLISHED 2224410/firefox     
+tcp        0      0 127.0.0.1:42002         127.0.0.1:33532         ESTABLISHED -                   
+tcp        1      0 127.0.0.1:59430         127.0.0.1:12347         CLOSE_WAIT  3036479/mysqld      
+tcp        0      1 192.168.55.2:45222      52.35.150.14:443        SYN_SENT    2224410/firefox     
+tcp        0      0 192.168.55.2:37802      64.233.165.104:443      TIME_WAIT   -                   
+tcp        0      0 192.168.55.2:42080      157.240.205.60:443      ESTABLISHED 2147311/chrome --ty 
+tcp        0      0 127.0.0.1:42002         127.0.0.1:54598         ESTABLISHED -                   
+tcp        0      0 127.0.0.1:47960         127.0.0.1:42002         ESTABLISHED -                   
+tcp        0      0 127.0.0.1:37430         127.0.0.1:12347         ESTABLISHED 3060170/mysqld      
+tcp        0      0 192.168.55.2:38774      77.223.96.250:443       ESTABLISHED 2224410/firefox     
+tcp        0      0 127.0.0.1:32844         127.0.0.1:3306          ESTABLISHED -                   
+tcp        0      0 192.168.55.2:44030      3.160.57.75:443         TIME_WAIT   -                   
+tcp        0      0 127.0.0.1:42003         127.0.0.1:54826         ESTABLISHED -                   
+tcp        0      0 127.0.0.1:42002         127.0.0.1:47960         ESTABLISHED -                   
+tcp        1      0 127.0.0.1:59438         127.0.0.1:12347         CLOSE_WAIT  3036479/mysqld      
+tcp        0      0 192.168.55.2:35430      91.105.192.100:443      ESTABLISHED 1712863/Telegram    
+tcp        0      0 192.168.55.2:55414      3.68.61.181:443         ESTABLISHED 622088/Slack --stan 
+tcp        0      0 127.0.0.1:46296         127.0.0.1:3306          TIME_WAIT   -                   
+tcp        0      0 127.0.0.1:32874         127.0.0.1:3306          ESTABLISHED -                   
+tcp        0      0 172.17.0.1:44894        172.17.0.2:443          ESTABLISHED -                   
+tcp        0      0 192.168.55.2:55950      170.114.15.227:443      ESTABLISHED 2504953/zoom        
+tcp        1      0 127.0.0.1:57442         127.0.0.1:12347         CLOSE_WAIT  3036479/mysqld      
+tcp        0      0 192.168.255.22:35056    213.180.204.148:443     ESTABLISHED 1932374/yandex-disk 
+tcp        0      0 192.168.55.2:43440      194.85.125.1:443        ESTABLISHED 2224410/firefox     
+tcp        0      0 172.17.0.1:42368        172.17.0.2:443          ESTABLISHED -                   
+tcp        0      0 127.0.0.1:42001         127.0.0.1:57612         ESTABLISHED -                   
+tcp        0      0 127.0.0.1:39666         127.0.0.1:3306          ESTABLISHED -                   
+tcp6       0      0 :::17500                :::*                    LISTEN      2837239/dropbox     
+tcp6       0      0 :::9123                 :::*                    LISTEN      -                   
+tcp6       0      0 :::8281                 :::*                    LISTEN      -                   
+tcp6       0      0 :::8383                 :::*                    LISTEN      -                   
+tcp6       0      0 :::9900                 :::*                    LISTEN      -                   
+tcp6       0      0 ::1:631                 :::*                    LISTEN      -                   
+tcp6       0      0 :::12345                :::*                    LISTEN      3036479/mysqld      
+tcp6       0      0 :::12346                :::*                    LISTEN      3060170/mysqld      
+tcp6       0      0 :::12347                :::*                    LISTEN      3035305/mysqld      
+tcp6       0      0 :::3306                 :::*                    LISTEN      -                   
+tcp6       0      0 :::22                   :::*                    LISTEN      -                   
+tcp6       0      0 :::33060                :::*                    LISTEN      -                   
+tcp6       0      0 :::443                  :::*                    LISTEN      -                   
+tcp6       0      0 :::1716                 :::*                    LISTEN      7748/kdeconnectd    
+tcp6       0      0 :::8080                 :::*                    LISTEN      -                   
+tcp6       0      0 :::4648                 :::*                    LISTEN      -                   
+tcp6       0      0 :::4646                 :::*                    LISTEN      -                   
+tcp6       0      0 :::4647                 :::*                    LISTEN      -                   
+tcp6       0      0 127.0.0.1:12347         127.0.0.1:57436         ESTABLISHED 3035305/mysqld      
+tcp6       0      0 127.0.0.1:12345         127.0.0.1:44464         ESTABLISHED 3036479/mysqld      
+tcp6       0      0 127.0.0.1:3306          127.0.0.1:36028         ESTABLISHED -                   
+tcp6       0      0 10.0.0.5:4647           10.0.0.5:37224          ESTABLISHED -                   
+tcp6       0      0 127.0.0.1:3306          127.0.0.1:50720         ESTABLISHED -                   
+tcp6       0      0 127.0.0.1:3306          127.0.0.1:32844         ESTABLISHED -                   
+tcp6       0      0 127.0.0.1:3306          127.0.0.1:43254         TIME_WAIT   -                   
+tcp6       0      0 127.0.0.1:3306          127.0.0.1:43756         TIME_WAIT   -                   
+tcp6       0      0 127.0.0.1:12347         127.0.0.1:37416         ESTABLISHED 3035305/mysqld      
+tcp6       0      0 127.0.0.1:3306          127.0.0.1:32874         ESTABLISHED -                   
+tcp6       0      0 10.0.0.5:4647           10.0.0.5:37220          ESTABLISHED -                   
+tcp6       0      0 127.0.0.1:3306          127.0.0.1:32870         TIME_WAIT   -                   
+tcp6       0      0 127.0.0.1:12347         127.0.0.1:37430         ESTABLISHED 3035305/mysqld      
+tcp6       0      0 127.0.0.1:3306          127.0.0.1:50754         ESTABLISHED -                   
+tcp6       0      0 127.0.0.1:12345         127.0.0.1:54652         ESTABLISHED 3036479/mysqld      
+tcp6       0      0 127.0.0.1:3306          127.0.0.1:50738         TIME_WAIT   -                   
+tcp6       0      0 127.0.0.1:3306          127.0.0.1:39666         ESTABLISHED -                   
+tcp6       0      0 127.0.0.1:3306          127.0.0.1:33302         TIME_WAIT   -                   
+tcp6       0      0 127.0.0.1:12347         127.0.0.1:57438         ESTABLISHED 3035305/mysqld      
+tcp6       0      0 127.0.0.1:3306          127.0.0.1:46308         ESTABLISHED -                   
+tcp6       0      0 127.0.0.1:12346         127.0.0.1:34666         ESTABLISHED 3060170/mysqld      
+tcp6       0      0 127.0.0.1:12345         127.0.0.1:54650         ESTABLISHED 3036479/mysqld      
+tcp6       0      0 127.0.0.1:3306          127.0.0.1:46296         TIME_WAIT   -                   
diff --git a/t/pt-summary/samples/Linux/009/notable_procs b/t/pt-summary/samples/Linux/009/notable_procs
new file mode 100644
index 000000000..ced71a345
--- /dev/null
+++ b/t/pt-summary/samples/Linux/009/notable_procs
@@ -0,0 +1,5 @@
+  PID    OOM    COMMAND
+    ?      ?    sshd doesn't appear to be running
+1499134    -17    multipathd
+2849628    -17    nomad
+3202899    -17    sshd
diff --git a/t/pt-summary/samples/Linux/009/partitioning b/t/pt-summary/samples/Linux/009/partitioning
new file mode 100644
index 000000000..f530bb49c
--- /dev/null
+++ b/t/pt-summary/samples/Linux/009/partitioning
@@ -0,0 +1,12 @@
+Disk /dev/nvme0n1: 3,64 TiB, 4000787030016 bytes, 7814037168 sectors
+Disk model: WD_BLACK SN850X 4000GB                  
+Units: sectors of 1 * 512 = 512 bytes
+Sector size (logical/physical): 512 bytes / 512 bytes
+I/O size (minimum/optimal): 512 bytes / 512 bytes
+Disklabel type: gpt
+Disk identifier: F57C2A9B-3E4B-49BA-BA83-3D206D23C1F6
+
+Device           Start        End    Sectors  Size Type
+/dev/nvme0n1p1    2048    1050623    1048576  512M EFI System
+/dev/nvme0n1p2 1050624    4550655    3500032  1,7G Linux filesystem
+/dev/nvme0n1p3 4550656 7814035455 7809484800  3,6T Linux filesystem
diff --git a/t/pt-summary/samples/Linux/009/proc_cpuinfo_copy b/t/pt-summary/samples/Linux/009/proc_cpuinfo_copy
new file mode 100644
index 000000000..9b7ff23c8
--- /dev/null
+++ b/t/pt-summary/samples/Linux/009/proc_cpuinfo_copy
@@ -0,0 +1,448 @@
+processor	: 0
+vendor_id	: GenuineIntel
+cpu family	: 6
+model		: 154
+model name	: 12th Gen Intel(R) Core(TM) i7-1260P
+stepping	: 3
+microcode	: 0x433
+cpu MHz		: 2788.142
+cache size	: 18432 KB
+physical id	: 0
+siblings	: 16
+core id		: 0
+cpu cores	: 12
+apicid		: 0
+initial apicid	: 0
+fpu		: yes
+fpu_exception	: yes
+cpuid level	: 32
+wp		: yes
+flags		: fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe syscall nx pdpe1gb rdtscp lm constant_tsc art arch_perfmon pebs bts rep_good nopl xtopology nonstop_tsc cpuid aperfmperf tsc_known_freq pni pclmulqdq dtes64 monitor ds_cpl vmx smx est tm2 ssse3 sdbg fma cx16 xtpr pdcm sse4_1 sse4_2 x2apic movbe popcnt tsc_deadline_timer aes xsave avx f16c rdrand lahf_lm abm 3dnowprefetch cpuid_fault epb ssbd ibrs ibpb stibp ibrs_enhanced tpr_shadow flexpriority ept vpid ept_ad fsgsbase tsc_adjust bmi1 avx2 smep bmi2 erms invpcid rdseed adx smap clflushopt clwb intel_pt sha_ni xsaveopt xsavec xgetbv1 xsaves split_lock_detect avx_vnni dtherm ida arat pln pts hwp hwp_notify hwp_act_window hwp_epp hwp_pkg_req hfi vnmi umip pku ospke waitpkg gfni vaes vpclmulqdq rdpid movdiri movdir64b fsrm md_clear serialize arch_lbr ibt flush_l1d arch_capabilities
+vmx flags	: vnmi preemption_timer posted_intr invvpid ept_x_only ept_ad ept_1gb flexpriority apicv tsc_offset vtpr mtf vapic ept vpid unrestricted_guest vapic_reg vid ple shadow_vmcs ept_mode_based_exec tsc_scaling usr_wait_pause
+bugs		: coma tlb_mmatch spectre_v1 spectre_v2 spec_store_bypass swapgs eibrs_pbrsb bhi
+bogomips	: 4992.00
+clflush size	: 64
+cache_alignment	: 64
+address sizes	: 39 bits physical, 48 bits virtual
+power management:
+
+processor	: 1
+vendor_id	: GenuineIntel
+cpu family	: 6
+model		: 154
+model name	: 12th Gen Intel(R) Core(TM) i7-1260P
+stepping	: 3
+microcode	: 0x433
+cpu MHz		: 2789.364
+cache size	: 18432 KB
+physical id	: 0
+siblings	: 16
+core id		: 0
+cpu cores	: 12
+apicid		: 1
+initial apicid	: 1
+fpu		: yes
+fpu_exception	: yes
+cpuid level	: 32
+wp		: yes
+flags		: fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe syscall nx pdpe1gb rdtscp lm constant_tsc art arch_perfmon pebs bts rep_good nopl xtopology nonstop_tsc cpuid aperfmperf tsc_known_freq pni pclmulqdq dtes64 monitor ds_cpl vmx smx est tm2 ssse3 sdbg fma cx16 xtpr pdcm sse4_1 sse4_2 x2apic movbe popcnt tsc_deadline_timer aes xsave avx f16c rdrand lahf_lm abm 3dnowprefetch cpuid_fault epb ssbd ibrs ibpb stibp ibrs_enhanced tpr_shadow flexpriority ept vpid ept_ad fsgsbase tsc_adjust bmi1 avx2 smep bmi2 erms invpcid rdseed adx smap clflushopt clwb intel_pt sha_ni xsaveopt xsavec xgetbv1 xsaves split_lock_detect avx_vnni dtherm ida arat pln pts hwp hwp_notify hwp_act_window hwp_epp hwp_pkg_req hfi vnmi umip pku ospke waitpkg gfni vaes vpclmulqdq rdpid movdiri movdir64b fsrm md_clear serialize arch_lbr ibt flush_l1d arch_capabilities
+vmx flags	: vnmi preemption_timer posted_intr invvpid ept_x_only ept_ad ept_1gb flexpriority apicv tsc_offset vtpr mtf vapic ept vpid unrestricted_guest vapic_reg vid ple shadow_vmcs ept_mode_based_exec tsc_scaling usr_wait_pause
+bugs		: coma tlb_mmatch spectre_v1 spectre_v2 spec_store_bypass swapgs eibrs_pbrsb bhi
+bogomips	: 4992.00
+clflush size	: 64
+cache_alignment	: 64
+address sizes	: 39 bits physical, 48 bits virtual
+power management:
+
+processor	: 2
+vendor_id	: GenuineIntel
+cpu family	: 6
+model		: 154
+model name	: 12th Gen Intel(R) Core(TM) i7-1260P
+stepping	: 3
+microcode	: 0x433
+cpu MHz		: 2778.914
+cache size	: 18432 KB
+physical id	: 0
+siblings	: 16
+core id		: 4
+cpu cores	: 12
+apicid		: 8
+initial apicid	: 8
+fpu		: yes
+fpu_exception	: yes
+cpuid level	: 32
+wp		: yes
+flags		: fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe syscall nx pdpe1gb rdtscp lm constant_tsc art arch_perfmon pebs bts rep_good nopl xtopology nonstop_tsc cpuid aperfmperf tsc_known_freq pni pclmulqdq dtes64 monitor ds_cpl vmx smx est tm2 ssse3 sdbg fma cx16 xtpr pdcm sse4_1 sse4_2 x2apic movbe popcnt tsc_deadline_timer aes xsave avx f16c rdrand lahf_lm abm 3dnowprefetch cpuid_fault epb ssbd ibrs ibpb stibp ibrs_enhanced tpr_shadow flexpriority ept vpid ept_ad fsgsbase tsc_adjust bmi1 avx2 smep bmi2 erms invpcid rdseed adx smap clflushopt clwb intel_pt sha_ni xsaveopt xsavec xgetbv1 xsaves split_lock_detect avx_vnni dtherm ida arat pln pts hwp hwp_notify hwp_act_window hwp_epp hwp_pkg_req hfi vnmi umip pku ospke waitpkg gfni vaes vpclmulqdq rdpid movdiri movdir64b fsrm md_clear serialize arch_lbr ibt flush_l1d arch_capabilities
+vmx flags	: vnmi preemption_timer posted_intr invvpid ept_x_only ept_ad ept_1gb flexpriority apicv tsc_offset vtpr mtf vapic ept vpid unrestricted_guest vapic_reg vid ple shadow_vmcs ept_mode_based_exec tsc_scaling usr_wait_pause
+bugs		: coma tlb_mmatch spectre_v1 spectre_v2 spec_store_bypass swapgs eibrs_pbrsb bhi
+bogomips	: 4992.00
+clflush size	: 64
+cache_alignment	: 64
+address sizes	: 39 bits physical, 48 bits virtual
+power management:
+
+processor	: 3
+vendor_id	: GenuineIntel
+cpu family	: 6
+model		: 154
+model name	: 12th Gen Intel(R) Core(TM) i7-1260P
+stepping	: 3
+microcode	: 0x433
+cpu MHz		: 2788.149
+cache size	: 18432 KB
+physical id	: 0
+siblings	: 16
+core id		: 4
+cpu cores	: 12
+apicid		: 9
+initial apicid	: 9
+fpu		: yes
+fpu_exception	: yes
+cpuid level	: 32
+wp		: yes
+flags		: fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe syscall nx pdpe1gb rdtscp lm constant_tsc art arch_perfmon pebs bts rep_good nopl xtopology nonstop_tsc cpuid aperfmperf tsc_known_freq pni pclmulqdq dtes64 monitor ds_cpl vmx smx est tm2 ssse3 sdbg fma cx16 xtpr pdcm sse4_1 sse4_2 x2apic movbe popcnt tsc_deadline_timer aes xsave avx f16c rdrand lahf_lm abm 3dnowprefetch cpuid_fault epb ssbd ibrs ibpb stibp ibrs_enhanced tpr_shadow flexpriority ept vpid ept_ad fsgsbase tsc_adjust bmi1 avx2 smep bmi2 erms invpcid rdseed adx smap clflushopt clwb intel_pt sha_ni xsaveopt xsavec xgetbv1 xsaves split_lock_detect avx_vnni dtherm ida arat pln pts hwp hwp_notify hwp_act_window hwp_epp hwp_pkg_req hfi vnmi umip pku ospke waitpkg gfni vaes vpclmulqdq rdpid movdiri movdir64b fsrm md_clear serialize arch_lbr ibt flush_l1d arch_capabilities
+vmx flags	: vnmi preemption_timer posted_intr invvpid ept_x_only ept_ad ept_1gb flexpriority apicv tsc_offset vtpr mtf vapic ept vpid unrestricted_guest vapic_reg vid ple shadow_vmcs ept_mode_based_exec tsc_scaling usr_wait_pause
+bugs		: coma tlb_mmatch spectre_v1 spectre_v2 spec_store_bypass swapgs eibrs_pbrsb bhi
+bogomips	: 4992.00
+clflush size	: 64
+cache_alignment	: 64
+address sizes	: 39 bits physical, 48 bits virtual
+power management:
+
+processor	: 4
+vendor_id	: GenuineIntel
+cpu family	: 6
+model		: 154
+model name	: 12th Gen Intel(R) Core(TM) i7-1260P
+stepping	: 3
+microcode	: 0x433
+cpu MHz		: 2788.156
+cache size	: 18432 KB
+physical id	: 0
+siblings	: 16
+core id		: 8
+cpu cores	: 12
+apicid		: 16
+initial apicid	: 16
+fpu		: yes
+fpu_exception	: yes
+cpuid level	: 32
+wp		: yes
+flags		: fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe syscall nx pdpe1gb rdtscp lm constant_tsc art arch_perfmon pebs bts rep_good nopl xtopology nonstop_tsc cpuid aperfmperf tsc_known_freq pni pclmulqdq dtes64 monitor ds_cpl vmx smx est tm2 ssse3 sdbg fma cx16 xtpr pdcm sse4_1 sse4_2 x2apic movbe popcnt tsc_deadline_timer aes xsave avx f16c rdrand lahf_lm abm 3dnowprefetch cpuid_fault epb ssbd ibrs ibpb stibp ibrs_enhanced tpr_shadow flexpriority ept vpid ept_ad fsgsbase tsc_adjust bmi1 avx2 smep bmi2 erms invpcid rdseed adx smap clflushopt clwb intel_pt sha_ni xsaveopt xsavec xgetbv1 xsaves split_lock_detect avx_vnni dtherm ida arat pln pts hwp hwp_notify hwp_act_window hwp_epp hwp_pkg_req hfi vnmi umip pku ospke waitpkg gfni vaes vpclmulqdq rdpid movdiri movdir64b fsrm md_clear serialize arch_lbr ibt flush_l1d arch_capabilities
+vmx flags	: vnmi preemption_timer posted_intr invvpid ept_x_only ept_ad ept_1gb flexpriority apicv tsc_offset vtpr mtf vapic ept vpid unrestricted_guest vapic_reg vid ple shadow_vmcs ept_mode_based_exec tsc_scaling usr_wait_pause
+bugs		: coma tlb_mmatch spectre_v1 spectre_v2 spec_store_bypass swapgs eibrs_pbrsb bhi
+bogomips	: 4992.00
+clflush size	: 64
+cache_alignment	: 64
+address sizes	: 39 bits physical, 48 bits virtual
+power management:
+
+processor	: 5
+vendor_id	: GenuineIntel
+cpu family	: 6
+model		: 154
+model name	: 12th Gen Intel(R) Core(TM) i7-1260P
+stepping	: 3
+microcode	: 0x433
+cpu MHz		: 2783.569
+cache size	: 18432 KB
+physical id	: 0
+siblings	: 16
+core id		: 8
+cpu cores	: 12
+apicid		: 17
+initial apicid	: 17
+fpu		: yes
+fpu_exception	: yes
+cpuid level	: 32
+wp		: yes
+flags		: fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe syscall nx pdpe1gb rdtscp lm constant_tsc art arch_perfmon pebs bts rep_good nopl xtopology nonstop_tsc cpuid aperfmperf tsc_known_freq pni pclmulqdq dtes64 monitor ds_cpl vmx smx est tm2 ssse3 sdbg fma cx16 xtpr pdcm sse4_1 sse4_2 x2apic movbe popcnt tsc_deadline_timer aes xsave avx f16c rdrand lahf_lm abm 3dnowprefetch cpuid_fault epb ssbd ibrs ibpb stibp ibrs_enhanced tpr_shadow flexpriority ept vpid ept_ad fsgsbase tsc_adjust bmi1 avx2 smep bmi2 erms invpcid rdseed adx smap clflushopt clwb intel_pt sha_ni xsaveopt xsavec xgetbv1 xsaves split_lock_detect avx_vnni dtherm ida arat pln pts hwp hwp_notify hwp_act_window hwp_epp hwp_pkg_req hfi vnmi umip pku ospke waitpkg gfni vaes vpclmulqdq rdpid movdiri movdir64b fsrm md_clear serialize arch_lbr ibt flush_l1d arch_capabilities
+vmx flags	: vnmi preemption_timer posted_intr invvpid ept_x_only ept_ad ept_1gb flexpriority apicv tsc_offset vtpr mtf vapic ept vpid unrestricted_guest vapic_reg vid ple shadow_vmcs ept_mode_based_exec tsc_scaling usr_wait_pause
+bugs		: coma tlb_mmatch spectre_v1 spectre_v2 spec_store_bypass swapgs eibrs_pbrsb bhi
+bogomips	: 4992.00
+clflush size	: 64
+cache_alignment	: 64
+address sizes	: 39 bits physical, 48 bits virtual
+power management:
+
+processor	: 6
+vendor_id	: GenuineIntel
+cpu family	: 6
+model		: 154
+model name	: 12th Gen Intel(R) Core(TM) i7-1260P
+stepping	: 3
+microcode	: 0x433
+cpu MHz		: 2788.144
+cache size	: 18432 KB
+physical id	: 0
+siblings	: 16
+core id		: 12
+cpu cores	: 12
+apicid		: 24
+initial apicid	: 24
+fpu		: yes
+fpu_exception	: yes
+cpuid level	: 32
+wp		: yes
+flags		: fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe syscall nx pdpe1gb rdtscp lm constant_tsc art arch_perfmon pebs bts rep_good nopl xtopology nonstop_tsc cpuid aperfmperf tsc_known_freq pni pclmulqdq dtes64 monitor ds_cpl vmx smx est tm2 ssse3 sdbg fma cx16 xtpr pdcm sse4_1 sse4_2 x2apic movbe popcnt tsc_deadline_timer aes xsave avx f16c rdrand lahf_lm abm 3dnowprefetch cpuid_fault epb ssbd ibrs ibpb stibp ibrs_enhanced tpr_shadow flexpriority ept vpid ept_ad fsgsbase tsc_adjust bmi1 avx2 smep bmi2 erms invpcid rdseed adx smap clflushopt clwb intel_pt sha_ni xsaveopt xsavec xgetbv1 xsaves split_lock_detect avx_vnni dtherm ida arat pln pts hwp hwp_notify hwp_act_window hwp_epp hwp_pkg_req hfi vnmi umip pku ospke waitpkg gfni vaes vpclmulqdq rdpid movdiri movdir64b fsrm md_clear serialize arch_lbr ibt flush_l1d arch_capabilities
+vmx flags	: vnmi preemption_timer posted_intr invvpid ept_x_only ept_ad ept_1gb flexpriority apicv tsc_offset vtpr mtf vapic ept vpid unrestricted_guest vapic_reg vid ple shadow_vmcs ept_mode_based_exec tsc_scaling usr_wait_pause
+bugs		: coma tlb_mmatch spectre_v1 spectre_v2 spec_store_bypass swapgs eibrs_pbrsb bhi
+bogomips	: 4992.00
+clflush size	: 64
+cache_alignment	: 64
+address sizes	: 39 bits physical, 48 bits virtual
+power management:
+
+processor	: 7
+vendor_id	: GenuineIntel
+cpu family	: 6
+model		: 154
+model name	: 12th Gen Intel(R) Core(TM) i7-1260P
+stepping	: 3
+microcode	: 0x433
+cpu MHz		: 2788.137
+cache size	: 18432 KB
+physical id	: 0
+siblings	: 16
+core id		: 12
+cpu cores	: 12
+apicid		: 25
+initial apicid	: 25
+fpu		: yes
+fpu_exception	: yes
+cpuid level	: 32
+wp		: yes
+flags		: fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe syscall nx pdpe1gb rdtscp lm constant_tsc art arch_perfmon pebs bts rep_good nopl xtopology nonstop_tsc cpuid aperfmperf tsc_known_freq pni pclmulqdq dtes64 monitor ds_cpl vmx smx est tm2 ssse3 sdbg fma cx16 xtpr pdcm sse4_1 sse4_2 x2apic movbe popcnt tsc_deadline_timer aes xsave avx f16c rdrand lahf_lm abm 3dnowprefetch cpuid_fault epb ssbd ibrs ibpb stibp ibrs_enhanced tpr_shadow flexpriority ept vpid ept_ad fsgsbase tsc_adjust bmi1 avx2 smep bmi2 erms invpcid rdseed adx smap clflushopt clwb intel_pt sha_ni xsaveopt xsavec xgetbv1 xsaves split_lock_detect avx_vnni dtherm ida arat pln pts hwp hwp_notify hwp_act_window hwp_epp hwp_pkg_req hfi vnmi umip pku ospke waitpkg gfni vaes vpclmulqdq rdpid movdiri movdir64b fsrm md_clear serialize arch_lbr ibt flush_l1d arch_capabilities
+vmx flags	: vnmi preemption_timer posted_intr invvpid ept_x_only ept_ad ept_1gb flexpriority apicv tsc_offset vtpr mtf vapic ept vpid unrestricted_guest vapic_reg vid ple shadow_vmcs ept_mode_based_exec tsc_scaling usr_wait_pause
+bugs		: coma tlb_mmatch spectre_v1 spectre_v2 spec_store_bypass swapgs eibrs_pbrsb bhi
+bogomips	: 4992.00
+clflush size	: 64
+cache_alignment	: 64
+address sizes	: 39 bits physical, 48 bits virtual
+power management:
+
+processor	: 8
+vendor_id	: GenuineIntel
+cpu family	: 6
+model		: 154
+model name	: 12th Gen Intel(R) Core(TM) i7-1260P
+stepping	: 3
+microcode	: 0x433
+cpu MHz		: 2361.790
+cache size	: 18432 KB
+physical id	: 0
+siblings	: 16
+core id		: 16
+cpu cores	: 12
+apicid		: 32
+initial apicid	: 32
+fpu		: yes
+fpu_exception	: yes
+cpuid level	: 32
+wp		: yes
+flags		: fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe syscall nx pdpe1gb rdtscp lm constant_tsc art arch_perfmon pebs bts rep_good nopl xtopology nonstop_tsc cpuid aperfmperf tsc_known_freq pni pclmulqdq dtes64 monitor ds_cpl vmx smx est tm2 ssse3 sdbg fma cx16 xtpr pdcm sse4_1 sse4_2 x2apic movbe popcnt tsc_deadline_timer aes xsave avx f16c rdrand lahf_lm abm 3dnowprefetch cpuid_fault epb ssbd ibrs ibpb stibp ibrs_enhanced tpr_shadow flexpriority ept vpid ept_ad fsgsbase tsc_adjust bmi1 avx2 smep bmi2 erms invpcid rdseed adx smap clflushopt clwb intel_pt sha_ni xsaveopt xsavec xgetbv1 xsaves split_lock_detect avx_vnni dtherm ida arat pln pts hwp hwp_notify hwp_act_window hwp_epp hwp_pkg_req hfi vnmi umip pku ospke waitpkg gfni vaes vpclmulqdq rdpid movdiri movdir64b fsrm md_clear serialize arch_lbr ibt flush_l1d arch_capabilities
+vmx flags	: vnmi preemption_timer posted_intr invvpid ept_x_only ept_ad ept_1gb flexpriority apicv tsc_offset vtpr mtf vapic ept vpid unrestricted_guest vapic_reg vid ple shadow_vmcs ept_mode_based_exec tsc_scaling usr_wait_pause
+bugs		: coma tlb_mmatch spectre_v1 spectre_v2 spec_store_bypass swapgs eibrs_pbrsb bhi
+bogomips	: 4992.00
+clflush size	: 64
+cache_alignment	: 64
+address sizes	: 39 bits physical, 48 bits virtual
+power management:
+
+processor	: 9
+vendor_id	: GenuineIntel
+cpu family	: 6
+model		: 154
+model name	: 12th Gen Intel(R) Core(TM) i7-1260P
+stepping	: 3
+microcode	: 0x433
+cpu MHz		: 2381.090
+cache size	: 18432 KB
+physical id	: 0
+siblings	: 16
+core id		: 17
+cpu cores	: 12
+apicid		: 34
+initial apicid	: 34
+fpu		: yes
+fpu_exception	: yes
+cpuid level	: 32
+wp		: yes
+flags		: fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe syscall nx pdpe1gb rdtscp lm constant_tsc art arch_perfmon pebs bts rep_good nopl xtopology nonstop_tsc cpuid aperfmperf tsc_known_freq pni pclmulqdq dtes64 monitor ds_cpl vmx smx est tm2 ssse3 sdbg fma cx16 xtpr pdcm sse4_1 sse4_2 x2apic movbe popcnt tsc_deadline_timer aes xsave avx f16c rdrand lahf_lm abm 3dnowprefetch cpuid_fault epb ssbd ibrs ibpb stibp ibrs_enhanced tpr_shadow flexpriority ept vpid ept_ad fsgsbase tsc_adjust bmi1 avx2 smep bmi2 erms invpcid rdseed adx smap clflushopt clwb intel_pt sha_ni xsaveopt xsavec xgetbv1 xsaves split_lock_detect avx_vnni dtherm ida arat pln pts hwp hwp_notify hwp_act_window hwp_epp hwp_pkg_req hfi vnmi umip pku ospke waitpkg gfni vaes vpclmulqdq rdpid movdiri movdir64b fsrm md_clear serialize arch_lbr ibt flush_l1d arch_capabilities
+vmx flags	: vnmi preemption_timer posted_intr invvpid ept_x_only ept_ad ept_1gb flexpriority apicv tsc_offset vtpr mtf vapic ept vpid unrestricted_guest vapic_reg vid ple shadow_vmcs ept_mode_based_exec tsc_scaling usr_wait_pause
+bugs		: coma tlb_mmatch spectre_v1 spectre_v2 spec_store_bypass swapgs eibrs_pbrsb bhi
+bogomips	: 4992.00
+clflush size	: 64
+cache_alignment	: 64
+address sizes	: 39 bits physical, 48 bits virtual
+power management:
+
+processor	: 10
+vendor_id	: GenuineIntel
+cpu family	: 6
+model		: 154
+model name	: 12th Gen Intel(R) Core(TM) i7-1260P
+stepping	: 3
+microcode	: 0x433
+cpu MHz		: 2372.925
+cache size	: 18432 KB
+physical id	: 0
+siblings	: 16
+core id		: 18
+cpu cores	: 12
+apicid		: 36
+initial apicid	: 36
+fpu		: yes
+fpu_exception	: yes
+cpuid level	: 32
+wp		: yes
+flags		: fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe syscall nx pdpe1gb rdtscp lm constant_tsc art arch_perfmon pebs bts rep_good nopl xtopology nonstop_tsc cpuid aperfmperf tsc_known_freq pni pclmulqdq dtes64 monitor ds_cpl vmx smx est tm2 ssse3 sdbg fma cx16 xtpr pdcm sse4_1 sse4_2 x2apic movbe popcnt tsc_deadline_timer aes xsave avx f16c rdrand lahf_lm abm 3dnowprefetch cpuid_fault epb ssbd ibrs ibpb stibp ibrs_enhanced tpr_shadow flexpriority ept vpid ept_ad fsgsbase tsc_adjust bmi1 avx2 smep bmi2 erms invpcid rdseed adx smap clflushopt clwb intel_pt sha_ni xsaveopt xsavec xgetbv1 xsaves split_lock_detect avx_vnni dtherm ida arat pln pts hwp hwp_notify hwp_act_window hwp_epp hwp_pkg_req hfi vnmi umip pku ospke waitpkg gfni vaes vpclmulqdq rdpid movdiri movdir64b fsrm md_clear serialize arch_lbr ibt flush_l1d arch_capabilities
+vmx flags	: vnmi preemption_timer posted_intr invvpid ept_x_only ept_ad ept_1gb flexpriority apicv tsc_offset vtpr mtf vapic ept vpid unrestricted_guest vapic_reg vid ple shadow_vmcs ept_mode_based_exec tsc_scaling usr_wait_pause
+bugs		: coma tlb_mmatch spectre_v1 spectre_v2 spec_store_bypass swapgs eibrs_pbrsb bhi
+bogomips	: 4992.00
+clflush size	: 64
+cache_alignment	: 64
+address sizes	: 39 bits physical, 48 bits virtual
+power management:
+
+processor	: 11
+vendor_id	: GenuineIntel
+cpu family	: 6
+model		: 154
+model name	: 12th Gen Intel(R) Core(TM) i7-1260P
+stepping	: 3
+microcode	: 0x433
+cpu MHz		: 2361.788
+cache size	: 18432 KB
+physical id	: 0
+siblings	: 16
+core id		: 19
+cpu cores	: 12
+apicid		: 38
+initial apicid	: 38
+fpu		: yes
+fpu_exception	: yes
+cpuid level	: 32
+wp		: yes
+flags		: fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe syscall nx pdpe1gb rdtscp lm constant_tsc art arch_perfmon pebs bts rep_good nopl xtopology nonstop_tsc cpuid aperfmperf tsc_known_freq pni pclmulqdq dtes64 monitor ds_cpl vmx smx est tm2 ssse3 sdbg fma cx16 xtpr pdcm sse4_1 sse4_2 x2apic movbe popcnt tsc_deadline_timer aes xsave avx f16c rdrand lahf_lm abm 3dnowprefetch cpuid_fault epb ssbd ibrs ibpb stibp ibrs_enhanced tpr_shadow flexpriority ept vpid ept_ad fsgsbase tsc_adjust bmi1 avx2 smep bmi2 erms invpcid rdseed adx smap clflushopt clwb intel_pt sha_ni xsaveopt xsavec xgetbv1 xsaves split_lock_detect avx_vnni dtherm ida arat pln pts hwp hwp_notify hwp_act_window hwp_epp hwp_pkg_req hfi vnmi umip pku ospke waitpkg gfni vaes vpclmulqdq rdpid movdiri movdir64b fsrm md_clear serialize arch_lbr ibt flush_l1d arch_capabilities
+vmx flags	: vnmi preemption_timer posted_intr invvpid ept_x_only ept_ad ept_1gb flexpriority apicv tsc_offset vtpr mtf vapic ept vpid unrestricted_guest vapic_reg vid ple shadow_vmcs ept_mode_based_exec tsc_scaling usr_wait_pause
+bugs		: coma tlb_mmatch spectre_v1 spectre_v2 spec_store_bypass swapgs eibrs_pbrsb bhi
+bogomips	: 4992.00
+clflush size	: 64
+cache_alignment	: 64
+address sizes	: 39 bits physical, 48 bits virtual
+power management:
+
+processor	: 12
+vendor_id	: GenuineIntel
+cpu family	: 6
+model		: 154
+model name	: 12th Gen Intel(R) Core(TM) i7-1260P
+stepping	: 3
+microcode	: 0x433
+cpu MHz		: 2387.139
+cache size	: 18432 KB
+physical id	: 0
+siblings	: 16
+core id		: 20
+cpu cores	: 12
+apicid		: 40
+initial apicid	: 40
+fpu		: yes
+fpu_exception	: yes
+cpuid level	: 32
+wp		: yes
+flags		: fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe syscall nx pdpe1gb rdtscp lm constant_tsc art arch_perfmon pebs bts rep_good nopl xtopology nonstop_tsc cpuid aperfmperf tsc_known_freq pni pclmulqdq dtes64 monitor ds_cpl vmx smx est tm2 ssse3 sdbg fma cx16 xtpr pdcm sse4_1 sse4_2 x2apic movbe popcnt tsc_deadline_timer aes xsave avx f16c rdrand lahf_lm abm 3dnowprefetch cpuid_fault epb ssbd ibrs ibpb stibp ibrs_enhanced tpr_shadow flexpriority ept vpid ept_ad fsgsbase tsc_adjust bmi1 avx2 smep bmi2 erms invpcid rdseed adx smap clflushopt clwb intel_pt sha_ni xsaveopt xsavec xgetbv1 xsaves split_lock_detect avx_vnni dtherm ida arat pln pts hwp hwp_notify hwp_act_window hwp_epp hwp_pkg_req hfi vnmi umip pku ospke waitpkg gfni vaes vpclmulqdq rdpid movdiri movdir64b fsrm md_clear serialize arch_lbr ibt flush_l1d arch_capabilities
+vmx flags	: vnmi preemption_timer posted_intr invvpid ept_x_only ept_ad ept_1gb flexpriority apicv tsc_offset vtpr mtf vapic ept vpid unrestricted_guest vapic_reg vid ple shadow_vmcs ept_mode_based_exec tsc_scaling usr_wait_pause
+bugs		: coma tlb_mmatch spectre_v1 spectre_v2 spec_store_bypass swapgs eibrs_pbrsb bhi
+bogomips	: 4992.00
+clflush size	: 64
+cache_alignment	: 64
+address sizes	: 39 bits physical, 48 bits virtual
+power management:
+
+processor	: 13
+vendor_id	: GenuineIntel
+cpu family	: 6
+model		: 154
+model name	: 12th Gen Intel(R) Core(TM) i7-1260P
+stepping	: 3
+microcode	: 0x433
+cpu MHz		: 2392.435
+cache size	: 18432 KB
+physical id	: 0
+siblings	: 16
+core id		: 21
+cpu cores	: 12
+apicid		: 42
+initial apicid	: 42
+fpu		: yes
+fpu_exception	: yes
+cpuid level	: 32
+wp		: yes
+flags		: fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe syscall nx pdpe1gb rdtscp lm constant_tsc art arch_perfmon pebs bts rep_good nopl xtopology nonstop_tsc cpuid aperfmperf tsc_known_freq pni pclmulqdq dtes64 monitor ds_cpl vmx smx est tm2 ssse3 sdbg fma cx16 xtpr pdcm sse4_1 sse4_2 x2apic movbe popcnt tsc_deadline_timer aes xsave avx f16c rdrand lahf_lm abm 3dnowprefetch cpuid_fault epb ssbd ibrs ibpb stibp ibrs_enhanced tpr_shadow flexpriority ept vpid ept_ad fsgsbase tsc_adjust bmi1 avx2 smep bmi2 erms invpcid rdseed adx smap clflushopt clwb intel_pt sha_ni xsaveopt xsavec xgetbv1 xsaves split_lock_detect avx_vnni dtherm ida arat pln pts hwp hwp_notify hwp_act_window hwp_epp hwp_pkg_req hfi vnmi umip pku ospke waitpkg gfni vaes vpclmulqdq rdpid movdiri movdir64b fsrm md_clear serialize arch_lbr ibt flush_l1d arch_capabilities
+vmx flags	: vnmi preemption_timer posted_intr invvpid ept_x_only ept_ad ept_1gb flexpriority apicv tsc_offset vtpr mtf vapic ept vpid unrestricted_guest vapic_reg vid ple shadow_vmcs ept_mode_based_exec tsc_scaling usr_wait_pause
+bugs		: coma tlb_mmatch spectre_v1 spectre_v2 spec_store_bypass swapgs eibrs_pbrsb bhi
+bogomips	: 4992.00
+clflush size	: 64
+cache_alignment	: 64
+address sizes	: 39 bits physical, 48 bits virtual
+power management:
+
+processor	: 14
+vendor_id	: GenuineIntel
+cpu family	: 6
+model		: 154
+model name	: 12th Gen Intel(R) Core(TM) i7-1260P
+stepping	: 3
+microcode	: 0x433
+cpu MHz		: 2388.023
+cache size	: 18432 KB
+physical id	: 0
+siblings	: 16
+core id		: 22
+cpu cores	: 12
+apicid		: 44
+initial apicid	: 44
+fpu		: yes
+fpu_exception	: yes
+cpuid level	: 32
+wp		: yes
+flags		: fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe syscall nx pdpe1gb rdtscp lm constant_tsc art arch_perfmon pebs bts rep_good nopl xtopology nonstop_tsc cpuid aperfmperf tsc_known_freq pni pclmulqdq dtes64 monitor ds_cpl vmx smx est tm2 ssse3 sdbg fma cx16 xtpr pdcm sse4_1 sse4_2 x2apic movbe popcnt tsc_deadline_timer aes xsave avx f16c rdrand lahf_lm abm 3dnowprefetch cpuid_fault epb ssbd ibrs ibpb stibp ibrs_enhanced tpr_shadow flexpriority ept vpid ept_ad fsgsbase tsc_adjust bmi1 avx2 smep bmi2 erms invpcid rdseed adx smap clflushopt clwb intel_pt sha_ni xsaveopt xsavec xgetbv1 xsaves split_lock_detect avx_vnni dtherm ida arat pln pts hwp hwp_notify hwp_act_window hwp_epp hwp_pkg_req hfi vnmi umip pku ospke waitpkg gfni vaes vpclmulqdq rdpid movdiri movdir64b fsrm md_clear serialize arch_lbr ibt flush_l1d arch_capabilities
+vmx flags	: vnmi preemption_timer posted_intr invvpid ept_x_only ept_ad ept_1gb flexpriority apicv tsc_offset vtpr mtf vapic ept vpid unrestricted_guest vapic_reg vid ple shadow_vmcs ept_mode_based_exec tsc_scaling usr_wait_pause
+bugs		: coma tlb_mmatch spectre_v1 spectre_v2 spec_store_bypass swapgs eibrs_pbrsb bhi
+bogomips	: 4992.00
+clflush size	: 64
+cache_alignment	: 64
+address sizes	: 39 bits physical, 48 bits virtual
+power management:
+
+processor	: 15
+vendor_id	: GenuineIntel
+cpu family	: 6
+model		: 154
+model name	: 12th Gen Intel(R) Core(TM) i7-1260P
+stepping	: 3
+microcode	: 0x433
+cpu MHz		: 2393.328
+cache size	: 18432 KB
+physical id	: 0
+siblings	: 16
+core id		: 23
+cpu cores	: 12
+apicid		: 46
+initial apicid	: 46
+fpu		: yes
+fpu_exception	: yes
+cpuid level	: 32
+wp		: yes
+flags		: fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe syscall nx pdpe1gb rdtscp lm constant_tsc art arch_perfmon pebs bts rep_good nopl xtopology nonstop_tsc cpuid aperfmperf tsc_known_freq pni pclmulqdq dtes64 monitor ds_cpl vmx smx est tm2 ssse3 sdbg fma cx16 xtpr pdcm sse4_1 sse4_2 x2apic movbe popcnt tsc_deadline_timer aes xsave avx f16c rdrand lahf_lm abm 3dnowprefetch cpuid_fault epb ssbd ibrs ibpb stibp ibrs_enhanced tpr_shadow flexpriority ept vpid ept_ad fsgsbase tsc_adjust bmi1 avx2 smep bmi2 erms invpcid rdseed adx smap clflushopt clwb intel_pt sha_ni xsaveopt xsavec xgetbv1 xsaves split_lock_detect avx_vnni dtherm ida arat pln pts hwp hwp_notify hwp_act_window hwp_epp hwp_pkg_req hfi vnmi umip pku ospke waitpkg gfni vaes vpclmulqdq rdpid movdiri movdir64b fsrm md_clear serialize arch_lbr ibt flush_l1d arch_capabilities
+vmx flags	: vnmi preemption_timer posted_intr invvpid ept_x_only ept_ad ept_1gb flexpriority apicv tsc_offset vtpr mtf vapic ept vpid unrestricted_guest vapic_reg vid ple shadow_vmcs ept_mode_based_exec tsc_scaling usr_wait_pause
+bugs		: coma tlb_mmatch spectre_v1 spectre_v2 spec_store_bypass swapgs eibrs_pbrsb bhi
+bogomips	: 4992.00
+clflush size	: 64
+cache_alignment	: 64
+address sizes	: 39 bits physical, 48 bits virtual
+power management:
+
diff --git a/t/pt-summary/samples/Linux/009/processes b/t/pt-summary/samples/Linux/009/processes
new file mode 100644
index 000000000..55bfea425
--- /dev/null
+++ b/t/pt-summary/samples/Linux/009/processes
@@ -0,0 +1,10 @@
+    PID USER      PR  NI    VIRT    RES    SHR S  %CPU  %MEM     TIME+ COMMAND
+ 783789 sveta     20   0 2822620 506824  42752 S 100,0   0,8   5795:02 mysqld
+2407273 sveta     20   0   64144  46012  13824 R 100,0   0,1   5069:41 perl
+2410420 sveta     20   0   64140  46184  13952 R 100,0   0,1   5067:44 perl
+2419768 sveta     20   0   64140  46088  13952 R 100,0   0,1   5063:21 perl
+2408748 sveta     20   0   64136  46068  14080 R  94,1   0,1   5068:45 perl
+3396104 sveta     20   0   16768   5248   3968 R  11,8   0,0   0:00.03 top
+2147236 sveta     20   0   32,8g 450796 225184 S   5,9   0,7  52:26.29 chrome
+2147423 sveta     20   0 1158,3g 556292 148372 S   5,9   0,8  83:11.29 chrome
+2738171 sveta     20   0  499860  52224  13312 S   5,9   0,1  19:40.27 aomhost
diff --git a/t/pt-summary/samples/Linux/009/summary b/t/pt-summary/samples/Linux/009/summary
new file mode 100644
index 000000000..066d5b543
--- /dev/null
+++ b/t/pt-summary/samples/Linux/009/summary
@@ -0,0 +1,23 @@
+platform    Linux
+hostname    s76
+kernel    6.5.0-35-generic
+release    Ubuntu 22.04.4 LTS (jammy)
+CPU_ARCH    64-bit
+OS_ARCH    64-bit
+virt    No virtualization detected
+vendor    
+rss    39089426432
+raid_controller    No RAID controller detected
+threading    NPTL 2.35
+getenforce    No SELinux detected
+swappiness    60
+dirtypolicy    20, 10
+dirtystatus     0, 0
+numa-available    
+numa-policy    
+numa-preferred-node    
+internal::disks    dm-0 dm-1 dm-2 nvme0n1
+internal::nvme0n1    [none] 1023
+dentry-state    3355603	3159991	45	0	2250834	0
+file-nr    36032	0	9223372036854775807
+inode-nr    1419887	556339
diff --git a/t/pt-summary/samples/Linux/009/sysctl b/t/pt-summary/samples/Linux/009/sysctl
new file mode 100644
index 000000000..34d5510aa
--- /dev/null
+++ b/t/pt-summary/samples/Linux/009/sysctl
@@ -0,0 +1,2010 @@
+abi.vsyscall32 = 1
+debug.exception-trace = 1
+debug.kprobes-optimization = 1
+dev.cdrom.autoclose = 1
+dev.cdrom.autoeject = 0
+dev.cdrom.check_media = 0
+dev.cdrom.debug = 0
+dev.cdrom.info = CD-ROM information, Id: cdrom.c 3.20 2003/12/17
+dev.cdrom.info = 
+dev.cdrom.info = drive name:	
+dev.cdrom.info = drive speed:	
+dev.cdrom.info = drive # of slots:
+dev.cdrom.info = Can close tray:	
+dev.cdrom.info = Can open tray:	
+dev.cdrom.info = Can lock tray:	
+dev.cdrom.info = Can change speed:
+dev.cdrom.info = Can select disk:
+dev.cdrom.info = Can read multisession:
+dev.cdrom.info = Can read MCN:	
+dev.cdrom.info = Reports media changed:
+dev.cdrom.info = Can play audio:	
+dev.cdrom.info = Can write CD-R:	
+dev.cdrom.info = Can write CD-RW:
+dev.cdrom.info = Can read DVD:	
+dev.cdrom.info = Can write DVD-R:
+dev.cdrom.info = Can write DVD-RAM:
+dev.cdrom.info = Can read MRW:	
+dev.cdrom.info = Can write MRW:	
+dev.cdrom.info = Can write RAM:	
+dev.cdrom.info = 
+dev.cdrom.info = 
+dev.cdrom.lock = 0
+dev.hpet.max-user-freq = 64
+dev.i915.oa_max_sample_rate = 100000
+dev.i915.perf_stream_paranoid = 1
+dev.mac_hid.mouse_button2_keycode = 97
+dev.mac_hid.mouse_button3_keycode = 100
+dev.mac_hid.mouse_button_emulation = 0
+dev.parport.default.spintime = 500
+dev.parport.default.timeslice = 200
+dev.raid.speed_limit_max = 200000
+dev.raid.speed_limit_min = 1000
+dev.scsi.logging_level = 0
+dev.tty.ldisc_autoload = 1
+dev.tty.legacy_tiocsti = 1
+fs.aio-max-nr = 65536
+fs.aio-nr = 13745
+fs.binfmt_misc.python3/10 = enabled
+fs.binfmt_misc.python3/10 = interpreter /usr/bin/python3.10
+fs.binfmt_misc.python3/10 = flags: 
+fs.binfmt_misc.python3/10 = offset 0
+fs.binfmt_misc.python3/10 = magic 6f0d0d0a
+fs.binfmt_misc.status = enabled
+fs.dentry-state = 3355589	3159981	45	0	2250833	0
+fs.dir-notify-enable = 1
+fs.epoll.max_user_watches = 14590731
+fs.fanotify.max_queued_events = 16384
+fs.fanotify.max_user_groups = 128
+fs.fanotify.max_user_marks = 530989
+fs.file-max = 9223372036854775807
+fs.file-nr = 36064	0	9223372036854775807
+fs.inode-nr = 1419874	556221
+fs.inode-state = 1419874	556221	0	0	0	0	0
+fs.inotify.max_queued_events = 16384
+fs.inotify.max_user_instances = 128
+fs.inotify.max_user_watches = 65536
+fs.lease-break-time = 45
+fs.leases-enable = 1
+fs.mount-max = 100000
+fs.mqueue.msg_default = 10
+fs.mqueue.msg_max = 10
+fs.mqueue.msgsize_default = 8192
+fs.mqueue.msgsize_max = 8192
+fs.mqueue.queues_max = 256
+fs.nr_open = 1048576
+fs.overflowgid = 65534
+fs.overflowuid = 65534
+fs.pipe-max-size = 1048576
+fs.pipe-user-pages-hard = 0
+fs.pipe-user-pages-soft = 16384
+fs.protected_fifos = 1
+fs.protected_hardlinks = 1
+fs.protected_regular = 2
+fs.protected_symlinks = 1
+fs.quota.allocated_dquots = 0
+fs.quota.cache_hits = 0
+fs.quota.drops = 0
+fs.quota.free_dquots = 0
+fs.quota.lookups = 0
+fs.quota.reads = 0
+fs.quota.syncs = 2592
+fs.quota.writes = 0
+fs.suid_dumpable = 2
+fs.verity.require_signatures = 0
+kernel.acct = 4	2	30
+kernel.acpi_video_flags = 0
+kernel.apparmor_restrict_unprivileged_unconfined = 0
+kernel.apparmor_restrict_unprivileged_userns = 0
+kernel.arch = x86_64
+kernel.auto_msgmni = 0
+kernel.bootloader_type = 6
+kernel.bootloader_version = 38
+kernel.bpf_stats_enabled = 0
+kernel.cap_last_cap = 40
+kernel.core_pattern = |/usr/share/apport/apport -p%p -s%s -c%c -d%d -P%P -u%u -g%g -- %E
+kernel.core_pipe_limit = 10
+kernel.core_uses_pid = 1
+kernel.ctrl-alt-del = 0
+kernel.dmesg_restrict = 1
+kernel.domainname = (none)
+kernel.firmware_config.force_sysfs_fallback = 0
+kernel.firmware_config.ignore_sysfs_fallback = 0
+kernel.ftrace_dump_on_oops = 0
+kernel.ftrace_enabled = 1
+kernel.hardlockup_all_cpu_backtrace = 0
+kernel.hardlockup_panic = 0
+kernel.hostname = s76
+kernel.hotplug = 
+kernel.hung_task_all_cpu_backtrace = 0
+kernel.hung_task_check_count = 4194304
+kernel.hung_task_check_interval_secs = 0
+kernel.hung_task_panic = 0
+kernel.hung_task_timeout_secs = 120
+kernel.hung_task_warnings = 10
+kernel.io_delay_type = 1
+kernel.io_uring_disabled = 0
+kernel.io_uring_group = -1
+kernel.kexec_load_disabled = 0
+kernel.kexec_load_limit_panic = -1
+kernel.kexec_load_limit_reboot = -1
+kernel.keys.gc_delay = 300
+kernel.keys.maxbytes = 20000
+kernel.keys.maxkeys = 200
+kernel.keys.persistent_keyring_expiry = 259200
+kernel.keys.root_maxbytes = 25000000
+kernel.keys.root_maxkeys = 1000000
+kernel.kptr_restrict = 1
+kernel.max_lock_depth = 1024
+kernel.max_rcu_stall_to_panic = 0
+kernel.modprobe = /sbin/modprobe
+kernel.modules_disabled = 0
+kernel.msg_next_id = -1
+kernel.msgmax = 8192
+kernel.msgmnb = 16384
+kernel.msgmni = 32000
+kernel.ngroups_max = 65536
+kernel.nmi_watchdog = 1
+kernel.ns_last_pid = 3396025
+kernel.numa_balancing = 0
+kernel.numa_balancing_promote_rate_limit_MBps = 65536
+kernel.oops_all_cpu_backtrace = 0
+kernel.oops_limit = 10000
+kernel.osrelease = 6.5.0-35-generic
+kernel.ostype = Linux
+kernel.overflowgid = 65534
+kernel.overflowuid = 65534
+kernel.panic = 0
+kernel.panic_on_io_nmi = 0
+kernel.panic_on_oops = 0
+kernel.panic_on_rcu_stall = 0
+kernel.panic_on_unrecovered_nmi = 0
+kernel.panic_on_warn = 0
+kernel.panic_print = 0
+kernel.perf_cpu_time_max_percent = 25
+kernel.perf_event_max_contexts_per_stack = 8
+kernel.perf_event_max_sample_rate = 26250
+kernel.perf_event_max_stack = 127
+kernel.perf_event_mlock_kb = 516
+kernel.perf_event_paranoid = 1
+kernel.pid_max = 4194304
+kernel.poweroff_cmd = /sbin/poweroff
+kernel.print-fatal-signals = 0
+kernel.printk = 4	4	1	7
+kernel.printk_delay = 0
+kernel.printk_devkmsg = on
+kernel.printk_ratelimit = 5
+kernel.printk_ratelimit_burst = 10
+kernel.pty.max = 4096
+kernel.pty.nr = 6
+kernel.pty.reserve = 1024
+kernel.random.boot_id = 31d4dc04-94fc-4b44-9ad0-60aa785f573d
+kernel.random.entropy_avail = 256
+kernel.random.poolsize = 256
+kernel.random.urandom_min_reseed_secs = 60
+kernel.random.uuid = 6e317867-3d89-4005-853c-54618b86cec6
+kernel.random.write_wakeup_threshold = 256
+kernel.randomize_va_space = 2
+kernel.real-root-dev = 0
+kernel.sched_autogroup_enabled = 1
+kernel.sched_cfs_bandwidth_slice_us = 5000
+kernel.sched_child_runs_first = 0
+kernel.sched_deadline_period_max_us = 4194304
+kernel.sched_deadline_period_min_us = 100
+kernel.sched_energy_aware = 1
+kernel.sched_itmt_enabled = 1
+kernel.sched_rr_timeslice_ms = 100
+kernel.sched_rt_period_us = 1000000
+kernel.sched_rt_runtime_us = 950000
+kernel.sched_schedstats = 0
+kernel.sched_util_clamp_max = 1024
+kernel.sched_util_clamp_min = 1024
+kernel.sched_util_clamp_min_rt_default = 1024
+kernel.seccomp.actions_avail = kill_process kill_thread trap errno user_notif trace log allow
+kernel.seccomp.actions_logged = kill_process kill_thread trap errno user_notif trace log
+kernel.sem = 32000	1024000000	500	32000
+kernel.sem_next_id = -1
+kernel.shm_next_id = -1
+kernel.shm_rmid_forced = 0
+kernel.shmall = 18446744073692774399
+kernel.shmmax = 18446744073692774399
+kernel.shmmni = 4096
+kernel.soft_watchdog = 1
+kernel.softlockup_all_cpu_backtrace = 0
+kernel.softlockup_panic = 0
+kernel.split_lock_mitigate = 1
+kernel.stack_tracer_enabled = 0
+kernel.sysctl_writes_strict = 1
+kernel.sysrq = 176
+kernel.tainted = 512
+kernel.task_delayacct = 0
+kernel.threads-max = 512064
+kernel.timer_migration = 1
+kernel.traceoff_on_warning = 0
+kernel.tracepoint_printk = 0
+kernel.unknown_nmi_panic = 0
+kernel.unprivileged_bpf_disabled = 2
+kernel.unprivileged_userns_clone = 1
+kernel.user_events_max = 32768
+kernel.version = #35~22.04.1-Ubuntu SMP PREEMPT_DYNAMIC Tue May  7 09:00:52 UTC 2
+kernel.warn_limit = 0
+kernel.watchdog = 1
+kernel.watchdog_cpumask = 0-15
+kernel.watchdog_thresh = 10
+kernel.yama.ptrace_scope = 0
+net.bridge.bridge-nf-call-arptables = 1
+net.bridge.bridge-nf-call-ip6tables = 1
+net.bridge.bridge-nf-call-iptables = 1
+net.bridge.bridge-nf-filter-pppoe-tagged = 0
+net.bridge.bridge-nf-filter-vlan-tagged = 0
+net.bridge.bridge-nf-pass-vlan-input-dev = 0
+net.core.bpf_jit_enable = 1
+net.core.busy_poll = 0
+net.core.busy_read = 0
+net.core.default_qdisc = fq_codel
+net.core.dev_weight = 64
+net.core.dev_weight_rx_bias = 1
+net.core.dev_weight_tx_bias = 1
+net.core.devconf_inherit_init_net = 0
+net.core.fb_tunnels_only_for_init_net = 0
+net.core.flow_limit_cpu_bitmap = 0000
+net.core.flow_limit_table_len = 4096
+net.core.gro_normal_batch = 8
+net.core.high_order_alloc_disable = 0
+net.core.max_skb_frags = 17
+net.core.message_burst = 10
+net.core.message_cost = 5
+net.core.netdev_budget = 300
+net.core.netdev_budget_usecs = 8000
+net.core.netdev_max_backlog = 1000
+net.core.netdev_rss_key = 68:87:a5:6d:f6:e8:62:a0:01:85:a6:1a:c2:fb:d3:e0:ca:d9:b7:ad:8f:ff:78:4c:ab:57:54:de:2a:9c:92:12:1e:96:c5:34:9a:97:95:aa:d9:b9:9a:86:49:cf:99:a0:54:07:50:97
+net.core.netdev_tstamp_prequeue = 1
+net.core.netdev_unregister_timeout_secs = 10
+net.core.optmem_max = 20480
+net.core.rmem_default = 212992
+net.core.rmem_max = 212992
+net.core.rps_default_mask = 0000
+net.core.rps_sock_flow_entries = 0
+net.core.skb_defer_max = 64
+net.core.somaxconn = 4096
+net.core.tstamp_allow_data = 1
+net.core.txrehash = 1
+net.core.warnings = 0
+net.core.wmem_default = 212992
+net.core.wmem_max = 212992
+net.core.xfrm_acq_expires = 30
+net.core.xfrm_aevent_etime = 10
+net.core.xfrm_aevent_rseqth = 2
+net.core.xfrm_larval_drop = 1
+net.ipv4.cipso_cache_bucket_size = 10
+net.ipv4.cipso_cache_enable = 1
+net.ipv4.cipso_rbm_optfmt = 0
+net.ipv4.cipso_rbm_strictvalid = 1
+net.ipv4.conf.all.accept_local = 0
+net.ipv4.conf.all.accept_redirects = 0
+net.ipv4.conf.all.accept_source_route = 0
+net.ipv4.conf.all.arp_accept = 0
+net.ipv4.conf.all.arp_announce = 0
+net.ipv4.conf.all.arp_evict_nocarrier = 1
+net.ipv4.conf.all.arp_filter = 0
+net.ipv4.conf.all.arp_ignore = 0
+net.ipv4.conf.all.arp_notify = 0
+net.ipv4.conf.all.bc_forwarding = 0
+net.ipv4.conf.all.bootp_relay = 0
+net.ipv4.conf.all.disable_policy = 0
+net.ipv4.conf.all.disable_xfrm = 0
+net.ipv4.conf.all.drop_gratuitous_arp = 0
+net.ipv4.conf.all.drop_unicast_in_l2_multicast = 0
+net.ipv4.conf.all.force_igmp_version = 0
+net.ipv4.conf.all.forwarding = 1
+net.ipv4.conf.all.igmpv2_unsolicited_report_interval = 10000
+net.ipv4.conf.all.igmpv3_unsolicited_report_interval = 1000
+net.ipv4.conf.all.ignore_routes_with_linkdown = 0
+net.ipv4.conf.all.log_martians = 0
+net.ipv4.conf.all.mc_forwarding = 0
+net.ipv4.conf.all.medium_id = 0
+net.ipv4.conf.all.promote_secondaries = 0
+net.ipv4.conf.all.proxy_arp = 0
+net.ipv4.conf.all.proxy_arp_pvlan = 0
+net.ipv4.conf.all.route_localnet = 0
+net.ipv4.conf.all.rp_filter = 2
+net.ipv4.conf.all.secure_redirects = 1
+net.ipv4.conf.all.send_redirects = 0
+net.ipv4.conf.all.shared_media = 1
+net.ipv4.conf.all.src_valid_mark = 1
+net.ipv4.conf.all.tag = 0
+net.ipv4.conf.br-79118f7d5a92.accept_local = 0
+net.ipv4.conf.br-79118f7d5a92.accept_redirects = 1
+net.ipv4.conf.br-79118f7d5a92.accept_source_route = 0
+net.ipv4.conf.br-79118f7d5a92.arp_accept = 0
+net.ipv4.conf.br-79118f7d5a92.arp_announce = 0
+net.ipv4.conf.br-79118f7d5a92.arp_evict_nocarrier = 1
+net.ipv4.conf.br-79118f7d5a92.arp_filter = 0
+net.ipv4.conf.br-79118f7d5a92.arp_ignore = 0
+net.ipv4.conf.br-79118f7d5a92.arp_notify = 0
+net.ipv4.conf.br-79118f7d5a92.bc_forwarding = 0
+net.ipv4.conf.br-79118f7d5a92.bootp_relay = 0
+net.ipv4.conf.br-79118f7d5a92.disable_policy = 0
+net.ipv4.conf.br-79118f7d5a92.disable_xfrm = 0
+net.ipv4.conf.br-79118f7d5a92.drop_gratuitous_arp = 0
+net.ipv4.conf.br-79118f7d5a92.drop_unicast_in_l2_multicast = 0
+net.ipv4.conf.br-79118f7d5a92.force_igmp_version = 0
+net.ipv4.conf.br-79118f7d5a92.forwarding = 1
+net.ipv4.conf.br-79118f7d5a92.igmpv2_unsolicited_report_interval = 10000
+net.ipv4.conf.br-79118f7d5a92.igmpv3_unsolicited_report_interval = 1000
+net.ipv4.conf.br-79118f7d5a92.ignore_routes_with_linkdown = 0
+net.ipv4.conf.br-79118f7d5a92.log_martians = 0
+net.ipv4.conf.br-79118f7d5a92.mc_forwarding = 0
+net.ipv4.conf.br-79118f7d5a92.medium_id = 0
+net.ipv4.conf.br-79118f7d5a92.promote_secondaries = 1
+net.ipv4.conf.br-79118f7d5a92.proxy_arp = 0
+net.ipv4.conf.br-79118f7d5a92.proxy_arp_pvlan = 0
+net.ipv4.conf.br-79118f7d5a92.route_localnet = 0
+net.ipv4.conf.br-79118f7d5a92.rp_filter = 2
+net.ipv4.conf.br-79118f7d5a92.secure_redirects = 1
+net.ipv4.conf.br-79118f7d5a92.send_redirects = 1
+net.ipv4.conf.br-79118f7d5a92.shared_media = 1
+net.ipv4.conf.br-79118f7d5a92.src_valid_mark = 0
+net.ipv4.conf.br-79118f7d5a92.tag = 0
+net.ipv4.conf.br-a7c7f1777df1.accept_local = 0
+net.ipv4.conf.br-a7c7f1777df1.accept_redirects = 1
+net.ipv4.conf.br-a7c7f1777df1.accept_source_route = 0
+net.ipv4.conf.br-a7c7f1777df1.arp_accept = 0
+net.ipv4.conf.br-a7c7f1777df1.arp_announce = 0
+net.ipv4.conf.br-a7c7f1777df1.arp_evict_nocarrier = 1
+net.ipv4.conf.br-a7c7f1777df1.arp_filter = 0
+net.ipv4.conf.br-a7c7f1777df1.arp_ignore = 0
+net.ipv4.conf.br-a7c7f1777df1.arp_notify = 0
+net.ipv4.conf.br-a7c7f1777df1.bc_forwarding = 0
+net.ipv4.conf.br-a7c7f1777df1.bootp_relay = 0
+net.ipv4.conf.br-a7c7f1777df1.disable_policy = 0
+net.ipv4.conf.br-a7c7f1777df1.disable_xfrm = 0
+net.ipv4.conf.br-a7c7f1777df1.drop_gratuitous_arp = 0
+net.ipv4.conf.br-a7c7f1777df1.drop_unicast_in_l2_multicast = 0
+net.ipv4.conf.br-a7c7f1777df1.force_igmp_version = 0
+net.ipv4.conf.br-a7c7f1777df1.forwarding = 1
+net.ipv4.conf.br-a7c7f1777df1.igmpv2_unsolicited_report_interval = 10000
+net.ipv4.conf.br-a7c7f1777df1.igmpv3_unsolicited_report_interval = 1000
+net.ipv4.conf.br-a7c7f1777df1.ignore_routes_with_linkdown = 0
+net.ipv4.conf.br-a7c7f1777df1.log_martians = 0
+net.ipv4.conf.br-a7c7f1777df1.mc_forwarding = 0
+net.ipv4.conf.br-a7c7f1777df1.medium_id = 0
+net.ipv4.conf.br-a7c7f1777df1.promote_secondaries = 1
+net.ipv4.conf.br-a7c7f1777df1.proxy_arp = 0
+net.ipv4.conf.br-a7c7f1777df1.proxy_arp_pvlan = 0
+net.ipv4.conf.br-a7c7f1777df1.route_localnet = 0
+net.ipv4.conf.br-a7c7f1777df1.rp_filter = 2
+net.ipv4.conf.br-a7c7f1777df1.secure_redirects = 1
+net.ipv4.conf.br-a7c7f1777df1.send_redirects = 1
+net.ipv4.conf.br-a7c7f1777df1.shared_media = 1
+net.ipv4.conf.br-a7c7f1777df1.src_valid_mark = 0
+net.ipv4.conf.br-a7c7f1777df1.tag = 0
+net.ipv4.conf.default.accept_local = 0
+net.ipv4.conf.default.accept_redirects = 1
+net.ipv4.conf.default.accept_source_route = 0
+net.ipv4.conf.default.arp_accept = 0
+net.ipv4.conf.default.arp_announce = 0
+net.ipv4.conf.default.arp_evict_nocarrier = 1
+net.ipv4.conf.default.arp_filter = 0
+net.ipv4.conf.default.arp_ignore = 0
+net.ipv4.conf.default.arp_notify = 0
+net.ipv4.conf.default.bc_forwarding = 0
+net.ipv4.conf.default.bootp_relay = 0
+net.ipv4.conf.default.disable_policy = 0
+net.ipv4.conf.default.disable_xfrm = 0
+net.ipv4.conf.default.drop_gratuitous_arp = 0
+net.ipv4.conf.default.drop_unicast_in_l2_multicast = 0
+net.ipv4.conf.default.force_igmp_version = 0
+net.ipv4.conf.default.forwarding = 1
+net.ipv4.conf.default.igmpv2_unsolicited_report_interval = 10000
+net.ipv4.conf.default.igmpv3_unsolicited_report_interval = 1000
+net.ipv4.conf.default.ignore_routes_with_linkdown = 0
+net.ipv4.conf.default.log_martians = 0
+net.ipv4.conf.default.mc_forwarding = 0
+net.ipv4.conf.default.medium_id = 0
+net.ipv4.conf.default.promote_secondaries = 1
+net.ipv4.conf.default.proxy_arp = 0
+net.ipv4.conf.default.proxy_arp_pvlan = 0
+net.ipv4.conf.default.route_localnet = 0
+net.ipv4.conf.default.rp_filter = 2
+net.ipv4.conf.default.secure_redirects = 1
+net.ipv4.conf.default.send_redirects = 1
+net.ipv4.conf.default.shared_media = 1
+net.ipv4.conf.default.src_valid_mark = 0
+net.ipv4.conf.default.tag = 0
+net.ipv4.conf.docker0.accept_local = 0
+net.ipv4.conf.docker0.accept_redirects = 1
+net.ipv4.conf.docker0.accept_source_route = 0
+net.ipv4.conf.docker0.arp_accept = 0
+net.ipv4.conf.docker0.arp_announce = 0
+net.ipv4.conf.docker0.arp_evict_nocarrier = 1
+net.ipv4.conf.docker0.arp_filter = 0
+net.ipv4.conf.docker0.arp_ignore = 0
+net.ipv4.conf.docker0.arp_notify = 0
+net.ipv4.conf.docker0.bc_forwarding = 0
+net.ipv4.conf.docker0.bootp_relay = 0
+net.ipv4.conf.docker0.disable_policy = 0
+net.ipv4.conf.docker0.disable_xfrm = 0
+net.ipv4.conf.docker0.drop_gratuitous_arp = 0
+net.ipv4.conf.docker0.drop_unicast_in_l2_multicast = 0
+net.ipv4.conf.docker0.force_igmp_version = 0
+net.ipv4.conf.docker0.forwarding = 1
+net.ipv4.conf.docker0.igmpv2_unsolicited_report_interval = 10000
+net.ipv4.conf.docker0.igmpv3_unsolicited_report_interval = 1000
+net.ipv4.conf.docker0.ignore_routes_with_linkdown = 0
+net.ipv4.conf.docker0.log_martians = 0
+net.ipv4.conf.docker0.mc_forwarding = 0
+net.ipv4.conf.docker0.medium_id = 0
+net.ipv4.conf.docker0.promote_secondaries = 1
+net.ipv4.conf.docker0.proxy_arp = 0
+net.ipv4.conf.docker0.proxy_arp_pvlan = 0
+net.ipv4.conf.docker0.route_localnet = 0
+net.ipv4.conf.docker0.rp_filter = 2
+net.ipv4.conf.docker0.secure_redirects = 1
+net.ipv4.conf.docker0.send_redirects = 1
+net.ipv4.conf.docker0.shared_media = 1
+net.ipv4.conf.docker0.src_valid_mark = 0
+net.ipv4.conf.docker0.tag = 0
+net.ipv4.conf.enp46s0.accept_local = 0
+net.ipv4.conf.enp46s0.accept_redirects = 1
+net.ipv4.conf.enp46s0.accept_source_route = 0
+net.ipv4.conf.enp46s0.arp_accept = 0
+net.ipv4.conf.enp46s0.arp_announce = 0
+net.ipv4.conf.enp46s0.arp_evict_nocarrier = 1
+net.ipv4.conf.enp46s0.arp_filter = 0
+net.ipv4.conf.enp46s0.arp_ignore = 0
+net.ipv4.conf.enp46s0.arp_notify = 0
+net.ipv4.conf.enp46s0.bc_forwarding = 0
+net.ipv4.conf.enp46s0.bootp_relay = 0
+net.ipv4.conf.enp46s0.disable_policy = 0
+net.ipv4.conf.enp46s0.disable_xfrm = 0
+net.ipv4.conf.enp46s0.drop_gratuitous_arp = 0
+net.ipv4.conf.enp46s0.drop_unicast_in_l2_multicast = 0
+net.ipv4.conf.enp46s0.force_igmp_version = 0
+net.ipv4.conf.enp46s0.forwarding = 1
+net.ipv4.conf.enp46s0.igmpv2_unsolicited_report_interval = 10000
+net.ipv4.conf.enp46s0.igmpv3_unsolicited_report_interval = 1000
+net.ipv4.conf.enp46s0.ignore_routes_with_linkdown = 0
+net.ipv4.conf.enp46s0.log_martians = 0
+net.ipv4.conf.enp46s0.mc_forwarding = 0
+net.ipv4.conf.enp46s0.medium_id = 0
+net.ipv4.conf.enp46s0.promote_secondaries = 1
+net.ipv4.conf.enp46s0.proxy_arp = 0
+net.ipv4.conf.enp46s0.proxy_arp_pvlan = 0
+net.ipv4.conf.enp46s0.route_localnet = 0
+net.ipv4.conf.enp46s0.rp_filter = 2
+net.ipv4.conf.enp46s0.secure_redirects = 1
+net.ipv4.conf.enp46s0.send_redirects = 1
+net.ipv4.conf.enp46s0.shared_media = 1
+net.ipv4.conf.enp46s0.src_valid_mark = 0
+net.ipv4.conf.enp46s0.tag = 0
+net.ipv4.conf.lo.accept_local = 0
+net.ipv4.conf.lo.accept_redirects = 1
+net.ipv4.conf.lo.accept_source_route = 0
+net.ipv4.conf.lo.arp_accept = 0
+net.ipv4.conf.lo.arp_announce = 0
+net.ipv4.conf.lo.arp_evict_nocarrier = 1
+net.ipv4.conf.lo.arp_filter = 0
+net.ipv4.conf.lo.arp_ignore = 0
+net.ipv4.conf.lo.arp_notify = 0
+net.ipv4.conf.lo.bc_forwarding = 0
+net.ipv4.conf.lo.bootp_relay = 0
+net.ipv4.conf.lo.disable_policy = 1
+net.ipv4.conf.lo.disable_xfrm = 1
+net.ipv4.conf.lo.drop_gratuitous_arp = 0
+net.ipv4.conf.lo.drop_unicast_in_l2_multicast = 0
+net.ipv4.conf.lo.force_igmp_version = 0
+net.ipv4.conf.lo.forwarding = 1
+net.ipv4.conf.lo.igmpv2_unsolicited_report_interval = 10000
+net.ipv4.conf.lo.igmpv3_unsolicited_report_interval = 1000
+net.ipv4.conf.lo.ignore_routes_with_linkdown = 0
+net.ipv4.conf.lo.log_martians = 0
+net.ipv4.conf.lo.mc_forwarding = 0
+net.ipv4.conf.lo.medium_id = 0
+net.ipv4.conf.lo.promote_secondaries = 1
+net.ipv4.conf.lo.proxy_arp = 0
+net.ipv4.conf.lo.proxy_arp_pvlan = 0
+net.ipv4.conf.lo.route_localnet = 0
+net.ipv4.conf.lo.rp_filter = 2
+net.ipv4.conf.lo.secure_redirects = 1
+net.ipv4.conf.lo.send_redirects = 1
+net.ipv4.conf.lo.shared_media = 1
+net.ipv4.conf.lo.src_valid_mark = 0
+net.ipv4.conf.lo.tag = 0
+net.ipv4.conf.veth0655c9f.accept_local = 0
+net.ipv4.conf.veth0655c9f.accept_redirects = 1
+net.ipv4.conf.veth0655c9f.accept_source_route = 0
+net.ipv4.conf.veth0655c9f.arp_accept = 0
+net.ipv4.conf.veth0655c9f.arp_announce = 0
+net.ipv4.conf.veth0655c9f.arp_evict_nocarrier = 1
+net.ipv4.conf.veth0655c9f.arp_filter = 0
+net.ipv4.conf.veth0655c9f.arp_ignore = 0
+net.ipv4.conf.veth0655c9f.arp_notify = 0
+net.ipv4.conf.veth0655c9f.bc_forwarding = 0
+net.ipv4.conf.veth0655c9f.bootp_relay = 0
+net.ipv4.conf.veth0655c9f.disable_policy = 0
+net.ipv4.conf.veth0655c9f.disable_xfrm = 0
+net.ipv4.conf.veth0655c9f.drop_gratuitous_arp = 0
+net.ipv4.conf.veth0655c9f.drop_unicast_in_l2_multicast = 0
+net.ipv4.conf.veth0655c9f.force_igmp_version = 0
+net.ipv4.conf.veth0655c9f.forwarding = 1
+net.ipv4.conf.veth0655c9f.igmpv2_unsolicited_report_interval = 10000
+net.ipv4.conf.veth0655c9f.igmpv3_unsolicited_report_interval = 1000
+net.ipv4.conf.veth0655c9f.ignore_routes_with_linkdown = 0
+net.ipv4.conf.veth0655c9f.log_martians = 0
+net.ipv4.conf.veth0655c9f.mc_forwarding = 0
+net.ipv4.conf.veth0655c9f.medium_id = 0
+net.ipv4.conf.veth0655c9f.promote_secondaries = 1
+net.ipv4.conf.veth0655c9f.proxy_arp = 0
+net.ipv4.conf.veth0655c9f.proxy_arp_pvlan = 0
+net.ipv4.conf.veth0655c9f.route_localnet = 0
+net.ipv4.conf.veth0655c9f.rp_filter = 2
+net.ipv4.conf.veth0655c9f.secure_redirects = 1
+net.ipv4.conf.veth0655c9f.send_redirects = 1
+net.ipv4.conf.veth0655c9f.shared_media = 1
+net.ipv4.conf.veth0655c9f.src_valid_mark = 0
+net.ipv4.conf.veth0655c9f.tag = 0
+net.ipv4.conf.veth2655c84.accept_local = 0
+net.ipv4.conf.veth2655c84.accept_redirects = 1
+net.ipv4.conf.veth2655c84.accept_source_route = 0
+net.ipv4.conf.veth2655c84.arp_accept = 0
+net.ipv4.conf.veth2655c84.arp_announce = 0
+net.ipv4.conf.veth2655c84.arp_evict_nocarrier = 1
+net.ipv4.conf.veth2655c84.arp_filter = 0
+net.ipv4.conf.veth2655c84.arp_ignore = 0
+net.ipv4.conf.veth2655c84.arp_notify = 0
+net.ipv4.conf.veth2655c84.bc_forwarding = 0
+net.ipv4.conf.veth2655c84.bootp_relay = 0
+net.ipv4.conf.veth2655c84.disable_policy = 0
+net.ipv4.conf.veth2655c84.disable_xfrm = 0
+net.ipv4.conf.veth2655c84.drop_gratuitous_arp = 0
+net.ipv4.conf.veth2655c84.drop_unicast_in_l2_multicast = 0
+net.ipv4.conf.veth2655c84.force_igmp_version = 0
+net.ipv4.conf.veth2655c84.forwarding = 1
+net.ipv4.conf.veth2655c84.igmpv2_unsolicited_report_interval = 10000
+net.ipv4.conf.veth2655c84.igmpv3_unsolicited_report_interval = 1000
+net.ipv4.conf.veth2655c84.ignore_routes_with_linkdown = 0
+net.ipv4.conf.veth2655c84.log_martians = 0
+net.ipv4.conf.veth2655c84.mc_forwarding = 0
+net.ipv4.conf.veth2655c84.medium_id = 0
+net.ipv4.conf.veth2655c84.promote_secondaries = 1
+net.ipv4.conf.veth2655c84.proxy_arp = 0
+net.ipv4.conf.veth2655c84.proxy_arp_pvlan = 0
+net.ipv4.conf.veth2655c84.route_localnet = 0
+net.ipv4.conf.veth2655c84.rp_filter = 2
+net.ipv4.conf.veth2655c84.secure_redirects = 1
+net.ipv4.conf.veth2655c84.send_redirects = 1
+net.ipv4.conf.veth2655c84.shared_media = 1
+net.ipv4.conf.veth2655c84.src_valid_mark = 0
+net.ipv4.conf.veth2655c84.tag = 0
+net.ipv4.conf.vethd189986.accept_local = 0
+net.ipv4.conf.vethd189986.accept_redirects = 1
+net.ipv4.conf.vethd189986.accept_source_route = 0
+net.ipv4.conf.vethd189986.arp_accept = 0
+net.ipv4.conf.vethd189986.arp_announce = 0
+net.ipv4.conf.vethd189986.arp_evict_nocarrier = 1
+net.ipv4.conf.vethd189986.arp_filter = 0
+net.ipv4.conf.vethd189986.arp_ignore = 0
+net.ipv4.conf.vethd189986.arp_notify = 0
+net.ipv4.conf.vethd189986.bc_forwarding = 0
+net.ipv4.conf.vethd189986.bootp_relay = 0
+net.ipv4.conf.vethd189986.disable_policy = 0
+net.ipv4.conf.vethd189986.disable_xfrm = 0
+net.ipv4.conf.vethd189986.drop_gratuitous_arp = 0
+net.ipv4.conf.vethd189986.drop_unicast_in_l2_multicast = 0
+net.ipv4.conf.vethd189986.force_igmp_version = 0
+net.ipv4.conf.vethd189986.forwarding = 1
+net.ipv4.conf.vethd189986.igmpv2_unsolicited_report_interval = 10000
+net.ipv4.conf.vethd189986.igmpv3_unsolicited_report_interval = 1000
+net.ipv4.conf.vethd189986.ignore_routes_with_linkdown = 0
+net.ipv4.conf.vethd189986.log_martians = 0
+net.ipv4.conf.vethd189986.mc_forwarding = 0
+net.ipv4.conf.vethd189986.medium_id = 0
+net.ipv4.conf.vethd189986.promote_secondaries = 1
+net.ipv4.conf.vethd189986.proxy_arp = 0
+net.ipv4.conf.vethd189986.proxy_arp_pvlan = 0
+net.ipv4.conf.vethd189986.route_localnet = 0
+net.ipv4.conf.vethd189986.rp_filter = 2
+net.ipv4.conf.vethd189986.secure_redirects = 1
+net.ipv4.conf.vethd189986.send_redirects = 1
+net.ipv4.conf.vethd189986.shared_media = 1
+net.ipv4.conf.vethd189986.src_valid_mark = 0
+net.ipv4.conf.vethd189986.tag = 0
+net.ipv4.conf.wg0.accept_local = 0
+net.ipv4.conf.wg0.accept_redirects = 1
+net.ipv4.conf.wg0.accept_source_route = 0
+net.ipv4.conf.wg0.arp_accept = 0
+net.ipv4.conf.wg0.arp_announce = 0
+net.ipv4.conf.wg0.arp_evict_nocarrier = 1
+net.ipv4.conf.wg0.arp_filter = 0
+net.ipv4.conf.wg0.arp_ignore = 0
+net.ipv4.conf.wg0.arp_notify = 0
+net.ipv4.conf.wg0.bc_forwarding = 0
+net.ipv4.conf.wg0.bootp_relay = 0
+net.ipv4.conf.wg0.disable_policy = 0
+net.ipv4.conf.wg0.disable_xfrm = 0
+net.ipv4.conf.wg0.drop_gratuitous_arp = 0
+net.ipv4.conf.wg0.drop_unicast_in_l2_multicast = 0
+net.ipv4.conf.wg0.force_igmp_version = 0
+net.ipv4.conf.wg0.forwarding = 1
+net.ipv4.conf.wg0.igmpv2_unsolicited_report_interval = 10000
+net.ipv4.conf.wg0.igmpv3_unsolicited_report_interval = 1000
+net.ipv4.conf.wg0.ignore_routes_with_linkdown = 0
+net.ipv4.conf.wg0.log_martians = 0
+net.ipv4.conf.wg0.mc_forwarding = 0
+net.ipv4.conf.wg0.medium_id = 0
+net.ipv4.conf.wg0.promote_secondaries = 1
+net.ipv4.conf.wg0.proxy_arp = 0
+net.ipv4.conf.wg0.proxy_arp_pvlan = 0
+net.ipv4.conf.wg0.route_localnet = 0
+net.ipv4.conf.wg0.rp_filter = 2
+net.ipv4.conf.wg0.secure_redirects = 1
+net.ipv4.conf.wg0.send_redirects = 0
+net.ipv4.conf.wg0.shared_media = 1
+net.ipv4.conf.wg0.src_valid_mark = 0
+net.ipv4.conf.wg0.tag = 0
+net.ipv4.conf.wlp0s20f3.accept_local = 0
+net.ipv4.conf.wlp0s20f3.accept_redirects = 1
+net.ipv4.conf.wlp0s20f3.accept_source_route = 0
+net.ipv4.conf.wlp0s20f3.arp_accept = 0
+net.ipv4.conf.wlp0s20f3.arp_announce = 0
+net.ipv4.conf.wlp0s20f3.arp_evict_nocarrier = 1
+net.ipv4.conf.wlp0s20f3.arp_filter = 0
+net.ipv4.conf.wlp0s20f3.arp_ignore = 0
+net.ipv4.conf.wlp0s20f3.arp_notify = 0
+net.ipv4.conf.wlp0s20f3.bc_forwarding = 0
+net.ipv4.conf.wlp0s20f3.bootp_relay = 0
+net.ipv4.conf.wlp0s20f3.disable_policy = 0
+net.ipv4.conf.wlp0s20f3.disable_xfrm = 0
+net.ipv4.conf.wlp0s20f3.drop_gratuitous_arp = 0
+net.ipv4.conf.wlp0s20f3.drop_unicast_in_l2_multicast = 0
+net.ipv4.conf.wlp0s20f3.force_igmp_version = 0
+net.ipv4.conf.wlp0s20f3.forwarding = 1
+net.ipv4.conf.wlp0s20f3.igmpv2_unsolicited_report_interval = 10000
+net.ipv4.conf.wlp0s20f3.igmpv3_unsolicited_report_interval = 1000
+net.ipv4.conf.wlp0s20f3.ignore_routes_with_linkdown = 0
+net.ipv4.conf.wlp0s20f3.log_martians = 0
+net.ipv4.conf.wlp0s20f3.mc_forwarding = 0
+net.ipv4.conf.wlp0s20f3.medium_id = 0
+net.ipv4.conf.wlp0s20f3.promote_secondaries = 1
+net.ipv4.conf.wlp0s20f3.proxy_arp = 0
+net.ipv4.conf.wlp0s20f3.proxy_arp_pvlan = 0
+net.ipv4.conf.wlp0s20f3.route_localnet = 0
+net.ipv4.conf.wlp0s20f3.rp_filter = 2
+net.ipv4.conf.wlp0s20f3.secure_redirects = 1
+net.ipv4.conf.wlp0s20f3.send_redirects = 1
+net.ipv4.conf.wlp0s20f3.shared_media = 1
+net.ipv4.conf.wlp0s20f3.src_valid_mark = 0
+net.ipv4.conf.wlp0s20f3.tag = 0
+net.ipv4.fib_multipath_hash_fields = 7
+net.ipv4.fib_multipath_hash_policy = 0
+net.ipv4.fib_multipath_use_neigh = 0
+net.ipv4.fib_notify_on_flag_change = 0
+net.ipv4.fib_sync_mem = 524288
+net.ipv4.fwmark_reflect = 0
+net.ipv4.icmp_echo_enable_probe = 0
+net.ipv4.icmp_echo_ignore_all = 0
+net.ipv4.icmp_echo_ignore_broadcasts = 1
+net.ipv4.icmp_errors_use_inbound_ifaddr = 0
+net.ipv4.icmp_ignore_bogus_error_responses = 1
+net.ipv4.icmp_msgs_burst = 50
+net.ipv4.icmp_msgs_per_sec = 1000
+net.ipv4.icmp_ratelimit = 1000
+net.ipv4.icmp_ratemask = 6168
+net.ipv4.igmp_link_local_mcast_reports = 1
+net.ipv4.igmp_max_memberships = 20
+net.ipv4.igmp_max_msf = 10
+net.ipv4.igmp_qrv = 2
+net.ipv4.inet_peer_maxttl = 600
+net.ipv4.inet_peer_minttl = 120
+net.ipv4.inet_peer_threshold = 65664
+net.ipv4.ip_autobind_reuse = 0
+net.ipv4.ip_default_ttl = 64
+net.ipv4.ip_dynaddr = 0
+net.ipv4.ip_early_demux = 1
+net.ipv4.ip_forward = 1
+net.ipv4.ip_forward_update_priority = 1
+net.ipv4.ip_forward_use_pmtu = 0
+net.ipv4.ip_local_port_range = 32768	60999
+net.ipv4.ip_local_reserved_ports = 
+net.ipv4.ip_no_pmtu_disc = 0
+net.ipv4.ip_nonlocal_bind = 0
+net.ipv4.ip_unprivileged_port_start = 1024
+net.ipv4.ipfrag_high_thresh = 4194304
+net.ipv4.ipfrag_low_thresh = 3145728
+net.ipv4.ipfrag_max_dist = 64
+net.ipv4.ipfrag_secret_interval = 0
+net.ipv4.ipfrag_time = 30
+net.ipv4.neigh.br-79118f7d5a92.anycast_delay = 100
+net.ipv4.neigh.br-79118f7d5a92.app_solicit = 0
+net.ipv4.neigh.br-79118f7d5a92.base_reachable_time_ms = 30000
+net.ipv4.neigh.br-79118f7d5a92.delay_first_probe_time = 5
+net.ipv4.neigh.br-79118f7d5a92.gc_stale_time = 60
+net.ipv4.neigh.br-79118f7d5a92.interval_probe_time_ms = 5000
+net.ipv4.neigh.br-79118f7d5a92.locktime = 100
+net.ipv4.neigh.br-79118f7d5a92.mcast_resolicit = 0
+net.ipv4.neigh.br-79118f7d5a92.mcast_solicit = 3
+net.ipv4.neigh.br-79118f7d5a92.proxy_delay = 80
+net.ipv4.neigh.br-79118f7d5a92.proxy_qlen = 64
+net.ipv4.neigh.br-79118f7d5a92.retrans_time_ms = 1000
+net.ipv4.neigh.br-79118f7d5a92.ucast_solicit = 3
+net.ipv4.neigh.br-79118f7d5a92.unres_qlen = 101
+net.ipv4.neigh.br-79118f7d5a92.unres_qlen_bytes = 212992
+net.ipv4.neigh.br-a7c7f1777df1.anycast_delay = 100
+net.ipv4.neigh.br-a7c7f1777df1.app_solicit = 0
+net.ipv4.neigh.br-a7c7f1777df1.base_reachable_time_ms = 30000
+net.ipv4.neigh.br-a7c7f1777df1.delay_first_probe_time = 5
+net.ipv4.neigh.br-a7c7f1777df1.gc_stale_time = 60
+net.ipv4.neigh.br-a7c7f1777df1.interval_probe_time_ms = 5000
+net.ipv4.neigh.br-a7c7f1777df1.locktime = 100
+net.ipv4.neigh.br-a7c7f1777df1.mcast_resolicit = 0
+net.ipv4.neigh.br-a7c7f1777df1.mcast_solicit = 3
+net.ipv4.neigh.br-a7c7f1777df1.proxy_delay = 80
+net.ipv4.neigh.br-a7c7f1777df1.proxy_qlen = 64
+net.ipv4.neigh.br-a7c7f1777df1.retrans_time_ms = 1000
+net.ipv4.neigh.br-a7c7f1777df1.ucast_solicit = 3
+net.ipv4.neigh.br-a7c7f1777df1.unres_qlen = 101
+net.ipv4.neigh.br-a7c7f1777df1.unres_qlen_bytes = 212992
+net.ipv4.neigh.default.anycast_delay = 100
+net.ipv4.neigh.default.app_solicit = 0
+net.ipv4.neigh.default.base_reachable_time_ms = 30000
+net.ipv4.neigh.default.delay_first_probe_time = 5
+net.ipv4.neigh.default.gc_interval = 30
+net.ipv4.neigh.default.gc_stale_time = 60
+net.ipv4.neigh.default.gc_thresh1 = 128
+net.ipv4.neigh.default.gc_thresh2 = 512
+net.ipv4.neigh.default.gc_thresh3 = 1024
+net.ipv4.neigh.default.interval_probe_time_ms = 5000
+net.ipv4.neigh.default.locktime = 100
+net.ipv4.neigh.default.mcast_resolicit = 0
+net.ipv4.neigh.default.mcast_solicit = 3
+net.ipv4.neigh.default.proxy_delay = 80
+net.ipv4.neigh.default.proxy_qlen = 64
+net.ipv4.neigh.default.retrans_time_ms = 1000
+net.ipv4.neigh.default.ucast_solicit = 3
+net.ipv4.neigh.default.unres_qlen = 101
+net.ipv4.neigh.default.unres_qlen_bytes = 212992
+net.ipv4.neigh.docker0.anycast_delay = 100
+net.ipv4.neigh.docker0.app_solicit = 0
+net.ipv4.neigh.docker0.base_reachable_time_ms = 30000
+net.ipv4.neigh.docker0.delay_first_probe_time = 5
+net.ipv4.neigh.docker0.gc_stale_time = 60
+net.ipv4.neigh.docker0.interval_probe_time_ms = 5000
+net.ipv4.neigh.docker0.locktime = 100
+net.ipv4.neigh.docker0.mcast_resolicit = 0
+net.ipv4.neigh.docker0.mcast_solicit = 3
+net.ipv4.neigh.docker0.proxy_delay = 80
+net.ipv4.neigh.docker0.proxy_qlen = 64
+net.ipv4.neigh.docker0.retrans_time_ms = 1000
+net.ipv4.neigh.docker0.ucast_solicit = 3
+net.ipv4.neigh.docker0.unres_qlen = 101
+net.ipv4.neigh.docker0.unres_qlen_bytes = 212992
+net.ipv4.neigh.enp46s0.anycast_delay = 100
+net.ipv4.neigh.enp46s0.app_solicit = 0
+net.ipv4.neigh.enp46s0.base_reachable_time_ms = 30000
+net.ipv4.neigh.enp46s0.delay_first_probe_time = 5
+net.ipv4.neigh.enp46s0.gc_stale_time = 60
+net.ipv4.neigh.enp46s0.interval_probe_time_ms = 5000
+net.ipv4.neigh.enp46s0.locktime = 100
+net.ipv4.neigh.enp46s0.mcast_resolicit = 0
+net.ipv4.neigh.enp46s0.mcast_solicit = 3
+net.ipv4.neigh.enp46s0.proxy_delay = 80
+net.ipv4.neigh.enp46s0.proxy_qlen = 64
+net.ipv4.neigh.enp46s0.retrans_time_ms = 1000
+net.ipv4.neigh.enp46s0.ucast_solicit = 3
+net.ipv4.neigh.enp46s0.unres_qlen = 101
+net.ipv4.neigh.enp46s0.unres_qlen_bytes = 212992
+net.ipv4.neigh.lo.anycast_delay = 100
+net.ipv4.neigh.lo.app_solicit = 0
+net.ipv4.neigh.lo.base_reachable_time_ms = 30000
+net.ipv4.neigh.lo.delay_first_probe_time = 5
+net.ipv4.neigh.lo.gc_stale_time = 60
+net.ipv4.neigh.lo.interval_probe_time_ms = 5000
+net.ipv4.neigh.lo.locktime = 100
+net.ipv4.neigh.lo.mcast_resolicit = 0
+net.ipv4.neigh.lo.mcast_solicit = 3
+net.ipv4.neigh.lo.proxy_delay = 80
+net.ipv4.neigh.lo.proxy_qlen = 64
+net.ipv4.neigh.lo.retrans_time_ms = 1000
+net.ipv4.neigh.lo.ucast_solicit = 3
+net.ipv4.neigh.lo.unres_qlen = 101
+net.ipv4.neigh.lo.unres_qlen_bytes = 212992
+net.ipv4.neigh.veth0655c9f.anycast_delay = 100
+net.ipv4.neigh.veth0655c9f.app_solicit = 0
+net.ipv4.neigh.veth0655c9f.base_reachable_time_ms = 30000
+net.ipv4.neigh.veth0655c9f.delay_first_probe_time = 5
+net.ipv4.neigh.veth0655c9f.gc_stale_time = 60
+net.ipv4.neigh.veth0655c9f.interval_probe_time_ms = 5000
+net.ipv4.neigh.veth0655c9f.locktime = 100
+net.ipv4.neigh.veth0655c9f.mcast_resolicit = 0
+net.ipv4.neigh.veth0655c9f.mcast_solicit = 3
+net.ipv4.neigh.veth0655c9f.proxy_delay = 80
+net.ipv4.neigh.veth0655c9f.proxy_qlen = 64
+net.ipv4.neigh.veth0655c9f.retrans_time_ms = 1000
+net.ipv4.neigh.veth0655c9f.ucast_solicit = 3
+net.ipv4.neigh.veth0655c9f.unres_qlen = 101
+net.ipv4.neigh.veth0655c9f.unres_qlen_bytes = 212992
+net.ipv4.neigh.veth2655c84.anycast_delay = 100
+net.ipv4.neigh.veth2655c84.app_solicit = 0
+net.ipv4.neigh.veth2655c84.base_reachable_time_ms = 30000
+net.ipv4.neigh.veth2655c84.delay_first_probe_time = 5
+net.ipv4.neigh.veth2655c84.gc_stale_time = 60
+net.ipv4.neigh.veth2655c84.interval_probe_time_ms = 5000
+net.ipv4.neigh.veth2655c84.locktime = 100
+net.ipv4.neigh.veth2655c84.mcast_resolicit = 0
+net.ipv4.neigh.veth2655c84.mcast_solicit = 3
+net.ipv4.neigh.veth2655c84.proxy_delay = 80
+net.ipv4.neigh.veth2655c84.proxy_qlen = 64
+net.ipv4.neigh.veth2655c84.retrans_time_ms = 1000
+net.ipv4.neigh.veth2655c84.ucast_solicit = 3
+net.ipv4.neigh.veth2655c84.unres_qlen = 101
+net.ipv4.neigh.veth2655c84.unres_qlen_bytes = 212992
+net.ipv4.neigh.vethd189986.anycast_delay = 100
+net.ipv4.neigh.vethd189986.app_solicit = 0
+net.ipv4.neigh.vethd189986.base_reachable_time_ms = 30000
+net.ipv4.neigh.vethd189986.delay_first_probe_time = 5
+net.ipv4.neigh.vethd189986.gc_stale_time = 60
+net.ipv4.neigh.vethd189986.interval_probe_time_ms = 5000
+net.ipv4.neigh.vethd189986.locktime = 100
+net.ipv4.neigh.vethd189986.mcast_resolicit = 0
+net.ipv4.neigh.vethd189986.mcast_solicit = 3
+net.ipv4.neigh.vethd189986.proxy_delay = 80
+net.ipv4.neigh.vethd189986.proxy_qlen = 64
+net.ipv4.neigh.vethd189986.retrans_time_ms = 1000
+net.ipv4.neigh.vethd189986.ucast_solicit = 3
+net.ipv4.neigh.vethd189986.unres_qlen = 101
+net.ipv4.neigh.vethd189986.unres_qlen_bytes = 212992
+net.ipv4.neigh.wg0.anycast_delay = 100
+net.ipv4.neigh.wg0.app_solicit = 0
+net.ipv4.neigh.wg0.base_reachable_time_ms = 30000
+net.ipv4.neigh.wg0.delay_first_probe_time = 5
+net.ipv4.neigh.wg0.gc_stale_time = 60
+net.ipv4.neigh.wg0.interval_probe_time_ms = 5000
+net.ipv4.neigh.wg0.locktime = 100
+net.ipv4.neigh.wg0.mcast_resolicit = 0
+net.ipv4.neigh.wg0.mcast_solicit = 3
+net.ipv4.neigh.wg0.proxy_delay = 80
+net.ipv4.neigh.wg0.proxy_qlen = 64
+net.ipv4.neigh.wg0.retrans_time_ms = 1000
+net.ipv4.neigh.wg0.ucast_solicit = 3
+net.ipv4.neigh.wg0.unres_qlen = 101
+net.ipv4.neigh.wg0.unres_qlen_bytes = 212992
+net.ipv4.neigh.wlp0s20f3.anycast_delay = 100
+net.ipv4.neigh.wlp0s20f3.app_solicit = 0
+net.ipv4.neigh.wlp0s20f3.base_reachable_time_ms = 30000
+net.ipv4.neigh.wlp0s20f3.delay_first_probe_time = 5
+net.ipv4.neigh.wlp0s20f3.gc_stale_time = 60
+net.ipv4.neigh.wlp0s20f3.interval_probe_time_ms = 5000
+net.ipv4.neigh.wlp0s20f3.locktime = 100
+net.ipv4.neigh.wlp0s20f3.mcast_resolicit = 0
+net.ipv4.neigh.wlp0s20f3.mcast_solicit = 3
+net.ipv4.neigh.wlp0s20f3.proxy_delay = 80
+net.ipv4.neigh.wlp0s20f3.proxy_qlen = 64
+net.ipv4.neigh.wlp0s20f3.retrans_time_ms = 1000
+net.ipv4.neigh.wlp0s20f3.ucast_solicit = 3
+net.ipv4.neigh.wlp0s20f3.unres_qlen = 101
+net.ipv4.neigh.wlp0s20f3.unres_qlen_bytes = 212992
+net.ipv4.nexthop_compat_mode = 1
+net.ipv4.ping_group_range = 0	2147483647
+net.ipv4.raw_l3mdev_accept = 1
+net.ipv4.route.error_burst = 1250
+net.ipv4.route.error_cost = 250
+net.ipv4.route.gc_elasticity = 8
+net.ipv4.route.gc_interval = 60
+net.ipv4.route.gc_min_interval = 0
+net.ipv4.route.gc_min_interval_ms = 500
+net.ipv4.route.gc_thresh = -1
+net.ipv4.route.gc_timeout = 300
+net.ipv4.route.max_size = 2147483647
+net.ipv4.route.min_adv_mss = 256
+net.ipv4.route.min_pmtu = 552
+net.ipv4.route.mtu_expires = 600
+net.ipv4.route.redirect_load = 5
+net.ipv4.route.redirect_number = 9
+net.ipv4.route.redirect_silence = 5120
+net.ipv4.tcp_abort_on_overflow = 0
+net.ipv4.tcp_adv_win_scale = 1
+net.ipv4.tcp_allowed_congestion_control = reno cubic
+net.ipv4.tcp_app_win = 31
+net.ipv4.tcp_autocorking = 1
+net.ipv4.tcp_available_congestion_control = reno cubic
+net.ipv4.tcp_available_ulp = espintcp mptcp tls
+net.ipv4.tcp_base_mss = 1024
+net.ipv4.tcp_challenge_ack_limit = 2147483647
+net.ipv4.tcp_child_ehash_entries = 0
+net.ipv4.tcp_comp_sack_delay_ns = 1000000
+net.ipv4.tcp_comp_sack_nr = 44
+net.ipv4.tcp_comp_sack_slack_ns = 100000
+net.ipv4.tcp_congestion_control = cubic
+net.ipv4.tcp_dsack = 1
+net.ipv4.tcp_early_demux = 1
+net.ipv4.tcp_early_retrans = 3
+net.ipv4.tcp_ecn = 2
+net.ipv4.tcp_ecn_fallback = 1
+net.ipv4.tcp_ehash_entries = 524288
+net.ipv4.tcp_fack = 0
+net.ipv4.tcp_fastopen = 1
+net.ipv4.tcp_fastopen_blackhole_timeout_sec = 0
+net.ipv4.tcp_fin_timeout = 60
+net.ipv4.tcp_frto = 2
+net.ipv4.tcp_fwmark_accept = 0
+net.ipv4.tcp_invalid_ratelimit = 500
+net.ipv4.tcp_keepalive_intvl = 75
+net.ipv4.tcp_keepalive_probes = 9
+net.ipv4.tcp_keepalive_time = 7200
+net.ipv4.tcp_l3mdev_accept = 0
+net.ipv4.tcp_limit_output_bytes = 1048576
+net.ipv4.tcp_low_latency = 0
+net.ipv4.tcp_max_orphans = 262144
+net.ipv4.tcp_max_reordering = 300
+net.ipv4.tcp_max_syn_backlog = 4096
+net.ipv4.tcp_max_tw_buckets = 262144
+net.ipv4.tcp_mem = 765768	1021025	1531536
+net.ipv4.tcp_migrate_req = 0
+net.ipv4.tcp_min_rtt_wlen = 300
+net.ipv4.tcp_min_snd_mss = 48
+net.ipv4.tcp_min_tso_segs = 2
+net.ipv4.tcp_moderate_rcvbuf = 1
+net.ipv4.tcp_mtu_probe_floor = 48
+net.ipv4.tcp_mtu_probing = 0
+net.ipv4.tcp_no_metrics_save = 0
+net.ipv4.tcp_no_ssthresh_metrics_save = 1
+net.ipv4.tcp_notsent_lowat = 4294967295
+net.ipv4.tcp_orphan_retries = 0
+net.ipv4.tcp_pacing_ca_ratio = 120
+net.ipv4.tcp_pacing_ss_ratio = 200
+net.ipv4.tcp_plb_cong_thresh = 128
+net.ipv4.tcp_plb_enabled = 0
+net.ipv4.tcp_plb_idle_rehash_rounds = 3
+net.ipv4.tcp_plb_rehash_rounds = 12
+net.ipv4.tcp_plb_suspend_rto_sec = 60
+net.ipv4.tcp_probe_interval = 600
+net.ipv4.tcp_probe_threshold = 8
+net.ipv4.tcp_recovery = 1
+net.ipv4.tcp_reflect_tos = 0
+net.ipv4.tcp_reordering = 3
+net.ipv4.tcp_retrans_collapse = 1
+net.ipv4.tcp_retries1 = 3
+net.ipv4.tcp_retries2 = 15
+net.ipv4.tcp_rfc1337 = 0
+net.ipv4.tcp_rmem = 4096	131072	6291456
+net.ipv4.tcp_sack = 1
+net.ipv4.tcp_shrink_window = 0
+net.ipv4.tcp_slow_start_after_idle = 1
+net.ipv4.tcp_stdurg = 0
+net.ipv4.tcp_syn_linear_timeouts = 4
+net.ipv4.tcp_syn_retries = 6
+net.ipv4.tcp_synack_retries = 5
+net.ipv4.tcp_syncookies = 1
+net.ipv4.tcp_thin_linear_timeouts = 0
+net.ipv4.tcp_timestamps = 1
+net.ipv4.tcp_tso_rtt_log = 9
+net.ipv4.tcp_tso_win_divisor = 3
+net.ipv4.tcp_tw_reuse = 2
+net.ipv4.tcp_window_scaling = 1
+net.ipv4.tcp_wmem = 4096	16384	4194304
+net.ipv4.tcp_workaround_signed_windows = 0
+net.ipv4.udp_child_hash_entries = 0
+net.ipv4.udp_early_demux = 1
+net.ipv4.udp_hash_entries = 32768
+net.ipv4.udp_l3mdev_accept = 0
+net.ipv4.udp_mem = 1531536	2042051	3063072
+net.ipv4.udp_rmem_min = 4096
+net.ipv4.udp_wmem_min = 4096
+net.ipv4.xfrm4_gc_thresh = 32768
+net.ipv6.anycast_src_echo_reply = 0
+net.ipv6.auto_flowlabels = 1
+net.ipv6.bindv6only = 0
+net.ipv6.calipso_cache_bucket_size = 10
+net.ipv6.calipso_cache_enable = 1
+net.ipv6.conf.all.accept_dad = 0
+net.ipv6.conf.all.accept_ra = 1
+net.ipv6.conf.all.accept_ra_defrtr = 1
+net.ipv6.conf.all.accept_ra_from_local = 0
+net.ipv6.conf.all.accept_ra_min_hop_limit = 1
+net.ipv6.conf.all.accept_ra_min_lft = 0
+net.ipv6.conf.all.accept_ra_mtu = 1
+net.ipv6.conf.all.accept_ra_pinfo = 1
+net.ipv6.conf.all.accept_ra_rt_info_max_plen = 0
+net.ipv6.conf.all.accept_ra_rt_info_min_plen = 0
+net.ipv6.conf.all.accept_ra_rtr_pref = 1
+net.ipv6.conf.all.accept_redirects = 1
+net.ipv6.conf.all.accept_source_route = 0
+net.ipv6.conf.all.accept_untracked_na = 0
+net.ipv6.conf.all.addr_gen_mode = 0
+net.ipv6.conf.all.autoconf = 1
+net.ipv6.conf.all.dad_transmits = 1
+net.ipv6.conf.all.disable_ipv6 = 0
+net.ipv6.conf.all.disable_policy = 0
+net.ipv6.conf.all.drop_unicast_in_l2_multicast = 0
+net.ipv6.conf.all.drop_unsolicited_na = 0
+net.ipv6.conf.all.enhanced_dad = 1
+net.ipv6.conf.all.force_mld_version = 0
+net.ipv6.conf.all.force_tllao = 0
+net.ipv6.conf.all.forwarding = 0
+net.ipv6.conf.all.hop_limit = 64
+net.ipv6.conf.all.ignore_routes_with_linkdown = 0
+net.ipv6.conf.all.ioam6_enabled = 0
+net.ipv6.conf.all.ioam6_id = 65535
+net.ipv6.conf.all.ioam6_id_wide = 4294967295
+net.ipv6.conf.all.keep_addr_on_down = 0
+net.ipv6.conf.all.max_addresses = 16
+net.ipv6.conf.all.max_desync_factor = 600
+net.ipv6.conf.all.mc_forwarding = 0
+net.ipv6.conf.all.mldv1_unsolicited_report_interval = 10000
+net.ipv6.conf.all.mldv2_unsolicited_report_interval = 1000
+net.ipv6.conf.all.mtu = 1280
+net.ipv6.conf.all.ndisc_evict_nocarrier = 1
+net.ipv6.conf.all.ndisc_notify = 0
+net.ipv6.conf.all.ndisc_tclass = 0
+net.ipv6.conf.all.proxy_ndp = 0
+net.ipv6.conf.all.ra_defrtr_metric = 1024
+net.ipv6.conf.all.regen_max_retry = 3
+net.ipv6.conf.all.router_probe_interval = 60
+net.ipv6.conf.all.router_solicitation_delay = 1
+net.ipv6.conf.all.router_solicitation_interval = 4
+net.ipv6.conf.all.router_solicitation_max_interval = 3600
+net.ipv6.conf.all.router_solicitations = -1
+net.ipv6.conf.all.rpl_seg_enabled = 0
+net.ipv6.conf.all.seg6_enabled = 0
+net.ipv6.conf.all.seg6_require_hmac = 0
+net.ipv6.conf.all.suppress_frag_ndisc = 1
+net.ipv6.conf.all.temp_prefered_lft = 86400
+net.ipv6.conf.all.temp_valid_lft = 604800
+net.ipv6.conf.all.use_oif_addrs_only = 0
+net.ipv6.conf.all.use_tempaddr = 2
+net.ipv6.conf.br-79118f7d5a92.accept_dad = 1
+net.ipv6.conf.br-79118f7d5a92.accept_ra = 0
+net.ipv6.conf.br-79118f7d5a92.accept_ra_defrtr = 1
+net.ipv6.conf.br-79118f7d5a92.accept_ra_from_local = 0
+net.ipv6.conf.br-79118f7d5a92.accept_ra_min_hop_limit = 1
+net.ipv6.conf.br-79118f7d5a92.accept_ra_min_lft = 0
+net.ipv6.conf.br-79118f7d5a92.accept_ra_mtu = 1
+net.ipv6.conf.br-79118f7d5a92.accept_ra_pinfo = 1
+net.ipv6.conf.br-79118f7d5a92.accept_ra_rt_info_max_plen = 0
+net.ipv6.conf.br-79118f7d5a92.accept_ra_rt_info_min_plen = 0
+net.ipv6.conf.br-79118f7d5a92.accept_ra_rtr_pref = 1
+net.ipv6.conf.br-79118f7d5a92.accept_redirects = 1
+net.ipv6.conf.br-79118f7d5a92.accept_source_route = 0
+net.ipv6.conf.br-79118f7d5a92.accept_untracked_na = 0
+net.ipv6.conf.br-79118f7d5a92.addr_gen_mode = 0
+net.ipv6.conf.br-79118f7d5a92.autoconf = 1
+net.ipv6.conf.br-79118f7d5a92.dad_transmits = 1
+net.ipv6.conf.br-79118f7d5a92.disable_ipv6 = 0
+net.ipv6.conf.br-79118f7d5a92.disable_policy = 0
+net.ipv6.conf.br-79118f7d5a92.drop_unicast_in_l2_multicast = 0
+net.ipv6.conf.br-79118f7d5a92.drop_unsolicited_na = 0
+net.ipv6.conf.br-79118f7d5a92.enhanced_dad = 1
+net.ipv6.conf.br-79118f7d5a92.force_mld_version = 0
+net.ipv6.conf.br-79118f7d5a92.force_tllao = 0
+net.ipv6.conf.br-79118f7d5a92.forwarding = 0
+net.ipv6.conf.br-79118f7d5a92.hop_limit = 64
+net.ipv6.conf.br-79118f7d5a92.ignore_routes_with_linkdown = 0
+net.ipv6.conf.br-79118f7d5a92.ioam6_enabled = 0
+net.ipv6.conf.br-79118f7d5a92.ioam6_id = 65535
+net.ipv6.conf.br-79118f7d5a92.ioam6_id_wide = 4294967295
+net.ipv6.conf.br-79118f7d5a92.keep_addr_on_down = 0
+net.ipv6.conf.br-79118f7d5a92.max_addresses = 16
+net.ipv6.conf.br-79118f7d5a92.max_desync_factor = 600
+net.ipv6.conf.br-79118f7d5a92.mc_forwarding = 0
+net.ipv6.conf.br-79118f7d5a92.mldv1_unsolicited_report_interval = 10000
+net.ipv6.conf.br-79118f7d5a92.mldv2_unsolicited_report_interval = 1000
+net.ipv6.conf.br-79118f7d5a92.mtu = 1500
+net.ipv6.conf.br-79118f7d5a92.ndisc_evict_nocarrier = 1
+net.ipv6.conf.br-79118f7d5a92.ndisc_notify = 0
+net.ipv6.conf.br-79118f7d5a92.ndisc_tclass = 0
+net.ipv6.conf.br-79118f7d5a92.proxy_ndp = 0
+net.ipv6.conf.br-79118f7d5a92.ra_defrtr_metric = 1024
+net.ipv6.conf.br-79118f7d5a92.regen_max_retry = 3
+net.ipv6.conf.br-79118f7d5a92.router_probe_interval = 60
+net.ipv6.conf.br-79118f7d5a92.router_solicitation_delay = 1
+net.ipv6.conf.br-79118f7d5a92.router_solicitation_interval = 4
+net.ipv6.conf.br-79118f7d5a92.router_solicitation_max_interval = 3600
+net.ipv6.conf.br-79118f7d5a92.router_solicitations = -1
+net.ipv6.conf.br-79118f7d5a92.rpl_seg_enabled = 0
+net.ipv6.conf.br-79118f7d5a92.seg6_enabled = 0
+net.ipv6.conf.br-79118f7d5a92.seg6_require_hmac = 0
+net.ipv6.conf.br-79118f7d5a92.suppress_frag_ndisc = 1
+net.ipv6.conf.br-79118f7d5a92.temp_prefered_lft = 86400
+net.ipv6.conf.br-79118f7d5a92.temp_valid_lft = 604800
+net.ipv6.conf.br-79118f7d5a92.use_oif_addrs_only = 0
+net.ipv6.conf.br-79118f7d5a92.use_tempaddr = 2
+net.ipv6.conf.br-a7c7f1777df1.accept_dad = 1
+net.ipv6.conf.br-a7c7f1777df1.accept_ra = 0
+net.ipv6.conf.br-a7c7f1777df1.accept_ra_defrtr = 1
+net.ipv6.conf.br-a7c7f1777df1.accept_ra_from_local = 0
+net.ipv6.conf.br-a7c7f1777df1.accept_ra_min_hop_limit = 1
+net.ipv6.conf.br-a7c7f1777df1.accept_ra_min_lft = 0
+net.ipv6.conf.br-a7c7f1777df1.accept_ra_mtu = 1
+net.ipv6.conf.br-a7c7f1777df1.accept_ra_pinfo = 1
+net.ipv6.conf.br-a7c7f1777df1.accept_ra_rt_info_max_plen = 0
+net.ipv6.conf.br-a7c7f1777df1.accept_ra_rt_info_min_plen = 0
+net.ipv6.conf.br-a7c7f1777df1.accept_ra_rtr_pref = 1
+net.ipv6.conf.br-a7c7f1777df1.accept_redirects = 1
+net.ipv6.conf.br-a7c7f1777df1.accept_source_route = 0
+net.ipv6.conf.br-a7c7f1777df1.accept_untracked_na = 0
+net.ipv6.conf.br-a7c7f1777df1.addr_gen_mode = 0
+net.ipv6.conf.br-a7c7f1777df1.autoconf = 1
+net.ipv6.conf.br-a7c7f1777df1.dad_transmits = 1
+net.ipv6.conf.br-a7c7f1777df1.disable_ipv6 = 0
+net.ipv6.conf.br-a7c7f1777df1.disable_policy = 0
+net.ipv6.conf.br-a7c7f1777df1.drop_unicast_in_l2_multicast = 0
+net.ipv6.conf.br-a7c7f1777df1.drop_unsolicited_na = 0
+net.ipv6.conf.br-a7c7f1777df1.enhanced_dad = 1
+net.ipv6.conf.br-a7c7f1777df1.force_mld_version = 0
+net.ipv6.conf.br-a7c7f1777df1.force_tllao = 0
+net.ipv6.conf.br-a7c7f1777df1.forwarding = 0
+net.ipv6.conf.br-a7c7f1777df1.hop_limit = 64
+net.ipv6.conf.br-a7c7f1777df1.ignore_routes_with_linkdown = 0
+net.ipv6.conf.br-a7c7f1777df1.ioam6_enabled = 0
+net.ipv6.conf.br-a7c7f1777df1.ioam6_id = 65535
+net.ipv6.conf.br-a7c7f1777df1.ioam6_id_wide = 4294967295
+net.ipv6.conf.br-a7c7f1777df1.keep_addr_on_down = 0
+net.ipv6.conf.br-a7c7f1777df1.max_addresses = 16
+net.ipv6.conf.br-a7c7f1777df1.max_desync_factor = 600
+net.ipv6.conf.br-a7c7f1777df1.mc_forwarding = 0
+net.ipv6.conf.br-a7c7f1777df1.mldv1_unsolicited_report_interval = 10000
+net.ipv6.conf.br-a7c7f1777df1.mldv2_unsolicited_report_interval = 1000
+net.ipv6.conf.br-a7c7f1777df1.mtu = 1500
+net.ipv6.conf.br-a7c7f1777df1.ndisc_evict_nocarrier = 1
+net.ipv6.conf.br-a7c7f1777df1.ndisc_notify = 0
+net.ipv6.conf.br-a7c7f1777df1.ndisc_tclass = 0
+net.ipv6.conf.br-a7c7f1777df1.proxy_ndp = 0
+net.ipv6.conf.br-a7c7f1777df1.ra_defrtr_metric = 1024
+net.ipv6.conf.br-a7c7f1777df1.regen_max_retry = 3
+net.ipv6.conf.br-a7c7f1777df1.router_probe_interval = 60
+net.ipv6.conf.br-a7c7f1777df1.router_solicitation_delay = 1
+net.ipv6.conf.br-a7c7f1777df1.router_solicitation_interval = 4
+net.ipv6.conf.br-a7c7f1777df1.router_solicitation_max_interval = 3600
+net.ipv6.conf.br-a7c7f1777df1.router_solicitations = -1
+net.ipv6.conf.br-a7c7f1777df1.rpl_seg_enabled = 0
+net.ipv6.conf.br-a7c7f1777df1.seg6_enabled = 0
+net.ipv6.conf.br-a7c7f1777df1.seg6_require_hmac = 0
+net.ipv6.conf.br-a7c7f1777df1.suppress_frag_ndisc = 1
+net.ipv6.conf.br-a7c7f1777df1.temp_prefered_lft = 86400
+net.ipv6.conf.br-a7c7f1777df1.temp_valid_lft = 604800
+net.ipv6.conf.br-a7c7f1777df1.use_oif_addrs_only = 0
+net.ipv6.conf.br-a7c7f1777df1.use_tempaddr = 2
+net.ipv6.conf.default.accept_dad = 1
+net.ipv6.conf.default.accept_ra = 1
+net.ipv6.conf.default.accept_ra_defrtr = 1
+net.ipv6.conf.default.accept_ra_from_local = 0
+net.ipv6.conf.default.accept_ra_min_hop_limit = 1
+net.ipv6.conf.default.accept_ra_min_lft = 0
+net.ipv6.conf.default.accept_ra_mtu = 1
+net.ipv6.conf.default.accept_ra_pinfo = 1
+net.ipv6.conf.default.accept_ra_rt_info_max_plen = 0
+net.ipv6.conf.default.accept_ra_rt_info_min_plen = 0
+net.ipv6.conf.default.accept_ra_rtr_pref = 1
+net.ipv6.conf.default.accept_redirects = 1
+net.ipv6.conf.default.accept_source_route = 0
+net.ipv6.conf.default.accept_untracked_na = 0
+net.ipv6.conf.default.addr_gen_mode = 0
+net.ipv6.conf.default.autoconf = 1
+net.ipv6.conf.default.dad_transmits = 1
+net.ipv6.conf.default.disable_ipv6 = 0
+net.ipv6.conf.default.disable_policy = 0
+net.ipv6.conf.default.drop_unicast_in_l2_multicast = 0
+net.ipv6.conf.default.drop_unsolicited_na = 0
+net.ipv6.conf.default.enhanced_dad = 1
+net.ipv6.conf.default.force_mld_version = 0
+net.ipv6.conf.default.force_tllao = 0
+net.ipv6.conf.default.forwarding = 0
+net.ipv6.conf.default.hop_limit = 64
+net.ipv6.conf.default.ignore_routes_with_linkdown = 0
+net.ipv6.conf.default.ioam6_enabled = 0
+net.ipv6.conf.default.ioam6_id = 65535
+net.ipv6.conf.default.ioam6_id_wide = 4294967295
+net.ipv6.conf.default.keep_addr_on_down = 0
+net.ipv6.conf.default.max_addresses = 16
+net.ipv6.conf.default.max_desync_factor = 600
+net.ipv6.conf.default.mc_forwarding = 0
+net.ipv6.conf.default.mldv1_unsolicited_report_interval = 10000
+net.ipv6.conf.default.mldv2_unsolicited_report_interval = 1000
+net.ipv6.conf.default.mtu = 1280
+net.ipv6.conf.default.ndisc_evict_nocarrier = 1
+net.ipv6.conf.default.ndisc_notify = 0
+net.ipv6.conf.default.ndisc_tclass = 0
+net.ipv6.conf.default.proxy_ndp = 0
+net.ipv6.conf.default.ra_defrtr_metric = 1024
+net.ipv6.conf.default.regen_max_retry = 3
+net.ipv6.conf.default.router_probe_interval = 60
+net.ipv6.conf.default.router_solicitation_delay = 1
+net.ipv6.conf.default.router_solicitation_interval = 4
+net.ipv6.conf.default.router_solicitation_max_interval = 3600
+net.ipv6.conf.default.router_solicitations = -1
+net.ipv6.conf.default.rpl_seg_enabled = 0
+net.ipv6.conf.default.seg6_enabled = 0
+net.ipv6.conf.default.seg6_require_hmac = 0
+net.ipv6.conf.default.suppress_frag_ndisc = 1
+net.ipv6.conf.default.temp_prefered_lft = 86400
+net.ipv6.conf.default.temp_valid_lft = 604800
+net.ipv6.conf.default.use_oif_addrs_only = 0
+net.ipv6.conf.default.use_tempaddr = 2
+net.ipv6.conf.docker0.accept_dad = 1
+net.ipv6.conf.docker0.accept_ra = 0
+net.ipv6.conf.docker0.accept_ra_defrtr = 1
+net.ipv6.conf.docker0.accept_ra_from_local = 0
+net.ipv6.conf.docker0.accept_ra_min_hop_limit = 1
+net.ipv6.conf.docker0.accept_ra_min_lft = 0
+net.ipv6.conf.docker0.accept_ra_mtu = 1
+net.ipv6.conf.docker0.accept_ra_pinfo = 1
+net.ipv6.conf.docker0.accept_ra_rt_info_max_plen = 0
+net.ipv6.conf.docker0.accept_ra_rt_info_min_plen = 0
+net.ipv6.conf.docker0.accept_ra_rtr_pref = 1
+net.ipv6.conf.docker0.accept_redirects = 1
+net.ipv6.conf.docker0.accept_source_route = 0
+net.ipv6.conf.docker0.accept_untracked_na = 0
+net.ipv6.conf.docker0.addr_gen_mode = 0
+net.ipv6.conf.docker0.autoconf = 1
+net.ipv6.conf.docker0.dad_transmits = 1
+net.ipv6.conf.docker0.disable_ipv6 = 0
+net.ipv6.conf.docker0.disable_policy = 0
+net.ipv6.conf.docker0.drop_unicast_in_l2_multicast = 0
+net.ipv6.conf.docker0.drop_unsolicited_na = 0
+net.ipv6.conf.docker0.enhanced_dad = 1
+net.ipv6.conf.docker0.force_mld_version = 0
+net.ipv6.conf.docker0.force_tllao = 0
+net.ipv6.conf.docker0.forwarding = 0
+net.ipv6.conf.docker0.hop_limit = 64
+net.ipv6.conf.docker0.ignore_routes_with_linkdown = 0
+net.ipv6.conf.docker0.ioam6_enabled = 0
+net.ipv6.conf.docker0.ioam6_id = 65535
+net.ipv6.conf.docker0.ioam6_id_wide = 4294967295
+net.ipv6.conf.docker0.keep_addr_on_down = 0
+net.ipv6.conf.docker0.max_addresses = 16
+net.ipv6.conf.docker0.max_desync_factor = 600
+net.ipv6.conf.docker0.mc_forwarding = 0
+net.ipv6.conf.docker0.mldv1_unsolicited_report_interval = 10000
+net.ipv6.conf.docker0.mldv2_unsolicited_report_interval = 1000
+net.ipv6.conf.docker0.mtu = 1500
+net.ipv6.conf.docker0.ndisc_evict_nocarrier = 1
+net.ipv6.conf.docker0.ndisc_notify = 0
+net.ipv6.conf.docker0.ndisc_tclass = 0
+net.ipv6.conf.docker0.proxy_ndp = 0
+net.ipv6.conf.docker0.ra_defrtr_metric = 1024
+net.ipv6.conf.docker0.regen_max_retry = 3
+net.ipv6.conf.docker0.router_probe_interval = 60
+net.ipv6.conf.docker0.router_solicitation_delay = 1
+net.ipv6.conf.docker0.router_solicitation_interval = 4
+net.ipv6.conf.docker0.router_solicitation_max_interval = 3600
+net.ipv6.conf.docker0.router_solicitations = -1
+net.ipv6.conf.docker0.rpl_seg_enabled = 0
+net.ipv6.conf.docker0.seg6_enabled = 0
+net.ipv6.conf.docker0.seg6_require_hmac = 0
+net.ipv6.conf.docker0.suppress_frag_ndisc = 1
+net.ipv6.conf.docker0.temp_prefered_lft = 86400
+net.ipv6.conf.docker0.temp_valid_lft = 604800
+net.ipv6.conf.docker0.use_oif_addrs_only = 0
+net.ipv6.conf.docker0.use_tempaddr = 2
+net.ipv6.conf.enp46s0.accept_dad = 1
+net.ipv6.conf.enp46s0.accept_ra = 0
+net.ipv6.conf.enp46s0.accept_ra_defrtr = 1
+net.ipv6.conf.enp46s0.accept_ra_from_local = 0
+net.ipv6.conf.enp46s0.accept_ra_min_hop_limit = 1
+net.ipv6.conf.enp46s0.accept_ra_min_lft = 0
+net.ipv6.conf.enp46s0.accept_ra_mtu = 1
+net.ipv6.conf.enp46s0.accept_ra_pinfo = 1
+net.ipv6.conf.enp46s0.accept_ra_rt_info_max_plen = 0
+net.ipv6.conf.enp46s0.accept_ra_rt_info_min_plen = 0
+net.ipv6.conf.enp46s0.accept_ra_rtr_pref = 1
+net.ipv6.conf.enp46s0.accept_redirects = 1
+net.ipv6.conf.enp46s0.accept_source_route = 0
+net.ipv6.conf.enp46s0.accept_untracked_na = 0
+net.ipv6.conf.enp46s0.addr_gen_mode = 1
+net.ipv6.conf.enp46s0.autoconf = 1
+net.ipv6.conf.enp46s0.dad_transmits = 1
+net.ipv6.conf.enp46s0.disable_ipv6 = 0
+net.ipv6.conf.enp46s0.disable_policy = 0
+net.ipv6.conf.enp46s0.drop_unicast_in_l2_multicast = 0
+net.ipv6.conf.enp46s0.drop_unsolicited_na = 0
+net.ipv6.conf.enp46s0.enhanced_dad = 1
+net.ipv6.conf.enp46s0.force_mld_version = 0
+net.ipv6.conf.enp46s0.force_tllao = 0
+net.ipv6.conf.enp46s0.forwarding = 0
+net.ipv6.conf.enp46s0.hop_limit = 64
+net.ipv6.conf.enp46s0.ignore_routes_with_linkdown = 0
+net.ipv6.conf.enp46s0.ioam6_enabled = 0
+net.ipv6.conf.enp46s0.ioam6_id = 65535
+net.ipv6.conf.enp46s0.ioam6_id_wide = 4294967295
+net.ipv6.conf.enp46s0.keep_addr_on_down = 0
+net.ipv6.conf.enp46s0.max_addresses = 16
+net.ipv6.conf.enp46s0.max_desync_factor = 600
+net.ipv6.conf.enp46s0.mc_forwarding = 0
+net.ipv6.conf.enp46s0.mldv1_unsolicited_report_interval = 10000
+net.ipv6.conf.enp46s0.mldv2_unsolicited_report_interval = 1000
+net.ipv6.conf.enp46s0.mtu = 1500
+net.ipv6.conf.enp46s0.ndisc_evict_nocarrier = 1
+net.ipv6.conf.enp46s0.ndisc_notify = 0
+net.ipv6.conf.enp46s0.ndisc_tclass = 0
+net.ipv6.conf.enp46s0.proxy_ndp = 0
+net.ipv6.conf.enp46s0.ra_defrtr_metric = 1024
+net.ipv6.conf.enp46s0.regen_max_retry = 3
+net.ipv6.conf.enp46s0.router_probe_interval = 60
+net.ipv6.conf.enp46s0.router_solicitation_delay = 1
+net.ipv6.conf.enp46s0.router_solicitation_interval = 4
+net.ipv6.conf.enp46s0.router_solicitation_max_interval = 3600
+net.ipv6.conf.enp46s0.router_solicitations = -1
+net.ipv6.conf.enp46s0.rpl_seg_enabled = 0
+net.ipv6.conf.enp46s0.seg6_enabled = 0
+net.ipv6.conf.enp46s0.seg6_require_hmac = 0
+net.ipv6.conf.enp46s0.suppress_frag_ndisc = 1
+net.ipv6.conf.enp46s0.temp_prefered_lft = 86400
+net.ipv6.conf.enp46s0.temp_valid_lft = 604800
+net.ipv6.conf.enp46s0.use_oif_addrs_only = 0
+net.ipv6.conf.enp46s0.use_tempaddr = 0
+net.ipv6.conf.lo.accept_dad = -1
+net.ipv6.conf.lo.accept_ra = 1
+net.ipv6.conf.lo.accept_ra_defrtr = 1
+net.ipv6.conf.lo.accept_ra_from_local = 0
+net.ipv6.conf.lo.accept_ra_min_hop_limit = 1
+net.ipv6.conf.lo.accept_ra_min_lft = 0
+net.ipv6.conf.lo.accept_ra_mtu = 1
+net.ipv6.conf.lo.accept_ra_pinfo = 1
+net.ipv6.conf.lo.accept_ra_rt_info_max_plen = 0
+net.ipv6.conf.lo.accept_ra_rt_info_min_plen = 0
+net.ipv6.conf.lo.accept_ra_rtr_pref = 1
+net.ipv6.conf.lo.accept_redirects = 1
+net.ipv6.conf.lo.accept_source_route = 0
+net.ipv6.conf.lo.accept_untracked_na = 0
+net.ipv6.conf.lo.addr_gen_mode = 0
+net.ipv6.conf.lo.autoconf = 1
+net.ipv6.conf.lo.dad_transmits = 1
+net.ipv6.conf.lo.disable_ipv6 = 0
+net.ipv6.conf.lo.disable_policy = 0
+net.ipv6.conf.lo.drop_unicast_in_l2_multicast = 0
+net.ipv6.conf.lo.drop_unsolicited_na = 0
+net.ipv6.conf.lo.enhanced_dad = 1
+net.ipv6.conf.lo.force_mld_version = 0
+net.ipv6.conf.lo.force_tllao = 0
+net.ipv6.conf.lo.forwarding = 0
+net.ipv6.conf.lo.hop_limit = 64
+net.ipv6.conf.lo.ignore_routes_with_linkdown = 0
+net.ipv6.conf.lo.ioam6_enabled = 0
+net.ipv6.conf.lo.ioam6_id = 65535
+net.ipv6.conf.lo.ioam6_id_wide = 4294967295
+net.ipv6.conf.lo.keep_addr_on_down = 0
+net.ipv6.conf.lo.max_addresses = 16
+net.ipv6.conf.lo.max_desync_factor = 600
+net.ipv6.conf.lo.mc_forwarding = 0
+net.ipv6.conf.lo.mldv1_unsolicited_report_interval = 10000
+net.ipv6.conf.lo.mldv2_unsolicited_report_interval = 1000
+net.ipv6.conf.lo.mtu = 65536
+net.ipv6.conf.lo.ndisc_evict_nocarrier = 1
+net.ipv6.conf.lo.ndisc_notify = 0
+net.ipv6.conf.lo.ndisc_tclass = 0
+net.ipv6.conf.lo.proxy_ndp = 0
+net.ipv6.conf.lo.ra_defrtr_metric = 1024
+net.ipv6.conf.lo.regen_max_retry = 3
+net.ipv6.conf.lo.router_probe_interval = 60
+net.ipv6.conf.lo.router_solicitation_delay = 1
+net.ipv6.conf.lo.router_solicitation_interval = 4
+net.ipv6.conf.lo.router_solicitation_max_interval = 3600
+net.ipv6.conf.lo.router_solicitations = -1
+net.ipv6.conf.lo.rpl_seg_enabled = 0
+net.ipv6.conf.lo.seg6_enabled = 0
+net.ipv6.conf.lo.seg6_require_hmac = 0
+net.ipv6.conf.lo.suppress_frag_ndisc = 1
+net.ipv6.conf.lo.temp_prefered_lft = 86400
+net.ipv6.conf.lo.temp_valid_lft = 604800
+net.ipv6.conf.lo.use_oif_addrs_only = 0
+net.ipv6.conf.lo.use_tempaddr = -1
+net.ipv6.conf.veth0655c9f.accept_dad = 1
+net.ipv6.conf.veth0655c9f.accept_ra = 1
+net.ipv6.conf.veth0655c9f.accept_ra_defrtr = 1
+net.ipv6.conf.veth0655c9f.accept_ra_from_local = 0
+net.ipv6.conf.veth0655c9f.accept_ra_min_hop_limit = 1
+net.ipv6.conf.veth0655c9f.accept_ra_min_lft = 0
+net.ipv6.conf.veth0655c9f.accept_ra_mtu = 1
+net.ipv6.conf.veth0655c9f.accept_ra_pinfo = 1
+net.ipv6.conf.veth0655c9f.accept_ra_rt_info_max_plen = 0
+net.ipv6.conf.veth0655c9f.accept_ra_rt_info_min_plen = 0
+net.ipv6.conf.veth0655c9f.accept_ra_rtr_pref = 1
+net.ipv6.conf.veth0655c9f.accept_redirects = 1
+net.ipv6.conf.veth0655c9f.accept_source_route = 0
+net.ipv6.conf.veth0655c9f.accept_untracked_na = 0
+net.ipv6.conf.veth0655c9f.addr_gen_mode = 0
+net.ipv6.conf.veth0655c9f.autoconf = 1
+net.ipv6.conf.veth0655c9f.dad_transmits = 1
+net.ipv6.conf.veth0655c9f.disable_ipv6 = 0
+net.ipv6.conf.veth0655c9f.disable_policy = 0
+net.ipv6.conf.veth0655c9f.drop_unicast_in_l2_multicast = 0
+net.ipv6.conf.veth0655c9f.drop_unsolicited_na = 0
+net.ipv6.conf.veth0655c9f.enhanced_dad = 1
+net.ipv6.conf.veth0655c9f.force_mld_version = 0
+net.ipv6.conf.veth0655c9f.force_tllao = 0
+net.ipv6.conf.veth0655c9f.forwarding = 0
+net.ipv6.conf.veth0655c9f.hop_limit = 64
+net.ipv6.conf.veth0655c9f.ignore_routes_with_linkdown = 0
+net.ipv6.conf.veth0655c9f.ioam6_enabled = 0
+net.ipv6.conf.veth0655c9f.ioam6_id = 65535
+net.ipv6.conf.veth0655c9f.ioam6_id_wide = 4294967295
+net.ipv6.conf.veth0655c9f.keep_addr_on_down = 0
+net.ipv6.conf.veth0655c9f.max_addresses = 16
+net.ipv6.conf.veth0655c9f.max_desync_factor = 600
+net.ipv6.conf.veth0655c9f.mc_forwarding = 0
+net.ipv6.conf.veth0655c9f.mldv1_unsolicited_report_interval = 10000
+net.ipv6.conf.veth0655c9f.mldv2_unsolicited_report_interval = 1000
+net.ipv6.conf.veth0655c9f.mtu = 1500
+net.ipv6.conf.veth0655c9f.ndisc_evict_nocarrier = 1
+net.ipv6.conf.veth0655c9f.ndisc_notify = 0
+net.ipv6.conf.veth0655c9f.ndisc_tclass = 0
+net.ipv6.conf.veth0655c9f.proxy_ndp = 0
+net.ipv6.conf.veth0655c9f.ra_defrtr_metric = 1024
+net.ipv6.conf.veth0655c9f.regen_max_retry = 3
+net.ipv6.conf.veth0655c9f.router_probe_interval = 60
+net.ipv6.conf.veth0655c9f.router_solicitation_delay = 1
+net.ipv6.conf.veth0655c9f.router_solicitation_interval = 4
+net.ipv6.conf.veth0655c9f.router_solicitation_max_interval = 3600
+net.ipv6.conf.veth0655c9f.router_solicitations = -1
+net.ipv6.conf.veth0655c9f.rpl_seg_enabled = 0
+net.ipv6.conf.veth0655c9f.seg6_enabled = 0
+net.ipv6.conf.veth0655c9f.seg6_require_hmac = 0
+net.ipv6.conf.veth0655c9f.suppress_frag_ndisc = 1
+net.ipv6.conf.veth0655c9f.temp_prefered_lft = 86400
+net.ipv6.conf.veth0655c9f.temp_valid_lft = 604800
+net.ipv6.conf.veth0655c9f.use_oif_addrs_only = 0
+net.ipv6.conf.veth0655c9f.use_tempaddr = 2
+net.ipv6.conf.veth2655c84.accept_dad = 1
+net.ipv6.conf.veth2655c84.accept_ra = 1
+net.ipv6.conf.veth2655c84.accept_ra_defrtr = 1
+net.ipv6.conf.veth2655c84.accept_ra_from_local = 0
+net.ipv6.conf.veth2655c84.accept_ra_min_hop_limit = 1
+net.ipv6.conf.veth2655c84.accept_ra_min_lft = 0
+net.ipv6.conf.veth2655c84.accept_ra_mtu = 1
+net.ipv6.conf.veth2655c84.accept_ra_pinfo = 1
+net.ipv6.conf.veth2655c84.accept_ra_rt_info_max_plen = 0
+net.ipv6.conf.veth2655c84.accept_ra_rt_info_min_plen = 0
+net.ipv6.conf.veth2655c84.accept_ra_rtr_pref = 1
+net.ipv6.conf.veth2655c84.accept_redirects = 1
+net.ipv6.conf.veth2655c84.accept_source_route = 0
+net.ipv6.conf.veth2655c84.accept_untracked_na = 0
+net.ipv6.conf.veth2655c84.addr_gen_mode = 0
+net.ipv6.conf.veth2655c84.autoconf = 1
+net.ipv6.conf.veth2655c84.dad_transmits = 1
+net.ipv6.conf.veth2655c84.disable_ipv6 = 0
+net.ipv6.conf.veth2655c84.disable_policy = 0
+net.ipv6.conf.veth2655c84.drop_unicast_in_l2_multicast = 0
+net.ipv6.conf.veth2655c84.drop_unsolicited_na = 0
+net.ipv6.conf.veth2655c84.enhanced_dad = 1
+net.ipv6.conf.veth2655c84.force_mld_version = 0
+net.ipv6.conf.veth2655c84.force_tllao = 0
+net.ipv6.conf.veth2655c84.forwarding = 0
+net.ipv6.conf.veth2655c84.hop_limit = 64
+net.ipv6.conf.veth2655c84.ignore_routes_with_linkdown = 0
+net.ipv6.conf.veth2655c84.ioam6_enabled = 0
+net.ipv6.conf.veth2655c84.ioam6_id = 65535
+net.ipv6.conf.veth2655c84.ioam6_id_wide = 4294967295
+net.ipv6.conf.veth2655c84.keep_addr_on_down = 0
+net.ipv6.conf.veth2655c84.max_addresses = 16
+net.ipv6.conf.veth2655c84.max_desync_factor = 600
+net.ipv6.conf.veth2655c84.mc_forwarding = 0
+net.ipv6.conf.veth2655c84.mldv1_unsolicited_report_interval = 10000
+net.ipv6.conf.veth2655c84.mldv2_unsolicited_report_interval = 1000
+net.ipv6.conf.veth2655c84.mtu = 1500
+net.ipv6.conf.veth2655c84.ndisc_evict_nocarrier = 1
+net.ipv6.conf.veth2655c84.ndisc_notify = 0
+net.ipv6.conf.veth2655c84.ndisc_tclass = 0
+net.ipv6.conf.veth2655c84.proxy_ndp = 0
+net.ipv6.conf.veth2655c84.ra_defrtr_metric = 1024
+net.ipv6.conf.veth2655c84.regen_max_retry = 3
+net.ipv6.conf.veth2655c84.router_probe_interval = 60
+net.ipv6.conf.veth2655c84.router_solicitation_delay = 1
+net.ipv6.conf.veth2655c84.router_solicitation_interval = 4
+net.ipv6.conf.veth2655c84.router_solicitation_max_interval = 3600
+net.ipv6.conf.veth2655c84.router_solicitations = -1
+net.ipv6.conf.veth2655c84.rpl_seg_enabled = 0
+net.ipv6.conf.veth2655c84.seg6_enabled = 0
+net.ipv6.conf.veth2655c84.seg6_require_hmac = 0
+net.ipv6.conf.veth2655c84.suppress_frag_ndisc = 1
+net.ipv6.conf.veth2655c84.temp_prefered_lft = 86400
+net.ipv6.conf.veth2655c84.temp_valid_lft = 604800
+net.ipv6.conf.veth2655c84.use_oif_addrs_only = 0
+net.ipv6.conf.veth2655c84.use_tempaddr = 2
+net.ipv6.conf.vethd189986.accept_dad = 1
+net.ipv6.conf.vethd189986.accept_ra = 1
+net.ipv6.conf.vethd189986.accept_ra_defrtr = 1
+net.ipv6.conf.vethd189986.accept_ra_from_local = 0
+net.ipv6.conf.vethd189986.accept_ra_min_hop_limit = 1
+net.ipv6.conf.vethd189986.accept_ra_min_lft = 0
+net.ipv6.conf.vethd189986.accept_ra_mtu = 1
+net.ipv6.conf.vethd189986.accept_ra_pinfo = 1
+net.ipv6.conf.vethd189986.accept_ra_rt_info_max_plen = 0
+net.ipv6.conf.vethd189986.accept_ra_rt_info_min_plen = 0
+net.ipv6.conf.vethd189986.accept_ra_rtr_pref = 1
+net.ipv6.conf.vethd189986.accept_redirects = 1
+net.ipv6.conf.vethd189986.accept_source_route = 0
+net.ipv6.conf.vethd189986.accept_untracked_na = 0
+net.ipv6.conf.vethd189986.addr_gen_mode = 0
+net.ipv6.conf.vethd189986.autoconf = 1
+net.ipv6.conf.vethd189986.dad_transmits = 1
+net.ipv6.conf.vethd189986.disable_ipv6 = 0
+net.ipv6.conf.vethd189986.disable_policy = 0
+net.ipv6.conf.vethd189986.drop_unicast_in_l2_multicast = 0
+net.ipv6.conf.vethd189986.drop_unsolicited_na = 0
+net.ipv6.conf.vethd189986.enhanced_dad = 1
+net.ipv6.conf.vethd189986.force_mld_version = 0
+net.ipv6.conf.vethd189986.force_tllao = 0
+net.ipv6.conf.vethd189986.forwarding = 0
+net.ipv6.conf.vethd189986.hop_limit = 64
+net.ipv6.conf.vethd189986.ignore_routes_with_linkdown = 0
+net.ipv6.conf.vethd189986.ioam6_enabled = 0
+net.ipv6.conf.vethd189986.ioam6_id = 65535
+net.ipv6.conf.vethd189986.ioam6_id_wide = 4294967295
+net.ipv6.conf.vethd189986.keep_addr_on_down = 0
+net.ipv6.conf.vethd189986.max_addresses = 16
+net.ipv6.conf.vethd189986.max_desync_factor = 600
+net.ipv6.conf.vethd189986.mc_forwarding = 0
+net.ipv6.conf.vethd189986.mldv1_unsolicited_report_interval = 10000
+net.ipv6.conf.vethd189986.mldv2_unsolicited_report_interval = 1000
+net.ipv6.conf.vethd189986.mtu = 1500
+net.ipv6.conf.vethd189986.ndisc_evict_nocarrier = 1
+net.ipv6.conf.vethd189986.ndisc_notify = 0
+net.ipv6.conf.vethd189986.ndisc_tclass = 0
+net.ipv6.conf.vethd189986.proxy_ndp = 0
+net.ipv6.conf.vethd189986.ra_defrtr_metric = 1024
+net.ipv6.conf.vethd189986.regen_max_retry = 3
+net.ipv6.conf.vethd189986.router_probe_interval = 60
+net.ipv6.conf.vethd189986.router_solicitation_delay = 1
+net.ipv6.conf.vethd189986.router_solicitation_interval = 4
+net.ipv6.conf.vethd189986.router_solicitation_max_interval = 3600
+net.ipv6.conf.vethd189986.router_solicitations = -1
+net.ipv6.conf.vethd189986.rpl_seg_enabled = 0
+net.ipv6.conf.vethd189986.seg6_enabled = 0
+net.ipv6.conf.vethd189986.seg6_require_hmac = 0
+net.ipv6.conf.vethd189986.suppress_frag_ndisc = 1
+net.ipv6.conf.vethd189986.temp_prefered_lft = 86400
+net.ipv6.conf.vethd189986.temp_valid_lft = 604800
+net.ipv6.conf.vethd189986.use_oif_addrs_only = 0
+net.ipv6.conf.vethd189986.use_tempaddr = 2
+net.ipv6.conf.wg0.accept_dad = -1
+net.ipv6.conf.wg0.accept_ra = 1
+net.ipv6.conf.wg0.accept_ra_defrtr = 1
+net.ipv6.conf.wg0.accept_ra_from_local = 0
+net.ipv6.conf.wg0.accept_ra_min_hop_limit = 1
+net.ipv6.conf.wg0.accept_ra_min_lft = 0
+net.ipv6.conf.wg0.accept_ra_mtu = 1
+net.ipv6.conf.wg0.accept_ra_pinfo = 1
+net.ipv6.conf.wg0.accept_ra_rt_info_max_plen = 0
+net.ipv6.conf.wg0.accept_ra_rt_info_min_plen = 0
+net.ipv6.conf.wg0.accept_ra_rtr_pref = 1
+net.ipv6.conf.wg0.accept_redirects = 1
+net.ipv6.conf.wg0.accept_source_route = 0
+net.ipv6.conf.wg0.accept_untracked_na = 0
+net.ipv6.conf.wg0.addr_gen_mode = 1
+net.ipv6.conf.wg0.autoconf = 1
+net.ipv6.conf.wg0.dad_transmits = 1
+net.ipv6.conf.wg0.disable_ipv6 = 0
+net.ipv6.conf.wg0.disable_policy = 0
+net.ipv6.conf.wg0.drop_unicast_in_l2_multicast = 0
+net.ipv6.conf.wg0.drop_unsolicited_na = 0
+net.ipv6.conf.wg0.enhanced_dad = 1
+net.ipv6.conf.wg0.force_mld_version = 0
+net.ipv6.conf.wg0.force_tllao = 0
+net.ipv6.conf.wg0.forwarding = 0
+net.ipv6.conf.wg0.hop_limit = 64
+net.ipv6.conf.wg0.ignore_routes_with_linkdown = 0
+net.ipv6.conf.wg0.ioam6_enabled = 0
+net.ipv6.conf.wg0.ioam6_id = 65535
+net.ipv6.conf.wg0.ioam6_id_wide = 4294967295
+net.ipv6.conf.wg0.keep_addr_on_down = 0
+net.ipv6.conf.wg0.max_addresses = 16
+net.ipv6.conf.wg0.max_desync_factor = 600
+net.ipv6.conf.wg0.mc_forwarding = 0
+net.ipv6.conf.wg0.mldv1_unsolicited_report_interval = 10000
+net.ipv6.conf.wg0.mldv2_unsolicited_report_interval = 1000
+net.ipv6.conf.wg0.mtu = 1420
+net.ipv6.conf.wg0.ndisc_evict_nocarrier = 1
+net.ipv6.conf.wg0.ndisc_notify = 0
+net.ipv6.conf.wg0.ndisc_tclass = 0
+net.ipv6.conf.wg0.proxy_ndp = 0
+net.ipv6.conf.wg0.ra_defrtr_metric = 1024
+net.ipv6.conf.wg0.regen_max_retry = 3
+net.ipv6.conf.wg0.router_probe_interval = 60
+net.ipv6.conf.wg0.router_solicitation_delay = 1
+net.ipv6.conf.wg0.router_solicitation_interval = 4
+net.ipv6.conf.wg0.router_solicitation_max_interval = 3600
+net.ipv6.conf.wg0.router_solicitations = -1
+net.ipv6.conf.wg0.rpl_seg_enabled = 0
+net.ipv6.conf.wg0.seg6_enabled = 0
+net.ipv6.conf.wg0.seg6_require_hmac = 0
+net.ipv6.conf.wg0.suppress_frag_ndisc = 1
+net.ipv6.conf.wg0.temp_prefered_lft = 86400
+net.ipv6.conf.wg0.temp_valid_lft = 604800
+net.ipv6.conf.wg0.use_oif_addrs_only = 0
+net.ipv6.conf.wg0.use_tempaddr = -1
+net.ipv6.conf.wlp0s20f3.accept_dad = 1
+net.ipv6.conf.wlp0s20f3.accept_ra = 0
+net.ipv6.conf.wlp0s20f3.accept_ra_defrtr = 1
+net.ipv6.conf.wlp0s20f3.accept_ra_from_local = 0
+net.ipv6.conf.wlp0s20f3.accept_ra_min_hop_limit = 1
+net.ipv6.conf.wlp0s20f3.accept_ra_min_lft = 0
+net.ipv6.conf.wlp0s20f3.accept_ra_mtu = 1
+net.ipv6.conf.wlp0s20f3.accept_ra_pinfo = 1
+net.ipv6.conf.wlp0s20f3.accept_ra_rt_info_max_plen = 0
+net.ipv6.conf.wlp0s20f3.accept_ra_rt_info_min_plen = 0
+net.ipv6.conf.wlp0s20f3.accept_ra_rtr_pref = 1
+net.ipv6.conf.wlp0s20f3.accept_redirects = 1
+net.ipv6.conf.wlp0s20f3.accept_source_route = 0
+net.ipv6.conf.wlp0s20f3.accept_untracked_na = 0
+net.ipv6.conf.wlp0s20f3.addr_gen_mode = 1
+net.ipv6.conf.wlp0s20f3.autoconf = 1
+net.ipv6.conf.wlp0s20f3.dad_transmits = 1
+net.ipv6.conf.wlp0s20f3.disable_ipv6 = 0
+net.ipv6.conf.wlp0s20f3.disable_policy = 0
+net.ipv6.conf.wlp0s20f3.drop_unicast_in_l2_multicast = 0
+net.ipv6.conf.wlp0s20f3.drop_unsolicited_na = 0
+net.ipv6.conf.wlp0s20f3.enhanced_dad = 1
+net.ipv6.conf.wlp0s20f3.force_mld_version = 0
+net.ipv6.conf.wlp0s20f3.force_tllao = 0
+net.ipv6.conf.wlp0s20f3.forwarding = 0
+net.ipv6.conf.wlp0s20f3.hop_limit = 64
+net.ipv6.conf.wlp0s20f3.ignore_routes_with_linkdown = 0
+net.ipv6.conf.wlp0s20f3.ioam6_enabled = 0
+net.ipv6.conf.wlp0s20f3.ioam6_id = 65535
+net.ipv6.conf.wlp0s20f3.ioam6_id_wide = 4294967295
+net.ipv6.conf.wlp0s20f3.keep_addr_on_down = 0
+net.ipv6.conf.wlp0s20f3.max_addresses = 16
+net.ipv6.conf.wlp0s20f3.max_desync_factor = 600
+net.ipv6.conf.wlp0s20f3.mc_forwarding = 0
+net.ipv6.conf.wlp0s20f3.mldv1_unsolicited_report_interval = 10000
+net.ipv6.conf.wlp0s20f3.mldv2_unsolicited_report_interval = 1000
+net.ipv6.conf.wlp0s20f3.mtu = 1500
+net.ipv6.conf.wlp0s20f3.ndisc_evict_nocarrier = 1
+net.ipv6.conf.wlp0s20f3.ndisc_notify = 0
+net.ipv6.conf.wlp0s20f3.ndisc_tclass = 0
+net.ipv6.conf.wlp0s20f3.proxy_ndp = 0
+net.ipv6.conf.wlp0s20f3.ra_defrtr_metric = 1024
+net.ipv6.conf.wlp0s20f3.regen_max_retry = 3
+net.ipv6.conf.wlp0s20f3.router_probe_interval = 60
+net.ipv6.conf.wlp0s20f3.router_solicitation_delay = 1
+net.ipv6.conf.wlp0s20f3.router_solicitation_interval = 4
+net.ipv6.conf.wlp0s20f3.router_solicitation_max_interval = 3600
+net.ipv6.conf.wlp0s20f3.router_solicitations = -1
+net.ipv6.conf.wlp0s20f3.rpl_seg_enabled = 0
+net.ipv6.conf.wlp0s20f3.seg6_enabled = 0
+net.ipv6.conf.wlp0s20f3.seg6_require_hmac = 0
+net.ipv6.conf.wlp0s20f3.suppress_frag_ndisc = 1
+net.ipv6.conf.wlp0s20f3.temp_prefered_lft = 86400
+net.ipv6.conf.wlp0s20f3.temp_valid_lft = 604800
+net.ipv6.conf.wlp0s20f3.use_oif_addrs_only = 0
+net.ipv6.conf.wlp0s20f3.use_tempaddr = 2
+net.ipv6.fib_multipath_hash_fields = 7
+net.ipv6.fib_multipath_hash_policy = 0
+net.ipv6.fib_notify_on_flag_change = 0
+net.ipv6.flowlabel_consistency = 1
+net.ipv6.flowlabel_reflect = 0
+net.ipv6.flowlabel_state_ranges = 0
+net.ipv6.fwmark_reflect = 0
+net.ipv6.icmp.echo_ignore_all = 0
+net.ipv6.icmp.echo_ignore_anycast = 0
+net.ipv6.icmp.echo_ignore_multicast = 0
+net.ipv6.icmp.error_anycast_as_unicast = 0
+net.ipv6.icmp.ratelimit = 1000
+net.ipv6.icmp.ratemask = 0-1,3-127
+net.ipv6.idgen_delay = 1
+net.ipv6.idgen_retries = 3
+net.ipv6.ioam6_id = 16777215
+net.ipv6.ioam6_id_wide = 72057594037927935
+net.ipv6.ip6frag_high_thresh = 4194304
+net.ipv6.ip6frag_low_thresh = 3145728
+net.ipv6.ip6frag_secret_interval = 0
+net.ipv6.ip6frag_time = 60
+net.ipv6.ip_nonlocal_bind = 0
+net.ipv6.max_dst_opts_length = 2147483647
+net.ipv6.max_dst_opts_number = 8
+net.ipv6.max_hbh_length = 2147483647
+net.ipv6.max_hbh_opts_number = 8
+net.ipv6.mld_max_msf = 64
+net.ipv6.mld_qrv = 2
+net.ipv6.neigh.br-79118f7d5a92.anycast_delay = 100
+net.ipv6.neigh.br-79118f7d5a92.app_solicit = 0
+net.ipv6.neigh.br-79118f7d5a92.base_reachable_time_ms = 30000
+net.ipv6.neigh.br-79118f7d5a92.delay_first_probe_time = 5
+net.ipv6.neigh.br-79118f7d5a92.gc_stale_time = 60
+net.ipv6.neigh.br-79118f7d5a92.interval_probe_time_ms = 5000
+net.ipv6.neigh.br-79118f7d5a92.locktime = 0
+net.ipv6.neigh.br-79118f7d5a92.mcast_resolicit = 0
+net.ipv6.neigh.br-79118f7d5a92.mcast_solicit = 3
+net.ipv6.neigh.br-79118f7d5a92.proxy_delay = 80
+net.ipv6.neigh.br-79118f7d5a92.proxy_qlen = 64
+net.ipv6.neigh.br-79118f7d5a92.retrans_time_ms = 1000
+net.ipv6.neigh.br-79118f7d5a92.ucast_solicit = 3
+net.ipv6.neigh.br-79118f7d5a92.unres_qlen = 101
+net.ipv6.neigh.br-79118f7d5a92.unres_qlen_bytes = 212992
+net.ipv6.neigh.br-a7c7f1777df1.anycast_delay = 100
+net.ipv6.neigh.br-a7c7f1777df1.app_solicit = 0
+net.ipv6.neigh.br-a7c7f1777df1.base_reachable_time_ms = 30000
+net.ipv6.neigh.br-a7c7f1777df1.delay_first_probe_time = 5
+net.ipv6.neigh.br-a7c7f1777df1.gc_stale_time = 60
+net.ipv6.neigh.br-a7c7f1777df1.interval_probe_time_ms = 5000
+net.ipv6.neigh.br-a7c7f1777df1.locktime = 0
+net.ipv6.neigh.br-a7c7f1777df1.mcast_resolicit = 0
+net.ipv6.neigh.br-a7c7f1777df1.mcast_solicit = 3
+net.ipv6.neigh.br-a7c7f1777df1.proxy_delay = 80
+net.ipv6.neigh.br-a7c7f1777df1.proxy_qlen = 64
+net.ipv6.neigh.br-a7c7f1777df1.retrans_time_ms = 1000
+net.ipv6.neigh.br-a7c7f1777df1.ucast_solicit = 3
+net.ipv6.neigh.br-a7c7f1777df1.unres_qlen = 101
+net.ipv6.neigh.br-a7c7f1777df1.unres_qlen_bytes = 212992
+net.ipv6.neigh.default.anycast_delay = 100
+net.ipv6.neigh.default.app_solicit = 0
+net.ipv6.neigh.default.base_reachable_time_ms = 30000
+net.ipv6.neigh.default.delay_first_probe_time = 5
+net.ipv6.neigh.default.gc_interval = 30
+net.ipv6.neigh.default.gc_stale_time = 60
+net.ipv6.neigh.default.gc_thresh1 = 128
+net.ipv6.neigh.default.gc_thresh2 = 512
+net.ipv6.neigh.default.gc_thresh3 = 1024
+net.ipv6.neigh.default.interval_probe_time_ms = 5000
+net.ipv6.neigh.default.locktime = 0
+net.ipv6.neigh.default.mcast_resolicit = 0
+net.ipv6.neigh.default.mcast_solicit = 3
+net.ipv6.neigh.default.proxy_delay = 80
+net.ipv6.neigh.default.proxy_qlen = 64
+net.ipv6.neigh.default.retrans_time_ms = 1000
+net.ipv6.neigh.default.ucast_solicit = 3
+net.ipv6.neigh.default.unres_qlen = 101
+net.ipv6.neigh.default.unres_qlen_bytes = 212992
+net.ipv6.neigh.docker0.anycast_delay = 100
+net.ipv6.neigh.docker0.app_solicit = 0
+net.ipv6.neigh.docker0.base_reachable_time_ms = 30000
+net.ipv6.neigh.docker0.delay_first_probe_time = 5
+net.ipv6.neigh.docker0.gc_stale_time = 60
+net.ipv6.neigh.docker0.interval_probe_time_ms = 5000
+net.ipv6.neigh.docker0.locktime = 0
+net.ipv6.neigh.docker0.mcast_resolicit = 0
+net.ipv6.neigh.docker0.mcast_solicit = 3
+net.ipv6.neigh.docker0.proxy_delay = 80
+net.ipv6.neigh.docker0.proxy_qlen = 64
+net.ipv6.neigh.docker0.retrans_time_ms = 1000
+net.ipv6.neigh.docker0.ucast_solicit = 3
+net.ipv6.neigh.docker0.unres_qlen = 101
+net.ipv6.neigh.docker0.unres_qlen_bytes = 212992
+net.ipv6.neigh.enp46s0.anycast_delay = 100
+net.ipv6.neigh.enp46s0.app_solicit = 0
+net.ipv6.neigh.enp46s0.base_reachable_time_ms = 30000
+net.ipv6.neigh.enp46s0.delay_first_probe_time = 5
+net.ipv6.neigh.enp46s0.gc_stale_time = 60
+net.ipv6.neigh.enp46s0.interval_probe_time_ms = 5000
+net.ipv6.neigh.enp46s0.locktime = 0
+net.ipv6.neigh.enp46s0.mcast_resolicit = 0
+net.ipv6.neigh.enp46s0.mcast_solicit = 3
+net.ipv6.neigh.enp46s0.proxy_delay = 80
+net.ipv6.neigh.enp46s0.proxy_qlen = 64
+net.ipv6.neigh.enp46s0.retrans_time_ms = 1000
+net.ipv6.neigh.enp46s0.ucast_solicit = 3
+net.ipv6.neigh.enp46s0.unres_qlen = 101
+net.ipv6.neigh.enp46s0.unres_qlen_bytes = 212992
+net.ipv6.neigh.lo.anycast_delay = 100
+net.ipv6.neigh.lo.app_solicit = 0
+net.ipv6.neigh.lo.base_reachable_time_ms = 30000
+net.ipv6.neigh.lo.delay_first_probe_time = 5
+net.ipv6.neigh.lo.gc_stale_time = 60
+net.ipv6.neigh.lo.interval_probe_time_ms = 5000
+net.ipv6.neigh.lo.locktime = 0
+net.ipv6.neigh.lo.mcast_resolicit = 0
+net.ipv6.neigh.lo.mcast_solicit = 3
+net.ipv6.neigh.lo.proxy_delay = 80
+net.ipv6.neigh.lo.proxy_qlen = 64
+net.ipv6.neigh.lo.retrans_time_ms = 1000
+net.ipv6.neigh.lo.ucast_solicit = 3
+net.ipv6.neigh.lo.unres_qlen = 101
+net.ipv6.neigh.lo.unres_qlen_bytes = 212992
+net.ipv6.neigh.veth0655c9f.anycast_delay = 100
+net.ipv6.neigh.veth0655c9f.app_solicit = 0
+net.ipv6.neigh.veth0655c9f.base_reachable_time_ms = 30000
+net.ipv6.neigh.veth0655c9f.delay_first_probe_time = 5
+net.ipv6.neigh.veth0655c9f.gc_stale_time = 60
+net.ipv6.neigh.veth0655c9f.interval_probe_time_ms = 5000
+net.ipv6.neigh.veth0655c9f.locktime = 0
+net.ipv6.neigh.veth0655c9f.mcast_resolicit = 0
+net.ipv6.neigh.veth0655c9f.mcast_solicit = 3
+net.ipv6.neigh.veth0655c9f.proxy_delay = 80
+net.ipv6.neigh.veth0655c9f.proxy_qlen = 64
+net.ipv6.neigh.veth0655c9f.retrans_time_ms = 1000
+net.ipv6.neigh.veth0655c9f.ucast_solicit = 3
+net.ipv6.neigh.veth0655c9f.unres_qlen = 101
+net.ipv6.neigh.veth0655c9f.unres_qlen_bytes = 212992
+net.ipv6.neigh.veth2655c84.anycast_delay = 100
+net.ipv6.neigh.veth2655c84.app_solicit = 0
+net.ipv6.neigh.veth2655c84.base_reachable_time_ms = 30000
+net.ipv6.neigh.veth2655c84.delay_first_probe_time = 5
+net.ipv6.neigh.veth2655c84.gc_stale_time = 60
+net.ipv6.neigh.veth2655c84.interval_probe_time_ms = 5000
+net.ipv6.neigh.veth2655c84.locktime = 0
+net.ipv6.neigh.veth2655c84.mcast_resolicit = 0
+net.ipv6.neigh.veth2655c84.mcast_solicit = 3
+net.ipv6.neigh.veth2655c84.proxy_delay = 80
+net.ipv6.neigh.veth2655c84.proxy_qlen = 64
+net.ipv6.neigh.veth2655c84.retrans_time_ms = 1000
+net.ipv6.neigh.veth2655c84.ucast_solicit = 3
+net.ipv6.neigh.veth2655c84.unres_qlen = 101
+net.ipv6.neigh.veth2655c84.unres_qlen_bytes = 212992
+net.ipv6.neigh.vethd189986.anycast_delay = 100
+net.ipv6.neigh.vethd189986.app_solicit = 0
+net.ipv6.neigh.vethd189986.base_reachable_time_ms = 30000
+net.ipv6.neigh.vethd189986.delay_first_probe_time = 5
+net.ipv6.neigh.vethd189986.gc_stale_time = 60
+net.ipv6.neigh.vethd189986.interval_probe_time_ms = 5000
+net.ipv6.neigh.vethd189986.locktime = 0
+net.ipv6.neigh.vethd189986.mcast_resolicit = 0
+net.ipv6.neigh.vethd189986.mcast_solicit = 3
+net.ipv6.neigh.vethd189986.proxy_delay = 80
+net.ipv6.neigh.vethd189986.proxy_qlen = 64
+net.ipv6.neigh.vethd189986.retrans_time_ms = 1000
+net.ipv6.neigh.vethd189986.ucast_solicit = 3
+net.ipv6.neigh.vethd189986.unres_qlen = 101
+net.ipv6.neigh.vethd189986.unres_qlen_bytes = 212992
+net.ipv6.neigh.wg0.anycast_delay = 100
+net.ipv6.neigh.wg0.app_solicit = 0
+net.ipv6.neigh.wg0.base_reachable_time_ms = 30000
+net.ipv6.neigh.wg0.delay_first_probe_time = 5
+net.ipv6.neigh.wg0.gc_stale_time = 60
+net.ipv6.neigh.wg0.interval_probe_time_ms = 5000
+net.ipv6.neigh.wg0.locktime = 0
+net.ipv6.neigh.wg0.mcast_resolicit = 0
+net.ipv6.neigh.wg0.mcast_solicit = 3
+net.ipv6.neigh.wg0.proxy_delay = 80
+net.ipv6.neigh.wg0.proxy_qlen = 64
+net.ipv6.neigh.wg0.retrans_time_ms = 1000
+net.ipv6.neigh.wg0.ucast_solicit = 3
+net.ipv6.neigh.wg0.unres_qlen = 101
+net.ipv6.neigh.wg0.unres_qlen_bytes = 212992
+net.ipv6.neigh.wlp0s20f3.anycast_delay = 100
+net.ipv6.neigh.wlp0s20f3.app_solicit = 0
+net.ipv6.neigh.wlp0s20f3.base_reachable_time_ms = 30000
+net.ipv6.neigh.wlp0s20f3.delay_first_probe_time = 5
+net.ipv6.neigh.wlp0s20f3.gc_stale_time = 60
+net.ipv6.neigh.wlp0s20f3.interval_probe_time_ms = 5000
+net.ipv6.neigh.wlp0s20f3.locktime = 0
+net.ipv6.neigh.wlp0s20f3.mcast_resolicit = 0
+net.ipv6.neigh.wlp0s20f3.mcast_solicit = 3
+net.ipv6.neigh.wlp0s20f3.proxy_delay = 80
+net.ipv6.neigh.wlp0s20f3.proxy_qlen = 64
+net.ipv6.neigh.wlp0s20f3.retrans_time_ms = 1000
+net.ipv6.neigh.wlp0s20f3.ucast_solicit = 3
+net.ipv6.neigh.wlp0s20f3.unres_qlen = 101
+net.ipv6.neigh.wlp0s20f3.unres_qlen_bytes = 212992
+net.ipv6.route.gc_elasticity = 9
+net.ipv6.route.gc_interval = 30
+net.ipv6.route.gc_min_interval = 0
+net.ipv6.route.gc_min_interval_ms = 500
+net.ipv6.route.gc_thresh = 1024
+net.ipv6.route.gc_timeout = 60
+net.ipv6.route.max_size = 2147483647
+net.ipv6.route.min_adv_mss = 1220
+net.ipv6.route.mtu_expires = 600
+net.ipv6.route.skip_notify_on_dev_down = 0
+net.ipv6.seg6_flowlabel = 0
+net.ipv6.xfrm6_gc_thresh = 32768
+net.mptcp.add_addr_timeout = 120
+net.mptcp.allow_join_initial_addr_port = 1
+net.mptcp.checksum_enabled = 0
+net.mptcp.enabled = 1
+net.mptcp.pm_type = 0
+net.mptcp.stale_loss_cnt = 4
+net.netfilter.nf_conntrack_acct = 0
+net.netfilter.nf_conntrack_buckets = 262144
+net.netfilter.nf_conntrack_checksum = 1
+net.netfilter.nf_conntrack_count = 1511
+net.netfilter.nf_conntrack_dccp_loose = 1
+net.netfilter.nf_conntrack_dccp_timeout_closereq = 64
+net.netfilter.nf_conntrack_dccp_timeout_closing = 64
+net.netfilter.nf_conntrack_dccp_timeout_open = 43200
+net.netfilter.nf_conntrack_dccp_timeout_partopen = 480
+net.netfilter.nf_conntrack_dccp_timeout_request = 240
+net.netfilter.nf_conntrack_dccp_timeout_respond = 480
+net.netfilter.nf_conntrack_dccp_timeout_timewait = 240
+net.netfilter.nf_conntrack_events = 2
+net.netfilter.nf_conntrack_expect_max = 4096
+net.netfilter.nf_conntrack_frag6_high_thresh = 4194304
+net.netfilter.nf_conntrack_frag6_low_thresh = 3145728
+net.netfilter.nf_conntrack_frag6_timeout = 60
+net.netfilter.nf_conntrack_generic_timeout = 600
+net.netfilter.nf_conntrack_gre_timeout = 30
+net.netfilter.nf_conntrack_gre_timeout_stream = 180
+net.netfilter.nf_conntrack_icmp_timeout = 30
+net.netfilter.nf_conntrack_icmpv6_timeout = 30
+net.netfilter.nf_conntrack_log_invalid = 0
+net.netfilter.nf_conntrack_max = 262144
+net.netfilter.nf_conntrack_sctp_timeout_closed = 10
+net.netfilter.nf_conntrack_sctp_timeout_cookie_echoed = 3
+net.netfilter.nf_conntrack_sctp_timeout_cookie_wait = 3
+net.netfilter.nf_conntrack_sctp_timeout_established = 210
+net.netfilter.nf_conntrack_sctp_timeout_heartbeat_sent = 30
+net.netfilter.nf_conntrack_sctp_timeout_shutdown_ack_sent = 3
+net.netfilter.nf_conntrack_sctp_timeout_shutdown_recd = 3
+net.netfilter.nf_conntrack_sctp_timeout_shutdown_sent = 3
+net.netfilter.nf_conntrack_tcp_be_liberal = 0
+net.netfilter.nf_conntrack_tcp_ignore_invalid_rst = 0
+net.netfilter.nf_conntrack_tcp_loose = 1
+net.netfilter.nf_conntrack_tcp_max_retrans = 3
+net.netfilter.nf_conntrack_tcp_timeout_close = 10
+net.netfilter.nf_conntrack_tcp_timeout_close_wait = 60
+net.netfilter.nf_conntrack_tcp_timeout_established = 432000
+net.netfilter.nf_conntrack_tcp_timeout_fin_wait = 120
+net.netfilter.nf_conntrack_tcp_timeout_last_ack = 30
+net.netfilter.nf_conntrack_tcp_timeout_max_retrans = 300
+net.netfilter.nf_conntrack_tcp_timeout_syn_recv = 60
+net.netfilter.nf_conntrack_tcp_timeout_syn_sent = 120
+net.netfilter.nf_conntrack_tcp_timeout_time_wait = 120
+net.netfilter.nf_conntrack_tcp_timeout_unacknowledged = 300
+net.netfilter.nf_conntrack_timestamp = 0
+net.netfilter.nf_conntrack_udp_timeout = 30
+net.netfilter.nf_conntrack_udp_timeout_stream = 120
+net.netfilter.nf_flowtable_tcp_timeout = 30
+net.netfilter.nf_flowtable_udp_timeout = 30
+net.netfilter.nf_hooks_lwtunnel = 0
+net.netfilter.nf_log.0 = NONE
+net.netfilter.nf_log.1 = NONE
+net.netfilter.nf_log.10 = NONE
+net.netfilter.nf_log.2 = NONE
+net.netfilter.nf_log.3 = NONE
+net.netfilter.nf_log.4 = NONE
+net.netfilter.nf_log.5 = NONE
+net.netfilter.nf_log.6 = NONE
+net.netfilter.nf_log.7 = NONE
+net.netfilter.nf_log.8 = NONE
+net.netfilter.nf_log.9 = NONE
+net.netfilter.nf_log_all_netns = 0
+net.nf_conntrack_max = 262144
+net.unix.max_dgram_qlen = 512
+user.max_cgroup_namespaces = 256032
+user.max_fanotify_groups = 128
+user.max_fanotify_marks = 530989
+user.max_inotify_instances = 128
+user.max_inotify_watches = 65536
+user.max_ipc_namespaces = 256032
+user.max_mnt_namespaces = 256032
+user.max_net_namespaces = 256032
+user.max_pid_namespaces = 256032
+user.max_time_namespaces = 256032
+user.max_user_namespaces = 256032
+user.max_uts_namespaces = 256032
+vm.admin_reserve_kbytes = 8192
+vm.compact_unevictable_allowed = 1
+vm.compaction_proactiveness = 20
+vm.dirty_background_bytes = 0
+vm.dirty_background_ratio = 10
+vm.dirty_bytes = 0
+vm.dirty_expire_centisecs = 3000
+vm.dirty_ratio = 20
+vm.dirty_writeback_centisecs = 500
+vm.dirtytime_expire_seconds = 43200
+vm.extfrag_threshold = 500
+vm.hugetlb_optimize_vmemmap = 0
+vm.hugetlb_shm_group = 0
+vm.laptop_mode = 0
+vm.legacy_va_layout = 0
+vm.lowmem_reserve_ratio = 256	256	32	0	0
+vm.max_map_count = 65530
+vm.memfd_noexec = 0
+vm.memory_failure_early_kill = 0
+vm.memory_failure_recovery = 1
+vm.min_free_kbytes = 67584
+vm.min_slab_ratio = 5
+vm.min_unmapped_ratio = 1
+vm.mmap_min_addr = 65536
+vm.nr_hugepages = 0
+vm.nr_hugepages_mempolicy = 0
+vm.nr_overcommit_hugepages = 0
+vm.numa_stat = 1
+vm.numa_zonelist_order = Node
+vm.oom_dump_tasks = 1
+vm.oom_kill_allocating_task = 0
+vm.overcommit_kbytes = 0
+vm.overcommit_memory = 0
+vm.overcommit_ratio = 50
+vm.page-cluster = 3
+vm.page_lock_unfairness = 5
+vm.panic_on_oom = 0
+vm.percpu_pagelist_high_fraction = 0
+vm.stat_interval = 1
+vm.swappiness = 60
+vm.unprivileged_userfaultfd = 0
+vm.user_reserve_kbytes = 131072
+vm.vfs_cache_pressure = 100
+vm.watermark_boost_factor = 15000
+vm.watermark_scale_factor = 10
+vm.zone_reclaim_mode = 0
diff --git a/t/pt-summary/samples/Linux/009/transparent_hugepage b/t/pt-summary/samples/Linux/009/transparent_hugepage
new file mode 100644
index 000000000..1a6560fa1
--- /dev/null
+++ b/t/pt-summary/samples/Linux/009/transparent_hugepage
@@ -0,0 +1 @@
+[always] madvise never
diff --git a/t/pt-summary/samples/Linux/009/uptime b/t/pt-summary/samples/Linux/009/uptime
new file mode 100644
index 000000000..c0efdf784
--- /dev/null
+++ b/t/pt-summary/samples/Linux/009/uptime
@@ -0,0 +1 @@
+ 12:57:53 up 95 days,  5:49,  1 user,  load average: 6,32, 6,92, 6,94
diff --git a/t/pt-summary/samples/Linux/009/vmstat b/t/pt-summary/samples/Linux/009/vmstat
new file mode 100644
index 000000000..ffdb4e289
--- /dev/null
+++ b/t/pt-summary/samples/Linux/009/vmstat
@@ -0,0 +1,7 @@
+procs -----------memory---------- ---swap-- -----io---- -system-- ------cpu-----
+ r  b   swpd   free   buff  cache   si   so    bi    bo   in   cs us sy id wa st
+ 8  0 1987020 1418168 1633964 35363256    0    0    31   201    1    1 12  2 86  0  0
+ 5  0 1987020 1446196 1633964 35344312    0    0     0   112 14942 51159 40  3 57  0  0
+ 6  0 1987020 1434224 1633964 35341352    0    0     4  1704 16125 21166 34  1 65  0  0
+ 6  0 1987020 1459840 1633964 35338636    0    0     0     8 16382 20180 35  2 63  0  0
+ 5  0 1987020 1436008 1633964 35338540    0    0     0   904 16908 26057 35  1 63  0  0
diff --git a/t/pt-summary/samples/Linux/output_002.txt b/t/pt-summary/samples/Linux/output_002.txt
index 1c7bda310..4a81fe9d1 100644
--- a/t/pt-summary/samples/Linux/output_002.txt
+++ b/t/pt-summary/samples/Linux/output_002.txt
@@ -81,5 +81,4 @@ Unable to collect information
    1  0     0    0     0     0   1000     35  80  20   0   0   0
    1  0     0    0     0     0    900     45  62  38   0   0   0
 # Memory management ##########################################
-Transparent huge pages are enabled.
 # The End ####################################################
diff --git a/t/pt-summary/samples/Linux/output_003.txt b/t/pt-summary/samples/Linux/output_003.txt
index 90a9ae332..38bde2c11 100644
--- a/t/pt-summary/samples/Linux/output_003.txt
+++ b/t/pt-summary/samples/Linux/output_003.txt
@@ -78,5 +78,4 @@ Unable to collect information
    1  0     0    0     0     0    900     35  78  22   0   0   0
    2  0     0    0     0     0    700     20  78  22   0   0   0
 # Memory management ##########################################
-Transparent huge pages are enabled.
 # The End ####################################################
diff --git a/t/pt-summary/samples/Linux/output_005.txt b/t/pt-summary/samples/Linux/output_005.txt
index 8ba557903..8de81c637 100644
--- a/t/pt-summary/samples/Linux/output_005.txt
+++ b/t/pt-summary/samples/Linux/output_005.txt
@@ -160,5 +160,4 @@ Unable to collect information
    0  0     0    0     0     0    150    100   0   0 100   0   0
    0  0     0    0     0     0    125    100   0   0 100   0   0
 # Memory management ##########################################
-Transparent huge pages are enabled.
 # The End ####################################################
diff --git a/t/pt-summary/samples/Linux/output_006.txt b/t/pt-summary/samples/Linux/output_006.txt
index 66ea1fa01..b74c9fd6b 100644
--- a/t/pt-summary/samples/Linux/output_006.txt
+++ b/t/pt-summary/samples/Linux/output_006.txt
@@ -207,5 +207,4 @@ dentry-state | 456513	375385	45	0	141719	0
   PID    OOM    COMMAND
     ?      ?    sshd doesn't appear to be running
 # Memory management ##########################################
-Transparent huge pages are enabled.
 # The End ####################################################
diff --git a/t/pt-summary/samples/Linux/output_007.txt b/t/pt-summary/samples/Linux/output_007.txt
index dcbabdb8b..0c2c672fe 100644
--- a/t/pt-summary/samples/Linux/output_007.txt
+++ b/t/pt-summary/samples/Linux/output_007.txt
@@ -568,5 +568,4 @@ dentry-state | 10194137	9907146	45	0	2973650	0
 44034    -17    sshd
 48761    -17    sshd
 # Memory management ##########################################
-Transparent huge pages are enabled.
 # The End ####################################################
diff --git a/t/pt-summary/samples/Linux/output_008.txt b/t/pt-summary/samples/Linux/output_008.txt
new file mode 100644
index 000000000..242f407c8
--- /dev/null
+++ b/t/pt-summary/samples/Linux/output_008.txt
@@ -0,0 +1,201 @@
+    Hostname | s76
+      Uptime | 95 days,  5:41,  1 user,  load average: 7,27, 6,88, 6,86
+    Platform | Linux
+     Release | Ubuntu 22.04.4 LTS (jammy)
+      Kernel | 6.5.0-35-generic
+Architecture | CPU = 64-bit, OS = 64-bit
+   Threading | NPTL 2.35
+     SELinux | No SELinux detected
+ Virtualized | No virtualization detected
+# Processor ##################################################
+  Processors | physical = 1, cores = 12, virtual = 16, hyperthreading = yes
+      Speeds | 1x2299.894, 1x2299.975, 1x2299.997, 1x2299.998, 1x2300.011, 1x2300.012, 1x2300.017, 1x2300.091, 1x2672.558, 1x2780.294, 4x2800.000, 1x2800.007, 1x2900.000
+      Models | 16x12th Gen Intel(R) Core(TM) i7-1260P
+      Caches | 16x18432 KB
+  Designation               Configuration                  Size     Associativity
+  ========================= ============================== ======== ======================
+# Memory #####################################################
+         Total | 62.6G
+          Free | 1.6G
+          Used | physical = 25.7G, swap allocated = 1.9G, swap used = 1.9G, virtual = 27.6G
+        Shared | 2.7G
+       Buffers | 35.4G
+        Caches | 33.8G
+         Dirty | 16372 kB
+       UsedRSS | 35.9G
+    Swappiness | 60
+   DirtyPolicy | 20, 10
+   DirtyStatus | 0, 0
+  Locator   Size     Speed             Form Factor   Type          Type Detail
+  ========= ======== ================= ============= ============= ===========
+# Mounted Filesystems ########################################
+  Filesystem                 Size Used Type     Opts                                                                                                 Mountpoint
+  /dev/fuse                  250G   0% fuse     rw,nosuid,nodev,relatime,user_id=1000,group_id=1000                                                  /run/user/1000/keybase/kbfs
+  /dev/mapper/vgubuntu-root  3,6T  43% ext4     rw,relatime,errors=remount-ro                                                                        /
+  /dev/nvme0n1p1             511M  57% vfat     rw,relatime,fmask=0077,dmask=0077,codepage=437,iocharset=iso8859-1,shortname=mixed,errors=remount-ro /boot/efi
+  /dev/nvme0n1p2             1,7G  20% ext4     rw,relatime                                                                                          /boot
+  efivarfs                    64K  45% efivarfs rw,nosuid,nodev,noexec,relatime                                                                      /sys/firmware/efi/efivars
+  tmpfs                       32G   3% tmpfs    rw,nosuid,nodev,inode64                                                                              /dev/shm
+  tmpfs                       32G   3% tmpfs    rw,nosuid,nodev,noexec,relatime,size=5120k,inode64                                                   /dev/shm
+  tmpfs                       32G   3% tmpfs    rw,nosuid,nodev,noexec,relatime,size=6567948k,mode=755,inode64                                       /dev/shm
+  tmpfs                       32G   3% tmpfs    rw,nosuid,nodev,noexec,relatime,size=6567948k,mode=755,inode64                                       /dev/shm
+  tmpfs                       32G   3% tmpfs    rw,nosuid,nodev,relatime,size=6567944k,nr_inodes=1641986,mode=700,uid=1000,gid=1000,inode64          /dev/shm
+  tmpfs                      5,0M   1% tmpfs    rw,nosuid,nodev,inode64                                                                              /run/lock
+  tmpfs                      5,0M   1% tmpfs    rw,nosuid,nodev,noexec,relatime,size=5120k,inode64                                                   /run/lock
+  tmpfs                      5,0M   1% tmpfs    rw,nosuid,nodev,noexec,relatime,size=6567948k,mode=755,inode64                                       /run/lock
+  tmpfs                      5,0M   1% tmpfs    rw,nosuid,nodev,noexec,relatime,size=6567948k,mode=755,inode64                                       /run/lock
+  tmpfs                      5,0M   1% tmpfs    rw,nosuid,nodev,relatime,size=6567944k,nr_inodes=1641986,mode=700,uid=1000,gid=1000,inode64          /run/lock
+  tmpfs                      6,3G   1% tmpfs    rw,nosuid,nodev,inode64                                                                              /run/user/1000
+  tmpfs                      6,3G   1% tmpfs    rw,nosuid,nodev,noexec,relatime,size=5120k,inode64                                                   /run/user/1000
+  tmpfs                      6,3G   1% tmpfs    rw,nosuid,nodev,noexec,relatime,size=6567948k,mode=755,inode64                                       /run/user/1000
+  tmpfs                      6,3G   1% tmpfs    rw,nosuid,nodev,noexec,relatime,size=6567948k,mode=755,inode64                                       /run/user/1000
+  tmpfs                      6,3G   1% tmpfs    rw,nosuid,nodev,relatime,size=6567944k,nr_inodes=1641986,mode=700,uid=1000,gid=1000,inode64          /run/user/1000
+  tmpfs                      6,3G   1% tmpfs    rw,nosuid,nodev,inode64                                                                              /run
+  tmpfs                      6,3G   1% tmpfs    rw,nosuid,nodev,noexec,relatime,size=5120k,inode64                                                   /run
+  tmpfs                      6,3G   1% tmpfs    rw,nosuid,nodev,noexec,relatime,size=6567948k,mode=755,inode64                                       /run
+  tmpfs                      6,3G   1% tmpfs    rw,nosuid,nodev,noexec,relatime,size=6567948k,mode=755,inode64                                       /run
+  tmpfs                      6,3G   1% tmpfs    rw,nosuid,nodev,relatime,size=6567944k,nr_inodes=1641986,mode=700,uid=1000,gid=1000,inode64          /run
+# Disk Schedulers And Queue Size #############################
+        dm-0 | UNREADABLE
+        dm-1 | UNREADABLE
+        dm-2 | UNREADABLE
+     nvme0n1 | [none] 1023
+# Disk Partitioning ##########################################
+Device       Type      Start        End               Size
+============ ==== ========== ========== ==================
+/dev/nvme0n1 Disk                            4000787030016
+/dev/nvme0n1p1 Part       2048    1050623                  0
+/dev/nvme0n1p2 Part    1050624    4550655                  0
+/dev/nvme0n1p3 Part    4550656 7814035455                  0
+# Kernel Inode State #########################################
+dentry-state | 3350735	3155181	45	0	2247869	0
+     file-nr | 35904	0	9223372036854775807
+    inode-nr | 1417972	554725
+# LVM Volumes ################################################
+Unable to collect information
+# LVM Volume Groups ##########################################
+Unable to collect information
+# RAID Controller ############################################
+  Controller | No RAID controller detected
+# Network Config #############################################
+  Controller | Realtek Semiconductor Co., Ltd. RTL8111/8168/8411 PCI Express Gigabit Ethernet Controller (rev 15)
+ FIN Timeout | 60
+  Port Range | 60999
+# Interface Statistics #######################################
+  interface  rx_bytes rx_packets  rx_errors   tx_bytes tx_packets  tx_errors
+  ========= ========= ========== ========== ========== ========== ==========
+  lo       125000000000  175000000          0 125000000000  175000000          0
+  enp46s0           0          0          0          0          0          0
+  wlp0s20f3 150000000000  150000000          0 30000000000   80000000          0
+  docker0  12500000000   12500000          0 30000000000   15000000          0
+  br-a7c7f1777df1          0          0          0          0          0          0
+  veth0655c9f@if604 1250000000    1000000          0 2500000000    1250000          0
+  vethd189986@if606   50000000     250000          0  600000000     300000          0
+  veth2655c84@if608  500000000     250000          0   50000000     250000          0
+  wg0        12500000      25000          0    5000000      25000          0
+  br-79118f7d5a92   15000000     225000          0  800000000     350000          0
+# Network Connections ########################################
+  Connections from remote IP addresses
+    3.68.61.181         3
+    3.124.19.111        1
+    10.0.0.1            1
+    10.0.0.5            4
+    18.190.135.240      1
+    18.205.222.128      1
+    34.107.243.93       1
+    34.202.253.140      1
+    35.75.32.93         6
+    38.111.114.11       1
+    44.208.19.176       1
+    52.35.150.14        3
+    52.57.79.4          1
+    52.73.62.51         1
+    52.84.151.38        1
+    52.193.110.50       1
+    54.147.17.17        1
+    54.158.119.218      1
+    54.159.113.253      1
+    64.233.162.188      1
+    74.125.205.188      1
+    77.223.96.250       1
+    89.253.240.17       2
+    91.105.192.100      7
+    108.157.214.53      1
+    108.157.214.118     1
+    127.0.0.1          80
+    140.82.113.26       1
+    142.250.184.131     1
+    142.251.1.138       1
+    149.154.167.51      1
+    157.240.205.60      1
+    162.125.6.20        1
+    162.125.21.2        1
+    162.125.21.3        8
+    162.125.69.12       1
+    162.125.69.13       1
+    170.114.4.224       1
+    170.114.15.227      1
+    170.114.52.2        2
+    170.114.52.66       1
+    172.17.0.2          5
+    172.64.152.233      1
+    173.194.220.108     5
+    173.194.221.94      1
+    185.166.143.36      1
+    188.114.98.233      2
+    188.114.99.233      2
+    194.85.125.1        1
+    206.247.115.239     1
+    209.85.233.104      1
+    213.180.204.148     3
+  Connections to local IP addresses
+    10.0.0.5           15
+    127.0.0.1          80
+    172.17.0.1          5
+    192.168.55.2       70
+    192.168.255.22      1
+  Connections to top 10 local ports
+    12345               3
+    12347               4
+    3306               10
+    42001               3
+    42002               3
+    42003               3
+    4647                2
+    60442               1
+    60536               1
+    60740               1
+  States of connections
+    CLOSE_WAIT          9
+    ESTABLISHED       125
+    LISTEN             45
+    SYN_SENT            3
+    TIME_WAIT          25
+# Top Processes ##############################################
+    PID USER      PR  NI    VIRT    RES    SHR S  %CPU  %MEM     TIME+ COMMAND
+2407273 sveta     20   0   64144  46012  13824 R 100,0   0,1   5061:20 perl
+2410420 sveta     20   0   64140  46184  13952 R 100,0   0,1   5059:23 perl
+ 783789 sveta     20   0 2822620 506824  42752 S  94,1   0,8   5786:40 mysqld
+2408748 sveta     20   0   64136  46068  14080 R  94,1   0,1   5060:24 perl
+2419768 sveta     20   0   64140  46088  13952 R  94,1   0,1   5055:00 perl
+2504338 root      20   0 3183396 578628 283160 S  94,1   0,9  47:38.67 s1-agent
+2504336 root      20   0  289740 127780  25600 S  52,9   0,2   9:50.52 s1-scan+
+   7288 sveta     20   0 2688236 139560  46968 S   5,9   0,2   1028:47 Xorg
+ 622143 sveta     20   0 1132,2g 682008  88376 S   5,9   1,0 117:46.23 slack
+# Notable Processes ##########################################
+  PID    OOM    COMMAND
+    ?      ?    sshd doesn't appear to be running
+1499134    -17    multipathd
+2849628    -17    nomad
+3202899    -17    sshd
+# Simplified and fuzzy rounded vmstat (wait please) ##########
+  procs  ---swap-- -----io---- ---system---- --------cpu--------
+   r  b    si   so    bi    bo     ir     cs  us  sy  il  wa  st
+   8  0     0    0    30   200      1      1  12   2  86   0   0
+   9  0     0    0     8  1750  15000  50000  39   3  58   0   0
+   5  1     0    0     0   500  15000  22500  39   1  60   0   0
+   5  0     0    0     0   900  17500  20000  34   1  65   0   0
+   5  0     0    0     0   350  17500  25000  36   2  63   0   0
+# Memory management ##########################################
+Transparent huge pages are currently disabled on the system.
+# The End ####################################################
diff --git a/t/pt-summary/samples/Linux/output_009.txt b/t/pt-summary/samples/Linux/output_009.txt
new file mode 100644
index 000000000..748d2cd14
--- /dev/null
+++ b/t/pt-summary/samples/Linux/output_009.txt
@@ -0,0 +1,212 @@
+    Hostname | s76
+      Uptime | 95 days,  5:49,  1 user,  load average: 6,32, 6,92, 6,94
+    Platform | Linux
+     Release | Ubuntu 22.04.4 LTS (jammy)
+      Kernel | 6.5.0-35-generic
+Architecture | CPU = 64-bit, OS = 64-bit
+   Threading | NPTL 2.35
+     SELinux | No SELinux detected
+ Virtualized | No virtualization detected
+# Processor ##################################################
+  Processors | physical = 1, cores = 12, virtual = 16, hyperthreading = yes
+      Speeds | 1x2361.788, 1x2361.790, 1x2372.925, 1x2381.090, 1x2387.139, 1x2388.023, 1x2392.435, 1x2393.328, 1x2778.914, 1x2783.569, 1x2788.137, 1x2788.142, 1x2788.144, 1x2788.149, 1x2788.156, 1x2789.364
+      Models | 16x12th Gen Intel(R) Core(TM) i7-1260P
+      Caches | 16x18432 KB
+  Designation               Configuration                  Size     Associativity
+  ========================= ============================== ======== ======================
+# Memory #####################################################
+         Total | 62.6G
+          Free | 1.4G
+          Used | physical = 26.0G, swap allocated = 1.9G, swap used = 1.9G, virtual = 27.9G
+        Shared | 2.7G
+       Buffers | 35.3G
+        Caches | 33.6G
+         Dirty | 16096 kB
+       UsedRSS | 36.4G
+    Swappiness | 60
+   DirtyPolicy | 20, 10
+   DirtyStatus | 0, 0
+  Locator   Size     Speed             Form Factor   Type          Type Detail
+  ========= ======== ================= ============= ============= ===========
+# Mounted Filesystems ########################################
+  Filesystem                 Size Used Type     Opts                                                                                                 Mountpoint
+  /dev/fuse                  250G   0% fuse     rw,nosuid,nodev,relatime,user_id=1000,group_id=1000                                                  /run/user/1000/keybase/kbfs
+  /dev/mapper/vgubuntu-root  3,6T  43% ext4     rw,relatime,errors=remount-ro                                                                        /
+  /dev/nvme0n1p1             511M  57% vfat     rw,relatime,fmask=0077,dmask=0077,codepage=437,iocharset=iso8859-1,shortname=mixed,errors=remount-ro /boot/efi
+  /dev/nvme0n1p2             1,7G  20% ext4     rw,relatime                                                                                          /boot
+  efivarfs                    64K  45% efivarfs rw,nosuid,nodev,noexec,relatime                                                                      /sys/firmware/efi/efivars
+  tmpfs                       32G   3% tmpfs    rw,nosuid,nodev,inode64                                                                              /dev/shm
+  tmpfs                       32G   3% tmpfs    rw,nosuid,nodev,noexec,relatime,size=5120k,inode64                                                   /dev/shm
+  tmpfs                       32G   3% tmpfs    rw,nosuid,nodev,noexec,relatime,size=6567948k,mode=755,inode64                                       /dev/shm
+  tmpfs                       32G   3% tmpfs    rw,nosuid,nodev,noexec,relatime,size=6567948k,mode=755,inode64                                       /dev/shm
+  tmpfs                       32G   3% tmpfs    rw,nosuid,nodev,relatime,size=6567944k,nr_inodes=1641986,mode=700,uid=1000,gid=1000,inode64          /dev/shm
+  tmpfs                      5,0M   1% tmpfs    rw,nosuid,nodev,inode64                                                                              /run/lock
+  tmpfs                      5,0M   1% tmpfs    rw,nosuid,nodev,noexec,relatime,size=5120k,inode64                                                   /run/lock
+  tmpfs                      5,0M   1% tmpfs    rw,nosuid,nodev,noexec,relatime,size=6567948k,mode=755,inode64                                       /run/lock
+  tmpfs                      5,0M   1% tmpfs    rw,nosuid,nodev,noexec,relatime,size=6567948k,mode=755,inode64                                       /run/lock
+  tmpfs                      5,0M   1% tmpfs    rw,nosuid,nodev,relatime,size=6567944k,nr_inodes=1641986,mode=700,uid=1000,gid=1000,inode64          /run/lock
+  tmpfs                      6,3G   1% tmpfs    rw,nosuid,nodev,inode64                                                                              /run/user/1000
+  tmpfs                      6,3G   1% tmpfs    rw,nosuid,nodev,noexec,relatime,size=5120k,inode64                                                   /run/user/1000
+  tmpfs                      6,3G   1% tmpfs    rw,nosuid,nodev,noexec,relatime,size=6567948k,mode=755,inode64                                       /run/user/1000
+  tmpfs                      6,3G   1% tmpfs    rw,nosuid,nodev,noexec,relatime,size=6567948k,mode=755,inode64                                       /run/user/1000
+  tmpfs                      6,3G   1% tmpfs    rw,nosuid,nodev,relatime,size=6567944k,nr_inodes=1641986,mode=700,uid=1000,gid=1000,inode64          /run/user/1000
+  tmpfs                      6,3G   1% tmpfs    rw,nosuid,nodev,inode64                                                                              /run
+  tmpfs                      6,3G   1% tmpfs    rw,nosuid,nodev,noexec,relatime,size=5120k,inode64                                                   /run
+  tmpfs                      6,3G   1% tmpfs    rw,nosuid,nodev,noexec,relatime,size=6567948k,mode=755,inode64                                       /run
+  tmpfs                      6,3G   1% tmpfs    rw,nosuid,nodev,noexec,relatime,size=6567948k,mode=755,inode64                                       /run
+  tmpfs                      6,3G   1% tmpfs    rw,nosuid,nodev,relatime,size=6567944k,nr_inodes=1641986,mode=700,uid=1000,gid=1000,inode64          /run
+# Disk Schedulers And Queue Size #############################
+        dm-0 | UNREADABLE
+        dm-1 | UNREADABLE
+        dm-2 | UNREADABLE
+     nvme0n1 | [none] 1023
+# Disk Partitioning ##########################################
+Device       Type      Start        End               Size
+============ ==== ========== ========== ==================
+/dev/nvme0n1 Disk                            4000787030016
+/dev/nvme0n1p1 Part       2048    1050623                  0
+/dev/nvme0n1p2 Part    1050624    4550655                  0
+/dev/nvme0n1p3 Part    4550656 7814035455                  0
+# Kernel Inode State #########################################
+dentry-state | 3355603	3159991	45	0	2250834	0
+     file-nr | 36032	0	9223372036854775807
+    inode-nr | 1419887	556339
+# LVM Volumes ################################################
+Unable to collect information
+# LVM Volume Groups ##########################################
+Unable to collect information
+# RAID Controller ############################################
+  Controller | No RAID controller detected
+# Network Config #############################################
+  Controller | Realtek Semiconductor Co., Ltd. RTL8111/8168/8411 PCI Express Gigabit Ethernet Controller (rev 15)
+ FIN Timeout | 60
+  Port Range | 60999
+# Interface Statistics #######################################
+  interface  rx_bytes rx_packets  rx_errors   tx_bytes tx_packets  tx_errors
+  ========= ========= ========== ========== ========== ========== ==========
+  lo       125000000000  175000000          0 125000000000  175000000          0
+  enp46s0           0          0          0          0          0          0
+  wlp0s20f3 150000000000  150000000          0 30000000000   80000000          0
+  docker0  12500000000   12500000          0 30000000000   15000000          0
+  br-a7c7f1777df1          0          0          0          0          0          0
+  veth0655c9f@if604 1250000000    1000000          0 2500000000    1250000          0
+  vethd189986@if606   50000000     250000          0  600000000     300000          0
+  veth2655c84@if608  500000000     250000          0   50000000     250000          0
+  wg0        17500000      35000          0    7000000      35000          0
+  br-79118f7d5a92   15000000     225000          0  800000000     350000          0
+# Network Connections ########################################
+  Connections from remote IP addresses
+    3.68.61.181         3
+    3.160.57.75         1
+    3.164.240.62        2
+    10.0.0.1            1
+    10.0.0.5            4
+    18.190.135.240      1
+    18.205.222.128      1
+    23.20.17.147        1
+    34.107.243.93       1
+    34.110.207.168      1
+    34.117.188.166      2
+    34.120.208.123      1
+    34.202.253.140      1
+    35.74.138.212       2
+    35.75.32.93         6
+    38.111.114.11       1
+    52.35.150.14        2
+    52.57.79.4          1
+    52.73.62.51         1
+    52.73.238.236       1
+    52.84.151.38        1
+    52.193.110.50       1
+    54.86.147.85        1
+    54.147.17.17        1
+    54.158.119.218      1
+    54.159.113.253      1
+    54.159.239.26       1
+    64.233.162.188      1
+    64.233.165.104      1
+    74.125.205.188      1
+    77.223.96.250       1
+    89.253.240.17       2
+    91.105.192.100      7
+    108.157.52.95       1
+    108.157.214.47      1
+    108.157.214.111     1
+    108.177.14.94       2
+    127.0.0.1          80
+    140.82.114.25       1
+    142.250.150.154     1
+    142.251.1.138       1
+    142.251.140.14      1
+    149.154.167.51      1
+    157.240.205.60      1
+    157.240.205.174     2
+    162.125.21.2        1
+    162.125.21.3        8
+    170.114.4.224       1
+    170.114.15.227      1
+    170.114.52.2        2
+    170.114.52.66       1
+    172.17.0.2          4
+    172.64.152.233      1
+    173.194.73.94       1
+    173.194.220.108     5
+    173.194.222.94      1
+    185.166.143.36      1
+    188.114.98.233      2
+    188.114.99.233      2
+    194.85.125.1        1
+    206.247.115.239     1
+    213.180.204.148     3
+    216.58.213.113      1
+  Connections to local IP addresses
+    10.0.0.5           15
+    127.0.0.1          80
+    172.17.0.1          4
+    192.168.55.2       80
+    192.168.255.22      1
+  Connections to top 10 local ports
+    12345               3
+    12347               4
+    3306               15
+    42001               3
+    42002               3
+    42003               3
+    4647                2
+    60442               1
+    60592               2
+    60740               1
+  States of connections
+    CLOSE_WAIT          9
+    ESTABLISHED       125
+    LISTEN             45
+    SYN_SENT            4
+    TIME_WAIT          40
+# Top Processes ##############################################
+    PID USER      PR  NI    VIRT    RES    SHR S  %CPU  %MEM     TIME+ COMMAND
+ 783789 sveta     20   0 2822620 506824  42752 S 100,0   0,8   5795:02 mysqld
+2407273 sveta     20   0   64144  46012  13824 R 100,0   0,1   5069:41 perl
+2410420 sveta     20   0   64140  46184  13952 R 100,0   0,1   5067:44 perl
+2419768 sveta     20   0   64140  46088  13952 R 100,0   0,1   5063:21 perl
+2408748 sveta     20   0   64136  46068  14080 R  94,1   0,1   5068:45 perl
+3396104 sveta     20   0   16768   5248   3968 R  11,8   0,0   0:00.03 top
+2147236 sveta     20   0   32,8g 450796 225184 S   5,9   0,7  52:26.29 chrome
+2147423 sveta     20   0 1158,3g 556292 148372 S   5,9   0,8  83:11.29 chrome
+2738171 sveta     20   0  499860  52224  13312 S   5,9   0,1  19:40.27 aomhost
+# Notable Processes ##########################################
+  PID    OOM    COMMAND
+    ?      ?    sshd doesn't appear to be running
+1499134    -17    multipathd
+2849628    -17    nomad
+3202899    -17    sshd
+# Simplified and fuzzy rounded vmstat (wait please) ##########
+  procs  ---swap-- -----io---- ---system---- --------cpu--------
+   r  b    si   so    bi    bo     ir     cs  us  sy  il  wa  st
+   8  0     0    0    30   200      1      1  12   2  86   0   0
+   5  0     0    0     0   100  15000  50000  40   3  57   0   0
+   6  0     0    0     4  1750  15000  20000  34   1  65   0   0
+   6  0     0    0     0     8  17500  20000  35   2  63   0   0
+   5  0     0    0     0   900  17500  25000  35   1  63   0   0
+# Memory management ##########################################
+Transparent huge pages are enabled.
+# The End ####################################################

From 045b2fec9fcebcd71ab217748f2594dbc66cedf6 Mon Sep 17 00:00:00 2001
From: Sveta Smirnova <sveta.smirnova@percona.com>
Date: Fri, 6 Sep 2024 16:10:36 +0300
Subject: [PATCH 22/31] PT-2340 - Support MySQL 8.4

- Adjusted test results, broken due to mysql.component table in PS
---
 t/lib/SchemaIterator.t                            | 3 ++-
 t/lib/samples/SchemaIterator/all-dbs-tbls-8.4.txt | 2 +-
 t/pt-table-checksum/basics.t                      | 4 ++--
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/t/lib/SchemaIterator.t b/t/lib/SchemaIterator.t
index 6f3e5a741..db1fc787d 100644
--- a/t/lib/SchemaIterator.t
+++ b/t/lib/SchemaIterator.t
@@ -112,7 +112,7 @@ sub test_so {
             update_sample => 1,
          ),
          $args{test_name},
-      );
+      ) or diag($test_diff);
    }
    elsif ( $args{like} ) {
       like(
@@ -169,6 +169,7 @@ SKIP: {
    # ########################################################################
    # Test simple, unfiltered get_db_itr().
    # ########################################################################
+   # TODO: create flavor-dependent samples
    test_so(
       result    => $sb->is_cluster_mode 
 	     ? "$out/all-dbs-tbls-cluster-$sandbox_version.txt" 
diff --git a/t/lib/samples/SchemaIterator/all-dbs-tbls-8.4.txt b/t/lib/samples/SchemaIterator/all-dbs-tbls-8.4.txt
index efc6f1cbd..012249de6 100644
--- a/t/lib/samples/SchemaIterator/all-dbs-tbls-8.4.txt
+++ b/t/lib/samples/SchemaIterator/all-dbs-tbls-8.4.txt
@@ -16,7 +16,7 @@ CREATE TABLE `component` (
   `component_group_id` int unsigned NOT NULL,
   `component_urn` text NOT NULL,
   PRIMARY KEY (`component_id`)
-) /*!50100 TABLESPACE `mysql` */ ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 ROW_FORMAT=DYNAMIC COMMENT='Components'
+) /*!50100 TABLESPACE `mysql` */ ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=utf8mb3 ROW_FORMAT=DYNAMIC COMMENT='Components'
 
 mysql.db
 CREATE TABLE `db` (
diff --git a/t/pt-table-checksum/basics.t b/t/pt-table-checksum/basics.t
index 6cb71a8f7..c1e8ad433 100644
--- a/t/pt-table-checksum/basics.t
+++ b/t/pt-table-checksum/basics.t
@@ -86,8 +86,8 @@ ok(
    no_diff(
       $cmd,
       "$sample/default-results-$sandbox_version.txt",
-      sed_out => '\'/mysql.plugin$/d; /percona_test.checksums$/d; /mysql.help_category$/d; /mysql.help_keyword$/d; /mysql.help_relation$/d; /mysql.help_topic$/d; /mysql.columns_priv$/d; /mysql.engine_cost$/d; /mysql.general_log$/d; /mysql.innodb_index_stats$/d; /mysql.innodb_table_stats$/d; /mysql.password_history$/d; /mysql.procs_priv$/d; /mysql.proxies_priv$/d; /mysql.server_cost$/d; /mysql.slow_log$/d; /mysql.tables_priv$/d\'',
-      post_pipe => 'sed \'/mysql.plugin$/d; /percona_test.checksums$/d; /mysql.help_category$/d; /mysql.help_keyword$/d; /mysql.help_relation$/d; /mysql.help_topic$/d; /mysql.ndb_binlog_index$/d; /mysql.global_grants$/d; /mysql.columns_priv$/d; /mysql.engine_cost$/d; /mysql.general_log$/d; /mysql.innodb_index_stats$/d; /mysql.innodb_table_stats$/d; /mysql.password_history$/d; /mysql.procs_priv$/d; /mysql.proxies_priv$/d; /mysql.server_cost$/d; /mysql.slow_log$/d; /mysql.tables_priv$/d\' | ' .
+      sed_out => '\'/mysql.plugin$/d; /percona_test.checksums$/d; /mysql.help_category$/d; /mysql.help_keyword$/d; /mysql.help_relation$/d; /mysql.help_topic$/d; /mysql.columns_priv$/d; /mysql.component$/d; /mysql.engine_cost$/d; /mysql.general_log$/d; /mysql.innodb_index_stats$/d; /mysql.innodb_table_stats$/d; /mysql.password_history$/d; /mysql.procs_priv$/d; /mysql.proxies_priv$/d; /mysql.server_cost$/d; /mysql.slow_log$/d; /mysql.tables_priv$/d\'',
+      post_pipe => 'sed \'/mysql.plugin$/d; /percona_test.checksums$/d; /mysql.help_category$/d; /mysql.help_keyword$/d; /mysql.help_relation$/d; /mysql.help_topic$/d; /mysql.ndb_binlog_index$/d; /mysql.global_grants$/d; /mysql.columns_priv$/d; /mysql.component$/d; /mysql.engine_cost$/d; /mysql.general_log$/d; /mysql.innodb_index_stats$/d; /mysql.innodb_table_stats$/d; /mysql.password_history$/d; /mysql.procs_priv$/d; /mysql.proxies_priv$/d; /mysql.server_cost$/d; /mysql.slow_log$/d; /mysql.tables_priv$/d\' | ' .
                    'awk \'{print $2 " " $3 " " $4 " " $7 " " $9}\'',
       keep_ouput => 1,
    ),

From 5d5590443609e17d9e5489ddebfc2da548557b5e Mon Sep 17 00:00:00 2001
From: Sveta Smirnova <sveta.smirnova@percona.com>
Date: Thu, 12 Sep 2024 20:33:11 +0300
Subject: [PATCH 23/31] PT-2340 - Support MySQL 8.4

- Tests for the minimal SSL support
- Updated util/update-modules, so they don't skip tools with modules, not defined in lib
---
 bin/pt-duplicate-key-checker          |   6 -
 bin/pt-find                           |   6 +
 bin/pt-index-usage                    |   6 +
 bin/pt-table-usage                    | 481 +++++++++++++---------
 bin/pt-visual-explain                 | 572 +++++++++++++++++++-------
 t/pt-archiver/ssl.t                   |  90 ++++
 t/pt-config-diff/ssl.t                |  87 ++++
 t/pt-deadlock-logger/ssl.t            | 177 ++++++++
 t/pt-duplicate-key-checker/ssl.t      | 100 +++++
 t/pt-find/ssl.t                       |  75 ++++
 t/pt-fk-error-logger/ssl.t            | 102 +++++
 t/pt-heartbeat/ssl.t                  |  98 +++++
 t/pt-index-usage/ssl.t                | 103 +++++
 t/pt-kill/ssl.t                       |  98 +++++
 t/pt-mysql-summary/ssl.t              |  81 ++++
 t/pt-online-schema-change/ssl.t       | 108 +++++
 t/pt-replica-restart/ssl.t            | 102 +++++
 t/pt-show-grants/ssl.t                |  95 +++++
 t/pt-stalk/ssl.t                      | 121 ++++++
 t/pt-table-checksum/ssl.t             | 107 +++++
 t/pt-table-sync/ssl.t                 |  89 ++++
 t/pt-table-usage/ssl.t                |  88 ++++
 t/pt-upgrade/ssl.t                    | 105 +++++
 t/pt-variable-advisor/ssl.t           |  87 ++++
 t/pt-visual-explain/samples/query.sql |   1 +
 t/pt-visual-explain/ssl.t             |  88 ++++
 util/update-modules                   |   6 +-
 27 files changed, 2732 insertions(+), 347 deletions(-)
 create mode 100644 t/pt-archiver/ssl.t
 create mode 100644 t/pt-config-diff/ssl.t
 create mode 100644 t/pt-deadlock-logger/ssl.t
 create mode 100644 t/pt-duplicate-key-checker/ssl.t
 create mode 100644 t/pt-find/ssl.t
 create mode 100644 t/pt-fk-error-logger/ssl.t
 create mode 100644 t/pt-heartbeat/ssl.t
 create mode 100644 t/pt-index-usage/ssl.t
 create mode 100644 t/pt-kill/ssl.t
 create mode 100644 t/pt-mysql-summary/ssl.t
 create mode 100644 t/pt-online-schema-change/ssl.t
 create mode 100644 t/pt-replica-restart/ssl.t
 create mode 100644 t/pt-show-grants/ssl.t
 create mode 100644 t/pt-stalk/ssl.t
 create mode 100644 t/pt-table-checksum/ssl.t
 create mode 100644 t/pt-table-sync/ssl.t
 create mode 100644 t/pt-table-usage/ssl.t
 create mode 100644 t/pt-upgrade/ssl.t
 create mode 100644 t/pt-variable-advisor/ssl.t
 create mode 100644 t/pt-visual-explain/samples/query.sql
 create mode 100644 t/pt-visual-explain/ssl.t

diff --git a/bin/pt-duplicate-key-checker b/bin/pt-duplicate-key-checker
index a1cdef407..4e4a4fc9f 100755
--- a/bin/pt-duplicate-key-checker
+++ b/bin/pt-duplicate-key-checker
@@ -5736,12 +5736,6 @@ dsn: mysql_ssl; copy: yes
 
 Create SSL connection
 
-=item * s
-
-dsn: mysql_ssl; copy: yes
-
-Create SSL connection
-
 =back
 
 =head1 ENVIRONMENT
diff --git a/bin/pt-find b/bin/pt-find
index d2d71d762..5a491c6c2 100755
--- a/bin/pt-find
+++ b/bin/pt-find
@@ -4605,6 +4605,12 @@ short form: -h; type: string
 
 Connect to host.
 
+=item --mysql_ssl
+
+short form: -s; type: int
+
+Create SSL MySQL connection.
+
 =item --or
 
 Combine tests with OR, not AND.
diff --git a/bin/pt-index-usage b/bin/pt-index-usage
index e852e3d61..7df4b2833 100755
--- a/bin/pt-index-usage
+++ b/bin/pt-index-usage
@@ -7308,6 +7308,12 @@ type: string
 
 Ignore tables whose names match the Perl regex.
 
+=item --mysql_ssl
+
+short form: -s; type: int
+
+Create SSL MySQL connection.
+
 =item --password
 
 short form: -p; type: string
diff --git a/bin/pt-table-usage b/bin/pt-table-usage
index 08ae7bccb..a9848da84 100755
--- a/bin/pt-table-usage
+++ b/bin/pt-table-usage
@@ -42,10 +42,10 @@ BEGIN {
 # ###########################################################################
 # DSNParser package
 # This package is a copy without comments from the original.  The original
-# with comments and its test file can be found in the Bazaar repository at,
+# with comments and its test file can be found in the GitHub repository at,
 #   lib/DSNParser.pm
 #   t/lib/DSNParser.t
-# See https://launchpad.net/percona-toolkit for more information.
+# See https://github.com/percona/percona-toolkit for more information.
 # ###########################################################################
 {
 package DSNParser;
@@ -217,7 +217,7 @@ sub get_cxn_params {
       $dsn = 'DBI:mysql:' . ( $info->{D} || '' ) . ';'
          . join(';', map  { "$opts{$_}->{dsn}=$info->{$_}" }
                      grep { defined $info->{$_} }
-                     qw(F h P S A))
+                     qw(F h P S A s))
          . ';mysql_read_default_group=client'
          . ($info->{L} ? ';mysql_local_infile=1' : '');
    }
@@ -297,22 +297,49 @@ sub get_dbh {
    if ( $cxn_string =~ m/mysql/i ) {
       my $sql;
 
-      if ( my ($charset) = $cxn_string =~ m/charset=([\w]+)/ ) {
+      my ($charset) = $cxn_string =~ m/charset=([\w]+)/;
+      if ( $charset ) {
          $sql = qq{/*!40101 SET NAMES "$charset"*/};
          PTDEBUG && _d($dbh, $sql);
          eval { $dbh->do($sql) };
          if ( $EVAL_ERROR ) {
             die "Error setting NAMES to $charset: $EVAL_ERROR";
          }
-         PTDEBUG && _d('Enabling charset for STDOUT');
-         if ( $charset eq 'utf8' ) {
-            binmode(STDOUT, ':utf8')
-               or die "Can't binmode(STDOUT, ':utf8'): $OS_ERROR";
+      }
+      else {
+         my ($mysql_version) = eval { $dbh->selectrow_array('SELECT VERSION()') };
+         if ( $EVAL_ERROR ) {
+            die "Cannot get MySQL version: $EVAL_ERROR";
          }
-         else {
-            binmode(STDOUT) or die "Can't binmode(STDOUT): $OS_ERROR";
+         my (undef, $character_set_server) = eval { $dbh->selectrow_array("SHOW VARIABLES LIKE 'character_set_server'") };
+         if ( $EVAL_ERROR ) {
+            die "Cannot get MySQL var character_set_server: $EVAL_ERROR";
+         }
+
+         if ( $mysql_version =~ m/^(\d+)\.(\d)\.(\d+).*/ ) {
+            if ( $1 >= 8 && $character_set_server =~ m/^utf8/ ) {
+               $dbh->{mysql_enable_utf8} = 1;
+               $charset = $character_set_server;
+               my $msg = "MySQL version $mysql_version >= 8 and character_set_server = $character_set_server\n".
+                        "Setting: SET NAMES $character_set_server";
+               PTDEBUG && _d($msg);
+               eval { $dbh->do("SET NAMES '$character_set_server'") };
+               if ( $EVAL_ERROR ) {
+                  die "Cannot SET NAMES $character_set_server: $EVAL_ERROR";
+               }
+            }
          }
       }
+      PTDEBUG && _d('Enabling charset for STDOUT');
+      if ( $charset && $charset =~ m/^utf8/ ) {
+         binmode(STDOUT, ':utf8')
+            or die "Can't binmode(STDOUT, ':utf8'): $OS_ERROR";
+         binmode(STDERR, ':utf8')
+            or die "Can't binmode(STDERR, ':utf8'): $OS_ERROR";
+      }
+      else {
+         binmode(STDOUT) or die "Can't binmode(STDOUT): $OS_ERROR";
+      }
 
       if ( my $vars = $self->prop('set-vars') ) {
          $self->set_vars($dbh, $vars);
@@ -337,28 +364,6 @@ sub get_dbh {
            . ": $EVAL_ERROR";
       }
    }
-   my ($mysql_version) = eval { $dbh->selectrow_array('SELECT VERSION()') };
-   if ($EVAL_ERROR) {
-       die "Cannot get MySQL version: $EVAL_ERROR";
-   }
-
-   my (undef, $character_set_server) = eval { $dbh->selectrow_array("SHOW VARIABLES LIKE 'character_set_server'") };
-   if ($EVAL_ERROR) {
-       die "Cannot get MySQL var character_set_server: $EVAL_ERROR";
-   }
-
-   if ($mysql_version =~ m/^(\d+)\.(\d)\.(\d+).*/) {
-       if ($1 >= 8 && $character_set_server =~ m/^utf8/) {
-           $dbh->{mysql_enable_utf8} = 1;
-           my $msg = "MySQL version $mysql_version >= 8 and character_set_server = $character_set_server\n".
-                     "Setting: SET NAMES $character_set_server";
-           PTDEBUG && _d($msg);
-           eval { $dbh->do("SET NAMES 'utf8mb4'") };
-           if ($EVAL_ERROR) {
-               die "Cannot SET NAMES $character_set_server: $EVAL_ERROR";
-           }
-       }
-   }
 
    PTDEBUG && _d('DBH info: ',
       $dbh,
@@ -487,10 +492,10 @@ sub _d {
 # ###########################################################################
 # Lmo::Utils package
 # This package is a copy without comments from the original.  The original
-# with comments and its test file can be found in the Bazaar repository at,
+# with comments and its test file can be found in the GitHub repository at,
 #   lib/Lmo/Utils.pm
 #   t/lib/Lmo/Utils.t
-# See https://launchpad.net/percona-toolkit for more information.
+# See https://github.com/percona/percona-toolkit for more information.
 # ###########################################################################
 {
 package Lmo::Utils;
@@ -547,10 +552,10 @@ sub _unimport_coderefs {
 # ###########################################################################
 # Lmo::Meta package
 # This package is a copy without comments from the original.  The original
-# with comments and its test file can be found in the Bazaar repository at,
+# with comments and its test file can be found in the GitHub repository at,
 #   lib/Lmo/Meta.pm
 #   t/lib/Lmo/Meta.t
-# See https://launchpad.net/percona-toolkit for more information.
+# See https://github.com/percona/percona-toolkit for more information.
 # ###########################################################################
 {
 package Lmo::Meta;
@@ -604,10 +609,10 @@ sub attributes_for_new {
 # ###########################################################################
 # Lmo::Object package
 # This package is a copy without comments from the original.  The original
-# with comments and its test file can be found in the Bazaar repository at,
+# with comments and its test file can be found in the GitHub repository at,
 #   lib/Lmo/Object.pm
 #   t/lib/Lmo/Object.t
-# See https://launchpad.net/percona-toolkit for more information.
+# See https://github.com/percona/percona-toolkit for more information.
 # ###########################################################################
 {
 package Lmo::Object;
@@ -2248,10 +2253,10 @@ if ( PTDEBUG ) {
 # ###########################################################################
 # SlowLogParser package
 # This package is a copy without comments from the original.  The original
-# with comments and its test file can be found in the Bazaar repository at,
+# with comments and its test file can be found in the GitHub repository at,
 #   lib/SlowLogParser.pm
 #   t/lib/SlowLogParser.t
-# See https://launchpad.net/percona-toolkit for more information.
+# See https://github.com/percona/percona-toolkit for more information.
 # ###########################################################################
 {
 package SlowLogParser;
@@ -2476,10 +2481,10 @@ sub _d {
 # ###########################################################################
 # Transformers package
 # This package is a copy without comments from the original.  The original
-# with comments and its test file can be found in the Bazaar repository at,
+# with comments and its test file can be found in the GitHub repository at,
 #   lib/Transformers.pm
 #   t/lib/Transformers.t
-# See https://launchpad.net/percona-toolkit for more information.
+# See https://github.com/percona/percona-toolkit for more information.
 # ###########################################################################
 {
 package Transformers;
@@ -2702,7 +2707,7 @@ sub any_unix_timestamp {
 
 sub make_checksum {
    my ( $val ) = @_;
-   my $checksum = uc substr(md5_hex($val), -16);
+   my $checksum = uc md5_hex($val);
    PTDEBUG && _d($checksum, 'checksum for', $val);
    return $checksum;
 }
@@ -3238,10 +3243,10 @@ sub _d {
 # ###########################################################################
 # QueryParser package
 # This package is a copy without comments from the original.  The original
-# with comments and its test file can be found in the Bazaar repository at,
+# with comments and its test file can be found in the GitHub repository at,
 #   lib/QueryParser.pm
 #   t/lib/QueryParser.t
-# See https://launchpad.net/percona-toolkit for more information.
+# See https://github.com/percona/percona-toolkit for more information.
 # ###########################################################################
 {
 package QueryParser;
@@ -3297,7 +3302,7 @@ sub get_tables {
       return ($tbl);
    }
 
-   $query =~ s/ (?:LOW_PRIORITY|IGNORE|STRAIGHT_JOIN)//ig;
+   $query =~ s/(?:LOW_PRIORITY|IGNORE|STRAIGHT_JOIN|DELAYED)\s+/ /ig;
 
    if ( $query =~ s/^\s*LOCK TABLES\s+//i ) {
       PTDEBUG && _d('Special table type: LOCK TABLES');
@@ -3306,9 +3311,18 @@ sub get_tables {
       $query = "FROM $query";
    }
 
-   $query =~ s/\\["']//g;                # quoted strings
-   $query =~ s/".*?"/?/sg;               # quoted strings
-   $query =~ s/'.*?'/?/sg;               # quoted strings
+   $query =~ s/\\["']//g;   # quoted strings
+   $query =~ s/".*?"/?/sg;  # quoted strings
+   $query =~ s/'.*?'/?/sg;  # quoted strings
+
+   if ( $query =~ m/\A\s*(?:INSERT|REPLACE)(?!\s+INTO)/i ) {
+      $query =~ s/\A\s*((?:INSERT|REPLACE))\s+/$1 INTO /i;
+   }
+
+   if ( $query =~ m/\A\s*LOAD DATA/i ) {
+      my ($tbl) = $query =~ m/INTO TABLE\s+(\S+)/i;
+      return $tbl;
+   }
 
    my @tables;
    foreach my $tbls ( $query =~ m/$tbl_regex/gio ) {
@@ -3834,10 +3848,10 @@ no Lmo;
 # ###########################################################################
 # FileIterator package
 # This package is a copy without comments from the original.  The original
-# with comments and its test file can be found in the Bazaar repository at,
+# with comments and its test file can be found in the GitHub repository at,
 #   lib/FileIterator.pm
 #   t/lib/FileIterator.t
-# See https://launchpad.net/percona-toolkit for more information.
+# See https://github.com/percona/percona-toolkit for more information.
 # ###########################################################################
 {
 package FileIterator;
@@ -4919,10 +4933,10 @@ sub _d {
 # ###########################################################################
 # TableUsage package
 # This package is a copy without comments from the original.  The original
-# with comments and its test file can be found in the Bazaar repository at,
+# with comments and its test file can be found in the GitHub repository at,
 #   lib/TableUsage.pm
 #   t/lib/TableUsage.t
-# See https://launchpad.net/percona-toolkit for more information.
+# See https://github.com/percona/percona-toolkit for more information.
 # ###########################################################################
 {
 package TableUsage;
@@ -4936,6 +4950,7 @@ use Data::Dumper;
 $Data::Dumper::Indent    = 1;
 $Data::Dumper::Sortkeys  = 1;
 $Data::Dumper::Quotekeys = 0;
+use VersionParser;
 
 use constant PTDEBUG => $ENV{PTDEBUG} || 0;
 
@@ -5897,10 +5912,10 @@ sub _d {
 # ###########################################################################
 # Daemon package
 # This package is a copy without comments from the original.  The original
-# with comments and its test file can be found in the Bazaar repository at,
+# with comments and its test file can be found in the GitHub repository at,
 #   lib/Daemon.pm
 #   t/lib/Daemon.t
-# See https://launchpad.net/percona-toolkit for more information.
+# See https://github.com/percona/percona-toolkit for more information.
 # ###########################################################################
 {
 package Daemon;
@@ -5908,157 +5923,225 @@ package Daemon;
 use strict;
 use warnings FATAL => 'all';
 use English qw(-no_match_vars);
+
 use constant PTDEBUG => $ENV{PTDEBUG} || 0;
 
 use POSIX qw(setsid);
+use Fcntl qw(:DEFAULT);
 
 sub new {
-   my ( $class, %args ) = @_;
-   foreach my $arg ( qw(o) ) {
-      die "I need a $arg argument" unless $args{$arg};
-   }
-   my $o = $args{o};
+   my ($class, %args) = @_;
    my $self = {
-      o        => $o,
-      log_file => $o->has('log') ? $o->get('log') : undef,
-      PID_file => $o->has('pid') ? $o->get('pid') : undef,
+      log_file       => $args{log_file},
+      pid_file       => $args{pid_file},
+      daemonize      => $args{daemonize},
+      force_log_file => $args{force_log_file},
+      parent_exit    => $args{parent_exit},
+      pid_file_owner => 0,
+      utf8           => $args{utf8} // 0,
    };
-
-   check_PID_file(undef, $self->{PID_file});
-
-   PTDEBUG && _d('Daemonized child will log to', $self->{log_file});
    return bless $self, $class;
 }
 
-sub daemonize {
-   my ( $self ) = @_;
-
-   PTDEBUG && _d('About to fork and daemonize');
-   defined (my $pid = fork()) or die "Cannot fork: $OS_ERROR";
-   if ( $pid ) {
-      PTDEBUG && _d('Parent PID', $PID, 'exiting after forking child PID',$pid);
-      exit;
-   }
-
-   PTDEBUG && _d('Daemonizing child PID', $PID);
-   $self->{PID_owner} = $PID;
-   $self->{child}     = 1;
+sub run {
+   my ($self) = @_;
 
-   POSIX::setsid() or die "Cannot start a new session: $OS_ERROR";
-   chdir '/'       or die "Cannot chdir to /: $OS_ERROR";
+   my $daemonize      = $self->{daemonize};
+   my $pid_file       = $self->{pid_file};
+   my $log_file       = $self->{log_file};
+   my $force_log_file = $self->{force_log_file};
+   my $parent_exit    = $self->{parent_exit};
+   my $utf8           = $self->{utf8};
 
-   $self->_make_PID_file();
+   PTDEBUG && _d('Starting daemon');
 
-   $OUTPUT_AUTOFLUSH = 1;
+   if ( $pid_file ) {
+      eval {
+         $self->_make_pid_file(
+            pid      => $PID,  # parent's pid
+            pid_file => $pid_file,
+         );
+      };
+      die "$EVAL_ERROR\n" if $EVAL_ERROR;
+      if ( !$daemonize ) {
+         $self->{pid_file_owner} = $PID;  # parent's pid
+      }
+   }
 
-   PTDEBUG && _d('Redirecting STDIN to /dev/null');
-   close STDIN;
-   open  STDIN, '/dev/null'
-      or die "Cannot reopen STDIN to /dev/null: $OS_ERROR";
+   if ( $daemonize ) {
+      defined (my $child_pid = fork()) or die "Cannot fork: $OS_ERROR";
+      if ( $child_pid ) {
+         PTDEBUG && _d('Forked child', $child_pid);
+         $parent_exit->($child_pid) if $parent_exit;
+         exit 0;
+      }
 
-   if ( $self->{log_file} ) {
-      PTDEBUG && _d('Redirecting STDOUT and STDERR to', $self->{log_file});
-      close STDOUT;
-      open  STDOUT, '>>', $self->{log_file}
-         or die "Cannot open log file $self->{log_file}: $OS_ERROR";
+      POSIX::setsid() or die "Cannot start a new session: $OS_ERROR";
+      chdir '/'       or die "Cannot chdir to /: $OS_ERROR";
 
-      close STDERR;
-      open  STDERR, ">&STDOUT"
-         or die "Cannot dupe STDERR to STDOUT: $OS_ERROR";
+      if ( $pid_file ) {
+         $self->_update_pid_file(
+            pid      => $PID,  # child's pid
+            pid_file => $pid_file,
+         );
+         $self->{pid_file_owner} = $PID;
+      }
    }
-   else {
-      if ( -t STDOUT ) {
-         PTDEBUG && _d('No log file and STDOUT is a terminal;',
-            'redirecting to /dev/null');
+
+   if ( $daemonize || $force_log_file ) {
+      PTDEBUG && _d('Redirecting STDIN to /dev/null');
+      close STDIN;
+      open  STDIN, '/dev/null'
+         or die "Cannot reopen STDIN to /dev/null: $OS_ERROR";
+      if ( $log_file ) {
+         PTDEBUG && _d('Redirecting STDOUT and STDERR to', $log_file);
          close STDOUT;
-         open  STDOUT, '>', '/dev/null'
-            or die "Cannot reopen STDOUT to /dev/null: $OS_ERROR";
-      }
-      if ( -t STDERR ) {
-         PTDEBUG && _d('No log file and STDERR is a terminal;',
-            'redirecting to /dev/null');
+         open  STDOUT, '>>', $log_file
+            or die "Cannot open log file $log_file: $OS_ERROR";
+         if ( $utf8 ) {
+            binmode(STDOUT, ':utf8')
+               or die "Can't binmode(STDOUT, ':utf8'): $OS_ERROR";
+         }
+
+
          close STDERR;
-         open  STDERR, '>', '/dev/null'
-            or die "Cannot reopen STDERR to /dev/null: $OS_ERROR";
+         open  STDERR, ">&STDOUT"
+            or die "Cannot dupe STDERR to STDOUT: $OS_ERROR";
+         if ( $utf8 ) {
+            binmode(STDERR, ':utf8')
+               or die "Can't binmode(STDERR, ':utf8'): $OS_ERROR";
+         }
       }
+      else {
+         if ( -t STDOUT ) {
+            PTDEBUG && _d('No log file and STDOUT is a terminal;',
+               'redirecting to /dev/null');
+            close STDOUT;
+            open  STDOUT, '>', '/dev/null'
+               or die "Cannot reopen STDOUT to /dev/null: $OS_ERROR";
+         }
+         if ( -t STDERR ) {
+            PTDEBUG && _d('No log file and STDERR is a terminal;',
+               'redirecting to /dev/null');
+            close STDERR;
+            open  STDERR, '>', '/dev/null'
+               or die "Cannot reopen STDERR to /dev/null: $OS_ERROR";
+         }
+      }
+
+      $OUTPUT_AUTOFLUSH = 1;
    }
 
+   PTDEBUG && _d('Daemon running');
    return;
 }
 
-sub check_PID_file {
-   my ( $self, $file ) = @_;
-   my $PID_file = $self ? $self->{PID_file} : $file;
-   PTDEBUG && _d('Checking PID file', $PID_file);
-   if ( $PID_file && -f $PID_file ) {
-      my $pid;
-      eval {
-         chomp($pid = (slurp_file($PID_file) || ''));
-      };
-      if ( $EVAL_ERROR ) {
-         die "The PID file $PID_file already exists but it cannot be read: "
-            . $EVAL_ERROR;
-      }
-      PTDEBUG && _d('PID file exists; it contains PID', $pid);
-      if ( $pid ) {
-         my $pid_is_alive = kill 0, $pid;
-         if ( $pid_is_alive ) {
-            die "The PID file $PID_file already exists "
-               . " and the PID that it contains, $pid, is running";
-         }
-         else {
-            warn "Overwriting PID file $PID_file because the PID that it "
-               . "contains, $pid, is not running";
+sub _make_pid_file {
+   my ($self, %args) = @_;
+   my @required_args = qw(pid pid_file);
+   foreach my $arg ( @required_args ) {
+      die "I need a $arg argument" unless $args{$arg};
+   };
+   my $pid      = $args{pid};
+   my $pid_file = $args{pid_file};
+
+   eval {
+      sysopen(PID_FH, $pid_file, O_RDWR|O_CREAT|O_EXCL) or die $OS_ERROR;
+      print PID_FH $PID, "\n";
+      close PID_FH;
+   };
+   if ( my $e = $EVAL_ERROR ) {
+      if ( $e =~ m/file exists/i ) {
+         my $old_pid = $self->_check_pid_file(
+            pid_file => $pid_file,
+            pid      => $PID,
+         );
+         if ( $old_pid ) {
+            warn "Overwriting PID file $pid_file because PID $old_pid "
+               . "is not running.\n";
          }
+         $self->_update_pid_file(
+            pid      => $PID,
+            pid_file => $pid_file
+         );
       }
       else {
-         die "The PID file $PID_file already exists but it does not "
-            . "contain a PID";
+         die "Error creating PID file $pid_file: $e\n";
       }
    }
-   else {
-      PTDEBUG && _d('No PID file');
-   }
-   return;
-}
 
-sub make_PID_file {
-   my ( $self ) = @_;
-   if ( exists $self->{child} ) {
-      die "Do not call Daemon::make_PID_file() for daemonized scripts";
-   }
-   $self->_make_PID_file();
-   $self->{PID_owner} = $PID;
    return;
 }
 
-sub _make_PID_file {
-   my ( $self ) = @_;
+sub _check_pid_file {
+   my ($self, %args) = @_;
+   my @required_args = qw(pid_file pid);
+   foreach my $arg ( @required_args ) {
+      die "I need a $arg argument" unless $args{$arg};
+   };
+   my $pid_file = $args{pid_file};
+   my $pid      = $args{pid};
+
+   PTDEBUG && _d('Checking if PID in', $pid_file, 'is running');
 
-   my $PID_file = $self->{PID_file};
-   if ( !$PID_file ) {
-      PTDEBUG && _d('No PID file to create');
+   if ( ! -f $pid_file ) {
+      PTDEBUG && _d('PID file', $pid_file, 'does not exist');
       return;
    }
 
-   $self->check_PID_file();
+   open my $fh, '<', $pid_file
+      or die "Error opening $pid_file: $OS_ERROR";
+   my $existing_pid = do { local $/; <$fh> };
+   chomp($existing_pid) if $existing_pid;
+   close $fh
+      or die "Error closing $pid_file: $OS_ERROR";
+
+   if ( $existing_pid ) {
+      if ( $existing_pid == $pid ) {
+         warn "The current PID $pid already holds the PID file $pid_file\n";
+         return;
+      }
+      else {
+         PTDEBUG && _d('Checking if PID', $existing_pid, 'is running');
+         my $pid_is_alive = kill 0, $existing_pid;
+         if ( $pid_is_alive ) {
+            die "PID file $pid_file exists and PID $existing_pid is running\n";
+         }
+      }
+   }
+   else {
+      die "PID file $pid_file exists but it is empty.  Remove the file "
+         . "if the process is no longer running.\n";
+   }
 
-   open my $PID_FH, '>', $PID_file
-      or die "Cannot open PID file $PID_file: $OS_ERROR";
-   print $PID_FH $PID
-      or die "Cannot print to PID file $PID_file: $OS_ERROR";
-   close $PID_FH
-      or die "Cannot close PID file $PID_file: $OS_ERROR";
+   return $existing_pid;
+}
+
+sub _update_pid_file {
+   my ($self, %args) = @_;
+   my @required_args = qw(pid pid_file);
+   foreach my $arg ( @required_args ) {
+      die "I need a $arg argument" unless $args{$arg};
+   };
+   my $pid      = $args{pid};
+   my $pid_file = $args{pid_file};
+
+   open my $fh, '>', $pid_file
+      or die "Cannot open $pid_file: $OS_ERROR";
+   print { $fh } $pid, "\n"
+      or die "Cannot print to $pid_file: $OS_ERROR";
+   close $fh
+      or warn "Cannot close $pid_file: $OS_ERROR";
 
-   PTDEBUG && _d('Created PID file:', $self->{PID_file});
    return;
 }
 
-sub _remove_PID_file {
-   my ( $self ) = @_;
-   if ( $self->{PID_file} && -f $self->{PID_file} ) {
-      unlink $self->{PID_file}
-         or warn "Cannot remove PID file $self->{PID_file}: $OS_ERROR";
+sub remove_pid_file {
+   my ($self, $pid_file) = @_;
+   $pid_file ||= $self->{pid_file};
+   if ( $pid_file && -f $pid_file ) {
+      unlink $self->{pid_file}
+         or warn "Cannot remove PID file $pid_file: $OS_ERROR";
       PTDEBUG && _d('Removed PID file');
    }
    else {
@@ -6068,20 +6151,15 @@ sub _remove_PID_file {
 }
 
 sub DESTROY {
-   my ( $self ) = @_;
+   my ($self) = @_;
 
-   $self->_remove_PID_file() if ($self->{PID_owner} || 0) == $PID;
+   if ( $self->{pid_file_owner} == $PID ) {
+      $self->remove_pid_file();
+   }
 
    return;
 }
 
-sub slurp_file {
-   my ($file) = @_;
-   return unless $file;
-   open my $fh, "<", $file or die "Cannot open $file: $OS_ERROR";
-   return do { local $/; <$fh> };
-}
-
 sub _d {
    my ($package, undef, $line) = caller 0;
    @_ = map { (my $temp = $_) =~ s/\n/\n# /g; $temp; }
@@ -6099,10 +6177,10 @@ sub _d {
 # ###########################################################################
 # Runtime package
 # This package is a copy without comments from the original.  The original
-# with comments and its test file can be found in the Bazaar repository at,
+# with comments and its test file can be found in the GitHub repository at,
 #   lib/Runtime.pm
 #   t/lib/Runtime.t
-# See https://launchpad.net/percona-toolkit for more information.
+# See https://github.com/percona/percona-toolkit for more information.
 # ###########################################################################
 {
 package Runtime;
@@ -6232,10 +6310,10 @@ sub _d {
 # ###########################################################################
 # Progress package
 # This package is a copy without comments from the original.  The original
-# with comments and its test file can be found in the Bazaar repository at,
+# with comments and its test file can be found in the GitHub repository at,
 #   lib/Progress.pm
 #   t/lib/Progress.t
-# See https://launchpad.net/percona-toolkit for more information.
+# See https://github.com/percona/percona-toolkit for more information.
 # ###########################################################################
 {
 package Progress;
@@ -6379,10 +6457,10 @@ sub _d {
 # ###########################################################################
 # Pipeline package
 # This package is a copy without comments from the original.  The original
-# with comments and its test file can be found in the Bazaar repository at,
+# with comments and its test file can be found in the GitHub repository at,
 #   lib/Pipeline.pm
 #   t/lib/Pipeline.t
-# See https://launchpad.net/percona-toolkit for more information.
+# See https://github.com/percona/percona-toolkit for more information.
 # ###########################################################################
 {
 package Pipeline;
@@ -6563,10 +6641,10 @@ sub _d {
 # ###########################################################################
 # Quoter package
 # This package is a copy without comments from the original.  The original
-# with comments and its test file can be found in the Bazaar repository at,
+# with comments and its test file can be found in the GitHub repository at,
 #   lib/Quoter.pm
 #   t/lib/Quoter.t
-# See https://launchpad.net/percona-toolkit for more information.
+# See https://github.com/percona/percona-toolkit for more information.
 # ###########################################################################
 {
 package Quoter;
@@ -6602,6 +6680,8 @@ sub quote_val {
    return $val if $val =~ m/^0x[0-9a-fA-F]+$/  # quote hex data
                   && !$args{is_char};          # unless is_char is true
 
+   return $val if $args{is_float};
+
    $val =~ s/(['\\])/\\$1/g;
    return "'$val'";
 }
@@ -6714,10 +6794,10 @@ sub _d {
 # ###########################################################################
 # TableParser package
 # This package is a copy without comments from the original.  The original
-# with comments and its test file can be found in the Bazaar repository at,
+# with comments and its test file can be found in the GitHub repository at,
 #   lib/TableParser.pm
 #   t/lib/TableParser.t
-# See https://launchpad.net/percona-toolkit for more information.
+# See https://github.com/percona/percona-toolkit for more information.
 # ###########################################################################
 {
 package TableParser;
@@ -6777,13 +6857,15 @@ sub get_create_table {
    eval { $href = $dbh->selectrow_hashref($show_sql); };
    if ( my $e = $EVAL_ERROR ) {
       PTDEBUG && _d($old_sql_mode);
-      $dbh->do($old_sql_mode);
+      eval { $dbh->do($old_sql_mode); };
+      PTDEBUG && $EVAL_ERROR && _d($EVAL_ERROR);
 
       die $e;
    }
 
    PTDEBUG && _d($old_sql_mode);
-   $dbh->do($old_sql_mode);
+   eval { $dbh->do($old_sql_mode); };
+   PTDEBUG && $EVAL_ERROR && _d($EVAL_ERROR);
 
    my ($key) = grep { m/create (?:table|view)/i } keys %$href;
    if ( !$key ) {
@@ -6812,7 +6894,7 @@ sub parse {
 
    my $engine = $self->get_engine($ddl);
 
-   my @defs   = $ddl =~ m/^(\s+`.*?),?$/gm;
+   my @defs = $ddl =~ m/(?:(?<=,\n)|(?<=\(\n))(\s+`(?:.|\n)+?`.+?),?\n/g;
    my @cols   = map { $_ =~ m/`([^`]+)`/ } @defs;
    PTDEBUG && _d('Table cols:', join(', ', map { "`$_`" } @cols));
 
@@ -6952,11 +7034,29 @@ sub check_table {
    }
    my ($dbh, $db, $tbl) = @args{@required_args};
    my $q      = $self->{Quoter} || 'Quoter';
+   $self->{check_table_error} = undef;
+
+
+   my $lctn_sql = 'SELECT @@lower_case_table_names';
+   PTDEBUG && _d($lctn_sql);
+
+   my $lower_case_table_names;
+   eval { ($lower_case_table_names) = $dbh->selectrow_array($lctn_sql); };
+   if ( $EVAL_ERROR ) {
+      PTDEBUG && _d($EVAL_ERROR);
+      $self->{check_table_error} = $EVAL_ERROR;
+      return 0;
+   }
+
+   PTDEBUG && _d("lower_case_table_names=$lower_case_table_names");
+   if ($lower_case_table_names > 0) {
+       PTDEBUG && _d("MySQL uses case-insensitive lookup, converting '$tbl' to lowercase");
+       $tbl = lc $tbl;
+   }
+
    my $db_tbl = $q->quote($db, $tbl);
    PTDEBUG && _d('Checking', $db_tbl);
 
-   $self->{check_table_error} = undef;
-
    my $sql = "SHOW TABLES FROM " . $q->quote($db)
            . ' LIKE ' . $q->literal_like($tbl);
    PTDEBUG && _d($sql);
@@ -6993,8 +7093,7 @@ sub get_keys {
    my $clustered_key = undef;
 
    KEY:
-   foreach my $key ( $ddl =~ m/^  ((?:[A-Z]+ )?KEY .*)$/gm ) {
-
+   foreach my $key ( $ddl =~ m/^  ((?:[A-Z]+ )?KEY [\s\S]*?\),?.*)$/gm ) {
       next KEY if $key =~ m/FOREIGN/;
 
       my $key_ddl = $key;
@@ -7004,7 +7103,7 @@ sub get_keys {
          $key =~ s/USING HASH/USING BTREE/;
       }
 
-      my ( $type, $cols ) = $key =~ m/(?:USING (\w+))? \((.+)\)/;
+      my ( $type, $cols ) = $key =~ m/(?:USING (\w+))? \(([\s\S]+)\)/;
       my ( $special ) = $key =~ m/(FULLTEXT|SPATIAL)/;
       $type = $type || $special || 'BTREE';
       my ($name) = $key =~ m/(PRIMARY|`[^`]*`)/;
@@ -7032,7 +7131,7 @@ sub get_keys {
          ddl          => $key_ddl,
       };
 
-      if ( ($engine || '') =~ m/InnoDB/i && !$clustered_key ) {
+      if ( ($engine || '') =~ m/(InnoDB)|(TokuDB)|(RocksDB)/i && !$clustered_key ) {
          my $this_key = $keys->{$name};
          if ( $this_key->{name} eq 'PRIMARY' ) {
             $clustered_key = 'PRIMARY';
diff --git a/bin/pt-visual-explain b/bin/pt-visual-explain
index 6652f34d6..dd4369dee 100755
--- a/bin/pt-visual-explain
+++ b/bin/pt-visual-explain
@@ -18,6 +18,7 @@ BEGIN {
       OptionParser
       DSNParser
       Daemon
+      VersionParser
    ));
 }
 
@@ -1814,7 +1815,7 @@ if ( PTDEBUG ) {
 # ###########################################################################
 # DSNParser package
 # This package is a copy without comments from the original.  The original
-# with comments and its test file can be found in the Bazaar repository at,
+# with comments and its test file can be found in the GitHub repository at,
 #   lib/DSNParser.pm
 #   t/lib/DSNParser.t
 # See https://github.com/percona/percona-toolkit for more information.
@@ -1989,7 +1990,7 @@ sub get_cxn_params {
       $dsn = 'DBI:mysql:' . ( $info->{D} || '' ) . ';'
          . join(';', map  { "$opts{$_}->{dsn}=$info->{$_}" }
                      grep { defined $info->{$_} }
-                     qw(F h P S A))
+                     qw(F h P S A s))
          . ';mysql_read_default_group=client'
          . ($info->{L} ? ';mysql_local_infile=1' : '');
    }
@@ -2069,22 +2070,49 @@ sub get_dbh {
    if ( $cxn_string =~ m/mysql/i ) {
       my $sql;
 
-      if ( my ($charset) = $cxn_string =~ m/charset=([\w]+)/ ) {
+      my ($charset) = $cxn_string =~ m/charset=([\w]+)/;
+      if ( $charset ) {
          $sql = qq{/*!40101 SET NAMES "$charset"*/};
          PTDEBUG && _d($dbh, $sql);
          eval { $dbh->do($sql) };
          if ( $EVAL_ERROR ) {
             die "Error setting NAMES to $charset: $EVAL_ERROR";
          }
-         PTDEBUG && _d('Enabling charset for STDOUT');
-         if ( $charset eq 'utf8' ) {
-            binmode(STDOUT, ':utf8')
-               or die "Can't binmode(STDOUT, ':utf8'): $OS_ERROR";
+      }
+      else {
+         my ($mysql_version) = eval { $dbh->selectrow_array('SELECT VERSION()') };
+         if ( $EVAL_ERROR ) {
+            die "Cannot get MySQL version: $EVAL_ERROR";
          }
-         else {
-            binmode(STDOUT) or die "Can't binmode(STDOUT): $OS_ERROR";
+         my (undef, $character_set_server) = eval { $dbh->selectrow_array("SHOW VARIABLES LIKE 'character_set_server'") };
+         if ( $EVAL_ERROR ) {
+            die "Cannot get MySQL var character_set_server: $EVAL_ERROR";
+         }
+
+         if ( $mysql_version =~ m/^(\d+)\.(\d)\.(\d+).*/ ) {
+            if ( $1 >= 8 && $character_set_server =~ m/^utf8/ ) {
+               $dbh->{mysql_enable_utf8} = 1;
+               $charset = $character_set_server;
+               my $msg = "MySQL version $mysql_version >= 8 and character_set_server = $character_set_server\n".
+                        "Setting: SET NAMES $character_set_server";
+               PTDEBUG && _d($msg);
+               eval { $dbh->do("SET NAMES '$character_set_server'") };
+               if ( $EVAL_ERROR ) {
+                  die "Cannot SET NAMES $character_set_server: $EVAL_ERROR";
+               }
+            }
          }
       }
+      PTDEBUG && _d('Enabling charset for STDOUT');
+      if ( $charset && $charset =~ m/^utf8/ ) {
+         binmode(STDOUT, ':utf8')
+            or die "Can't binmode(STDOUT, ':utf8'): $OS_ERROR";
+         binmode(STDERR, ':utf8')
+            or die "Can't binmode(STDERR, ':utf8'): $OS_ERROR";
+      }
+      else {
+         binmode(STDOUT) or die "Can't binmode(STDOUT): $OS_ERROR";
+      }
 
       if ( my $vars = $self->prop('set-vars') ) {
          $self->set_vars($dbh, $vars);
@@ -2109,28 +2137,6 @@ sub get_dbh {
            . ": $EVAL_ERROR";
       }
    }
-   my ($mysql_version) = eval { $dbh->selectrow_array('SELECT VERSION()') };
-   if ($EVAL_ERROR) {
-       die "Cannot get MySQL version: $EVAL_ERROR";
-   }
-
-   my (undef, $character_set_server) = eval { $dbh->selectrow_array("SHOW VARIABLES LIKE 'character_set_server'") };
-   if ($EVAL_ERROR) {
-       die "Cannot get MySQL var character_set_server: $EVAL_ERROR";
-   }
-
-   if ($mysql_version =~ m/^(\d+)\.(\d)\.(\d+).*/) {
-       if ($1 >= 8 && $character_set_server =~ m/^utf8/) {
-           $dbh->{mysql_enable_utf8} = 1;
-           my $msg = "MySQL version $mysql_version >= 8 and character_set_server = $character_set_server\n".
-                     "Setting: SET NAMES $character_set_server";
-           PTDEBUG && _d($msg);
-           eval { $dbh->do("SET NAMES 'utf8mb4'") };
-           if ($EVAL_ERROR) {
-               die "Cannot SET NAMES $character_set_server: $EVAL_ERROR";
-           }
-       }
-   }
 
    PTDEBUG && _d('DBH info: ',
       $dbh,
@@ -2259,7 +2265,7 @@ sub _d {
 # ###########################################################################
 # Daemon package
 # This package is a copy without comments from the original.  The original
-# with comments and its test file can be found in the Bazaar repository at,
+# with comments and its test file can be found in the GitHub repository at,
 #   lib/Daemon.pm
 #   t/lib/Daemon.t
 # See https://github.com/percona/percona-toolkit for more information.
@@ -2270,157 +2276,225 @@ package Daemon;
 use strict;
 use warnings FATAL => 'all';
 use English qw(-no_match_vars);
+
 use constant PTDEBUG => $ENV{PTDEBUG} || 0;
 
 use POSIX qw(setsid);
+use Fcntl qw(:DEFAULT);
 
 sub new {
-   my ( $class, %args ) = @_;
-   foreach my $arg ( qw(o) ) {
-      die "I need a $arg argument" unless $args{$arg};
-   }
-   my $o = $args{o};
+   my ($class, %args) = @_;
    my $self = {
-      o        => $o,
-      log_file => $o->has('log') ? $o->get('log') : undef,
-      PID_file => $o->has('pid') ? $o->get('pid') : undef,
+      log_file       => $args{log_file},
+      pid_file       => $args{pid_file},
+      daemonize      => $args{daemonize},
+      force_log_file => $args{force_log_file},
+      parent_exit    => $args{parent_exit},
+      pid_file_owner => 0,
+      utf8           => $args{utf8} // 0,
    };
-
-   check_PID_file(undef, $self->{PID_file});
-
-   PTDEBUG && _d('Daemonized child will log to', $self->{log_file});
    return bless $self, $class;
 }
 
-sub daemonize {
-   my ( $self ) = @_;
+sub run {
+   my ($self) = @_;
 
-   PTDEBUG && _d('About to fork and daemonize');
-   defined (my $pid = fork()) or die "Cannot fork: $OS_ERROR";
-   if ( $pid ) {
-      PTDEBUG && _d('Parent PID', $PID, 'exiting after forking child PID',$pid);
-      exit;
-   }
-
-   PTDEBUG && _d('Daemonizing child PID', $PID);
-   $self->{PID_owner} = $PID;
-   $self->{child}     = 1;
-
-   POSIX::setsid() or die "Cannot start a new session: $OS_ERROR";
-   chdir '/'       or die "Cannot chdir to /: $OS_ERROR";
+   my $daemonize      = $self->{daemonize};
+   my $pid_file       = $self->{pid_file};
+   my $log_file       = $self->{log_file};
+   my $force_log_file = $self->{force_log_file};
+   my $parent_exit    = $self->{parent_exit};
+   my $utf8           = $self->{utf8};
 
-   $self->_make_PID_file();
+   PTDEBUG && _d('Starting daemon');
 
-   $OUTPUT_AUTOFLUSH = 1;
+   if ( $pid_file ) {
+      eval {
+         $self->_make_pid_file(
+            pid      => $PID,  # parent's pid
+            pid_file => $pid_file,
+         );
+      };
+      die "$EVAL_ERROR\n" if $EVAL_ERROR;
+      if ( !$daemonize ) {
+         $self->{pid_file_owner} = $PID;  # parent's pid
+      }
+   }
 
-   PTDEBUG && _d('Redirecting STDIN to /dev/null');
-   close STDIN;
-   open  STDIN, '/dev/null'
-      or die "Cannot reopen STDIN to /dev/null: $OS_ERROR";
+   if ( $daemonize ) {
+      defined (my $child_pid = fork()) or die "Cannot fork: $OS_ERROR";
+      if ( $child_pid ) {
+         PTDEBUG && _d('Forked child', $child_pid);
+         $parent_exit->($child_pid) if $parent_exit;
+         exit 0;
+      }
 
-   if ( $self->{log_file} ) {
-      PTDEBUG && _d('Redirecting STDOUT and STDERR to', $self->{log_file});
-      close STDOUT;
-      open  STDOUT, '>>', $self->{log_file}
-         or die "Cannot open log file $self->{log_file}: $OS_ERROR";
+      POSIX::setsid() or die "Cannot start a new session: $OS_ERROR";
+      chdir '/'       or die "Cannot chdir to /: $OS_ERROR";
 
-      close STDERR;
-      open  STDERR, ">&STDOUT"
-         or die "Cannot dupe STDERR to STDOUT: $OS_ERROR";
+      if ( $pid_file ) {
+         $self->_update_pid_file(
+            pid      => $PID,  # child's pid
+            pid_file => $pid_file,
+         );
+         $self->{pid_file_owner} = $PID;
+      }
    }
-   else {
-      if ( -t STDOUT ) {
-         PTDEBUG && _d('No log file and STDOUT is a terminal;',
-            'redirecting to /dev/null');
+
+   if ( $daemonize || $force_log_file ) {
+      PTDEBUG && _d('Redirecting STDIN to /dev/null');
+      close STDIN;
+      open  STDIN, '/dev/null'
+         or die "Cannot reopen STDIN to /dev/null: $OS_ERROR";
+      if ( $log_file ) {
+         PTDEBUG && _d('Redirecting STDOUT and STDERR to', $log_file);
          close STDOUT;
-         open  STDOUT, '>', '/dev/null'
-            or die "Cannot reopen STDOUT to /dev/null: $OS_ERROR";
-      }
-      if ( -t STDERR ) {
-         PTDEBUG && _d('No log file and STDERR is a terminal;',
-            'redirecting to /dev/null');
+         open  STDOUT, '>>', $log_file
+            or die "Cannot open log file $log_file: $OS_ERROR";
+         if ( $utf8 ) {
+            binmode(STDOUT, ':utf8')
+               or die "Can't binmode(STDOUT, ':utf8'): $OS_ERROR";
+         }
+
+
          close STDERR;
-         open  STDERR, '>', '/dev/null'
-            or die "Cannot reopen STDERR to /dev/null: $OS_ERROR";
+         open  STDERR, ">&STDOUT"
+            or die "Cannot dupe STDERR to STDOUT: $OS_ERROR";
+         if ( $utf8 ) {
+            binmode(STDERR, ':utf8')
+               or die "Can't binmode(STDERR, ':utf8'): $OS_ERROR";
+         }
       }
+      else {
+         if ( -t STDOUT ) {
+            PTDEBUG && _d('No log file and STDOUT is a terminal;',
+               'redirecting to /dev/null');
+            close STDOUT;
+            open  STDOUT, '>', '/dev/null'
+               or die "Cannot reopen STDOUT to /dev/null: $OS_ERROR";
+         }
+         if ( -t STDERR ) {
+            PTDEBUG && _d('No log file and STDERR is a terminal;',
+               'redirecting to /dev/null');
+            close STDERR;
+            open  STDERR, '>', '/dev/null'
+               or die "Cannot reopen STDERR to /dev/null: $OS_ERROR";
+         }
+      }
+
+      $OUTPUT_AUTOFLUSH = 1;
    }
 
+   PTDEBUG && _d('Daemon running');
    return;
 }
 
-sub check_PID_file {
-   my ( $self, $file ) = @_;
-   my $PID_file = $self ? $self->{PID_file} : $file;
-   PTDEBUG && _d('Checking PID file', $PID_file);
-   if ( $PID_file && -f $PID_file ) {
-      my $pid;
-      eval {
-         chomp($pid = (slurp_file($PID_file) || ''));
-      };
-      if ( $EVAL_ERROR ) {
-         die "The PID file $PID_file already exists but it cannot be read: "
-            . $EVAL_ERROR;
-      }
-      PTDEBUG && _d('PID file exists; it contains PID', $pid);
-      if ( $pid ) {
-         my $pid_is_alive = kill 0, $pid;
-         if ( $pid_is_alive ) {
-            die "The PID file $PID_file already exists "
-               . " and the PID that it contains, $pid, is running";
-         }
-         else {
-            warn "Overwriting PID file $PID_file because the PID that it "
-               . "contains, $pid, is not running";
+sub _make_pid_file {
+   my ($self, %args) = @_;
+   my @required_args = qw(pid pid_file);
+   foreach my $arg ( @required_args ) {
+      die "I need a $arg argument" unless $args{$arg};
+   };
+   my $pid      = $args{pid};
+   my $pid_file = $args{pid_file};
+
+   eval {
+      sysopen(PID_FH, $pid_file, O_RDWR|O_CREAT|O_EXCL) or die $OS_ERROR;
+      print PID_FH $PID, "\n";
+      close PID_FH;
+   };
+   if ( my $e = $EVAL_ERROR ) {
+      if ( $e =~ m/file exists/i ) {
+         my $old_pid = $self->_check_pid_file(
+            pid_file => $pid_file,
+            pid      => $PID,
+         );
+         if ( $old_pid ) {
+            warn "Overwriting PID file $pid_file because PID $old_pid "
+               . "is not running.\n";
          }
+         $self->_update_pid_file(
+            pid      => $PID,
+            pid_file => $pid_file
+         );
       }
       else {
-         die "The PID file $PID_file already exists but it does not "
-            . "contain a PID";
+         die "Error creating PID file $pid_file: $e\n";
       }
    }
-   else {
-      PTDEBUG && _d('No PID file');
-   }
-   return;
-}
 
-sub make_PID_file {
-   my ( $self ) = @_;
-   if ( exists $self->{child} ) {
-      die "Do not call Daemon::make_PID_file() for daemonized scripts";
-   }
-   $self->_make_PID_file();
-   $self->{PID_owner} = $PID;
    return;
 }
 
-sub _make_PID_file {
-   my ( $self ) = @_;
+sub _check_pid_file {
+   my ($self, %args) = @_;
+   my @required_args = qw(pid_file pid);
+   foreach my $arg ( @required_args ) {
+      die "I need a $arg argument" unless $args{$arg};
+   };
+   my $pid_file = $args{pid_file};
+   my $pid      = $args{pid};
+
+   PTDEBUG && _d('Checking if PID in', $pid_file, 'is running');
 
-   my $PID_file = $self->{PID_file};
-   if ( !$PID_file ) {
-      PTDEBUG && _d('No PID file to create');
+   if ( ! -f $pid_file ) {
+      PTDEBUG && _d('PID file', $pid_file, 'does not exist');
       return;
    }
 
-   $self->check_PID_file();
+   open my $fh, '<', $pid_file
+      or die "Error opening $pid_file: $OS_ERROR";
+   my $existing_pid = do { local $/; <$fh> };
+   chomp($existing_pid) if $existing_pid;
+   close $fh
+      or die "Error closing $pid_file: $OS_ERROR";
 
-   open my $PID_FH, '>', $PID_file
-      or die "Cannot open PID file $PID_file: $OS_ERROR";
-   print $PID_FH $PID
-      or die "Cannot print to PID file $PID_file: $OS_ERROR";
-   close $PID_FH
-      or die "Cannot close PID file $PID_file: $OS_ERROR";
+   if ( $existing_pid ) {
+      if ( $existing_pid == $pid ) {
+         warn "The current PID $pid already holds the PID file $pid_file\n";
+         return;
+      }
+      else {
+         PTDEBUG && _d('Checking if PID', $existing_pid, 'is running');
+         my $pid_is_alive = kill 0, $existing_pid;
+         if ( $pid_is_alive ) {
+            die "PID file $pid_file exists and PID $existing_pid is running\n";
+         }
+      }
+   }
+   else {
+      die "PID file $pid_file exists but it is empty.  Remove the file "
+         . "if the process is no longer running.\n";
+   }
+
+   return $existing_pid;
+}
+
+sub _update_pid_file {
+   my ($self, %args) = @_;
+   my @required_args = qw(pid pid_file);
+   foreach my $arg ( @required_args ) {
+      die "I need a $arg argument" unless $args{$arg};
+   };
+   my $pid      = $args{pid};
+   my $pid_file = $args{pid_file};
+
+   open my $fh, '>', $pid_file
+      or die "Cannot open $pid_file: $OS_ERROR";
+   print { $fh } $pid, "\n"
+      or die "Cannot print to $pid_file: $OS_ERROR";
+   close $fh
+      or warn "Cannot close $pid_file: $OS_ERROR";
 
-   PTDEBUG && _d('Created PID file:', $self->{PID_file});
    return;
 }
 
-sub _remove_PID_file {
-   my ( $self ) = @_;
-   if ( $self->{PID_file} && -f $self->{PID_file} ) {
-      unlink $self->{PID_file}
-         or warn "Cannot remove PID file $self->{PID_file}: $OS_ERROR";
+sub remove_pid_file {
+   my ($self, $pid_file) = @_;
+   $pid_file ||= $self->{pid_file};
+   if ( $pid_file && -f $pid_file ) {
+      unlink $self->{pid_file}
+         or warn "Cannot remove PID file $pid_file: $OS_ERROR";
       PTDEBUG && _d('Removed PID file');
    }
    else {
@@ -2430,18 +2504,204 @@ sub _remove_PID_file {
 }
 
 sub DESTROY {
-   my ( $self ) = @_;
+   my ($self) = @_;
 
-   $self->_remove_PID_file() if ($self->{PID_owner} || 0) == $PID;
+   if ( $self->{pid_file_owner} == $PID ) {
+      $self->remove_pid_file();
+   }
 
    return;
 }
 
-sub slurp_file {
-   my ($file) = @_;
-   return unless $file;
-   open my $fh, "<", $file or die "Cannot open $file: $OS_ERROR";
-   return do { local $/; <$fh> };
+sub _d {
+   my ($package, undef, $line) = caller 0;
+   @_ = map { (my $temp = $_) =~ s/\n/\n# /g; $temp; }
+        map { defined $_ ? $_ : 'undef' }
+        @_;
+   print STDERR "# $package:$line $PID ", join(' ', @_), "\n";
+}
+
+1;
+}
+# ###########################################################################
+# End Daemon package
+# ###########################################################################
+
+# ###########################################################################
+# VersionParser package
+# This package is a copy without comments from the original.  The original
+# with comments and its test file can be found in the GitHub repository at,
+#   lib/VersionParser.pm
+#   t/lib/VersionParser.t
+# See https://github.com/percona/percona-toolkit for more information.
+# ###########################################################################
+{
+package VersionParser;
+
+use Lmo;
+use Scalar::Util qw(blessed);
+use English qw(-no_match_vars);
+use constant PTDEBUG => $ENV{PTDEBUG} || 0;
+
+use overload (
+   '""'     => "version",
+   '<=>'    => "cmp",
+   'cmp'    => "cmp",
+   fallback => 1,
+);
+
+use Carp ();
+
+has major => (
+    is       => 'ro',
+    isa      => 'Int',
+    required => 1,
+);
+
+has [qw( minor revision )] => (
+    is  => 'ro',
+    isa => 'Num',
+);
+
+has flavor => (
+    is      => 'ro',
+    isa     => 'Str',
+    default => sub { 'Unknown' },
+);
+
+has innodb_version => (
+    is      => 'ro',
+    isa     => 'Str',
+    default => sub { 'NO' },
+);
+
+sub series {
+   my $self = shift;
+   return $self->_join_version($self->major, $self->minor);
+}
+
+sub version {
+   my $self = shift;
+   return $self->_join_version($self->major, $self->minor, $self->revision);
+}
+
+sub is_in {
+   my ($self, $target) = @_;
+
+   return $self eq $target;
+}
+
+sub _join_version {
+    my ($self, @parts) = @_;
+
+    return join ".", map { my $c = $_; $c =~ s/^0\./0/; $c } grep defined, @parts;
+}
+sub _split_version {
+   my ($self, $str) = @_;
+   my @version_parts = map { s/^0(?=\d)/0./; $_ } $str =~ m/(\d+)/g;
+   return @version_parts[0..2];
+}
+
+sub normalized_version {
+   my ( $self ) = @_;
+   my $result = sprintf('%d%02d%02d', map { $_ || 0 } $self->major,
+                                                      $self->minor,
+                                                      $self->revision);
+   PTDEBUG && _d($self->version, 'normalizes to', $result);
+   return $result;
+}
+
+sub comment {
+   my ( $self, $cmd ) = @_;
+   my $v = $self->normalized_version();
+
+   return "/*!$v $cmd */"
+}
+
+my @methods = qw(major minor revision);
+sub cmp {
+   my ($left, $right) = @_;
+   my $right_obj = (blessed($right) && $right->isa(ref($left)))
+                   ? $right
+                   : ref($left)->new($right);
+
+   my $retval = 0;
+   for my $m ( @methods ) {
+      last unless defined($left->$m) && defined($right_obj->$m);
+      $retval = $left->$m <=> $right_obj->$m;
+      last if $retval;
+   }
+   return $retval;
+}
+
+sub BUILDARGS {
+   my $self = shift;
+
+   if ( @_ == 1 ) {
+      my %args;
+      if ( blessed($_[0]) && $_[0]->can("selectrow_hashref") ) {
+         PTDEBUG && _d("VersionParser got a dbh, trying to get the version");
+         my $dbh = $_[0];
+         local $dbh->{FetchHashKeyName} = 'NAME_lc';
+         my $query = eval {
+            $dbh->selectall_arrayref(q/SHOW VARIABLES LIKE 'version%'/, { Slice => {} })
+         };
+         if ( $query ) {
+            $query = { map { $_->{variable_name} => $_->{value} } @$query };
+            @args{@methods} = $self->_split_version($query->{version});
+            $args{flavor} = delete $query->{version_comment}
+                  if $query->{version_comment};
+         }
+         elsif ( eval { ($query) = $dbh->selectrow_array(q/SELECT VERSION()/) } ) {
+            @args{@methods} = $self->_split_version($query);
+         }
+         else {
+            Carp::confess("Couldn't get the version from the dbh while "
+                        . "creating a VersionParser object: $@");
+         }
+         $args{innodb_version} = eval { $self->_innodb_version($dbh) };
+      }
+      elsif ( !ref($_[0]) ) {
+         @args{@methods} = $self->_split_version($_[0]);
+      }
+
+      for my $method (@methods) {
+         delete $args{$method} unless defined $args{$method};
+      }
+      @_ = %args if %args;
+   }
+
+   return $self->SUPER::BUILDARGS(@_);
+}
+
+sub _innodb_version {
+   my ( $self, $dbh ) = @_;
+   return unless $dbh;
+   my $innodb_version = "NO";
+
+   my ($innodb) =
+      grep { $_->{engine} =~ m/InnoDB/i }
+      map  {
+         my %hash;
+         @hash{ map { lc $_ } keys %$_ } = values %$_;
+         \%hash;
+      }
+      @{ $dbh->selectall_arrayref("SHOW ENGINES", {Slice=>{}}) };
+   if ( $innodb ) {
+      PTDEBUG && _d("InnoDB support:", $innodb->{support});
+      if ( $innodb->{support} =~ m/YES|DEFAULT/i ) {
+         my $vars = $dbh->selectrow_hashref(
+            "SHOW VARIABLES LIKE 'innodb_version'");
+         $innodb_version = !$vars ? "BUILTIN"
+                         :          ($vars->{Value} || $vars->{value});
+      }
+      else {
+         $innodb_version = $innodb->{support};  # probably DISABLED or NO
+      }
+   }
+
+   PTDEBUG && _d("InnoDB version:", $innodb_version);
+   return $innodb_version;
 }
 
 sub _d {
@@ -2452,10 +2712,11 @@ sub _d {
    print STDERR "# $package:$line $PID ", join(' ', @_), "\n";
 }
 
+no Lmo;
 1;
 }
 # ###########################################################################
-# End Daemon package
+# End VersionParser package
 # ###########################################################################
 
 # ###########################################################################
@@ -2518,7 +2779,12 @@ sub main {
       my $dsn = $dp->parse_options($o);
       my $dbh = $dp->get_dbh($dp->get_cxn_params($dsn), { AutoCommit => 1 } );
 
-      $text =~ s{^.*?select}{EXPLAIN /*!50115 PARTITIONS*/ SELECT}is;
+      my $vp = VersionParser->new($dbh);
+      if ( $vp->cmp('8.0') < 0 || $vp->flavor() =~ m/maria/i ) {
+         $text =~ s{^.*?select}{EXPLAIN /*!50115 PARTITIONS*/ SELECT}is;
+      } else {
+         $text =~ s{^.*?select}{EXPLAIN SELECT}is;
+      }
       $rows =  $dbh->selectall_arrayref($text, { Slice => {} } );
       $dbh->disconnect();
    }
@@ -3045,6 +3311,8 @@ first option on the command line.
 
 =item --connect
 
+short form: -c
+
 Treat input as a query, and obtain EXPLAIN output by connecting to a MySQL
 instance and running EXPLAIN on the query.  When this option is given,
 pt-visual-explain uses the other connection-specific options such as
@@ -3088,6 +3356,12 @@ short form: -h; type: string
 
 Connect to host.
 
+=item --mysql_ssl
+
+short form: -s; type: int
+
+Create SSL MySQL connection.
+
 =item --password
 
 short form: -p; type: string
diff --git a/t/pt-archiver/ssl.t b/t/pt-archiver/ssl.t
new file mode 100644
index 000000000..79bbd3c03
--- /dev/null
+++ b/t/pt-archiver/ssl.t
@@ -0,0 +1,90 @@
+#!/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-archiver";
+
+my $dp   = new DSNParser(opts=>$dsn_opts);
+my $sb   = new Sandbox(basedir => '/tmp', DSNParser => $dp);
+my $dbh  = $sb->get_dbh_for('source');
+
+if ( !$dbh ) {
+   plan skip_all => 'Cannot connect to sandbox source';
+}
+
+my ($output, $exit_code);
+my $cnf      = "/tmp/12345/my.sandbox.cnf";
+
+$sb->do_as_root(
+   'source',
+   q/CREATE USER IF NOT EXISTS sha256_user@'%' IDENTIFIED WITH caching_sha2_password BY 'sha256_user%password' REQUIRE SSL/,
+   q/GRANT ALL ON sakila.* TO sha256_user@'%'/,
+);
+
+($output, $exit_code) = full_output(
+   sub {
+      pt_archiver::main('--source', "F=$cnf,h=127.1,P=12345,D=sakila,t=film,u=sha256_user,p=sha256_user%password,s=0",
+         qw(--no-check-charset --purge --dry-run --port 12345),
+         "--where", "film_id < 100")
+   },
+   stderr => 1,
+);
+
+isnt(
+   $exit_code,
+   0,
+   "Error raised when SSL connection is not used"
+) or diag($output);
+
+like(
+   $output,
+   qr/Authentication plugin 'caching_sha2_password' reported error: Authentication requires secure connection./,
+   'Secure connection error raised when no SSL connection used'
+) or diag($output);
+
+($output, $exit_code) = full_output(
+   sub {
+      pt_archiver::main('--source', "F=$cnf,h=127.1,P=12345,D=sakila,t=film,u=sha256_user,p=sha256_user%password,s=1",
+         qw(--no-check-charset --purge --dry-run --port 12345),
+         "--where", "film_id < 100")
+   },
+   stderr => 1,
+);
+
+is(
+   $exit_code,
+   0,
+   "No error for user, identified with caching_sha2_password"
+) or diag($output);
+
+unlike(
+   $output,
+   qr/Authentication plugin 'caching_sha2_password' reported error: Authentication requires secure connection./,
+   'No secure connection error'
+) or diag($output);
+
+like(
+   $output,
+   qr/DELETE FROM `sakila`.`film` WHERE/,
+   'Queries printed'
+) or diag($output);
+
+# #############################################################################
+# Done.
+# #############################################################################
+$sb->do_as_root('source', q/DROP USER 'sha256_user'@'%'/);
+
+$sb->wipe_clean($dbh);
+ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox");
+done_testing;
diff --git a/t/pt-config-diff/ssl.t b/t/pt-config-diff/ssl.t
new file mode 100644
index 000000000..373a88eaa
--- /dev/null
+++ b/t/pt-config-diff/ssl.t
@@ -0,0 +1,87 @@
+#!/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-config-diff";
+
+require VersionParser;
+my $dp   = new DSNParser(opts=>$dsn_opts);
+my $sb   = new Sandbox(basedir => '/tmp', DSNParser => $dp);
+my $dbh  = $sb->get_dbh_for('source');
+
+if ( !$dbh ) {
+   plan skip_all => 'Cannot connect to sandbox source';
+}
+
+my ($output, $exit_code);
+my $cnf      = "/tmp/12345/my.sandbox.cnf";
+
+$sb->do_as_root(
+   'source',
+   q/CREATE USER IF NOT EXISTS sha256_user@'%' IDENTIFIED WITH caching_sha2_password BY 'sha256_user%password'/,
+   q/GRANT ALL ON sakila.* TO sha256_user@'%'/,
+);
+
+($output, $exit_code) = full_output(
+   sub { pt_config_diff::main(
+      'h=127.1,P=12345,u=sha256_user,p=sha256_user%password,s=0', 'h=127.1')
+   },
+   stderr => 1,
+);
+
+isnt(
+   $exit_code,
+   0,
+   "Error raised when SSL connection is not used"
+) or diag($output);
+
+like(
+   $output,
+   qr/Authentication plugin 'caching_sha2_password' reported error: Authentication requires secure connection./,
+   'Secure connection error raised when no SSL connection used'
+) or diag($output);
+
+($output, $exit_code) = full_output(
+   sub { pt_config_diff::main(
+      'h=127.1,P=12345,u=sha256_user,p=sha256_user%password,s=1', 'h=127.1')
+   },
+   stderr => 1,
+);
+
+is(
+   $exit_code,
+   0,
+   "No error for user, identified with caching_sha2_password"
+) or diag($output);
+
+unlike(
+   $output,
+   qr/Authentication plugin 'caching_sha2_password' reported error: Authentication requires secure connection./,
+   'No secure connection error'
+) or diag($output);
+
+is(
+   $output,
+   "",
+   "No output when no diff"
+) or diag($output);
+
+# #############################################################################
+# Done.
+# #############################################################################
+$sb->do_as_root('source', q/DROP USER 'sha256_user'@'%'/);
+
+$sb->wipe_clean($dbh);
+ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox");
+done_testing;
diff --git a/t/pt-deadlock-logger/ssl.t b/t/pt-deadlock-logger/ssl.t
new file mode 100644
index 000000000..e14f701ee
--- /dev/null
+++ b/t/pt-deadlock-logger/ssl.t
@@ -0,0 +1,177 @@
+#!/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 $dbh1 = $sb->get_dbh_for('source', { PrintError => 0, RaiseError => 1, AutoCommit => 0 });
+my $dbh2 = $sb->get_dbh_for('source', { PrintError => 0, RaiseError => 1, AutoCommit => 0 });
+
+if ( !$dbh1 || !$dbh2 ) {
+   plan skip_all => 'Cannot connect to sandbox source';
+}
+
+my ($output, $exit_code);
+my $dsn  = $sb->dsn_for('source');
+my @args = ($dsn, qw(--iterations 1));
+
+$dbh1->commit;
+$dbh2->commit;
+$sb->wipe_clean($dbh1);
+$sb->create_dbs($dbh1, ['test']);
+
+# Set up the table for creating a deadlock.
+$dbh1->do("create table test.dl(a int) engine=innodb");
+$dbh1->do("insert into test.dl(a) values(0), (1)");
+$dbh1->commit;
+$dbh2->commit;
+$dbh1->{InactiveDestroy} = 1;
+$dbh2->{InactiveDestroy} = 1;
+
+$dbh1->{mysql_auto_reconnect} = 1;
+$dbh2->{mysql_auto_reconnect} = 1;
+
+sub make_deadlock {
+   # Fork off two children to deadlock against each other.
+   my %children;
+   foreach my $child ( 0..1 ) {
+      my $pid = fork();
+      if ( defined($pid) && $pid == 0 ) { # I am a child
+         eval {
+            my $dbh = ($dbh1, $dbh2)[$child];
+            my @stmts = (
+               "set transaction isolation level serializable",
+               "begin",
+               "select * from test.dl where a = $child",
+               "update test.dl set a = $child where a <> $child",
+            );
+            foreach my $stmt (@stmts[0..2]) {
+               $dbh->do($stmt);
+            }
+            sleep(1 + $child);
+            $dbh->do($stmts[-1]);
+         };
+         if ( $EVAL_ERROR ) {
+            if ( $EVAL_ERROR !~ m/Deadlock found/ ) {
+               die $EVAL_ERROR;
+            }
+         }
+         exit(0);
+      }
+      elsif ( !defined($pid) ) {
+         die("Unable to fork for clearing deadlocks!\n");
+      }
+
+      # I already exited if I'm a child, so I'm the parent.
+      $children{$child} = $pid;
+   }
+
+   # Wait for the children to exit.
+   foreach my $child ( keys %children ) {
+      my $pid = waitpid($children{$child}, 0);
+   }
+   eval {
+       $dbh1->commit;
+       $dbh1->disconnect();
+   };
+   eval {
+       $dbh2->commit;
+       $dbh2->disconnect();
+   };
+}
+
+sub reconnect {
+    my $dbh = shift;
+    $dbh->disconnect();
+    $dbh = $sb->get_dbh_for('source', { PrintError => 0, RaiseError => 1, AutoCommit => 0 });
+    return $dbh;
+}
+
+$sb->do_as_root(
+   'source',
+   q/CREATE USER IF NOT EXISTS sha256_user@'%' IDENTIFIED WITH caching_sha2_password BY 'sha256_user%password'/,
+   q/GRANT ALL ON sakila.* TO sha256_user@'%'/,
+   q/GRANT PROCESS ON *.* TO sha256_user@'%'/,
+);
+
+make_deadlock();
+
+$dbh1 = reconnect($dbh1);
+$dbh2 = reconnect($dbh2);
+
+# Test that there is a deadlock
+$output = $dbh1->selectrow_hashref('show /*!40101 engine*/ innodb status')->{status};
+like($output, qr/WE ROLL BACK/, 'There was a deadlock');
+
+($output, $exit_code) = full_output(
+   sub {
+      pt_deadlock_logger::main("h=127.1,P=12345,D=sakila,t=film,u=sha256_user,p=sha256_user%password,s=0",
+      qw(--iterations 1));
+   },
+   stderr => 1,
+);
+
+isnt(
+   $exit_code,
+   0,
+   "Error raised when SSL connection is not used"
+) or diag($output);
+
+like(
+   $output,
+   qr/Authentication plugin 'caching_sha2_password' reported error: Authentication requires secure connection./,
+   'Secure connection error raised when no SSL connection used'
+) or diag($output);
+
+($output, $exit_code) = full_output(
+   sub {
+      pt_deadlock_logger::main("h=127.1,P=12345,D=sakila,t=film,u=sha256_user,p=sha256_user%password,s=1",
+      qw(--iterations 1));
+   },
+   stderr => 1,
+);
+
+is(
+   $exit_code,
+   0,
+   "No error for user, identified with caching_sha2_password"
+) or diag($output);
+
+unlike(
+   $output,
+   qr/Authentication plugin 'caching_sha2_password' reported error: Authentication requires secure connection./,
+   'No secure connection error'
+) or diag($output);
+
+like(
+   $output,
+   qr/127\.1.+msandbox.+GEN_CLUST_INDEX/,
+   'Deadlock logger prints the output'
+) or diag($output);
+
+# #############################################################################
+# Done.
+# #############################################################################
+$sb->do_as_root('source', q/DROP USER 'sha256_user'@'%'/);
+
+$dbh1 = reconnect($dbh1);
+$dbh2 = reconnect($dbh2);
+
+$dbh1->commit;
+$dbh2->commit;
+$sb->wipe_clean($dbh1);
+ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox");
+done_testing;
diff --git a/t/pt-duplicate-key-checker/ssl.t b/t/pt-duplicate-key-checker/ssl.t
new file mode 100644
index 000000000..26d0deddd
--- /dev/null
+++ b/t/pt-duplicate-key-checker/ssl.t
@@ -0,0 +1,100 @@
+#!/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-duplicate-key-checker";
+
+require VersionParser;
+my $dp  = new DSNParser(opts=>$dsn_opts);
+my $sb  = new Sandbox(basedir => '/tmp', DSNParser => $dp);
+my $dbh = $sb->get_dbh_for('source');
+
+if ( !$dbh ) {
+   plan skip_all => 'Cannot connect to sandbox source';
+}
+
+my $output;
+my $sample = "t/pt-duplicate-key-checker/samples/";
+my $cnf    = "/tmp/12345/my.sandbox.cnf";
+my $cmd    = "$trunk/bin/pt-duplicate-key-checker -F $cnf -h 127.1";
+
+$sb->wipe_clean($dbh);
+$sb->create_dbs($dbh, ['test']);
+
+my $transform_int = undef;
+# In version 8.0 integer display width is deprecated and not shown in the outputs.
+# So we need to transform our samples.
+if ($sandbox_version ge '8.0') {
+   $transform_int = sub {
+      my $txt = slurp_file(shift);
+      $txt =~ s/int\(\d{1,2}\)/int/g;
+      print $txt;
+   };
+}
+
+$sb->do_as_root(
+   'source',
+   q/CREATE USER IF NOT EXISTS sha256_user@'%' IDENTIFIED WITH caching_sha2_password BY 'sha256_user%password' REQUIRE SSL/,
+   q/GRANT ALL ON mysql.* TO sha256_user@'%'/,
+);
+
+$output = `$cmd -d mysql -t columns_priv -v P=12345,u=sha256_user,p=sha256_user%password,s=0 2>&1`;
+
+isnt(
+   $?,
+   0,
+   "Error raised when SSL connection is not used"
+) or diag($output);
+
+like(
+   $output,
+   qr/Authentication plugin 'caching_sha2_password' reported error: Authentication requires secure connection./,
+   'Secure connection error raised when no SSL connection used'
+) or diag($output);
+
+$output = `$cmd -d mysql -t columns_priv -v P=12345,u=sha256_user,p=sha256_user%password,s=1`;
+
+is(
+   $?,
+   0,
+   "No error for user, identified with caching_sha2_password"
+) or diag($output);
+
+unlike(
+   $output,
+   qr/Authentication plugin 'caching_sha2_password' reported error: Authentication requires secure connection./,
+   'No secure connection error'
+) or diag($output);
+
+# In version 8.0 order of columns in the index changed
+if ($sandbox_version ge '8.0') {
+   like($output,
+      qr/PRIMARY \(`Host`,`User`,`Db`,`Table_name`,`Column_name`\)/,
+      'Finds mysql.columns_priv PK'
+   );
+} else {
+   like($output,
+      qr/PRIMARY \(`Host`,`Db`,`User`,`Table_name`,`Column_name`\)/,
+      'Finds mysql.columns_priv PK'
+   );
+}
+
+# #############################################################################
+# Done.
+# #############################################################################
+$sb->do_as_root('source', q/DROP USER 'sha256_user'@'%'/);
+
+$sb->wipe_clean($dbh);
+ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox");
+done_testing;
diff --git a/t/pt-find/ssl.t b/t/pt-find/ssl.t
new file mode 100644
index 000000000..bf5044cfa
--- /dev/null
+++ b/t/pt-find/ssl.t
@@ -0,0 +1,75 @@
+#!/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-find";
+
+require VersionParser;
+my $dp = new DSNParser(opts=>$dsn_opts);
+my $sb = new Sandbox(basedir => '/tmp', DSNParser => $dp);
+my $dbh = $sb->get_dbh_for('source');
+
+if ( !$dbh ) {
+   plan skip_all => 'Cannot connect to sandbox source';
+}
+
+my $output;
+my $cnf = '/tmp/12345/my.sandbox.cnf';
+my $cmd = "$trunk/bin/pt-find -F $cnf ";
+
+$sb->do_as_root(
+   'source',
+   q/CREATE USER IF NOT EXISTS sha256_user@'%' IDENTIFIED WITH caching_sha2_password BY 'sha256_user%password' REQUIRE SSL/,
+   q/GRANT ALL ON *.* TO sha256_user@'%'/,
+);
+
+$output = `$cmd mysql --tblregex column --user=sha256_user --password=sha256_user%password --mysql_ssl=0 2>&1`; 
+
+isnt(
+   $?,
+   0,
+   "Error raised when SSL connection is not used"
+) or diag($output);
+
+like(
+   $output,
+   qr/Access denied/,
+   'Secure connection error raised when no SSL connection used'
+) or diag($output);
+
+$output = `$cmd mysql --tblregex column --user=sha256_user --password=sha256_user%password --mysql_ssl=1 2>&1`; 
+
+is(
+   $?,
+   0,
+   "Error raised when SSL connection is not used"
+) or diag($output);
+
+unlike(
+   $output,
+   qr/Access denied/,
+   'Secure connection error raised when no SSL connection used'
+) or diag($output);
+
+like($output, qr/`mysql`.`columns_priv`/, 'Found mysql.columns_priv');
+
+# #############################################################################
+# Done.
+# #############################################################################
+$sb->do_as_root('source', q/DROP USER 'sha256_user'@'%'/);
+
+$sb->wipe_clean($dbh);
+ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox");
+done_testing;
+exit;
diff --git a/t/pt-fk-error-logger/ssl.t b/t/pt-fk-error-logger/ssl.t
new file mode 100644
index 000000000..ae53a4706
--- /dev/null
+++ b/t/pt-fk-error-logger/ssl.t
@@ -0,0 +1,102 @@
+#!/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 Time::HiRes qw(sleep);
+use Test::More;
+
+use PerconaTest;
+use Sandbox;
+require "$trunk/bin/pt-fk-error-logger";
+
+require VersionParser;
+my $dp = new DSNParser(opts=>$dsn_opts);
+my $sb = new Sandbox(basedir => '/tmp', DSNParser => $dp);
+my $dbh = $sb->get_dbh_for('source');
+
+if ( !$dbh ) {
+   plan skip_all => 'Cannot connect to sandbox source';
+}
+
+$sb->create_dbs($dbh, [qw(test)]);
+
+my ($output, $exit_code);
+my $cnf  = '/tmp/12345/my.sandbox.cnf';
+my $cmd  = "$trunk/bin/pt-fk-error-logger -F $cnf ";
+my @args = qw(--iterations 1);
+
+$sb->do_as_root(
+   'source',
+   q/CREATE USER IF NOT EXISTS sha256_user@'%' IDENTIFIED WITH caching_sha2_password BY 'sha256_user%password' REQUIRE SSL/,
+   q/GRANT ALL ON test.* TO sha256_user@'%'/,
+   q/GRANT PROCESS ON *.* TO sha256_user@'%'/,
+);
+
+$sb->load_file('source', 't/pt-fk-error-logger/samples/fke_tbl.sql', 'test');
+
+# #########################################################################
+# Test saving foreign key errors to --dest.
+# #########################################################################
+
+# First, create a foreign key error.
+`/tmp/12345/use -D test < $trunk/t/pt-fk-error-logger/samples/fke.sql 1>/dev/null 2>/dev/null`;
+
+($output, $exit_code) = full_output(
+   sub {
+      pt_fk_error_logger::main(@args, 'h=127.1,P=12345,u=sha256_user,p=sha256_user%password,s=0'),
+   },
+   stderr => 1,
+);
+
+isnt(
+   $exit_code,
+   0,
+   "Error raised when SSL connection is not used"
+) or diag($output);
+
+like(
+   $output,
+   qr/Authentication plugin 'caching_sha2_password' reported error: Authentication requires secure connection./,
+   'Secure connection error raised when no SSL connection used'
+) or diag($output);
+
+($output, $exit_code) = full_output(
+   sub {
+      pt_fk_error_logger::main(@args, 'h=127.1,P=12345,u=sha256_user,p=sha256_user%password,s=1'),
+   },
+   stderr => 1,
+);
+
+is(
+   $exit_code,
+   0,
+   "No error for user, identified with caching_sha2_password"
+) or diag($output);
+
+unlike(
+   $output,
+   qr/Authentication plugin 'caching_sha2_password' reported error: Authentication requires secure connection./,
+   'No secure connection error'
+) or diag($output);
+
+like(
+   $output,
+   qr/Foreign key constraint fails/,
+   "Prints fk error by default"
+);
+
+# #############################################################################
+# Done.
+# #############################################################################
+$sb->do_as_root('source', q/DROP USER 'sha256_user'@'%'/);
+
+$sb->wipe_clean($dbh);
+ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox");
+done_testing;
diff --git a/t/pt-heartbeat/ssl.t b/t/pt-heartbeat/ssl.t
new file mode 100644
index 000000000..c8d27ff7f
--- /dev/null
+++ b/t/pt-heartbeat/ssl.t
@@ -0,0 +1,98 @@
+#!/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 Data::Dumper;
+
+use PerconaTest;
+use Sandbox;
+require "$trunk/bin/pt-heartbeat";
+
+my $dp  = new DSNParser(opts=>$dsn_opts);
+my $sb  = new Sandbox(basedir => '/tmp', DSNParser => $dp);
+my $dbh = $sb->get_dbh_for('source');
+
+if ( !$dbh ) {
+   plan skip_all => 'Cannot connect to sandbox source';
+}
+
+$sb->create_dbs($dbh, ['test']);
+
+my ($output, $exit_code);
+my $cnf       = '/tmp/12345/my.sandbox.cnf';
+my $cmd       = "$trunk/bin/pt-heartbeat -F $cnf ";
+
+$dbh->do('drop table if exists test.heartbeat');
+$dbh->do(q{CREATE TABLE test.heartbeat (
+             id int NOT NULL PRIMARY KEY,
+             ts datetime NOT NULL
+          ) ENGINE=MEMORY});
+$sb->wait_for_replicas;
+
+$sb->do_as_root(
+   'source',
+   q/CREATE USER IF NOT EXISTS sha256_user@'%' IDENTIFIED WITH caching_sha2_password BY 'sha256_user%password' REQUIRE SSL/,
+   q/GRANT ALL ON test.* TO sha256_user@'%'/,
+);
+
+($output, $exit_code) = full_output(
+   sub { pt_heartbeat::main("F=$cnf,h=127.1,P=12345,u=sha256_user,p=sha256_user%password,s=0",
+      qw(-D test --check)) },
+   stderr => 1,
+);
+
+isnt(
+   $?,
+   0,
+   "Error raised when SSL connection is not used"
+) or diag($output);
+
+like(
+   $output,
+   qr/Authentication plugin 'caching_sha2_password' reported error: Authentication requires secure connection./,
+   'Secure connection error raised when no SSL connection used'
+) or diag($output);
+
+($output, $exit_code) = full_output(
+   sub { pt_heartbeat::main("F=$cnf,h=127.1,P=12345,u=sha256_user,p=sha256_user%password,s=1",
+      qw(-D test --check)) },
+   stderr => 1,
+);
+
+is(
+   $?,
+   0,
+   "No error for user, identified with caching_sha2_password"
+) or diag($output);
+
+unlike(
+   $output,
+   qr/Authentication plugin 'caching_sha2_password' reported error: Authentication requires secure connection./,
+   'No secure connection error'
+) or diag($output);
+
+my $row = $dbh->selectall_hashref('select * from test.heartbeat', 'id');
+is(
+   $row->{1}->{id},
+   1,
+   "Automatically inserts heartbeat row (issue 1292)"
+);
+
+# #############################################################################
+# Done.
+# #############################################################################
+$sb->do_as_root('source', q/DROP USER 'sha256_user'@'%'/);
+
+$sb->wipe_clean($dbh);
+ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox");
+
+done_testing;
+exit;
diff --git a/t/pt-index-usage/ssl.t b/t/pt-index-usage/ssl.t
new file mode 100644
index 000000000..032379605
--- /dev/null
+++ b/t/pt-index-usage/ssl.t
@@ -0,0 +1,103 @@
+#!/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-index-usage";
+require VersionParser;
+
+use Sandbox;
+my $dp  = new DSNParser(opts=>$dsn_opts);
+my $sb  = new Sandbox(basedir => '/tmp', DSNParser => $dp);
+my $dbh = $sb->get_dbh_for('source');
+
+if ( !$dbh ) {
+   plan skip_all => 'Cannot connect to sandbox source';
+}
+if ( !@{ $dbh->selectall_arrayref("show databases like 'sakila'") } ) {
+   plan skip_all => "Sakila database is not loaded";
+}
+
+my $cnf     = '/tmp/12345/my.sandbox.cnf';
+my @args    = ('-F', $cnf);
+my $samples = "t/pt-index-usage/samples/";
+my ($output, $exit_code);
+
+$sb->do_as_root(
+   'source',
+   q/CREATE USER IF NOT EXISTS sha256_user@'%' IDENTIFIED WITH caching_sha2_password BY 'sha256_user%password' REQUIRE SSL/,
+   q/GRANT ALL ON sakila.* TO sha256_user@'%'/,
+);
+
+# This query doesn't use indexes so there's an unused PK and
+# an unused secondary index.  Only the secondary index should
+# be printed since dropping PKs is not suggested by default.
+
+($output, $exit_code) = full_output(
+   sub {
+      pt_index_usage::main(
+         @args,
+         qw(--host=127.1 --port=12345 --user=sha256_user --password=sha256_user%password --mysql_ssl=0),
+         "$trunk/$samples/slow001.txt")
+   },
+   stderr => 1,
+);
+
+isnt(
+   $exit_code,
+   0,
+   "Error raised when SSL connection is not used"
+) or diag($output);
+
+like(
+   $output,
+   qr/Authentication plugin 'caching_sha2_password' reported error: Authentication requires secure connection./,
+   'Secure connection error raised when no SSL connection used'
+) or diag($output);
+
+($output, $exit_code) = full_output(
+   sub {
+      pt_index_usage::main(
+         @args,
+         qw(--host=127.1 --port=12345 --user=sha256_user --password=sha256_user%password --mysql_ssl=1),
+         "$trunk/$samples/slow001.txt")
+   },
+   stderr => 1,
+);
+
+is(
+   $exit_code,
+   0,
+   "No error for user, identified with caching_sha2_password"
+) or diag($output);
+
+unlike(
+   $output,
+   qr/Authentication plugin 'caching_sha2_password' reported error: Authentication requires secure connection./,
+   'No secure connection error'
+) or diag($output);
+
+like(
+   $output,
+   qr/ALTER TABLE `sakila`.`film_text` DROP KEY `idx_title_description`; -- type:non-unique/,
+   'A simple query that does not use any indexes',
+) or diag($output);
+
+# #############################################################################
+# Done.
+# #############################################################################
+$sb->do_as_root('source', q/DROP USER 'sha256_user'@'%'/);
+
+$sb->wipe_clean($dbh);
+ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox");
+done_testing;
+exit;
diff --git a/t/pt-kill/ssl.t b/t/pt-kill/ssl.t
new file mode 100644
index 000000000..ab5dc6042
--- /dev/null
+++ b/t/pt-kill/ssl.t
@@ -0,0 +1,98 @@
+#!/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";
+   $ENV{PERCONA_TOOLKIT_TEST_USE_DSN_NAMES} = 1;
+};
+
+use strict;
+use warnings FATAL => 'all';
+use English qw(-no_match_vars);
+use Test::More;
+
+use Data::Dumper;
+
+use PerconaTest;
+use Sandbox;
+require "$trunk/bin/pt-kill";
+require VersionParser;
+
+my $dp = new DSNParser(opts=>$dsn_opts);
+my $sb = new Sandbox(basedir => '/tmp', DSNParser => $dp);
+my $source_dbh = $sb->get_dbh_for('source');
+
+if ( !$source_dbh ) {
+   plan skip_all => 'Cannot connect to sandbox source';
+}
+else {
+   plan tests => 6;
+}
+
+my ($output, $exit_code);
+my $cnf = '/tmp/12345/my.sandbox.cnf';
+my $cmd = "$trunk/bin/pt-kill -F $cnf";
+
+$sb->do_as_root(
+   'source',
+   q/CREATE USER IF NOT EXISTS sha256_user@'%' IDENTIFIED WITH caching_sha2_password BY 'sha256_user%password' REQUIRE SSL/,
+   q/GRANT PROCESS ON *.* TO sha256_user@'%'/,
+);
+
+$output = `$cmd h=127.1,P=12345,u=sha256_user,p=sha256_user%password,s=0 --busy-time 1s --print --run-time 10 2>&1`;
+
+isnt(
+   $?,
+   0,
+   "Error raised when SSL connection is not used"
+) or diag($output);
+
+like(
+   $output,
+   qr/Authentication plugin 'caching_sha2_password' reported error: Authentication requires secure connection./,
+   'Secure connection error raised when no SSL connection used'
+) or diag($output);
+
+# Shell out to a sleep(10) query and try to capture the query.
+# Backticks don't work here.
+system("/tmp/12345/use -e 'select sleep(5)' >/dev/null &");
+
+$output = `$cmd h=127.1,P=12345,u=sha256_user,p=sha256_user%password,s=1 --busy-time 1s --print --run-time 10 2>&1`;
+
+is(
+   $?,
+   0,
+   "No error for user, identified with caching_sha2_password"
+) or diag($output);
+
+unlike(
+   $output,
+   qr/Authentication plugin 'caching_sha2_password' reported error: Authentication requires secure connection./,
+   'No secure connection error'
+) or diag($output);
+
+# $output ought to be something like
+# 2009-05-27T22:19:40 KILL 5 (Query 1 sec) select sleep(10)
+# 2009-05-27T22:19:41 KILL 5 (Query 2 sec) select sleep(10)
+# 2009-05-27T22:19:42 KILL 5 (Query 3 sec) select sleep(10)
+# 2009-05-27T22:19:43 KILL 5 (Query 4 sec) select sleep(10)
+# 2009-05-27T22:19:44 KILL 5 (Query 5 sec) select sleep(10)
+# 2009-05-27T22:19:45 KILL 5 (Query 6 sec) select sleep(10)
+# 2009-05-27T22:19:46 KILL 5 (Query 7 sec) select sleep(10)
+# 2009-05-27T22:19:47 KILL 5 (Query 8 sec) select sleep(10)
+# 2009-05-27T22:19:48 KILL 5 (Query 9 sec) select sleep(10)
+my @times = $output =~ m/\(Query (\d+) sec\)/g;
+ok(
+   @times > 2 && @times < 7,
+   "There were 2 to 5 captures"
+) or diag($output);
+
+# #############################################################################
+# Done.
+# #############################################################################
+$sb->do_as_root('source', q/DROP USER 'sha256_user'@'%'/);
+
+$sb->wipe_clean($source_dbh);
+ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox");
+exit;
diff --git a/t/pt-mysql-summary/ssl.t b/t/pt-mysql-summary/ssl.t
new file mode 100644
index 000000000..9c3d4c914
--- /dev/null
+++ b/t/pt-mysql-summary/ssl.t
@@ -0,0 +1,81 @@
+#!/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 PerconaTest;
+use Sandbox;
+use DSNParser;
+require VersionParser;
+use Test::More;
+use File::Temp qw( tempdir );
+
+local $ENV{PTDEBUG} = "";
+
+my $dp  = new DSNParser(opts=>$dsn_opts);
+my $sb  = new Sandbox(basedir => '/tmp', DSNParser => $dp);
+my $dbh = $sb->get_dbh_for('source');
+
+if ( !$dbh ) {
+   plan skip_all => 'Cannot connect to sandbox';
+}
+else {
+   plan tests => 6;
+}
+
+my ($tool) = 'pt-mysql-summary';
+
+$sb->do_as_root(
+   'source',
+   q/CREATE USER IF NOT EXISTS sha256_user@'%' IDENTIFIED WITH caching_sha2_password BY 'sha256_user%password' REQUIRE SSL/,
+   q/GRANT ALL ON sakila.* TO sha256_user@'%'/,
+);
+
+my $output = `$trunk/bin/$tool --host=127.1 --port=12345 --user=sha256_user --password=sha256_user%password 2>&1 -- --defaults-file=/tmp/12345/my.sandbox.cnf --ssl-mode=disabled`;
+
+isnt(
+   $?,
+   0,
+   "Error raised when SSL connection is not used"
+) or diag($output);
+
+like(
+   $output,
+   qr/Authentication plugin 'caching_sha2_password' reported error: Authentication requires secure connection./,
+   'Secure connection error raised when no SSL connection used'
+) or diag($output);
+
+$output = `$trunk/bin/$tool --host=127.1 --port=12345 --user=sha256_user --password=sha256_user%password 2>&1 -- --defaults-file=/tmp/12345/my.sandbox.cnf --ssl-mode=required`;
+
+is(
+   $?,
+   0,
+   "No error for user, identified with caching_sha2_password"
+) or diag($output);
+
+unlike(
+   $output,
+   qr/Authentication plugin 'caching_sha2_password' reported error: Authentication requires secure connection./,
+   'No secure connection error'
+) or diag($output);
+
+like(
+   $output,
+   qr/SSL | Yes/,
+   "Authentication with caching_sha2_password works"
+);
+
+# #############################################################################
+# Done.
+# #############################################################################
+$sb->do_as_root('source', q/DROP USER 'sha256_user'@'%'/);
+
+$sb->wipe_clean($dbh);
+ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox");
+exit;
diff --git a/t/pt-online-schema-change/ssl.t b/t/pt-online-schema-change/ssl.t
new file mode 100644
index 000000000..277089453
--- /dev/null
+++ b/t/pt-online-schema-change/ssl.t
@@ -0,0 +1,108 @@
+#!/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 Data::Dumper;
+use PerconaTest;
+use Sandbox;
+
+require "$trunk/bin/pt-online-schema-change";
+
+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 replica1';
+}
+
+# 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 $source_dsn = 'h=127.1,P=12345';
+my @args       = (qw(--set-vars innodb_lock_wait_timeout=3));
+my $output;
+my $exit_code;
+my $sample  = "t/pt-online-schema-change/samples/";
+
+$sb->do_as_root(
+   'source',
+   q/CREATE USER IF NOT EXISTS sha256_user@'%' IDENTIFIED WITH caching_sha2_password BY 'sha256_user%password' REQUIRE SSL/,
+   q/GRANT ALL ON test.* TO sha256_user@'%'/,
+   q/GRANT REPLICATION SLAVE ON *.* TO sha256_user@'%'/,
+   q/GRANT SUPER ON *.* TO sha256_user@'%'/,
+);
+
+# #############################################################################
+# DROP PRIMARY KEY
+# #############################################################################
+
+$sb->load_file('source', "$sample/del-trg-bug-1103672.sql");
+
+($output, $exit_code) = full_output(
+   sub { pt_online_schema_change::main(@args,
+      "$source_dsn,D=test,t=t1,u=sha256_user,p=sha256_user%password,s=0",
+      "--alter", "drop primary key, add column _id int unsigned not null primary key auto_increment FIRST",
+      qw(--execute --no-check-alter)),
+   },
+);
+
+isnt(
+   $exit_code,
+   0,
+   "Error raised when SSL connection is not used"
+) or diag($output);
+
+like(
+   $output,
+   qr/Authentication plugin 'caching_sha2_password' reported error: Authentication requires secure connection./,
+   'Secure connection error raised when no SSL connection used'
+) or diag($output);
+
+($output, $exit_code) = full_output(
+   sub { pt_online_schema_change::main(@args,
+      "$source_dsn,D=test,t=t1,u=sha256_user,p=sha256_user%password,s=1",
+      "--alter", "drop primary key, add column _id int unsigned not null primary key auto_increment FIRST",
+      qw(--execute --no-check-alter)),
+   },
+);
+
+is(
+   $exit_code,
+   0,
+   "No error for user, identified with caching_sha2_password"
+) or diag($output);
+
+unlike(
+   $output,
+   qr/Authentication plugin 'caching_sha2_password' reported error: Authentication requires secure connection./,
+   'No secure connection error'
+) or diag($output);
+
+like(
+   $output,
+   qr/Successfully altered `test`.`t1`/,
+   "DROP PRIMARY KEY"
+);
+
+# #############################################################################
+# Done.
+# #############################################################################
+$sb->do_as_root('source', q/DROP USER 'sha256_user'@'%'/);
+
+$sb->wipe_clean($source_dbh);
+ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox");
+done_testing;
diff --git a/t/pt-replica-restart/ssl.t b/t/pt-replica-restart/ssl.t
new file mode 100644
index 000000000..d850e9e7e
--- /dev/null
+++ b/t/pt-replica-restart/ssl.t
@@ -0,0 +1,102 @@
+#!/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');
+my $output;
+
+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
+$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'
+);
+
+$sb->do_as_root(
+   'replica1',
+   q/CREATE USER IF NOT EXISTS sha256_user@'%' IDENTIFIED WITH caching_sha2_password BY 'sha256_user%password' REQUIRE SSL/,
+   q/GRANT REPLICATION SLAVE, PROCESS ON *.* TO sha256_user@'%'/,
+);
+
+# Start an instance
+$output = `$trunk/bin/pt-replica-restart --max-sleep 0.25 h=127.1,P=12346,u=sha256_user,p=sha256_user%password,s=0 --error-text "doesn't exist" --run-time 1s 2>&1`;
+
+isnt(
+   $?,
+   0,
+   "Error raised when SSL connection is not used"
+) or diag($output);
+
+like(
+   $output,
+   qr/Authentication plugin 'caching_sha2_password' reported error: Authentication requires secure connection./,
+   'Secure connection error raised when no SSL connection used'
+) or diag($output);
+
+$output = `$trunk/bin/pt-replica-restart --max-sleep 0.25 h=127.1,P=12346,u=sha256_user,p=sha256_user%password,s=1 --error-text "doesn't exist" --run-time 1s 2>&1`;
+
+is(
+   $?,
+   0,
+   "No error for user, identified with caching_sha2_password"
+) or diag($output);
+
+unlike(
+   $output,
+   qr/Authentication plugin 'caching_sha2_password' reported error: Authentication requires secure connection./,
+   'No secure connection error'
+) or diag($output);
+
+unlike(
+   $output,
+   qr/Error does not match/,
+   '--error-text works (issue 459)'
+);
+
+# #############################################################################
+# Done.
+# #############################################################################
+$sb->do_as_root('replica1', q/DROP USER 'sha256_user'@'%'/);
+
+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;
diff --git a/t/pt-show-grants/ssl.t b/t/pt-show-grants/ssl.t
new file mode 100644
index 000000000..60eb42f7c
--- /dev/null
+++ b/t/pt-show-grants/ssl.t
@@ -0,0 +1,95 @@
+#!/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;
+use SqlModes;
+require "$trunk/bin/pt-show-grants";
+require VersionParser;
+
+my $dp = new DSNParser(opts=>$dsn_opts);
+my $sb = new Sandbox(basedir => '/tmp', DSNParser => $dp);
+my $dbh = $sb->get_dbh_for('source');
+
+if ( !$dbh ) {
+   plan skip_all => 'Cannot connect to sandbox source';
+}
+
+$sb->wipe_clean($dbh);
+
+my ($output, $exit_code);
+my $cnf = '/tmp/12345/my.sandbox.cnf';
+
+$sb->do_as_root(
+   'source',
+   q/CREATE USER IF NOT EXISTS sha256_user@'%' IDENTIFIED WITH caching_sha2_password BY 'sha256_user%password' REQUIRE SSL/,
+   q/GRANT SUPER ON *.* TO sha256_user@'%'/,
+   q/GRANT SELECT ON mysql.* TO sha256_user@'%'/,
+);
+
+($output, $exit_code) = full_output(
+   sub { pt_show_grants::main(
+         '-F', $cnf,
+         'h=127.1,P=12345,u=sha256_user,p=sha256_user%password,s=0',
+         qw(--drop --flush --revoke --separate)
+      ); },
+   stderr => 1,
+);
+
+isnt(
+   $exit_code,
+   0,
+   "Error raised when SSL connection is not used"
+) or diag($output);
+
+like(
+   $output,
+   qr/Authentication plugin 'caching_sha2_password' reported error: Authentication requires secure connection./,
+   'Secure connection error raised when no SSL connection used'
+) or diag($output);
+
+($output, $exit_code) = full_output(
+   sub { pt_show_grants::main(
+         '-F', $cnf,
+         'h=127.1,P=12345,u=sha256_user,p=sha256_user%password,s=1',
+         qw(--drop --flush --revoke --separate)
+      ); },
+   stderr => 1,
+);
+
+is(
+   $exit_code,
+   0,
+   "No error for user, identified with caching_sha2_password"
+) or diag($output);
+
+unlike(
+   $output,
+   qr/Authentication plugin 'caching_sha2_password' reported error: Authentication requires secure connection./,
+   'No secure connection error'
+) or diag($output);
+
+like(
+   $output,
+   qr/Grants dumped by/,
+   'It lives',
+);
+
+# #############################################################################
+# Done.
+# #############################################################################
+$sb->do_as_root('source', q/DROP USER 'sha256_user'@'%'/);
+
+$sb->wipe_clean($dbh);
+ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox");
+done_testing;
diff --git a/t/pt-stalk/ssl.t b/t/pt-stalk/ssl.t
new file mode 100644
index 000000000..d1af27525
--- /dev/null
+++ b/t/pt-stalk/ssl.t
@@ -0,0 +1,121 @@
+#!/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 threads;
+use English qw(-no_match_vars);
+use Test::More;
+use Time::HiRes qw(sleep);
+
+use PerconaTest;
+use DSNParser;
+use Sandbox;
+require VersionParser;
+
+my $dp = new DSNParser(opts=>$dsn_opts);
+my $sb = new Sandbox(basedir => '/tmp', DSNParser => $dp);
+my $dbh = $sb->get_dbh_for('source');
+
+if ( !$dbh ) {
+   plan skip_all => 'Cannot connect to sandbox source';
+}
+
+my $cnf      = "/tmp/12345/my.sandbox.cnf";
+my $pid_file = "/tmp/pt-stalk.pid.$PID";
+my $log_file = "/tmp/pt-stalk.log.$PID";
+my $dest     = "/tmp/pt-stalk.collect.$PID";
+my $int_file = "/tmp/pt-stalk-after-interval-sleep";
+my $pid;
+my ($output, $exit_code);
+
+sub cleanup {
+   diag(`rm $pid_file $log_file $int_file 2>/dev/null`);
+   diag(`rm -rf $dest 2>/dev/null`);
+}
+
+cleanup();
+
+$sb->do_as_root(
+   'source',
+   q/CREATE USER IF NOT EXISTS sha256_user@'%' IDENTIFIED WITH caching_sha2_password BY 'sha256_user%password' REQUIRE SSL/,
+   q/GRANT SUPER ON *.* TO sha256_user@'%'/,
+);
+
+$exit_code = system("$trunk/bin/pt-stalk --host=127.1 --no-stalk --run-time 2 --dest $dest --prefix nostalk --pid $pid_file --iterations 1 --user=sha256_user --password=sha256_user%password -- --defaults-file=$cnf --ssl-mode=disabled >$log_file 2>&1");
+
+PerconaTest::wait_until(sub { !-f $pid_file });
+
+$output = `cat $log_file 2>/dev/null`;
+
+isnt(
+   $exit_code,
+   0,
+   "Error raised when SSL connection is not used"
+) or diag($output);
+
+like(
+   $output,
+   qr/Authentication plugin 'caching_sha2_password' reported error: Authentication requires secure connection./,
+   'Secure connection error raised when no SSL connection used'
+) or diag($output);
+
+cleanup();
+
+$exit_code = system("$trunk/bin/pt-stalk --host=127.1 --no-stalk --run-time 2 --dest $dest --prefix nostalk --pid $pid_file --iterations 1 --user=sha256_user --password=sha256_user%password -- --defaults-file=$cnf --ssl-mode=required >$log_file 2>&1");
+
+PerconaTest::wait_until(sub { !-f $pid_file });
+
+$output = `cat $log_file 2>/dev/null`;
+
+is(
+   $?,
+   0,
+   "No error for user, identified with caching_sha2_password"
+) or diag($output);
+
+unlike(
+   $output,
+   qr/Authentication plugin 'caching_sha2_password' reported error: Authentication requires secure connection./,
+   'No secure connection error'
+) or diag($output);
+
+$output = `cat $dest/nostalk-trigger 2>/dev/null`;
+like(
+   $output,
+   qr/Not stalking/,
+   "Not stalking, collect triggered"
+)
+or diag(
+   'dest',      `ls -l $dest/ 2>/dev/null`,
+   'log_file',  `cat $log_file 2>/dev/null`,
+   'collector', `cat $dest/*-output 2>/dev/null`,
+);
+
+chomp($output = `grep -c '^TS' $dest/nostalk-df 2>/dev/null`);
+is(
+   $output,
+   2,
+   "Not stalking, collect ran for --run-time"
+)
+or diag(
+   'dest',      `ls -l $dest/ 2>/dev/null`,
+   'log_file',  `cat $log_file 2>/dev/null`,
+   'collector', `cat $dest/*-output 2>/dev/null`,
+);
+
+# #############################################################################
+# Done.
+# #############################################################################
+$sb->do_as_root('source', q/DROP USER 'sha256_user'@'%'/);
+
+cleanup();
+diag(`rm -rf $dest 2>/dev/null`);
+$sb->wipe_clean($dbh);
+ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox");
+done_testing;
diff --git a/t/pt-table-checksum/ssl.t b/t/pt-table-checksum/ssl.t
new file mode 100644
index 000000000..33939d2c9
--- /dev/null
+++ b/t/pt-table-checksum/ssl.t
@@ -0,0 +1,107 @@
+#!/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-table-checksum";
+
+my $dp  = new DSNParser(opts=>$dsn_opts);
+my $sb  = new Sandbox(basedir => '/tmp', DSNParser => $dp);
+my $dbh = $sb->get_dbh_for('source');
+
+if ( !$dbh ) {
+   plan skip_all => 'Cannot connect to sandbox source';
+}
+else {
+   plan tests => 7;
+}
+
+# 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.
+# And --max-load "" prevents waiting for status variables.
+my @args       = (qw(--set-vars innodb_lock_wait_timeout=3), '--max-load', ''); 
+my ($output, $exit_code);
+
+# #############################################################################
+# Issue 388: mk-table-checksum crashes when column with comma in the name
+# is used in a key
+# #############################################################################
+
+$sb->create_dbs($dbh, [qw(test)]);
+$sb->load_file('source', 't/lib/samples/tables/issue-388.sql', 'test');
+
+$sb->do_as_root(
+   'source',
+   q/CREATE USER IF NOT EXISTS sha256_user@'%' IDENTIFIED WITH caching_sha2_password BY 'sha256_user%password' REQUIRE SSL/,
+   q/GRANT ALL ON test.* TO sha256_user@'%'/,
+   q/GRANT ALL ON percona.* TO sha256_user@'%'/,
+   q/GRANT REPLICATION SLAVE ON *.* TO sha256_user@'%'/,
+   q/GRANT REPLICATION CLIENT ON *.* TO sha256_user@'%'/,
+);
+
+$dbh->do("insert into test.foo values (null, 'john, smith')");
+
+($output, $exit_code) = full_output(
+   sub { pt_table_checksum::main(@args, 'h=127.1,P=12345,u=sha256_user,p=sha256_user%password,s=0', qw(-d test)) },
+   stderr => 1,
+);
+
+isnt(
+   $exit_code,
+   0,
+   "Error raised when SSL connection is not used"
+) or diag($output);
+
+like(
+   $output,
+   qr/Authentication plugin 'caching_sha2_password' reported error: Authentication requires secure connection./,
+   'Secure connection error raised when no SSL connection used'
+) or diag($output);
+
+($output, $exit_code) = full_output(
+   sub { pt_table_checksum::main(@args, 'h=127.1,P=12345,u=sha256_user,p=sha256_user%password,s=1', qw(-d test)) },
+   stderr => 1,
+);
+
+is(
+   $exit_code,
+   0,
+   "No error for user, identified with caching_sha2_password"
+) or diag($output);
+
+unlike(
+   $output,
+   qr/Authentication plugin 'caching_sha2_password' reported error: Authentication requires secure connection./,
+   'No secure connection error'
+) or diag($output);
+
+unlike(
+   $output,
+   qr/Use of uninitialized value/,
+   'No error (issue 388)'
+);
+
+like(
+   $output,
+   qr/^\S+\s+0\s+0\s+1\s+0\s+1\s+/m,
+   'Checksums the table (issue 388)'
+);
+
+# #############################################################################
+# Done.
+# #############################################################################
+$sb->do_as_root('source', q/DROP USER 'sha256_user'@'%'/);
+
+$sb->wipe_clean($dbh);
+ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox");
+exit;
diff --git a/t/pt-table-sync/ssl.t b/t/pt-table-sync/ssl.t
new file mode 100644
index 000000000..37208ab54
--- /dev/null
+++ b/t/pt-table-sync/ssl.t
@@ -0,0 +1,89 @@
+#!/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-table-sync";
+
+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';
+}
+else {
+   plan tests => 7;
+}
+
+my ($output, $exit_code);
+my @args = (qw(--sync-to-source -t sakila.actor -v -v --print --chunk-size 100));
+
+$sb->do_as_root(
+   'source',
+   q/CREATE USER IF NOT EXISTS sha256_user@'%' IDENTIFIED WITH caching_sha2_password BY 'sha256_user%password' REQUIRE SSL/,
+   q/GRANT ALL ON sakila.* TO sha256_user@'%'/,
+);
+
+($output, $exit_code) = full_output(
+   sub { pt_table_sync::main('h=127.1,P=12345,D=sakila,t=film,u=sha256_user,p=sha256_user%password,s=0', @args) },
+   stderr => 1,
+);
+
+isnt(
+   $exit_code,
+   0,
+   "Error raised when SSL connection is not used"
+) or diag($output);
+
+like(
+   $output,
+   qr/Authentication plugin 'caching_sha2_password' reported error: Authentication requires secure connection./,
+   'Secure connection error raised when no SSL connection used'
+) or diag($output);
+
+($output, $exit_code) = full_output(
+   sub { pt_table_sync::main('h=127.1,P=12345,D=sakila,t=film,u=sha256_user,p=sha256_user%password,s=1', @args) },
+   stderr => 1,
+);
+
+is(
+   $exit_code,
+   0,
+   "No error for user, identified with caching_sha2_password"
+) or diag($output);
+
+unlike(
+   $output,
+   qr/Authentication plugin 'caching_sha2_password' reported error: Authentication requires secure connection./,
+   'No secure connection error'
+) or diag($output);
+
+like(
+   $output,
+   qr/WHERE \(`actor_id` = 0\)/,
+   "Zero chunk"
+);
+
+# #############################################################################
+# Done.
+# #############################################################################
+$sb->do_as_root('source', q/DROP USER 'sha256_user'@'%'/);
+
+$sb->wipe_clean($source_dbh);
+ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox");
+exit;
diff --git a/t/pt-table-usage/ssl.t b/t/pt-table-usage/ssl.t
new file mode 100644
index 000000000..96044d4d6
--- /dev/null
+++ b/t/pt-table-usage/ssl.t
@@ -0,0 +1,88 @@
+#!/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-table-usage";
+
+my $dp  = new DSNParser(opts=>$dsn_opts);
+my $sb  = new Sandbox(basedir => '/tmp', DSNParser => $dp);
+my $dbh = $sb->get_dbh_for('source');
+
+if ( !$dbh ) {
+   plan skip_all => 'Cannot connect to sandbox source';
+}
+else {
+   plan tests => 6;
+}
+
+my ($output, $exit_code);
+my $cnf = '/tmp/12345/my.sandbox.cnf';
+
+my $in   = "$trunk/t/pt-table-usage/samples/in";
+my $out  = "t/pt-table-usage/samples/out";
+
+$sb->do_as_root(
+   'source',
+   q/CREATE USER IF NOT EXISTS sha256_user@'%' IDENTIFIED WITH caching_sha2_password BY 'sha256_user%password' REQUIRE SSL/,
+   q/GRANT ALL ON sakila.* TO sha256_user@'%'/,
+);
+
+($output, $exit_code) = full_output(
+   sub { pt_table_usage::main("--explain-extended=F=$cnf,h=127.1,P=12345,D=sakila,u=sha256_user,p=sha256_user%password,s=0", 
+      '--query', 'select * from foo, bar where id=1') },
+   stderr => 1,
+);
+
+isnt(
+   $exit_code,
+   0,
+   "Error raised when SSL connection is not used"
+) or diag($output);
+
+like(
+   $output,
+   qr/Authentication plugin 'caching_sha2_password' reported error: Authentication requires secure connection./,
+   'Secure connection error raised when no SSL connection used'
+) or diag($output);
+
+($output, $exit_code) = full_output(
+   sub { pt_table_usage::main('--explain-extended', "F=$cnf,h=127.1,P=12345,D=sakila,u=sha256_user,p=sha256_user%password,s=1", 
+      '--query', 'select * from foo, bar where id=1') },
+   stderr => 1,
+);
+
+is(
+   $exit_code,
+   0,
+   "No error for user, identified with caching_sha2_password"
+) or diag($output);
+
+unlike(
+   $output,
+   qr/Authentication plugin 'caching_sha2_password' reported error: Authentication requires secure connection./,
+   'No secure connection error'
+) or diag($output);
+
+is(
+   $output,
+   "",
+   "No error if table doesn't exist"
+);
+# #############################################################################
+# Done.
+# #############################################################################
+$sb->do_as_root('source', q/DROP USER 'sha256_user'@'%'/);
+
+ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox");
+exit;
diff --git a/t/pt-upgrade/ssl.t b/t/pt-upgrade/ssl.t
new file mode 100644
index 000000000..4027eef7e
--- /dev/null
+++ b/t/pt-upgrade/ssl.t
@@ -0,0 +1,105 @@
+#!/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 File::Basename;
+use File::Temp qw(tempdir);
+
+$ENV{PERCONA_TOOLKIT_TEST_USE_DSN_NAMES} = 1; 
+$ENV{PRETTY_RESULTS} = 1; 
+
+use PerconaTest;
+use Sandbox;
+require "$trunk/bin/pt-upgrade";
+
+my $dp = new DSNParser(opts=>$dsn_opts);
+my $sb = new Sandbox(basedir => '/tmp', DSNParser => $dp);
+my $dbh1 = $sb->get_dbh_for('host1');
+
+
+if ( !$dbh1 ) {
+   plan skip_all => 'Cannot connect to sandbox host1'; 
+}
+
+my $host1_dsn   = $sb->dsn_for('host1');
+my $tmpdir      = tempdir("/tmp/pt-upgrade.$PID.XXXXXX", CLEANUP => 1);
+my $samples     = "$trunk/t/pt-upgrade/samples";
+my $lib_samples = "$trunk/t/lib/samples";
+my ($output, $exit_code);
+
+# #############################################################################
+# genlog
+# #############################################################################
+
+`rm -f /tmp/test_select_into_*.log`;
+
+$sb->do_as_root(
+   'host1',
+   q/CREATE USER IF NOT EXISTS sha256_user@'%' IDENTIFIED WITH caching_sha2_password BY 'sha256_user%password' REQUIRE SSL/,
+   q/GRANT ALL ON *.* TO sha256_user@'%'/,
+);
+
+($output, $exit_code) = full_output(
+   sub {
+      pt_upgrade::main("${host1_dsn},u=sha256_user,p=sha256_user%password,s=0", '--save-results', $tmpdir,
+         qw(--type rawlog),
+         "$samples/select_into.log",
+   )},
+   stderr => 1,
+);
+
+isnt(
+   $exit_code,
+   0,
+   "Error raised when SSL connection is not used"
+) or diag($output);
+
+like(
+   $output,
+   qr/Authentication plugin 'caching_sha2_password' reported error: Authentication requires secure connection./,
+   'Secure connection error raised when no SSL connection used'
+) or diag($output);
+
+($output, $exit_code) = full_output(
+   sub {
+      pt_upgrade::main("${host1_dsn},u=sha256_user,p=sha256_user%password,s=1", '--save-results', $tmpdir,
+         qw(--type rawlog),
+         "$samples/select_into.log",
+   )},
+   stderr => 1,
+);
+
+is(
+   $exit_code,
+   0,
+   "No error for user, identified with caching_sha2_password"
+) or diag($output);
+
+unlike(
+   $output,
+   qr/Authentication plugin 'caching_sha2_password' reported error: Authentication requires secure connection./,
+   'No secure connection error'
+) or diag($output);
+
+is(
+   $exit_code,
+   0,
+   "Does not fail on SELECT...INTO statements"
+);
+
+# #############################################################################
+# Done.
+# #############################################################################
+$sb->do_as_root('host1', q/DROP USER 'sha256_user'@'%'/);
+
+$sb->wipe_clean($dbh1);
+ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox");
+done_testing;
diff --git a/t/pt-variable-advisor/ssl.t b/t/pt-variable-advisor/ssl.t
new file mode 100644
index 000000000..1326ad3fa
--- /dev/null
+++ b/t/pt-variable-advisor/ssl.t
@@ -0,0 +1,87 @@
+#!/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-variable-advisor";
+
+my $dp  = new DSNParser(opts=>$dsn_opts);
+my $sb  = new Sandbox(basedir => '/tmp', DSNParser => $dp);
+my $dbh = $sb->get_dbh_for('source');
+my $dsn = $sb->dsn_for('source');
+
+if ( !$dbh ) {
+   plan skip_all => "Cannot connect to sandbox source";
+}
+
+# #############################################################################
+# https://bugs.launchpad.net/percona-toolkit/+bug/1168106
+# pt-variable-advisor has the wrong default value for
+# innodb_max_dirty_pages_pct in 5.6.10
+# #############################################################################
+
+$sb->do_as_root(
+   'source',
+   q/CREATE USER IF NOT EXISTS sha256_user@'%' IDENTIFIED WITH caching_sha2_password BY 'sha256_user%password' REQUIRE SSL/,
+   q/GRANT ALL ON sakila.* TO sha256_user@'%'/,
+);
+
+my ($output, $exit_code);
+
+($output, $exit_code) = full_output(
+   sub { pt_variable_advisor::main("${dsn},u=sha256_user,p=sha256_user%password,s=0") },
+   stderr => 1,
+);
+
+isnt(
+   $exit_code,
+   0,
+   "Error raised when SSL connection is not used"
+) or diag($output);
+
+like(
+   $output,
+   qr/Authentication plugin 'caching_sha2_password' reported error: Authentication requires secure connection./,
+   'Secure connection error raised when no SSL connection used'
+) or diag($output);
+
+($output, $exit_code) = full_output(
+   sub { pt_variable_advisor::main("${dsn},u=sha256_user,p=sha256_user%password,s=1") },
+   stderr => 1,
+);
+
+is(
+   $exit_code,
+   0,
+   "No error for user, identified with caching_sha2_password"
+) or diag($output);
+
+unlike(
+   $output,
+   qr/Authentication plugin 'caching_sha2_password' reported error: Authentication requires secure connection./,
+   'No secure connection error'
+) or diag($output);
+
+unlike(
+   $output,
+   qr/innodb_max_dirty_pages_pct/,
+   "No innodb_max_dirty_pages_pct warning (bug 1168106)"
+);
+
+# #############################################################################
+# Done.
+# #############################################################################
+$sb->do_as_root('source', q/DROP USER 'sha256_user'@'%'/);
+
+ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox");
+done_testing;
diff --git a/t/pt-visual-explain/samples/query.sql b/t/pt-visual-explain/samples/query.sql
new file mode 100644
index 000000000..9a5db543d
--- /dev/null
+++ b/t/pt-visual-explain/samples/query.sql
@@ -0,0 +1 @@
+SELECT * FROM sakila.actor where last_name LIKE 'MO%';
diff --git a/t/pt-visual-explain/ssl.t b/t/pt-visual-explain/ssl.t
new file mode 100644
index 000000000..7ff4adc48
--- /dev/null
+++ b/t/pt-visual-explain/ssl.t
@@ -0,0 +1,88 @@
+#!/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-visual-explain";
+
+my $dp   = new DSNParser(opts=>$dsn_opts);
+my $sb   = new Sandbox(basedir => '/tmp', DSNParser => $dp);
+my $dbh  = $sb->get_dbh_for('source');
+
+if ( !$dbh ) {
+   plan skip_all => 'Cannot connect to sandbox source';
+}
+
+my ($output, $exit_code);
+
+$sb->do_as_root(
+   'source',
+   q/CREATE USER IF NOT EXISTS sha256_user@'%' IDENTIFIED WITH caching_sha2_password BY 'sha256_user%password' REQUIRE SSL/,
+   q/GRANT ALL ON sakila.* TO sha256_user@'%'/,
+);
+
+($output, $exit_code) = full_output(
+   sub {
+      pt_visual_explain::main(
+         '--connect',
+         't/pt-visual-explain/samples/query.sql',
+         qw(--host=127.1 --port=12345 --user=sha256_user --password=sha256_user%password --mysql_ssl=0)
+      )
+   },
+   stderr => 1,
+);
+
+isnt(
+   $exit_code,
+   0,
+   "Error raised when SSL connection is not used"
+) or diag($output);
+
+like(
+   $output,
+   qr/Authentication plugin 'caching_sha2_password' reported error: Authentication requires secure connection./,
+   'Secure connection error raised when no SSL connection used'
+) or diag($output);
+
+($output, $exit_code) = full_output(
+   sub {
+      pt_visual_explain::main(
+         '--connect',
+         't/pt-visual-explain/samples/query.sql',
+         qw(--host=127.1 --port=12345 --user=sha256_user --password=sha256_user%password --mysql_ssl=1)
+      )
+   },
+   stderr => 1,
+);
+
+is(
+   $exit_code,
+   0,
+   "No error for user, identified with caching_sha2_password"
+) or diag($output);
+
+unlike(
+   $output,
+   qr/Authentication plugin 'caching_sha2_password' reported error: Authentication requires secure connection./,
+   'No secure connection error'
+) or diag($output);
+
+
+# #############################################################################
+# Done.
+# #############################################################################
+$sb->do_as_root('source', q/DROP USER 'sha256_user'@'%'/);
+
+$sb->wipe_clean($dbh);
+ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox");
+done_testing;
diff --git a/util/update-modules b/util/update-modules
index 65582cc88..bbba29580 100755
--- a/util/update-modules
+++ b/util/update-modules
@@ -182,6 +182,10 @@ for pkg in $pkgs; do
 done
 
 if [ $pkgs_updated -gt 0 ]; then
+   # Storing existing EXIT_STATUS, because tool should only fail copying resulting
+   # file if below code also fails. Previous errors should not affect copying.
+   es=$EXIT_STATUS
+   EXIT_STATUS=0
    if [ "$tool_lang" = "perl" ]; then
       update_tool_header $tmp_tool_file
       if [ $? -ne 0 ]; then
@@ -190,7 +194,7 @@ if [ $pkgs_updated -gt 0 ]; then
    fi
    if [ $EXIT_STATUS -eq 0 ]; then
       cp $tmp_tool_file $tool_file
-      EXIT_STATUS=$((EXIT_STATUS | $?))
+      EXIT_STATUS=$((es | $?))
       if [ $? -ne 0 ]; then
          warn "Failed to copy $tmp_tool_file to $tool_file"
       fi

From 1de149116a81f49afde70178e50855b3032c938d Mon Sep 17 00:00:00 2001
From: Sveta Smirnova <sveta.smirnova@percona.com>
Date: Fri, 20 Sep 2024 15:27:23 +0300
Subject: [PATCH 24/31] PT-2340 - Support MySQL 8.4

- Added tests for legacy style heartbeat and checksum tables
---
 bin/pt-heartbeat                              |  13 +-
 t/pt-heartbeat/heartbeat_table.t              | 130 ++++++++++++++++++
 ...e-table.sql => heartbeat-table-legacy.sql} |   0
 t/pt-heartbeat/samples/heartbeat-table.sql    |  11 ++
 t/pt-table-checksum/privs.t                   |  43 ++++++
 .../samples/privs-bug-916168-legacy.sql       |  22 +++
 6 files changed, 218 insertions(+), 1 deletion(-)
 create mode 100644 t/pt-heartbeat/heartbeat_table.t
 rename t/pt-heartbeat/samples/{precision-time-table.sql => heartbeat-table-legacy.sql} (100%)
 create mode 100644 t/pt-heartbeat/samples/heartbeat-table.sql
 create mode 100644 t/pt-table-checksum/samples/privs-bug-916168-legacy.sql

diff --git a/bin/pt-heartbeat b/bin/pt-heartbeat
index 5ed48dcc9..af30ed66a 100755
--- a/bin/pt-heartbeat
+++ b/bin/pt-heartbeat
@@ -6316,14 +6316,25 @@ sub main {
    die "Heartbeat table $db_tbl does not have a ts column"
       unless $tbl_struct->{is_col}->{ts};
 
+   my $deprecated_cols = 0;
+
    if ( $tbl_struct->{is_col}->{exec_master_log_file}
       && !$tbl_struct->{is_col}->{exec_source_log_file} ) {
-      $exec_source_log_pos_col = 'exec_master_log_file';
+      $relay_source_log_file_col = 'exec_master_log_file';
+      $deprecated_cols = 1;
    }
 
    if ( $tbl_struct->{is_col}->{exec_master_log_pos}
       && !$tbl_struct->{is_col}->{exec_source_log_pos} ) {
       $exec_source_log_pos_col = 'exec_master_log_pos';
+      $deprecated_cols = 1;
+   }
+
+   if ( $deprecated_cols ) {
+      warn "The current heartbeat table uses deprecated column names. Support for these names "
+      . "will be occasionally removed. Please update the table definition with command:\n"
+      . "ALTER TABLE `$db`.`$tbl` RENAME COLUMN exec_master_log_file TO exec_source_log_file, "
+      . "RENAME COLUMN exec_master_log_pos TO exec_source_log_pos;\n";
    }
 
    my $hires_ts = $tbl_struct->{type_for}->{ts} =~ m/char/i ? 1 : 0;
diff --git a/t/pt-heartbeat/heartbeat_table.t b/t/pt-heartbeat/heartbeat_table.t
new file mode 100644
index 000000000..c4e1e16bf
--- /dev/null
+++ b/t/pt-heartbeat/heartbeat_table.t
@@ -0,0 +1,130 @@
+#!/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 Data::Dumper;
+
+use PerconaTest;
+use Sandbox;
+require "$trunk/bin/pt-heartbeat";
+
+my $dp  = new DSNParser(opts=>$dsn_opts);
+my $sb  = new Sandbox(basedir => '/tmp', DSNParser => $dp);
+my $source_dbh = $sb->get_dbh_for('source');
+my $replica1_dbh = $sb->get_dbh_for('replica1');
+
+if ( !$source_dbh ) {
+   plan skip_all => 'Cannot connect to sandbox source';
+}
+elsif ( !$replica1_dbh ) {
+   plan skip_all => 'Cannot connect to sandbox replica1';
+}
+
+
+$sb->create_dbs($source_dbh, ['test']);
+
+my $output;
+my $cnf       = '/tmp/12345/my.sandbox.cnf';
+my $cmd       = "$trunk/bin/pt-heartbeat -F $cnf ";
+my $pid_file  = "/tmp/__pt-heartbeat-test.pid";
+my $sent_file = "/tmp/pt-heartbeat-sentinel";
+my $ps_grep_cmd = "ps x | grep pt-heartbeat | grep daemonize | grep -v grep";
+
+diag(`rm $sent_file 2>/dev/null`);
+
+# Loading heartbeat table
+$sb->load_file('source', 't/pt-heartbeat/samples/heartbeat-table.sql');
+
+# Start one daemonized instance to update it
+system("$cmd --daemonize -D test --update --run-time 3s --pid $pid_file 1>/dev/null 2>/dev/null");
+PerconaTest::wait_for_files($pid_file);
+$output = `$ps_grep_cmd`;
+like($output, qr/$cmd/, 'It is running');
+ok(-f $pid_file, 'PID file created');
+my ($pid) = $output =~ /^\s*(\d+)\s+/;
+$output = `cat $pid_file` if -f $pid_file;
+chomp($output);
+is($output, $pid, 'PID file has correct PID');
+
+$output = `$cmd -D test --monitor --run-time 1s --source-server-id 12345 2>&1`;
+if ( $output ) {
+   chomp ($output);
+   $output =~ s/\d/0/g;
+}
+is(
+   $output,
+   '0.00s [  0.00s,  0.00s,  0.00s ]',
+   'It is being updated',
+);
+unlike(
+   $output,
+   qr/The current checksum table uses deprecated column names./,
+   'Deprecation warning not printed'
+);
+
+PerconaTest::wait_until(sub { !-f $pid_file });
+
+$output = `$ps_grep_cmd`;
+chomp $output;
+unlike($output, qr/$cmd/, 'It is not running anymore');
+ok(! -f $pid_file, 'PID file removed');
+
+# Run again, create table with legacy structure, and check that the tool can work with it
+
+# Loading legacy heartbeat table
+$sb->load_file('source', 't/pt-heartbeat/samples/heartbeat-table-legacy.sql');
+
+# Start one daemonized instance to update it
+system("$cmd --daemonize -D test --update --run-time 3s --pid $pid_file 1>/dev/null 2>/dev/null");
+PerconaTest::wait_for_files($pid_file);
+$output = `$ps_grep_cmd`;
+like($output, qr/$cmd/, 'It is running');
+ok(-f $pid_file, 'PID file created');
+($pid) = $output =~ /^\s*(\d+)\s+/;
+$output = `cat $pid_file` if -f $pid_file;
+chomp($output);
+is($output, $pid, 'PID file has correct PID');
+
+$output = `$cmd -D test --monitor --run-time 1s --source-server-id 12345 2>&1`;
+if ( $output ) {
+   chomp ($output);
+   $output =~ s/\d/0/g;
+}
+
+like(
+   $output,
+   qr/0.00s \[  0.00s,  0.00s,  0.00s \]/,
+   'It is being updated',
+) or diag($output);
+
+like(
+   $output,
+   qr/The current heartbeat table uses deprecated column names./,
+   'Deprecation warning printed for legacy syntax'
+);
+
+PerconaTest::wait_until(sub { !-f $pid_file });
+
+$output = `$ps_grep_cmd`;
+chomp $output;
+unlike($output, qr/$cmd/, 'It is not running anymore');
+ok(! -f $pid_file, 'PID file removed');
+
+# #############################################################################
+# Done.
+# #############################################################################
+diag(`rm $pid_file $sent_file 2>/dev/null`);
+$sb->wipe_clean($source_dbh);
+# $sb->wipe_clean($replica1_dbh);
+ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox");
+
+done_testing;
+exit;
diff --git a/t/pt-heartbeat/samples/precision-time-table.sql b/t/pt-heartbeat/samples/heartbeat-table-legacy.sql
similarity index 100%
rename from t/pt-heartbeat/samples/precision-time-table.sql
rename to t/pt-heartbeat/samples/heartbeat-table-legacy.sql
diff --git a/t/pt-heartbeat/samples/heartbeat-table.sql b/t/pt-heartbeat/samples/heartbeat-table.sql
new file mode 100644
index 000000000..fa0e3ea00
--- /dev/null
+++ b/t/pt-heartbeat/samples/heartbeat-table.sql
@@ -0,0 +1,11 @@
+DROP DATABASE IF EXISTS test;
+CREATE DATABASE test;
+USE test;
+CREATE TABLE heartbeat (
+  ts                    varchar(26) NOT NULL,
+  server_id             int unsigned NOT NULL PRIMARY KEY,
+  file                  varchar(255) DEFAULT NULL,    -- SHOW MASTER STATUS
+  position              bigint unsigned DEFAULT NULL, -- SHOW MASTER STATUS
+  relay_source_log_file varchar(255) DEFAULT NULL,    -- SHOW SLAVE STATUS 
+  exec_source_log_pos   bigint unsigned DEFAULT NULL  -- SHOW SLAVE STATUS
+) ENGINE=MEMORY;
diff --git a/t/pt-table-checksum/privs.t b/t/pt-table-checksum/privs.t
index 184b926e6..5d853ccda 100644
--- a/t/pt-table-checksum/privs.t
+++ b/t/pt-table-checksum/privs.t
@@ -187,6 +187,49 @@ is(
    "test_user privs work (bug 916168)"
 );
 
+unlike(
+   $output,
+   qr/The current checksum table uses deprecated column names./,
+   'Deprecation warning not printed'
+);
+
+diag(`/tmp/12345/use -u root -e "drop user 'test_user'\@'%'"`);
+wait_until(
+   sub {
+      my $rows=$replica2_dbh->selectall_arrayref("SELECT user FROM mysql.user");
+      return !grep { ($_->[0] || '') eq 'test_user' } @$rows;
+   }
+);
+
+# #############################################################################
+# Legacy checksum table
+# #############################################################################
+diag(`/tmp/12345/use -u root < $trunk/t/pt-table-checksum/samples/privs-bug-916168-legacy.sql`);
+
+$output = output(
+   sub { $exit_status = pt_table_checksum::main(@args,
+      "$source_dsn,u=test_user,p=foo", qw(-t sakila.country)) },
+   stderr => 1,
+);
+
+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,
+   "test_user privs work (bug 916168)"
+);
+
+like(
+   $output,
+   qr/The current checksum table uses deprecated column names./,
+   'Deprecation warning printed for legacy table'
+);
+
 diag(`/tmp/12345/use -u root -e "drop user 'test_user'\@'%'"`);
 wait_until(
    sub {
diff --git a/t/pt-table-checksum/samples/privs-bug-916168-legacy.sql b/t/pt-table-checksum/samples/privs-bug-916168-legacy.sql
new file mode 100644
index 000000000..0fcb2af49
--- /dev/null
+++ b/t/pt-table-checksum/samples/privs-bug-916168-legacy.sql
@@ -0,0 +1,22 @@
+CREATE USER 'test_user'@'%' identified by 'foo';
+grant select, replication slave, replication client, super, process on *.* to 'test_user'@'%';
+grant all on percona.* to 'test_user'@'%';
+create database if not exists percona;
+use percona;
+drop table if exists checksums;
+CREATE TABLE `checksums` (
+  `db` char(64) NOT NULL,
+  `tbl` char(64) NOT NULL,
+  `chunk` int(11) NOT NULL,
+  `chunk_time` float DEFAULT NULL,
+  `chunk_index` varchar(200) DEFAULT NULL,
+  `lower_boundary` text,
+  `upper_boundary` text,
+  `this_crc` char(40) NOT NULL,
+  `this_cnt` int(11) NOT NULL,
+  `master_crc` char(40) DEFAULT NULL,
+  `master_cnt` int(11) DEFAULT NULL,
+  `ts` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+  PRIMARY KEY (`db`,`tbl`,`chunk`),
+  KEY `ts_db_tbl` (`ts`,`db`,`tbl`)
+) ENGINE=InnoDB;

From 33086769a1bfb794bd7bfe096270358659af8a5e Mon Sep 17 00:00:00 2001
From: Sveta Smirnova <sveta.smirnova@percona.com>
Date: Tue, 24 Sep 2024 03:04:46 +0300
Subject: [PATCH 25/31] PT-2340 - Support MySQL 8.4

- Added test for replica lag check for pt-archiver
- Re-added deprecated slave- options
- Added tests for deprecation warnings and for legacy options for pt-archiver
- Removed practically not supported options --replica-user and --replica-password from pt-archiver, pt-kill, pt-query-digest
- Added legacy source/replica options (master/slave) variants and tests for pt-heartbeat, pt-online-schema-change, pt-replica-find, pt-replica-restart, pt-table-checksum, pt-table-sync
- Updated modules after lib/MasterSlave.pm change
---
 bin/pt-archiver                           |  40 +--
 bin/pt-heartbeat                          |  63 ++++-
 bin/pt-kill                               |  24 +-
 bin/pt-online-schema-change               |  67 ++++-
 bin/pt-query-digest                       |  24 +-
 bin/pt-replica-find                       |  38 ++-
 bin/pt-replica-restart                    |  69 +++++-
 bin/pt-table-checksum                     |  81 +++++-
 bin/pt-table-sync                         |  83 ++++++-
 lib/MasterSlave.pm                        |   8 +-
 t/pt-archiver/archive_using_channels.t    |  28 ++-
 t/pt-archiver/replica_lag.t               | 261 ++++++++++++++++++++
 t/pt-heartbeat/multi_update_mode.t        |  58 ++++-
 t/pt-heartbeat/replica_user.t             | 162 ++++++++++++
 t/pt-online-schema-change/slave_lag.t     | 168 ++++++++++++-
 t/pt-replica-find/pt-replica-find.t       |  73 ++++--
 t/pt-replica-find/pt-slave-find.t         |  81 ++++--
 t/pt-replica-restart/gtid.t               |  46 ++++
 t/pt-replica-restart/pt-replica-restart.t | 102 ++++++++
 t/pt-replica-restart/pt-slave-restart.t   |  98 ++++++++
 t/pt-replica-restart/until.t              | 286 ++++++++++++++++++++++
 t/pt-table-checksum/basics.t              |  76 +++++-
 t/pt-table-checksum/bugs.t                |  31 ++-
 t/pt-table-checksum/issue_1651002.t       |  41 +++-
 t/pt-table-checksum/pt-1637.t             |   4 +-
 t/pt-table-checksum/throttle.t            |  39 ++-
 t/pt-table-sync/basics.t                  |  41 +++-
 t/pt-table-sync/master_master.t           |  92 ++++++-
 t/pt-table-sync/safety_checks.t           |  77 +++++-
 29 files changed, 2122 insertions(+), 139 deletions(-)
 create mode 100644 t/pt-archiver/replica_lag.t
 create mode 100644 t/pt-heartbeat/replica_user.t
 create mode 100644 t/pt-replica-restart/until.t

diff --git a/bin/pt-archiver b/bin/pt-archiver
index 26d4c40d4..b511e957f 100755
--- a/bin/pt-archiver
+++ b/bin/pt-archiver
@@ -3707,19 +3707,19 @@ sub get_replicas {
       $self->recurse_to_replicas(
          {  dbh              => $dbh,
             dsn              => $dsn,
-            replica_user     => $o->got('replica-user') ? $o->get('replica-user') : '',
-            replica_password => $o->got('replica-password') ? $o->get('replica-password') : '',
+            replica_user     => ( $o->got('replica-user') or $o->got('slave-user') ) ? $o->get('replica-user') : '',
+            replica_password => ( $o->got('replica-password') or $o->got('slave-password') ) ? $o->get('replica-password') : '',
             replicas         => $args{replicas},
             callback  => sub {
                my ( $dsn, $dbh, $level, $parent ) = @_;
                return unless $level;
                PTDEBUG && _d('Found replica:', $dp->as_string($dsn));
                my $replica_dsn = $dsn;
-               if ($o->got('replica-user')) {
+               if ( $o->got('replica-user') or $o->got('slave-user') ) {
                   $replica_dsn->{u} = $o->get('replica-user');
                   PTDEBUG && _d("Using replica user ".$o->get('replica-user')." on ".$replica_dsn->{h}.":".$replica_dsn->{P});
                }
-               if ($o->got('replica-password')) {
+               if ( $o->got('replica-password') or $o->got('slave-password') ) {
                   $replica_dsn->{p} = $o->get('replica-password');
                   PTDEBUG && _d("Replica password set");
                }
@@ -6360,6 +6360,15 @@ sub main {
    $o->get_specs();
    $o->get_opts();
 
+   # Deprecated options
+   if ( my $slaves = $o->get('check-slave-lag') ) {
+      warn "Option --check-slave-lag is deprecated and will be removed in future versions. Use --check-replica-lag instead.";
+      if ( my $replicas = $o->get('check-replica-lag')) {
+         push(@$slaves, @$replicas);
+      }
+      $o->set('check-replica-lag', $slaves);
+   }
+
    my $dp = $o->DSNParser();
    $dp->prop('set-vars', $o->set_vars());
 
@@ -7906,6 +7915,13 @@ type: string; repeatable: yes
 Pause archiving until the specified DSN's replica lag is less than L<"--max-lag">.
 This option can be specified multiple times for checking more than one replica.
 
+=item --check-slave-lag
+
+type: string; repeatable: yes
+
+This option is deprecated and will be removed in future releases.
+Use L<"--check-replica-lag"> instead.
+
 =item --columns
 
 short form: -c; type: array
@@ -8329,22 +8345,6 @@ stop archiving and exit.  The default is /tmp/pt-archiver-sentinel.  You
 might find this handy to stop cron jobs gracefully if necessary.  See also
 L<"--stop">.
 
-=item --replica-user
-
-type: string
-
-Sets the user to be used to connect to the replicas.
-This parameter allows you to have a different user with less privileges on the
-replicas but that user must exist on all replicas.
-
-=item --replica-password
-
-type: string
-
-Sets the password to be used to connect to the replicas.
-It can be used with --replica-user and the password for the user must be the same
-on all replicas.
-
 =item --set-vars
 
 type: Array
diff --git a/bin/pt-heartbeat b/bin/pt-heartbeat
index af30ed66a..c04db3e1c 100755
--- a/bin/pt-heartbeat
+++ b/bin/pt-heartbeat
@@ -168,19 +168,19 @@ sub get_replicas {
       $self->recurse_to_replicas(
          {  dbh              => $dbh,
             dsn              => $dsn,
-            replica_user     => $o->got('replica-user') ? $o->get('replica-user') : '',
-            replica_password => $o->got('replica-password') ? $o->get('replica-password') : '',
+            replica_user     => ( $o->got('replica-user') or $o->got('slave-user') ) ? $o->get('replica-user') : '',
+            replica_password => ( $o->got('replica-password') or $o->got('slave-password') ) ? $o->get('replica-password') : '',
             replicas         => $args{replicas},
             callback  => sub {
                my ( $dsn, $dbh, $level, $parent ) = @_;
                return unless $level;
                PTDEBUG && _d('Found replica:', $dp->as_string($dsn));
                my $replica_dsn = $dsn;
-               if ($o->got('replica-user')) {
+               if ( $o->got('replica-user') or $o->got('slave-user') ) {
                   $replica_dsn->{u} = $o->get('replica-user');
                   PTDEBUG && _d("Using replica user ".$o->get('replica-user')." on ".$replica_dsn->{h}.":".$replica_dsn->{P});
                }
-               if ($o->got('replica-password')) {
+               if ( $o->got('replica-password') or $o->got('slave-password') ) {
                   $replica_dsn->{p} = $o->get('replica-password');
                   PTDEBUG && _d("Replica password set");
                }
@@ -6117,6 +6117,35 @@ sub main {
    $o->get_specs();
    $o->get_opts();
 
+   # Deprecated options
+   if ( $o->got('print-master-server-id') ) {
+      warn "Option --print-master-server-id is deprecated and will be removed in future versions. Use --print-source-server-id instead.";
+      if ( !$o->got('print-source-server-id') ) {
+         $o->set('print-source-server-id', $o->get('print-master-server-id'));
+      }
+   }
+
+   if ( $o->got('master-server-id') ) {
+      warn "Option --master-server-id is deprecated and will be removed in future versions. Use --source-server-id instead.";
+      if ( !$o->got('source-server-id') ) {
+         $o->set('source-server-id', $o->get('master-server-id'));
+      }
+   }
+
+   if ( $o->got('slave-user') ) {
+      warn "Option --slave-user is deprecated and will be removed in future versions. Use --replica-user instead.";
+      if ( !$o->got('replica-user') ) {
+         $o->set('replica-user', $o->get('slave-user'));
+      }
+   }
+
+   if ( $o->got('slave-password') ) {
+      warn "Option --slave-password is deprecated and will be removed in future versions. Use --replica-password instead.";
+      if ( !$o->got('replica-password') ) {
+         $o->set('replica-password', $o->get('slave-password'));
+      }
+   }
+
    my $dp = $o->DSNParser;
    $dp->prop('dbidriver', $o->get('dbi-driver'));
    $dp->prop('set-vars', $o->set_vars());
@@ -7285,6 +7314,13 @@ type: string
 
 Print all output to this file when daemonized.
 
+=item --master-server-id
+
+type: string
+
+This option is deprecated and will be removed in future releases.
+Use L<"--source-server-id"> instead.
+
 =item --source-server-id
 
 type: string
@@ -7334,6 +7370,11 @@ short form: -P; type: int
 
 Port number to use for connection.
 
+=item --print-master-server-id
+
+This option is deprecated and will be removed in future releases.
+Use L<"--print-source-server-id"> instead.
+
 =item --print-source-server-id
 
 Print the auto-detected or given L<"--source-server-id">.  If L<"--check">
@@ -7400,6 +7441,20 @@ type: string; default: /tmp/pt-heartbeat-sentinel
 
 Exit if this file exists.
 
+=item --slave-user
+
+type: string
+
+This option is deprecated and will be removed in future releases.
+Use L<"--replica-user"> instead.
+
+=item --slave-password
+
+type: string
+
+This option is deprecated and will be removed in future releases.
+Use L<"--replica-password"> instead.
+
 =item --replica-user
 
 type: string
diff --git a/bin/pt-kill b/bin/pt-kill
index 7a6f3d918..639b32a5c 100755
--- a/bin/pt-kill
+++ b/bin/pt-kill
@@ -3984,19 +3984,19 @@ sub get_replicas {
       $self->recurse_to_replicas(
          {  dbh              => $dbh,
             dsn              => $dsn,
-            replica_user     => $o->got('replica-user') ? $o->get('replica-user') : '',
-            replica_password => $o->got('replica-password') ? $o->get('replica-password') : '',
+            replica_user     => ( $o->got('replica-user') or $o->got('slave-user') ) ? $o->get('replica-user') : '',
+            replica_password => ( $o->got('replica-password') or $o->got('slave-password') ) ? $o->get('replica-password') : '',
             replicas         => $args{replicas},
             callback  => sub {
                my ( $dsn, $dbh, $level, $parent ) = @_;
                return unless $level;
                PTDEBUG && _d('Found replica:', $dp->as_string($dsn));
                my $replica_dsn = $dsn;
-               if ($o->got('replica-user')) {
+               if ( $o->got('replica-user') or $o->got('slave-user') ) {
                   $replica_dsn->{u} = $o->get('replica-user');
                   PTDEBUG && _d("Using replica user ".$o->get('replica-user')." on ".$replica_dsn->{h}.":".$replica_dsn->{P});
                }
-               if ($o->got('replica-password')) {
+               if ( $o->got('replica-password') or $o->got('slave-password') ) {
                   $replica_dsn->{p} = $o->get('replica-password');
                   PTDEBUG && _d("Replica password set");
                }
@@ -8320,22 +8320,6 @@ The presence of the file specified by L<"--sentinel"> will cause all
 running instances of pt-kill to exit.  You might find this handy to stop cron
 jobs gracefully if necessary.  See also L<"--stop">.
 
-=item --replica-user
-
-type: string
-
-Sets the user to be used to connect to the replicas.
-This parameter allows you to have a different user with less privileges on the
-replicas but that user must exist on all replicas.
-
-=item --replica-password
-
-type: string
-
-Sets the password to be used to connect to the replicas.
-It can be used with --replica-user and the password for the user must be the same
-on all replicas.
-
 =item --set-vars
 
 type: Array
diff --git a/bin/pt-online-schema-change b/bin/pt-online-schema-change
index 0d985f5da..c1296fb64 100755
--- a/bin/pt-online-schema-change
+++ b/bin/pt-online-schema-change
@@ -4272,19 +4272,19 @@ sub get_replicas {
       $self->recurse_to_replicas(
          {  dbh              => $dbh,
             dsn              => $dsn,
-            replica_user     => $o->got('replica-user') ? $o->get('replica-user') : '',
-            replica_password => $o->got('replica-password') ? $o->get('replica-password') : '',
+            replica_user     => ( $o->got('replica-user') or $o->got('slave-user') ) ? $o->get('replica-user') : '',
+            replica_password => ( $o->got('replica-password') or $o->got('slave-password') ) ? $o->get('replica-password') : '',
             replicas         => $args{replicas},
             callback  => sub {
                my ( $dsn, $dbh, $level, $parent ) = @_;
                return unless $level;
                PTDEBUG && _d('Found replica:', $dp->as_string($dsn));
                my $replica_dsn = $dsn;
-               if ($o->got('replica-user')) {
+               if ( $o->got('replica-user') or $o->got('slave-user') ) {
                   $replica_dsn->{u} = $o->get('replica-user');
                   PTDEBUG && _d("Using replica user ".$o->get('replica-user')." on ".$replica_dsn->{h}.":".$replica_dsn->{P});
                }
-               if ($o->got('replica-password')) {
+               if ( $o->got('replica-password') or $o->got('slave-password') ) {
                   $replica_dsn->{p} = $o->get('replica-password');
                   PTDEBUG && _d("Replica password set");
                }
@@ -8713,6 +8713,37 @@ sub main {
    $o->get_specs();
    $o->get_opts();
 
+   # Deprecated options
+   if ( my $slaves = $o->get('check-slave-lag') ) {
+      warn "Option --check-slave-lag is deprecated and will be removed in future versions. Use --check-replica-lag instead.";
+      if ( my $replicas = $o->get('check-replica-lag') ) {
+         push(@$slaves, @$replicas);
+      }
+      $o->set('check-replica-lag', $slaves);
+   }
+
+   if ( my $slaves = $o->get('skip-check-slave-lag') ) {
+      warn "Option --skip-check-slave-lag is deprecated and will be removed in future versions. Use --skip-check-replica-lag instead.";
+      if ( my $replicas = $o->get('skip-check-replica-lag') ) {
+         push(@$slaves, @$replicas);
+      }
+      $o->set('skip-check-replica-lag', $slaves);
+   }
+
+   if ( $o->got('slave-user') ) {
+      warn "Option --slave-user is deprecated and will be removed in future versions. Use --replica-user instead.";
+      if ( !$o->got('replica-user') ) {
+         $o->set('replica-user', $o->get('slave-user'));
+      }
+   }
+
+   if ( $o->got('slave-password') ) {
+      warn "Option --slave-password is deprecated and will be removed in future versions. Use --replica-password instead.";
+      if ( !$o->got('replica-password') ) {
+         $o->set('replica-password', $o->get('slave-password'));
+      }
+   }
+
    if ( $o->get('null-to-not-null') ) {
       $ignore_code{1048} = 1;
    }
@@ -13008,6 +13039,13 @@ If you don't want to monitor ALL replicas, but you want more than just one
 replica to be monitored, then use the DSN option to the L<"--recursion-method">
 option instead of this option.
 
+=item --check-slave-lag
+
+type: string
+
+This option is deprecated and will be removed in future releases.
+Use L<"--check-replica-lag"> instead.
+
 =item --chunk-index
 
 type: string
@@ -13558,6 +13596,27 @@ Example: --skip-check-replica-lag h=127.0.0.1,P=12345 --skip-check-replica-lag h
 Please take into consideration that even when for the MySQL driver h=127.1 is equal to h=127.0.0.1,
 for this parameter you need to specify the full IP address.
 
+=item --skip-check-slave-lag
+
+type: DSN; repeatable: yes
+
+This option is deprecated and will be removed in future releases.
+Use L<"--skip-check-replica-lag"> instead.
+
+=item --slave-user
+
+type: string
+
+This option is deprecated and will be removed in future releases.
+Use L<"--replica-user"> instead.
+
+=item --slave-password
+
+type: string
+
+This option is deprecated and will be removed in future releases.
+Use L<"--replica-password"> instead.
+
 =item --replica-user
 
 type: string
diff --git a/bin/pt-query-digest b/bin/pt-query-digest
index 7dd3e57a8..c4d3a78e9 100755
--- a/bin/pt-query-digest
+++ b/bin/pt-query-digest
@@ -10578,19 +10578,19 @@ sub get_replicas {
       $self->recurse_to_replicas(
          {  dbh              => $dbh,
             dsn              => $dsn,
-            replica_user     => $o->got('replica-user') ? $o->get('replica-user') : '',
-            replica_password => $o->got('replica-password') ? $o->get('replica-password') : '',
+            replica_user     => ( $o->got('replica-user') or $o->got('slave-user') ) ? $o->get('replica-user') : '',
+            replica_password => ( $o->got('replica-password') or $o->got('slave-password') ) ? $o->get('replica-password') : '',
             replicas         => $args{replicas},
             callback  => sub {
                my ( $dsn, $dbh, $level, $parent ) = @_;
                return unless $level;
                PTDEBUG && _d('Found replica:', $dp->as_string($dsn));
                my $replica_dsn = $dsn;
-               if ($o->got('replica-user')) {
+               if ( $o->got('replica-user') or $o->got('slave-user') ) {
                   $replica_dsn->{u} = $o->get('replica-user');
                   PTDEBUG && _d("Using replica user ".$o->get('replica-user')." on ".$replica_dsn->{h}.":".$replica_dsn->{P});
                }
-               if ($o->got('replica-password')) {
+               if ( $o->got('replica-password') or $o->got('slave-password') ) {
                   $replica_dsn->{p} = $o->get('replica-password');
                   PTDEBUG && _d("Replica password set");
                }
@@ -16569,22 +16569,6 @@ queries.  A complete example:
 
   pt-query-digest --sample 2 --no-report --output slowlog slow.log
 
-=item --replica-user
-
-type: string
-
-Sets the user to be used to connect to the replicas.
-This parameter allows you to have a different user with less privileges on the
-replicas but that user must exist on all replicas.
-
-=item --replica-password
-
-type: string
-
-Sets the password to be used to connect to the replicas.
-It can be used with --replica-user and the password for the user must be the same
-on all replicas.
-
 =item --set-vars
 
 type: Array
diff --git a/bin/pt-replica-find b/bin/pt-replica-find
index be5bd8188..c6b58836a 100755
--- a/bin/pt-replica-find
+++ b/bin/pt-replica-find
@@ -2309,19 +2309,19 @@ sub get_replicas {
       $self->recurse_to_replicas(
          {  dbh              => $dbh,
             dsn              => $dsn,
-            replica_user     => $o->got('replica-user') ? $o->get('replica-user') : '',
-            replica_password => $o->got('replica-password') ? $o->get('replica-password') : '',
+            replica_user     => ( $o->got('replica-user') or $o->got('slave-user') ) ? $o->get('replica-user') : '',
+            replica_password => ( $o->got('replica-password') or $o->got('slave-password') ) ? $o->get('replica-password') : '',
             replicas         => $args{replicas},
             callback  => sub {
                my ( $dsn, $dbh, $level, $parent ) = @_;
                return unless $level;
                PTDEBUG && _d('Found replica:', $dp->as_string($dsn));
                my $replica_dsn = $dsn;
-               if ($o->got('replica-user')) {
+               if ( $o->got('replica-user') or $o->got('slave-user') ) {
                   $replica_dsn->{u} = $o->get('replica-user');
                   PTDEBUG && _d("Using replica user ".$o->get('replica-user')." on ".$replica_dsn->{h}.":".$replica_dsn->{P});
                }
-               if ($o->got('replica-password')) {
+               if ( $o->got('replica-password') or $o->got('slave-password') ) {
                   $replica_dsn->{p} = $o->get('replica-password');
                   PTDEBUG && _d("Replica password set");
                }
@@ -4060,6 +4060,20 @@ sub main {
    $o->get_specs();
    $o->get_opts();
 
+   if ( $o->got('slave-user') ) {
+      warn "Option --slave-user is deprecated and will be removed in future versions. Use --replica-user instead.";
+      if ( !$o->got('replica-user') ) {
+         $o->set('replica-user', $o->get('slave-user'));
+      }
+   }
+
+   if ( $o->got('slave-password') ) {
+      warn "Option --slave-password is deprecated and will be removed in future versions. Use --replica-password instead.";
+      if ( !$o->got('replica-password') ) {
+         $o->set('replica-password', $o->get('slave-password'));
+      }
+   }
+
    my $dp = $o->DSNParser();
    $dp->prop('set-vars', $o->set_vars());
 
@@ -4117,6 +4131,8 @@ sub main {
    $ms->recurse_to_replicas(
       {  dbh      => $dbh,
          dsn      => $master_dsn,
+         replica_user     => ( $o->got('replica-user') or $o->got('slave-user') ) ? $o->get('replica-user') : '',
+         replica_password => ( $o->got('replica-password') or $o->got('slave-password') ) ? $o->get('replica-password') : '',
          callback => sub {
             my ( $dsn, $dbh, $level, $parent ) = @_;
             if ( !$parent ) {
@@ -4567,6 +4583,20 @@ Example:
 
 Might delay runtime a few seconds.
 
+=item --slave-user
+
+type: string
+
+This option is deprecated and will be removed in future releases.
+Use L<"--replica-user"> instead.
+
+=item --slave-password
+
+type: string
+
+This option is deprecated and will be removed in future releases.
+Use L<"--replica-password"> instead.
+
 =item --replica-user
 
 type: string
diff --git a/bin/pt-replica-restart b/bin/pt-replica-restart
index 790a33539..481f728f5 100755
--- a/bin/pt-replica-restart
+++ b/bin/pt-replica-restart
@@ -2720,19 +2720,19 @@ sub get_replicas {
       $self->recurse_to_replicas(
          {  dbh              => $dbh,
             dsn              => $dsn,
-            replica_user     => $o->got('replica-user') ? $o->get('replica-user') : '',
-            replica_password => $o->got('replica-password') ? $o->get('replica-password') : '',
+            replica_user     => ( $o->got('replica-user') or $o->got('slave-user') ) ? $o->get('replica-user') : '',
+            replica_password => ( $o->got('replica-password') or $o->got('slave-password') ) ? $o->get('replica-password') : '',
             replicas         => $args{replicas},
             callback  => sub {
                my ( $dsn, $dbh, $level, $parent ) = @_;
                return unless $level;
                PTDEBUG && _d('Found replica:', $dp->as_string($dsn));
                my $replica_dsn = $dsn;
-               if ($o->got('replica-user')) {
+               if ( $o->got('replica-user') or $o->got('slave-user') ) {
                   $replica_dsn->{u} = $o->get('replica-user');
                   PTDEBUG && _d("Using replica user ".$o->get('replica-user')." on ".$replica_dsn->{h}.":".$replica_dsn->{P});
                }
-               if ($o->got('replica-password')) {
+               if ( $o->got('replica-password') or $o->got('slave-password') ) {
                   $replica_dsn->{p} = $o->get('replica-password');
                   PTDEBUG && _d("Replica password set");
                }
@@ -5234,6 +5234,35 @@ sub main {
    $o->get_specs();
    $o->get_opts();
 
+   # Deprecated options
+   if ( $o->got('master-uuid') ) {
+      warn "Option --master-uuid is deprecated and will be removed in future versions. Use --source-uuid instead.";
+      if ( !$o->got('source-uuid') ) {
+         $o->set('source-uuid', $o->get('master-uuid'));
+      }
+   }
+
+   if ( $o->got('until-master') ) {
+      warn "Option --until-master is deprecated and will be removed in future versions. Use --until-source instead.";
+      if ( !$o->got('until-source') ) {
+         $o->set('until-source', $o->get('until-master'));
+      }
+   }
+
+   if ( $o->got('slave-user') ) {
+      warn "Option --slave-user is deprecated and will be removed in future versions. Use --replica-user instead.";
+      if ( !$o->got('replica-user') ) {
+         $o->set('replica-user', $o->get('slave-user'));
+      }
+   }
+
+   if ( $o->got('slave-password') ) {
+      warn "Option --slave-password is deprecated and will be removed in future versions. Use --replica-password instead.";
+      if ( !$o->got('replica-password') ) {
+         $o->set('replica-password', $o->get('slave-password'));
+      }
+   }
+
    $dp = $o->DSNParser();
    $dp->prop('set-vars', $o->set_vars());
 
@@ -5614,7 +5643,7 @@ sub watch_server {
          $stat->{last_error}        ||= '';
          $stat->{last_errno}        ||= 0;
 
-         if ( $o->get('until-source') && pos_ge($stat, $source_name, $source_name) ) {
+         if ( $o->get('until-source') && pos_ge($stat, 'source', $source_name) ) {
             die "Replica has advanced past " . $o->get('until-source')
                . " on master.\n";
          }
@@ -5731,7 +5760,7 @@ sub watch_server {
 sub pos_ge {
    my ( $stat, $which, $source_name ) = @_;
    my $fmt  = '%s/%020d';
-   my $curr = $which eq $source_name
+   my $curr = $which eq 'source'
       ? sprintf($fmt, @{$stat}{("relay_${source_name}_log_file", "exec_${source_name}_log_pos")})
       : sprintf($fmt, @{$stat}{qw(relay_log_file relay_log_pos)});
    my $stop = sprintf($fmt, split(',', $o->get("until-$which")));
@@ -6006,6 +6035,13 @@ type: string
 
 Print all output to this file when daemonized.
 
+=item --master-uuid
+
+type: string
+
+This option is deprecated and will be removed in future releases.
+Use L<"--source-user"> instead.
+
 =item --max-sleep
 
 type: float; default: 64
@@ -6113,6 +6149,20 @@ type: string; default: /tmp/pt-replica-restart-sentinel
 
 Exit if this file exists.
 
+=item --slave-user
+
+type: string
+
+This option is deprecated and will be removed in future releases.
+Use L<"--replica-user"> instead.
+
+=item --slave-password
+
+type: string
+
+This option is deprecated and will be removed in future releases.
+Use L<"--replica-password"> instead.
+
 =item --replica-user
 
 type: string
@@ -6212,6 +6262,13 @@ same C<cron> job).
 
 See also L<"--sentinel">.
 
+=item --until-master
+
+type: string
+
+This option is deprecated and will be removed in future releases.
+Use L<"--until-source"> instead.
+
 =item --until-source
 
 type: string
diff --git a/bin/pt-table-checksum b/bin/pt-table-checksum
index 62fa8ee39..1693e5e2b 100755
--- a/bin/pt-table-checksum
+++ b/bin/pt-table-checksum
@@ -5227,19 +5227,19 @@ sub get_replicas {
       $self->recurse_to_replicas(
          {  dbh              => $dbh,
             dsn              => $dsn,
-            replica_user     => $o->got('replica-user') ? $o->get('replica-user') : '',
-            replica_password => $o->got('replica-password') ? $o->get('replica-password') : '',
+            replica_user     => ( $o->got('replica-user') or $o->got('slave-user') ) ? $o->get('replica-user') : '',
+            replica_password => ( $o->got('replica-password') or $o->got('slave-password') ) ? $o->get('replica-password') : '',
             replicas         => $args{replicas},
             callback  => sub {
                my ( $dsn, $dbh, $level, $parent ) = @_;
                return unless $level;
                PTDEBUG && _d('Found replica:', $dp->as_string($dsn));
                my $replica_dsn = $dsn;
-               if ($o->got('replica-user')) {
+               if ( $o->got('replica-user') or $o->got('slave-user') ) {
                   $replica_dsn->{u} = $o->get('replica-user');
                   PTDEBUG && _d("Using replica user ".$o->get('replica-user')." on ".$replica_dsn->{h}.":".$replica_dsn->{P});
                }
-               if ($o->got('replica-password')) {
+               if ( $o->got('replica-password') or $o->got('slave-password') ) {
                   $replica_dsn->{p} = $o->get('replica-password');
                   PTDEBUG && _d("Replica password set");
                }
@@ -10183,6 +10183,44 @@ sub main {
    $o->get_specs();
    $o->get_opts();
 
+   # Deprecated options
+   if ( my $slaves = $o->get('check-slave-lag') ) {
+      warn "Option --check-slave-lag is deprecated and will be removed in future versions. Use --check-replica-lag instead.";
+      if ( my $replicas = $o->get('check-replica-lag') ) {
+         push(@$slaves, @$replicas);
+      }
+      $o->set('check-replica-lag', $slaves);
+   }
+
+   if ( my $slaves = $o->get('skip-check-slave-lag') ) {
+      warn "Option --skip-check-slave-lag is deprecated and will be removed in future versions. Use --skip-check-replica-lag instead.";
+      if ( my $replicas = $o->get('skip-check-replica-lag') ) {
+         push(@$slaves, @$replicas);
+      }
+      $o->set('skip-check-replica-lag', $slaves);
+   }
+
+   if ( $o->got('check-slave-tables') ) {
+      warn "Option --[no]check-slave-tables is deprecated and will be removed in future versions. Use --[no]check-replica-tables instead.";
+      if ( !$o->got('check-replica-tables') ) {
+         $o->set('check-replica-tables', $o->get('check-slave-tables'));
+      }
+   }
+
+   if ( $o->got('slave-user') ) {
+      warn "Option --slave-user is deprecated and will be removed in future versions. Use --replica-user instead.";
+      if ( !$o->got('replica-user') ) {
+         $o->set('replica-user', $o->get('slave-user'));
+      }
+   }
+
+   if ( $o->got('slave-password') ) {
+      warn "Option --slave-password is deprecated and will be removed in future versions. Use --replica-password instead.";
+      if ( !$o->got('replica-password') ) {
+         $o->set('replica-password', $o->get('slave-password'));
+      }
+   }
+
    my $dp = $o->DSNParser();
    $dp->prop('set-vars', $o->set_vars());
 
@@ -13406,6 +13444,20 @@ cause the tool to break replication when it tries to check for differences.
 Only disable this check if you are aware of the risks and are sure that all
 tables on all replicas exist and are identical to the source.
 
+=item --check-slave-lag
+
+type: string
+
+This option is deprecated and will be removed in future releases.
+Use L<"--check-replica-lag"> instead.
+
+=item --[no]check-slave-tables
+
+default: yes; group: Safety
+
+This option is deprecated and will be removed in future releases.
+Use L<"--[no]check-replica-tables"> instead.
+
 =item --chunk-index
 
 type: string
@@ -13983,6 +14035,27 @@ type: DSN; repeatable: yes
 DSN to skip when checking replica lag. It can be used multiple times.
 Example: C<--skip-check-replica-lag h=127.1,P=12345 --skip-check-replica-lag h=127.1,P=12346>
 
+=item --skip-check-slave-lag
+
+type: DSN; repeatable: yes
+
+This option is deprecated and will be removed in future releases.
+Use L<"--skip-check-replica-lag"> instead.
+
+=item --slave-user
+
+type: string
+
+This option is deprecated and will be removed in future releases.
+Use L<"--replica-user"> instead.
+
+=item --slave-password
+
+type: string
+
+This option is deprecated and will be removed in future releases.
+Use L<"--replica-password"> instead.
+
 =item --replica-user
 
 type: string
diff --git a/bin/pt-table-sync b/bin/pt-table-sync
index 4a85f9061..9b2bce925 100755
--- a/bin/pt-table-sync
+++ b/bin/pt-table-sync
@@ -6738,19 +6738,19 @@ sub get_replicas {
       $self->recurse_to_replicas(
          {  dbh              => $dbh,
             dsn              => $dsn,
-            replica_user     => $o->got('replica-user') ? $o->get('replica-user') : '',
-            replica_password => $o->got('replica-password') ? $o->get('replica-password') : '',
+            replica_user     => ( $o->got('replica-user') or $o->got('slave-user') ) ? $o->get('replica-user') : '',
+            replica_password => ( $o->got('replica-password') or $o->got('slave-password') ) ? $o->get('replica-password') : '',
             replicas         => $args{replicas},
             callback  => sub {
                my ( $dsn, $dbh, $level, $parent ) = @_;
                return unless $level;
                PTDEBUG && _d('Found replica:', $dp->as_string($dsn));
                my $replica_dsn = $dsn;
-               if ($o->got('replica-user')) {
+               if ( $o->got('replica-user') or $o->got('slave-user') ) {
                   $replica_dsn->{u} = $o->get('replica-user');
                   PTDEBUG && _d("Using replica user ".$o->get('replica-user')." on ".$replica_dsn->{h}.":".$replica_dsn->{P});
                }
-               if ($o->got('replica-password')) {
+               if ( $o->got('replica-password') or $o->got('slave-password') ) {
                   $replica_dsn->{p} = $o->get('replica-password');
                   PTDEBUG && _d("Replica password set");
                }
@@ -7056,8 +7056,10 @@ sub is_source_of {
          . $replica_status->{"${source_name}_user"};
    }
 
-   if ( ($replica_status->{replica_io_state} || '')
-      eq 'Waiting for ${source_name} to send event' )
+   if ( ( ($replica_status->{replica_io_state} || '')
+      eq 'Waiting for source to send event' )
+   || ( ($replica_status->{replica_io_state} || '')
+      eq 'Waiting for master to send event' ) )
    {
       my ( $source_log_name, $source_log_num )
          = $source_status->{file} =~ m/^(.*?)\.0*([1-9][0-9]*)$/;
@@ -10154,6 +10156,42 @@ sub main {
    $o->get_specs();
    $o->get_opts();
 
+   # Deprecated options
+   if ( $o->got('check-master') ) {
+      warn "Option --[no]check-master is deprecated and will be removed in future versions. Use --check-source instead.";
+      if ( !$o->got('check-source') ) {
+         $o->set('check-source', $o->get('check-master'));
+      }
+   }
+   
+   if ( $o->got('check-slave') ) {
+      warn "Option --[no]check-slave is deprecated and will be removed in future versions. Use --check-replica instead.";
+      if ( !$o->got('check-replica') ) {
+         $o->set('check-replica', $o->get('check-slave'));
+      }
+   }
+
+   if ( $o->got('sync-to-master') ) {
+      warn "Option --sync-to-master is deprecated and will be removed in future versions. Use --sync-to-source instead.";
+      if ( !$o->got('sync-to-source') ) {
+         $o->set('sync-to-source', $o->get('sync-to-master'));
+      }
+   }
+
+   if ( $o->got('slave-user') ) {
+      warn "Option --slave-user is deprecated and will be removed in future versions. Use --replica-user instead.";
+      if ( !$o->got('replica-user') ) {
+         $o->set('replica-user', $o->get('slave-user'));
+      }
+   }
+
+   if ( $o->got('slave-password') ) {
+      warn "Option --slave-password is deprecated and will be removed in future versions. Use --replica-password instead.";
+      if ( !$o->got('replica-password') ) {
+         $o->set('replica-password', $o->get('slave-password'));
+      }
+   }
+
    my $dp = $o->DSNParser();
    $dp->prop('set-vars', $o->set_vars());
 
@@ -12514,6 +12552,20 @@ The error message only prints the first child table found with an
 C<ON DELETE CASCADE>, C<ON UPDATE CASCADE>, or C<ON UPDATE SET NULL>
 foreign key constraint.  There could be other affected child tables.
 
+=item --[no]check-master
+
+default: yes
+
+This option is deprecated and will be removed in future releases.
+Use L<"--[no]check-source"> instead.
+
+=item --[no]check-slave
+
+This option is deprecated and will be removed in future releases.
+Use L<"--[no]check-replica"> instead.
+
+default: yes
+
 =item --[no]check-source
 
 default: yes
@@ -12965,6 +13017,20 @@ The tool will examine server B's copy of the table.  If it looks like server B's
 data in table C<test.tbl1> is different from server A's copy, the tool will not
 sync that table on servers C and D.
 
+=item --slave-user
+
+type: string
+
+This option is deprecated and will be removed in future releases.
+Use L<"--replica-user"> instead.
+
+=item --slave-password
+
+type: string
+
+This option is deprecated and will be removed in future releases.
+Use L<"--replica-password"> instead.
+
 =item --replica-user
 
 type: string
@@ -13005,6 +13071,11 @@ short form: -S; type: string
 
 Socket file to use for connection.
 
+=item --sync-to-master
+
+This option is deprecated and will be removed in future releases.
+Use L<"--sync-to-source"> instead.
+
 =item --sync-to-source
 
 Treat the DSN as a replica and sync it to its source.
diff --git a/lib/MasterSlave.pm b/lib/MasterSlave.pm
index ece8beac5..4c92c2d25 100644
--- a/lib/MasterSlave.pm
+++ b/lib/MasterSlave.pm
@@ -85,19 +85,19 @@ sub get_replicas {
       $self->recurse_to_replicas(
          {  dbh              => $dbh,
             dsn              => $dsn,
-            replica_user     => $o->got('replica-user') ? $o->get('replica-user') : '',
-            replica_password => $o->got('replica-password') ? $o->get('replica-password') : '',
+            replica_user     => ( $o->got('replica-user') or $o->got('slave-user') ) ? $o->get('replica-user') : '',
+            replica_password => ( $o->got('replica-password') or $o->got('slave-password') ) ? $o->get('replica-password') : '',
             replicas         => $args{replicas},
             callback  => sub {
                my ( $dsn, $dbh, $level, $parent ) = @_;
                return unless $level;
                PTDEBUG && _d('Found replica:', $dp->as_string($dsn));
                my $replica_dsn = $dsn;
-               if ($o->got('replica-user')) {
+               if ( $o->got('replica-user') or $o->got('slave-user') ) {
                   $replica_dsn->{u} = $o->get('replica-user');
                   PTDEBUG && _d("Using replica user ".$o->get('replica-user')." on ".$replica_dsn->{h}.":".$replica_dsn->{P});
                }
-               if ($o->got('replica-password')) {
+               if ( $o->got('replica-password') or $o->got('slave-password') ) {
                   $replica_dsn->{p} = $o->get('replica-password');
                   PTDEBUG && _d("Replica password set");
                }
diff --git a/t/pt-archiver/archive_using_channels.t b/t/pt-archiver/archive_using_channels.t
index 2a4019fdd..6fdfc2f5e 100644
--- a/t/pt-archiver/archive_using_channels.t
+++ b/t/pt-archiver/archive_using_channels.t
@@ -28,7 +28,7 @@ elsif ( !$replica_dbh ) {
 } elsif ($sandbox_version lt '5.7') {
    plan skip_all => 'Only on MySQL 5.7+';
 } else {
-   plan tests => 5;
+   plan tests => 8;
 }
 
 my ($source1_dbh, $source1_dsn) = $sb->start_sandbox(
@@ -95,6 +95,32 @@ like (
     'Message saying channel name must be specified'
 ) or diag($output);
 
+# Legacy option --check-slave-lag
+@args = ('--source', $source1_dsn.',D=test,t=t1', '--purge', '--where', sprintf('id >= %d', $num_rows / 2), "--check-slave-lag", $replica1_dsn);
+
+$output = output(
+   sub { $exit_status = pt_archiver::main(@args) },
+   stderr => 1,
+);
+
+isnt(
+    $exit_status,
+    0,
+    'Must specify a channel name',
+);
+
+like (
+    $output,
+    qr/"channel" was not specified/,
+    'Message saying channel name must be specified'
+) or diag($output);
+
+like(
+   $output,
+   qr/Option --check-slave-lag is deprecated and will be removed in future versions./,
+   'Deprecation warning printed'
+) or diag($output);
+
 push @args, ('--channel', 'sourcechan1');
 
 output(
diff --git a/t/pt-archiver/replica_lag.t b/t/pt-archiver/replica_lag.t
new file mode 100644
index 000000000..28a0dac12
--- /dev/null
+++ b/t/pt-archiver/replica_lag.t
@@ -0,0 +1,261 @@
+#!/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 Time::HiRes qw(time);
+
+use PerconaTest;
+use Sandbox;
+use Data::Dumper;
+require "$trunk/bin/pt-archiver";
+
+my $dp  = new DSNParser(opts=>$dsn_opts);
+my $sb  = new Sandbox(basedir => '/tmp', DSNParser => $dp);
+my $source_dbh = $sb->get_dbh_for('source');
+my $replica1_dbh = $sb->get_dbh_for('replica1');
+
+if ( !$source_dbh ) {
+   plan skip_all => 'Cannot connect to sandbox source';
+}
+elsif ( !$replica1_dbh ) {
+   plan skip_all => 'Cannot connect to sandbox replica1';
+}
+
+my $output;
+my $cnf  = "/tmp/12345/my.sandbox.cnf";
+my @args = qw(--no-delete --where 1=1 --progress 1 --no-check-charset);
+my $delay = 10;
+
+# Prepare tables and replica lag
+sub prepare {
+   $replica1_dbh->do("STOP ${replica_name}");
+   $source_dbh->do("RESET ${source_reset}");
+   $replica1_dbh->do("RESET ${replica_name}");
+   $replica1_dbh->do("START ${replica_name}");
+
+   $source_dbh->do("DROP DATABASE IF EXISTS test");
+   $source_dbh->do("CREATE DATABASE test");
+   $source_dbh->do("CREATE TABLE test.test(id INT)");
+   $source_dbh->do("CREATE TABLE test.actor LIKE sakila.actor");
+
+   $replica1_dbh->do("STOP ${replica_name}");
+   $replica1_dbh->do("CHANGE ${source_change} TO ${source_name}_DELAY=${delay}");
+   $replica1_dbh->do("START ${replica_name}");
+   $source_dbh->do("INSERT INTO test.test VALUES(1)");
+
+   # Sleeping to ensure that replica is lagging when pt-archiver starts
+   sleep(3);
+}
+
+prepare();
+
+$output = output(
+   sub {
+      pt_archiver::main(@args,
+         '--source', "D=sakila,t=actor,F=$cnf",
+         '--dest', "D=test,t=actor,F=$cnf",
+         '--check-replica-lag', 'h=127.0.0.1,P=12346,u=msandbox,p=msandbox'
+      )
+   },
+   stderr => 1
+);
+
+like(
+   $output,
+   qr/Sleeping: slave lag for server/,
+   'Lag check works'
+) or diag($output);
+
+unlike(
+   $output,
+   qr/Option --check-slave-lag is deprecated and will be removed in future versions./,
+   'Deprecation warning not printed for option --check-replica-lag'
+) or diag($output);
+
+# Option --check-replica-lag specified two times
+
+prepare();
+
+$output = output(
+   sub {
+      pt_archiver::main(@args,
+         '--source', "D=sakila,t=actor,F=$cnf",
+         '--dest', "D=test,t=actor,F=$cnf",
+         '--check-replica-lag', 'h=127.0.0.1,P=12346,u=msandbox,p=msandbox',
+         '--check-replica-lag', 'h=127.0.0.1,P=12347,u=msandbox,p=msandbox'
+      )
+   },
+   stderr => 1
+);
+
+like(
+   $output,
+   qr/Sleeping: slave lag for server/,
+   'Lag check works when --check-replica-lag provided two times'
+) or diag($output);
+
+unlike(
+   $output,
+   qr/Option --check-slave-lag is deprecated and will be removed in future versions./,
+   'Deprecation warning not printed when option --check-replica-lag provided two times'
+) or diag($output);
+
+# Option --check-replica-lag specified two times
+
+prepare();
+
+$output = output(
+   sub {
+      pt_archiver::main(@args,
+         '--source', "D=sakila,t=actor,F=$cnf",
+         '--dest', "D=test,t=actor,F=$cnf",
+         '--check-replica-lag', 'h=127.0.0.1,P=12347,u=msandbox,p=msandbox',
+         '--check-replica-lag', 'h=127.0.0.1,P=12346,u=msandbox,p=msandbox'
+      )
+   },
+   stderr => 1
+);
+
+like(
+   $output,
+   qr/Sleeping: slave lag for server/,
+   'Test 2: Lag check works when --check-replica-lag provided two times'
+) or diag($output);
+
+unlike(
+   $output,
+   qr/Option --check-slave-lag is deprecated and will be removed in future versions./,
+   'Test 2: Deprecation warning not printed when option --check-replica-lag provided two times'
+) or diag($output);
+
+# Warning printed for --check-slave-lag but the option works
+
+prepare();
+
+$output = output(
+   sub {
+      pt_archiver::main(@args,
+         '--source', "D=sakila,t=actor,F=$cnf",
+         '--dest', "D=test,t=actor,F=$cnf",
+         '--check-slave-lag', 'h=127.0.0.1,P=12346,u=msandbox,p=msandbox'
+      )
+   },
+   stderr => 1
+);
+
+like(
+   $output,
+   qr/Sleeping: slave lag for server/,
+   'Lag check works for deprecated option'
+) or diag($output);
+
+like(
+   $output,
+   qr/Option --check-slave-lag is deprecated and will be removed in future versions./,
+   'Deprecation warning printed for --check-slave-lag'
+) or diag($output);
+
+# Option --check-slave-lag specified two times
+
+prepare();
+
+$output = output(
+   sub {
+      pt_archiver::main(@args,
+         '--source', "D=sakila,t=actor,F=$cnf",
+         '--dest', "D=test,t=actor,F=$cnf",
+         '--check-slave-lag', 'h=127.0.0.1,P=12346,u=msandbox,p=msandbox',
+         '--check-slave-lag', 'h=127.0.0.1,P=12347,u=msandbox,p=msandbox'
+      )
+   },
+   stderr => 1
+);
+
+like(
+   $output,
+   qr/Sleeping: slave lag for server/,
+   'Lag check works when option --check-slave-lag provided two times'
+) or diag($output);
+
+like(
+   $output,
+   qr/Option --check-slave-lag is deprecated and will be removed in future versions./,
+   'Deprecation warning printed for option --check-slave-lag provided two times'
+) or diag($output);
+
+# Mix of --check-slave-lag amd --check-replica-lag options
+
+prepare();
+
+$output = output(
+   sub {
+      pt_archiver::main(@args,
+         '--source', "D=sakila,t=actor,F=$cnf",
+         '--dest', "D=test,t=actor,F=$cnf",
+         '--check-replica-lag', 'h=127.0.0.1,P=12346,u=msandbox,p=msandbox',
+         '--check-slave-lag', 'h=127.0.0.1,P=12347,u=msandbox,p=msandbox'
+      )
+   },
+   stderr => 1
+);
+
+like(
+   $output,
+   qr/Sleeping: slave lag for server/,
+   'Lag check works for --check-replica-lag when --check-slave-lag also provided'
+) or diag($output);
+
+like(
+   $output,
+   qr/Option --check-slave-lag is deprecated and will be removed in future versions./,
+   'Deprecation warning printed for option --check-slave-lag'
+) or diag($output);
+
+# Mix of --check-slave-lag amd --check-replica-lag options
+
+prepare();
+
+$output = output(
+   sub {
+      pt_archiver::main(@args,
+         '--source', "D=sakila,t=actor,F=$cnf",
+         '--dest', "D=test,t=actor,F=$cnf",
+         '--check-slave-lag', 'h=127.0.0.1,P=12346,u=msandbox,p=msandbox',
+         '--check-replica-lag', 'h=127.0.0.1,P=12347,u=msandbox,p=msandbox'
+      )
+   },
+   stderr => 1
+);
+
+like(
+   $output,
+   qr/Sleeping: slave lag for server/,
+   'Lag check works for --check-slave-lag when --check-replica-lag also provided'
+) or diag($output);
+
+like(
+   $output,
+   qr/Option --check-slave-lag is deprecated and will be removed in future versions./,
+   'Deprecation warning printed for option --check-slave-lag'
+) or diag($output);
+
+# #############################################################################
+# Done.
+# #############################################################################
+$replica1_dbh->do("STOP ${replica_name}");
+$source_dbh->do("RESET ${source_reset}");
+$replica1_dbh->do("RESET ${replica_name}");
+$replica1_dbh->do("START ${replica_name}");
+
+$sb->wipe_clean($source_dbh);
+ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox");
+
+done_testing;
diff --git a/t/pt-heartbeat/multi_update_mode.t b/t/pt-heartbeat/multi_update_mode.t
index 5d69a49b3..cf08bb1c0 100644
--- a/t/pt-heartbeat/multi_update_mode.t
+++ b/t/pt-heartbeat/multi_update_mode.t
@@ -32,7 +32,7 @@ elsif ( !$replica2_dbh ) {
    plan skip_all => 'Cannot connect to sandbox replica2';
 }
 else {
-   plan tests => 29;
+   plan tests => 35;
 }
 
 diag(`rm -rf /tmp/pt-heartbeat-sentinel >/dev/null 2>&1`);
@@ -196,9 +196,28 @@ like(
    "--check 12347, automatic source server_id"
 ) or diag($output);
 
+$output = output(
+   sub { pt_heartbeat::main(qw(-h 127.1 -P 12347 -u msandbox -p msandbox),
+      qw(-D test --check --print-master-server-id)) },
+   stderr => 1
+);
+
+like(
+   $output,
+   qr/0\.\d\d\s+12346\n/,
+   "--check 12347, automatic source server_id with legacy option"
+) or diag($output);
+
+like(
+   $output,
+   qr/Option --print-master-server-id is deprecated and will be removed in future versions./,
+   'Deprecation warning printed for option --print-master-server-id'
+) or diag($output);
+
 $output = output(
    sub { pt_heartbeat::main(qw(-h 127.1 -P 12347 -u msandbox -p msandbox),
       qw(-D test --check --print-source-server-id --source-server-id 12346)) },
+   stderr => 1
 );
 
 like(
@@ -207,6 +226,43 @@ like(
    "--check 12347 from --source-server-id 12346"
 );
 
+$output = output(
+   sub { pt_heartbeat::main(qw(-h 127.1 -P 12347 -u msandbox -p msandbox),
+      qw(-D test --check --print-source-server-id --master-server-id 12346)) },
+   stderr => 1
+);
+
+like(
+   $output,
+   qr/0\.\d\d\s+12346\n/,
+   "--check 12347 from --master-server-id 12346"
+) or diag($output);
+
+like(
+   $output,
+   qr/Option --master-server-id is deprecated and will be removed in future versions./,
+   'Deprecation warning printed for option --master-server-id'
+) or diag($output);
+
+$output = output(
+   sub { pt_heartbeat::main(qw(-h 127.1 -P 12347 -u msandbox -p msandbox),
+      qw(-D test --check --print-source-server-id --master-server-id 12346),
+      qw( --source-server-id 12345)) },
+   stderr => 1
+);
+
+like(
+   $output,
+   qr/0\.\d\d\s+12345\n/,
+   "--check 12347 from --source-server-id 12345 regardless of --master-server-id 12346"
+);
+
+like(
+   $output,
+   qr/Option --master-server-id is deprecated and will be removed in future versions./,
+   'Deprecation warning printed for option --master-server-id'
+) or diag($output);
+
 $output = output(
    sub { pt_heartbeat::main(qw(-h 127.1 -P 12347 -u msandbox -p msandbox),
       qw(-D test --check --print-source-server-id --source-server-id 12345)) },
diff --git a/t/pt-heartbeat/replica_user.t b/t/pt-heartbeat/replica_user.t
new file mode 100644
index 000000000..995f34272
--- /dev/null
+++ b/t/pt-heartbeat/replica_user.t
@@ -0,0 +1,162 @@
+#!/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;
+use SqlModes;
+require "$trunk/bin/pt-heartbeat";
+
+my $dp  = new DSNParser(opts=>$dsn_opts);
+my $sb  = new Sandbox(basedir => '/tmp', DSNParser => $dp);
+my $source_dbh = $sb->get_dbh_for('source');
+my $replica1_dbh = $sb->get_dbh_for('replica1');
+
+if ( !$source_dbh ) {
+   plan skip_all => 'Cannot connect to sandbox source';
+}
+elsif ( !$replica1_dbh ) {
+   plan skip_all => 'Cannot connect to sandbox replica1';
+}
+
+my $cnf  = "/tmp/12345/my.sandbox.cnf";
+my ($output, $exit_code);
+my $rows;
+
+$source_dbh->do('CREATE DATABASE IF NOT EXISTS test');
+
+# Create a new user that is going to be replicated on replicas.
+if ($sandbox_version eq '8.0') {
+    $sb->do_as_root("replica1", q/CREATE USER 'replica_user'@'localhost' IDENTIFIED WITH mysql_native_password BY 'replica_password'/);
+} else {
+    $sb->do_as_root("replica1", q/CREATE USER 'replica_user'@'localhost' IDENTIFIED BY 'replica_password'/);
+}
+$sb->do_as_root("replica1", q/GRANT REPLICATION CLIENT ON *.* TO 'replica_user'@'localhost'/);
+$sb->do_as_root("replica1", q/FLUSH PRIVILEGES/);                
+
+$sb->wait_for_replicas();
+
+# Ensure we cannot connect to replicas using standard credentials
+# Since replica2 is a replica of replica1, removing the user from the replica1 will remove
+# the user also from replica2
+$sb->do_as_root("replica1", q/RENAME USER 'msandbox'@'%' TO 'msandbox_old'@'%'/);
+$sb->do_as_root("replica1", q/FLUSH PRIVILEGES/);
+$sb->do_as_root("replica1", q/FLUSH TABLES/);
+
+($output, $exit_code) = full_output(
+   sub {
+      pt_heartbeat::main(
+         qw(-h 127.1 -u msandbox -p msandbox -P 12345 --database test),
+         qw(--table heartbeat --create-table --update --interval 0.5  --run-time 2), 
+         qw(--replica-user replica_user --replica-password replica_password)
+      )
+   },
+   stderr => 1,
+);
+
+is(
+   $exit_code,
+   0,
+   "pt-heartbeat finished correctly"
+) or diag($output);
+ 
+$rows = `/tmp/12346/use -u root -s -e "select server_id from test.heartbeat"`;
+
+chomp $rows;
+
+is(
+   $rows,
+   12345,
+   "Replica1 has source heartbeat",
+);
+
+unlike(
+   $output,
+   qr/Option --slave-user is deprecated and will be removed in future versions./,
+   'Deprecation warning not printed when option --replica-user provided'
+) or diag($output);
+
+unlike(
+   $output,
+   qr/Option --slave-password is deprecated and will be removed in future versions./,
+   'Deprecation warning not printed when option --replica-password provided'
+) or diag($output);
+
+$source_dbh->do('TRUNCATE TABLE test.heartbeat');
+
+$rows = `/tmp/12346/use -u root -s -e "select count(*) from test.heartbeat"`;
+
+chomp $rows;
+
+is(
+   $rows,
+   0,
+   'Heartbeat table truncated on replica'
+);
+
+($output, $exit_code) = full_output(
+   sub {
+      pt_heartbeat::main(
+         qw(-h 127.1 -u msandbox -p msandbox -P 12345 --database test),
+         qw(--table heartbeat --create-table --update --interval 0.5  --run-time 2), 
+         qw(--slave-user replica_user --slave-password replica_password)
+      )
+   },
+   stderr => 1,
+);
+
+is(
+   $exit_code,
+   0,
+   "pt-heartbeat finished correctly"
+) or diag($output);
+ 
+$rows = `/tmp/12346/use -u root -s -e "select server_id from test.heartbeat"`;
+
+chomp $rows;
+
+is(
+   $rows,
+   12345,
+   "Replica1 has source heartbeat",
+);
+
+like(
+   $output,
+   qr/Option --slave-user is deprecated and will be removed in future versions./,
+   'Deprecation warning printed when option --slave-user provided'
+) or diag($output);
+
+like(
+   $output,
+   qr/Option --slave-password is deprecated and will be removed in future versions./,
+   'Deprecation warning printed when option --slave-password provided'
+) or diag($output);
+
+# #############################################################################
+# Done.
+# #############################################################################
+# Drop test user
+$sb->do_as_root("replica1", q/DROP USER 'replica_user'@'localhost'/);
+$sb->do_as_root("replica1", q/FLUSH PRIVILEGES/);
+
+# Restore privilegs for the other test files
+$sb->do_as_root("replica1", q/RENAME USER 'msandbox_old'@'%' TO 'msandbox'@'%'/);
+$sb->do_as_root("source", q/FLUSH PRIVILEGES/);                
+$sb->do_as_root("source", q/FLUSH TABLES/);
+
+$sb->wipe_clean($source_dbh);
+
+ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox");
+
+done_testing;
+exit;
diff --git a/t/pt-online-schema-change/slave_lag.t b/t/pt-online-schema-change/slave_lag.t
index be880aeca..3a758a9ca 100644
--- a/t/pt-online-schema-change/slave_lag.t
+++ b/t/pt-online-schema-change/slave_lag.t
@@ -36,7 +36,7 @@ my $sb = new Sandbox(basedir => '/tmp', DSNParser => $dp);
 if ($sb->is_cluster_mode) {
     plan skip_all => 'Not for PXC';
 } else {
-    plan tests => 6;
+    plan tests => 18;
 }                                  
 my $source_dbh = $sb->get_dbh_for('source');
 my $replica_dbh = $sb->get_dbh_for('replica1');
@@ -97,7 +97,7 @@ like(
       $output,
       qr/Replica lag is \d+ seconds on .*  Waiting/s,
       "Base test waits on the correct replica",
-);
+) or diag($output);
 
 # Repeat the test now using --check-replica-lag
 $args = "$source_dsn,D=test,t=pt178 --execute --chunk-size 1 --max-lag $max_lag --alter 'ENGINE=InnoDB' "
@@ -120,6 +120,39 @@ like(
       "--check-replica-lag waits on the correct replica",
 );
 
+unlike(
+   $output,
+   qr/Option --check-slave-lag is deprecated and will be removed in future versions./,
+   'Deprecation warning not printed when option --check-replica-lag provided'
+) or diag($output);
+
+# Repeat the test now using deprecated --check-slave-lag
+$args = "$source_dsn,D=test,t=pt178 --execute --chunk-size 1 --max-lag $max_lag --alter 'ENGINE=InnoDB' "
+      . "--check-slave-lag h=127.0.0.1,P=12346,u=msandbox,p=msandbox,D=test,t=sbtest --pid $tmp_file_name --progress time,5";
+
+# Run a full table scan query to ensure the replica is behind the source
+reset_query_cache($source_dbh, $source_dbh);
+# Update one row so replica is delayed
+$source_dbh->do('UPDATE `test`.`pt178` SET f2 = f2 + 1 LIMIT 1');
+$source_dbh->do('UPDATE `test`.`pt178` SET f2 = f2 + 1 WHERE f1 = ""');
+
+# We need to sleep, otherwise pt-osc can finish before replica is delayed
+sleep($max_lag);
+diag("Starting deprecated --check-slave-lag test. This is going to take some time due to the delay in the replica");
+$output = `$trunk/bin/pt-online-schema-change $args 2>&1`;
+
+like(
+      $output,
+      qr/Replica lag is \d+ seconds on .*  Waiting/s,
+      "--check-slave-lag waits on the correct replica",
+);
+
+like(
+   $output,
+   qr/Option --check-slave-lag is deprecated and will be removed in future versions./,
+   'Deprecation warning printed when option --check-slave-lag provided'
+) or diag($output);
+
 # Repeat the test new adding and removing a replica during the process
 $args = "$source_dsn,D=test,t=pt178 --execute --chunk-size 1 --max-lag $max_lag --alter 'ENGINE=InnoDB' "
       . "--recursion-method=dsn=D=test,t=dynamic_replicas --recurse 0 --pid $tmp_file_name --progress time,5";
@@ -188,6 +221,137 @@ unlike(
       "--skip-check-replica-lag is really skipping the replica",
 );
 
+unlike(
+   $output,
+   qr/Option --skip-check-slave-lag is deprecated and will be removed in future versions./,
+   'Deprecation warning not printed when option --skip-check-replica-lag provided'
+) or diag($output);
+
+# Repeat the test now using deprecated --skip-check-slave-lag
+# Run a full table scan query to ensure the replica is behind the source
+reset_query_cache($source_dbh, $source_dbh);
+# Update one row so replica is delayed
+$source_dbh->do('UPDATE `test`.`pt178` SET f2 = f2 + 1 LIMIT 1');
+$source_dbh->do('UPDATE `test`.`pt178` SET f2 = f2 + 1 WHERE f1 = ""');
+
+# We need to sleep, otherwise pt-osc can finish before replica is delayed
+sleep($max_lag);
+$args = "$source_dsn,D=test,t=pt178 --execute --chunk-size 1 --max-lag $max_lag --alter 'ENGINE=InnoDB' "
+      . "--skip-check-slave-lag h=127.0.0.1,P=12346,u=msandbox,p=msandbox,D=test,t=sbtest --pid $tmp_file_name --progress time,5";
+
+diag("Starting deprecated --skip-check-slave-lag test. This is going to take some time due to the delay in the replica");
+$output = `$trunk/bin/pt-online-schema-change $args 2>&1`;
+
+unlike(
+      $output,
+      qr/Replica lag is \d+ seconds on .*:12346.  Waiting/s,
+      "--skip-check-slave-lag is really skipping the replica",
+);
+
+like(
+   $output,
+   qr/Option --skip-check-slave-lag is deprecated and will be removed in future versions./,
+   'Deprecation warning printed when option --skip-check-slave-lag provided'
+) or diag($output);
+
+# Test --replica-user and --replica-password
+
+# Create a new user that is going to be replicated on replicas.
+if ($sandbox_version eq '8.0') {
+    $sb->do_as_root("replica1", q/CREATE USER 'replica_user'@'localhost' IDENTIFIED WITH mysql_native_password BY 'replica_password'/);
+} else {
+    $sb->do_as_root("replica1", q/CREATE USER 'replica_user'@'localhost' IDENTIFIED BY 'replica_password'/);
+}
+$sb->do_as_root("replica1", q/GRANT REPLICATION CLIENT ON *.* TO 'replica_user'@'localhost'/);
+$sb->do_as_root("replica1", q/GRANT REPLICATION SLAVE ON *.* TO 'replica_user'@'localhost'/);
+$sb->do_as_root("replica1", q/FLUSH PRIVILEGES/);                
+
+$sb->wait_for_replicas();
+
+# Ensure we cannot connect to replicas using standard credentials
+# Since replica2 is a replica of replica1, removing the user from the replica1 will remove
+# the user also from replica2
+$sb->do_as_root("replica1", q/RENAME USER 'msandbox'@'%' TO 'msandbox_old'@'%'/);
+$sb->do_as_root("replica1", q/FLUSH PRIVILEGES/);
+$sb->do_as_root("replica1", q/FLUSH TABLES/);
+
+# Repeat the basic test with --replica-user and --replica-password
+# Run a full table scan query to ensure the replica is behind the source
+reset_query_cache($source_dbh, $source_dbh);
+# Update one row so replica is delayed
+$source_dbh->do('UPDATE `test`.`pt178` SET f2 = f2 + 1 LIMIT 1');
+$source_dbh->do('UPDATE `test`.`pt178` SET f2 = f2 + 1 WHERE f1 = ""');
+
+# We need to sleep, otherwise pt-osc can finish before replica is delayed
+sleep($max_lag);
+$args = "$source_dsn,D=test,t=pt178 --execute --chunk-size 10 --max-lag $max_lag --alter 'ENGINE=InnoDB' "
+      . "--pid $tmp_file_name --progress time,5 "
+      . "--replica-user replica_user --replica-password replica_password";
+
+diag("Starting basic test with --replica-user and --replica-password. This is going to take some time due to the delay in the replica");
+$output = `$trunk/bin/pt-online-schema-change $args 2>&1`;
+
+like(
+      $output,
+      qr/Replica lag is \d+ seconds on .*:12346.  Waiting/s,
+      "Basic test waits on the correct replica with --replica-user and --replica-password",
+) or diag($output);
+
+unlike(
+   $output,
+   qr/Option --slave-user is deprecated and will be removed in future versions./,
+   'Deprecation warning not printed for option --replica-user'
+) or diag($output);
+
+unlike(
+   $output,
+   qr/Option --slave-password is deprecated and will be removed in future versions./,
+   'Deprecation warning not printed for option --replica-password'
+) or diag($output);
+
+# Repeat the basic test with deprecated --slave-user and --slave-password
+# Run a full table scan query to ensure the replica is behind the source
+reset_query_cache($source_dbh, $source_dbh);
+# Update one row so replica is delayed
+$source_dbh->do('UPDATE `test`.`pt178` SET f2 = f2 + 1 LIMIT 1');
+$source_dbh->do('UPDATE `test`.`pt178` SET f2 = f2 + 1 WHERE f1 = ""');
+
+# We need to sleep, otherwise pt-osc can finish before replica is delayed
+sleep($max_lag);
+$args = "$source_dsn,D=test,t=pt178 --execute --chunk-size 10 --max-lag $max_lag --alter 'ENGINE=InnoDB' "
+      . "--pid $tmp_file_name --progress time,5 "
+      . "--slave-user replica_user --slave-password replica_password";
+
+diag("Starting basic test with deprecated --slave-user and --slave-password. This is going to take some time due to the delay in the replica");
+$output = `$trunk/bin/pt-online-schema-change $args 2>&1`;
+
+like(
+      $output,
+      qr/Replica lag is \d+ seconds on .*:12346.  Waiting/s,
+      "Basic test waits on the correct replica with --slave-user and --slave-password",
+) or diag($output);
+
+like(
+   $output,
+   qr/Option --slave-user is deprecated and will be removed in future versions./,
+   'Deprecation warning printed for option --slave-user'
+) or diag($output);
+
+like(
+   $output,
+   qr/Option --slave-password is deprecated and will be removed in future versions./,
+   'Deprecation warning printed for option --slave-password'
+) or diag($output);
+
+# Drop test user
+$sb->do_as_root("replica1", q/DROP USER 'replica_user'@'localhost'/);
+$sb->do_as_root("replica1", q/FLUSH PRIVILEGES/);
+
+# Restore privilegs for the other tests
+$sb->do_as_root("replica1", q/RENAME USER 'msandbox_old'@'%' TO 'msandbox'@'%'/);
+$sb->do_as_root("source", q/FLUSH PRIVILEGES/);                
+$sb->do_as_root("source", q/FLUSH TABLES/);
+
 diag("Setting replica delay to 0 seconds");
 $replica_dbh->do("STOP ${replica_name}");
 $source_dbh->do("RESET ${source_reset}");
diff --git a/t/pt-replica-find/pt-replica-find.t b/t/pt-replica-find/pt-replica-find.t
index 77e9119e6..2eeedc6a4 100644
--- a/t/pt-replica-find/pt-replica-find.t
+++ b/t/pt-replica-find/pt-replica-find.t
@@ -44,7 +44,7 @@ elsif ( !$replica2_dbh ) {
    plan skip_all => 'Cannot connect to second sandbox replica';
 }
 else {
-   plan tests => 10;
+   plan tests => 13;
 }
 
 my @args = ('h=127.0.0.1,P=12345,u=msandbox,p=msandbox,s=1');
@@ -68,6 +68,63 @@ my $expected = <<EOF;
 EOF
 is($output, $expected, 'Source with replica and replica of replica');
 
+###############################################################################
+# Test --replica-user and --replica-password options
+###############################################################################
+
+# Create a new user that is going to be replicated on replicas.
+if ($sandbox_version eq '8.0') {
+    $sb->do_as_root("replica1", q/CREATE USER 'replica_user'@'localhost' IDENTIFIED WITH mysql_native_password BY 'replica_password'/);
+} else {
+    $sb->do_as_root("replica1", q/CREATE USER 'replica_user'@'localhost' IDENTIFIED BY 'replica_password'/);
+}
+$sb->do_as_root("replica1", q/GRANT REPLICATION CLIENT ON *.* TO 'replica_user'@'localhost'/);
+$sb->do_as_root("replica1", q/GRANT REPLICATION SLAVE ON *.* TO 'replica_user'@'localhost'/);
+$sb->do_as_root("replica1", q/FLUSH PRIVILEGES/);                
+
+$sb->wait_for_replicas();
+
+# Ensure we cannot connect to replicas using standard credentials
+# Since replica2 is a replica of replica1, removing the user from the replica1 will remove
+# the user also from replica2
+$sb->do_as_root("replica1", q/RENAME USER 'msandbox'@'%' TO 'msandbox_old'@'%'/);
+$sb->do_as_root("replica1", q/FLUSH PRIVILEGES/);
+$sb->do_as_root("replica1", q/FLUSH TABLES/);
+
+$output = `$trunk/bin/pt-replica-find -h 127.0.0.1 -P 12345 -u msandbox -p msandbox s=1 --report-format hostname --replica-user replica_user --replica-password replica_password`;
+$expected = <<EOF;
+127.0.0.1:12345
++- 127.0.0.1:12346
+   +- 127.0.0.1:12347
+EOF
+
+is(
+   $output,
+   $expected,
+   'Source with replica and replica of replica with --replica-user/--replica-password'
+) or diag($output);
+
+unlike(
+   $output,
+   qr/Option --slave-user is deprecated and will be removed in future versions./,
+   'Deprecation warning not printed for option --replica-user'
+) or diag($output);
+
+unlike(
+   $output,
+   qr/Option --slave-password is deprecated and will be removed in future versions./,
+   'Deprecation warning not printed for option --replica-password'
+) or diag($output);
+
+# Drop test user
+$sb->do_as_root("replica1", q/DROP USER 'replica_user'@'localhost'/);
+$sb->do_as_root("replica1", q/FLUSH PRIVILEGES/);
+
+# Restore privilegs for the other tests
+$sb->do_as_root("replica1", q/RENAME USER 'msandbox_old'@'%' TO 'msandbox'@'%'/);
+$sb->do_as_root("source", q/FLUSH PRIVILEGES/);                
+$sb->do_as_root("source", q/FLUSH TABLES/);
+
 ###############################################################################
 # Test --resolve-hostname option (we don't know the hostname of the test
 # machine so we settle for any non null string)
@@ -79,20 +136,6 @@ like (
    "--resolve-address option"
 ) or diag($output);
 
-# #############################################################################
-# Until MasterSlave::find_replica_hosts() is improved to overcome the problems
-# with SHOW REPLICA HOSTS, this test won't work.
-# #############################################################################
-# Make replica2 replica of source.
-#diag(`../../mk-slave-move/mk-slave-move --sibling-of-master h=127.1,P=12347`);
-#$output = `perl ../mk-slave-find -h 127.0.0.1 -P 12345 -u msandbox -p msandbox`;
-#$expected = <<EOF;
-#127.0.0.1:12345
-#+- 127.0.0.1:12346
-#+- 127.0.0.1:12347
-#EOF
-#is($output, $expected, 'Source with two replicas');
-
 # #########################################################################
 # Issue 391: Add --pid option to all scripts
 # #########################################################################
diff --git a/t/pt-replica-find/pt-slave-find.t b/t/pt-replica-find/pt-slave-find.t
index 797fbf41a..9abbecc84 100644
--- a/t/pt-replica-find/pt-slave-find.t
+++ b/t/pt-replica-find/pt-slave-find.t
@@ -44,7 +44,7 @@ elsif ( !$replica2_dbh ) {
    plan skip_all => 'Cannot connect to second sandbox replica';
 }
 else {
-   plan tests => 10;
+   plan tests => 14;
 }
 
 my @args = ('h=127.0.0.1,P=12345,u=msandbox,p=msandbox,s=1');
@@ -68,6 +68,71 @@ my $expected = <<EOF;
 EOF
 is($output, $expected, 'Source with replica and replica of replica');
 
+###############################################################################
+# Test --slave-user and --slave-password options
+###############################################################################
+# Create a new user that is going to be replicated on replicas.
+if ($sandbox_version eq '8.0') {
+    $sb->do_as_root("replica1", q/CREATE USER 'replica_user'@'localhost' IDENTIFIED WITH mysql_native_password BY 'replica_password'/);
+} else {
+    $sb->do_as_root("replica1", q/CREATE USER 'replica_user'@'localhost' IDENTIFIED BY 'replica_password'/);
+}
+$sb->do_as_root("replica1", q/GRANT REPLICATION CLIENT ON *.* TO 'replica_user'@'localhost'/);
+$sb->do_as_root("replica1", q/GRANT REPLICATION SLAVE ON *.* TO 'replica_user'@'localhost'/);
+$sb->do_as_root("replica1", q/FLUSH PRIVILEGES/);                
+
+$sb->wait_for_replicas();
+
+# Ensure we cannot connect to replicas using standard credentials
+# Since replica2 is a replica of replica1, removing the user from the replica1 will remove
+# the user also from replica2
+$sb->do_as_root("replica1", q/RENAME USER 'msandbox'@'%' TO 'msandbox_old'@'%'/);
+$sb->do_as_root("replica1", q/FLUSH PRIVILEGES/);
+$sb->do_as_root("replica1", q/FLUSH TABLES/);
+
+$output = `$trunk/bin/pt-replica-find -h 127.0.0.1 -P 12345 -u msandbox -p msandbox s=1 --report-format hostname --slave-user replica_user --slave-password replica_password 2>/dev/null`;
+$expected = <<EOF;
+127.0.0.1:12345
++- 127.0.0.1:12346
+   +- 127.0.0.1:12347
+EOF
+
+is(
+   $output,
+   $expected,
+   'Source with replica and replica of replica with --slave-user/--slave-password'
+) or diag($output);
+
+$output = `$trunk/bin/pt-replica-find -h 127.0.0.1 -P 12345 -u msandbox -p msandbox s=1 --report-format hostname --slave-user replica_user --slave-password replica_password 2>&1`;
+
+like(
+   $output,
+   qr/\+- 127.0.0.1:12347/,
+   'Test 2: Source with replica and replica of replica with --slave-user/--slave-password'
+) or diag($output);
+
+like(
+   $output,
+   qr/Option --slave-user is deprecated and will be removed in future versions./,
+   'Deprecation warning printed for option --slave-user'
+) or diag($output);
+
+like(
+   $output,
+   qr/Option --slave-password is deprecated and will be removed in future versions./,
+   'Deprecation warning printed for option --slave-password'
+) or diag($output);
+
+# Repeat the basic test with deprecated --slave-user and --slave-password
+# Drop test user
+$sb->do_as_root("replica1", q/DROP USER 'replica_user'@'localhost'/);
+$sb->do_as_root("replica1", q/FLUSH PRIVILEGES/);
+
+# Restore privilegs for the other tests
+$sb->do_as_root("replica1", q/RENAME USER 'msandbox_old'@'%' TO 'msandbox'@'%'/);
+$sb->do_as_root("source", q/FLUSH PRIVILEGES/);                
+$sb->do_as_root("source", q/FLUSH TABLES/);
+
 ###############################################################################
 # Test --resolve-hostname option (we don't know the hostname of the test
 # machine so we settle for any non null string)
@@ -79,20 +144,6 @@ like (
    "--resolve-address option"
 ) or diag($output);
 
-# #############################################################################
-# Until MasterSlave::find_replica_hosts() is improved to overcome the problems
-# with SHOW REPLICA HOSTS, this test won't work.
-# #############################################################################
-# Make replica2 replica of source.
-#diag(`../../mk-slave-move/mk-slave-move --sibling-of-master h=127.1,P=12347`);
-#$output = `perl ../mk-slave-find -h 127.0.0.1 -P 12345 -u msandbox -p msandbox`;
-#$expected = <<EOF;
-#127.0.0.1:12345
-#+- 127.0.0.1:12346
-#+- 127.0.0.1:12347
-#EOF
-#is($output, $expected, 'Source with two replicas');
-
 # #########################################################################
 # Issue 391: Add --pid option to all scripts
 # #########################################################################
diff --git a/t/pt-replica-restart/gtid.t b/t/pt-replica-restart/gtid.t
index 255ff80fb..ac184ecb3 100644
--- a/t/pt-replica-restart/gtid.t
+++ b/t/pt-replica-restart/gtid.t
@@ -11,6 +11,7 @@ use warnings FATAL => 'all';
 use English qw(-no_match_vars);
 use Test::More;
 use Data::Dumper;
+use File::Temp qw(tempfile);
 
 use PerconaTest;
 use Sandbox;
@@ -162,6 +163,51 @@ like(
 
 stop() or die "Failed to stop pt-replica-restart";
 
+# #############################################################################
+# Test the replica of the source with deprecated option syntax.
+# #############################################################################
+
+$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
+$replica2_dbh->do('DROP TABLE test.t');
+$source_dbh->do('INSERT INTO test.t SELECT 1');
+wait_repl_broke($replica2_dbh) or die "Failed to break replication";
+
+# fetch the source uuid, which is the machine we need to skip an event from
+$r = $source_dbh->selectrow_hashref('select @@GLOBAL.server_uuid as uuid');
+$uuid = $r->{uuid};
+
+$r = $replica2_dbh->selectrow_hashref("show ${replica_name} status");
+like(
+   $r->{last_error},
+   qr/Table 'test.t' doesn't exist'/,
+   'replicaofreplica - deprecated option: Replication broke');
+
+# Start an instance
+my (undef, $tempfile) = tempfile();
+start("--master-uuid=$uuid $replica2_dsn > $tempfile 2>&1") or die;
+wait_repl_ok($replica2_dbh);
+
+like(
+   slurp_file($tempfile),
+   qr/Option --master-uuid is deprecated and will be removed in future versions./,
+   'Deprecation warning printed for legacy option --master-uuid'
+);
+
+$r = $replica2_dbh->selectrow_hashref("show ${replica_name} status");
+like(
+   $r->{last_errno},
+   qr/^0$/,
+   'Skips event from source on replica2 for deprecated --master-uuid'
+) or BAIL_OUT("Replication is broken");
+
+stop() or die "Failed to stop pt-replica-restart";
+diag(`rm $tempfile >/dev/null`);
+
 # #############################################################################
 # Test skipping 2 events in a row.
 # #############################################################################
diff --git a/t/pt-replica-restart/pt-replica-restart.t b/t/pt-replica-restart/pt-replica-restart.t
index 2db4da27c..a8c0ef6f7 100644
--- a/t/pt-replica-restart/pt-replica-restart.t
+++ b/t/pt-replica-restart/pt-replica-restart.t
@@ -105,6 +105,108 @@ unlike(
    '--error-text works (issue 459)'
 );
 
+$replica_dbh->do('CREATE TABLE test.t (a INT)');
+$replica_dbh->do("start ${replica_name}");
+$sb->wait_for_replicas;
+
+# #############################################################################
+# Testing --recurse option
+# #############################################################################
+# Bust replication again.
+$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 12345 -u msandbox -p msandbox --error-text "doesn't exist" --run-time 1s --recurse 1 2>&1`;
+
+like(
+   $output,
+   qr/P=12346/,
+   'Replica discovered'
+);
+
+$replica_dbh->do('CREATE TABLE test.t (a INT)');
+$replica_dbh->do("start ${replica_name}");
+$sb->wait_for_replicas;
+
+# #############################################################################
+# Testing --recurse option with --replica-user/--replica-password
+# #############################################################################
+# Create a new user that is going to be replicated on replicas.
+if ($sandbox_version eq '8.0') {
+    $sb->do_as_root("replica1", q/CREATE USER 'replica_user'@'localhost' IDENTIFIED WITH mysql_native_password BY 'replica_password'/);
+} else {
+    $sb->do_as_root("replica1", q/CREATE USER 'replica_user'@'localhost' IDENTIFIED BY 'replica_password'/);
+}
+$sb->do_as_root("replica1", q/GRANT REPLICATION CLIENT ON *.* TO 'replica_user'@'localhost'/);
+$sb->do_as_root("replica1", q/GRANT REPLICATION SLAVE ON *.* TO 'replica_user'@'localhost'/);
+$sb->do_as_root("replica1", q/FLUSH PRIVILEGES/);                
+
+$sb->wait_for_replicas();
+
+# Bust replication again.
+$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'
+);
+
+# Ensure we cannot connect to replicas using standard credentials
+# Since replica2 is a replica of replica1, removing the user from the replica1 will remove
+# the user also from replica2
+$sb->do_as_root("replica1", q/RENAME USER 'msandbox'@'%' TO 'msandbox_old'@'%'/);
+$sb->do_as_root("replica1", q/FLUSH PRIVILEGES/);
+$sb->do_as_root("replica1", q/FLUSH TABLES/);
+
+# Start an instance
+$output = `$trunk/bin/pt-replica-restart --max-sleep 0.25 -h 127.0.0.1 -P 12345 -u msandbox -p msandbox --error-text "doesn't exist" --run-time 1s --recurse 1 --replica-user replica_user --replica-password replica_password 2>&1`;
+
+like(
+   $output,
+   qr/P=12346/,
+   'Replica discovered with --replica-user/--replica-password'
+);
+
+unlike(
+   $output,
+   qr/Option --slave-user is deprecated and will be removed in future versions./,
+   'Deprecation warning not printed when option --replica-user provided'
+) or diag($output);
+
+unlike(
+   $output,
+   qr/Option --slave-password is deprecated and will be removed in future versions./,
+   'Deprecation warning not printed when option --replica-password provided'
+) or diag($output);
+
+# Drop test user
+$sb->do_as_root("replica1", q/DROP USER 'replica_user'@'localhost'/);
+$sb->do_as_root("replica1", q/FLUSH PRIVILEGES/);
+
+# Restore privilegs for the other tests
+$sb->do_as_root("replica1", q/RENAME USER 'msandbox_old'@'%' TO 'msandbox'@'%'/);
+$sb->do_as_root("source", q/FLUSH PRIVILEGES/);                
+$sb->do_as_root("source", q/FLUSH TABLES/);
+
+$replica_dbh->do('CREATE TABLE test.t (a INT)');
+$replica_dbh->do("start ${replica_name}");
+$sb->wait_for_replicas;
+
 # ###########################################################################
 # Issue 391: Add --pid option to all scripts
 # ###########################################################################
diff --git a/t/pt-replica-restart/pt-slave-restart.t b/t/pt-replica-restart/pt-slave-restart.t
index 3cd3a516e..b8aacf81e 100644
--- a/t/pt-replica-restart/pt-slave-restart.t
+++ b/t/pt-replica-restart/pt-slave-restart.t
@@ -105,6 +105,104 @@ unlike(
    '--error-text works (issue 459)'
 );
 
+# #############################################################################
+# Testing --recurse option
+# #############################################################################
+# Bust replication again.
+$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-slave-restart --max-sleep 0.25 -h 127.0.0.1 -P 12345 -u msandbox -p msandbox --error-text "doesn't exist" --run-time 1s --recurse 1 2>&1`;
+
+like(
+   $output,
+   qr/P=12346/,
+   'Replica discovered'
+);
+
+$replica_dbh->do('CREATE TABLE test.t (a INT)');
+$replica_dbh->do("start ${replica_name}");
+$sb->wait_for_replicas;
+
+# #############################################################################
+# Testing --recurse option with --slave-user/--slave-password
+# #############################################################################
+# Create a new user that is going to be replicated on replicas.
+if ($sandbox_version eq '8.0') {
+    $sb->do_as_root("replica1", q/CREATE USER 'replica_user'@'localhost' IDENTIFIED WITH mysql_native_password BY 'replica_password'/);
+} else {
+    $sb->do_as_root("replica1", q/CREATE USER 'replica_user'@'localhost' IDENTIFIED BY 'replica_password'/);
+}
+$sb->do_as_root("replica1", q/GRANT REPLICATION CLIENT ON *.* TO 'replica_user'@'localhost'/);
+$sb->do_as_root("replica1", q/GRANT REPLICATION SLAVE ON *.* TO 'replica_user'@'localhost'/);
+$sb->do_as_root("replica1", q/FLUSH PRIVILEGES/);                
+
+$sb->wait_for_replicas();
+
+# Bust replication again.
+$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'
+);
+
+# Ensure we cannot connect to replicas using standard credentials
+# Since replica2 is a replica of replica1, removing the user from the replica1 will remove
+# the user also from replica2
+$sb->do_as_root("replica1", q/RENAME USER 'msandbox'@'%' TO 'msandbox_old'@'%'/);
+$sb->do_as_root("replica1", q/FLUSH PRIVILEGES/);
+$sb->do_as_root("replica1", q/FLUSH TABLES/);
+
+# Start an instance
+$output = `$trunk/bin/pt-slave-restart --max-sleep 0.25 -h 127.0.0.1 -P 12345 -u msandbox -p msandbox --error-text "doesn't exist" --run-time 1s --recurse 1 --slave-user replica_user --slave-password replica_password 2>&1`;
+
+like(
+   $output,
+   qr/P=12346/,
+   'Replica discovered with --slave-user/--slave-password'
+);
+
+like(
+   $output,
+   qr/Option --slave-user is deprecated and will be removed in future versions./,
+   'Deprecation warning printed when option --slave-user provided'
+) or diag($output);
+
+like(
+   $output,
+   qr/Option --slave-password is deprecated and will be removed in future versions./,
+   'Deprecation warning printed when option --slave-password provided'
+) or diag($output);
+
+# Drop test user
+$sb->do_as_root("replica1", q/DROP USER 'replica_user'@'localhost'/);
+$sb->do_as_root("replica1", q/FLUSH PRIVILEGES/);
+
+# Restore privilegs for the other tests
+$sb->do_as_root("replica1", q/RENAME USER 'msandbox_old'@'%' TO 'msandbox'@'%'/);
+$sb->do_as_root("source", q/FLUSH PRIVILEGES/);                
+$sb->do_as_root("source", q/FLUSH TABLES/);
+
+$replica_dbh->do('CREATE TABLE test.t (a INT)');
+$replica_dbh->do("start ${replica_name}");
+$sb->wait_for_replicas;
+
 # ###########################################################################
 # Issue 391: Add --pid option to all scripts
 # ###########################################################################
diff --git a/t/pt-replica-restart/until.t b/t/pt-replica-restart/until.t
new file mode 100644
index 000000000..ac058326d
--- /dev/null
+++ b/t/pt-replica-restart/until.t
@@ -0,0 +1,286 @@
+#!/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 Data::Dumper;
+use File::Temp qw(tempfile);
+
+use PerconaTest;
+use Sandbox;
+require "$trunk/bin/pt-replica-restart";
+
+diag('Restarting the sandbox');
+diag(`SAKILA=0 REPLICATION_THREADS=0 $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 $replica1_dbh = $sb->get_dbh_for('replica1');
+my $replica2_dbh = $sb->get_dbh_for('replica2');
+
+if ( !$source_dbh ) {
+   plan skip_all => 'Cannot connect to sandbox source';
+}
+elsif ( !$replica1_dbh ) {
+   plan skip_all => 'Cannot connect to sandbox replica1';
+}
+elsif ( !$replica2_dbh ) {
+   plan skip_all => 'Cannot connect to sandbox replica2';
+}
+
+my $replica1_dsn = $sb->dsn_for("replica1");
+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-replica-restart --daemonize --run-time 5 --max-sleep 0.25 --pid $pid_file --log $log_file";
+
+sub start {
+   my ( $extra ) = @_;
+   stop() or return;
+   system "$cmd $extra";
+   PerconaTest::wait_for_files($pid_file);
+}
+
+sub stop() {
+   return 1 if !is_running();
+   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-replica-restart-sentinel`);
+   return is_running() ? 0 : 1;
+}
+
+sub is_running {
+   chomp(my $running = `ps -eaf | grep -v grep | grep '$cmd'`);
+   if (!-f $pid_file && !$running) {
+      return 0;
+   } elsif (-f $pid_file && !$running) {
+      diag(`rm -f $pid_file`);
+      return 0;
+   }
+   return 1;
+}
+
+sub wait_repl_broke {
+   my $dbh = shift;
+   return wait_until(
+      sub {
+         my $row = $dbh->selectrow_hashref("show ${replica_name} status");
+         return $row->{last_sql_errno};
+      }
+   );
+}
+
+sub wait_repl_ok {
+   my $dbh = shift;
+   wait_until(
+      sub {
+         my $row = $dbh->selectrow_hashref("show ${replica_name} status");
+         return $row->{last_sql_errno} == 0;
+      },
+      0.30,
+      5,
+   );
+}
+
+# #############################################################################
+# Testing --until-source option
+# #############################################################################
+
+$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
+$replica1_dbh->do('DROP TABLE test.t');
+$source_dbh->do('INSERT INTO test.t SELECT 1');
+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');
+
+$source_dbh->do('INSERT INTO test.t SELECT 2');
+$r = $source_dbh->selectrow_hashref("show ${source_status} status");
+my $until_file = $r->{file};
+my $until_pos = $r->{position};
+$source_dbh->do('INSERT INTO test.t SELECT 3');
+
+my (undef, $tempfile) = tempfile();
+
+# 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("--until-source=${until_file},${until_pos} $replica1_dsn > $tempfile 2>&1") or die "Failed to start pt-replica-restart";
+wait_repl_ok($replica1_dbh);
+
+# Check if replication is fixed.
+$r = $replica1_dbh->selectrow_hashref("show ${replica_name} status");
+like(
+   $r->{last_errno},
+   qr/^0$/,
+   'Event is skipped',
+) or BAIL_OUT("Replication is broken: " . Dumper($r) . `cat $log_file`);
+
+is(
+   $r->{"relay_${source_name}_log_file"},
+   $until_file,
+   'Started until specified source binary log file'
+) or diag(Dumper($r));
+
+is(
+   $r->{"exec_${source_name}_log_pos"},
+   $until_pos,
+   'Started until specified source binary log pos'
+) or diag(Dumper($r));
+
+unlike(
+   slurp_file($tempfile),
+   qr/Option --until-master is deprecated and will be removed in future versions./,
+   'Deprecation warning not printed for option --unitl-source'
+) or diag(slurp_file($tempfile));
+
+# Stop pt-replica-restart.
+stop() or die "Failed to stop pt-replica-restart";
+diag(`rm $tempfile >/dev/null`);
+
+$replica1_dbh->do('CREATE TABLE test.t (a INT)');
+$replica1_dbh->do("start ${replica_name}");
+$sb->wait_for_replicas;
+# #############################################################################
+# Testing legacy --until-master option
+# #############################################################################
+$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
+$replica1_dbh->do('DROP TABLE test.t');
+$source_dbh->do('INSERT INTO test.t SELECT 1');
+wait_repl_broke($replica1_dbh) or die "Failed to break replication";
+
+$r = $replica1_dbh->selectrow_hashref("show ${replica_name} status");
+like($r->{last_error}, qr/Table 'test.t' doesn't exist'/, 'replica: Replication broke');
+
+$source_dbh->do('INSERT INTO test.t SELECT 2');
+$r = $source_dbh->selectrow_hashref("show ${source_status} status");
+$until_file = $r->{file};
+$until_pos = $r->{position};
+$source_dbh->do('INSERT INTO test.t SELECT 3');
+
+(undef, $tempfile) = tempfile();
+
+# 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("--until-master=${until_file},${until_pos} $replica1_dsn > $tempfile 2>&1") or die "Failed to start pt-replica-restart";
+wait_repl_ok($replica1_dbh);
+
+# Check if replication is fixed.
+$r = $replica1_dbh->selectrow_hashref("show ${replica_name} status");
+like(
+   $r->{last_errno},
+   qr/^0$/,
+   'Event is skipped',
+) or BAIL_OUT("Replication is broken: " . Dumper($r) . `cat $log_file`);
+
+is(
+   $r->{"relay_${source_name}_log_file"},
+   $until_file,
+   'Started until specified source binary log file'
+) or diag(Dumper($r));
+
+is(
+   $r->{"exec_${source_name}_log_pos"},
+   $until_pos,
+   'Started until specified source binary log pos'
+) or diag(Dumper($r));
+
+like(
+   slurp_file($tempfile),
+   qr/Option --until-master is deprecated and will be removed in future versions./,
+   'Deprecation warning printed for legacy option --unitl-master'
+) or diag(slurp_file($tempfile));
+
+# Stop pt-replica-restart.
+stop() or die "Failed to stop pt-replica-restart";
+diag(`rm $tempfile >/dev/null`);
+
+$replica1_dbh->do('CREATE TABLE test.t (a INT)');
+$replica1_dbh->do("start ${replica_name}");
+$sb->wait_for_replicas;
+
+# #############################################################################
+# Testing --until-relay option
+# #############################################################################
+$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
+$replica1_dbh->do('DROP TABLE test.t');
+$source_dbh->do('INSERT INTO test.t SELECT 1');
+wait_repl_broke($replica1_dbh) or die "Failed to break replication";
+
+$r = $replica1_dbh->selectrow_hashref("show ${replica_name} status");
+like($r->{last_error}, qr/Table 'test.t' doesn't exist'/, 'replica: Replication broke');
+
+$r = $replica1_dbh->selectrow_hashref("show ${replica_name} status");
+$until_file = $r->{relay_log_file};
+my $rm1 = $source_dbh->selectrow_hashref("show ${source_status} status");
+$source_dbh->do('INSERT INTO test.t SELECT 2');
+my $rm2 = $source_dbh->selectrow_hashref("show ${source_status} status");
+$until_pos = $r->{relay_log_pos} + $rm2->{position} - $rm1->{position};
+$source_dbh->do('INSERT INTO test.t SELECT 3');
+
+(undef, $tempfile) = tempfile();
+
+# 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("--until-relay=${until_file},${until_pos} $replica1_dsn > $tempfile 2>&1") or die "Failed to start pt-replica-restart";
+wait_repl_ok($replica1_dbh);
+
+# Check if replication is fixed.
+$r = $replica1_dbh->selectrow_hashref("show ${replica_name} status");
+like(
+   $r->{last_errno},
+   qr/^0$/,
+   'Event is skipped',
+) or BAIL_OUT("Replication is broken: " . Dumper($r) . `cat $log_file`);
+
+is(
+   $r->{"relay_log_file"},
+   $until_file,
+   'Started until specified relay log file'
+) or diag(Dumper($r));
+
+is(
+   $r->{"relay_log_pos"},
+   $until_pos,
+   'Started until specified relay log pos'
+) or diag(Dumper($r));
+
+# Stop pt-replica-restart.
+stop() or die "Failed to stop pt-replica-restart";
+diag(`rm $tempfile >/dev/null`);
+
+$replica1_dbh->do('CREATE TABLE test.t (a INT)');
+$replica1_dbh->do("start ${replica_name}");
+$sb->wait_for_replicas;
+
+# #############################################################################
+# Done.
+# #############################################################################
+diag(`rm -f $pid_file $log_file >/dev/null`);
+diag(`$trunk/sandbox/test-env restart`);
+ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox");
+done_testing;
diff --git a/t/pt-table-checksum/basics.t b/t/pt-table-checksum/basics.t
index c1e8ad433..9a28e9a39 100644
--- a/t/pt-table-checksum/basics.t
+++ b/t/pt-table-checksum/basics.t
@@ -38,7 +38,7 @@ elsif ( !$replica1_dbh ) {
 elsif ( !@{$source_dbh->selectall_arrayref("show databases like 'sakila'")} ) {
    plan skip_all => 'sakila database is not loaded';
 } else {
-   plan tests => 40;
+   plan tests => 46;
 }
 
 # The sandbox servers run with lock_wait_timeout=3 and it's not dynamic
@@ -208,6 +208,80 @@ is_deeply(
    "--emptry-replicate-table on by default"
 ) or print STDERR Dumper($row);
 
+# ############################################################################
+# --[no]check-replica-tables
+# ############################################################################
+
+$sb->wipe_clean($source_dbh);
+$sb->load_file('source', 't/pt-table-checksum/samples/issue_21.sql');
+
+$replica2_dbh->do('ALTER TABLE test.issue_21 DROP COLUMN b');
+
+($output, $exit_status) = full_output(
+   sub {
+      pt_table_checksum::main(@args, 
+         qw(-t test.issue_21),
+         qw(--chunk-time 0 --chunk-size 2 --no-check-replica-tables --no-replicate-check),
+         '--skip-check-replica-lag', 'h=127.0.0.1,P=12347,u=msandbox,p=msandbox'
+      )
+   },
+   stderr => 1
+);
+
+is(
+   $exit_status,
+   0,
+   'no error with --no-check-replica-tables'
+);
+
+like(
+   $output,
+   qr/Skipping replica h=127.0.0.1,P=12347/,
+   'Broken replica skipped with --no-check-replica-tables and --skip-check-replica-lag'
+);
+
+unlike(
+   $output,
+   qr/Option --\[no\]check-slave-tables is deprecated and will be removed in future versions./,
+   'Deprecation warning not printed when option --no-check-replica-tables provided'
+) or diag($output);
+
+($output, $exit_status) = full_output(
+   sub {
+      pt_table_checksum::main(@args, 
+         qw(-t test.issue_21),
+         qw(--chunk-time 0 --chunk-size 2 --no-check-slave-tables --no-replicate-check),
+         '--skip-check-replica-lag', 'h=127.0.0.1,P=12347,u=msandbox,p=msandbox'
+      )
+   },
+   stderr => 1
+);
+
+is(
+   $exit_status,
+   0,
+   'no error with --no-check-slave-tables'
+);
+
+like(
+   $output,
+   qr/Skipping replica h=127.0.0.1,P=12347/,
+   'Broken replica skipped with -no-check-slave-tables and --skip-check-replica-lag'
+);
+
+like(
+   $output,
+   qr/Option --\[no\]check-slave-tables is deprecated and will be removed in future versions./,
+   'Deprecation warning printed when option --no-check-slave-tables provided'
+) or diag($output);
+
+$sb->load_file(
+   'replica2',
+   't/pt-table-checksum/samples/issue_21.sql',
+   undef,
+   no_wait => 1
+);
+$replica2_dbh->do("START ${replica_name}");
 # ############################################################################
 # --[no]recheck
 # ############################################################################
diff --git a/t/pt-table-checksum/bugs.t b/t/pt-table-checksum/bugs.t
index d2378772d..34edfe27a 100644
--- a/t/pt-table-checksum/bugs.t
+++ b/t/pt-table-checksum/bugs.t
@@ -206,7 +206,6 @@ like(
    "Bug 1016131: ptc should skip tables where all columns are excluded"
 );
 
-# Test #12
 {
 $output = output(
    sub { pt_table_checksum::main(@args, 
@@ -222,6 +221,36 @@ like(
       "--skip-check-replica-lag",
 );
 
+unlike(
+   $output,
+   qr/Option --skip-check-slave-lag is deprecated and will be removed in future versions./,
+   'Deprecation warning not printed when option --skip-check-replica-lag provided'
+) or diag($output);
+
+# Deprecatted option --skip-check-slave-lag
+$output = output(
+   sub {
+      pt_table_checksum::main(@args, 
+         '--skip-check-slave-lag', "h=127.0.0.1,P=".$sb->port_for('replica1'),
+         ),
+   },
+   stderr => 1,
+);
+
+$skipping_str = "Skipping.*".$sb->port_for('replica1');
+like(
+      $output,
+      qr/$skipping_str/s,
+      "--skip-check-slave-lag",
+);
+
+like(
+   $output,
+   qr/Option --skip-check-slave-lag is deprecated and will be removed in future versions./,
+   'Deprecation warning printed when option --skip-check-slave-lag provided'
+) or diag($output);
+
+# Test #12
 # Test for skip-check-replica-lag and empty replica port
 $output = output(
    sub { pt_table_checksum::main(@args,
diff --git a/t/pt-table-checksum/issue_1651002.t b/t/pt-table-checksum/issue_1651002.t
index 137aad0d2..30592b2e3 100644
--- a/t/pt-table-checksum/issue_1651002.t
+++ b/t/pt-table-checksum/issue_1651002.t
@@ -24,7 +24,7 @@ if ( !$dbh ) {
    plan skip_all => 'Cannot connect to sandbox source';
 }
 else {
-   plan tests => 2;
+   plan tests => 7;
 }
 
 # The sandbox servers run with lock_wait_timeout=3 and it's not dynamic
@@ -57,17 +57,56 @@ $sb->do_as_root("replica1", q/RENAME USER 'msandbox'@'%' TO 'msandbox_old'@'%'/)
 $sb->do_as_root("replica1", q/FLUSH PRIVILEGES/);
 $sb->do_as_root("replica1", q/FLUSH TABLES/);
 
+$output = output(
+   sub { pt_table_checksum::main(@args) },
+   stderr => 1,
+);
+
+is(
+   PerconaTest::count_checksum_results($output, 'rows'),
+   6,
+   "Large BLOB/TEXT/BINARY Checksum"
+) or diag($output);
+
+unlike(
+   $output,
+   qr/Option --slave-user is deprecated and will be removed in future versions./,
+   'Deprecation warning not printed when option --replica-user provided'
+) or diag($output);
+
+unlike(
+   $output,
+   qr/Option --slave-password is deprecated and will be removed in future versions./,
+   'Deprecation warning not printed when option --replica-password provided'
+) or diag($output);
+
+#Legacy variant
+
+@args = ($source_dsn, qw(--replicate test.checksums -d test --slave-user replica_user --slave-password replica_password --ignore-databases mysql)); 
 
 $output = output(
    sub { pt_table_checksum::main(@args) },
    stderr => 1,
 );
+
 is(
    PerconaTest::count_checksum_results($output, 'rows'),
    6,
    "Large BLOB/TEXT/BINARY Checksum"
 ) or diag($output);
 
+like(
+   $output,
+   qr/Option --slave-user is deprecated and will be removed in future versions./,
+   'Deprecation warning printed when option --slave-user provided'
+) or diag($output);
+
+like(
+   $output,
+   qr/Option --slave-password is deprecated and will be removed in future versions./,
+   'Deprecation warning printed when option --slave-password provided'
+) or diag($output);
+
 # #############################################################################
 # Done.
 # #############################################################################
diff --git a/t/pt-table-checksum/pt-1637.t b/t/pt-table-checksum/pt-1637.t
index 794928b50..5ba0ab4fe 100644
--- a/t/pt-table-checksum/pt-1637.t
+++ b/t/pt-table-checksum/pt-1637.t
@@ -63,7 +63,7 @@ my @args = ($source1_dsn,
 
 # 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.
-$sb->do_as_root("chan_replica1", 'stop ${replica_name} IO_thread;');
+$sb->do_as_root("chan_replica1", "stop ${replica_name} IO_thread;");
 
 my $output;
 my $exit_status;
@@ -79,7 +79,7 @@ is(
     "PT-1637 exist status 128 if replication is stopped and --fail-on-replication-stopped",
 );
 
-$sb->do_as_root("chan_replica1", 'start ${replica_name} IO_thread;');
+$sb->do_as_root("chan_replica1", "start ${replica_name} IO_thread;");
 sleep(2);
 
 $sb->stop_sandbox(qw(chan_source1 chan_replica2 chan_replica1));
diff --git a/t/pt-table-checksum/throttle.t b/t/pt-table-checksum/throttle.t
index 97c8a4187..e6a77e04b 100644
--- a/t/pt-table-checksum/throttle.t
+++ b/t/pt-table-checksum/throttle.t
@@ -37,7 +37,7 @@ elsif ( !$replica2_dbh ) {
    plan skip_all => 'Cannot connect to sandbox replica2';
 }
 else {
-   plan tests => 4;
+   plan tests => 8;
 }
 
 # The sandbox servers run with lock_wait_timeout=3 and it's not dynamic
@@ -90,6 +90,43 @@ is(
    "Ignores replica1 when --check-replica-lag=replica2"
 );
 
+unlike(
+   $output,
+   qr/Option --check-slave-lag is deprecated and will be removed in future versions./,
+   'Deprecation warning not printed when option --check-replica-lag provided'
+) or diag($output);
+
+$row = $source_dbh->selectall_arrayref("select * from percona.checksums where db='sakila' and tbl='city'");
+is(
+   scalar @$row,
+   1,
+   "Checksummed table"
+);
+
+$source_dbh->do("delete from percona.checksums where db='sakila' and tbl='city'");
+
+# Checksum but only use replica2 to check for lag with deprecated --check-slave-lag.
+($output, $exit_status) = full_output(
+   sub {
+      pt_table_checksum::main(@args, 
+         qw(-t sakila.city --quiet),
+         qw(--no-replicate-check), '--check-slave-lag', 'P=12347')
+   },
+   stderr => 1,
+);
+
+is(
+   $exit_status,
+   0,
+   "Ignores replica1 when --check-slave-lag=replica2"
+);
+
+like(
+   $output,
+   qr/Option --check-slave-lag is deprecated and will be removed in future versions./,
+   'Deprecation warning printed when option --check-slave-lag provided'
+) or diag($output);
+
 $row = $source_dbh->selectall_arrayref("select * from percona.checksums where db='sakila' and tbl='city'");
 is(
    scalar @$row,
diff --git a/t/pt-table-sync/basics.t b/t/pt-table-sync/basics.t
index d77441d40..2b7a2efbf 100644
--- a/t/pt-table-sync/basics.t
+++ b/t/pt-table-sync/basics.t
@@ -29,7 +29,7 @@ elsif ( !$replica_dbh ) {
    plan skip_all => 'Cannot connect to sandbox replica';
 }
 else {
-   plan tests => 24;
+   plan tests => 30;
 }
 
 $sb->create_dbs($source_dbh, [qw(test)]);
@@ -131,6 +131,45 @@ is_deeply(
    'Synced OK with --replica-user'
 );
 
+unlike(
+   $output,
+   qr/Option --slave-user is deprecated and will be removed in future versions./,
+   'Deprecation warning not printed when option --replica-user provided'
+) or diag($output);
+
+unlike(
+   $output,
+   qr/Option --slave-password is deprecated and will be removed in future versions./,
+   'Deprecation warning not printed when option --replica-password provided'
+) or diag($output);
+
+$sb->load_file('source', 't/pt-table-sync/samples/before.sql');
+$output = run('test1', 'test2', '--algorithms Chunk,GroupBy --no-bin-log --slave-user replica_user --slave-password replica_password');
+
+like(
+   $output, 
+   qr/INSERT INTO `test`.`test2`\(`a`, `b`\) VALUES \('1', 'en'\);\nINSERT INTO `test`.`test2`\(`a`, `b`\) VALUES \('2', 'ca'\);/, 
+   'Basic Chunk sync with --slave-user/--slave-password'
+);
+
+is_deeply(
+   query_replica('select * from test.test2'),
+   [ {   a => 1, b => 'en' }, { a => 2, b => 'ca' } ],
+   'Synced OK with --slave-user'
+);
+
+like(
+   $output,
+   qr/Option --slave-user is deprecated and will be removed in future versions./,
+   'Deprecation warning printed when option --slave-user provided'
+) or diag($output);
+
+like(
+   $output,
+   qr/Option --slave-password is deprecated and will be removed in future versions./,
+   'Deprecation warning printed when option --slave-password provided'
+) or diag($output);
+
 $sb->load_file('source', 't/pt-table-sync/samples/before.sql');
 $output = run('test1', 'test2', '--algorithms Nibble --no-bin-log');
 is($output, "INSERT INTO `test`.`test2`(`a`, `b`) VALUES ('1', 'en');
diff --git a/t/pt-table-sync/master_master.t b/t/pt-table-sync/master_master.t
index 860a6c93b..2f729cb7a 100644
--- a/t/pt-table-sync/master_master.t
+++ b/t/pt-table-sync/master_master.t
@@ -18,7 +18,7 @@ require "$trunk/bin/pt-table-sync";
 my $dp = new DSNParser(opts=>$dsn_opts);
 my $sb = new Sandbox(basedir => '/tmp', DSNParser => $dp);
 
-plan tests => 4;
+plan tests => 11;
 
 # #############################################################################
 # Ensure that syncing source-source works OK
@@ -26,13 +26,11 @@ plan tests => 4;
 
 # Start up 12348 <-> 12349
 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 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(
@@ -57,6 +55,7 @@ my $output = output(
          qw(--no-check-replica --sync-to-source --print --execute),
          "h=127.0.0.1,P=12348,u=msandbox,p=msandbox,D=test,t=test1")
    },
+   stderr => 1
 );
 
 # 0  = ok no diffs
@@ -74,6 +73,18 @@ like(
    "SQL to sync diff"
 );
 
+unlike(
+   $output,
+   qr/Option --sync-to-master is deprecated and will be removed in future versions./,
+   'Deprecation warning not printed when option --sync-to-source provided'
+) or diag($output);
+
+unlike(
+   $output,
+   qr/Option --\[no\]check-slave is deprecated and will be removed in future versions./,
+   'Deprecation warning not printed when option --no-check-replica provided'
+) or diag($output);
+
 
 PerconaTest::wait_for_table($source1_dbh, "test.test1", "a=1 and b='mm'");
 my $rows = $source1_dbh->selectall_arrayref("SELECT * FROM test.test1");
@@ -83,6 +94,81 @@ is_deeply(
    "Diff row synced on source1"
 ); 
 
+diag('Stopping source-source servers...');
+diag(`$trunk/sandbox/stop-sandbox 12348 12349 >/dev/null`);
+# #############################################################################
+# Repeat the test with deprecated options.
+# #############################################################################
+
+# Start up 12348 <-> 12349
+diag('Starting source-source servers...');
+diag(`$trunk/sandbox/start-sandbox source-source 12348 12349`);
+$source1_dbh = $sb->get_dbh_for('source1');
+$source2_dbh = $sb->get_dbh_for('source2');
+
+$sb->load_file("source1", "t/pt-table-sync/samples/before.sql");
+$sb->wait_for_replicas();
+$sb->wait_for_replicas(
+                     source => 'source1',
+                     replica => 'source2',
+                  );
+
+# 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 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.
+$exit_status = 0;
+$output = output(
+   sub {
+      $exit_status = pt_table_sync::main(
+         qw(--no-check-slave --sync-to-master --print --execute),
+         "h=127.0.0.1,P=12348,u=msandbox,p=msandbox,D=test,t=test1")
+   },
+   stderr =>1
+);
+
+# 0  = ok no diffs
+# 1  = error
+# >1 = sum(@status{@ChangeHandler::ACTIONS})
+is(
+   $exit_status,
+   2,
+   "Exit status 2"
+);
+
+like(
+   $output,
+   qr/REPLACE INTO `test`\.`test1`\s*\(`a`, `b`\) VALUES\s*\('1', 'mm'\)/,
+   "SQL to sync diff"
+);
+
+like(
+   $output,
+   qr/Option --sync-to-master is deprecated and will be removed in future versions./,
+   'Deprecation warning printed when option --sync-to-master provided'
+) or diag($output);
+
+like(
+   $output,
+   qr/Option --\[no\]check-slave is deprecated and will be removed in future versions./,
+   'Deprecation warning printed when option --no-check-slave provided'
+) or diag($output);
+
+
+PerconaTest::wait_for_table($source1_dbh, "test.test1", "a=1 and b='mm'");
+$rows = $source1_dbh->selectall_arrayref("SELECT * FROM test.test1");
+is_deeply(
+   $rows,
+   [ [1, 'mm'], [2, 'ca'] ],
+   "Diff row synced on source1"
+);
+
 diag('Stopping source-source servers...');
 diag(`$trunk/sandbox/stop-sandbox 12348 12349 >/dev/null`);
 
diff --git a/t/pt-table-sync/safety_checks.t b/t/pt-table-sync/safety_checks.t
index a4589d138..2dea0ac78 100644
--- a/t/pt-table-sync/safety_checks.t
+++ b/t/pt-table-sync/safety_checks.t
@@ -20,12 +20,13 @@ my $output;
 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');
+my $replica1_dbh  = $sb->get_dbh_for('replica1');
+my $replica2_dbh  = $sb->get_dbh_for('replica2');
 
 if ( !$source_dbh ) {
    plan skip_all => 'Cannot connect to sandbox source';
 }
-elsif ( !$replica_dbh ) {
+elsif ( !$replica1_dbh ) {
    plan skip_all => 'Cannot connect to sandbox replica';
 }
 
@@ -59,7 +60,7 @@ like(
    "check-child-tables: error message"
 );
 
-my $rows = $replica_dbh->selectall_arrayref("select * from on_del_cas.child2");
+my $rows = $replica1_dbh->selectall_arrayref("select * from on_del_cas.child2");
 is_deeply(
    $rows,
    [ [1,1] ],
@@ -80,6 +81,76 @@ unlike(
    "check-child-tables: no error message with --print"
 );
 
+# #############################################################################
+# --[no]check-source
+# #############################################################################
+# Connecting replica with wrong user name
+$replica1_dbh->do("STOP ${replica_name}");
+$replica1_dbh->do("CHANGE ${source_change} TO ${source_name}_port=12347, ${source_name}_user='does_not_exist'");
+$replica1_dbh->do("START ${replica_name}");
+
+$output = output(
+   sub {
+      pt_table_sync::main($replica1_dsn, qw(--sync-to-source),
+         qw(--execute -d on_del_cas --wait 0))
+   },
+   stderr => 1,
+);
+
+like(
+   $output,
+   qr/The server specified as a source has no connected replicas/,
+   "Error when --check-source is enabled (default)"
+) or diag($output);
+
+$output = output(
+   sub {
+      pt_table_sync::main($replica1_dsn, qw(--sync-to-source),
+         qw(--execute -d on_del_cas --wait 0 --no-check-source))
+   },
+   stderr => 1,
+);
+
+unlike(
+   $output,
+   qr/The server specified as a source has no connected replicas/,
+   "No wrong source error when --check-source is disabled"
+) or diag($output);
+
+unlike(
+   $output,
+   qr/Option --\[no\]check-master is deprecated and will be removed in future versions./,
+   'Deprecation warning not printed when option --no-check-source provided'
+) or diag($output);
+
+# Legacy option
+$output = output(
+   sub {
+      pt_table_sync::main($replica1_dsn, qw(--sync-to-source),
+         qw(--execute -d on_del_cas --wait 0 --no-check-master))
+   },
+   stderr => 1,
+);
+
+unlike(
+   $output,
+   qr/The server specified as a source has no connected replicas/,
+   "No wrong source error when --check-master is disabled"
+) or diag($output);
+
+like(
+   $output,
+   qr/Option --\[no\]check-master is deprecated and will be removed in future versions./,
+   'Deprecation warning printed when option --no-check-master provided'
+) or diag($output);
+
+$replica1_dbh->do("STOP ${replica_name}");
+$replica1_dbh->do("CHANGE ${source_change} TO ${source_name}_port=12345, ${source_name}_user='msandbox'");
+$replica1_dbh->do("START ${replica_name}");
+$replica1_dbh->do("STOP ${replica_name}");
+$replica1_dbh->do("CHANGE ${source_change} TO ${source_name}_port=12345, ${source_name}_user='msandbox'");
+$replica1_dbh->do("START ${replica_name}");
+
 # #############################################################################
 # Done.
 # #############################################################################

From e4281dc6c297871635e7e47872cc902a005eda62 Mon Sep 17 00:00:00 2001
From: Sveta Smirnova <sveta.smirnova@percona.com>
Date: Fri, 4 Oct 2024 18:32:39 +0300
Subject: [PATCH 26/31] PT-2340 - Support MySQL 8.4

- Adjusted t/pt-deadlock-logger/check_schema_exists.t so it makes sense
---
 t/pt-deadlock-logger/check_schema_exists.t | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/t/pt-deadlock-logger/check_schema_exists.t b/t/pt-deadlock-logger/check_schema_exists.t
index b664a913b..1538bb6b9 100644
--- a/t/pt-deadlock-logger/check_schema_exists.t
+++ b/t/pt-deadlock-logger/check_schema_exists.t
@@ -19,7 +19,7 @@ my $dp  = new DSNParser(opts=>$dsn_opts);
 my $sb  = new Sandbox(basedir => '/tmp', DSNParser => $dp);
 my $dbh = $sb->get_dbh_for('source');
 
-my ($output, $exist_status) = full_output(
+my ($output, $exit_status) = full_output(
    sub {
       pt_deadlock_logger::main(
          "h=127.1,D=non_existent_db,u=msandbox,p=msandbox",
@@ -29,6 +29,17 @@ my ($output, $exist_status) = full_output(
    }
 );
 
+is(
+   $exit_status,
+   2,
+   'Dies when connects to non existent database'
+);
+
+like(
+   $output,
+   qr/Unknown database 'non_existent_db'/,
+   'Error printed when connects to non existent database'
+);
 # #############################################################################
 # Done.
 # #############################################################################

From fcb2d549b838e15268be5fd00906f99af1bc27a9 Mon Sep 17 00:00:00 2001
From: Sveta Smirnova <sveta.smirnova@percona.com>
Date: Fri, 4 Oct 2024 19:02:07 +0300
Subject: [PATCH 27/31] PT-2340 - Support MySQL 8.4

- Adjusted pt-variable-advisor, so it reflects current defaults
---
 bin/pt-variable-advisor                  | 22 ++++++++++++++++++----
 lib/VariableAdvisorRules.pm              | 15 +++++++++++----
 t/lib/samples/show-variables/vars001.txt |  4 ++--
 t/lib/samples/show-variables/vars002.txt |  4 ++--
 4 files changed, 33 insertions(+), 12 deletions(-)

diff --git a/bin/pt-variable-advisor b/bin/pt-variable-advisor
index 4228adf76..671e6f6b7 100755
--- a/bin/pt-variable-advisor
+++ b/bin/pt-variable-advisor
@@ -3445,7 +3445,7 @@ sub get_rules {
       code => sub {
          my ( %args ) = @_;
          return _var_eq($args{variables}->{innodb_buffer_pool_size},
-            10 * 1_048_576);  # 10M
+            128 * 1_048_576);  # 10M
       },
    },
    {
@@ -3502,7 +3502,7 @@ sub get_rules {
       code => sub {
          my ( %args ) = @_;
          return _var_gt($args{variables}->{innodb_log_buffer_size},
-            16 * 1_048_576);  # 16M
+            64 * 1_048_576);  # 16M
       },
    },
    {
@@ -3510,7 +3510,7 @@ sub get_rules {
       code => sub {
          my ( %args ) = @_;
          return _var_eq($args{variables}->{innodb_log_file_size},
-            5 * 1_048_576);  # 5M
+            48 * 1_048_576);  # 5M
       },
    },
    {
@@ -3633,6 +3633,13 @@ sub get_rules {
             512 * 1_048_576);  # 512M
       },
    },
+   {
+      id   => 'query_cache_size-3',
+      code => sub {
+         my ( %args ) = @_;
+         return _var_neq($args{variables}->{query_cache_size}, 0);
+      },
+   },
    {
       id   => 'read_buffer_size-1',
       code => sub {
@@ -3833,7 +3840,7 @@ sub get_rules {
       code => sub {
          my ( %args ) = @_;
          return 0 unless $args{variables}->{storage_engine};
-         return $args{variables}->{storage_engine} !~ m/InnoDB|MyISAM/i ? 1 : 0;
+         return $args{variables}->{storage_engine} !~ m/InnoDB/i ? 1 : 0;
       },
    },
    {
@@ -5839,6 +5846,13 @@ severity: warn
 The query cache can cause severe performance problems when it is
 larger than 256MB, especially on multi-core machines.
 
+=item query_cache_size-3
+
+severity: note
+
+The query cache can cause severe performance problems when it is
+enabled, especially in high concurrent loads on multi-core machines.
+
 =item read_buffer_size-1
 
 severity: note
diff --git a/lib/VariableAdvisorRules.pm b/lib/VariableAdvisorRules.pm
index 72a5732a5..994833e1c 100644
--- a/lib/VariableAdvisorRules.pm
+++ b/lib/VariableAdvisorRules.pm
@@ -149,7 +149,7 @@ sub get_rules {
       code => sub {
          my ( %args ) = @_;
          return _var_eq($args{variables}->{innodb_buffer_pool_size},
-            10 * 1_048_576);  # 10M
+            128 * 1_048_576);  # 10M
       },
    },
    {
@@ -206,7 +206,7 @@ sub get_rules {
       code => sub {
          my ( %args ) = @_;
          return _var_gt($args{variables}->{innodb_log_buffer_size},
-            16 * 1_048_576);  # 16M
+            64 * 1_048_576);  # 16M
       },
    },
    {
@@ -214,7 +214,7 @@ sub get_rules {
       code => sub {
          my ( %args ) = @_;
          return _var_eq($args{variables}->{innodb_log_file_size},
-            5 * 1_048_576);  # 5M
+            48 * 1_048_576);  # 5M
       },
    },
    {
@@ -337,6 +337,13 @@ sub get_rules {
             512 * 1_048_576);  # 512M
       },
    },
+   {
+      id   => 'query_cache_size-3',
+      code => sub {
+         my ( %args ) = @_;
+         return _var_neq($args{variables}->{query_cache_size}, 0);
+      },
+   },
    {
       id   => 'read_buffer_size-1',
       code => sub {
@@ -537,7 +544,7 @@ sub get_rules {
       code => sub {
          my ( %args ) = @_;
          return 0 unless $args{variables}->{storage_engine};
-         return $args{variables}->{storage_engine} !~ m/InnoDB|MyISAM/i ? 1 : 0;
+         return $args{variables}->{storage_engine} !~ m/InnoDB/i ? 1 : 0;
       },
    },
    {
diff --git a/t/lib/samples/show-variables/vars001.txt b/t/lib/samples/show-variables/vars001.txt
index 25e287f55..06f7ec6aa 100644
--- a/t/lib/samples/show-variables/vars001.txt
+++ b/t/lib/samples/show-variables/vars001.txt
@@ -89,7 +89,7 @@
 | innodb_lock_wait_timeout        | 50                                                                                        | 
 | innodb_locks_unsafe_for_binlog  | OFF                                                                                       | 
 | innodb_log_buffer_size          | 1048576                                                                                   | 
-| innodb_log_file_size            | 5242880                                                                                   | 
+| innodb_log_file_size            | 50331648                                                                                   | 
 | innodb_log_files_in_group       | 2                                                                                         | 
 | innodb_log_group_home_dir       | /tmp/12345/data                                                                           | 
 | innodb_max_dirty_pages_pct      | 90                                                                                        | 
@@ -243,7 +243,7 @@
 | ssl_cert                        |                                                                                           | 
 | ssl_cipher                      |                                                                                           | 
 | ssl_key                         |                                                                                           | 
-| storage_engine                  | MyISAM                                                                                    | 
+| storage_engine                  | InnoDB                                                                                    | 
 | sync_binlog                     | 0                                                                                         | 
 | sync_frm                        | ON                                                                                        | 
 | system_time_zone                | MDT                                                                                       | 
diff --git a/t/lib/samples/show-variables/vars002.txt b/t/lib/samples/show-variables/vars002.txt
index bf21825d1..77b64df27 100644
--- a/t/lib/samples/show-variables/vars002.txt
+++ b/t/lib/samples/show-variables/vars002.txt
@@ -87,7 +87,7 @@ innodb_force_recovery	0
 innodb_lock_wait_timeout	3
 innodb_locks_unsafe_for_binlog	OFF
 innodb_log_buffer_size	1048576
-innodb_log_file_size	5242880
+innodb_log_file_size	50331648
 innodb_log_files_in_group	2
 innodb_log_group_home_dir	/tmp/12345/data
 innodb_max_dirty_pages_pct	90
@@ -241,7 +241,7 @@ ssl_capath
 ssl_cert	
 ssl_cipher	
 ssl_key	
-storage_engine	MyISAM
+storage_engine	InnoDB
 sync_binlog	0
 sync_frm	ON
 system_time_zone	MDT

From 86fe02143458d1dd4c60a837ed78c2aa5cccc44d Mon Sep 17 00:00:00 2001
From: Sveta Smirnova <sveta.smirnova@percona.com>
Date: Fri, 4 Oct 2024 19:06:01 +0300
Subject: [PATCH 28/31] PT-2340 - Support MySQL 8.4

- Updated modules
---
 bin/pt-archiver             | 6 ++++--
 bin/pt-heartbeat            | 6 ++++--
 bin/pt-kill                 | 6 ++++--
 bin/pt-online-schema-change | 6 ++++--
 bin/pt-query-digest         | 6 ++++--
 bin/pt-replica-find         | 6 ++++--
 bin/pt-replica-restart      | 6 ++++--
 bin/pt-table-checksum       | 6 ++++--
 bin/pt-table-sync           | 6 +++---
 lib/MasterSlave.pm          | 6 ++++--
 10 files changed, 39 insertions(+), 21 deletions(-)

diff --git a/bin/pt-archiver b/bin/pt-archiver
index b511e957f..4e3d48b7e 100755
--- a/bin/pt-archiver
+++ b/bin/pt-archiver
@@ -4025,8 +4025,10 @@ sub is_source_of {
          . $replica_status->{"${source_name}_user"};
    }
 
-   if ( ($replica_status->{replica_io_state} || '')
-      eq 'Waiting for ${source_name} to send event' )
+   if ( ( ($replica_status->{replica_io_state} || '')
+         eq 'Waiting for source to send event' )
+      || ( ($replica_status->{replica_io_state} || '')
+         eq 'Waiting for master to send event' ) )
    {
       my ( $source_log_name, $source_log_num )
          = $source_status->{file} =~ m/^(.*?)\.0*([1-9][0-9]*)$/;
diff --git a/bin/pt-heartbeat b/bin/pt-heartbeat
index c04db3e1c..c20273cad 100755
--- a/bin/pt-heartbeat
+++ b/bin/pt-heartbeat
@@ -486,8 +486,10 @@ sub is_source_of {
          . $replica_status->{"${source_name}_user"};
    }
 
-   if ( ($replica_status->{replica_io_state} || '')
-      eq 'Waiting for ${source_name} to send event' )
+   if ( ( ($replica_status->{replica_io_state} || '')
+         eq 'Waiting for source to send event' )
+      || ( ($replica_status->{replica_io_state} || '')
+         eq 'Waiting for master to send event' ) )
    {
       my ( $source_log_name, $source_log_num )
          = $source_status->{file} =~ m/^(.*?)\.0*([1-9][0-9]*)$/;
diff --git a/bin/pt-kill b/bin/pt-kill
index 639b32a5c..c401a3ca9 100755
--- a/bin/pt-kill
+++ b/bin/pt-kill
@@ -4302,8 +4302,10 @@ sub is_source_of {
          . $replica_status->{"${source_name}_user"};
    }
 
-   if ( ($replica_status->{replica_io_state} || '')
-      eq 'Waiting for ${source_name} to send event' )
+   if ( ( ($replica_status->{replica_io_state} || '')
+         eq 'Waiting for source to send event' )
+      || ( ($replica_status->{replica_io_state} || '')
+         eq 'Waiting for master to send event' ) )
    {
       my ( $source_log_name, $source_log_num )
          = $source_status->{file} =~ m/^(.*?)\.0*([1-9][0-9]*)$/;
diff --git a/bin/pt-online-schema-change b/bin/pt-online-schema-change
index c1296fb64..c9a784747 100755
--- a/bin/pt-online-schema-change
+++ b/bin/pt-online-schema-change
@@ -4590,8 +4590,10 @@ sub is_source_of {
          . $replica_status->{"${source_name}_user"};
    }
 
-   if ( ($replica_status->{replica_io_state} || '')
-      eq 'Waiting for ${source_name} to send event' )
+   if ( ( ($replica_status->{replica_io_state} || '')
+         eq 'Waiting for source to send event' )
+      || ( ($replica_status->{replica_io_state} || '')
+         eq 'Waiting for master to send event' ) )
    {
       my ( $source_log_name, $source_log_num )
          = $source_status->{file} =~ m/^(.*?)\.0*([1-9][0-9]*)$/;
diff --git a/bin/pt-query-digest b/bin/pt-query-digest
index c4d3a78e9..ae98493cb 100755
--- a/bin/pt-query-digest
+++ b/bin/pt-query-digest
@@ -10896,8 +10896,10 @@ sub is_source_of {
          . $replica_status->{"${source_name}_user"};
    }
 
-   if ( ($replica_status->{replica_io_state} || '')
-      eq 'Waiting for ${source_name} to send event' )
+   if ( ( ($replica_status->{replica_io_state} || '')
+         eq 'Waiting for source to send event' )
+      || ( ($replica_status->{replica_io_state} || '')
+         eq 'Waiting for master to send event' ) )
    {
       my ( $source_log_name, $source_log_num )
          = $source_status->{file} =~ m/^(.*?)\.0*([1-9][0-9]*)$/;
diff --git a/bin/pt-replica-find b/bin/pt-replica-find
index c6b58836a..02e961aa4 100755
--- a/bin/pt-replica-find
+++ b/bin/pt-replica-find
@@ -2627,8 +2627,10 @@ sub is_source_of {
          . $replica_status->{"${source_name}_user"};
    }
 
-   if ( ($replica_status->{replica_io_state} || '')
-      eq 'Waiting for ${source_name} to send event' )
+   if ( ( ($replica_status->{replica_io_state} || '')
+         eq 'Waiting for source to send event' )
+      || ( ($replica_status->{replica_io_state} || '')
+         eq 'Waiting for master to send event' ) )
    {
       my ( $source_log_name, $source_log_num )
          = $source_status->{file} =~ m/^(.*?)\.0*([1-9][0-9]*)$/;
diff --git a/bin/pt-replica-restart b/bin/pt-replica-restart
index 481f728f5..0dfdb45c9 100755
--- a/bin/pt-replica-restart
+++ b/bin/pt-replica-restart
@@ -3038,8 +3038,10 @@ sub is_source_of {
          . $replica_status->{"${source_name}_user"};
    }
 
-   if ( ($replica_status->{replica_io_state} || '')
-      eq 'Waiting for ${source_name} to send event' )
+   if ( ( ($replica_status->{replica_io_state} || '')
+         eq 'Waiting for source to send event' )
+      || ( ($replica_status->{replica_io_state} || '')
+         eq 'Waiting for master to send event' ) )
    {
       my ( $source_log_name, $source_log_num )
          = $source_status->{file} =~ m/^(.*?)\.0*([1-9][0-9]*)$/;
diff --git a/bin/pt-table-checksum b/bin/pt-table-checksum
index 1693e5e2b..038f26b01 100755
--- a/bin/pt-table-checksum
+++ b/bin/pt-table-checksum
@@ -5545,8 +5545,10 @@ sub is_source_of {
          . $replica_status->{"${source_name}_user"};
    }
 
-   if ( ($replica_status->{replica_io_state} || '')
-      eq 'Waiting for ${source_name} to send event' )
+   if ( ( ($replica_status->{replica_io_state} || '')
+         eq 'Waiting for source to send event' )
+      || ( ($replica_status->{replica_io_state} || '')
+         eq 'Waiting for master to send event' ) )
    {
       my ( $source_log_name, $source_log_num )
          = $source_status->{file} =~ m/^(.*?)\.0*([1-9][0-9]*)$/;
diff --git a/bin/pt-table-sync b/bin/pt-table-sync
index 9b2bce925..eb1d3e122 100755
--- a/bin/pt-table-sync
+++ b/bin/pt-table-sync
@@ -7057,9 +7057,9 @@ sub is_source_of {
    }
 
    if ( ( ($replica_status->{replica_io_state} || '')
-      eq 'Waiting for source to send event' )
-   || ( ($replica_status->{replica_io_state} || '')
-      eq 'Waiting for master to send event' ) )
+         eq 'Waiting for source to send event' )
+      || ( ($replica_status->{replica_io_state} || '')
+         eq 'Waiting for master to send event' ) )
    {
       my ( $source_log_name, $source_log_num )
          = $source_status->{file} =~ m/^(.*?)\.0*([1-9][0-9]*)$/;
diff --git a/lib/MasterSlave.pm b/lib/MasterSlave.pm
index 4c92c2d25..8eb69c887 100644
--- a/lib/MasterSlave.pm
+++ b/lib/MasterSlave.pm
@@ -453,8 +453,10 @@ sub is_source_of {
          . $replica_status->{"${source_name}_user"};
    }
 
-   if ( ($replica_status->{replica_io_state} || '')
-      eq 'Waiting for ${source_name} to send event' )
+   if ( ( ($replica_status->{replica_io_state} || '')
+         eq 'Waiting for source to send event' )
+      || ( ($replica_status->{replica_io_state} || '')
+         eq 'Waiting for master to send event' ) )
    {
       # The replica thinks its I/O thread is caught up to the source.  Let's
       # compare and make sure the source and replica are reasonably close to each

From 287a1c03310b57a90bf895f81716f142b143300a Mon Sep 17 00:00:00 2001
From: Sveta Smirnova <sveta.smirnova@percona.com>
Date: Fri, 4 Oct 2024 19:33:04 +0300
Subject: [PATCH 29/31] PT-2340 - Support MySQL 8.4

- Fixed typo in bin/pt-table-sync
---
 bin/pt-table-sync | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bin/pt-table-sync b/bin/pt-table-sync
index eb1d3e122..99656fe41 100755
--- a/bin/pt-table-sync
+++ b/bin/pt-table-sync
@@ -11338,7 +11338,7 @@ sub print_err {
 #   %args - Arguments
 #
 # Required Arguments:
-#   OptionaParser - <OptionParser> object
+#   OptionParser - <OptionParser> object
 #   DSNParser     - <DSNParser> object
 #
 # Returns:

From aab0b0cd22e6abb259df279c6920ddc0a897a329 Mon Sep 17 00:00:00 2001
From: Sveta Smirnova <sveta.smirnova@percona.com>
Date: Sun, 6 Oct 2024 22:55:48 +0300
Subject: [PATCH 30/31] PT-2340 - Support MySQL 8.4

- Fixed typos
---
 bin/pt-config-diff     | 2 +-
 bin/pt-heartbeat       | 4 ++--
 bin/pt-replica-restart | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/bin/pt-config-diff b/bin/pt-config-diff
index 434d5025d..927a31917 100755
--- a/bin/pt-config-diff
+++ b/bin/pt-config-diff
@@ -5692,7 +5692,7 @@ There is no output when there are no differences.  When there are differences,
 pt-config-diff prints a report to STDOUT that looks similar to the following:
 
   2 config differences
-  Variable                  my.soource.cnf   my.replica.cnf
+  Variable                  my.source.cnf   my.replica.cnf
   ========================= =============== ===============
   datadir                   /tmp/12345/data /tmp/12346/data
   port                      12345           12346
diff --git a/bin/pt-heartbeat b/bin/pt-heartbeat
index c20273cad..d8b931f3e 100755
--- a/bin/pt-heartbeat
+++ b/bin/pt-heartbeat
@@ -6978,7 +6978,7 @@ pt-heartbeat measures replication lag on a MySQL or PostgreSQL server.  You can
 use it to update a replication source or monitor a replica.  If possible, MySQL
 connection options are read from your .my.cnf file.
 
-Start daemonized process to update test.heartbeat table on replicaiton source:
+Start daemonized process to update test.heartbeat table on replication source:
 
   pt-heartbeat -D test --update -h source-server --daemonize
 
@@ -7018,7 +7018,7 @@ avoids reliance on the replication mechanism itself, which is unreliable.  (For
 example, C<SHOW REPLICA STATUS> on MySQL).
 
 The first part is an L<"--update"> instance of pt-heartbeat that connects to
-a replicaiton source and updates a timestamp ("heartbeat record") every
+a replication source and updates a timestamp ("heartbeat record") every
 L<"--interval"> seconds.  Since the heartbeat table may contain records from
 multiple replication sources (see L<"MULTI-REPLICA HIERARCHY">), the server's ID
 (@@server_id) is used to identify records.
diff --git a/bin/pt-replica-restart b/bin/pt-replica-restart
index 0dfdb45c9..6a8366024 100755
--- a/bin/pt-replica-restart
+++ b/bin/pt-replica-restart
@@ -6131,7 +6131,7 @@ Possible methods are:
   hosts        SHOW REPLICAS (SHOW SLAVE HOSTS before MySQL 8.1)
   none         Do not find replicas
 
-The processlist method is preferred because SHOW REPLCIAS is not reliable.
+The processlist method is preferred because SHOW REPLICAS is not reliable.
 However, the hosts method is required if the server uses a non-standard
 port (not 3306).  Usually pt-replica-restart does the right thing and finds
 the replicas, but you may give a preferred method and it will be used first.

From a2102efb868e091970f36e1596139dcbd52c35a1 Mon Sep 17 00:00:00 2001
From: Sveta Smirnova <sveta.smirnova@percona.com>
Date: Mon, 7 Oct 2024 15:52:38 +0300
Subject: [PATCH 31/31] PT-2340 - Support MySQL 8.4

- s/slave lag/replica lag/ in reports
---
 bin/pt-archiver             | 6 +++---
 bin/pt-online-schema-change | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/bin/pt-archiver b/bin/pt-archiver
index 4e3d48b7e..093b11af0 100755
--- a/bin/pt-archiver
+++ b/bin/pt-archiver
@@ -7285,7 +7285,7 @@ sub main {
          PTDEBUG && _d('Got another row in this chunk');
       }
 
-      # Check slave lag and wait if slave is too far behind.
+      # Check replica lag and wait if slave is too far behind.
       # Do this check every 100 rows
       if (@lag_dbh && $lag_count++ % 100 == 0 ) {
          foreach my $lag_server (@lag_dbh) {
@@ -7294,9 +7294,9 @@ sub main {
             if ( $lag_dbh ) {
                my $lag = $ms->get_replica_lag($lag_dbh);
                while ( !defined $lag || $lag > $o->get('max-lag') ) {
-                  PTDEBUG && _d("Sleeping: slave lag for server '$id' is", $lag);
+                  PTDEBUG && _d("Sleeping: replica lag for server '$id' is", $lag);
                   if ($o->got('progress')) {
-                     _d("Sleeping: slave lag for server '$id' is", $lag);
+                     _d("Sleeping: replica lag for server '$id' is", $lag);
                   }
                   sleep($o->get('check-interval'));
                   $lag = $ms->get_replica_lag($lag_dbh);
diff --git a/bin/pt-online-schema-change b/bin/pt-online-schema-change
index c9a784747..5e05bb173 100755
--- a/bin/pt-online-schema-change
+++ b/bin/pt-online-schema-change
@@ -9272,7 +9272,7 @@ sub main {
       }
 
       if ( my $dsn = $o->get('check-replica-lag') ) {
-         PTDEBUG && _d('Will use --check-replica-lag to check for slave lag');
+         PTDEBUG && _d('Will use --check-replica-lag to check for replica lag');
          my $cxn = $make_cxn->(
             dsn_string => $o->get('check-replica-lag'),
             #prev_dsn   => $cxn->dsn(),