From: John Spray <john.spray@redhat.com>
Date: Wed, 22 Jun 2016 12:00:44 +0000 (+0100)
Subject: tasks/cephfs: fix race while mounting
X-Git-Tag: v10.2.8~24^2~2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=12aa35a6d50f612df77199ac4f35c7baeed0583e;p=ceph.git

tasks/cephfs: fix race while mounting

This could fail if the mount hadn't finished
coming up.

Signed-off-by: John Spray <john.spray@redhat.com>
(cherry picked from commit adfb757c898a80f18c15dafd02e29840c5931c87)
---

diff --git a/qa/tasks/cephfs/test_pool_perm.py b/qa/tasks/cephfs/test_pool_perm.py
index b558cb18704b..d625afde8d2f 100644
--- a/qa/tasks/cephfs/test_pool_perm.py
+++ b/qa/tasks/cephfs/test_pool_perm.py
@@ -80,6 +80,7 @@ class TestPoolPerm(CephFSTestCase):
 
         self.mount_a.umount_wait()
         self.mount_a.mount()
+        self.mount_a.wait_until_mounted()
 
         with self.assertRaises(CommandFailedError):
             self.mount_a.run_shell(["setfattr",
@@ -100,6 +101,7 @@ class TestPoolPerm(CephFSTestCase):
                 self.fs.get_data_pool_names()[1],
             ))
         self.mount_a.mount()
+        self.mount_a.wait_until_mounted()
         self.mount_a.run_shell(["setfattr",
                                 "-n", "ceph.file.layout.pool",
                                 "-v", new_pool_name, "layoutfile"])