From 1ad8d86bd03400cc521ec4f71a5484ee84889e0e Mon Sep 17 00:00:00 2001 From: Patrick Donnelly Date: Fri, 13 Jul 2018 18:15:17 -0700 Subject: [PATCH] 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 --- qa/tasks/cephfs/mount.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/qa/tasks/cephfs/mount.py b/qa/tasks/cephfs/mount.py index fbff376041ef2..16b2149a819cc 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() -- 2.39.5