]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
os/bluestore: fix potential assert when splitting collection. 19519/head
authorIgor Fedotov <ifedotov@suse.com>
Thu, 14 Dec 2017 12:29:31 +0000 (15:29 +0300)
committerIgor Fedotov <ifedotov@suse.com>
Thu, 14 Dec 2017 12:29:31 +0000 (15:29 +0300)
Signed-off-by: Igor Fedotov <ifedotov@suse.com>
src/os/bluestore/BlueStore.cc

index 657bf7917c5a5724772d1399fd1a4e5f0392bb50..0c58eec6ec0e5e0027cb35a86e6a2dd3908fe995 100644 (file)
@@ -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();