From: Ramana Raja Date: Thu, 13 Mar 2025 22:18:43 +0000 (-0400) Subject: pybind/mgr: fix flake8 errors in rbd_support module X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=fc32c6c78be0ef30cdacd8777f97459fe302ce18;p=ceph.git pybind/mgr: fix flake8 errors in rbd_support module Signed-off-by: Ramana Raja --- diff --git a/src/pybind/mgr/rbd_support/mirror_group_snapshot_schedule.py b/src/pybind/mgr/rbd_support/mirror_group_snapshot_schedule.py index e2bfe8c61a82f..8371bcd12b82b 100644 --- a/src/pybind/mgr/rbd_support/mirror_group_snapshot_schedule.py +++ b/src/pybind/mgr/rbd_support/mirror_group_snapshot_schedule.py @@ -18,6 +18,7 @@ def namespace_validator(ioctx: rados.Ioctx) -> None: raise ValueError("namespace {} is not in mirror image mode".format( ioctx.get_namespace())) + def group_validator(group: rbd.Group) -> None: try: info = group.mirror_group_get_info() @@ -26,6 +27,7 @@ def group_validator(group: rbd.Group) -> None: if info['image_mode'] != rbd.RBD_MIRROR_IMAGE_MODE_SNAPSHOT: raise rbd.InvalidArgument("Invalid mirror group mode") + class GroupSpec(NamedTuple): pool_id: str namespace: str @@ -63,8 +65,10 @@ class GroupCreateSnapshotRequests: self.handler.MODULE_OPTION_NAME_MAX_CONCURRENT_GROUP_SNAP_CREATE) self.log.debug("GroupCreateSnapshotRequests.add: {}/{}/{} " - "max concurrent snap create {}".format( - pool_id, namespace, group_id, max_concurrent)) + "max concurrent snap create {}".format(pool_id, + namespace, + group_id, + max_concurrent)) with self.lock: if group_spec in self.pending: @@ -159,7 +163,7 @@ class GroupCreateSnapshotRequests: self.finish(group_spec) return - if not info['primary'] : + if not info['primary']: self.log.debug( "GroupCreateSnapshotRequests.handle_get_mirror_info: " "{}/{}/{}: {}".format( diff --git a/src/pybind/mgr/rbd_support/schedule.py b/src/pybind/mgr/rbd_support/schedule.py index 479323742f231..46ea3f987004f 100644 --- a/src/pybind/mgr/rbd_support/schedule.py +++ b/src/pybind/mgr/rbd_support/schedule.py @@ -23,7 +23,7 @@ class LevelSpec: pool_id: Optional[str], namespace: Optional[str], image_id: Optional[str] = None, - group_id: Optional [str] = None) -> None: + group_id: Optional[str] = None) -> None: if image_id is not None and group_id is not None: raise ValueError("LevelSpec cannot have both image_id and group_id") self.name = name @@ -169,12 +169,12 @@ class LevelSpec: except rbd.InvalidArgument: raise ValueError( "group {} is not in snapshot mirror mode".format( - group_id)) + group_id)) else: image_name = match.group(3) try: with rbd.Image(ioctx, image_name, - read_only=True) as image: + read_only=True) as image: image_id = image.id() id += "/" + image_id if image_validator: @@ -259,7 +259,7 @@ class LevelSpec: image_id = match.group(3) try: with rbd.Image(ioctx, image_id=image_id, - read_only=True) as image: + read_only=True) as image: image_name = image.get_name() name += image_name if image_validator: @@ -267,7 +267,7 @@ class LevelSpec: except rbd.ImageNotFound: raise ValueError( "image {} does not exist".format( - image_id)) + image_id)) except rbd.InvalidArgument: raise ValueError( "image {} is not in snapshot mirror mode".format(