diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2020-12-01 14:55:46 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2020-12-01 14:55:46 +0200 |
| commit | 81ab9ea63f5d3ad4909bb75552008d6b035a371b (patch) | |
| tree | 6e65113d85d36c9f488da15540ddd601e7641fee /scripts | |
| parent | c537576495e1e651bf3dc63e5a569fcddd9fbec8 (diff) | |
| parent | e6b3e38d62d13206ae982fc7b740d5d8024b207a (diff) | |
| download | mariadb-git-81ab9ea63f5d3ad4909bb75552008d6b035a371b.tar.gz | |
Merge 10.2 into 10.3
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/wsrep_sst_rsync.sh | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/scripts/wsrep_sst_rsync.sh b/scripts/wsrep_sst_rsync.sh index 7638627c1ce..755ecc01bc1 100644 --- a/scripts/wsrep_sst_rsync.sh +++ b/scripts/wsrep_sst_rsync.sh @@ -399,6 +399,14 @@ then MODULE="rsync_sst" RSYNC_PID="$WSREP_SST_OPT_DATA/$MODULE.pid" + # give some time for lingering rsync from previous SST to complete + check_round=0 + while check_pid $RSYNC_PID && [ $check_round -lt 10 ] + do + wsrep_log_info "lingering rsync daemon found at startup, waiting for it to exit" + check_round=$(( check_round + 1 )) + sleep 1 + done if check_pid $RSYNC_PID then |