From e5c6580178a8d660c03fe9fab09c539cedf6fb34 Mon Sep 17 00:00:00 2001
From: mkaruza <mario.karuza@gmail.com>
Date: Tue, 19 Jun 2018 16:09:31 +0200
Subject: MDEV-15442 xtrabackup-v2 SST donor stuck in DONOR/DESYNCED state when
 joiner is killed

Monitor mysqld process and if it is terminated during sst stream kill xtrabackup-v2 script and children
---
 scripts/wsrep_sst_xtrabackup-v2.sh | 23 ++++++++++++++++++++++-
 1 file changed, 22 insertions(+), 1 deletion(-)

(limited to 'scripts')

diff --git a/scripts/wsrep_sst_xtrabackup-v2.sh b/scripts/wsrep_sst_xtrabackup-v2.sh
index 00efdaeebcf..99bbabbe9be 100644
--- a/scripts/wsrep_sst_xtrabackup-v2.sh
+++ b/scripts/wsrep_sst_xtrabackup-v2.sh
@@ -801,6 +801,27 @@ check_for_version()
     fi
 }
 
+monitor_process()
+{
+    local sst_stream_pid=$1
+
+    while true ; do
+
+        if ! ps --pid "${WSREP_SST_OPT_PARENT}" &>/dev/null; then
+            wsrep_log_error "Parent mysqld process (PID:${WSREP_SST_OPT_PARENT}) terminated unexpectedly." 
+            kill -- -"${WSREP_SST_OPT_PARENT}"
+            exit 32
+        fi
+
+        if ! ps --pid "${sst_stream_pid}" &>/dev/null; then 
+            break
+        fi
+
+        sleep 0.1
+
+    done
+}
+
 
 if [[ ! -x `which $INNOBACKUPEX_BIN` ]];then 
     wsrep_log_error "innobackupex not in path: $PATH"
@@ -1102,7 +1123,7 @@ then
 
         MAGIC_FILE="${DATA}/${INFO_FILE}"
         wsrep_log_info "Waiting for SST streaming to complete!"
-        wait $jpid
+        monitor_process $jpid
 
         get_proc
 
-- 
cgit v1.2.1


From 7a7a61998c60b8114994b29d5f649637be8139e0 Mon Sep 17 00:00:00 2001
From: mkaruza <mario.karuza@gmail.com>
Date: Wed, 20 Jun 2018 13:16:34 +0200
Subject: MDEV-15442 xtrabackup-v2 SST donor stuck in DONOR/DESYNCED state when
 joiner is killed

SST transfer scripts rsync and maribackup now monitor parent process and will cleanup if process dies
---
 scripts/wsrep_sst_mariabackup.sh | 23 ++++++++++++++++++++++-
 scripts/wsrep_sst_rsync.sh       |  2 ++
 2 files changed, 24 insertions(+), 1 deletion(-)

(limited to 'scripts')

diff --git a/scripts/wsrep_sst_mariabackup.sh b/scripts/wsrep_sst_mariabackup.sh
index 549161aa8f3..ea0a6fc0d51 100644
--- a/scripts/wsrep_sst_mariabackup.sh
+++ b/scripts/wsrep_sst_mariabackup.sh
@@ -644,6 +644,27 @@ send_donor()
 
 }
 
+monitor_process()
+{
+    local sst_stream_pid=$1
+
+    while true ; do
+
+        if ! ps --pid "${WSREP_SST_OPT_PARENT}" &>/dev/null; then
+            wsrep_log_error "Parent mysqld process (PID:${WSREP_SST_OPT_PARENT}) terminated unexpectedly." 
+            kill -- -"${WSREP_SST_OPT_PARENT}"
+            exit 32
+        fi
+
+        if ! ps --pid "${sst_stream_pid}" &>/dev/null; then 
+            break
+        fi
+
+        sleep 0.1
+
+    done
+}
+
 if [[ ! -x `which $INNOBACKUPEX_BIN` ]];then 
     wsrep_log_error "${INNOBACKUPEX_BIN} not in path: $PATH"
     exit 2
@@ -932,7 +953,7 @@ then
 
         MAGIC_FILE="${DATA}/${INFO_FILE}"
         wsrep_log_info "Waiting for SST streaming to complete!"
-        wait $jpid
+        monitor_process $jpid
 
         get_proc
 
diff --git a/scripts/wsrep_sst_rsync.sh b/scripts/wsrep_sst_rsync.sh
index 3d76d1780e2..81120b66d5a 100644
--- a/scripts/wsrep_sst_rsync.sh
+++ b/scripts/wsrep_sst_rsync.sh
@@ -329,6 +329,8 @@ EOF
     then
         wsrep_log_error \
         "Parent mysqld process (PID:$MYSQLD_PID) terminated unexpectedly."
+        kill -- -"${MYSQLD_PID}"
+        sleep 1
         exit 32
     fi
 
-- 
cgit v1.2.1