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

revise the error code loss

Browse Source
This commit is contained in:
SevenJ-swj
2023-07-27 04:54:04 +00:00
committed by ob-robot
parent e91a059c09
commit fbdc721784
14 changed files with 26 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/share/ob_upgrade_utils.cpp
View File

@ -164,8 +164,8 @@ int ObUpgradeUtils::check_rs_job_exist(ObRsJobType job_type, bool &exist)
} else if (OB_ISNULL(GCTX.sql_proxy_)) {
ret = OB_ERR_UNEXPECTED;
LOG_WARN("sql_proxy is null", K(ret));
} else if (sql.assign_fmt("SELECT floor(count(*)) as count FROM %s WHERE job_type = '%s'",
OB_ALL_ROOTSERVICE_JOB_TNAME, ObRsJobTableOperator::get_job_type_str(job_type))) {
} else if (OB_FAIL(sql.assign_fmt("SELECT floor(count(*)) as count FROM %s WHERE job_type = '%s'",
OB_ALL_ROOTSERVICE_JOB_TNAME, ObRsJobTableOperator::get_job_type_str(job_type)))) {
LOG_WARN("fail to assign sql", K(ret));
} else if (OB_FAIL(GCTX.sql_proxy_->read(res, sql.ptr()))) {
LOG_WARN("fail to execute sql", K(ret), K(sql));
@ -203,9 +203,9 @@ int ObUpgradeUtils::check_rs_job_success(ObRsJobType job_type, bool &success)
} else if (OB_ISNULL(GCTX.sql_proxy_)) {
ret = OB_ERR_UNEXPECTED;
LOG_WARN("sql_proxy is null", K(ret));
} else if (sql.assign_fmt("SELECT floor(count(*)) as count FROM %s "
} else if (OB_FAIL(sql.assign_fmt("SELECT floor(count(*)) as count FROM %s "
"WHERE job_type = '%s' and job_status = 'SUCCESS'",
OB_ALL_ROOTSERVICE_JOB_TNAME, ObRsJobTableOperator::get_job_type_str(job_type))) {
OB_ALL_ROOTSERVICE_JOB_TNAME, ObRsJobTableOperator::get_job_type_str(job_type)))) {
LOG_WARN("fail to assign sql", K(ret));
} else if (OB_FAIL(GCTX.sql_proxy_->read(res, sql.ptr()))) {
LOG_WARN("fail to execute sql", K(ret), K(sql));