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

not return error code when schedule config update task failed

Browse Source
This commit is contained in:
obdev
2022-11-14 05:41:03 +00:00
committed by wangzelin.wzl
parent 75d329f747
commit afd6681d2b
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/observer/omt/ob_tenant_config.cpp
View File

@ -313,6 +313,7 @@ int ObTenantConfig::got_version(int64_t version, const bool remove_repeat)
if ((ATOMIC_FAA(&update_task_.running_task_count_, 1) < 2)) { if ((ATOMIC_FAA(&update_task_.running_task_count_, 1) < 2)) {
if (OB_FAIL(config_mgr_->schedule(update_task_, 0))) { if (OB_FAIL(config_mgr_->schedule(update_task_, 0))) {
LOG_WARN("schedule task failed", K_(tenant_id), K(ret)); LOG_WARN("schedule task failed", K_(tenant_id), K(ret));
ret = OB_SUCCESS; // if task reach 32 limit, it has chance to retry later
ATOMIC_DEC(&update_task_.running_task_count_); ATOMIC_DEC(&update_task_.running_task_count_);
} else { } else {
LOG_INFO("Schedule update tenant config task successfully!", K_(tenant_id)); LOG_INFO("Schedule update tenant config task successfully!", K_(tenant_id));

6
src/sql/engine/expr/ob_expr_to_outfile_row.cpp
View File

@ -190,9 +190,9 @@ int ObExprToOutfileRow::to_outfile_str(const ObExpr &expr, ObEvalCtx &ctx, ObDat
if (OB_SUCC(ret)) { if (OB_SUCC(ret)) {
char *res_buf = NULL; char *res_buf = NULL;
if (OB_ISNULL(res_buf = expr.get_str_res_mem(ctx, pos))) { if (OB_ISNULL(res_buf = expr.get_str_res_mem(ctx, pos))) {
ret = OB_ALLOCATE_MEMORY_FAILED; ret = OB_ALLOCATE_MEMORY_FAILED;
LOG_WARN("allocate memory failed", K(ret), K(pos)); LOG_WARN("allocate memory failed", K(ret), K(pos));
} else { } else {
MEMCPY(res_buf, buf, pos); MEMCPY(res_buf, buf, pos);
expr_datum.set_string(res_buf, pos); expr_datum.set_string(res_buf, pos);
} }