Skip to content

feat(server): Add shutdown watchdog #5915

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Oct 16, 2025
+41 −0
Merged

feat(server): Add shutdown watchdog #5915

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5106b6b
server: Add shutdown watchdog
abhijat Oct 15, 2025
6cc49e5
server: move swd to main service
abhijat Oct 16, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
41 changes: 41 additions & 0 deletions src/server/main_service.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,6 +147,42 @@ ABSL_FLAG(uint32_t, scheduler_background_warrant, 5,
ABSL_FLAG(uint32_t, squash_stats_latency_lower_limit, 0,
"If set, will not track latency stats below this threshold (usec). ");

namespace {

struct ShutdownWatchdog {
util::fb2::Fiber watchdog_fb;
util::fb2::Done watchdog_done;
util::ProactorPool& pool;

explicit ShutdownWatchdog(util::ProactorPool& pp);
void Disarm();
};

ShutdownWatchdog::ShutdownWatchdog(util::ProactorPool& pp) : pool{pp} {
watchdog_fb = pool.GetNextProactor()->LaunchFiber("shutdown_watchdog", [&] {
if (!watchdog_done.WaitFor(20s)) {
LOG(ERROR) << "Deadlock detected during shutdown";
absl::SetFlag(&FLAGS_alsologtostderr, true);
util::fb2::Mutex m;
pool.AwaitFiberOnAll([&m](unsigned index, auto*) {
util::ThisFiber::SetName(absl::StrFormat("print_stack_fib_%u", index));
std::unique_lock lk(m);
LOG(ERROR) << "Proactor " << index << ":\n";
util::fb2::detail::FiberInterface::PrintAllFiberStackTraces();
});
}
});
}

void ShutdownWatchdog::Disarm() {
watchdog_done.Notify();
watchdog_fb.JoinIfNeeded();
}

std::optional<ShutdownWatchdog> shutdown_watchdog = std::nullopt;

} // namespace

namespace dfly {

#if defined(__linux__)
Expand Down Expand Up @@ -1075,6 +1111,9 @@ void Service::Shutdown() {
cluster_family_.Shutdown();

server_family_.Shutdown();

shutdown_watchdog.emplace(pp_);

engine_varz.reset();

ChannelStore::Destroy();
Expand All @@ -1088,6 +1127,8 @@ void Service::Shutdown() {
// wait for all the pending callbacks to stop.
ThisFiber::SleepFor(10ms);
facade::Connection::Shutdown();

shutdown_watchdog->Disarm();
}

OpResult<KeyIndex> Service::FindKeys(const CommandId* cid, CmdArgList args) {
Expand Down
Loading