From: Patrick Donnelly Date: Wed, 28 Jul 2021 17:45:08 +0000 (-0700) Subject: Merge PR #42349 into master X-Git-Tag: v17.1.0~1262 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=665b36de4e8b4cd3f45da87f6ce2c845b0658cb3;p=ceph.git Merge PR #42349 into master * refs/pull/42349/head: mon/MDSMonitor: propose if FSMap struct_v is too old mon/MDSMonitor: give a proper error message if FSMap struct_v is too old mds/FSMap: use DECODE_OLDEST to gate FSMap version qa: add tests for fs dump of epoch and trimming qa: add file system support for dumping epoch mon/MDSMonitor: return mon_mds_force_trim_to even if equal to current epoch mon: add debugging for trimming methods mon: fix debug spacing qa: add nofs upgrade suite Reviewed-by: Kefu Chai Reviewed-by: Neha Ojha Reviewed-by: Ramana Raja --- 665b36de4e8b4cd3f45da87f6ce2c845b0658cb3