Skip to content
Permalink
Browse files
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
  • Loading branch information
mkaruza committed Jun 20, 2018
1 parent e5c6580 commit 7a7a619
Show file tree
Hide file tree
Showing 2 changed files with 24 additions and 1 deletion.
@@ -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

@@ -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

0 comments on commit 7a7a619

Please sign in to comment.