From: Igor Fedotov <ifedotov@suse.com>
Date: Thu, 14 Dec 2017 12:29:31 +0000 (+0300)
Subject: os/bluestore: fix potential assert when splitting collection.
X-Git-Tag: v13.0.2~678^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=f1082ee59919f40b7d142897273883cdb5221b81;p=ceph.git

os/bluestore: fix potential assert when splitting collection.

Signed-off-by: Igor Fedotov <ifedotov@suse.com>
---

diff --git a/src/os/bluestore/BlueStore.cc b/src/os/bluestore/BlueStore.cc
index 657bf7917c5..0c58eec6ec0 100644
--- a/src/os/bluestore/BlueStore.cc
+++ b/src/os/bluestore/BlueStore.cc
@@ -8337,7 +8337,7 @@ void BlueStore::_osr_drain_preceding(TransContext *txc)
   {
     // submit anything pending
     deferred_lock.lock();
-    if (osr->deferred_pending) {
+    if (osr->deferred_pending && !osr->deferred_running) {
       _deferred_submit_unlock(osr);
     } else {
       deferred_lock.unlock();