Merge pull request #6783 from yuyuyu101/wip-13961

osd: KeyValueStore: don't queue NULL context Reviewed-by: Sage Weil <sage@redhat.com>
ceph · Dec 11, 2015 · 1c24b20 · 1c24b20
2 parents b2ec53c + e4218a2
commit 1c24b20
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/src/os/KeyValueStore.cc b/src/os/KeyValueStore.cc
@@ -1193,8 +1193,10 @@ void KeyValueStore::_finish_op(OpSequencer *osr)
   if (o->onreadable_sync) {
     o->onreadable_sync->complete(0);
   }
-  op_finisher.queue(o->onreadable);
-  op_finisher.queue(to_queue);
+  if (o->onreadable)
+    op_finisher.queue(o->onreadable);
+  if (!to_queue.empty())
+    op_finisher.queue(to_queue);
   delete o;
 }