From: David Disseldorp <ddiss@suse.de>
Date: Fri, 29 May 2015 16:30:54 +0000 (+0200)
Subject: tests: fix test_activate_dmcrypt uuid usage
X-Git-Tag: v9.0.2~45^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F4866%2Fhead;p=ceph.git

tests: fix test_activate_dmcrypt uuid usage

4601e10800a63cf0e03108e1da0bf11c19c33e26 introduced a regression in that
an empty (uninitialised) OSD uuid is passed to test_pool_read_write for
IO. As a result, the "rados put" request times out causing test failure.

This change ensures that a correct OSD uuid is passed to
test_pool_read_write.

Signed-off-by: David Disseldorp <ddiss@suse.de>
---

diff --git a/src/test/ceph-disk.sh b/src/test/ceph-disk.sh
index 9cbbb00c48d9..f3eed8a0e027 100755
--- a/src/test/ceph-disk.sh
+++ b/src/test/ceph-disk.sh
@@ -324,7 +324,7 @@ function test_activate_dmcrypt() {
         --mark-init=none \
         /dev/mapper/$uuid || return 1
 
-    test_pool_read_write $osd_uuid || return 1
+    test_pool_read_write $uuid || return 1
 }
 
 function test_activate_dir() {