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

fix unstable obtest for medium_with_migrate.test

Browse Source
This commit is contained in:
Tsunaou
2023-12-06 05:47:09 +00:00
committed by ob-robot
parent df25a7bc0f
commit 62e48e989d
2 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
deps/oblib/src/lib/utility/ob_tracepoint.h vendored
View File

@ -689,6 +689,7 @@ class EventTable
EN_COMPACTION_CO_MERGE_PARTITION_LONG_TIME = 734, EN_COMPACTION_CO_MERGE_PARTITION_LONG_TIME = 734,
EN_COMPACTION_SCHEDULE_META_MERGE = 735, EN_COMPACTION_SCHEDULE_META_MERGE = 735,
EN_COMPACTION_ESTIMATE_ROW_FAILED = 736, EN_COMPACTION_ESTIMATE_ROW_FAILED = 736,
EN_COMPACTION_UPDATE_REPORT_SCN = 737,
// please add new trace point after 750 // please add new trace point after 750
EN_SESSION_LEAK_COUNT_THRESHOLD = 751, EN_SESSION_LEAK_COUNT_THRESHOLD = 751,

8
src/share/ob_tablet_meta_table_compaction_operator.cpp
View File

@ -344,7 +344,13 @@ int ObTabletMetaTableCompactionOperator::inner_batch_update_unequal_report_scn_t
int64_t affected_rows = 0; int64_t affected_rows = 0;
const uint64_t meta_tenant_id = gen_meta_tenant_id(tenant_id); const uint64_t meta_tenant_id = gen_meta_tenant_id(tenant_id);
ObSqlString sql; ObSqlString sql;
if (OB_FAIL(sql.append_fmt( #ifdef ERRSIM
ret = OB_E(EventTable::EN_COMPACTION_UPDATE_REPORT_SCN) ret;
if (OB_FAIL(ret)) {
LOG_INFO("ERRSIM EN_COMPACTION_UPDATE_REPORT_SCN", K(ret));
}
#endif
if (FAILEDx(sql.append_fmt(
"UPDATE %s t1 SET report_scn=if(compaction_scn>'%lu' ,'%lu', compaction_scn) WHERE " "UPDATE %s t1 SET report_scn=if(compaction_scn>'%lu' ,'%lu', compaction_scn) WHERE "
"tenant_id='%lu' AND ls_id='%ld' AND tablet_id IN (", "tenant_id='%lu' AND ls_id='%ld' AND tablet_id IN (",
OB_ALL_TABLET_META_TABLE_TNAME, major_frozen_scn, major_frozen_scn, OB_ALL_TABLET_META_TABLE_TNAME, major_frozen_scn, major_frozen_scn,