bahman/scylla
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

effective_replication_map_factory: add create_effective_replication_map

Browse Source 
Make a factory key using the replication_strategy type
and config options, plus the token_metadata ring version
and use it to search an already-registred effective_replication_map.

If not found, calculate a new create_effective_replication_map
and register it using the above key.

Signed-off-by: Benny Halevy <bhalevy@scylladb.com>
This commit is contained in:
Benny Halevy
2021-11-17 10:08:40 +02:00
parent ecba37dbfd
commit 8a6fbe800f
2 changed files with 49 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
locator/abstract_replication_strategy.cc
View File

@@ -349,6 +349,41 @@ effective_replication_map::factory_key effective_replication_map::make_factory_k
return factory_key(rs->get_type(), rs->get_config_options(), tmptr->get_ring_version());
}
future<effective_replication_map_ptr> effective_replication_map_factory::create_effective_replication_map(abstract_replication_strategy::ptr_type rs, token_metadata_ptr tmptr) {
// lookup key on local shard
auto key = effective_replication_map::make_factory_key(rs, tmptr);
auto erm = find_effective_replication_map(key);
if (erm) {
rslogger.debug("create_effective_replication_map: found {} [{}]", key, fmt::ptr(erm.get()));
co_return erm;
}
mutable_effective_replication_map_ptr new_erm;
// FIXME: indentation prepared for followup patch
new_erm = co_await calculate_effective_replication_map(std::move(rs), std::move(tmptr));
co_return insert_effective_replication_map(std::move(new_erm), std::move(key));
}
effective_replication_map_ptr effective_replication_map_factory::find_effective_replication_map(const effective_replication_map::factory_key& key) const {
auto it = _effective_replication_maps.find(key);
if (it != _effective_replication_maps.end()) {
return it->second->shared_from_this();
}
return {};
}
effective_replication_map_ptr effective_replication_map_factory::insert_effective_replication_map(mutable_effective_replication_map_ptr erm, effective_replication_map::factory_key key) {
auto [it, inserted] = _effective_replication_maps.insert({key, erm.get()});
if (inserted) {
rslogger.debug("insert_effective_replication_map: inserted {} [{}]", key, fmt::ptr(erm.get()));
return erm;
}
auto res = it->second->shared_from_this();
rslogger.debug("insert_effective_replication_map: found {} [{}]", key, fmt::ptr(res.get()));
return res;
}
} // namespace locator
std::ostream& operator<<(std::ostream& os, locator::replication_strategy_type t) {

15
locator/abstract_replication_strategy.hh
View File

@@ -302,7 +302,20 @@ namespace locator {
class effective_replication_map_factory {
std::unordered_map<effective_replication_map::factory_key, effective_replication_map*> _effective_replication_maps;
// TODO: create and erase effective_replication_map
public:
// looks up the effective_replication_map on the local shard.
// If not found, tries to look one up for reference on shard 0
// so its replication map can be cloned. Otherwise, calculates the
// effective_replication_map for the local shard.
//
// Therefore create should be called first on shard 0, then on all other shards.
future<effective_replication_map_ptr> create_effective_replication_map(abstract_replication_strategy::ptr_type rs, token_metadata_ptr tmptr);
private:
effective_replication_map_ptr find_effective_replication_map(const effective_replication_map::factory_key& key) const;
effective_replication_map_ptr insert_effective_replication_map(mutable_effective_replication_map_ptr erm, effective_replication_map::factory_key key);
// TODO: erase effective_replication_map when destroyed
};
}