Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion conanfile.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@

class HomestoreConan(ConanFile):
name = "homestore"
version = "6.20.21"
version = "6.20.22"

homepage = "https://github.com/eBay/Homestore"
description = "HomeStore Storage Engine"
Expand Down
3 changes: 2 additions & 1 deletion src/include/homestore/index_service.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,8 @@ class IndexService {

// Creates the vdev that is needed to initialize the device
void create_vdev(uint64_t size, HSDevType devType, uint32_t num_chunks,
chunk_selector_type_t chunk_sel_type = chunk_selector_type_t::ROUND_ROBIN);
chunk_selector_type_t chunk_sel_type = chunk_selector_type_t::ROUND_ROBIN,
uint32_t chunk_size = 0);
// Open the existing vdev which is represnted by the vdev_info_block
shared< VirtualDev > open_vdev(const vdev_info& vb, bool load_existing);
std::shared_ptr< ChunkSelector > get_chunk_selector() { return m_custom_chunk_selector; };
Expand Down
2 changes: 1 addition & 1 deletion src/lib/homestore.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -251,7 +251,7 @@ void HomeStore::format_and_start(std::map< uint32_t, hs_format_params >&& format
fparams.dev_type, fparams.chunk_size));
} else if ((svc_type & HS_SERVICE::INDEX) && has_index_service()) {
m_index_service->create_vdev(pct_to_size(fparams.size_pct, fparams.dev_type), fparams.dev_type,
fparams.num_chunks, fparams.chunk_sel_type);
fparams.num_chunks, fparams.chunk_sel_type, fparams.chunk_size);
} else if ((svc_type & HS_SERVICE::DATA) && has_data_service()) {
m_data_service->create_vdev(pct_to_size(fparams.size_pct, fparams.dev_type), fparams.dev_type,
fparams.block_size, fparams.alloc_type, fparams.chunk_sel_type,
Expand Down
3 changes: 2 additions & 1 deletion src/lib/index/index_service.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ IndexService::IndexService(std::unique_ptr< IndexServiceCallbacks > cbs, shared<
}

void IndexService::create_vdev(uint64_t size, HSDevType devType, uint32_t num_chunks,
chunk_selector_type_t chunk_sel_type) {
chunk_selector_type_t chunk_sel_type, uint32_t chunk_size) {
auto const atomic_page_size = hs()->device_mgr()->atomic_page_size(devType);
hs_vdev_context vdev_ctx;
vdev_ctx.type = hs_vdev_type_t::INDEX_VDEV;
Expand All @@ -54,6 +54,7 @@ void IndexService::create_vdev(uint64_t size, HSDevType devType, uint32_t num_ch
.vdev_size = size,
.num_chunks = num_chunks,
.blk_size = atomic_page_size,
.chunk_size = chunk_size,
.dev_type = devType,
.alloc_type = blk_allocator_type_t::fixed,
.chunk_sel_type = chunk_sel_type,
Expand Down
Loading