From 0b1107e7c705e33f7ee39d39fca99c0ceea8a6b0 Mon Sep 17 00:00:00 2001 From: Ilya Dryomov Date: Thu, 12 Oct 2023 21:32:53 +0200 Subject: [PATCH] mgr/rbd_support: make type hits on aio_mirror_image_*() callbacks better Make it clear that mirror mode, mirror info and snap ID can be None if the respective operation fails. Signed-off-by: Ilya Dryomov (cherry picked from commit 01fff6a72a328459c1d153e5dc1de6a34e48a82f) Conflicts: src/pybind/mgr/rbd_support/mirror_snapshot_schedule.py [ commit e4a16e261370 ("mgr/rbd_support: add type annotation") not in pacific ] --- src/pybind/mgr/rbd_support/mirror_snapshot_schedule.py | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/pybind/mgr/rbd_support/mirror_snapshot_schedule.py b/src/pybind/mgr/rbd_support/mirror_snapshot_schedule.py index 2abf666663c7..42ecdbbe0cf3 100644 --- a/src/pybind/mgr/rbd_support/mirror_snapshot_schedule.py +++ b/src/pybind/mgr/rbd_support/mirror_snapshot_schedule.py @@ -132,7 +132,7 @@ class CreateSnapshotRequests: "CreateSnapshotRequests.handle_get_mirror_mode {}/{}/{}: r={} mode={}".format( pool_id, namespace, image_id, comp.get_return_value(), mode)) - if comp.get_return_value() < 0: + if mode is None: if comp.get_return_value() != -errno.ENOENT: self.log.error( "error when getting mirror mode for {}/{}/{}: {}".format( @@ -174,7 +174,7 @@ class CreateSnapshotRequests: "CreateSnapshotRequests.handle_get_mirror_info {}/{}/{}: r={} info={}".format( pool_id, namespace, image_id, comp.get_return_value(), info)) - if comp.get_return_value() < 0: + if info is None: if comp.get_return_value() != -errno.ENOENT: self.log.error( "error when getting mirror info for {}/{}/{}: {}".format( @@ -218,8 +218,7 @@ class CreateSnapshotRequests: "CreateSnapshotRequests.handle_create_snapshot for {}/{}/{}: r={}, snap_id={}".format( pool_id, namespace, image_id, comp.get_return_value(), snap_id)) - if comp.get_return_value() < 0 and \ - comp.get_return_value() != -errno.ENOENT: + if snap_id is None and comp.get_return_value() != -errno.ENOENT: self.log.error( "error when creating snapshot for {}/{}/{}: {}".format( pool_id, namespace, image_id, comp.get_return_value())) -- 2.47.3