From: Jos Collin Date: Thu, 26 Feb 2026 15:35:03 +0000 (+0530) Subject: test fix X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fheads%2Fwip-jcollin-testing-26022026;p=ceph-ci.git test fix Signed-off-by: Jos Collin --- diff --git a/src/pybind/mgr/mirroring/fs/snapshot_mirror.py b/src/pybind/mgr/mirroring/fs/snapshot_mirror.py index 86d4ed46eba..2199b7e4375 100644 --- a/src/pybind/mgr/mirroring/fs/snapshot_mirror.py +++ b/src/pybind/mgr/mirroring/fs/snapshot_mirror.py @@ -178,16 +178,8 @@ class FSPolicy: def process_updates(self): def acquire_message(dir_path): - lookup_info = self.policy.lookup(dir_path) - sync_latest_snapshot = False - sync_from_snapshot = None - if lookup_info: - sync_latest_snapshot = lookup_info['sync_latest_snapshot'] if 'sync_latest_snapshot' in lookup_info else False - sync_from_snapshot = lookup_info['sync_from_snapshot'] if 'sync_from_snapshot' in lookup_info else None return json.dumps({'dir_path': dir_path, - 'mode': 'acquire', - 'sync_latest_snapshot': sync_latest_snapshot, - 'sync_from_snapshot': sync_from_snapshot + 'mode': 'acquire' }) def release_message(dir_path): return json.dumps({'dir_path': dir_path, @@ -211,9 +203,7 @@ class FSPolicy: update_map[dir_path] = { 'version': 1, 'instance_id': lookup_info['instance_id'], - 'last_shuffled': lookup_info['mapped_time'], - 'sync_latest_snapshot': lookup_info['sync_latest_snapshot'] if 'sync_latest_snapshot' in lookup_info else False, - 'sync_from_snapshot': lookup_info['sync_from_snapshot'] if 'sync_from_snapshot' in lookup_info else None + 'last_shuffled': lookup_info['mapped_time'] } if lookup_info['purging']: update_map[dir_path]['purging'] = 1 @@ -241,9 +231,7 @@ class FSPolicy: schedule = self.policy.add_dir(dir_path) if not schedule: return - update_map = {dir_path: {'version': 1, 'instance_id': '', 'last_shuffled': 0.0, - 'sync_latest_snapshot': sync_latest_snapshot, - 'sync_from_snapshot': sync_from_snapshot}} + update_map = {dir_path: {'version': 1, 'instance_id': '', 'last_shuffled': 0.0}} updated = False def update_safe(updates, removals, r): nonlocal updated