Skip to content

Commit

Permalink
get defrag nblks api
Browse files Browse the repository at this point in the history
  • Loading branch information
yamingk committed Oct 18, 2023
1 parent 6ca1be3 commit adcad2c
Show file tree
Hide file tree
Showing 5 changed files with 54 additions and 6 deletions.
2 changes: 1 addition & 1 deletion conanfile.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

class HomestoreConan(ConanFile):
name = "homestore"
version = "4.5.5"
version = "4.5.6"

homepage = "https://github.com/eBay/Homestore"
description = "HomeStore Storage Engine"
Expand Down
2 changes: 2 additions & 0 deletions src/include/homestore/homestore.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -125,6 +125,8 @@ class HomeStore {
HS_SERVICE m_services; // Services homestore is starting with
hs_before_services_starting_cb_t m_before_services_starting_cb{nullptr};

bool init_done{false}

public:
HomeStore() = default;
virtual ~HomeStore() = default;
Expand Down
10 changes: 6 additions & 4 deletions src/lib/blkalloc/append_blk_allocator.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -164,10 +164,6 @@ void AppendBlkAllocator::free(const BlkId& bid) {
set_dirty_offset(cur_cp->id() % MAX_CP_COUNT);
}

blk_num_t AppendBlkAllocator::available_blks() const { return get_total_blks() - get_used_blks(); }

blk_num_t AppendBlkAllocator::get_used_blks() const { return m_last_append_offset; }

bool AppendBlkAllocator::is_blk_alloced(const BlkId& in_bid, bool) const {
// blk_num starts from 0;
return in_bid.blk_num() < get_used_blks();
Expand All @@ -179,6 +175,12 @@ std::string AppendBlkAllocator::to_string() const {
return fmt::format("{}, last_append_offset: {}", get_name(), m_last_append_offset);
}

blk_num_t AppendBlkAllocator::available_blks() const { return get_total_blks() - get_used_blks(); }

blk_num_t AppendBlkAllocator::get_used_blks() const { return m_last_append_offset; }

blk_num_t AppendBlkAllocator::get_freeable_nblks() const { return m_freeable_nblks; }

blk_num_t AppendBlkAllocator::get_defrag_nblks() const { return get_freeable_nblks() - available_blks(); }

} // namespace homestore
27 changes: 26 additions & 1 deletion src/lib/blkalloc/append_blk_allocator.h
Original file line number Diff line number Diff line change
Expand Up @@ -78,12 +78,37 @@ class AppendBlkAllocator : public BlkAllocator {
BlkAllocStatus alloc_contiguous(BlkId& bid) override;
BlkAllocStatus alloc(blk_count_t nblks, blk_alloc_hints const& hints, BlkId& out_blkid) override;
void free(BlkId const& b) override;


/**
* @brief : the number of available blocks that can be allocated by the AppendBlkAllocator.
* @return : the number of available blocks.
*/
blk_num_t available_blks() const override;

/**
* @brief : the number of used blocks by the AppendBlkAllocator.
* @return : the number of used blocks.
*/
blk_num_t get_used_blks() const override;

/**
* @brief : the number of freeable blocks by the AppendBlkAllocator.
* @return : the number of freeable blocks.
*/
blk_num_t get_freeable_nblks() const;

/**
* @brief : the number of blocks that have been allocated by the AppendBlkAllocator.
* @return : the number of allocated blocks.
*/
blk_num_t get_defrag_nblks() const;

/**
* @brief : the number of blocks that have been allocated by the AppendBlkAllocator.
* @return : the number of allocated blocks.
*/
bool is_blk_alloced(const BlkId& in_bid, bool use_lock = false) const override;

std::string to_string() const override;

/// @brief : needs to be called with cp_guard();
Expand Down
19 changes: 19 additions & 0 deletions src/lib/homestore.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -145,6 +145,16 @@ bool HomeStore::start(const hs_input_params& input, hs_before_services_starting_
}

void HomeStore::format_and_start(std::map< uint32_t, hs_format_params >&& format_opts) {
auto total_pct_sum = 0.0f;
for (const auto& [svc_type, fparams] : format_opts) {
total_pct_sum += fparams.size_pct;
}

if (total_pct_sum > 100.0f) {
LOGERROR("Total percentage of all services is greater than 100.0f, total_pct_sum={}", total_pct_sum);
throw std::invalid_argument("total percentage of all services is greater than 100.0f");
}

m_dev_mgr->format_devices();
hs_utils::set_btree_mempool_size(m_dev_mgr->atomic_page_size({HSDevType::Fast}));

Expand Down Expand Up @@ -209,9 +219,18 @@ void HomeStore::do_start() {
// In case of custom recovery, let consumer starts the recovery and it is consumer module's responsibilities
// to start log store
if (has_log_service() && inp_params.auto_recovery) { m_log_service->start(is_first_time_boot() /* format */); }

init_done();
}

void HomeStore::init_done() { m_init_done = true; }

void HomeStore::shutdown() {
if (!m_init_done) {
LOGWARN("Homestore shutdown is called before init is completed");
return;
}

LOGINFO("Homestore shutdown is started");

if (has_index_service()) {
Expand Down

0 comments on commit adcad2c

Please sign in to comment.