MDEV-34998 addendum: post-fix corrections for SST scripts

Delaying scripts on joiner after SST/IST has been made
a common debug feature for all suitable SST/IST methods.

Also some minor fixes have been made for new tests.

mysql-test/suite/galera/r/galera_vote_during_ist.result

@@ -2,6 +2,7 @@ connection node_4;
 connection node_3;
 connection node_2;
 connection node_1;
+# Correct Galera library found
 connection node_1;
 connection node_2;
 connection node_3;
@@ -103,7 +104,7 @@ expect4_1
 DROP TABLE t1;
 DROP TABLE t2;
 DROP PROCEDURE p1;
-CALL mtr.add_suppression("BF applier failed to open_and_lock_tables: 1146");
+CALL mtr.add_suppression("BF applier thread=.+ failed to open_and_lock_tables for Table ");
 CALL mtr.add_suppression("Event 3 Write_rows_v1 apply failed: 1146");
 CALL mtr.add_suppression("Inconsistency detected: Failed on preordered");
 CALL mtr.add_suppression("Failed to apply write set");

mysql-test/suite/galera/r/galera_vote_joined_apply.result

@@ -2,6 +2,7 @@ connection node_4;
 connection node_3;
 connection node_2;
 connection node_1;
+# Correct Galera library found
 connection node_1;
 connection node_2;
 connection node_3;
@@ -87,7 +88,7 @@ expect4_390
 DROP TABLE t1;
 DROP PROCEDURE p1;
 connection node_4;
-CALL mtr.add_suppression("BF applier failed to open_and_lock_tables: 1146");
+CALL mtr.add_suppression("BF applier thread=.+ failed to open_and_lock_tables for Table ");
 CALL mtr.add_suppression("Event 3 Write_rows_v1 apply failed: 1146");
 CALL mtr.add_suppression("Inconsistency detected: Inconsistent by consensus");
 CALL mtr.add_suppression("Failed to apply write set: gtid:");

mysql-test/suite/galera/r/galera_vote_joined_skip.result

@@ -2,6 +2,7 @@ connection node_4;
 connection node_3;
 connection node_2;
 connection node_1;
+# Correct Galera library found
 connection node_1;
 connection node_2;
 connection node_3;
@@ -89,13 +90,13 @@ expect4_390
 DROP TABLE t1;
 DROP PROCEDURE p1;
 connection node_1;
-CALL mtr.add_suppression("BF applier failed to open_and_lock_tables: 1146");
+CALL mtr.add_suppression("BF applier thread=.+ failed to open_and_lock_tables for Table ");
 CALL mtr.add_suppression("Event 3 Write_rows_v1 apply failed: 1146");
 connection node_2;
-CALL mtr.add_suppression("BF applier failed to open_and_lock_tables: 1146");
+CALL mtr.add_suppression("BF applier thread=.+ failed to open_and_lock_tables for Table ");
 CALL mtr.add_suppression("Event 3 Write_rows_v1 apply failed: 1146");
 connection node_3;
-CALL mtr.add_suppression("Vote 0 \\(success\\) on .* is inconsistent with group");
+CALL mtr.add_suppression("Vote 0 \\(success\\) on .+ is inconsistent with group");
 connection node_4;
-CALL mtr.add_suppression("BF applier failed to open_and_lock_tables: 1146");
+CALL mtr.add_suppression("BF applier thread=.+ failed to open_and_lock_tables for Table ");
 CALL mtr.add_suppression("Event 3 Write_rows_v1 apply failed: 1146");

mysql-test/suite/galera/t/galera_vote_during_ist.test

@@ -5,8 +5,13 @@
 
 --source include/galera_cluster.inc
 --source include/big_test.inc
+--source include/have_debug.inc
 --source include/have_debug_sync.inc
 
+# Make sure that the test is operating on the right version of galera library.
+--let $galera_version=26.4.19
+source ../wsrep/include/check_galera_version.inc;
+
 --let $node_1=node_1
 --let $node_2=node_2
 --let $node_3=node_3
@@ -150,7 +155,7 @@ DROP TABLE t1;
 DROP TABLE t2;
 DROP PROCEDURE p1;
 
-CALL mtr.add_suppression("BF applier failed to open_and_lock_tables: 1146");
+CALL mtr.add_suppression("BF applier thread=.+ failed to open_and_lock_tables for Table ");
 CALL mtr.add_suppression("Event 3 Write_rows_v1 apply failed: 1146");
 CALL mtr.add_suppression("Inconsistency detected: Failed on preordered");
 CALL mtr.add_suppression("Failed to apply write set");

mysql-test/suite/galera/t/galera_vote_joined_apply.test

@@ -67,7 +67,7 @@ DROP TABLE t2;
 --source galera_vote_joined_end.inc
 
 --connection node_4
-CALL mtr.add_suppression("BF applier failed to open_and_lock_tables: 1146");
+CALL mtr.add_suppression("BF applier thread=.+ failed to open_and_lock_tables for Table ");
 CALL mtr.add_suppression("Event 3 Write_rows_v1 apply failed: 1146");
 CALL mtr.add_suppression("Inconsistency detected: Inconsistent by consensus");
 CALL mtr.add_suppression("Failed to apply write set: gtid:");

mysql-test/suite/galera/t/galera_vote_joined_begin.inc

@@ -4,8 +4,13 @@
 
 --source include/galera_cluster.inc
 --source include/big_test.inc
+--source include/have_debug.inc
 --source include/have_debug_sync.inc
 
+# Make sure that the test is operating on the right version of galera library.
+--let $galera_version=26.4.19
+source ../wsrep/include/check_galera_version.inc;
+
 --let $node_1=node_1
 --let $node_2=node_2
 --let $node_3=node_3

mysql-test/suite/galera/t/galera_vote_joined_end.inc

@@ -10,14 +10,14 @@
 SELECT count(*) AS expect1_390 FROM t1;
 
 #CALL mtr.add_suppression("Replica SQL: Could not execute Delete_rows");
-#CALL mtr.add_suppression("Event 3 Delete_rows apply failed: 120, seqno [0-9]*");
+#CALL mtr.add_suppression("Event 3 Delete_rows apply failed: 120, seqno [0-9]+");
 
 --connection node_2
 SELECT count(*) AS expect2_390 FROM t1;
 
 #CALL mtr.add_suppression("mysqld: Can't find record in 't1'");
 #CALL mtr.add_suppression("Replica SQL: Could not execute Delete_rows");
-#CALL mtr.add_suppression("Event 3 Delete_rows apply failed: 120, seqno seqno [0-9]*");
+#CALL mtr.add_suppression("Event 3 Delete_rows apply failed: 120, seqno seqno [0-9]+");
 
 --connection node_3
 SELECT count(*) AS expect3_390 FROM t1;

mysql-test/suite/galera/t/galera_vote_joined_skip.test

@@ -85,16 +85,16 @@ EOF
 --source galera_vote_joined_end.inc
 
 --connection node_1
-CALL mtr.add_suppression("BF applier failed to open_and_lock_tables: 1146");
+CALL mtr.add_suppression("BF applier thread=.+ failed to open_and_lock_tables for Table ");
 CALL mtr.add_suppression("Event 3 Write_rows_v1 apply failed: 1146");
 
 --connection node_2
-CALL mtr.add_suppression("BF applier failed to open_and_lock_tables: 1146");
+CALL mtr.add_suppression("BF applier thread=.+ failed to open_and_lock_tables for Table ");
 CALL mtr.add_suppression("Event 3 Write_rows_v1 apply failed: 1146");
 
 --connection node_3
-CALL mtr.add_suppression("Vote 0 \\(success\\) on .* is inconsistent with group");
+CALL mtr.add_suppression("Vote 0 \\(success\\) on .+ is inconsistent with group");
 
 --connection node_4
-CALL mtr.add_suppression("BF applier failed to open_and_lock_tables: 1146");
+CALL mtr.add_suppression("BF applier thread=.+ failed to open_and_lock_tables for Table ");
 CALL mtr.add_suppression("Event 3 Write_rows_v1 apply failed: 1146");

scripts/wsrep_sst_common.sh

@@ -1910,4 +1910,17 @@ create_data
 
 SST_PID="$DATA/wsrep_sst.pid"
 
+if [ -n "${MTR_SST_JOINER_DELAY:-}" ]; then
+    MTR_SST_JOINER_DELAY=$(trim_string "$MTR_SST_JOINER_DELAY")
+fi
+
+simulate_long_sst()
+{
+    # Delay for MTR tests if needed to simulate long SST/IST:
+    if [ ${MTR_SST_JOINER_DELAY:-0} -gt 0 ]; then
+        wsrep_log_info "Sleeping $MTR_SST_JOINER_DELAY seconds for MTR test"
+        sleep $MTR_SST_JOINER_DELAY
+    fi
+}
+
 wsrep_log_info "$WSREP_METHOD $WSREP_TRANSFER_TYPE started on $WSREP_SST_OPT_ROLE"

scripts/wsrep_sst_mariabackup.sh

@@ -1519,6 +1519,8 @@ else # joiner
         exit 2
     fi
 
+    simulate_long_sst
+
     # use donor magic file, if present
     # if IST was used, donor magic file was not created
     # Remove special tags from the magic file, and from the output:

scripts/wsrep_sst_mysqldump.sh

@@ -184,5 +184,9 @@ else
     echo "$SET_START_POSITION" | $MYSQL || exit $?
 fi
 
+if [ "$WSREP_SST_OPT_ROLE" = 'joiner' ]; then
+    simulate_long_sst
+fi
+
 wsrep_log_info "$WSREP_METHOD $WSREP_TRANSFER_TYPE completed on $WSREP_SST_OPT_ROLE"
 exit 0

scripts/wsrep_sst_rsync.sh

@@ -915,12 +915,7 @@ EOF
         fi
     fi
 
-    # Delay for MTR tests if needed to simulate long SST
-    if [ ${MTR_SST_JOINER_DELAY:=0} -gt 0 ]
-    then
-        wsrep_log_info "Sleeping $MTR_SST_JOINER_DELAY seconds for MTR test"
-        sleep $MTR_SST_JOINER_DELAY
-    fi
+    simulate_long_sst
 
     # Remove special tags from the magic file, and from the output:
     coords=$(head -n1 "$MAGIC_FILE")