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

[CP] [LOG] To merge the log4220 feature into the master branch.

Browse Source
This commit is contained in:
obdev
2024-03-26 13:15:25 +00:00
committed by ob-robot
parent 6ed441335b
commit 2f5b5ef256
131 changed files with 6192 additions and 1068 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
mittest/logservice/env/ob_simple_arb_server.cpp vendored
View File

@ -64,6 +64,7 @@ ObSimpleArbServer::~ObSimpleArbServer()
int ObSimpleArbServer::simple_init(const std::string &cluster_name,
const common::ObAddr &addr,
const int64_t node_id,
LogMemberRegionMap *region_map,
bool is_bootstrap)
{
const std::string logserver_dir = cluster_name + "/port_" + std::to_string(addr.get_port());
@ -191,7 +192,7 @@ int ObSimpleArbServer::simple_restart(const std::string &cluster_name,
srv_network_frame_.deliver_.stop();
palf_env_mgr_.destroy();
timer_.destroy();
if (OB_FAIL(simple_init(cluster_name, self_, node_idx, false))) {
if (OB_FAIL(simple_init(cluster_name, self_, node_idx, NULL, false))) {
CLOG_LOG(WARN, "simple_init failed", K(ret));
} else if (OB_FAIL(srv_network_frame_.deliver_.start(srv_network_frame_.normal_rpc_qhandler_,
srv_network_frame_.server_rpc_qhandler_))) {