From: Milind Changire <mchangir@redhat.com>
Date: Sat, 19 Aug 2023 13:06:59 +0000 (+0530)
Subject: mgr/snap-schedule: tweaks to keep mypy happy
X-Git-Tag: v18.2.1~58^2~3
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=850ffeca521a65bb4ae8e574644885534dc00160;p=ceph.git

mgr/snap-schedule: tweaks to keep mypy happy

Signed-off-by: Milind Changire <mchangir@redhat.com>
(cherry picked from commit c208ce9f3ced89755b1180178812ef82aa1a5346)
---

diff --git a/src/pybind/mgr/snap_schedule/module.py b/src/pybind/mgr/snap_schedule/module.py
index 0d565fd92f45..b691572b64f6 100644
--- a/src/pybind/mgr/snap_schedule/module.py
+++ b/src/pybind/mgr/snap_schedule/module.py
@@ -95,10 +95,10 @@ class Module(MgrModule):
         '''
         Get current snapshot schedule for <path>
         '''
+        rc, fs, err = self._validate_fs(fs)
+        if rc < 0:
+            return rc, fs, err
         try:
-            rc, fs, err = self._validate_fs(fs)
-            if rc < 0:
-                return rc, fs, err
             scheds = self.client.list_snap_schedules(fs, path, recursive)
             self.log.debug(f'recursive is {recursive}')
         except CephfsConnectionException as e:
@@ -125,10 +125,10 @@ class Module(MgrModule):
         '''
         Set a snapshot schedule for <path>
         '''
+        rc, fs, err = self._validate_fs(fs)
+        if rc < 0:
+            return rc, fs, err
         try:
-            rc, fs, err = self._validate_fs(fs)
-            if rc < 0:
-                return rc, fs, err
             abs_path = path
             subvol = None
             self.client.store_snap_schedule(fs,
@@ -157,10 +157,10 @@ class Module(MgrModule):
         '''
         Remove a snapshot schedule for <path>
         '''
+        rc, fs, err = self._validate_fs(fs)
+        if rc < 0:
+            return rc, fs, err
         try:
-            rc, fs, err = self._validate_fs(fs)
-            if rc < 0:
-                return rc, fs, err
             abs_path = path
             self.client.rm_snap_schedule(fs, abs_path, repeat, start)
         except ValueError as e:
@@ -178,10 +178,10 @@ class Module(MgrModule):
         '''
         Set a retention specification for <path>
         '''
+        rc, fs, err = self._validate_fs(fs)
+        if rc < 0:
+            return rc, fs, err
         try:
-            rc, fs, err = self._validate_fs(fs)
-            if rc < 0:
-                return rc, fs, err
             abs_path = path
             self.client.add_retention_spec(fs, abs_path,
                                            retention_spec_or_period,
@@ -201,10 +201,10 @@ class Module(MgrModule):
         '''
         Remove a retention specification for <path>
         '''
+        rc, fs, err = self._validate_fs(fs)
+        if rc < 0:
+            return rc, fs, err
         try:
-            rc, fs, err = self._validate_fs(fs)
-            if rc < 0:
-                return rc, fs, err
             abs_path = path
             self.client.rm_retention_spec(fs, abs_path,
                                           retention_spec_or_period,
@@ -224,10 +224,10 @@ class Module(MgrModule):
         '''
         Activate a snapshot schedule for <path>
         '''
+        rc, fs, err = self._validate_fs(fs)
+        if rc < 0:
+            return rc, fs, err
         try:
-            rc, fs, err = self._validate_fs(fs)
-            if rc < 0:
-                return rc, fs, err
             abs_path = path
             self.client.activate_snap_schedule(fs, abs_path, repeat, start)
         except ValueError as e:
@@ -245,10 +245,10 @@ class Module(MgrModule):
         '''
         Deactivate a snapshot schedule for <path>
         '''
+        rc, fs, err = self._validate_fs(fs)
+        if rc < 0:
+            return rc, fs, err
         try:
-            rc, fs, err = self._validate_fs(fs)
-            if rc < 0:
-                return rc, fs, err
             abs_path = path
             self.client.deactivate_snap_schedule(fs, abs_path, repeat, start)
         except ValueError as e: