From: Michael Fritch <mfritch@suse.com>
Date: Tue, 3 Mar 2020 15:21:49 +0000 (-0700)
Subject: mgr/volumes: remove stray return
X-Git-Tag: v14.2.10~189^2~12
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=bdac807aa10ad95e18807da2e39872dfff05679c;p=ceph.git

mgr/volumes: remove stray return

fixes mypy errors:

volumes/fs/purge_queue.py: note: In function "get_trash_entry_for_volume":
volumes/fs/purge_queue.py:28: error: Name 'ret' is not defined

volumes/fs/async_cloner.py: note: In function "get_next_clone_entry":
volumes/fs/async_cloner.py:39: error: Name 'ret' is not defined

Fixes: https://tracker.ceph.com/issues/44393
Signed-off-by: Michael Fritch <mfritch@suse.com>
(cherry picked from commit 760a5918398626c956f22017a6513c7a70ac359a)
---

diff --git a/src/pybind/mgr/volumes/fs/async_cloner.py b/src/pybind/mgr/volumes/fs/async_cloner.py
index 50547a3f8a6..595bd5dd078 100644
--- a/src/pybind/mgr/volumes/fs/async_cloner.py
+++ b/src/pybind/mgr/volumes/fs/async_cloner.py
@@ -36,7 +36,6 @@ def get_next_clone_entry(volume_client, volname, running_jobs):
     except VolumeException as ve:
         log.error("error fetching clone entry for volume '{0}' ({1})".format(volname, ve))
         return ve.errno, None
-    return ret
 
 @contextmanager
 def open_at_volume(volume_client, volname, groupname, subvolname, need_complete=False, expected_types=[]):
diff --git a/src/pybind/mgr/volumes/fs/purge_queue.py b/src/pybind/mgr/volumes/fs/purge_queue.py
index fe241b31f85..6eb715fa3a6 100644
--- a/src/pybind/mgr/volumes/fs/purge_queue.py
+++ b/src/pybind/mgr/volumes/fs/purge_queue.py
@@ -25,7 +25,6 @@ def get_trash_entry_for_volume(volume_client, volname, running_jobs):
     except VolumeException as ve:
         log.error("error fetching trash entry for volume '{0}' ({1})".format(volname, ve))
         return ve.errno, None
-    return ret
 
 # helper for starting a purge operation on a trash entry
 def purge_trash_entry_for_volume(volume_client, volname, purge_dir, should_cancel):