Skip to content

Commit

Permalink
distributed_loader: Remove unused load-prio manipulations
Browse files Browse the repository at this point in the history
Mostly this was removed by 6dfeb10 (distributed_loader: remove unused
code).

Signed-off-by: Pavel Emelyanov <xemul@scylladb.com>
  • Loading branch information
xemul committed Jun 18, 2021
1 parent 055bc33 commit 7396de7
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 20 deletions.
11 changes: 0 additions & 11 deletions distributed_loader.cc
Original file line number Diff line number Diff line change
Expand Up @@ -46,15 +46,6 @@ static const std::unordered_set<std::string_view> system_keyspaces = {
db::system_keyspace::NAME, db::schema_tables::NAME
};

// Not super nice. Adding statefulness to the file.
static std::unordered_set<sstring> load_prio_keyspaces;
static bool population_started = false;

void distributed_loader::mark_keyspace_as_load_prio(const sstring& ks) {
assert(!population_started);
load_prio_keyspaces.insert(ks);
}

bool is_system_keyspace(std::string_view name) {
return system_keyspaces.contains(name);
}
Expand Down Expand Up @@ -633,8 +624,6 @@ future<> distributed_loader::populate_keyspace(distributed<database>& db, sstrin
}

future<> distributed_loader::init_system_keyspace(distributed<database>& db) {
population_started = true;

return seastar::async([&db] {
// We need to init commitlog on shard0 before it is inited on other shards
// because it obtains the list of pre-existing segments for replay, which must
Expand Down
9 changes: 0 additions & 9 deletions distributed_loader.hh
Original file line number Diff line number Diff line change
Expand Up @@ -83,15 +83,6 @@ public:
static future<> init_system_keyspace(distributed<database>& db);
static future<> ensure_system_table_directories(distributed<database>& db);
static future<> init_non_system_keyspaces(distributed<database>& db, distributed<service::storage_proxy>& proxy, distributed<service::migration_manager>& mm);
/**
* Marks a keyspace (by name) as "prioritized" on bootstrap.
* This will effectively let it bypass concurrency control.
* The only real use for this is to avoid certain chicken and
* egg issues.
*
* May only be called pre-bootstrap on main shard.
*/
static void mark_keyspace_as_load_prio(const sstring&);
private:
static future<> cleanup_column_family_temp_sst_dirs(sstring sstdir);
static future<> handle_sstables_pending_delete(sstring pending_deletes_dir);
Expand Down

0 comments on commit 7396de7

Please sign in to comment.