feat:update lastsave cmd

OpenAtomFoundation · Nov 26, 2023 · 0b2ffd0 · 0b2ffd0
1 parent 76b0fe5
commit 0b2ffd0
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 14 deletions.
diff --git a/include/pika_command.h b/include/pika_command.h
@@ -512,6 +512,16 @@ class Cmd : public std::enable_shared_from_this<Cmd> {
 
  virtual void DoBinlog(const std::shared_ptr<SyncMasterSlot>& slot);
 
+ // 获取最后一次成功保存到磁盘的时间戳
+ static __time_t GetLastSave() {
+ return lastsave_;
+ }
+
+ // 在 pika_slot.cc 中更新时间戳的值
+ static void UpdateLastSave() {
+ lastsave_ = time(nullptr);
+ }
+
  protected:
  // enable copy, used default copy
  // Cmd(const Cmd&);
@@ -537,12 +547,12 @@ class Cmd : public std::enable_shared_from_this<Cmd> {
  CmdStage stage_ = kNone;
  uint64_t do_duration_ = 0;
 
- struct timeval bgSaveTimeTv;
-
  private:
  virtual void DoInitial() = 0;
  virtual void Clear(){};
 
+ static __time_t lastsave_;
+
  Cmd& operator=(const Cmd&);
 };
 

diff --git a/src/pika_admin.cc b/src/pika_admin.cc
@@ -308,10 +308,6 @@ void BgsaveCmd::Do(std::shared_ptr<Slot> slot) {
  g_pika_server->DoSameThingSpecificDB(TaskType::kBgSave, bgsave_dbs_);
  LogCommand();
  res_.AppendContent("+Background saving started");
- memset(&bgSaveTimeTv,0,sizeof(struct timeval));
- if (gettimeofday(&bgSaveTimeTv, nullptr) != 0) {
- res_.SetRes(CmdRes::kErrOther, strerror(errno));
- }
 }
 
 void CompactCmd::DoInitial() {
@@ -2425,13 +2421,8 @@ void LastsaveCmd::DoInitial() {
 }
 
 void LastsaveCmd::Do(std::shared_ptr<Slot> slot) {
- struct timeval tv;
- if (gettimeofday(&tv, nullptr) == 0) {
- __time_t relativeTime = tv.tv_sec - bgSaveTimeTv.tv_sec;
- res_.AppendInteger(static_cast<int64_t>(relativeTime));
- } else {
- res_.SetRes(CmdRes::kErrOther, strerror(errno));
- }
+ __time_t lastsave_time = Cmd::GetLastSave();
+ res_.AppendInteger(static_cast<int64_t>(lastsave_time));
 }
 
 void DelbackupCmd::DoInitial() {

diff --git a/src/pika_command.cc b/src/pika_command.cc
@@ -30,6 +30,8 @@ extern PikaServer* g_pika_server;
 extern std::unique_ptr<PikaReplicaManager> g_pika_rm;
 extern std::unique_ptr<PikaCmdTableManager> g_pika_cmd_table_manager;
 
+__time_t Cmd::lastsave_ = 0;
+
 void InitCmdTable(CmdTable* cmd_table) {
  // Admin
  ////Slaveof

diff --git a/src/pika_slot.cc b/src/pika_slot.cc
@@ -10,6 +10,7 @@
 #include "include/pika_rm.h"
 #include "include/pika_server.h"
 #include "include/pika_slot.h"
+#include "include/pika_command.h"
 
 #include "pstd/include/mutex_impl.h"
 #include "pstd/include/pstd_hash.h"
@@ -378,7 +379,7 @@ bool Slot::RunBgsaveEngine() {
  return false;
  }
  LOG(INFO) << slot_name_ << " create new backup finished.";
-
+ Cmd::UpdateLastSave();
  return true;
 }