update ceph source to reef 18.2.1

[ceph.git] / ceph / src / pybind / mgr / volumes / fs / async_job.py

diff --git a/ceph/src/pybind/mgr/volumes/fs/async_job.py b/ceph/src/pybind/mgr/volumes/fs/async_job.py
index a91764e76fe247607b02c03bf05892afe296fec2..f1d998c85b8ff3686ba87bd557990b05155d53f1 100644 (file)
--- a/ceph/src/pybind/mgr/volumes/fs/async_job.py
+++ b/ceph/src/pybind/mgr/volumes/fs/async_job.py
@@ -35,7 +35,7 @@ class JobThread(threading.Thread):
             vol_job = None
             try:
                 # fetch next job to execute
-                with self.async_job.lock:
+                with lock_timeout_log(self.async_job.lock):
                     while True:
                         if self.should_reconfigure_num_threads():
                             log.info("thread [{0}] terminating due to reconfigure".format(thread_name))
@@ -64,12 +64,12 @@ class JobThread(threading.Thread):
             finally:
                 # when done, unregister the job
                 if vol_job:
-                    with self.async_job.lock:
+                    with lock_timeout_log(self.async_job.lock):
                         self.async_job.unregister_async_job(vol_job[0], vol_job[1], thread_id)
                 time.sleep(1)
         log.error("thread [{0}] reached exception limit, bailing out...".format(thread_name))
         self.vc.cluster_log("thread {0} bailing out due to exception".format(thread_name))
-        with self.async_job.lock:
+        with lock_timeout_log(self.async_job.lock):
             self.async_job.threads.remove(self)
 
     def should_reconfigure_num_threads(self):
@@ -150,7 +150,7 @@ class AsyncJobs(threading.Thread):
     def shutdown(self):
         self.stopping.set()
         self.cancel_all_jobs()
-        with self.lock:
+        with lock_timeout_log(self.lock):
             self.cv.notifyAll()
         self.join()