server: move swd to main service

Signed-off-by: Abhijat Malviya <[email protected]>

Author: abhijat

src/server/main_service.cc

@@ -159,15 +159,13 @@ struct ShutdownWatchdog {
 };
 
 ShutdownWatchdog::ShutdownWatchdog(util::ProactorPool& pp) : pool{pp} {
-  watchdog_fb = pool.GetNextProactor()->LaunchFiber([&] {
-    util::ThisFiber::SetName("shutdown-watchdog");
-
+  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("shutdown-watchdog");
+        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();
@@ -181,7 +179,7 @@ void ShutdownWatchdog::Disarm() {
   watchdog_fb.JoinIfNeeded();
 }
 
-std::optional<ShutdownWatchdog> swd = std::nullopt;
+std::optional<ShutdownWatchdog> shutdown_watchdog = std::nullopt;
 
 }  // namespace
 
@@ -1113,6 +1111,9 @@ void Service::Shutdown() {
   cluster_family_.Shutdown();
 
   server_family_.Shutdown();
+
+  shutdown_watchdog.emplace(pp_);
+
   engine_varz.reset();
 
   ChannelStore::Destroy();
@@ -1127,7 +1128,7 @@ void Service::Shutdown() {
   ThisFiber::SleepFor(10ms);
   facade::Connection::Shutdown();
 
-  DisarmShutdownWatchdog();
+  shutdown_watchdog->Disarm();
 }
 
 OpResult<KeyIndex> Service::FindKeys(const CommandId* cid, CmdArgList args) {
@@ -3107,16 +3108,4 @@ const acl::AclFamily* Service::TestInit() {
   return &acl_family_;
 }
 
-void ArmShutdownWatchdog(ProactorPool& pp) {
-  if (!swd.has_value()) {
-    swd.emplace(pp);
-  }
-}
-
-void DisarmShutdownWatchdog() {
-  if (swd.has_value()) {
-    swd->Disarm();
-  }
-}
-
 }  // namespace dfly

src/server/main_service.h

@@ -203,8 +203,4 @@ class Service : public facade::ServiceInterface {
   uint32_t loading_state_counter_ ABSL_GUARDED_BY(mu_) = 0;
 };
 
-void ArmShutdownWatchdog(util::ProactorPool& pp);
-
-void DisarmShutdownWatchdog();
-
 }  // namespace dfly

src/server/server_family.cc

@@ -1220,8 +1220,6 @@ void ServerFamily::Shutdown() {
     });
   }
 
-  ArmShutdownWatchdog(service_.proactor_pool());
-
   client_pause_ec_.await([this] { return active_pauses_.load() == 0; });
 
   pb_task_->Await([this] {