Merge pull request #3135 from XinzeChi/wip-3

os/FileStore.cc: insert not empty list<Context*> to op_finisher/ondisk_finisher

Reviewed-by: Sage Weil <sage@redhat.com>
This commit is contained in:
Sage Weil 2014-12-10 08:39:32 -08:00
commit f02d2d721a

View File

@ -1808,7 +1808,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;
}
@ -1958,7 +1960,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(