import ceph quincy 17.2.6

[ceph.git] / ceph / src / pybind / mgr / rbd_support / task.py

diff --git a/ceph/src/pybind/mgr/rbd_support/task.py b/ceph/src/pybind/mgr/rbd_support/task.py
index d283962a365e3f07f1c84fa9da352360d0caf97b..2566648634d7384a559d9d8e5cb5b879fc0e3de7 100644 (file)
--- a/ceph/src/pybind/mgr/rbd_support/task.py
+++ b/ceph/src/pybind/mgr/rbd_support/task.py
@@ -348,17 +348,18 @@ class TaskHandler:
         return task_json
 
     def remove_task(self,
-                    ioctx: rados.Ioctx,
+                    ioctx: Optional[rados.Ioctx],
                     task: Task,
                     remove_in_memory: bool = True) -> None:
         self.log.info("remove_task: task={}".format(str(task)))
-        omap_keys = (task.sequence_key, )
-        try:
-            with rados.WriteOpCtx() as write_op:
-                ioctx.remove_omap_keys(write_op, omap_keys)
-                ioctx.operate_write_op(write_op, RBD_TASK_OID)
-        except rados.ObjectNotFound:
-            pass
+        if ioctx:
+            try:
+                with rados.WriteOpCtx() as write_op:
+                    omap_keys = (task.sequence_key, )
+                    ioctx.remove_omap_keys(write_op, omap_keys)
+                    ioctx.operate_write_op(write_op, RBD_TASK_OID)
+            except rados.ObjectNotFound:
+                pass
 
         if remove_in_memory:
             try:
@@ -422,9 +423,9 @@ class TaskHandler:
                 task.retry_message = "{}".format(e)
                 self.update_progress(task, 0)
             else:
-                # pool DNE -- remove the task
+                # pool DNE -- remove in-memory task
                 self.complete_progress(task)
-                self.remove_task(ioctx, task)
+                self.remove_task(None, task)
 
         except (rados.Error, rbd.Error) as e:
             self.log.error("execute_task: {}".format(e))