database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

MDEV-25975: Merge 10.3 into 10.4

Browse Source
This commit is contained in:
Marko Mäkelä
2022-04-06 09:18:38 +03:00
parent f089f8d95e e9735a8185
commit d172df9913
33 changed files with 181 additions and 467 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
scripts/wsrep_sst_rsync.sh
View File

@ -3,7 +3,7 @@
set -ue
# Copyright (C) 2017-2022 MariaDB
# Copyright (C) 2010-2014 Codership Oy
# Copyright (C) 2010-2022 Codership Oy
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@ -416,6 +416,8 @@ EOF
sync
wsrep_log_info "Tables flushed"
if [ -n "$WSREP_SST_OPT_BINLOG" ]; then
# Change the directory to binlog base (if possible):
cd "$DATA"
@ -557,6 +559,8 @@ FILTER="-f '- /lost+found'
exit $RC
fi
wsrep_log_info "Transfer of normal directories done"
# Transfer InnoDB data files
rsync ${STUNNEL:+--rsh="$STUNNEL"} \
--owner --group --perms --links --specials \
@ -570,6 +574,8 @@ FILTER="-f '- /lost+found'
exit 255 # unknown error
fi
wsrep_log_info "Transfer of InnoDB data files done"
# second, we transfer InnoDB and Aria log files
rsync ${STUNNEL:+--rsh="$STUNNEL"} \
--owner --group --perms --links --specials \
@ -583,6 +589,8 @@ FILTER="-f '- /lost+found'
exit 255 # unknown error
fi
wsrep_log_info "Transfer of InnoDB and Aria log files done"
# then, we parallelize the transfer of database directories,
# use '.' so that path concatenation works:
@ -610,6 +618,9 @@ FILTER="-f '- /lost+found'
exit 255 # unknown error
fi
wsrep_log_info "Transfer of data done"
else # BYPASS
wsrep_log_info "Bypassing state dump."
@ -620,6 +631,7 @@ FILTER="-f '- /lost+found'
fi
wsrep_log_info "Sending continue to donor"
echo 'continue' # now server can resume updating data
echo "$STATE" > "$MAGIC_FILE"