os/bluestore: fix GC gc_end_offsed miscalculation

Signed-off-by: Igor Fedotov <ifedotov@mirantis.com>
ceph · Oct 13, 2016 · ce917c7 · ce917c7
1 parent 2c796de
commit ce917c7
Show file tree

Hide file tree

Showing 2 changed files with 103 additions and 3 deletions.
diff --git a/src/os/bluestore/BlueStore.cc b/src/os/bluestore/BlueStore.cc
@@ -2225,15 +2225,14 @@ bool BlueStore::GarbageCollector::do_write_check_depth(
 	tp++;
 	if (tp == ext_map.extent_map.end() ||
 	  (tp_prev->logical_offset + tp_prev->length) != tp->logical_offset) {
-	  tp = tp_prev;
 	  break;
 	}
       }
-      *gc_end_offset = tp->logical_offset + tp_prev->length;
+      *gc_end_offset = tp_prev->logical_offset + tp_prev->length;
     }
   }
   if (*gc_end_offset > onode_size) {
-    *gc_end_offset = MAX(end_offset, onode_size);
+    *gc_end_offset = onode_size;
   }
   if (depth >= g_conf->bluestore_gc_max_blob_depth) {
     return true;
@@ -7843,6 +7842,7 @@ int BlueStore::_do_write(
   dout(20) << __func__ << " GC depth " << (int)wctx.blob_depth
            << ", gc 0x" << std::hex << gc_start_offset << "~"
            << (gc_end_offset - gc_start_offset)
+           << (do_collect ? " collect" : "")
            << std::dec << dendl;
   if (do_collect) {
     // we need garbage collection of blobs.

diff --git a/src/test/objectstore/test_bluestore_types.cc b/src/test/objectstore/test_bluestore_types.cc
@@ -986,6 +986,106 @@ TEST(ExtentMap, compress_extent_map)
   ASSERT_EQ(6u, em.extent_map.size());
 }
 
+TEST(GarbageCollector, SimpleTest)
+{
+  BlueStore::LRUCache cache;
+  BlueStore::ExtentMap em(nullptr);
+  BlueStore::GarbageCollector gc;
+  uint8_t  blob_depth = 0;
+  uint64_t gc_start_offset = 0;
+  uint64_t gc_end_offset = 0;
+
+  bool b;
+  b = gc.do_write_check_depth(em,
+                                   0, //onode_size
+                                   0, //start_offset
+                                   100, //end_offset
+                                   &blob_depth,
+                                   &gc_start_offset,
+                                   &gc_end_offset);
+  ASSERT_TRUE(!b);
+  ASSERT_EQ(blob_depth, 1ul);
+  ASSERT_EQ(gc_start_offset, 0ul);
+  ASSERT_EQ(gc_end_offset, 0ul);
+
+  BlueStore::BlobRef b1(new BlueStore::Blob);
+  BlueStore::BlobRef b2(new BlueStore::Blob);
+  BlueStore::BlobRef b3(new BlueStore::Blob);
+  b1->shared_blob = new BlueStore::SharedBlob(-1, string(), &cache);
+  b2->shared_blob = new BlueStore::SharedBlob(-1, string(), &cache);
+  b3->shared_blob = new BlueStore::SharedBlob(1, string(), &cache);
+
+  em.extent_map.insert(*new BlueStore::Extent(0, 0, 100, 3, b1));
+  em.extent_map.insert(*new BlueStore::Extent(100, 0, 50, 3, b2));
+  em.extent_map.insert(*new BlueStore::Extent(150, 0, 150, 1, b3));
+
+  b = gc.do_write_check_depth(em,
+                                   300, //onode_size
+                                   10, //start_offset
+                                   80, //end_offset
+                                   &blob_depth,
+                                   &gc_start_offset,
+                                   &gc_end_offset);
+  ASSERT_TRUE(b);
+  ASSERT_EQ(blob_depth, 1ul);
+  ASSERT_EQ(gc_start_offset, 0ul);
+  ASSERT_EQ(gc_end_offset, 150ul);
+
+  b = gc.do_write_check_depth(em,
+                                   300, //onode_size
+                                   70, //start_offset
+                                   310, //end_offset
+                                   &blob_depth,
+                                   &gc_start_offset,
+                                   &gc_end_offset);
+  ASSERT_TRUE(b);
+  ASSERT_EQ(blob_depth, 1ul);
+  ASSERT_EQ(gc_start_offset, 0ul);
+  ASSERT_EQ(gc_end_offset, 300ul);
+
+  b = gc.do_write_check_depth(em,
+                                   300, //onode_size
+                                   70, //start_offset
+                                   290, //end_offset
+                                   &blob_depth,
+                                   &gc_start_offset,
+                                   &gc_end_offset);
+  ASSERT_TRUE(b);
+  ASSERT_EQ(blob_depth, 1ul);
+  ASSERT_EQ(gc_start_offset, 0ul);
+  ASSERT_EQ(gc_end_offset, 300ul);
+
+  b = gc.do_write_check_depth(em,
+                                   300, //onode_size
+                                   180, //start_offset
+                                   290, //end_offset
+                                   &blob_depth,
+                                   &gc_start_offset,
+                                   &gc_end_offset);
+  ASSERT_TRUE(!b);
+  ASSERT_EQ(blob_depth, 2ul);
+
+  em.extent_map.clear();
+  em.extent_map.insert(*new BlueStore::Extent(0x17c00, 0xc000, 0x400, 3, b1));
+  em.extent_map.insert(*new BlueStore::Extent(0x18000, 0, 0xf000, 3, b1));
+  em.extent_map.insert(*new BlueStore::Extent(0x27000, 0, 0x400, 3, b1));
+  em.extent_map.insert(*new BlueStore::Extent(0x27400, 0x400, 0x7c00, 2, b2));
+  em.extent_map.insert(*new BlueStore::Extent(0x2f000, 0, 0xe00, 1, b3));
+
+  b = gc.do_write_check_depth(em,
+                                   0x3f000, //onode_size
+                                   0x1ac00, //start_offset
+                                   0x1ac00 + 0x6600, //end_offset
+                                   &blob_depth,
+                                   &gc_start_offset,
+                                   &gc_end_offset);
+  ASSERT_TRUE(b);
+  ASSERT_EQ(blob_depth, 1ul);
+  ASSERT_EQ(gc_start_offset, 0x17c00ul);
+  ASSERT_EQ(gc_end_offset, 0x2f000ul);
+}
+
+
 int main(int argc, char **argv) {
   vector<const char*> args;
   argv_to_vec(argc, (const char **)argv, args);