]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
os/FileStore.cc: insert not empty list<Context*> to op_finisher/ondisk_finisher. 3135/head
authorXinze Chi <xmdxcxz@gmail.com>
Wed, 10 Dec 2014 17:00:43 +0000 (17:00 +0000)
committerXinze Chi <xmdxcxz@gmail.com>
Wed, 10 Dec 2014 17:00:43 +0000 (17:00 +0000)
Signed-off-by: Xinze Chi <xmdxcxz@gmail.com>
src/os/FileStore.cc

index 1bb4de96cdd211e0f869df31d08edb1470e03bbd..ae8dabfd37d560a1f632d3697594e8477be6be06 100644 (file)
@@ -1785,7 +1785,9 @@ void FileStore::_finish_op(OpSequencer *osr)
   if (o->onreadable) {
     op_finisher.queue(o->onreadable);
   }
-  op_finisher.queue(to_queue);
+  if (!to_queue.empty()) {
+    op_finisher.queue(to_queue);
+  }
   delete o;
 }
 
@@ -1935,7 +1937,9 @@ void FileStore::_journaled_ahead(OpSequencer *osr, Op *o, Context *ondisk)
     dout(10) << " queueing ondisk " << ondisk << dendl;
     ondisk_finisher.queue(ondisk);
   }
-  ondisk_finisher.queue(to_queue);
+  if (!to_queue.empty()) {
+    ondisk_finisher.queue(to_queue);
+  }
 }
 
 int FileStore::_do_transactions(