summaryrefslogtreecommitdiffstats
path: root/extras
diff options
context:
space:
mode:
authorKaleb S. KEITHLEY <kkeithle@redhat.com>2015-09-14 12:32:09 -0400
committerKaleb KEITHLEY <kkeithle@redhat.com>2015-09-24 16:36:01 -0700
commit045cb34238e341d68288893b8f040056e138c04e (patch)
tree10f790ea0b896c4cfcf51f5caa222eb886a78767 /extras
parent69e4d76e69537f8d42b4a11f8785ddaabb58b1dc (diff)
common-ha: refresh-config output includes dbus "method return" msg
filter out extraneous text from dbus-send Change-Id: If8467f8e756584027d36559960fd691dcaf98993 BUG: 1262881 Signed-off-by: Kaleb S. KEITHLEY <kkeithle@redhat.com> Reviewed-on: http://review.gluster.org/12174 Tested-by: NetBSD Build System <jenkins@build.gluster.org> Tested-by: Gluster Build System <jenkins@build.gluster.com> Reviewed-by: jiffin tony Thottan <jthottan@redhat.com> Reviewed-by: soumya k <skoduri@redhat.com>
Diffstat (limited to 'extras')
-rw-r--r--extras/ganesha/scripts/ganesha-ha.sh34
1 files changed, 18 insertions, 16 deletions
diff --git a/extras/ganesha/scripts/ganesha-ha.sh b/extras/ganesha/scripts/ganesha-ha.sh
index 2a9d696..ff6c1e1 100644
--- a/extras/ganesha/scripts/ganesha-ha.sh
+++ b/extras/ganesha/scripts/ganesha-ha.sh
@@ -249,10 +249,11 @@ grep Export_Id | cut -d " " -f8`
scp -q -oPasswordAuthentication=no -oStrictHostKeyChecking=no -i \
${SECRET_PEM} ${HA_CONFDIR}/exports/export.$VOL.conf \
${current_host}:${HA_CONFDIR}/exports/
- output=$(ssh -oPasswordAuthentication=no -oStrictHostKeyChecking=no -i \
-${SECRET_PEM} root@${current_host} "dbus-send --print-reply --system \
---dest=org.ganesha.nfsd /org/ganesha/nfsd/ExportMgr \
-org.ganesha.nfsd.exportmgr.RemoveExport uint16:$removed_id 2>&1")
+ output=$(ssh -oPasswordAuthentication=no \
+-oStrictHostKeyChecking=no -i ${SECRET_PEM} root@${current_host} \
+"dbus-send --print-reply --system --dest=org.ganesha.nfsd \
+/org/ganesha/nfsd/ExportMgr org.ganesha.nfsd.exportmgr.RemoveExport \
+uint16:$removed_id 2>&1 | grep -v \"^method return\"")
ret=$?
logger <<< "${output}"
if [ ${ret} -ne 0 ]; then
@@ -260,11 +261,12 @@ org.ganesha.nfsd.exportmgr.RemoveExport uint16:$removed_id 2>&1")
exit 1
fi
sleep 1
- output=$(ssh -oPasswordAuthentication=no -oStrictHostKeyChecking=no -i \
-${SECRET_PEM} root@${current_host} "dbus-send --system \
---dest=org.ganesha.nfsd /org/ganesha/nfsd/ExportMgr \
-org.ganesha.nfsd.exportmgr.AddExport string:$HA_CONFDIR/exports/export.$VOL.conf \
-string:\"EXPORT(Path=/$VOL)\" 2>&1")
+ output=$(ssh -oPasswordAuthentication=no \
+-oStrictHostKeyChecking=no -i ${SECRET_PEM} root@${current_host} \
+"dbus-send --system --dest=org.ganesha.nfsd \
+/org/ganesha/nfsd/ExportMgr org.ganesha.nfsd.exportmgr.AddExport \
+string:$HA_CONFDIR/exports/export.$VOL.conf \
+string:\"EXPORT(Path=/$VOL)\" 2>&1 | grep -v \"^method return\"")
ret=$?
logger <<< "${output}"
if [ ${ret} -ne 0 ]; then
@@ -283,9 +285,9 @@ string:\"EXPORT(Path=/$VOL)\" 2>&1")
fi
#Run the same command on the localhost,
- output=$(dbus-send --print-reply --system \
---dest=org.ganesha.nfsd /org/ganesha/nfsd/ExportMgr \
-org.ganesha.nfsd.exportmgr.RemoveExport uint16:$removed_id 2>&1)
+ output=$(dbus-send --print-reply --system --dest=org.ganesha.nfsd \
+/org/ganesha/nfsd/ExportMgr org.ganesha.nfsd.exportmgr.RemoveExport \
+uint16:$removed_id 2>&1 | grep -v "^method return")
ret=$?
logger <<< "${output}"
if [ ${ret} -ne 0 ]; then
@@ -293,10 +295,10 @@ org.ganesha.nfsd.exportmgr.RemoveExport uint16:$removed_id 2>&1)
exit 1
fi
sleep 1
- output=$(dbus-send --system \
---dest=org.ganesha.nfsd /org/ganesha/nfsd/ExportMgr \
-org.ganesha.nfsd.exportmgr.AddExport string:$HA_CONFDIR/exports/export.$VOL.conf \
-string:"EXPORT(Path=/$VOL)" 2>&1)
+ output=$(dbus-send --system --dest=org.ganesha.nfsd \
+/org/ganesha/nfsd/ExportMgr org.ganesha.nfsd.exportmgr.AddExport \
+string:$HA_CONFDIR/exports/export.$VOL.conf \
+string:"EXPORT(Path=/$VOL)" 2>&1 | grep -v "^method return")
ret=$?
logger <<< "${output}"
if [ ${ret} -ne 0 ] ; then