Merge PR ceph#19069 into master

* refs/pull/19069/head: qa/tasks/ceph_fuse: fix ceph-fuse mount failed Reviewed-by: Yunfei Guan <[email protected]> Reviewed-by: Patrick Donnelly <[email protected]> Reviewed-by: Amit Kumar <[email protected]>
zmc · Nov 30, 2017 · 49028ee · 49028ee
2 parents d10743c + fc29e2d
commit 49028ee
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 0 deletions.
diff --git a/.githubmap b/.githubmap
@@ -50,3 +50,4 @@ yuyuyu101 Haomai Wang <[email protected]>
 jtlayton Jeff Layton <[email protected]>
 yuriw Yuri Weinstein <[email protected]>
 jecluis João Eduardo Luís <[email protected]>
+yunfeiguan Yunfei Guan <[email protected]>
diff --git a/qa/tasks/ceph_fuse.py b/qa/tasks/ceph_fuse.py
@@ -7,6 +7,8 @@
 
 from teuthology import misc as teuthology
 from cephfs.fuse_mount import FuseMount
+from tasks.cephfs.filesystem import MDSCluster
+from tasks.cephfs.filesystem import Filesystem
 
 log = logging.getLogger(__name__)
 
@@ -103,6 +105,14 @@ def task(ctx, config):
     all_mounts = getattr(ctx, 'mounts', {})
     mounted_by_me = {}
 
+    log.info('Wait for MDS to reach steady state...')
+    mds_cluster = MDSCluster(ctx)
+    status = mds_cluster.status()
+    for filesystem in status.get_filesystems():
+        fs = Filesystem(ctx, fscid=filesystem['id']) 
+        fs.wait_for_daemons()
+    log.info('Ready to start ceph-fuse...')
+
     # Construct any new FuseMount instances
     for id_, remote in clients:
         client_config = config.get("client.%s" % id_)