Skip to content
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

Add LASTSAVE command #1702

Merged
merged 9 commits into from
Aug 28, 2023
Merged

Add LASTSAVE command #1702

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
fc95d41
Add LASTSAVE command
Aug 25, 2023
801102c
Update src/server/server.h
xq2010 Aug 26, 2023
47dff62
Merge branch 'unstable' into feature/lastsave
xq2010 Aug 26, 2023
5604857
change int to std::int64_t
enjoy-binbin Aug 27, 2023
4cdb4e7
Merge branch 'unstable' into feature/lastsave
enjoy-binbin Aug 27, 2023
c609e56
Fix TestInfo error: remove the last_bgsave_time check because last_bg…
xq2010 Aug 28, 2023
5e5db9a
Merge branch 'unstable' into feature/lastsave
xq2010 Aug 28, 2023
62793ca
Merge branch 'unstable' into feature/lastsave
enjoy-binbin Aug 28, 2023
ad953ee
Remove the prefix 'std::' from int64_t
xq2010 Aug 28, 2023
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
14 changes: 14 additions & 0 deletions src/commands/cmd_server.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -980,6 +980,19 @@ static uint64_t GenerateConfigFlag(const std::vector<std::string> &args) {
return 0;
}

class CommandLastSave : public Commander {
public:
Status Execute(Server *svr, Connection *conn, std::string *output) override {
if (!conn->IsAdmin()) {
return {Status::RedisExecErr, errAdminPermissionRequired};
}

int64_t unix_sec = svr->GetLastBgsaveTime();
*output = redis::Integer(unix_sec);
return Status::OK();
}
};

class CommandRestore : public Commander {
public:
Status Parse(const std::vector<std::string> &args) override {
Expand Down Expand Up @@ -1080,6 +1093,7 @@ REDIS_REGISTER_COMMANDS(MakeCmdAttr<CommandAuth>("auth", 2, "read-only ok-loadin

MakeCmdAttr<CommandCompact>("compact", 1, "read-only no-script", 0, 0, 0),
MakeCmdAttr<CommandBGSave>("bgsave", 1, "read-only no-script", 0, 0, 0),
MakeCmdAttr<CommandLastSave>("lastsave", 1, "read-only no-script", 0, 0, 0),
MakeCmdAttr<CommandFlushBackup>("flushbackup", 1, "read-only no-script", 0, 0, 0),
MakeCmdAttr<CommandSlaveOf>("slaveof", 3, "read-only exclusive no-script", 0, 0, 0),
MakeCmdAttr<CommandStats>("stats", 1, "read-only", 0, 0, 0), )
Expand Down
7 changes: 6 additions & 1 deletion src/server/server.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -986,6 +986,11 @@ int64_t Server::GetCachedUnixTime() {
return unix_time.load();
}

int64_t Server::GetLastBgsaveTime() {
std::lock_guard<std::mutex> lg(db_job_mu_);
return last_bgsave_time_ == -1 ? start_time_ : last_bgsave_time_;
}

void Server::GetStatsInfo(std::string *info) {
std::ostringstream string_stream;
string_stream << "# Stats\r\n";
Expand Down Expand Up @@ -1074,7 +1079,7 @@ void Server::GetInfo(const std::string &ns, const std::string &section, std::str

std::lock_guard<std::mutex> lg(db_job_mu_);
string_stream << "bgsave_in_progress:" << (is_bgsave_in_progress_ ? 1 : 0) << "\r\n";
string_stream << "last_bgsave_time:" << last_bgsave_time_ << "\r\n";
string_stream << "last_bgsave_time:" << (last_bgsave_time_ == -1 ? start_time_ : last_bgsave_time_) << "\r\n";
string_stream << "last_bgsave_status:" << last_bgsave_status_ << "\r\n";
string_stream << "last_bgsave_time_sec:" << last_bgsave_time_sec_ << "\r\n";
}
Expand Down
1 change: 1 addition & 0 deletions src/server/server.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -211,6 +211,7 @@ class Server {
void SetLastRandomKeyCursor(const std::string &cursor);

static int64_t GetCachedUnixTime();
int64_t GetLastBgsaveTime();
void GetStatsInfo(std::string *info);
void GetServerInfo(std::string *info);
void GetMemoryInfo(std::string *info);
Expand Down
1 change: 0 additions & 1 deletion tests/gocase/unit/info/info_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,6 @@ func TestInfo(t *testing.T) {

t.Run("get bgsave information by INFO", func(t *testing.T) {
require.Equal(t, "0", util.FindInfoEntry(rdb, "bgsave_in_progress", "persistence"))
require.Equal(t, "-1", util.FindInfoEntry(rdb, "last_bgsave_time", "persistence"))
require.Equal(t, "ok", util.FindInfoEntry(rdb, "last_bgsave_status", "persistence"))
require.Equal(t, "-1", util.FindInfoEntry(rdb, "last_bgsave_time_sec", "persistence"))

Expand Down