From 9cf2ae5e8d84d60d63d67643596eca7b32082cf7 Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Thu, 17 Jun 2021 16:17:24 -0400 Subject: [PATCH] mgr/nfs: adjust NFSExceptoin errno arg Signed-off-by: Sage Weil --- src/pybind/mgr/nfs/exception.py | 6 +++--- src/pybind/mgr/nfs/export.py | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/pybind/mgr/nfs/exception.py b/src/pybind/mgr/nfs/exception.py index 1701b275c7c..6c6e3d9f354 100644 --- a/src/pybind/mgr/nfs/exception.py +++ b/src/pybind/mgr/nfs/exception.py @@ -3,7 +3,7 @@ from typing import Optional class NFSException(Exception): - def __init__(self, errno: int, err_msg: str) -> None: + def __init__(self, err_msg: str, errno: int = -1) -> None: super(NFSException, self).__init__(errno, err_msg) self.errno = errno self.err_msg = err_msg @@ -14,12 +14,12 @@ class NFSException(Exception): class NFSInvalidOperation(NFSException): def __init__(self, err_msg: str) -> None: - super(NFSInvalidOperation, self).__init__(-errno.EINVAL, err_msg) + super(NFSInvalidOperation, self).__init__(err_msg, -errno.EINVAL) class NFSObjectNotFound(NFSException): def __init__(self, err_msg: str) -> None: - super(NFSObjectNotFound, self).__init__(-errno.ENOENT, err_msg) + super(NFSObjectNotFound, self).__init__(err_msg, -errno.ENOENT) class FSNotFound(NFSObjectNotFound): diff --git a/src/pybind/mgr/nfs/export.py b/src/pybind/mgr/nfs/export.py index cb14fc793df..d94e99a2882 100644 --- a/src/pybind/mgr/nfs/export.py +++ b/src/pybind/mgr/nfs/export.py @@ -308,7 +308,7 @@ class ExportMgr: ret, out, err = self._delete_export(cluster_id=cluster_id, pseudo_path=None, export_obj=export) if ret != 0: - raise NFSException(-1, f"Failed to delete exports: {err} and {ret}") + raise NFSException(f"Failed to delete exports: {err} and {ret}") log.info(f"All exports successfully deleted for cluster id: {cluster_id}") @export_cluster_checker @@ -476,7 +476,7 @@ class ExportMgr: ret, out, err = self._exec(['radosgw-admin', 'user', 'create', '--uid', uid, '--display-name', uid]) if ret: - raise NFSException(-1, f'Failed to create user {uid}') + raise NFSException(f'Failed to create user {uid}') j = json.loads(out) # FIXME: make this more tolerate of unexpected output? access_key = j['keys'][0]['access_key'] -- 2.39.5