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

view: differentiate identical error messages and change them to warnings

Browse Source 
Modified log message in view_builder::calculate_shard_build_step to make it distinct from the one in view_builder::execute, changed their logging level to warning, since we're continuing even if we handle an exception.

Fixes #4600
This commit is contained in:
Wojciech Mitros
2020-07-06 16:52:01 +02:00
committed by Nadav Har'El
parent 921dbd0978
commit 76038b8d8e
1 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
db/view/view.cc
View File

@@ -1441,7 +1441,7 @@ future<> view_builder::calculate_shard_build_step(
// restart a view build at some common token (reshard), and which token
// to restart at. So we need to wait until all shards have read the view
// build statuses before they can all proceed to make the (same) decision.
// If we don't synchronoize here, a fast shard may make a decision, start
// If we don't synchronize here, a fast shard may make a decision, start
// building and finish a build step - before the slowest shard even read
// the view build information.
container().invoke_on(0, [] (view_builder& builder) {
@@ -1484,8 +1484,7 @@ future<> view_builder::calculate_shard_build_step(
auto f = seastar::when_all_succeed(bookkeeping_ops->begin(), bookkeeping_ops->end());
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);
vlogger.warn("Failed to update materialized view bookkeeping while synchronizing view builds on all shards ({}), continuing anyway.", ep);
});
}
@@ -1820,8 +1819,7 @@ void view_builder::execute(build_step& step, exponential_backoff_retry r) {
}
}
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);
vlogger.warn("Failed to update materialized view bookkeeping ({}), continuing anyway.", ep);
}).get();
}