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

service: migration_manager: corutinize merge_schema_from

Browse Source 
It's needed to easily keep-alive pluggable storage_service
permit in a following commit.
This commit is contained in:
Marcin Maliszkiewicz
2025-11-13 10:49:30 +01:00
parent 5241e9476f
commit cf9b2de18b
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
service/migration_manager.cc
View File

@@ -394,7 +394,7 @@ future<> migration_manager::merge_schema_from(locator::host_id src, const utils:
const auto& db = proxy.get_db().local();
if (_as.abort_requested()) {
return make_exception_future<>(abort_requested_exception());
throw abort_requested_exception{};
}
utils::chunked_vector<mutation> mutations;
@@ -407,10 +407,9 @@ future<> migration_manager::merge_schema_from(locator::host_id src, const utils:
}
} catch (replica::no_such_column_family& e) {
mlogger.error("Error while applying schema mutations from {}: {}", src, e);
return make_exception_future<>(std::make_exception_ptr<std::runtime_error>(
std::runtime_error(fmt::format("Error while applying schema mutations: {}", e))));
throw std::runtime_error(fmt::format("Error while applying schema mutations: {}", e));
}
return db::schema_tables::merge_schema(_sys_ks, proxy.container(), _ss, _feat, std::move(mutations));
co_await db::schema_tables::merge_schema(_sys_ks, proxy.container(), _ss, _feat, std::move(mutations));
}
future<> migration_manager::reload_schema() {