From: Sage Weil <sage@redhat.com>
Date: Thu, 2 Jun 2016 18:39:15 +0000 (-0400)
Subject: os/bluestore: take collection lock when trimming collection cache
X-Git-Tag: v11.0.0~302^2~8
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=35de7bb50f0d7cb427aa308723a7714d11b23f3b;p=ceph.git

os/bluestore: take collection lock when trimming collection cache

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

diff --git a/src/os/bluestore/BlueStore.cc b/src/os/bluestore/BlueStore.cc
index 5fbae40d9981..388a0f7861de 100644
--- a/src/os/bluestore/BlueStore.cc
+++ b/src/os/bluestore/BlueStore.cc
@@ -4444,6 +4444,7 @@ void BlueStore::_osr_reap_done(OpSequencer *osr)
     }
 
     if (txc->first_collection) {
+      RWLock::WLocker l(txc->first_collection->lock);
       txc->first_collection->onode_map.trim();
       txc->first_collection->buffer_cache.trim(
 	g_conf->bluestore_collection_buffer_cache_size);