]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
journal: fix AsyncOpTracker compiler error
authorJason Dillaman <dillaman@redhat.com>
Tue, 11 Oct 2016 17:55:21 +0000 (13:55 -0400)
committerJason Dillaman <dillaman@redhat.com>
Tue, 11 Oct 2016 17:55:21 +0000 (13:55 -0400)
The master branch has an async JournalTrimmer which shouldn't be
backported to the Jewel branch yet. This change addresses the
missing sync AsyncOpTracker::wait_for_ops method from the backported
class.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
src/journal/JournalTrimmer.cc

index 18b8e38b37a18496f48df99d9390a22a4a0e5c24..6612d9ffd15a9f10833dd0af88f990efa7379d68 100644 (file)
@@ -49,7 +49,9 @@ void JournalTrimmer::shut_down(Context *on_finish) {
 
 int JournalTrimmer::remove_objects(bool force) {
   ldout(m_cct, 20) << __func__ << dendl;
-  m_async_op_tracker.wait_for_ops();
+  C_SaferCond ops_ctx;
+  m_async_op_tracker.wait_for_ops(&ops_ctx);
+  ops_ctx.wait();
 
   C_SaferCond ctx;
   {