mirrors/scylladb
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

view: degrade shutdown bookkeeping update failures log to warn

Browse Source 
Currently, if updating bookkeeping operations for view building fails,
we log the error message and continue. However, during shutdown,
some errors are more likely to happen due to existing issues
like #4384. To differentiate actual errors from semi-expected
errors during shutdown, the latter are now logged with a warning
level instead of error.

Fixes #4954
This commit is contained in:
Piotr Sarna
2019-09-12 13:05:33 +02:00
committed by Nadav Har'El
parent f912122072
commit feec3825aa
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
db/view/view.cc
View File

@@ -1405,8 +1405,9 @@ future<> view_builder::calculate_shard_build_step(
}
auto f = seastar::when_all_succeed(bookkeeping_ops->begin(), bookkeeping_ops->end());
return f.handle_exception([bookkeeping_ops = std::move(bookkeeping_ops)] (std::exception_ptr ep) {
vlogger.error("Failed to update materialized view bookkeeping ({}), continuing anyway.", ep);
return f.handle_exception([this, bookkeeping_ops = std::move(bookkeeping_ops)] (std::exception_ptr ep) {
log_level severity = _as.abort_requested() ? log_level::warn : log_level::error;
vlogger.log(severity, "Failed to update materialized view bookkeeping ({}), continuing anyway.", ep);
});
}
@@ -1724,8 +1725,9 @@ void view_builder::execute(build_step& step, exponential_backoff_retry r) {
system_keyspace::update_view_build_progress(view->ks_name(), view->cf_name(), *next_token));
}
}
seastar::when_all_succeed(bookkeeping_ops.begin(), bookkeeping_ops.end()).handle_exception([] (std::exception_ptr ep) {
vlogger.error("Failed to update materialized view bookkeeping ({}), continuing anyway.", ep);
seastar::when_all_succeed(bookkeeping_ops.begin(), bookkeeping_ops.end()).handle_exception([this] (std::exception_ptr ep) {
log_level severity = _as.abort_requested() ? log_level::warn : log_level::error;
vlogger.log(severity, "Failed to update materialized view bookkeeping ({}), continuing anyway.", ep);
}).get();
}