From cd97420965b4fb33f2048826c708283b5e116a97 Mon Sep 17 00:00:00 2001 From: Michael Fritch Date: Tue, 3 Mar 2020 08:21:25 -0700 Subject: [PATCH] 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 --- src/pybind/mgr/volumes/fs/operations/volume.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/pybind/mgr/volumes/fs/operations/volume.py b/src/pybind/mgr/volumes/fs/operations/volume.py index 417404532ee..dc2984499a2 100644 --- a/src/pybind/mgr/volumes/fs/operations/volume.py +++ b/src/pybind/mgr/volumes/fs/operations/volume.py @@ -89,6 +89,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)) addrs = self.fs.get_addrs() @@ -100,6 +101,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() -- 2.39.5