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

Fix restore sstable checksum bug.

Browse Source
This commit is contained in:
godyangfight
2024-02-08 01:11:27 +00:00
committed by ob-robot
parent e1764b71bb
commit b803b6efbf
3 changed files with 8 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/storage/high_availability/ob_physical_copy_task.cpp
View File

@ -1455,7 +1455,7 @@ int ObTabletCopyFinishTask::create_new_table_store_with_minor_()
ret = OB_NOT_INIT;
LOG_WARN("tablet copy finish task do not init", K(ret));
} else if (OB_FAIL(ObStorageHATabletBuilderUtil::build_table_with_minor_tables(ls_, tablet_id_,
src_tablet_meta_, minor_tables_handle_))) {
src_tablet_meta_, minor_tables_handle_, restore_action_))) {
LOG_WARN("failed to build table with ddl tables", K(ret));
}
return ret;

13
src/storage/high_availability/ob_storage_ha_tablet_builder.cpp
View File

@ -2397,21 +2397,18 @@ int ObStorageHATabletBuilderUtil::build_table_with_minor_tables(
ObLS *ls,
const common::ObTabletID &tablet_id,
const ObMigrationTabletParam *src_tablet_meta,
const ObTablesHandleArray &minor_tables)
const ObTablesHandleArray &minor_tables,
const ObTabletRestoreAction::ACTION &restore_action)
{
int ret = OB_SUCCESS;
ObTabletHandle tablet_handle;
ObTablet *tablet = nullptr;
//TODO(muwei.ym) check this logical when remove remote logical minor sstable in 4.2 RC3
//minor tables array is empty which means
//1.src do not has any minor but has major which contains dest minor sstable range
//2.src has minor sstables but dest has same minor sstable
const bool need_tablet_meta_merge = true;
const bool need_tablet_meta_merge = ObTabletRestoreAction::is_restore_major(restore_action) ? false : true;
const bool update_ddl_sstable = false;
if (OB_ISNULL(ls) || !tablet_id.is_valid() || OB_ISNULL(src_tablet_meta)) {
if (OB_ISNULL(ls) || !tablet_id.is_valid() || OB_ISNULL(src_tablet_meta) || !ObTabletRestoreAction::is_valid(restore_action)) {
ret = OB_INVALID_ARGUMENT;
LOG_WARN("build tablet with major tables get invalid argument", K(ret), KP(ls), K(tablet_id));
LOG_WARN("build tablet with major tables get invalid argument", K(ret), KP(ls), K(tablet_id), K(restore_action));
} else if (OB_FAIL(get_tablet_(tablet_id, ls, tablet_handle))) {
LOG_WARN("failed to get tablet", K(ret), K(tablet_id), KPC(ls));
} else if (FALSE_IT(tablet = tablet_handle.get_obj())) {

3
src/storage/high_availability/ob_storage_ha_tablet_builder.h
View File

@ -292,7 +292,8 @@ public:
ObLS *ls,
const common::ObTabletID &tablet_id,
const ObMigrationTabletParam *src_tablet_meta,
const ObTablesHandleArray &minor_tables);
const ObTablesHandleArray &minor_tables,
const ObTabletRestoreAction::ACTION &restore_action);
static int build_tablet_with_ddl_tables(
ObLS *ls,
const common::ObTabletID &tablet_id,