From: Loic Dachary <ldachary@redhat.com>
Date: Wed, 4 Mar 2015 14:43:15 +0000 (+0100)
Subject: tests: ceph-disk.sh cosmetic changes and reduced verbosity
X-Git-Tag: v9.0.0~167^2~4
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=1e462a4520f3c6333bc97ea04d2cad3160a4aae7;p=ceph.git

tests: ceph-disk.sh cosmetic changes and reduced verbosity

Signed-off-by: Loic Dachary <ldachary@redhat.com>
---

diff --git a/src/test/ceph-disk.sh b/src/test/ceph-disk.sh
index 5b439cc40a9c..d20f6cf887c7 100755
--- a/src/test/ceph-disk.sh
+++ b/src/test/ceph-disk.sh
@@ -303,21 +303,28 @@ function create_dev() {
     local name=$1
 
     dd if=/dev/zero of=$name bs=1024k count=200
+    set -x
+    echo create_dev $name >&2
     losetup --find $name
     local dev=$(losetup --associated $name | cut -f1 -d:)
     ceph-disk zap $dev > /dev/null 2>&1
     echo $dev
+    set +x
 }
 
 function destroy_dev() {
     local name=$1
     local dev=$2
 
+    set -x
+    echo destroy_dev $name $dev >&2
     for partition in 1 2 3 4 ; do
-        umount ${dev}p${partition} || true
+        umount ${dev}p${partition} > /dev/null 2>&1 || true
     done
+    ceph-disk zap $dev > /dev/null 2>&1
     losetup --detach $dev
     rm $name
+    set +x
 }
 
 function activate_dev_body() {