]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge pull request #62949 from joscollin/wip-test-mirroring-fix
authorJos Collin <joscollin@users.noreply.github.com>
Thu, 3 Jul 2025 13:22:05 +0000 (18:52 +0530)
committerGitHub <noreply@github.com>
Thu, 3 Jul 2025 13:22:05 +0000 (18:52 +0530)
qa: setup mount_b in test_mirroring.py

Reviewed-by: Venky Shankar <vshankar@redhat.com>
Reviewed-by: Rishabh Dave <ridave@redhat.com>
1  2 
qa/tasks/cephfs/test_mirroring.py

index 514aa8346527f9ab2196ed237db18c72087a3a67,de6058dd513464c4c8113704dac4259f22badb99..f408fdb64e782f7d1b79f171582909164513ae84
@@@ -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)