mirrors/scylladb
1
0
Fork 0
mirror of https://github.com/scylladb/scylladb.git synced 2026-06-09 08:23:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

replica: split creating keyspace into two functions

Browse Source 
This is done so that in following commits insert_keyspace can be used
to atomically change schema (as it doesn't yield).
This commit is contained in:
Marcin Maliszkiewicz
2024-09-12 15:54:00 +02:00
parent aceb1f9659
commit fe0f4033ca
2 changed files with 25 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
replica/database.cc
View File

@@ -18,6 +18,7 @@
#include "utils/assert.hh"
#include "utils/lister.hh"
#include "replica/database.hh"
#include <memory>
#include <seastar/core/future-util.hh>
#include "db/system_keyspace.hh"
#include "db/system_keyspace_sstables_registry.hh"
@@ -740,7 +741,9 @@ future<> database::parse_system_tables(distributed<service::storage_proxy>& prox
co_await do_parse_schema_tables(proxy, db::schema_tables::KEYSPACES, coroutine::lambda([&] (schema_result_value_type &v) -> future<> {
auto scylla_specific_rs = co_await extract_scylla_specific_keyspace_info(proxy, v);
auto ksm = co_await create_keyspace_metadata(proxy, v, scylla_specific_rs);
co_return co_await create_keyspace(ksm, proxy.local().get_erm_factory(), system_keyspace::no);
auto ks = co_await create_keyspace(ksm, proxy.local().get_erm_factory(), system_keyspace::no);
insert_keyspace(std::move(ks));
co_return;
}));
co_await do_parse_schema_tables(proxy, db::schema_tables::TYPES, coroutine::lambda([&] (schema_result_value_type &v) -> future<> {
auto& ks = this->find_keyspace(v.first);
@@ -937,7 +940,8 @@ future<> database::create_local_system_table(
std::nullopt,
durable
);
co_await create_keyspace(ksm, erm_factory, replica::database::system_keyspace::yes);
auto ks = co_await create_keyspace(ksm, erm_factory, replica::database::system_keyspace::yes);
insert_keyspace(std::move(ks));
}
auto& ks = find_keyspace(ks_name);
auto cfg = ks.make_column_family_config(*table, *this);
@@ -1360,27 +1364,32 @@ std::vector<view_ptr> database::get_views() const {
| std::views::transform([] (auto& cf) { return view_ptr(cf->schema()); }));
}
future<> database::create_in_memory_keyspace(const lw_shared_ptr<keyspace_metadata>& ksm, locator::effective_replication_map_factory& erm_factory, system_keyspace system) {
future<std::unique_ptr<keyspace>> database::create_in_memory_keyspace(const lw_shared_ptr<keyspace_metadata>& ksm, locator::effective_replication_map_factory& erm_factory, system_keyspace system) {
auto kscfg = make_keyspace_config(*ksm, system);
keyspace ks(ksm, std::move(kscfg), erm_factory);
co_await ks.create_replication_strategy(get_shared_token_metadata());
_keyspaces.emplace(ksm->name(), std::move(ks));
auto ks(std::make_unique<keyspace>(ksm, std::move(kscfg), erm_factory));
co_await ks->create_replication_strategy(get_shared_token_metadata());
co_return ks;
}
future<>
future<std::unique_ptr<keyspace>>
database::create_keyspace(const lw_shared_ptr<keyspace_metadata>& ksm, locator::effective_replication_map_factory& erm_factory, system_keyspace system) {
if (_keyspaces.contains(ksm->name())) {
co_return;
}
co_await create_in_memory_keyspace(ksm, erm_factory, system);
co_await get_sstables_manager(system).init_keyspace_storage(ksm->get_storage_options(), ksm->name());
co_return co_await create_in_memory_keyspace(ksm, erm_factory, system);
}
void database::insert_keyspace(std::unique_ptr<keyspace> ks) {
auto& name = ks->metadata()->name();
if (_keyspaces.contains(name)) {
return;
}
_keyspaces.emplace(name, std::move(*ks));
}
future<> database::create_keyspace_on_all_shards(sharded<database>& sharded_db, sharded<service::storage_proxy>& proxy, const keyspace_metadata& ks_metadata) {
co_await modify_keyspace_on_all_shards(sharded_db, [&] (replica::database& db) -> future<> {
auto ksm = keyspace_metadata::new_keyspace(ks_metadata);
co_await db.create_keyspace(ksm, proxy.local().get_erm_factory(), system_keyspace::no);
auto ks = co_await db.create_keyspace(ksm, proxy.local().get_erm_factory(), system_keyspace::no);
db.insert_keyspace(std::move(ks));
});
}

5
replica/database.hh
View File

@@ -1635,7 +1635,7 @@ private:
future<> flush_system_column_families();
using system_keyspace = bool_class<struct system_keyspace_tag>;
future<> create_in_memory_keyspace(const lw_shared_ptr<keyspace_metadata>& ksm, locator::effective_replication_map_factory& erm_factory, system_keyspace system);
future<std::unique_ptr<keyspace>> create_in_memory_keyspace(const lw_shared_ptr<keyspace_metadata>& ksm, locator::effective_replication_map_factory& erm_factory, system_keyspace system);
void setup_metrics();
void setup_scylla_memory_diagnostics_producer();
reader_concurrency_semaphore& read_concurrency_sem();
@@ -1653,7 +1653,8 @@ private:
template<typename Future>
Future update_write_metrics(Future&& f);
void update_write_metrics_for_timed_out_write();
future<> create_keyspace(const lw_shared_ptr<keyspace_metadata>&, locator::effective_replication_map_factory& erm_factory, system_keyspace system);
future<std::unique_ptr<keyspace>> create_keyspace(const lw_shared_ptr<keyspace_metadata>&, locator::effective_replication_map_factory& erm_factory, system_keyspace system);
void insert_keyspace(std::unique_ptr<keyspace> ks);
future<> remove(table&) noexcept;
void drop_keyspace(const sstring& name);
future<> update_keyspace(const keyspace_metadata& tmp_ksm);