mirrors/dragonfly
1
0
Fork 0
mirror of https://github.com/dragonflydb/dragonfly.git synced 2025-05-11 18:35:46 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

feat: enable multi-tx squashing. (#1074)

Browse source 
Make blpop test pass with squashing. The problem was that the txid was not properly reported
back to the testing code.

Also, fixed redundant codepath for defragmentation.

Signed-off-by: Roman Gershman <roman@dragonflydb.io>
This commit is contained in:
Roman Gershman 2023-04-12 16:15:35 +03:00 • committed by GitHub
parent 59f1ac6701
commit ee24029148
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 9 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/server/engine_shard_set.cc
View file

@ -101,11 +101,14 @@ void EngineShard::DefragTaskState::UpdateScanState(uint64_t cursor_val) {
// (control by mem_defrag_waste_threshold flag)
bool EngineShard::DefragTaskState::CheckRequired() {
if (cursor > kCursorDoneState || underutilized_found) {
VLOG(1) << "Already found memory utilization issue - cursor: " << cursor
<< " and underutilized_found " << underutilized_found;
VLOG(1) << "cursor: " << cursor << " and underutilized_found " << underutilized_found;
return true;
}
const std::size_t memory_per_shard = max_memory_limit / shard_set->size();
if (memory_per_shard < (1 << 16)) { // Too small.
return false;
}
const std::size_t threshold_mem = memory_per_shard * GetFlag(FLAGS_mem_defrag_threshold);
const double waste_threshold = GetFlag(FLAGS_mem_defrag_waste_threshold);

3
src/server/list_family_test.cc
View file

@ -240,9 +240,6 @@ TEST_F(ListFamilyTest, BLPopMultiPush) {
}
TEST_F(ListFamilyTest, BLPopSerialize) {
// TODO: Fix squashed blocking handling
GTEST_SKIP() << "Skipped because squashing breaks seralization guarantees";
RespExpr blpop_resp;
auto pop_fb = pp_->at(0)->LaunchFiber(Launch::dispatch, [&] {

2
src/server/main_service.cc
View file

@ -49,7 +49,7 @@ ABSL_FLAG(uint32_t, multi_exec_mode, 1,
"Set multi exec atomicity mode: 1 for global, 2 for locking ahead, 3 for locking "
"incrementally, 4 for non atomic");
ABSL_FLAG(bool, multi_exec_squash, false,
ABSL_FLAG(bool, multi_exec_squash, true,
"Whether multi exec will squash single shard commands to optimize performance");
ABSL_FLAG(uint32_t, num_shards, 0, "Number of database shards, 0 - to choose automatically");

3
src/server/multi_command_squasher.cc
View file

@ -181,6 +181,9 @@ void MultiCommandSquasher::Run() {
ExecuteSquashed(); // Flush leftover
// Set last txid.
cntx_->last_command_debug.clock = cntx_->transaction->txid();
if (!sharded_.empty())
cntx_->transaction->ReportWritesSquashedMulti(
[this](ShardId sid) { return sharded_[sid].had_writes; });