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

[CP] fix __all_tenant_scheduler_job buffer table problem, and lock conflict problem when create_job

Browse Source
This commit is contained in:
obdev 2023-10-11 10:09:18 +00:00 committed by ob-robot
parent dac0a4a616
commit 2d338d0f35
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/observer/dbms_scheduler/ob_dbms_sched_table_operator.cpp
View File

@ -109,6 +109,8 @@ int ObDBMSSchedTableOperator::update_for_end(
int ret = OB_SUCCESS;
ObMySQLTransaction trans;
ObDMLSqlSplicer dml0;
ObSqlString sql0;
ObDMLSqlSplicer dml1;
ObSqlString sql1;
ObDMLSqlSplicer dml2;
@ -143,6 +145,12 @@ int ObDBMSSchedTableOperator::update_for_end(
OX (job_info.flag_ = job_info.failures_ > 15 ? (job_info.flag_ | 0x1) : (job_info.flag_ & 0xfffffffffffffffE));
if ((now >= job_info.end_date_ || job_info.get_interval_ts() == 0) && (true == job_info.auto_drop_)) {
// when end_date is reach or no interval set, and auto_drop is set true, drop job.
OZ (dml0.add_gmt_modified(now));
OZ (dml0.add_pk_column("tenant_id",
ObSchemaUtils::get_extract_tenant_id(tenant_id, tenant_id)));
OZ (dml0.add_pk_column("job_name", job_info.job_name_));
OZ (dml0.add_pk_column("job", 0));
OZ (dml0.splice_delete_sql(OB_ALL_TENANT_SCHEDULER_JOB_TNAME, sql0));
OZ (dml1.add_gmt_modified(now));
OZ (dml1.add_pk_column("tenant_id",
ObSchemaUtils::get_extract_tenant_id(tenant_id, tenant_id)));
@ -207,6 +215,7 @@ int ObDBMSSchedTableOperator::update_for_end(
OZ (trans.start(sql_proxy_, tenant_id, true));
OZ (trans.write(tenant_id, sql0.ptr(), affected_rows));
OZ (trans.write(tenant_id, sql1.ptr(), affected_rows));
if (need_write_job_run_detail) {
OZ (trans.write(tenant_id, sql2.ptr(), affected_rows));
@ -414,7 +423,7 @@ int ObDBMSSchedTableOperator::get_dbms_sched_job_infos_in_tenant(
CK (OB_NOT_NULL(sql_proxy_));
CK (OB_LIKELY(tenant_id != OB_INVALID_ID));
OZ (sql.append_fmt("select * from %s where job_name != \'%s\' and (state is NULL or state != \'%s\')",
OZ (sql.append_fmt("select * from %s where job > 0 and job_name != \'%s\' and (state is NULL or state != \'%s\')",
OB_ALL_TENANT_SCHEDULER_JOB_TNAME,
"__dummy_guard",
"COMPLETED"));