Merge pull request #5424 from dlenev/ps-8.0-rpl_backup_locked_by_applier-fix

dlenev · web-flow · commit f3c6c56cc598 · 2024-09-12T16:33:43.000+02:00
PS-9328: Fix sporadic rpl.rpl_backup_locked_by_applier test failures (8.0 version)
diff --git a/mysql-test/suite/rpl/r/rpl_backup_locked_by_applier.result b/mysql-test/suite/rpl/r/rpl_backup_locked_by_applier.result
@@ -23,8 +23,8 @@ ERROR HY000: Lock wait timeout exceeded; try restarting transaction
 #
 # Unblock applier
 #
-SET DEBUG_SYNC = 'now SIGNAL continue_purge_applied_logs_after_backup_lock';
 # Removing debug point 'syncpoint_purge_applied_logs_after_backup_lock' from @@GLOBAL.debug
+SET DEBUG_SYNC = 'now SIGNAL continue_purge_applied_logs_after_backup_lock';
 #
 # Wait for replica to process the rest of the binlog
 #
diff --git a/mysql-test/suite/rpl/t/rpl_backup_locked_by_applier.test b/mysql-test/suite/rpl/t/rpl_backup_locked_by_applier.test
@@ -51,11 +51,11 @@ LOCK INSTANCE FOR BACKUP;
 --echo # Unblock applier
 --echo #
 
-SET DEBUG_SYNC = 'now SIGNAL continue_purge_applied_logs_after_backup_lock';
-
 --let $debug_point = syncpoint_purge_applied_logs_after_backup_lock
 --source include/remove_debug_point.inc
 
+SET DEBUG_SYNC = 'now SIGNAL continue_purge_applied_logs_after_backup_lock';
+
 --echo #
 --echo # Wait for replica to process the rest of the binlog
 --echo #

Original file line number	Diff line number	Diff line change
`@@ -23,8 +23,8 @@ ERROR HY000: Lock wait timeout exceeded; try restarting transaction`
`23`	`23`	`#`
`24`	`24`	`# Unblock applier`
`25`	`25`	`#`
`26`		`-SET DEBUG_SYNC = 'now SIGNAL continue_purge_applied_logs_after_backup_lock';`
`27`	`26`	`# Removing debug point 'syncpoint_purge_applied_logs_after_backup_lock' from @@GLOBAL.debug`
	`27`	`+SET DEBUG_SYNC = 'now SIGNAL continue_purge_applied_logs_after_backup_lock';`
`28`	`28`	`#`
`29`	`29`	`# Wait for replica to process the rest of the binlog`
`30`	`30`	`#`