Skip to content

hack: sync_write_test #677

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
xiaoxichen wants to merge 1 commit into
base: master
Choose a base branch
from
Open

hack: sync_write_test #677

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ def build_requirements(self):
self.test_requires("gtest/1.14.0")

def requirements(self):
self.requires("iomgr/[^11.3]@oss/master", transitive_headers=True)
self.requires("iomgr/[^11.4]@oss/master", transitive_headers=True)
self.requires("sisl/[^12.2]@oss/master", transitive_headers=True)
self.requires("nuraft_mesg/[^3.7.3]@oss/main", transitive_headers=True)

Expand Down
12 changes: 6 additions & 6 deletions src/tests/test_data_service.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -432,12 +432,14 @@ class BlkDataServiceTest : public testing::Test {
auto out_bids = std::make_shared< MultiBlkId >();
++m_outstanding_io_cnt;
// out_bids are returned syncronously;
write_sgs(io_size, sg, num_iovs, *out_bids).thenValue([this, sg, out_bids](auto) {
auto fut = write_sgs(io_size, sg, num_iovs, *out_bids).thenValue([this, sg, out_bids](auto rc) {
cal_write_blk_crc(*sg, *out_bids);
free(*sg);
--m_outstanding_io_cnt;
++m_total_io_comp_cnt;
return rc;
});
std::move(fut).wait();
}

// read_io has to process and send async_read all the blkids before it can exit and yielf to next io;
Expand Down Expand Up @@ -532,7 +534,7 @@ class BlkDataServiceTest : public testing::Test {
// read op ratio : 30%, free op ratio: 20%
static thread_local std::random_device rd{};
static thread_local std::default_random_engine re{rd()};
std::uniform_int_distribution< uint8_t > op_type{1, static_cast< uint8_t >(DataSvcOp_t::max_op) - 1};
std::uniform_int_distribution< uint8_t > op_type{1, 1};

return static_cast< DataSvcOp_t >(op_type(re));
}
Expand Down Expand Up @@ -945,10 +947,7 @@ TEST_F(BlkDataServiceTest, TestRandMixIOLoad) {
// Perform the I/O operation
switch (io_op) {
case DataSvcOp_t::async_alloc_write: // Write
iomanager.run_on_forget(iomgr::reactor_regex::random_worker, [this, io_size]() {
// num_iovs defaulted to 1;
this->write_io_load(io_size);
});
this->write_io_load(io_size);
break;
case DataSvcOp_t::async_read: // Read

Expand Down Expand Up @@ -977,6 +976,7 @@ TEST_F(BlkDataServiceTest, TestRandMixIOLoad) {

// Wait for the I/O operations to complete
wait_for_outstanding_io_done();
LOGINFO("Metrics: {}", sisl::MetricsFarm::getInstance().get_result_in_json().dump(2));
}

/**
Expand Down
Loading