From: Patrick Donnelly <pdonnell@redhat.com>
Date: Sat, 14 Jul 2018 01:15:17 +0000 (-0700)
Subject: qa: optionally use old fs name during cephfs remount
X-Git-Tag: v13.2.3~113^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=bb52297685831bf009b965e25fe44c216e94c6c3;p=ceph.git

qa: optionally use old fs name during cephfs remount

This fixes errors caused by remount done by some tests (test_recovery_pool.py)
where the fs name is not given.

Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
(cherry picked from commit 1ad8d86bd03400cc521ec4f71a5484ee84889e0e)
---

diff --git a/qa/tasks/cephfs/mount.py b/qa/tasks/cephfs/mount.py
index fbff376041ef..16b2149a819c 100644
--- a/qa/tasks/cephfs/mount.py
+++ b/qa/tasks/cephfs/mount.py
@@ -41,6 +41,9 @@ class CephFSMount(object):
         raise NotImplementedError()
 
     def setupfs(self, name=None):
+        if name is None and self.fs is not None:
+            # Previous mount existed, reuse the old name
+            name = self.fs.name
         self.fs = Filesystem(self.ctx, name=name)
         log.info('Wait for MDS to reach steady state...')
         self.fs.wait_for_daemons()