diff options
| author | Vincent Milum Jr <github@darkain.com> | 2017-09-13 10:48:10 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-09-13 10:48:10 -0700 |
| commit | 7f2fab0106d8bb43fb8f590c1d243fab4f2ab1cf (patch) | |
| tree | 38df6ad1d59e71b2d1f413f3f362c8396a7a3473 /scripts/wsrep_sst_rsync.sh | |
| parent | 24062fed7026cd9a65864402a6a4761ef88ade39 (diff) | |
| download | mariadb-git-7f2fab0106d8bb43fb8f590c1d243fab4f2ab1cf.tar.gz | |
Fixes Galera on FreeBSD
Corrects the following error with rsync sst on FreeBSD:
WSREP_SST: [ERROR] rsync daemon port '4444' has been taken
The FreeBSD version of grep doesn't play nicely with the -w parameter mixed with [[:space:]] and ends up matching nothing. This causes the script to loop and attempt to spawn more than one instance of rsync, which fails with the initial instance already having the port open. Because of this, the entire script fails and no sst occurs resulting in the error message listed above appearing in the log file.
Diffstat (limited to 'scripts/wsrep_sst_rsync.sh')
| -rw-r--r-- | scripts/wsrep_sst_rsync.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/wsrep_sst_rsync.sh b/scripts/wsrep_sst_rsync.sh index 7acdf87b660..24720ff3587 100644 --- a/scripts/wsrep_sst_rsync.sh +++ b/scripts/wsrep_sst_rsync.sh @@ -68,7 +68,7 @@ check_pid_and_port() local port_info="$(sockstat -46lp ${rsync_port} 2>/dev/null | \ grep ":${rsync_port}")" local is_rsync="$(echo $port_info | \ - grep -w '[[:space:]]\+rsync[[:space:]]\+'"$rsync_pid" 2>/dev/null)" + grep '[[:space:]]\+rsync[[:space:]]\+'"$rsync_pid" 2>/dev/null)" ;; *) if ! which lsof > /dev/null; then |