From: xie xingguo <xie.xingguo@zte.com.cn>
Date: Mon, 5 Dec 2016 01:47:58 +0000 (+0800)
Subject: os/bluestore: kill deprecated get_preferred_csum_order() method
X-Git-Tag: v11.1.0~57^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=4339b42632813ccc58149ffb4411881d635274fb;p=ceph.git

os/bluestore: kill deprecated get_preferred_csum_order() method

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
---

diff --git a/src/os/bluestore/bluestore_types.cc b/src/os/bluestore/bluestore_types.cc
index 3e3f5feaa6f..0781c1135ac 100644
--- a/src/os/bluestore/bluestore_types.cc
+++ b/src/os/bluestore/bluestore_types.cc
@@ -589,18 +589,6 @@ void bluestore_onode_t::generate_test_instances(list<bluestore_onode_t*>& o)
   // FIXME
 }
 
-// FIXME: Using this to compute the ctx.csum_order can lead to poor small
-// random read performance when initial writes are large.
-size_t bluestore_onode_t::get_preferred_csum_order() const
-{
-  uint32_t t = expected_write_size;
-  if (!t) {
-    return 0;
-  }
-  return ctz(expected_write_size);
-}
-
-
 // bluestore_wal_op_t
 
 void bluestore_wal_op_t::dump(Formatter *f) const
diff --git a/src/os/bluestore/bluestore_types.h b/src/os/bluestore/bluestore_types.h
index 559fe47a090..e2207f4c21b 100644
--- a/src/os/bluestore/bluestore_types.h
+++ b/src/os/bluestore/bluestore_types.h
@@ -722,9 +722,6 @@ struct bluestore_onode_t {
     clear_flag(FLAG_OMAP);
   }
 
-  /// get preferred csum chunk size
-  size_t get_preferred_csum_order() const;
-
   DENC(bluestore_onode_t, v, p) {
     DENC_START(1, 1, p);
     denc(v.nid, p);
diff --git a/src/test/objectstore/test_bluestore_types.cc b/src/test/objectstore/test_bluestore_types.cc
index d68beba7c79..ca3bcaad6b5 100644
--- a/src/test/objectstore/test_bluestore_types.cc
+++ b/src/test/objectstore/test_bluestore_types.cc
@@ -314,23 +314,6 @@ TEST(bluestore_blob_t, csum_bench)
   }
 }
 
-TEST(bluestore_onode_t, get_preferred_csum_order)
-{
-  bluestore_onode_t on;
-  ASSERT_EQ(0u, on.get_preferred_csum_order());
-  on.expected_write_size = 4096;
-  ASSERT_EQ(12u, on.get_preferred_csum_order());
-  on.expected_write_size = 4096;
-  ASSERT_EQ(12u, on.get_preferred_csum_order());
-  on.expected_write_size = 8192;
-  ASSERT_EQ(13u, on.get_preferred_csum_order());
-  on.expected_write_size = 8192 + 4096;
-  ASSERT_EQ(12u, on.get_preferred_csum_order());
-  on.expected_write_size = 1048576;
-  ASSERT_EQ(20u, on.get_preferred_csum_order());
-}
-
-
 TEST(Blob, put_ref)
 {
   {