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

fix: potential crash with multi-sharded pfmerge

Browse source 
Fixes #5004

Signed-off-by: Roman Gershman <roman@dragonflydb.io>
This commit is contained in:
Roman Gershman 2025-04-27 11:05:24 +03:00
parent d5c375235f
commit 86bbe3d4f7
No known key found for this signature in database
GPG key ID: F25B77EAF8AEBA7A
2 changed files with 7 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/server/hll_family.cc
View file

@ -255,14 +255,14 @@ OpResult<int> PFMergeInternal(CmdArgList args, Transaction* tx, SinkReplyBuilder
if (result.ok()) {
hlls[sid] = std::move(result.value());
} else {
success = false;
success.store(false, memory_order_relaxed);
}
return result.status();
return OpStatus::OK;
};
tx->Execute(std::move(cb), false);
if (!success) {
if (!success.load(memory_order_relaxed)) {
tx->Conclude();
return OpStatus::INVALID_VALUE;
}

7
src/server/hll_family_test.cc
View file

@ -194,11 +194,12 @@ TEST_F(HllFamilyTest, MergeOverlapping) {
}
TEST_F(HllFamilyTest, MergeInvalid) {
GTEST_SKIP() << "TBD: MergeInvalid test fails with multi-shard runs, see #5004";
Run({"exists", "key1", "key4"});
ASSERT_EQ(GetDebugInfo().shards_count, 2); // ensure 2 shards
EXPECT_EQ(CheckedInt({"pfadd", "key1", "1", "2", "3"}), 1);
EXPECT_EQ(Run({"set", "key2", "..."}), "OK");
EXPECT_THAT(Run({"pfmerge", "key1", "key2"}), ErrArg(HllFamily::kInvalidHllErr));
EXPECT_EQ(Run({"set", "key4", "..."}), "OK");
EXPECT_THAT(Run({"pfmerge", "key1", "key4"}), ErrArg(HllFamily::kInvalidHllErr));
EXPECT_EQ(CheckedInt({"pfcount", "key1"}), 3);
}