提交 afd6681d 编写于 作者: O obdev 提交者: wangzelin.wzl

not return error code when schedule config update task failed

上级 75d329f7
......@@ -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 (OB_FAIL(config_mgr_->schedule(update_task_, 0))) {
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_);
} else {
LOG_INFO("Schedule update tenant config task successfully!", K_(tenant_id));
......
......@@ -190,9 +190,9 @@ int ObExprToOutfileRow::to_outfile_str(const ObExpr &expr, ObEvalCtx &ctx, ObDat
if (OB_SUCC(ret)) {
char *res_buf = NULL;
if (OB_ISNULL(res_buf = expr.get_str_res_mem(ctx, pos))) {
ret = OB_ALLOCATE_MEMORY_FAILED;
LOG_WARN("allocate memory failed", K(ret), K(pos));
} else {
ret = OB_ALLOCATE_MEMORY_FAILED;
LOG_WARN("allocate memory failed", K(ret), K(pos));
} else {
MEMCPY(res_buf, buf, pos);
expr_datum.set_string(res_buf, pos);
}
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册