sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-03-01 04:58:35 +03:00
Code

fixed up exit status for onnode

Browse Source 
(This used to be ctdb commit c26afe26cc5c1f9cd9eef74166b5fc39dde591d3)
This commit is contained in:
Andrew Tridgell 2008-07-14 09:19:22 +10:00
parent 3bb727aaaf
commit 3fa8aaa4e2
1 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
ctdb/tools/onnode
View File

@ -1,4 +1,4 @@
#!/bin/sh #!/bin/bash
# Run commands on CTDB nodes. # Run commands on CTDB nodes.
@ -171,9 +171,12 @@ trap 'kill -TERM $pids 2>/dev/null' INT TERM
# There's a small race here where the kill can fail if no processes # There's a small race here where the kill can fail if no processes
# have been added to $pids and the script is interrupted. However, # have been added to $pids and the script is interrupted. However,
# the part of the window where it matter is very small. # the part of the window where it matter is very small.
retcode=0
for n in $nodes ; do for n in $nodes ; do
if $parallel ; then if $parallel ; then
if $verbose ; then if $verbose ; then
# pipefail is a bashism - is there some way to do this with plain sh?
set -o pipefail 2>/dev/null
($SSH $ssh_opts $EXTRA_SSH_OPTS $n "$command" 2>&1 | sed -e "s@^@[$n] @" )& ($SSH $ssh_opts $EXTRA_SSH_OPTS $n "$command" 2>&1 | sed -e "s@^@[$n] @" )&
else else
$SSH $ssh_opts $EXTRA_SSH_OPTS $n "$command" & $SSH $ssh_opts $EXTRA_SSH_OPTS $n "$command" &
@ -184,8 +187,17 @@ for n in $nodes ; do
echo >&2 ; echo ">> NODE: $n <<" >&2 echo >&2 ; echo ">> NODE: $n <<" >&2
fi fi
$SSH $ssh_opts $EXTRA_SSH_OPTS $n "$command" $SSH $ssh_opts $EXTRA_SSH_OPTS $n "$command"
[ $? = 0 ] || retcode=$?
fi fi
done done
$parallel && wait $parallel && {
for p in $pids; do
wait $p
[ $? = 0 ] || retcode=$?
done
}
exit $retcode