diff options
Diffstat (limited to 'geo-replication/src/gverify.sh')
| -rwxr-xr-x | geo-replication/src/gverify.sh | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/geo-replication/src/gverify.sh b/geo-replication/src/gverify.sh index 692c1d68500..f5f70d245e0 100755 --- a/geo-replication/src/gverify.sh +++ b/geo-replication/src/gverify.sh @@ -180,6 +180,8 @@ function main() > $log_file inet6=$7 + local cmd_line + local ver # Use FORCE_BLOCKER flag in the error message to differentiate # between the errors which the force command should bypass @@ -206,13 +208,14 @@ function main() exit 1; fi; + cmd_line=$(cmd_slave); if [[ -z "${GR_SSH_IDENTITY_KEY}" ]]; then - ssh -p ${SSH_PORT} -oNumberOfPasswordPrompts=0 -oStrictHostKeyChecking=no $2@$3 "type -p gluster" + ver=$(ssh -p ${SSH_PORT} -oNumberOfPasswordPrompts=0 -oStrictHostKeyChecking=no $2@$3 bash -c "'$cmd_line'") else - ssh -p ${SSH_PORT} -i ${GR_SSH_IDENTITY_KEY} -oNumberOfPasswordPrompts=0 -oStrictHostKeyChecking=no $2@$3 "type -p gluster" + ver=$(ssh -p ${SSH_PORT} -i ${GR_SSH_IDENTITY_KEY} -oNumberOfPasswordPrompts=0 -oStrictHostKeyChecking=no $2@$3 bash -c "'$cmd_line'") fi - if [ $? -ne 0 ]; then + if [ -z "$ver" ]; then echo "FORCE_BLOCKER|gluster command not found on $3 for user $2." > $log_file exit 1; fi; |