From 9d8de06a5484f2d8be1a0d6bbd3acc616c5636d3 Mon Sep 17 00:00:00 2001 From: lylei Date: Tue, 11 Oct 2016 14:53:33 +0800 Subject: [PATCH] fix web-readonly --- src/flags.cc | 2 +- src/nameserver/nameserver_impl.cc | 21 ++++++++++++--------- 2 files changed, 13 insertions(+), 10 deletions(-) diff --git a/src/flags.cc b/src/flags.cc index 6f87831e..86f8cf98 100644 --- a/src/flags.cc +++ b/src/flags.cc @@ -23,7 +23,7 @@ DEFINE_int32(keepalive_timeout, 10, "Chunkserver keepalive timeout"); DEFINE_int32(default_replica_num, 3, "Default replica num of data block"); DEFINE_int32(nameserver_log_level, 4, "Nameserver log level"); DEFINE_string(nameserver_warninglog, "./wflog", "Warning log file"); -DEFINE_int32(nameserver_start_recover_timeout, 120, "Nameserver starts recover in second"); +DEFINE_int32(nameserver_start_recover_timeout, 3600, "Nameserver starts recover in second"); DEFINE_int32(recover_speed, 100, "Max num of block to recover for one chunkserver"); DEFINE_int32(recover_dest_limit, 5, "Number of recover dest"); DEFINE_int32(hi_recover_timeout, 180, "Recover timeout for high priority blocks"); diff --git a/src/nameserver/nameserver_impl.cc b/src/nameserver/nameserver_impl.cc index 8d5730fa..cf933c2b 100644 --- a/src/nameserver/nameserver_impl.cc +++ b/src/nameserver/nameserver_impl.cc @@ -110,7 +110,7 @@ void NameServerImpl::CheckRecoverMode() { work_thread_pool_->DelayTask(1000, boost::bind(&NameServerImpl::CheckRecoverMode, this)); } void NameServerImpl::LeaveReadOnly() { - LOG(INFO, "Nameserver leave safemode"); + LOG(INFO, "Nameserver leave read only"); if (readonly_) { readonly_ = false; } @@ -1022,27 +1022,30 @@ bool NameServerImpl::WebService(const sofa::pbrpc::HTTPRequest& request, ListRecover(&response); return true; } else if (path == "/dfs/hi_only") { + recover_timeout_ = 0; LOG(INFO, "ChangeRecoverMode hi_only"); recover_mode_ = kHiOnly; response.content->Append(""); return true; } else if (path == "/dfs/recover_all") { + recover_timeout_ = 0; LOG(INFO, "ChangeRecoverMode recover_all"); recover_mode_ = kRecoverAll; response.content->Append(""); return true; } else if (path == "/dfs/stop_recover") { + recover_timeout_ = 0; LOG(INFO, "ChangeRecoverMode stop_recover"); recover_mode_ = kStopRecover; response.content->Append(""); return true; - } else if (path == "/dfs/entry_read_only") { - LOG(INFO, "ChangeStatus entry_read_only"); + } else if (path == "/dfs/leave_read_only") { + LOG(INFO, "ChangeStatus leave_read_only"); LeaveReadOnly(); response.content->Append(""); return true; - } else if (path == "/dfs/leave_read_only") { - LOG(INFO, "ChangeStatus leave_read_only"); + } else if (path == "/dfs/entry_read_only") { + LOG(INFO, "ChangeStatus entry_read_only"); readonly_ = true; response.content->Append(""); return true; @@ -1236,7 +1239,7 @@ bool NameServerImpl::WebService(const sofa::pbrpc::HTTPRequest& request, str += "
"; str += "Total: " + common::HumanReadableString(total_quota) + "B
"; str += "Used: " + common::HumanReadableString(total_data) + "B
"; - str += "Pending tasks: " + str += "Pending: (r/w/rp/h)
" + common::NumToString(read_thread_pool_->PendingNum()) + " " + common::NumToString(work_thread_pool_->PendingNum()) + " " + common::NumToString(report_thread_pool_->PendingNum()) + " " @@ -1249,13 +1252,13 @@ bool NameServerImpl::WebService(const sofa::pbrpc::HTTPRequest& request, str += "
"; str += "Status: "; if (readonly_) { - str += "Read Only
LeaveSafeMode"; + str += "Read Only
LeaveReadOnly"; } else { - str += "Normal
EnterSafeMode"; + str += "Normal
EnterReadOnly"; } str += "
"; if (recover_timeout_ > 1) { - str += "RecoverCountdown: " + common::NumToString(recover_timeout_) + "
"; + str += "Recover: " + common::NumToString(recover_timeout_) + " Stop
"; } str += "RecoverMode: "; if (recover_mode_ == kRecoverAll) {