From a6a3199a3c7dbce26628920728a0cb7119687535 Mon Sep 17 00:00:00 2001
From: Sveta Smirnova <sveta.smirnova@percona.com>
Date: Fri, 13 Dec 2024 17:28:39 +0300
Subject: [PATCH] Setting SQL Delay back to 0 explicitly

---
 t/pt-archiver/replica_lag.t                | 1 +
 t/pt-online-schema-change/pt-1717-resume.t | 1 +
 t/pt-online-schema-change/pt-2168-cancel.t | 1 +
 t/pt-online-schema-change/pt-2168.t        | 1 +
 t/pt-online-schema-change/pt-2241.t        | 2 ++
 t/pt-online-schema-change/slave_lag.t      | 1 +
 t/pt-table-checksum/pt-1616.t              | 1 +
 7 files changed, 8 insertions(+)

diff --git a/t/pt-archiver/replica_lag.t b/t/pt-archiver/replica_lag.t
index 6204de60..dc88295a 100644
--- a/t/pt-archiver/replica_lag.t
+++ b/t/pt-archiver/replica_lag.t
@@ -251,6 +251,7 @@ like(
 # Done.
 # #############################################################################
 $replica1_dbh->do("STOP ${replica_name}");
+$replica1_dbh->do("CHANGE ${source_change} TO ${source_name}_DELAY=0");
 $source_dbh->do("RESET ${source_reset}");
 $replica1_dbh->do("RESET ${replica_name}");
 $replica1_dbh->do("START ${replica_name}");
diff --git a/t/pt-online-schema-change/pt-1717-resume.t b/t/pt-online-schema-change/pt-1717-resume.t
index b44138f1..295d814c 100644
--- a/t/pt-online-schema-change/pt-1717-resume.t
+++ b/t/pt-online-schema-change/pt-1717-resume.t
@@ -398,6 +398,7 @@ $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}");
+$replica_dbh1->do("CHANGE ${source_change} TO ${source_name}_DELAY=0");
 $source_dbh->do("RESET ${source_reset}");
 $replica_dbh1->do("RESET ${source_reset}");
 $replica_dbh1->do("RESET ${replica_name}");
diff --git a/t/pt-online-schema-change/pt-2168-cancel.t b/t/pt-online-schema-change/pt-2168-cancel.t
index 929d2ce5..0f7733a7 100644
--- a/t/pt-online-schema-change/pt-2168-cancel.t
+++ b/t/pt-online-schema-change/pt-2168-cancel.t
@@ -162,6 +162,7 @@ $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}");
+$replica_dbh1->do("CHANGE ${source_change} TO ${source_name}_DELAY=0");
 $source_dbh->do("RESET ${source_reset}");
 $replica_dbh1->do("RESET ${replica_name}");
 $replica_dbh2->do("RESET ${replica_name}");
diff --git a/t/pt-online-schema-change/pt-2168.t b/t/pt-online-schema-change/pt-2168.t
index 2a699345..9a32a262 100644
--- a/t/pt-online-schema-change/pt-2168.t
+++ b/t/pt-online-schema-change/pt-2168.t
@@ -328,6 +328,7 @@ $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}");
+$replica_dbh1->do("CHANGE ${source_change} TO ${source_name}_DELAY=0");
 $source_dbh->do("RESET ${source_reset}");
 $replica_dbh1->do("RESET ${replica_name}");
 $replica_dbh2->do("RESET ${replica_name}");
diff --git a/t/pt-online-schema-change/pt-2241.t b/t/pt-online-schema-change/pt-2241.t
index 42ded218..58f78f22 100644
--- a/t/pt-online-schema-change/pt-2241.t
+++ b/t/pt-online-schema-change/pt-2241.t
@@ -98,6 +98,8 @@ unlike(
 diag("Setting replica delay to 0 seconds");
 $replica1_dbh->do("STOP ${replica_name}");
 $replica2_dbh->do("STOP ${replica_name}");
+$replica1_dbh->do("CHANGE ${source_change} TO ${source_name}_DELAY=0");
+$replica2_dbh->do("CHANGE ${source_change} TO ${source_name}_DELAY=0");
 $source_dbh->do("RESET ${source_reset}");
 $replica1_dbh->do("RESET ${replica_name}");
 $replica1_dbh->do("START ${replica_name}");
diff --git a/t/pt-online-schema-change/slave_lag.t b/t/pt-online-schema-change/slave_lag.t
index 2deb055e..d18d8eaa 100644
--- a/t/pt-online-schema-change/slave_lag.t
+++ b/t/pt-online-schema-change/slave_lag.t
@@ -354,6 +354,7 @@ $sb->do_as_root("source", q/FLUSH TABLES/);
 
 diag("Setting replica delay to 0 seconds");
 $replica_dbh->do("STOP ${replica_name}");
+$replica_dbh->do("CHANGE ${source_change} TO ${source_name}_DELAY=0");
 $source_dbh->do("RESET ${source_reset}");
 $replica_dbh->do("RESET ${replica_name}");
 $replica_dbh->do("START ${replica_name}");
diff --git a/t/pt-table-checksum/pt-1616.t b/t/pt-table-checksum/pt-1616.t
index 1b937006..2ccfa85d 100644
--- a/t/pt-table-checksum/pt-1616.t
+++ b/t/pt-table-checksum/pt-1616.t
@@ -104,6 +104,7 @@ unlike(
 # #############################################################################
 # Done.
 # #############################################################################
+$sb->wait_for_replicas();
 $sb->wipe_clean($dbh);
 ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox");
 exit;