From 8fbcf1ab9f3ccce3f3cc0854249e368ae8fbcc8e Mon Sep 17 00:00:00 2001 From: Benny Halevy Date: Sun, 13 Aug 2023 08:25:37 +0300 Subject: [PATCH] view: start: ignore also abort_requested_exception We see the abort_requested_exception error from time to time, instead of sleep_aborted that was expected and quietly ignored (in debug log level). Treat abort_requested_exception the same way since the error is expected on shutdown and to reduce test flakiness, as seen for example, in https://jenkins.scylladb.com/job/scylla-master/job/scylla-ci/3033/artifact/logs-full.release.010/1691896356104_repair_additional_test.py%3A%3ATestRepairAdditional%3A%3Atest_repair_schema/node2.log ``` INFO 2023-08-13 03:12:29,151 [shard 0] compaction_manager - Asked to stop WARN 2023-08-13 03:12:29,152 [shard 0] gossip - failure_detector_loop: Got error in the loop, live_nodes={}: seastar::sleep_aborted (Sleep is aborted) INFO 2023-08-13 03:12:29,152 [shard 0] gossip - failure_detector_loop: Finished main loop WARN 2023-08-13 03:12:29,152 [shard 0] cdc - Aborted update CDC description table with generation (2023/08/13 03:12:17, d74aad4b-6d30-4f22-947b-282a6e7c9892) INFO 2023-08-13 03:12:29,152 [shard 1] compaction_manager - Asked to stop INFO 2023-08-13 03:12:29,152 [shard 1] compaction_manager - Stopped INFO 2023-08-13 03:12:29,153 [shard 0] init - Signal received; shutting down INFO 2023-08-13 03:12:29,153 [shard 0] init - Shutting down view builder ops INFO 2023-08-13 03:12:29,153 [shard 0] view - Draining view builder INFO 2023-08-13 03:12:29,153 [shard 1] view - Draining view builder INFO 2023-08-13 03:12:29,153 [shard 0] compaction_manager - Stopped ERROR 2023-08-13 03:12:29,153 [shard 0] view - start failed: seastar::abort_requested_exception (abort requested) ERROR 2023-08-13 03:12:29,153 [shard 1] view - start failed: seastar::abort_requested_exception (abort requested) ``` Signed-off-by: Benny Halevy Closes #15029 --- db/view/view.cc | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/db/view/view.cc b/db/view/view.cc index 8028ef05c1..ca900e6f74 100644 --- a/db/view/view.cc +++ b/db/view/view.cc @@ -1841,11 +1841,19 @@ future<> view_builder::start(service::migration_manager& mm) { (void)_build_step.trigger(); return make_ready_future<>(); }); - }).handle_exception_type([] (const seastar::sleep_aborted& e) { - vlogger.debug("start aborted: {}", e.what()); - }).handle_exception([] (std::exception_ptr eptr) { - vlogger.error("start failed: {}", eptr); - return make_ready_future<>(); + }).then_wrapped([] (future<> f) { + if (f.failed()) { + auto ex = f.get_exception(); + auto ll = log_level::error; + try { + std::rethrow_exception(ex); + } catch (const seastar::sleep_aborted& e) { + ll = log_level::debug; + } catch (const seastar::abort_requested_exception& e) { + ll = log_level::debug; + } + vlogger.log(ll, "start aborted: {}", ex); + } }); return make_ready_future<>(); }