]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
pybind/mgr: don't log exception when cannot find RBD task by id
authorJason Dillaman <dillaman@redhat.com>
Fri, 26 Jul 2019 11:01:59 +0000 (07:01 -0400)
committerJason Dillaman <dillaman@redhat.com>
Sun, 18 Aug 2019 20:50:17 +0000 (16:50 -0400)
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit 7ccf0b3229e674b625e396ca3b1e6f737214e125)

src/pybind/mgr/rbd_support/module.py

index bd18ea603d45e32d91ac251d44766c2dcc62e9b5..bf6523de1acf3a1ed76f315c3ef2b525d015ce38 100644 (file)
@@ -1134,8 +1134,7 @@ class TaskHandler:
         self.log.info("task_cancel: {}".format(task_id))
 
         if task_id not in self.tasks_by_id:
-            self.log.debug("tasks: {}".format(str(self.tasks_by_id)))
-            raise KeyError("No such task {}".format(task_id))
+            return -errno.ENOENT, '', "No such task {}".format(task_id)
 
         task = self.tasks_by_id[task_id]
         task.cancel()
@@ -1160,7 +1159,7 @@ class TaskHandler:
 
         if task_id:
             if task_id not in self.tasks_by_id:
-                raise KeyError("No such task {}".format(task_id))
+                return -errno.ENOENT, '', "No such task {}".format(task_id)
 
             result = self.tasks_by_id[task_id].to_dict()
         else: