diff options
| author | Sergei Petrunia <psergey@askmonty.org> | 2016-03-28 22:18:38 +0300 |
|---|---|---|
| committer | Sergei Petrunia <psergey@askmonty.org> | 2016-03-28 22:18:38 +0300 |
| commit | 2bd4dc38e0d5eb257e2e29413dd01239ce075d42 (patch) | |
| tree | dad0557b1d927d012aebd1c36c8c3e00462adcb1 /scripts/wsrep_sst_rsync.sh | |
| parent | 44fdb56c977259b2801c612116813beda403df78 (diff) | |
| parent | 3df261dc31ab18ee1537f327b07320b0a07fb8f5 (diff) | |
| download | mariadb-git-2bd4dc38e0d5eb257e2e29413dd01239ce075d42.tar.gz | |
Merge branch '10.2' into bb-10.2-mdev9543
Diffstat (limited to 'scripts/wsrep_sst_rsync.sh')
| -rw-r--r-- | scripts/wsrep_sst_rsync.sh | 17 |
1 files changed, 15 insertions, 2 deletions
diff --git a/scripts/wsrep_sst_rsync.sh b/scripts/wsrep_sst_rsync.sh index a93ab940593..7e895aa4eb2 100644 --- a/scripts/wsrep_sst_rsync.sh +++ b/scripts/wsrep_sst_rsync.sh @@ -127,7 +127,10 @@ then then FLUSHED="$WSREP_SST_OPT_DATA/tables_flushed" + ERROR="$WSREP_SST_OPT_DATA/sst_error" + rm -rf "$FLUSHED" + rm -rf "$ERROR" # Use deltaxfer only for WAN inv=$(basename $0) @@ -137,10 +140,20 @@ then echo "flush tables" # Wait for : - # (a) tables to be flushed, and - # (b) state ID & wsrep_gtid_domain_id to be written to the file. + # (a) Tables to be flushed, AND + # (b) Cluster state ID & wsrep_gtid_domain_id to be written to the file, OR + # (c) ERROR file, in case flush tables operation failed. + while [ ! -r "$FLUSHED" ] && ! grep -q ':' "$FLUSHED" >/dev/null 2>&1 do + # Check whether ERROR file exists. + if [ -f "$ERROR" ] + then + # Flush tables operation failed. + rm -rf "$ERROR" + exit 255 + fi + sleep 0.2 done |