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

mgr/volumes: assert self.fs

fixes mypy errors:

volumes/fs/operations/volume.py: note: In member "disconnect" of class "Connection":
volumes/fs/operations/volume.py:94: error: Item "None" of "Optional[Any]" has no attribute "get_addrs"
volumes/fs/operations/volume.py:95: error: Item "None" of "Optional[Any]" has no attribute "shutdown"

volumes/fs/operations/volume.py: note: In member "abort" of class "Connection":
volumes/fs/operations/volume.py:105: error: Item "None" of "Optional[Any]" has no attribute "abort_conn"

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

diff --git a/src/pybind/mgr/volumes/fs/operations/volume.py b/src/pybind/mgr/volumes/fs/operations/volume.py
index f8b96e508900..634521b42cf8 100644
--- a/src/pybind/mgr/volumes/fs/operations/volume.py
+++ b/src/pybind/mgr/volumes/fs/operations/volume.py
@@ -87,6 +87,7 @@ class ConnectionPool(object):
 
         def disconnect(self):
             try:
+                assert self.fs
                 assert self.ops_in_progress == 0
                 log.info("disconnecting from cephfs '{0}'".format(self.fs_name))
                 self.fs.shutdown()
@@ -96,6 +97,7 @@ class ConnectionPool(object):
                 raise
 
         def abort(self):
+            assert self.fs
             assert self.ops_in_progress == 0
             log.info("aborting connection from cephfs '{0}'".format(self.fs_name))
             self.fs.abort_conn()