From d9b0219d9e41c711dd8ff4447e267defd774c679 Mon Sep 17 00:00:00 2001
From: Sveta Smirnova <sveta.smirnova@percona.com>
Date: Sat, 14 Dec 2024 20:19:03 +0300
Subject: [PATCH] Changed replica_parallel_workers in configuration for 8.0 and
 8.4 to o, because wiat_for_replicas is buggy for multi-threaded slaves

---
 sandbox/servers/8.0/my.sandbox.cnf | 3 +++
 sandbox/servers/8.4/my.sandbox.cnf | 3 +++
 t/pt-table-checksum/pt-1616.t      | 4 +++-
 3 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/sandbox/servers/8.0/my.sandbox.cnf b/sandbox/servers/8.0/my.sandbox.cnf
index 07c2f586..88357144 100644
--- a/sandbox/servers/8.0/my.sandbox.cnf
+++ b/sandbox/servers/8.0/my.sandbox.cnf
@@ -40,3 +40,6 @@ binlog_format              = STATEMENT
 #performance-schema-instrument='wait/lock/metadata/sql/mdl=ON'
 #performance-schema-instrument='transaction=ON'
 secure-file-priv           =
+
+# wait_for_replica buggy on multi-threaded replica
+slave-parallel-workers=0
diff --git a/sandbox/servers/8.4/my.sandbox.cnf b/sandbox/servers/8.4/my.sandbox.cnf
index 6eeb1d11..20e04a5f 100644
--- a/sandbox/servers/8.4/my.sandbox.cnf
+++ b/sandbox/servers/8.4/my.sandbox.cnf
@@ -40,3 +40,6 @@ binlog_format              = STATEMENT
 #performance-schema-instrument='wait/lock/metadata/sql/mdl=ON'
 #performance-schema-instrument='transaction=ON'
 secure-file-priv           =
+
+# wait_for_replica buggy on multi-threaded replica
+replica-parallel-workers=0
diff --git a/t/pt-table-checksum/pt-1616.t b/t/pt-table-checksum/pt-1616.t
index 19e6a084..f4986a29 100644
--- a/t/pt-table-checksum/pt-1616.t
+++ b/t/pt-table-checksum/pt-1616.t
@@ -106,7 +106,7 @@ unlike(
 # #############################################################################
 # Done.
 # #############################################################################
-# Resetting replicas, because this test sporadically fails
+diag("Resetting replicas, because this test sporadically fails");
 $replica1_dbh->do("STOP ${replica_name}");
 $replica2_dbh->do("STOP ${replica_name}");
 $dbh->do("RESET ${source_reset}");
@@ -115,7 +115,9 @@ $replica1_dbh->do("START ${replica_name}");
 $replica2_dbh->do("RESET ${replica_name}");
 $replica2_dbh->do("START ${replica_name}");
 
+diag("Replicas reset, syncing");
 $sb->wait_for_replicas();
+diag("Cleaning up");
 $sb->wipe_clean($dbh);
 ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox");
 exit;