diff options
| author | Vincent Milum Jr <github@darkain.com> | 2020-02-11 10:27:59 -0800 |
|---|---|---|
| committer | Jan Lindström <jan.lindstrom@mariadb.com> | 2020-06-24 08:14:32 +0300 |
| commit | fe0cf85d5adb2a9cb619d7137f971b7579d85d02 (patch) | |
| tree | 05b8178cc8ca9a8fb24b8039ab738c58903bac68 | |
| parent | eba918977793f0995d2f4f7707fc5dd891da4064 (diff) | |
| download | mariadb-git-fe0cf85d5adb2a9cb619d7137f971b7579d85d02.tar.gz | |
MDEV-21709 ZFS snapdir=visible breaks Galera rsync SST replcation
Fix for Galera rsync SST with the specific conditions listed in MDEV-21709
Exclude needs to be on receiving side too
| -rw-r--r-- | scripts/wsrep_sst_rsync.sh | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/scripts/wsrep_sst_rsync.sh b/scripts/wsrep_sst_rsync.sh index ef32e77e20d..ce970ed67e1 100644 --- a/scripts/wsrep_sst_rsync.sh +++ b/scripts/wsrep_sst_rsync.sh @@ -198,6 +198,7 @@ fi # New filter - exclude everything except dirs (schemas) and innodb files FILTER="-f '- /lost+found' + -f '- /.zfs' -f '- /.fseventsd' -f '- /.Trashes' -f '+ /wsrep_sst_binlog.tar' @@ -354,7 +355,7 @@ EOF [ "$OS" = "Linux" ] && count=$(grep -c processor /proc/cpuinfo) [ "$OS" = "Darwin" -o "$OS" = "FreeBSD" ] && count=$(sysctl -n hw.ncpu) - find . -maxdepth 1 -mindepth 1 -type d -not -name "lost+found" \ + find . -maxdepth 1 -mindepth 1 -type d -not -name "lost+found" -not -name ".zfs" \ -print0 | xargs -I{} -0 -P $count \ rsync ${STUNNEL:+--rsh="$STUNNEL"} \ --owner --group --perms --links --specials \ @@ -437,6 +438,7 @@ timeout = 300 $SILENT [$MODULE] path = $WSREP_SST_OPT_DATA + exclude = .zfs [$MODULE-log_dir] path = $WSREP_LOG_DIR [$MODULE-data_dir] |