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

feat: add diskrecovery command #1843

Merged
merged 3 commits into from
Aug 3, 2023
Merged

feat: add diskrecovery command #1843

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ac0e97a
Add diskrecovery command
Mixficsol Jul 30, 2023
8616c51
Add diskrecovery command
Mixficsol Jul 30, 2023
f6234b5
Merge branch 'unstable' into add_Disk_recovery_command
Mixficsol Aug 2, 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
5 changes: 4 additions & 1 deletion docs/ops/APIDifference.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,4 +122,7 @@ slaveof命令允许通过指定write2file(binlog)的文件名称及同步位置
* field_end：返回的结束Field, 空字符串表示 +inf(无限大)

### pkhrscanrange key field_start field_end [MATCH pattern] [LIMIT limit]
类似于pkhscanrange, 逆序
类似于pkhscanrange, 逆序

### diskrecovery
Mixficsol marked this conversation as resolved.
Show resolved Hide resolved
Mixficsol marked this conversation as resolved.
Show resolved Hide resolved
Mixficsol marked this conversation as resolved.
Show resolved Hide resolved
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Based on the provided code patch, here are some observations:

  1. There is no specific bug identified in the code patch.
  2. Improvement suggestion: Ensure consistent formatting and follow coding conventions like adding a newline at the end of each file.

However, it's important to note that the provided code patch is just a small excerpt, and without the full context and surrounding code, it's difficult to provide an extensive review. It is recommended to conduct a thorough review of the entire codebase to identify any potential issues or improvements.

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The code patch you provided appears to be a modification to a documentation file rather than actual code. Therefore, it is difficult to perform a comprehensive code review. However, based on the information provided, there are a few suggestions:

  1. Ensure consistent formatting: Maintain consistent line spacing and indentation throughout the file.
  2. Add a newline at the end of the file: It's recommended to have a newline character at the end of the file for better readability.
  3. Clarify usage instructions: Provide more detailed instructions on how to use the "diskrecovery" command, such as any required parameters or additional considerations.

Since this patch only contains changes to the documentation, it is unlikely to introduce bugs or risks in the code itself. Nonetheless, it's always important to ensure accuracy and clarity in the documentation to assist users in understanding and utilizing your code effectively.

Pika 原创命令，功能为当磁盘意外写满后，RocksDB 会进入写保护状态，当我们将空间调整为充足空间时，这个命令可以将 RocksDB 的写保护状态解除，变为可以继续写的状态, 避免了 Pika 因为磁盘写满后需要重启才能恢复写的情况，执行成功时返回 OK，如果当前磁盘空间依然不足，执行这个命令返回`"The available disk capacity is insufficient`，该命令执行时不需要额外参数，只需要执行 diskrecovery 即可。
13 changes: 13 additions & 0 deletions include/pika_admin.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -449,6 +449,19 @@ class HelloCmd : public Cmd {
void DoInitial() override;
};

class DiskRecoveryCmd : public Cmd {
public:
DiskRecoveryCmd(const std::string& name, int arity, uint16_t flag) : Cmd(name, arity, flag) {}
void Do(std::shared_ptr<Slot> slot = nullptr) override;
void Split(std::shared_ptr<Slot> slot, const HintKeys& hint_keys) override{};
void Merge() override{};
Cmd* Clone() override { return new DiskRecoveryCmd(*this); }

private:
void DoInitial() override;
std::map<std::string, uint64_t> background_errors_;
};

#ifdef WITH_COMMAND_DOCS
class CommandCmd : public Cmd {
public:
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Upon reviewing the provided code patch, a few observations and suggestions can be made:

  1. DiskRecoveryCmd Class:

    • The Split and Merge functions in the DiskRecoveryCmd class are empty. If they are intended to perform specific functionalities, you should implement them accordingly.
    • In the Clone function of DiskRecoveryCmd, it is recommended to use smart pointers (std::unique_ptr or std::shared_ptr) instead of raw pointers for better memory management.

  2. Code Formatting:

    • Ensure consistent indentation throughout the code to improve readability and maintainability.

  3. Error Handling:

    • It is important to handle any potential errors that may occur during execution. Make sure to include appropriate error handling mechanisms such as exception handling or error return codes.

  4. Documentation:

    • Consider adding comments or documentation to clarify the purpose and functionality of the classes and functions. This will help other developers understand and maintain the codebase.

Note: The provided code snippet is relatively small, making it difficult to identify any specific bugs or risks without a broader context of the codebase and its requirements. A comprehensive code review would typically involve examining the entire codebase and understanding its architecture and design choices.

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Overall, the code patch you provided looks fine. However, there are a few suggestions for improvement and potential bug risks:

  1. In the DiskRecoveryCmd class, the Split function is declared but does not have an implementation. Make sure to implement it according to your requirements. If it's not needed, consider removing the declaration.

  2. In the Merge function of the DiskRecoveryCmd class, there is an empty body. If the Merge function is intended to be empty, it would be clearer to indicate that by using the override keyword followed by a semicolon, like this: void Merge() override {};.

  3. In the CommandCmd class (not shown in the code patch), ensure that it has the necessary member functions implemented and properly defined. Verify that any overridden functions have the correct implementation according to their base class declarations.

  4. Consider using smart pointers (std::unique_ptr or std::shared_ptr) instead of raw pointers where appropriate. Smart pointers help manage memory automatically, reducing the likelihood of memory leaks and other related bugs.

  5. Refactor repetitive code, such as the DoInitial function, into a common base class if possible. This encourages code reuse and reduces duplication.

Remember to pay attention to the implementation details outside the code patch you provided to ensure the overall correctness and efficiency of your code.

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It's difficult to provide a comprehensive code review without seeing the entire codebase or having more context. However, based on the provided code patch:

  1. In DiskRecoveryCmd, the Split and Merge functions are empty. It's important to make sure these functions are properly implemented if they are expected to perform specific tasks. Otherwise, consider removing them if they are not needed.

  2. In the Clone function of DiskRecoveryCmd, you're returning a raw pointer to a dynamically allocated object. This can lead to memory leaks if not handled correctly. Consider using smart pointers like std::unique_ptr instead or ensuring proper memory management.

  3. It's unclear what DoInitial is meant to do in both HelloCmd and DiskRecoveryCmd. Make sure the implementation of this function aligns with its intended purpose.

  4. Without further information about the functionality and usage of the Cmd class, it's challenging to provide additional improvement suggestions or assess potential bug risks.

Consider providing more code context or specific areas of concern for a more detailed review.

Expand Down
1 change: 1 addition & 0 deletions include/pika_command.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@ const std::string kCmdDummy = "dummy";
const std::string kCmdNameQuit = "quit";
const std::string kCmdNameHello = "hello";
const std::string kCmdNameCommand = "command";
const std::string kCmdNameDiskRecovery = "diskrecovery";

// Migrate slot
const std::string kCmdNameSlotsMgrtSlot = "slotsmgrtslot";
Expand Down
5 changes: 4 additions & 1 deletion include/pika_db.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ class DB : public std::enable_shared_from_this<DB>, public pstd::noncopyable {
bool FlushSlotDB();
bool FlushSlotSubDB(const std::string& db_name);
void SetBinlogIoError();
void SetBinlogIoErrorrelieve();
bool IsBinlogIoError();
uint32_t SlotNum();
void GetAllSlots(std::set<uint32_t>& slot_ids);
Expand Down Expand Up @@ -56,7 +57,9 @@ class DB : public std::enable_shared_from_this<DB>, public pstd::noncopyable {
bool DBIsEmpty();
pstd::Status MovetoToTrash(const std::string& path);
pstd::Status Leave();

std::map<uint32_t, std::shared_ptr<Slot>> GetSlots() {
return slots_;
}
private:
std::string db_name_;
uint32_t slot_num_ = 0;
Expand Down
7 changes: 7 additions & 0 deletions include/pika_server.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -495,6 +495,13 @@ class PikaServer : public pstd::noncopyable {
*/
std::unique_ptr<Instant> instant_;

/*
* Diskrecovery used
*/
std::map<std::string, std::shared_ptr<DB>> GetDB() {
return dbs_;
}

friend class Cmd;
friend class InfoCmd;
friend class PikaReplClientConn;
Expand Down
53 changes: 53 additions & 0 deletions src/pika_admin.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@

#include <sys/time.h>
#include <sys/utsname.h>
#include <sys/statvfs.h>

#include <algorithm>
#include <unordered_map>
Expand Down Expand Up @@ -2546,6 +2547,58 @@ void HelloCmd::Do(std::shared_ptr<Slot> slot) {
res_.AppendStringRaw(raw);
}

void DiskRecoveryCmd::DoInitial() {
if (!CheckArg(argv_.size())) {
res_.SetRes(CmdRes::kWrongNum, kCmdNameDiskRecovery);
return;
}
}

void DiskRecoveryCmd::Do(std::shared_ptr<Slot> slot) {
struct statvfs disk_info;
int ret = statvfs(g_pika_conf->db_path().c_str(), &disk_info);
if (ret == -1) {
std::stringstream tmp_stream;
tmp_stream << "statvfs error:" << strerror(errno);
const std::string res = tmp_stream.str();
res_.SetRes(CmdRes::kErrOther, res);
return;
}
int64_t least_free_size = g_pika_conf->least_resume_free_disk_size();
uint64_t free_size = disk_info.f_bsize * disk_info.f_bfree;
if (free_size < least_free_size) {
res_.SetRes(CmdRes::kErrOther, "The available disk capacity is insufficient");
return;
}
std::shared_mutex slots_rw;
std::shared_mutex dbs_rw;
std::shared_lock db_rwl(dbs_rw);
Mixficsol marked this conversation as resolved.
Show resolved Hide resolved
// loop every db
for (const auto& db_item : g_pika_server->GetDB()) {
if (!db_item.second) {
continue;
}
db_item.second->SetBinlogIoErrorrelieve();
std::shared_lock slot_rwl(slots_rw);
// loop every slot
for (const auto &slot_item: db_item.second->GetSlots()) {
background_errors_.clear();
slot_item.second->DbRWLockReader();
slot_item.second->db()->GetUsage(storage::PROPERTY_TYPE_ROCKSDB_BACKGROUND_ERRORS, &background_errors_);
slot_item.second->DbRWUnLock();
for (const auto &item: background_errors_) {
if (item.second != 0) {
rocksdb::Status s = slot_item.second->db()->GetDBByType(item.first)->Resume();
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

这里是不是没有处理当resume失败时，设置对应返回值

if (!s.ok()) {
res_.SetRes(CmdRes::kErrOther, "The restore operation failed.");
}
}
}
}
}
res_.SetRes(CmdRes::kOk, "The disk error has been recovered");
}

#ifdef WITH_COMMAND_DOCS

bool CommandCmd::CommandFieldCompare::operator()(const std::string& a, const std::string& b) const {
Expand Down
2 changes: 2 additions & 0 deletions src/pika_command.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,8 @@ void InitCmdTable(CmdTable* cmd_table) {
cmd_table->insert(std::pair<std::string, std::unique_ptr<Cmd>>(kCmdDummy, std::move(dummyptr)));
std::unique_ptr<Cmd> quitptr = std::make_unique<QuitCmd>(kCmdNameQuit, 1, kCmdFlagsRead);
cmd_table->insert(std::pair<std::string, std::unique_ptr<Cmd>>(kCmdNameQuit, std::move(quitptr)));
std::unique_ptr<Cmd> diskrecoveryptr = std::make_unique<DiskRecoveryCmd>(kCmdNameDiskRecovery, 1, kCmdFlagsRead | kCmdFlagsAdmin);
cmd_table->insert(std::pair<std::string, std::unique_ptr<Cmd>>(kCmdNameDiskRecovery, std::move(diskrecoveryptr)));

#ifdef WITH_COMMAND_DOCS
std::unique_ptr<Cmd> commandptr = std::make_unique<CommandCmd>(kCmdNameCommand, -1, kCmdFlagsRead | kCmdFlagsAdmin);
Expand Down
2 changes: 1 addition & 1 deletion src/pika_db.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ bool DB::FlushSlotSubDB(const std::string& db_name) {
}

void DB::SetBinlogIoError() { return binlog_io_error_.store(true); }

void DB::SetBinlogIoErrorrelieve() { return binlog_io_error_.store(false); }
bool DB::IsBinlogIoError() { return binlog_io_error_.load(); }

uint32_t DB::SlotNum() { return slot_num_; }
Expand Down
51 changes: 0 additions & 51 deletions src/pika_server.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1285,8 +1285,6 @@ void PikaServer::PubSubNumSub(const std::vector<std::string>& channels,
/******************************* PRIVATE *******************************/

void PikaServer::DoTimingTask() {
// Resume DB if satisfy the condition
AutoResumeDB();
// Maybe schedule compactrange
AutoCompactRange();
// Purge log
Expand Down Expand Up @@ -1480,55 +1478,6 @@ void PikaServer::AutoKeepAliveRSync() {
}
}

void PikaServer::AutoResumeDB() {
int64_t interval = g_pika_conf->resume_interval();
int64_t least_free_size = g_pika_conf->least_resume_free_disk_size();
struct timeval now;
gettimeofday(&now, nullptr);
// first check or time interval between now and last check is larger than variable "interval"
if (last_check_resume_time_.tv_sec == 0 || now.tv_sec - last_check_resume_time_.tv_sec >= interval) {
struct statvfs disk_info;
int ret = statvfs(g_pika_conf->db_path().c_str(), &disk_info);
if (ret == -1) {
LOG(WARNING) << "statvfs error: " << strerror(errno);
return;
}
double min_check_resume_ratio = g_pika_conf->min_check_resume_ratio();
uint64_t free_size = disk_info.f_bsize * disk_info.f_bfree;
uint64_t total_size = disk_info.f_bsize * disk_info.f_blocks;
double disk_use_ratio = 1.0 - static_cast<double>(free_size) / static_cast<double>(total_size);
if (disk_use_ratio > min_check_resume_ratio && free_size > least_free_size) {
gettimeofday(&last_check_resume_time_, nullptr);

std::map<std::string, uint64_t> background_errors;
std::shared_lock db_rwl(g_pika_server->dbs_rw_);
// loop every db
for (const auto &db_item: g_pika_server->dbs_) {
if (!db_item.second) {
continue;
}
std::shared_lock slot_rwl(db_item.second->slots_rw_);
// loop every slot
for (const auto &slot_item: db_item.second->slots_) {
background_errors.clear();
slot_item.second->DbRWLockReader();
slot_item.second->db()->GetUsage(storage::PROPERTY_TYPE_ROCKSDB_BACKGROUND_ERRORS,
&background_errors);
slot_item.second->DbRWUnLock();
for (const auto &item: background_errors) {
if (item.second != 0) {
rocksdb::Status s = slot_item.second->db()->GetDBByType(item.first)->Resume();
if (!s.ok()) {
LOG(WARNING) << s.ToString();
}
}
}
}
}
}
}
}

void PikaServer::AutoUpdateNetworkMetric() {
monotime current_time = getMonotonicUs();
Mixficsol marked this conversation as resolved.
Show resolved Hide resolved
size_t factor = 5e6; // us, 5s
Mixficsol marked this conversation as resolved.
Show resolved Hide resolved
Expand Down
Loading