From: Sage Weil <sage@redhat.com>
Date: Thu, 19 May 2016 12:45:00 +0000 (-0400)
Subject: os/bluestore: mark used range on partial blob writes
X-Git-Tag: v11.0.0~359^2~57
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=82ed3ecf9ce069c82bde39104b615fb588c1bd18;p=ceph-ci.git

os/bluestore: mark used range on partial blob writes

- writing into unreferenced blob space
- wal blob writes

both need to update the blob used map.  The full blob writes generates
blobs that are always full, so no change is needed there.  New partial
blob creations need to indicate which parts aren't yet used.

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

diff --git a/src/os/bluestore/BlueStore.cc b/src/os/bluestore/BlueStore.cc
index 2470d5ea9f0..b246156178d 100644
--- a/src/os/bluestore/BlueStore.cc
+++ b/src/os/bluestore/BlueStore.cc
@@ -5447,6 +5447,7 @@ void BlueStore::_do_write_small(
       bluestore_lextent_t& lex = o->onode.extent_map[offset] =
 	bluestore_lextent_t(blob, b_off + head_pad, length, 0);
       b->ref_map.get(lex.offset, lex.length);
+      b->mark_used(lex.offset, lex.length);
       dout(20) << __func__ << "  lex 0x" << std::hex << offset << std::dec
 	       << ": " << lex << dendl;
       dout(20) << __func__ << "  old " << blob << ": " << *b << dendl;
@@ -5510,6 +5511,7 @@ void BlueStore::_do_write_small(
       bluestore_lextent_t& lex = o->onode.extent_map[offset] =
 	bluestore_lextent_t(blob, offset - bstart, length, 0);
       b->ref_map.get(lex.offset, lex.length);
+      b->mark_used(lex.offset, lex.length);
       dout(20) << __func__ << "  lex 0x" << std::hex << offset
 	       << std::dec << ": " << lex << dendl;
       dout(20) << __func__ << "  old " << blob << ": " << *b << dendl;
@@ -5526,6 +5528,10 @@ void BlueStore::_do_write_small(
   uint64_t b_off = offset % min_alloc_size;
   uint64_t b_len = length;
   _pad_zeros(txc, o, &bl, &b_off, &b_len, block_size);
+  if (b_off)
+    b->add_unused(0, b_off);
+  if (b_off + b_len < b->length)
+    b->add_unused(b_off + b_len, b->length - (b_off + b_len));
   o->onode.punch_hole(offset, length, &wctx->lex_old);
   bluestore_lextent_t& lex = o->onode.extent_map[offset] =
     bluestore_lextent_t(blob, offset % min_alloc_size, length);