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

let get_local_addr_ipv4 return error code

Browse Source
This commit is contained in:
obdev
2023-11-28 07:46:59 +00:00
committed by ob-robot
parent fa81dbabe1
commit 89fe95433a
6 changed files with 43 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
tools/ob_admin/ob_admin_executor.cpp
View File

@ -183,10 +183,16 @@ int ObAdminExecutor::load_config()
tmp_addr.set_ip_addr(ipv6, local_port);
GCTX.self_addr_seq_.set_addr(tmp_addr);
} else {
int32_t ipv4 = ntohl(obsys::ObNetUtil::get_local_addr_ipv4(config.devname));
ObAddr tmp_addr = GCTX.self_addr();
tmp_addr.set_ipv4_addr(ipv4, local_port);
GCTX.self_addr_seq_.set_addr(tmp_addr);
uint32_t ipv4_net = 0;
if (OB_FAIL(obsys::ObNetUtil::get_local_addr_ipv4(config.devname, ipv4_net))) {
LOG_ERROR("get ipv4 address by devname failed", "devname",
config.devname.get_value(), KR(ret));
} else {
int32_t ipv4 = ntohl(ipv4_net);
ObAddr tmp_addr = GCTX.self_addr();
tmp_addr.set_ipv4_addr(ipv4, local_port);
GCTX.self_addr_seq_.set_addr(tmp_addr);
}
}
}