diff options
| author | Nirbhay Choubey <nirbhay@skysql.com> | 2014-05-21 15:04:13 -0400 |
|---|---|---|
| committer | Nirbhay Choubey <nirbhay@skysql.com> | 2014-05-21 15:04:13 -0400 |
| commit | 81a85ad8d702ddfaf91dc43b5a0bc78857759209 (patch) | |
| tree | d0eb9731f3fefc18ce683810a6a3b96285c9cbd0 /scripts/wsrep_sst_rsync.sh | |
| parent | 99df0fbad5147b02ffed926f50cef11f9427e398 (diff) | |
| download | mariadb-git-81a85ad8d702ddfaf91dc43b5a0bc78857759209.tar.gz | |
bzr merge -r3985..3991 codership/5.5
Diffstat (limited to 'scripts/wsrep_sst_rsync.sh')
| -rwxr-xr-x | scripts/wsrep_sst_rsync.sh | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/scripts/wsrep_sst_rsync.sh b/scripts/wsrep_sst_rsync.sh index 8ab1c771ad6..af3c2bb23cd 100755 --- a/scripts/wsrep_sst_rsync.sh +++ b/scripts/wsrep_sst_rsync.sh @@ -1,6 +1,6 @@ #!/bin/bash -ue -# Copyright (C) 2010 Codership Oy +# Copyright (C) 2010-2014 Codership Oy # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -23,11 +23,13 @@ RSYNC_CONF= OS=$(uname) [ "$OS" == "Darwin" ] && export -n LD_LIBRARY_PATH -. $(dirname $0)/wsrep_sst_common - # Setting the path for lsof on CentOS export PATH="/usr/sbin:/sbin:$PATH" +. $(dirname $0)/wsrep_sst_common + +wsrep_check_programs rsync + cleanup_joiner() { wsrep_log_info "Joiner cleanup." @@ -197,6 +199,8 @@ then elif [ "$WSREP_SST_OPT_ROLE" = "joiner" ] then + wsrep_check_programs lsof + touch $SST_PROGRESS_FILE MYSQLD_PID=$WSREP_SST_OPT_PARENT |