From: Sage Weil <sage@newdream.net>
Date: Fri, 8 Sep 2017 12:16:40 +0000 (-0500)
Subject: Merge pull request #17352 from liewegas/wip-21171
X-Git-Tag: v13.0.1~994
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=e4ce4695f299bf985d3663a30e60e1b66cbec83c;p=ceph.git

Merge pull request #17352 from liewegas/wip-21171

os/bluestore: drop deferred_submit_lock, fix aio leak

Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
Reviewed-by: Pan Liu <liupan1111@gmail.com>
---

e4ce4695f299bf985d3663a30e60e1b66cbec83c
diff --cc src/os/bluestore/BlueStore.cc
index 997f261ab659,5cfd8a05914c..868c0f6a4db9
--- a/src/os/bluestore/BlueStore.cc
+++ b/src/os/bluestore/BlueStore.cc
@@@ -8726,9 -8724,11 +8732,11 @@@ void BlueStore::_deferred_aio_finish(Op
        deferred_queue.erase(q);
      } else if (deferred_aggressive) {
        dout(20) << __func__ << " queuing async deferred_try_submit" << dendl;
 -      finishers[0]->queue(new FunctionContext([&](int) {
 +      deferred_finisher.queue(new FunctionContext([&](int) {
  	    deferred_try_submit();
  	  }));
+     } else {
+       dout(20) << __func__ << " leaving queued, more pending" << dendl;
      }
    }