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

fix ret missed and overwrite

Browse Source
This commit is contained in:
obdev
2024-04-17 13:27:20 +00:00
committed by ob-robot
parent 854a7a24df
commit f143ab3f5e
18 changed files with 59 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/share/ob_table_access_helper.h
View File

@ -324,7 +324,8 @@ private:
#define PRINT_WRAPPER KR(ret), K(MTL_ID()), K(table), K(condition)
int ret = common::OB_SUCCESS;
if (OB_ISNULL(GCTX.sql_proxy_)) {
OB_LOG_(WARN, "GCTX.sql_proxy_ is null");
ret = OB_NULL_CHECK_ERROR;
OB_LOG_(WARN, "GCTX.sql_proxy_ is null", K(ret));
} else {
HEAP_VAR(ObMySQLProxy::MySQLResult, res) {
common::sqlclient::ObMySQLResult *result = nullptr;
@ -371,6 +372,7 @@ private:
#define PRINT_WRAPPER KR(ret), K(MTL_ID()), K(table), K(condition)
int ret = common::OB_SUCCESS;
if (OB_ISNULL(GCTX.sql_proxy_)) {
ret = OB_NULL_CHECK_ERROR;
OB_LOG_(WARN, "GCTX.sql_proxy_ is null");
} else {
HEAP_VAR(ObMySQLProxy::MySQLResult, res) {

3
src/share/ratelimit/ob_rl_mgr.cpp
View File

@ -559,7 +559,8 @@ void ObRatelimitMgr::calculate_s2r_max_bw(ObRegionBwStat *region_bw_stat)
if (IS_NOT_INIT) {
OB_LOG(ERROR, "ObRatelimitMgr not inited.");
} else if (OB_ISNULL(region_bw_stat)) {
OB_LOG(ERROR, "invalid argument", KP(region_bw_stat));
ret = OB_INVALID_ARGUMENT;
OB_LOG(ERROR, "invalid argument", KP(region_bw_stat), K(ret));
} else if (OB_FAIL(net_->get_easy_region_latest_bw(region_bw_stat->region_.ptr(),
&(region_bw_stat->local_server_cur_bw_),
&(region_bw_stat->local_server_max_bw_)))) {

1
src/share/resource_manager/ob_cgroup_ctrl.cpp
View File

@ -206,6 +206,7 @@ int ObCgroupCtrl::recursion_remove_group_(const char *curr_path)
}
}
if (OB_FAIL(remove_dir_(curr_path))) {
// ignore ret
LOG_WARN("remove sub group directory failed", K(ret), K(curr_path));
} else {
LOG_INFO("remove sub group directory success", K(curr_path));

6
src/share/rpc/ob_async_rpc_proxy.h
View File

@ -418,11 +418,13 @@ int ObAsyncRpcProxy<PC, RpcArg, RpcResult, Func, RpcProxy>::wait(
const int rc = cb->get_ret_code();
if (common::OB_SUCCESS != rc) {
if (index <= (args_.count() -1)) {
// ignore ret
RPC_LOG(WARN, "execute rpc failed", K(rc), "server", cb->get_dst(), "timeout", cb->get_timeout(),
"packet code", PC, "arg", args_.at(index));
"packet code", PC, "arg", args_.at(index), K(ret));
} else {
// ignore ret
RPC_LOG(WARN, "execute rpc failed and args_ count is not correct", K(rc), "server", cb->get_dst(), "timeout", cb->get_timeout(),
"packet code", PC, K(args_.count()), K(index));
"packet code", PC, K(args_.count()), K(index), K(ret));
}
}
if (NULL != return_code_array) {