Merge branch '10.5' into '10.6'

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,6 +915,8 @@ EOF
         fi
     fi
 
+    simulate_long_sst
+
     # Remove special tags from the magic file, and from the output:
     coords=$(head -n1 "$MAGIC_FILE")
     wsrep_log_info "Galera co-ords from recovery: $coords"