From 7ff2a81aa3691acfb56fbe49ef368072b0582dac Mon Sep 17 00:00:00 2001
From: kostas <kostas@dragonflydb.io>
Date: Tue, 6 May 2025 13:11:18 +0300
Subject: [PATCH] comments

---
 src/server/server_family.cc | 20 ++++++++------------
 src/server/server_family.h  |  6 +++---
 2 files changed, 11 insertions(+), 15 deletions(-)

diff --git a/src/server/server_family.cc b/src/server/server_family.cc
index 0caf9436d..3f7181143 100644
--- a/src/server/server_family.cc
+++ b/src/server/server_family.cc
@@ -1740,14 +1740,12 @@ GenericError ServerFamily::DoSaveCheckAndStart(const SaveCmdOptions& save_cmd_op
       last_save_info_.SetLastSaveError(*res);
       save_controller_.reset();
       if (bg_save) {
-        last_bgsave_status_ = false;
+        last_save_info_.last_bgsave_status = false;
       }
       return res->error;
     }
 
-    if (bg_save) {
-      bgsave_in_progress_ = true;
-    }
+    last_save_info_.bgsave_in_progress = bg_save;
   }
   return {};
 }
@@ -1762,8 +1760,8 @@ GenericError ServerFamily::WaitUntilSaveFinished(Transaction* trans, bool ignore
     save_info = save_controller_->Finalize();
 
     if (save_controller_->IsBgSave()) {
-      bgsave_in_progress_ = false;
-      last_bgsave_status_ = save_info.error ? false : true;
+      last_save_info_.bgsave_in_progress = false;
+      last_save_info_.last_bgsave_status = !save_info.error;
     }
 
     if (save_info.error) {
@@ -2636,12 +2634,10 @@ string ServerFamily::FormatInfoMetrics(const Metrics& m, std::string_view sectio
     }
     append("rdb_changes_since_last_success_save", m.events.update);
 
-    {
-      util::fb2::LockGuard lk{save_mu_};
-      append("rdb_bgsave_in_progress", bgsave_in_progress_ == true ? 1 : 0);
-      std::string val = last_bgsave_status_ == true ? "ok" : "err";
-      append("rdb_last_bgsave_status", val);
-    }
+    auto save = GetLastSaveInfo();
+    append("rdb_bgsave_in_progress", static_cast<int>(save.bgsave_in_progress));
+    std::string val = save.last_bgsave_status ? "ok" : "err";
+    append("rdb_last_bgsave_status", val);
 
     // when last failed save
     append("last_failed_save", save_info.last_error_time);
diff --git a/src/server/server_family.h b/src/server/server_family.h
index 23cdc83e3..21f8601db 100644
--- a/src/server/server_family.h
+++ b/src/server/server_family.h
@@ -146,6 +146,9 @@ struct LastSaveInfo {
   GenericError last_error;
   time_t last_error_time = 0;      // epoch time in seconds.
   time_t failed_duration_sec = 0;  // epoch time in seconds.
+  // false if last attempt failed
+  bool last_bgsave_status = true;
+  bool bgsave_in_progress = false;
 };
 
 struct SnapshotSpec {
@@ -396,9 +399,6 @@ class ServerFamily {
 
   // protected by save_mu_
   util::fb2::Fiber bg_save_fb_;
-  // false if last attempt failed
-  bool last_bgsave_status_ = true;
-  bool bgsave_in_progress_ = false;
 
   mutable util::fb2::Mutex peak_stats_mu_;
   mutable PeakStats peak_stats_;