| Message ID | 1462479489-5320-1-git-send-email-cardoe@cardoe.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On 05/05/16 21:18, Doug Goldstein wrote: > Most implementations of the sleep command only take integers. GNU > coreutils has a GNU extension to allow any floating point number to be > passed but we shouldn't depend on that. > > Signed-off-by: Doug Goldstein <cardoe@cardoe.com> Reviewed-by: Andrew Cooper <andrew.cooper3@citrix.com>
Ack + release ack and queued both patches
diff --git a/tools/hotplug/Linux/block-iscsi b/tools/hotplug/Linux/block-iscsi index 8e36852..3615905 100644 --- a/tools/hotplug/Linux/block-iscsi +++ b/tools/hotplug/Linux/block-iscsi @@ -74,7 +74,7 @@ find_device() { count=0 while [ ! -e /dev/disk/by-path/*"$iqn"-lun-0 ]; do - sleep 0.1 + sleep 1 count=`expr $count + 1` if [ count = 100 ]; then # 10s timeout while waiting for iSCSI disk to settle diff --git a/tools/hotplug/Linux/init.d/xencommons.in b/tools/hotplug/Linux/init.d/xencommons.in index 21e9133..eeac8ab 100644 --- a/tools/hotplug/Linux/init.d/xencommons.in +++ b/tools/hotplug/Linux/init.d/xencommons.in @@ -107,14 +107,14 @@ do_stop () { echo Stopping xenconsoled if read 2>/dev/null <$XENCONSOLED_PIDFILE pid; then kill $pid - while kill -9 $pid >/dev/null 2>&1; do sleep 0.1; done + while kill -9 $pid >/dev/null 2>&1; do sleep 1; done rm -f $XENCONSOLED_PIDFILE fi echo Stopping QEMU if read 2>/dev/null <$QEMU_PIDFILE pid; then kill $pid - while kill -9 $pid >/dev/null 2>&1; do sleep 0.1; done + while kill -9 $pid >/dev/null 2>&1; do sleep 1; done rm -f $QEMU_PIDFILE fi diff --git a/tools/hotplug/Linux/init.d/xendriverdomain.in b/tools/hotplug/Linux/init.d/xendriverdomain.in index dd5f3a3..3720dea 100644 --- a/tools/hotplug/Linux/init.d/xendriverdomain.in +++ b/tools/hotplug/Linux/init.d/xendriverdomain.in @@ -56,7 +56,7 @@ do_stop () { echo Stopping xl devd... if read 2>/dev/null <$XLDEVD_PIDFILE pid; then kill $pid - while kill -9 $pid >/dev/null 2>&1; do sleep 0.1; done + while kill -9 $pid >/dev/null 2>&1; do sleep 1; done rm -f $XLDEVD_PIDFILE fi }
Most implementations of the sleep command only take integers. GNU coreutils has a GNU extension to allow any floating point number to be passed but we shouldn't depend on that. Signed-off-by: Doug Goldstein <cardoe@cardoe.com> --- tools/hotplug/Linux/block-iscsi | 2 +- tools/hotplug/Linux/init.d/xencommons.in | 4 ++-- tools/hotplug/Linux/init.d/xendriverdomain.in | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-)