From: Yuri Weinstein Date: Tue, 14 Mar 2023 16:14:03 +0000 (-0700) Subject: Merge pull request #47726 from neesingh-rh/wip-57201-pacific X-Git-Tag: v16.2.13~105 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=fad62dd9ee0fb9421e59200cdce67b6cea133fc2;p=ceph.git Merge pull request #47726 from neesingh-rh/wip-57201-pacific pacific: mgr/snap_schedule: replace .snap with the client configured snap dir name Reviewed-by: Venky Shankar Reviewed-by: Kotresh HR Reviewed-by: Xiubo Li --- fad62dd9ee0fb9421e59200cdce67b6cea133fc2 diff --cc qa/tasks/cephfs/test_snap_schedules.py index 3ccd4d592011,f3899d82273d..f4d3f51b1b46 --- a/qa/tasks/cephfs/test_snap_schedules.py +++ b/qa/tasks/cephfs/test_snap_schedules.py @@@ -351,10 -352,10 +352,10 @@@ class TestSnapSchedules(TestSnapSchedul snap_path = f"{dir_path}/.snap"[1:] snapshots = self.mount_a.ls(path=snap_path) fs_count = len(snapshots) - log.debug(f'snapshots: {snapshots}'); + log.debug(f'snapshots: {snapshots}') result = self.fs_snap_schedule_cmd('status', path=dir_path, - snap_schedule='1M', format='json') + format='json') json_res = json.loads(result)[0] db_count = int(json_res['created_count']) log.debug(f'json_res: {json_res}')