From: Pere Diaz Bou <pere-altea@hotmail.com>
Date: Tue, 24 Oct 2023 10:35:58 +0000 (+0200)
Subject: os/bluestore: remove unnecessary set_shared_blob in tests
X-Git-Tag: v19.3.0~3^2~6
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=e3bd4527a1af80c06534557f32b7da8957072e6f;p=ceph.git

os/bluestore: remove unnecessary set_shared_blob in tests

Signed-off-by: Pere Diaz Bou <pere-altea@hotmail.com>
---

diff --git a/src/test/objectstore/test_bluestore_types.cc b/src/test/objectstore/test_bluestore_types.cc
index 2d3b6ed92693..cf41b504259f 100644
--- a/src/test/objectstore/test_bluestore_types.cc
+++ b/src/test/objectstore/test_bluestore_types.cc
@@ -434,7 +434,6 @@ TEST(Blob, put_ref)
 
     auto coll = ceph::make_ref<BlueStore::Collection>(&store, oc, bc, coll_t());
     BlueStore::Blob b(coll.get());
-    b.set_shared_blob(new BlueStore::SharedBlob(coll.get()));
     b.dirty_blob().allocated_test(bluestore_pextent_t(0x40715000, 0x2000));
     b.dirty_blob().allocated_test(
       bluestore_pextent_t(bluestore_pextent_t::INVALID_OFFSET, 0x8000));
@@ -467,7 +466,6 @@ TEST(Blob, put_ref)
 
   {
     BlueStore::Blob B(coll.get());
-    B.set_shared_blob(new BlueStore::SharedBlob(coll.get()));
     bluestore_blob_t& b = B.dirty_blob();
     PExtentVector r;
     b.allocated_test(bluestore_pextent_t(0, mas * 2));
@@ -488,7 +486,6 @@ TEST(Blob, put_ref)
   }
   {
     BlueStore::Blob B(coll.get());
-    B.set_shared_blob(new BlueStore::SharedBlob(coll.get()));
     bluestore_blob_t& b = B.dirty_blob();
     PExtentVector r;
     b.allocated_test(bluestore_pextent_t(123, mas * 2));
@@ -512,7 +509,6 @@ TEST(Blob, put_ref)
   }
   {
     BlueStore::Blob B(coll.get());
-    B.set_shared_blob(new BlueStore::SharedBlob(coll.get()));
     bluestore_blob_t& b = B.dirty_blob();
     PExtentVector r;
     b.allocated_test(bluestore_pextent_t(1, mas));
@@ -550,7 +546,6 @@ TEST(Blob, put_ref)
   }
   {
     BlueStore::Blob B(coll.get());
-    B.set_shared_blob(new BlueStore::SharedBlob(coll.get()));
     bluestore_blob_t& b = B.dirty_blob();
     PExtentVector r;
     b.allocated_test(bluestore_pextent_t(1, mas));
@@ -591,7 +586,6 @@ TEST(Blob, put_ref)
   }
   {
     BlueStore::Blob B(coll);
-    B.set_shared_blob(new BlueStore::SharedBlob(coll.get()));
     bluestore_blob_t& b = B.dirty_blob();
     PExtentVector r;
     b.allocated_test(bluestore_pextent_t(1, mas * 6));
@@ -623,7 +617,6 @@ TEST(Blob, put_ref)
   }
   {
     BlueStore::Blob B(coll);
-    B.set_shared_blob(new BlueStore::SharedBlob(coll.get()));
     bluestore_blob_t& b = B.dirty_blob();
     PExtentVector r;
     b.allocated_test(bluestore_pextent_t(1, mas * 4));
@@ -661,7 +654,6 @@ TEST(Blob, put_ref)
   }
   {
     BlueStore::Blob B(coll);
-    B.set_shared_blob(new BlueStore::SharedBlob(coll.get()));
     bluestore_blob_t& b = B.dirty_blob();
     PExtentVector r;
     b.allocated_test(bluestore_pextent_t(1, mas * 4));
@@ -716,7 +708,6 @@ TEST(Blob, put_ref)
   }
   {
     BlueStore::Blob B(coll);
-    B.set_shared_blob(new BlueStore::SharedBlob(coll.get()));
     bluestore_blob_t& b = B.dirty_blob();
     PExtentVector r;
     b.allocated_test(bluestore_pextent_t(1, mas * 4));
@@ -771,7 +762,6 @@ TEST(Blob, put_ref)
   }
   {
     BlueStore::Blob B(coll.get());
-    B.set_shared_blob(new BlueStore::SharedBlob(coll.get()));
     bluestore_blob_t& b = B.dirty_blob();
     PExtentVector r;
     b.allocated_test(bluestore_pextent_t(1, mas * 8));
@@ -814,7 +804,6 @@ TEST(Blob, put_ref)
   // verify csum chunk size if factored in properly
   {
     BlueStore::Blob B(coll.get());
-    B.set_shared_blob(new BlueStore::SharedBlob(coll.get()));
     bluestore_blob_t& b = B.dirty_blob();
     PExtentVector r;
     b.allocated_test(bluestore_pextent_t(0, mas*4));
@@ -832,7 +821,6 @@ TEST(Blob, put_ref)
   }
   {
     BlueStore::Blob B(coll.get());
-    B.set_shared_blob(new BlueStore::SharedBlob(coll.get()));
     bluestore_blob_t& b = B.dirty_blob();
     b.allocated_test(bluestore_pextent_t(0x40101000, 0x4000));
     b.allocated_test(bluestore_pextent_t(bluestore_pextent_t::INVALID_OFFSET,
@@ -854,7 +842,6 @@ TEST(Blob, put_ref)
   }
   {
     BlueStore::Blob B(coll.get());
-    B.set_shared_blob(new BlueStore::SharedBlob(coll.get()));
     bluestore_blob_t& b = B.dirty_blob();
     b.allocated_test(bluestore_pextent_t(1, 0x5000));
     b.allocated_test(bluestore_pextent_t(2, 0x5000));
@@ -872,7 +859,6 @@ TEST(Blob, put_ref)
   }
   {
     BlueStore::Blob B(coll.get());
-    B.set_shared_blob(new BlueStore::SharedBlob(coll.get()));
     bluestore_blob_t& b = B.dirty_blob();
     b.allocated_test(bluestore_pextent_t(1, 0x7000));
     b.allocated_test(bluestore_pextent_t(2, 0x7000));
@@ -901,7 +887,6 @@ TEST(Blob, put_ref)
 
     auto coll = ceph::make_ref<BlueStore::Collection>(&store, oc, bc, coll_t());
     BlueStore::Blob B(coll.get());
-    B.set_shared_blob(new BlueStore::SharedBlob(coll.get()));
     bluestore_blob_t& b = B.dirty_blob();
     b.allocated_test(bluestore_pextent_t(1, 0x5000));
     b.allocated_test(bluestore_pextent_t(2, 0x7000));
@@ -991,8 +976,6 @@ TEST(Blob, split)
   {
     BlueStore::Blob L(coll.get());
     BlueStore::Blob R(coll.get());
-    L.set_shared_blob(new BlueStore::SharedBlob(coll.get()));
-    R.set_shared_blob(new BlueStore::SharedBlob(coll.get()));
     L.dirty_blob().allocated_test(bluestore_pextent_t(0x2000, 0x2000));
     L.dirty_blob().init_csum(Checksummer::CSUM_CRC32C, 12, 0x2000);
     L.get_ref(coll.get(), 0, 0x2000);
@@ -1013,8 +996,6 @@ TEST(Blob, split)
   {
     BlueStore::Blob L(coll.get());
     BlueStore::Blob R(coll.get());
-    L.set_shared_blob(new BlueStore::SharedBlob(coll.get()));
-    R.set_shared_blob(new BlueStore::SharedBlob(coll.get()));
     L.dirty_blob().allocated_test(bluestore_pextent_t(0x2000, 0x1000));
     L.dirty_blob().allocated_test(bluestore_pextent_t(0x12000, 0x1000));
     L.dirty_blob().init_csum(Checksummer::CSUM_CRC32C, 12, 0x2000);
@@ -1048,7 +1029,6 @@ TEST(Blob, legacy_decode)
   {
     BlueStore::Blob B(coll.get());
 
-    B.set_shared_blob(new BlueStore::SharedBlob(coll.get()));
     B.dirty_blob().allocated_test(bluestore_pextent_t(0x1, 0x2000));
     B.dirty_blob().init_csum(Checksummer::CSUM_CRC32C, 12, 0x2000);
     B.get_ref(coll.get(), 0, 0xff0);
@@ -1094,8 +1074,6 @@ TEST(Blob, legacy_decode)
     auto p2 = bl2.front().begin_deep();
     BlueStore::Blob Bres(coll.get());
     BlueStore::Blob Bres2(coll.get());
-    Bres.set_shared_blob(new BlueStore::SharedBlob(coll.get()));
-    Bres2.set_shared_blob(new BlueStore::SharedBlob(coll.get()));
 
     uint64_t sbid, sbid2;
     Bres.decode(
@@ -1130,7 +1108,6 @@ TEST(ExtentMap, seek_lextent)
   BlueStore::ExtentMap em(&onode,
     g_ceph_context->_conf->bluestore_extent_map_inline_shard_prealloc_size);
   BlueStore::BlobRef br(coll->new_blob());
-  br->set_shared_blob(new BlueStore::SharedBlob(coll.get()));
 
   ASSERT_EQ(em.extent_map.end(), em.seek_lextent(0));
   ASSERT_EQ(em.extent_map.end(), em.seek_lextent(100));
@@ -1183,7 +1160,6 @@ TEST(ExtentMap, has_any_lextents)
   BlueStore::ExtentMap em(&onode,
     g_ceph_context->_conf->bluestore_extent_map_inline_shard_prealloc_size);
   BlueStore::BlobRef b(coll->new_blob());
-  b->set_shared_blob(new BlueStore::SharedBlob(coll.get()));
 
   ASSERT_FALSE(em.has_any_lextents(0, 0));
   ASSERT_FALSE(em.has_any_lextents(0, 1000));
@@ -1880,10 +1856,6 @@ TEST(GarbageCollector, BasicTest)
     BlueStore::BlobRef b2(coll->new_blob());
     BlueStore::BlobRef b3(coll->new_blob());
     BlueStore::BlobRef b4(coll->new_blob());
-    b1->set_shared_blob(new BlueStore::SharedBlob(coll.get()));
-    b2->set_shared_blob(new BlueStore::SharedBlob(coll.get()));
-    b3->set_shared_blob(new BlueStore::SharedBlob(coll.get()));
-    b4->set_shared_blob(new BlueStore::SharedBlob(coll.get()));
     b1->dirty_blob().set_compressed(0x2000, 0x1000);
     b1->dirty_blob().allocated_test(bluestore_pextent_t(0, 0x1000));
     b2->dirty_blob().allocated_test(bluestore_pextent_t(1, 0x1000));
@@ -1946,10 +1918,6 @@ TEST(GarbageCollector, BasicTest)
     BlueStore::BlobRef b2(coll->new_blob());
     BlueStore::BlobRef b3(coll->new_blob());
     BlueStore::BlobRef b4(coll->new_blob());
-    b1->set_shared_blob(new BlueStore::SharedBlob(coll.get()));
-    b2->set_shared_blob(new BlueStore::SharedBlob(coll.get()));
-    b3->set_shared_blob(new BlueStore::SharedBlob(coll.get()));
-    b4->set_shared_blob(new BlueStore::SharedBlob(coll.get()));
     b1->dirty_blob().set_compressed(0x40000, 0x20000);
     b1->dirty_blob().allocated_test(bluestore_pextent_t(0, 0x20000));
     b2->dirty_blob().allocated_test(bluestore_pextent_t(1, 0x10000));
@@ -2017,8 +1985,6 @@ TEST(GarbageCollector, BasicTest)
     int64_t saving;
     BlueStore::BlobRef b1(coll->new_blob());
     BlueStore::BlobRef b2(coll->new_blob());
-    b1->set_shared_blob(new BlueStore::SharedBlob(coll.get()));
-    b2->set_shared_blob(new BlueStore::SharedBlob(coll.get()));
     b1->dirty_blob().set_compressed(0x4000, 0x2000);
     b1->dirty_blob().allocated_test(bluestore_pextent_t(0, 0x2000));
     b2->dirty_blob().set_compressed(0x4000, 0x2000);
@@ -2075,11 +2041,6 @@ TEST(GarbageCollector, BasicTest)
     BlueStore::BlobRef b2(coll->new_blob());
     BlueStore::BlobRef b3(coll->new_blob());
     BlueStore::BlobRef b4(coll->new_blob());
-    b0->set_shared_blob(new BlueStore::SharedBlob(coll.get()));
-    b1->set_shared_blob(new BlueStore::SharedBlob(coll.get()));
-    b2->set_shared_blob(new BlueStore::SharedBlob(coll.get()));
-    b3->set_shared_blob(new BlueStore::SharedBlob(coll.get()));
-    b4->set_shared_blob(new BlueStore::SharedBlob(coll.get()));
     b0->dirty_blob().set_compressed(0x2000, 0x1000);
     b0->dirty_blob().allocated_test(bluestore_pextent_t(0, 0x10000));
     b1->dirty_blob().set_compressed(0x20000, 0x10000);