From e9e4ae837830665e9c673f649c936990d6648986 Mon Sep 17 00:00:00 2001 From: Kefu Chai Date: Fri, 29 Jan 2021 14:52:25 +0800 Subject: [PATCH] pybind/mgr/snap-schedule: use use_fs if fs is not specified the "vol_name" parameter of "fs subvolume getpath" command is not optional, so we have to pass an fs name to it. Signed-off-by: Kefu Chai --- src/pybind/mgr/snap_schedule/module.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/pybind/mgr/snap_schedule/module.py b/src/pybind/mgr/snap_schedule/module.py index 45ae13593f9..8e39e3b02dd 100644 --- a/src/pybind/mgr/snap_schedule/module.py +++ b/src/pybind/mgr/snap_schedule/module.py @@ -113,7 +113,7 @@ class Module(MgrModule): ''' try: use_fs = fs if fs else self.default_fs - abs_path = self.resolve_subvolume_path(fs, subvol, path) + abs_path = self.resolve_subvolume_path(use_fs, subvol, path) self.client.store_snap_schedule(use_fs, abs_path, (abs_path, snap_schedule, @@ -143,7 +143,7 @@ class Module(MgrModule): ''' try: use_fs = fs if fs else self.default_fs - abs_path = self.resolve_subvolume_path(fs, subvol, path) + abs_path = self.resolve_subvolume_path(use_fs, subvol, path) self.client.rm_snap_schedule(use_fs, abs_path, repeat, start) except CephfsConnectionException as e: return e.to_tuple() @@ -163,7 +163,7 @@ class Module(MgrModule): ''' try: use_fs = fs if fs else self.default_fs - abs_path = self.resolve_subvolume_path(fs, subvol, path) + abs_path = self.resolve_subvolume_path(use_fs, subvol, path) self.client.add_retention_spec(use_fs, abs_path, retention_spec_or_period, retention_count) @@ -185,7 +185,7 @@ class Module(MgrModule): ''' try: use_fs = fs if fs else self.default_fs - abs_path = self.resolve_subvolume_path(fs, subvol, path) + abs_path = self.resolve_subvolume_path(use_fs, subvol, path) self.client.rm_retention_spec(use_fs, abs_path, retention_spec_or_period, retention_count) @@ -207,7 +207,7 @@ class Module(MgrModule): ''' try: use_fs = fs if fs else self.default_fs - abs_path = self.resolve_subvolume_path(fs, subvol, path) + abs_path = self.resolve_subvolume_path(use_fs, subvol, path) self.client.activate_snap_schedule(use_fs, abs_path, repeat, start) except CephfsConnectionException as e: return e.to_tuple() @@ -227,7 +227,7 @@ class Module(MgrModule): ''' try: use_fs = fs if fs else self.default_fs - abs_path = self.resolve_subvolume_path(fs, subvol, path) + abs_path = self.resolve_subvolume_path(use_fs, subvol, path) self.client.deactivate_snap_schedule(use_fs, abs_path, repeat, start) except CephfsConnectionException as e: return e.to_tuple() -- 2.39.5