diff --git a/db/view/view.cc b/db/view/view.cc index 127b241293..066f9691fb 100644 --- a/db/view/view.cc +++ b/db/view/view.cc @@ -1844,6 +1844,8 @@ future<> view_builder::do_build_step() { _current_step = _base_to_build_step.begin(); } } + }).handle_exception([] (std::exception_ptr ex) { + vlogger.warn("Unexcepted error executing build step: {}. Ignored.", std::current_exception()); }); } diff --git a/service/migration_manager.cc b/service/migration_manager.cc index 5df185b6d5..44b568477e 100644 --- a/service/migration_manager.cc +++ b/service/migration_manager.cc @@ -1137,8 +1137,10 @@ future migration_manager::start_group0_operation() { * @param version The schema version to announce */ void migration_manager::passive_announce(utils::UUID version) { - _schema_version_to_publish = std::move(version); - (void)_schema_push.trigger(); + _schema_version_to_publish = version; + (void)_schema_push.trigger().handle_exception([version = std::move(version)] (std::exception_ptr ex) { + mlogger.warn("Passive announcing of version {} failed: {}. Ignored.", version); + }); } future<> migration_manager::passive_announce() { diff --git a/service/storage_service.hh b/service/storage_service.hh index 7fed254fb8..9fa0e6c3d8 100644 --- a/service/storage_service.hh +++ b/service/storage_service.hh @@ -24,7 +24,6 @@ #include #include #include "utils/fb_utilities.hh" -#include "utils/serialized_action.hh" #include "replica/database_fwd.hh" #include "db/schema_features.hh" #include "streaming/stream_state.hh"