From: Sage Weil <sage@newdream.net>
Date: Sun, 10 Sep 2017 18:56:51 +0000 (-0500)
Subject: Merge pull request #17601 from liewegas/wip-21171-luminous
X-Git-Tag: v12.2.1~73
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=462fc906e14bc994667f015f8dd1ece923861c0d;p=ceph.git

Merge pull request #17601 from liewegas/wip-21171-luminous

os/bluestore: fix deferred write deadlock, aio short return handling
---

462fc906e14bc994667f015f8dd1ece923861c0d
diff --cc src/os/bluestore/BlueStore.cc
index 01a20792482b,ce1fc3088ab5..3f67090f5a34
--- a/src/os/bluestore/BlueStore.cc
+++ b/src/os/bluestore/BlueStore.cc
@@@ -8782,9 -8783,11 +8788,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;
      }
    }