From: Aravind Date: Thu, 1 Sep 2022 05:35:35 +0000 (+0530) Subject: crimson/block: Rename Device::get_size() to get_available_size() X-Git-Tag: v18.0.0~94^2~1 X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=1021246a5707ae1c3ef5e104d972c98cb451491d;p=ceph-ci.git crimson/block: Rename Device::get_size() to get_available_size() Due to maintaining super block and other tracking information in the disk, the entire disk size is not available, so rename the function to represent that it actually returns available size on the device. get_available_size() represents together free and used space available on the device. Signed-off-by: Aravind Ramesh --- diff --git a/src/crimson/os/seastore/async_cleaner.cc b/src/crimson/os/seastore/async_cleaner.cc index 1027107c0c6..b5a2967d123 100644 --- a/src/crimson/os/seastore/async_cleaner.cc +++ b/src/crimson/os/seastore/async_cleaner.cc @@ -129,7 +129,7 @@ void segments_info_t::add_segment_manager( device_id_t d_id = segment_manager.get_device_id(); auto ssize = segment_manager.get_segment_size(); auto nsegments = segment_manager.get_num_segments(); - auto sm_size = segment_manager.get_size(); + auto sm_size = segment_manager.get_available_size(); INFO("adding segment manager {}, size={}, ssize={}, segments={}", device_id_printer_t{d_id}, sm_size, ssize, nsegments); ceph_assert(ssize > 0); diff --git a/src/crimson/os/seastore/device.h b/src/crimson/os/seastore/device.h index e3ad303c146..5f0af3616d0 100644 --- a/src/crimson/os/seastore/device.h +++ b/src/crimson/os/seastore/device.h @@ -71,7 +71,7 @@ public: virtual seastore_off_t get_block_size() const = 0; - virtual std::size_t get_size() const = 0; + virtual std::size_t get_available_size() const = 0; virtual secondary_device_set_t& get_secondary_devices() = 0; diff --git a/src/crimson/os/seastore/random_block_manager/rbm_device.h b/src/crimson/os/seastore/random_block_manager/rbm_device.h index c27057ca288..65ac3d62b66 100644 --- a/src/crimson/os/seastore/random_block_manager/rbm_device.h +++ b/src/crimson/os/seastore/random_block_manager/rbm_device.h @@ -115,7 +115,7 @@ public: secondary_device_set_t& get_secondary_devices() final { return devices; } - std::size_t get_size() const { return size; } + std::size_t get_available_size() const { return size; } seastore_off_t get_block_size() const { return block_size; } virtual read_ertr::future<> read( diff --git a/src/crimson/os/seastore/segment_manager.h b/src/crimson/os/seastore/segment_manager.h index e14ef0d8d07..e313b2b1a64 100644 --- a/src/crimson/os/seastore/segment_manager.h +++ b/src/crimson/os/seastore/segment_manager.h @@ -170,8 +170,8 @@ public: /* Methods for discovering device geometry, segmentid set, etc */ virtual seastore_off_t get_segment_size() const = 0; virtual device_segment_id_t get_num_segments() const { - ceph_assert(get_size() % get_segment_size() == 0); - return ((device_segment_id_t)(get_size() / get_segment_size())); + ceph_assert(get_available_size() % get_segment_size() == 0); + return ((device_segment_id_t)(get_available_size() / get_segment_size())); } virtual ~SegmentManager() {} diff --git a/src/crimson/os/seastore/segment_manager/block.h b/src/crimson/os/seastore/segment_manager/block.h index 765d78e881f..e4a1ee2ad08 100644 --- a/src/crimson/os/seastore/segment_manager/block.h +++ b/src/crimson/os/seastore/segment_manager/block.h @@ -132,7 +132,7 @@ public: size_t len, ceph::bufferptr &out) final; - size_t get_size() const final { + size_t get_available_size() const final { return superblock.size; } seastore_off_t get_block_size() const { diff --git a/src/crimson/os/seastore/segment_manager/ephemeral.h b/src/crimson/os/seastore/segment_manager/ephemeral.h index 7f69e60b40e..e769a1c0776 100644 --- a/src/crimson/os/seastore/segment_manager/ephemeral.h +++ b/src/crimson/os/seastore/segment_manager/ephemeral.h @@ -102,7 +102,7 @@ public: size_t len, ceph::bufferptr &out) final; - size_t get_size() const final { + size_t get_available_size() const final { return config.size; } seastore_off_t get_block_size() const final { diff --git a/src/crimson/os/seastore/segment_manager/zns.h b/src/crimson/os/seastore/segment_manager/zns.h index 7766a88271d..f8665841798 100644 --- a/src/crimson/os/seastore/segment_manager/zns.h +++ b/src/crimson/os/seastore/segment_manager/zns.h @@ -99,7 +99,7 @@ namespace crimson::os::seastore::segment_manager::zns { size_t len, ceph::bufferptr &out) final; - size_t get_size() const final { + size_t get_available_size() const final { return metadata.size; }; diff --git a/src/crimson/tools/store_nbd/tm_driver.cc b/src/crimson/tools/store_nbd/tm_driver.cc index c31319a5222..56cafc32b96 100644 --- a/src/crimson/tools/store_nbd/tm_driver.cc +++ b/src/crimson/tools/store_nbd/tm_driver.cc @@ -146,7 +146,7 @@ void TMDriver::clear() size_t TMDriver::get_size() const { - return device->get_size() * .5; + return device->get_available_size() * .5; } seastar::future<> TMDriver::mkfs() diff --git a/src/test/crimson/seastore/transaction_manager_test_state.h b/src/test/crimson/seastore/transaction_manager_test_state.h index 3c9761a8e4b..f19e891bdc1 100644 --- a/src/test/crimson/seastore/transaction_manager_test_state.h +++ b/src/test/crimson/seastore/transaction_manager_test_state.h @@ -324,7 +324,7 @@ public: return sm.read(addr, len, out); } - size_t get_size() const final { return sm.get_size(); } + size_t get_available_size() const final { return sm.get_available_size(); } seastore_off_t get_block_size() const final { return sm.get_block_size(); } seastore_off_t get_segment_size() const final { return sm.get_segment_size();