From: Jason Dillaman <dillaman@redhat.com>
Date: Fri, 24 Apr 2015 04:21:15 +0000 (-0400)
Subject: librbd: TaskFinisher should finish all queued tasks
X-Git-Tag: v0.94.3~28^2~7
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=fe013e0a813c5697e917da642143388de60e8528;p=ceph.git

librbd: TaskFinisher should finish all queued tasks

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)
---

diff --git a/src/librbd/TaskFinisher.h b/src/librbd/TaskFinisher.h
index 14dcd3011fd..4942a38bbdc 100644
--- a/src/librbd/TaskFinisher.h
+++ b/src/librbd/TaskFinisher.h
@@ -35,6 +35,7 @@ public:
       delete m_safe_timer;
     }
 
+    m_finisher->wait_for_empty();
     m_finisher->stop();
     delete m_finisher;
   }