From acd6743d403d225d6829aaa42c1ddc2eda89d2e1 Mon Sep 17 00:00:00 2001 From: Patrick Donnelly Date: Wed, 14 Jul 2021 13:59:48 -0700 Subject: [PATCH] qa: add file system support for dumping epoch Signed-off-by: Patrick Donnelly (cherry picked from commit ee899d9a44f3ab73c8ebbb82720d89364b9bb600) --- qa/tasks/cephfs/filesystem.py | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/qa/tasks/cephfs/filesystem.py b/qa/tasks/cephfs/filesystem.py index 7f01b0ff480..0c02e2aa3d7 100644 --- a/qa/tasks/cephfs/filesystem.py +++ b/qa/tasks/cephfs/filesystem.py @@ -63,9 +63,12 @@ class FSStatus(object): """ Operations on a snapshot of the FSMap. """ - def __init__(self, mon_manager): + def __init__(self, mon_manager, epoch=None): self.mon = mon_manager - self.map = json.loads(self.mon.raw_cluster_cmd("fs", "dump", "--format=json")) + cmd = ["fs", "dump", "--format=json"] + if epoch is not None: + cmd.append(str(epoch)) + self.map = json.loads(self.mon.raw_cluster_cmd(*cmd)) def __str__(self): return json.dumps(self.map, indent = 2, sort_keys = True) @@ -333,8 +336,8 @@ class MDSCluster(CephCluster): def newfs(self, name='cephfs', create=True): return Filesystem(self._ctx, name=name, create=create) - def status(self): - return FSStatus(self.mon_manager) + def status(self, epoch=None): + return FSStatus(self.mon_manager, epoch) def delete_all_filesystems(self): """ -- 2.47.3