thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-11-21 15:12:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #24499 from ClickHouse/fix_fake_race

Browse Source 
Fix benign race (detected by clang-12) in Keeper snapshots
This commit is contained in:
alesapin 2021-05-26 11:43:22 +03:00 committed by GitHub
commit b63dfeef88
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/Coordination/KeeperSnapshotManager.cpp
View File

@ -139,7 +139,7 @@ void KeeperStorageSnapshot::serialize(const KeeperStorageSnapshot & snapshot, Wr
writeBinary(snapshot.session_id, out); writeBinary(snapshot.session_id, out);
writeBinary(snapshot.snapshot_container_size, out); writeBinary(snapshot.snapshot_container_size, out);
size_t counter = 0; size_t counter = 0;
for (auto it = snapshot.begin; counter < snapshot.snapshot_container_size; ++it, ++counter) for (auto it = snapshot.begin; counter < snapshot.snapshot_container_size; ++counter)
{ {
const auto & path = it->key; const auto & path = it->key;
const auto & node = it->value; const auto & node = it->value;
@ -148,6 +148,13 @@ void KeeperStorageSnapshot::serialize(const KeeperStorageSnapshot & snapshot, Wr
writeBinary(path, out); writeBinary(path, out);
writeNode(node, out); writeNode(node, out);
/// Last iteration: check and exit here without iterator increment. Otherwise
/// false positive race condition on list end is possible.
if (counter == snapshot.snapshot_container_size - 1)
break;
++it;
} }
size_t size = snapshot.session_and_timeout.size(); size_t size = snapshot.session_and_timeout.size();