diff options
author | Nirbhay Choubey <nirbhay@skysql.com> | 2014-06-10 17:00:32 -0400 |
---|---|---|
committer | Nirbhay Choubey <nirbhay@skysql.com> | 2014-06-10 17:00:32 -0400 |
commit | c29cbac2eb06ab4a2bf1aeda65c15fce40a84345 (patch) | |
tree | 9d5b5dab4dfd0fe78084b0654cd06d6f3fc1171b /scripts/wsrep_sst_rsync.sh | |
parent | 90ead99572c8168583cb0943792d964cc2a6abd2 (diff) | |
download | mariadb-git-c29cbac2eb06ab4a2bf1aeda65c15fce40a84345.tar.gz |
bzr merge -r3985..3997 codership/5.5
Diffstat (limited to 'scripts/wsrep_sst_rsync.sh')
-rwxr-xr-x | scripts/wsrep_sst_rsync.sh | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/scripts/wsrep_sst_rsync.sh b/scripts/wsrep_sst_rsync.sh index bd8f03846e9..464b2b1ef3e 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 @@ -28,6 +28,8 @@ export PATH="/usr/sbin:/sbin:$PATH" . $(dirname $0)/wsrep_sst_common +wsrep_check_programs rsync + cleanup_joiner() { wsrep_log_info "Joiner cleanup." @@ -202,6 +204,8 @@ then elif [ "$WSREP_SST_OPT_ROLE" = "joiner" ] then + wsrep_check_programs lsof + touch $SST_PROGRESS_FILE MYSQLD_PID=$WSREP_SST_OPT_PARENT |