openstack/devstack
Code Issues Proposed changes

Remove extraneous timing messages from volumes.sh

Browse Source 
Change: I3bbcc5b9f8a4da2fcdb9f6f70913c2d6bc6e2b9b
added some timing messages around the volume operations in
exercises/volumes.sh.  This was a good idea, but some
useless timing info was added to failed cases, this patch
pulls that back out.  The only parameter used to detect
failure is a timeout, so outputing the time elapses in
these cases is useless.

Change-Id: I609a803a7293aa8a8e3cec186984de59bfe9b409
This commit is contained in:
John Griffith 2012-10-06 22:19:33 -06:00
parent 45ae8ccc4a
commit 082a3da01f
1 changed files with 0 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
exercises/volumes.sh
View File

@ -158,8 +158,6 @@ fi
start_time=`date +%s`
if ! timeout $ACTIVE_TIMEOUT sh -c "while ! nova volume-list | grep $VOL_NAME | grep available; do sleep 1; done"; then
echo "Volume $VOL_NAME not created"
end_time=`date +%s`
echo "Failed volume-create after $((end_time - start_time)) seconds"
exit 1
fi
end_time=`date +%s`
@ -176,8 +174,6 @@ nova volume-attach $VM_UUID $VOL_ID $DEVICE || \
die "Failure attaching volume $VOL_NAME to $NAME"
if ! timeout $ACTIVE_TIMEOUT sh -c "while ! nova volume-list | grep $VOL_NAME | grep in-use; do sleep 1; done"; then
echo "Volume $VOL_NAME not attached to $NAME"
end_time=`date +%s`
echo "Failed volume-attach after $((end_time - start_time)) seconds"
exit 1
fi
end_time=`date +%s`
@ -195,8 +191,6 @@ start_time=`date +%s`
nova volume-detach $VM_UUID $VOL_ID || die "Failure detaching volume $VOL_NAME from $NAME"
if ! timeout $ACTIVE_TIMEOUT sh -c "while ! nova volume-list | grep $VOL_NAME | grep available; do sleep 1; done"; then
echo "Volume $VOL_NAME not detached from $NAME"
end_time=`date +%s`
echo "Failed volume-detach after $((end_time - start_time)) seconds"
exit 1
fi
end_time=`date +%s`
@ -207,8 +201,6 @@ start_time=`date +%s`
nova volume-delete $VOL_ID || die "Failure deleting volume $VOL_NAME"
if ! timeout $ACTIVE_TIMEOUT sh -c "while ! nova volume-list | grep $VOL_NAME; do sleep 1; done"; then
echo "Volume $VOL_NAME not deleted"
end_time=`date +%s`
echo "Failed volume-delete after $((end_time - start_time)) seconds"
exit 1
fi
end_time=`date +%s`