hcq/oceanbase
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

heartbeat service adds log and trace

Browse Source
This commit is contained in:
linqiucen
2023-06-29 06:18:26 +00:00
committed by ob-robot
parent e015d11370
commit 71ff41ef12
2 changed files with 14 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/rootserver/ob_heartbeat_service.cpp
View File

@ -29,6 +29,8 @@
#include "rootserver/ob_root_utils.h" // get_proposal_id_from_sys_ls #include "rootserver/ob_root_utils.h" // get_proposal_id_from_sys_ls
#include "rootserver/ob_rs_event_history_table_operator.h" // ROOTSERVICE_EVENT_ADD #include "rootserver/ob_rs_event_history_table_operator.h" // ROOTSERVICE_EVENT_ADD
#include "rootserver/ob_root_service.h" #include "rootserver/ob_root_service.h"
#include "lib/utility/utility.h"
namespace oceanbase namespace oceanbase
{ {
using namespace common; using namespace common;
@ -185,10 +187,12 @@ void ObHeartbeatService::do_work()
HBS_LOG_ERROR("unexpected thread_idx", KR(ret), K(thread_idx), K(thread_cnt)); HBS_LOG_ERROR("unexpected thread_idx", KR(ret), K(thread_idx), K(thread_cnt));
} else { } else {
if (0 == thread_idx) { if (0 == thread_idx) {
ObCurTraceId::init(GCONF.self_addr_);
if (OB_FAIL(send_heartbeat_())) { if (OB_FAIL(send_heartbeat_())) {
LOG_WARN("fail to send heartbeat", KR(ret)); LOG_WARN("fail to send heartbeat", KR(ret));
} }
} else { // 1 == thread_idx } else { // 1 == thread_idx
ObCurTraceId::init(GCONF.self_addr_);
if (OB_FAIL(manage_heartbeat_())) { if (OB_FAIL(manage_heartbeat_())) {
LOG_WARN("fail to manage heartbeat", KR(ret)); LOG_WARN("fail to manage heartbeat", KR(ret));
} }
@ -229,12 +233,14 @@ int ObHeartbeatService::send_heartbeat_()
ret = OB_ERR_UNEXPECTED; ret = OB_ERR_UNEXPECTED;
HBS_LOG_ERROR("srv_rpc_proxy_ is null", KR(ret), KP(srv_rpc_proxy_)); HBS_LOG_ERROR("srv_rpc_proxy_ is null", KR(ret), KP(srv_rpc_proxy_));
} else { } else {
ObTimeGuard time_guard("ObHeartbeatService::send_heartbeat_", 2 * 1000 * 1000);
// step 1: prepare hb_requests based on the whitelist // step 1: prepare hb_requests based on the whitelist
if (OB_FAIL(prepare_hb_requests_(hb_requests, tmp_whitelist_epoch_id))) { if (OB_FAIL(prepare_hb_requests_(hb_requests, tmp_whitelist_epoch_id))) {
LOG_WARN("fail to prepare heartbeat requests", KR(ret)); LOG_WARN("fail to prepare heartbeat requests", KR(ret));
} else if (hb_requests.count() <= 0) { } else if (hb_requests.count() <= 0) {
LOG_INFO("no heartbeat request needs to be sent"); LOG_INFO("no heartbeat request needs to be sent");
} else { } else {
time_guard.click("end prepare_hb_requests");
ObSendHeartbeatProxy proxy(*srv_rpc_proxy_, &obrpc::ObSrvRpcProxy::handle_heartbeat); ObSendHeartbeatProxy proxy(*srv_rpc_proxy_, &obrpc::ObSrvRpcProxy::handle_heartbeat);
int64_t timeout = GCONF.rpc_timeout; // default value is 2s int64_t timeout = GCONF.rpc_timeout; // default value is 2s
int tmp_ret = OB_SUCCESS; int tmp_ret = OB_SUCCESS;
@ -257,12 +263,15 @@ int ObHeartbeatService::send_heartbeat_()
LOG_WARN("fail to wait all batch result", KR(ret), KR(tmp_ret)); LOG_WARN("fail to wait all batch result", KR(ret), KR(tmp_ret));
ret = OB_SUCC(ret) ? tmp_ret : ret; ret = OB_SUCC(ret) ? tmp_ret : ret;
} }
time_guard.click("end wait_hb_responses");
// step 4: save hb_responses // step 4: save hb_responses
if (FAILEDx(set_hb_responses_(tmp_whitelist_epoch_id, &proxy))) { if (FAILEDx(set_hb_responses_(tmp_whitelist_epoch_id, &proxy))) {
LOG_WARN("fail to set hb_responses", KR(ret)); LOG_WARN("fail to set hb_responses", KR(ret));
} }
time_guard.click("end set_hb_responses");
} }
} }
FLOG_INFO("send_heartbeat_ has finished one round", KR(ret));
return ret; return ret;
} }
int ObHeartbeatService::set_hb_responses_(const int64_t whitelist_epoch_id, ObSendHeartbeatProxy *proxy) int ObHeartbeatService::set_hb_responses_(const int64_t whitelist_epoch_id, ObSendHeartbeatProxy *proxy)
@ -292,7 +301,7 @@ int ObHeartbeatService::set_hb_responses_(const int64_t whitelist_epoch_id, ObSe
} else if (OB_FAIL(hb_responses_.push_back(*hb_response))) { } else if (OB_FAIL(hb_responses_.push_back(*hb_response))) {
LOG_WARN("fail to push an element into hb_responses_", KR(ret), KPC(hb_response)); LOG_WARN("fail to push an element into hb_responses_", KR(ret), KPC(hb_response));
} else { } else {
LOG_DEBUG("receive a heartbeat response", KPC(hb_response)); LOG_TRACE("receive a heartbeat response", KPC(hb_response));
} }
} }
} }
@ -374,16 +383,20 @@ int ObHeartbeatService::manage_heartbeat_()
ret = OB_NOT_INIT; ret = OB_NOT_INIT;
LOG_WARN("not init", KR(ret), K(is_inited_)); LOG_WARN("not init", KR(ret), K(is_inited_));
} else { } else {
ObTimeGuard time_guard("ObHeartbeatService::manage_heartbeat_", 2 * 1000 * 1000);
int tmp_ret = OB_SUCCESS; int tmp_ret = OB_SUCCESS;
if (OB_TMP_FAIL(prepare_whitelist_())) { if (OB_TMP_FAIL(prepare_whitelist_())) {
ret = OB_SUCC(ret) ? tmp_ret : ret; ret = OB_SUCC(ret) ? tmp_ret : ret;
LOG_WARN("fail to prepare whitelist", KR(ret), KR(tmp_ret)); LOG_WARN("fail to prepare whitelist", KR(ret), KR(tmp_ret));
} }
time_guard.click("end prepare_whitelist");
if (OB_TMP_FAIL(process_hb_responses_())) { if (OB_TMP_FAIL(process_hb_responses_())) {
ret = OB_SUCC(ret) ? tmp_ret : ret; ret = OB_SUCC(ret) ? tmp_ret : ret;
LOG_WARN("fail to prepare heartbeat response", KR(ret), KR(tmp_ret)); LOG_WARN("fail to prepare heartbeat response", KR(ret), KR(tmp_ret));
} }
time_guard.click("end process_hb_responses");
} }
FLOG_INFO("manage_heartbeat_ has finished one round", KR(ret));
return ret; return ret;
} }
int ObHeartbeatService::prepare_whitelist_() int ObHeartbeatService::prepare_whitelist_()

1
src/share/ob_server_table_operator.cpp
View File

@ -539,7 +539,6 @@ int ObServerTableOperator::build_server_status(
ret = OB_INVALID_SERVER_STATUS; ret = OB_INVALID_SERVER_STATUS;
LOG_WARN("invalid display status", K(svr_status), K(ret)); LOG_WARN("invalid display status", K(svr_status), K(ret));
} else { } else {
LOG_INFO("svr_status", K(svr_status), K(display_status));
// set server heartbeat status // set server heartbeat status
if (ObServerStatus::OB_SERVER_ACTIVE == display_status) { if (ObServerStatus::OB_SERVER_ACTIVE == display_status) {
server_status.admin_status_ = ObServerStatus::OB_SERVER_ADMIN_NORMAL; server_status.admin_status_ = ObServerStatus::OB_SERVER_ADMIN_NORMAL;