From: Kefu Chai <tchaikov@gmail.com>
Date: Wed, 5 Jul 2017 07:00:44 +0000 (+0800)
Subject: Merge pull request #13918 from liupan1111/wip-fix-performance-filestore
X-Git-Tag: v12.1.1~193
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=ab06dd445d188400071ee13bc1208c2acf389a4b;p=ceph.git

Merge pull request #13918 from liupan1111/wip-fix-performance-filestore

os/filestore: queue ondisk completion before apply work

Reviewed-by: Sage Weil <sage@redhat.com>
---

ab06dd445d188400071ee13bc1208c2acf389a4b
diff --cc src/os/filestore/FileStore.cc
index b6b809aff9c3,2ce58f5a53ba..1d018f3eaf8a
--- a/src/os/filestore/FileStore.cc
+++ b/src/os/filestore/FileStore.cc
@@@ -2266,16 -2213,8 +2266,10 @@@ int FileStore::queue_transactions(Seque
  
  void FileStore::_journaled_ahead(OpSequencer *osr, Op *o, Context *ondisk)
  {
 -  dout(5) << "_journaled_ahead " << o << " seq " << o->op << " " << *osr << " " << o->tls << dendl;
 +  dout(5) << __FUNC__ << ": " << o << " seq " << o->op << " " << *osr << " " << o->tls << dendl;
 +
 +  o->trace.event("writeahead journal finished");
  
-   // this should queue in order because the journal does it's completions in order.
-   queue_op(osr, o);
- 
-   list<Context*> to_queue;
-   osr->dequeue_journal(&to_queue);
- 
    // do ondisk completions async, to prevent any onreadable_sync completions
    // getting blocked behind an ondisk completion.
    if (ondisk) {