]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph-ci.git/commitdiff
Merge PR #61929 into wip-vshankar-testing-20260219.125903 wip-vshankar-testing-20260219.125903 testing/wip-vshankar-testing-20260219.125903
authorVenky Shankar <vshankar@redhat.com>
Thu, 19 Feb 2026 12:59:41 +0000 (18:29 +0530)
committerVenky Shankar <vshankar@redhat.com>
Thu, 19 Feb 2026 12:59:41 +0000 (18:29 +0530)
* refs/pull/61929/head:

1  2 
qa/tasks/cephfs/test_mirroring.py
src/pybind/mgr/mirroring/module.py
src/tools/cephfs_mirror/PeerReplayer.cc

Simple merge
index 10201bac1bc35ffdc9d642252181703fc2407916,744a69ba809ff4ce7a74f497c667f2a70a3865cf..6c3b1a97a1af561d2fc98dffb7c5e907da8bfb39
@@@ -77,14 -74,17 +77,17 @@@ class Module(MgrModule)
          """Import a bootstrap token"""
          return self.fs_snapshot_mirror.peer_bootstrap_import(fs_name, token)
  
 -    @CLIWriteCommand('fs snapshot mirror add')
 +    @MirroringCLICommand.Write('fs snapshot mirror add')
      def snapshot_mirror_add_dir(self,
                                  fs_name: str,
-                                 path: str):
+                                 path: str,
+                                 sync_latest_snapshot: Optional[bool] = False,
+                                 sync_from_snapshot: Optional[str] = None):
          """Add a directory for snapshot mirroring"""
-         return self.fs_snapshot_mirror.add_dir(fs_name, path)
+         return self.fs_snapshot_mirror.add_dir(fs_name, path, sync_latest_snapshot,
+                                                sync_from_snapshot)
  
 -    @CLIWriteCommand('fs snapshot mirror remove')
 +    @MirroringCLICommand.Write('fs snapshot mirror remove')
      def snapshot_mirror_remove_dir(self,
                                     fs_name: str,
                                     path: str):