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

Jump to bottom

Support executing INFO command during restoring database #375

Merged
merged 2 commits into from
Jan 7, 2022
Merged

Support executing INFO command during restoring database #375

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
715fc09
Support executing INFO command during restoring database
ShooterIT Oct 19, 2021
4714c63
Apply suggestions from code review
ShooterIT Oct 20, 2021
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
2 changes: 1 addition & 1 deletion src/redis_cmd.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4363,7 +4363,7 @@ CommandAttributes redisCommandTable[] = {
ADD_CMD("auth", 2, "read-only ok-loading", 0, 0, 0, CommandAuth),
ADD_CMD("ping", 1, "read-only", 0, 0, 0, CommandPing),
ADD_CMD("select", 2, "read-only", 0, 0, 0, CommandSelect),
ADD_CMD("info", -1, "read-only", 0, 0, 0, CommandInfo),
ADD_CMD("info", -1, "read-only ok-loading", 0, 0, 0, CommandInfo),
ADD_CMD("role", 1, "read-only", 0, 0, 0, CommandRole),
ADD_CMD("config", -2, "read-only", 0, 0, 0, CommandConfig),
ADD_CMD("namespace", -3, "read-only", 0, 0, 0, CommandNamespace),
Expand Down
17 changes: 14 additions & 3 deletions src/server.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -799,6 +799,11 @@ void Server::GetCommandsStatsInfo(std::string *info) {
*info = string_stream.str();
}

// WARNING: we must not access DB(i.e.RocksDB) when server is loading since
// DB is closed and the pointer is invalid. Server may crash if we access DB
// during loading.
// If you add new fields which access DB into INFO command output, make sure
// this section cant't be shown when loading(i.e. !is_loading_).
void Server::GetInfo(const std::string &ns, const std::string &section, std::string *info) {
info->clear();
std::ostringstream string_stream;
Expand Down Expand Up @@ -828,7 +833,9 @@ void Server::GetInfo(const std::string &ns, const std::string &section, std::str
GetStatsInfo(&stats_info);
string_stream << stats_info;
}
if (all || section == "replication") {

// In replication section, we access DB, so we can't do that when loading
if (!is_loading_ && (all || section == "replication")) {
std::string replication_info;
GetReplicationInfo(&replication_info);
string_stream << replication_info;
Expand All @@ -849,7 +856,9 @@ void Server::GetInfo(const std::string &ns, const std::string &section, std::str
GetCommandsStatsInfo(&commands_stats_info);
string_stream << commands_stats_info;
}
if (all || section == "keyspace") {

// In keyspace section, we access DB, so we can't do that when loading
if (!is_loading_ && (all || section == "keyspace")) {
KeyNumStats stats;
GetLastestKeyNumStats(ns, &stats);
time_t last_scan_time = GetLastScanTime(ns);
Expand All @@ -873,7 +882,9 @@ void Server::GetInfo(const std::string &ns, const std::string &section, std::str
string_stream << "used_disk_percent: " << used_disk_percent << "%\r\n";
}
}
if (all || section == "rocksdb") {

// In rocksdb section, we access DB, so we can't do that when loading
if (!is_loading_ && (all || section == "rocksdb")) {
std::string rocksdb_info;
GetRocksDBInfo(&rocksdb_info);
string_stream << rocksdb_info;
Expand Down