From: Jos Collin Date: Thu, 3 Jul 2025 13:22:05 +0000 (+0530) Subject: Merge pull request #62949 from joscollin/wip-test-mirroring-fix X-Git-Tag: v21.0.0~256^2~318 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=fba66eaf0366c22456f57a78c4a5fc648b6a09a5;p=ceph.git Merge pull request #62949 from joscollin/wip-test-mirroring-fix qa: setup mount_b in test_mirroring.py Reviewed-by: Venky Shankar Reviewed-by: Rishabh Dave --- fba66eaf0366c22456f57a78c4a5fc648b6a09a5 diff --cc qa/tasks/cephfs/test_mirroring.py index 514aa8346527,de6058dd5134..f408fdb64e78 --- a/qa/tasks/cephfs/test_mirroring.py +++ b/qa/tasks/cephfs/test_mirroring.py @@@ -1564,21 -1459,10 +1459,10 @@@ class TestMirroring(CephFSTestCase) def test_cephfs_mirror_remote_snap_corrupt_fails_synced_snapshot(self): """ - That making manual changes to the remote .snap directory shows 'peer status' state: "failed" + That making changes to the remote .snap directory shows 'peer status' state: "failed" for a synced snapshot and then restores to "idle" when those changes are reverted. """ - log.debug('reconfigure client auth caps') - self.get_ceph_cmd_result( - 'auth', 'caps', "client.{0}".format(self.mount_b.client_id), - 'mds', 'allow rwps', - 'mon', 'allow r', - 'osd', 'allow rw pool={0}, allow rw pool={1}'.format( - self.backup_fs.get_data_pool_name(), - self.backup_fs.get_data_pool_name())) - log.debug(f'mounting filesystem {self.secondary_fs_name}') - self.mount_b.umount_wait() - self.mount_b.mount_wait(cephfs_name=self.secondary_fs_name) - + self.setup_mount_b(mds_perm='rwps') self.enable_mirroring(self.primary_fs_name, self.primary_fs_id) peer_spec = "client.mirror_remote@ceph" self.peer_add(self.primary_fs_name, self.primary_fs_id, peer_spec, self.secondary_fs_name)