From 85019a113340ae6e7f4f1b2c0bfc32109521133a Mon Sep 17 00:00:00 2001 From: Vincent Milum Jr Date: Tue, 11 Feb 2020 10:27:59 -0800 Subject: [PATCH 1/2] MDEV-21709 ZFS snapdir=visible breaks Galera rsync SST replcation Fix for Galera rsync SST with the specific conditions listed in MDEV-21709 --- scripts/wsrep_sst_rsync.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/scripts/wsrep_sst_rsync.sh b/scripts/wsrep_sst_rsync.sh index 5403b9e850563..5de985237fc7f 100644 --- a/scripts/wsrep_sst_rsync.sh +++ b/scripts/wsrep_sst_rsync.sh @@ -200,6 +200,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' @@ -357,7 +358,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 \ From f986438cafb79086fa58b9f06f92b976da4467a8 Mon Sep 17 00:00:00 2001 From: Vincent Milum Jr Date: Tue, 11 Feb 2020 15:35:51 -0800 Subject: [PATCH 2/2] Exclude needs to be on receiving side too Exclude needs to be on receiving side too It is possible that other excludes may need to be added to the receiving side too that exist on the sending side. --- scripts/wsrep_sst_rsync.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts/wsrep_sst_rsync.sh b/scripts/wsrep_sst_rsync.sh index 5de985237fc7f..96e542ce8446c 100644 --- a/scripts/wsrep_sst_rsync.sh +++ b/scripts/wsrep_sst_rsync.sh @@ -441,6 +441,7 @@ timeout = 300 $SILENT [$MODULE] path = $WSREP_SST_OPT_DATA + exclude = .zfs [$MODULE-log_dir] path = $WSREP_LOG_DIR [$MODULE-data_dir]