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(cluster): first config set drop all entries not owned by node (#1301)

Browse source 
* feat(cluster): first config set drop all entries not owned by node

Signed-off-by: adi_holden <adi@dragonflydb.io>
This commit is contained in:
adiholden 2023-05-29 11:25:21 +03:00 • committed by GitHub
parent b027655ab1
commit 3df467583f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 56 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/server/cluster/cluster_config.cc
View file

@ -109,6 +109,12 @@ optional<SlotSet> ClusterConfig::SetConfig(const vector<ClusterShard>& new_confi
return nullopt;
}
// When set config is called the first time, deleted_slots will contain all slots which are not
// allocated to this node. This makes sure that if there is data in server that was loaded from
// disk (rdb_load), then after the call to set config the server data will contain only data from
// the node owned slots.
bool is_first_config = !IsConfigured();
lock_guard gu(mu_);
config_ = new_config;
@ -120,7 +126,7 @@ optional<SlotSet> ClusterConfig::SetConfig(const vector<ClusterShard>& new_confi
shard.master.id == my_id_ || any_of(shard.replicas.begin(), shard.replicas.end(),
[&](const Node& node) { return node.id == my_id_; });
for (SlotId i = slot_range.start; i <= slot_range.end; ++i) {
if (slots_[i].owned_by_me && !owned_by_me) {
if ((slots_[i].owned_by_me || is_first_config) && !owned_by_me) {
deleted_slots.insert(i);
}
slots_[i] = {.shard = &shard, .owned_by_me = owned_by_me};