From 0a752e634a64baa1b678018f39a788be0284106d Mon Sep 17 00:00:00 2001
From: liyan <liyan.wang@xtaotech.com>
Date: Wed, 22 Nov 2017 15:02:47 +0800
Subject: [PATCH 1/2] qa/tasks/ceph_fuse: fix ceph-fuse mount failed

Fixes: http://tracker.ceph.com/issues/22205

Signed-off-by: liyan <liyan.wang@xtaotech.com>
---
 qa/tasks/ceph_fuse.py | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/qa/tasks/ceph_fuse.py b/qa/tasks/ceph_fuse.py
index c9d8354966820..14c6989720b58 100644
--- 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_)

From fc29e2d33651a86d2ddf87fdc1559dfae99e5131 Mon Sep 17 00:00:00 2001
From: Patrick Donnelly <pdonnell@redhat.com>
Date: Wed, 29 Nov 2017 22:11:12 -0800
Subject: [PATCH 2/2] githubmap: update contributors

Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
---
 .githubmap | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.githubmap b/.githubmap
index d4fbace7e5a64..45ac4bbc2e7f4 100644
--- a/.githubmap
+++ b/.githubmap
@@ -49,3 +49,4 @@ yuyuyu101 Haomai Wang <haomai@xsky.com>
 jtlayton Jeff Layton <jlayton@redhat.com>
 yuriw Yuri Weinstein <yweins@redhat.com>
 jecluis João Eduardo Luís <joao@suse.de>
+yunfeiguan Yunfei Guan <yunfei.guan@xtaotech.com>