From 4773293d76ed43883e5c7800e1825a9132148d90 Mon Sep 17 00:00:00 2001
From: Igor Fedotov <ifedotov@suse.com>
Date: Mon, 7 May 2018 16:58:43 +0300
Subject: [PATCH] os/bluestore: add release(PExtentVector) helper to Allocator
 class to free PExtentVector explicitly.

Signed-off-by: Igor Fedotov <ifedotov@suse.com>
(cherry picked from commit 328ea72a84edef4a6c4e0558dff52d0e85f05122)
---
 src/os/bluestore/Allocator.cc       |  9 +++++++++
 src/os/bluestore/Allocator.h        |  1 +
 src/os/bluestore/BitMapAllocator.cc | 31 +++++++++++++++++++++++++++--
 src/os/bluestore/BlueFS.cc          |  6 +-----
 src/os/bluestore/BlueStore.cc       |  6 +-----
 5 files changed, 41 insertions(+), 12 deletions(-)

diff --git a/src/os/bluestore/Allocator.cc b/src/os/bluestore/Allocator.cc
index 8a4101eae2d81..059e088e1822b 100644
--- a/src/os/bluestore/Allocator.cc
+++ b/src/os/bluestore/Allocator.cc
@@ -20,3 +20,12 @@ Allocator *Allocator::create(CephContext* cct, string type,
 	     << type << dendl;
   return nullptr;
 }
+
+void Allocator::release(const PExtentVector& release_vec)
+{
+  interval_set<uint64_t> release_set;
+  for (auto e : release_vec) {
+    release_set.insert(e.offset, e.length);
+  }
+  release(release_set);
+}
diff --git a/src/os/bluestore/Allocator.h b/src/os/bluestore/Allocator.h
index 6594d8aeb6029..8d821116d68e4 100644
--- a/src/os/bluestore/Allocator.h
+++ b/src/os/bluestore/Allocator.h
@@ -41,6 +41,7 @@ public:
   /* Bulk release. Implementations may override this method to handle the whole
    * set at once. This could save e.g. unnecessary mutex dance. */
   virtual void release(const interval_set<uint64_t>& release_set) = 0;
+  void release(const PExtentVector& release_set);
 
   virtual void dump() = 0;
 
diff --git a/src/os/bluestore/BitMapAllocator.cc b/src/os/bluestore/BitMapAllocator.cc
index 4ef5e61cdd2dd..f9601939f5371 100644
--- a/src/os/bluestore/BitMapAllocator.cc
+++ b/src/os/bluestore/BitMapAllocator.cc
@@ -90,7 +90,19 @@ int64_t BitMapAllocator::allocate(
 
   assert(!max_alloc_size || max_alloc_size >= alloc_unit);
 
-  //FIXME: reproduce reserve/unreserve
+  {
+    int nblks = want_size / m_block_size; // apply floor
+    assert(!(want_size % m_block_size));
+    dout(10) << __func__ << " instance " << (uint64_t) this
+           << " num_used " << m_bit_alloc->get_used_blocks()
+           << " total " << m_bit_alloc->total_blocks()
+           << dendl;
+
+    if (!m_bit_alloc->reserve_blocks(nblks)) {
+      return -ENOSPC;
+    }
+  }
+
 
   dout(10) << __func__ <<" instance "<< (uint64_t) this
      << " want_size " << want_size
@@ -98,8 +110,23 @@ int64_t BitMapAllocator::allocate(
      << " hint " << hint
      << dendl;
   hint = hint % m_total_size; // make hint error-tolerant
-  return allocate_dis(want_size, alloc_unit / m_block_size,
+  auto res = allocate_dis(want_size, alloc_unit / m_block_size,
                       max_alloc_size, hint / m_block_size, extents);
+
+  if (res < want_size) {
+    auto unused = want_size - res;
+    int nblks = unused / m_block_size;
+    assert(!(unused % m_block_size));
+
+    dout(10) << __func__ << " instance " << (uint64_t) this
+	     << " unused " << nblks
+	     << " num used " << m_bit_alloc->get_used_blocks()
+	     << " total " << m_bit_alloc->total_blocks()
+	     << dendl;
+
+    m_bit_alloc->unreserve_blocks(nblks);
+  }
+  return res;
 }
 
 int64_t BitMapAllocator::allocate_dis(
diff --git a/src/os/bluestore/BlueFS.cc b/src/os/bluestore/BlueFS.cc
index 2f49174574912..a608b0311105f 100644
--- a/src/os/bluestore/BlueFS.cc
+++ b/src/os/bluestore/BlueFS.cc
@@ -2002,11 +2002,7 @@ int BlueFS::_allocate(uint8_t id, uint64_t len,
   }
   if (alloc_len < (int64_t)left) {
     if (alloc_len != 0) {
-      interval_set<uint64_t> to_release;
-      for (auto& p : extents) {
-        to_release.insert(p.offset, p.length);
-      }
-      alloc[id]->release(to_release);
+      alloc[id]->release(extents);
     }
     if (id != BDEV_SLOW) {
       if (bdev[id]) {
diff --git a/src/os/bluestore/BlueStore.cc b/src/os/bluestore/BlueStore.cc
index cd4016a166690..94fa4362dd58f 100644
--- a/src/os/bluestore/BlueStore.cc
+++ b/src/os/bluestore/BlueStore.cc
@@ -6629,11 +6629,7 @@ int BlueStore::_fsck(bool deep, bool repair)
 	      derr << __func__ << " allocate failed on 0x" << std::hex << e->length
 		    << " min_alloc_size 0x" << min_alloc_size << std::dec << dendl;
 	      if (alloc_len > 0) {
-		interval_set<uint64_t> release_set;
-		for (auto e : exts) {
-		  release_set.insert(e.offset, e.length);
-		}
-		alloc->release(release_set);
+		alloc->release(exts);
 	      }
 	      bypass_rest = true;
 	      break;
-- 
2.39.5