Bug#32636922 PB2 FAILURES ON 5.7 DUE TO BUG#26883680

Kapil Agrawal · surbhat1595 · commit 3fdbb868946c · 2021-03-22T13:09:01.000+01:00
Problem
-------

1. rpl_mts_spco_deadlock_slave_trans_retries_hang fails on Linux Valgrind
   due to wrong warning suppression getting suppressed.

2. rpl_mts_spco_deadlock_hang_on_non_temp_error fails on windows due to
   wrong pattern matching count.

Solution
--------

1. To fix this issue, Warning that workers print is modified such that it
   will work for all worker Ids.

2. To fix this issue, the assert file has been changed to a different error
   log such that it doesn't encounter the matching pattern more than once.

RB#26080

(cherry picked from commit 685ce79b271703d29d4cb749dfc775be7a3dea0f)
diff --git a/mysql-test/suite/rpl/r/rpl_mts_spco_deadlock_slave_trans_retries_hang.result b/mysql-test/suite/rpl/r/rpl_mts_spco_deadlock_slave_trans_retries_hang.result
@@ -50,7 +50,7 @@ include/start_slave_sql.inc
 ROLLBACK;
 #
 # Add error supressions.
-CALL mtr.add_suppression("Worker 2 failed executing transaction.*");
+CALL mtr.add_suppression("Worker .* failed executing transaction.*");
 #
 # 3.2. Wait till the co-ordinator thread to error out with ER_LOCK_DEADLOCK.
 include/wait_for_slave_sql_error.inc [errno=1213]
diff --git a/mysql-test/suite/rpl/t/rpl_mts_spco_deadlock_hang_on_non_temp_error-slave.opt b/mysql-test/suite/rpl/t/rpl_mts_spco_deadlock_hang_on_non_temp_error-slave.opt
@@ -0,0 +1 @@
+--no-console --log_error=$MYSQLTEST_VARDIR/tmp/rpl_mts_spco_deadlock_hang_on_non_temp_error.2.err
diff --git a/mysql-test/suite/rpl/t/rpl_mts_spco_deadlock_hang_on_non_temp_error.test b/mysql-test/suite/rpl/t/rpl_mts_spco_deadlock_hang_on_non_temp_error.test
@@ -189,7 +189,7 @@ COMMIT;
 --echo # 3.11 Check that worker 2 did not *retry* transaction-2
 --echo #      before throwing ER_DUP_ENTRY error (non-temporary error).
 --echo #
---let $assert_file= $MYSQLTEST_VARDIR/log/mysqld.2.err
+--let $assert_file= $MYSQLTEST_VARDIR/tmp/rpl_mts_spco_deadlock_hang_on_non_temp_error.2.err
 --let $assert_only_after = CURRENT_TEST: rpl.rpl_mts_spco_deadlock_hang_on_non_temp_error
 --let $assert_count = 1
 --let $assert_select = Error 'Duplicate entry '1' for key 'PRIMARY'' on query
diff --git a/mysql-test/suite/rpl/t/rpl_mts_spco_deadlock_slave_trans_retries_hang.test b/mysql-test/suite/rpl/t/rpl_mts_spco_deadlock_slave_trans_retries_hang.test
@@ -149,7 +149,7 @@ ROLLBACK;
 
 --echo #
 --echo # Add error supressions.
-CALL mtr.add_suppression("Worker 2 failed executing transaction.*");
+CALL mtr.add_suppression("Worker .* failed executing transaction.*");
 
 --echo #
 --echo # 3.2. Wait till the co-ordinator thread to error out with ER_LOCK_DEADLOCK.

Original file line number	Diff line number	Diff line change
`@@ -50,7 +50,7 @@ include/start_slave_sql.inc`
`50`	`50`	`ROLLBACK;`
`51`	`51`	`#`
`52`	`52`	`# Add error supressions.`
`53`		`-CALL mtr.add_suppression("Worker 2 failed executing transaction.*");`
	`53`	`+CALL mtr.add_suppression("Worker .* failed executing transaction.*");`
`54`	`54`	`#`
`55`	`55`	`# 3.2. Wait till the co-ordinator thread to error out with ER_LOCK_DEADLOCK.`
`56`	`56`	`include/wait_for_slave_sql_error.inc [errno=1213]`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+--no-console --log_error=$MYSQLTEST_VARDIR/tmp/rpl_mts_spco_deadlock_hang_on_non_temp_error.2.err`