From: Nathan Cutler <ncutler@suse.com>
Date: Sat, 10 Jun 2017 16:12:33 +0000 (+0200)
Subject: qa: deepsea: umount only existing OSD data partitions
X-Git-Tag: ses5-milestone6~2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=b5b8cfa486c675bbd28f4f0bd191e3219902571c;p=ceph.git

qa: deepsea: umount only existing OSD data partitions

This fixes the "end" (unwind) phase of the deepsea task so it unmounts OSD data
partitions only if they exist and are block devices (umount on a non-existent
partition can cause bogus test failure).

Signed-off-by: Nathan Cutler <ncutler@suse.com>
---

diff --git a/qa/tasks/deepsea.py b/qa/tasks/deepsea.py
index d2d62e1e763a..6f571eff7a32 100644
--- a/qa/tasks/deepsea.py
+++ b/qa/tasks/deepsea.py
@@ -170,7 +170,7 @@ class DeepSea(Task):
                 .format(_remote.hostname))
             _remote.run(args=[
                 'sudo', 'sh', '-c',
-                'umount /dev/vdb2 ; umount /dev/vdc2'
+                'for f in vdb2 vdc2 ; do test -b /dev/$f && umount /dev/$f || true ; done'
                 ])
         super(DeepSea, self).end()