]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
librbd: TaskFinisher should finish all queued tasks
authorJason Dillaman <dillaman@redhat.com>
Fri, 24 Apr 2015 04:21:15 +0000 (00:21 -0400)
committerJason Dillaman <dillaman@redhat.com>
Fri, 17 Jul 2015 18:17:04 +0000 (14:17 -0400)
The destructor wasn't waiting for all Finisher tasks
to complete before stopping the thread.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit 8e20240e4155e2f0398e79f4c0095d2d6ba1d4cb)

src/librbd/TaskFinisher.h

index 14dcd3011fd0ca2ce3c9b3ea3428e11a60d2c401..4942a38bbdc2113f7772c1ee8763b825f8fc8810 100644 (file)
@@ -35,6 +35,7 @@ public:
       delete m_safe_timer;
     }
 
+    m_finisher->wait_for_empty();
     m_finisher->stop();
     delete m_finisher;
   }