Skip to content

Run mariabackup SST timeout command on foreground #368

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: 10.5
Choose a base branch
from
Open

Run mariabackup SST timeout command on foreground #368

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions scripts/wsrep_sst_mariabackup.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -809,9 +809,9 @@ recv_joiner()
fi
fi
if [ $koption -ne 0 ]; then
ltcmd="timeout -k $(( tmt+10 )) $tmt $tcmd"
ltcmd="timeout --foreground -k $(( tmt+10 )) $tmt $tcmd"
else
ltcmd="timeout -s 9 $tmt $tcmd"
ltcmd="timeout --foreground -s 9 $tmt $tcmd"
fi
fi
fi
Expand Down
5 changes: 5 additions & 0 deletions scripts/wsrep_sst_rsync.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,6 +142,8 @@ check_pid_and_port()
if ! check_port $pid "$port" "$utils"; then
wsrep_log_error "rsync or stunnel daemon port '$port'" \
"has been taken by another program"
ps --forest 1>&2
netstat -natp | grep "$port" 1>&2
exit 16 # EBUSY
fi
fi
Expand Down Expand Up @@ -551,6 +553,7 @@ EOF
WHOLE_FILE_OPT='--whole-file'
fi

ps --forest 1>&2
# Old filter - include everything except selected
# FILTER=(--exclude '*.err' --exclude '*.pid' --exclude '*.sock' \
# --exclude '*.conf' --exclude core --exclude 'galera.*' \
Expand Down Expand Up @@ -877,6 +880,8 @@ EOF
sleep 0.2
done

ps --forest 1>&2

echo "ready $ADDR:$RSYNC_PORT/$MODULE"

MYSQLD_PID="$WSREP_SST_OPT_PARENT"
Expand Down