diff options
| author | Kotresh HR <khiremat@redhat.com> | 2019-07-31 15:40:55 +0530 |
|---|---|---|
| committer | Sunny Kumar <sunkumar@redhat.com> | 2019-08-07 04:51:13 +0000 |
| commit | 05f9dc24e13df9f993438ee9b98b7a1052cf8b12 (patch) | |
| tree | 13ac819359e8879022579e24485e5c83b0417aad | |
| parent | 24293229112670149226a44d4d2f87829e248718 (diff) | |
geo-rep: Fix mount broker setup issue
Even the use builtin 'type' command as in patch [1]
causes issues if argument in question is not part of PATH
environment variable for that user. This patch fixes the
same by doing source /etc/profile. This was already being
used in another part of script.
[1] https://review.gluster.org/23089
Backport of:
> Patch: https://review.gluster.org/23136/
> Change-Id: Iceb78835967ec6a4350983eec9af28398410c002
> BUG: 1734738
> Signed-off-by: Kotresh HR <khiremat@redhat.com>
(cherry picked from commit 84f7794547522463841068063b22fd3a8d8fca2b)
Change-Id: Iceb78835967ec6a4350983eec9af28398410c002
fixes: bz#1737712
Signed-off-by: Kotresh HR <khiremat@redhat.com>
| -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; |