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

fix update_clog_checkpoint failed

Browse Source
This commit is contained in:
WenJinyu
2023-07-28 10:18:06 +00:00
committed by ob-robot
parent 45950b1651
commit 3b8083320d
3 changed files with 43 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -388,7 +388,7 @@ int ObMigrationStatusHelper::set_ls_migrate_gc_status_(
const ObMigrationStatus migrate_GC_status = ObMigrationStatus::OB_MIGRATION_STATUS_GC; const ObMigrationStatus migrate_GC_status = ObMigrationStatus::OB_MIGRATION_STATUS_GC;
if (!not_in_member_list_scene || ObMigrationStatus::OB_MIGRATION_STATUS_NONE != migration_status) { if (!not_in_member_list_scene || ObMigrationStatus::OB_MIGRATION_STATUS_NONE != migration_status) {
// do nothing // do nothing
} else if (OB_FAIL(ls.get_log_handler()->offline())) { } else if (OB_FAIL(ls.get_log_handler()->disable_sync())) {
LOG_WARN("failed to disable replay", K(ret)); LOG_WARN("failed to disable replay", K(ret));
} else if (OB_FAIL(ls.set_migration_status(migrate_GC_status, ls.get_ls_meta().get_rebuild_seq()))) { } else if (OB_FAIL(ls.set_migration_status(migrate_GC_status, ls.get_ls_meta().get_rebuild_seq()))) {
LOG_WARN("failed to set migration status", K(ret)); LOG_WARN("failed to set migration status", K(ret));

41
src/storage/tablet/ob_tablet_start_transfer_mds_helper.cpp
View File

@ -1240,6 +1240,45 @@ int ObTabletStartTransferInHelper::on_replay(
return ret; return ret;
} }
int ObTabletStartTransferInHelper::check_transfer_ls_migration_status_(const ObTXStartTransferInInfo &tx_start_transfer_in_info)
{
int ret = OB_SUCCESS;
ObLSHandle dest_ls_handle;
ObLSHandle src_ls_handle;
ObLS *dest_ls = NULL;
ObLS *src_ls = NULL;
ObLSService* ls_srv = nullptr;
ObMigrationStatus migrate_status;
if (!tx_start_transfer_in_info.is_valid()) {
ret = OB_INVALID_ARGUMENT;
LOG_WARN("create transfer in tablet get invalid argument", K(ret), K(tx_start_transfer_in_info));
} else if (OB_ISNULL(ls_srv = MTL(ObLSService*))) {
ret = OB_ERR_UNEXPECTED;
LOG_ERROR("ls srv should not be NULL", K(ret), KP(ls_srv));
} else if (OB_FAIL(ls_srv->get_ls(tx_start_transfer_in_info.src_ls_id_, src_ls_handle, ObLSGetMod::STORAGE_MOD))) {
LOG_WARN("failed to get ls", KR(ret), "src_ls_id", tx_start_transfer_in_info.src_ls_id_);
} else if (OB_ISNULL(src_ls = src_ls_handle.get_ls())) {
ret = OB_ERR_UNEXPECTED;
LOG_WARN("ls is NULL", KR(ret), KP(src_ls));
} else if (OB_FAIL(src_ls->get_migration_status(migrate_status))) {
LOG_WARN("failed to get migration status", KR(ret), "src_ls_id", src_ls->get_ls_id());
} else if (ObMigrationStatus::OB_MIGRATION_STATUS_GC == migrate_status) {
ret = OB_LS_WAITING_SAFE_DESTROY;
LOG_WARN("the migration status of transfer src_ls is OB_MIGRATION_STATUS_GC", KR(ret), "src_ls_id", src_ls->get_ls_id());
} else if (OB_FAIL(ls_srv->get_ls(tx_start_transfer_in_info.dest_ls_id_, dest_ls_handle, ObLSGetMod::STORAGE_MOD))) {
LOG_WARN("failed to get ls", KR(ret), "dest_ls_id", tx_start_transfer_in_info.dest_ls_id_);
} else if (OB_ISNULL(dest_ls = dest_ls_handle.get_ls())) {
ret = OB_ERR_UNEXPECTED;
LOG_WARN("ls is NULL", KR(ret), KP(dest_ls));
} else if (OB_FAIL(dest_ls->get_migration_status(migrate_status))) {
LOG_WARN("failed to get migration status", KR(ret), KP(dest_ls), "dest_ls_id", dest_ls->get_ls_id());
} else if (ObMigrationStatus::OB_MIGRATION_STATUS_GC == migrate_status) {
ret = OB_LS_WAITING_SAFE_DESTROY;
LOG_WARN("the migration status of transfer dest_ls is OB_MIGRATION_STATUS_GC", KR(ret), "dest_ls_id", dest_ls->get_ls_id());
}
return ret;
}
int ObTabletStartTransferInHelper::on_replay_success_( int ObTabletStartTransferInHelper::on_replay_success_(
const share::SCN &scn, const share::SCN &scn,
const ObTXStartTransferInInfo &tx_start_transfer_in_info, const ObTXStartTransferInInfo &tx_start_transfer_in_info,
@ -1270,6 +1309,8 @@ int ObTabletStartTransferInHelper::on_replay_success_(
LOG_WARN("on replay success get invalid argument", K(ret), K(scn), K(tx_start_transfer_in_info)); LOG_WARN("on replay success get invalid argument", K(ret), K(scn), K(tx_start_transfer_in_info));
} else if (CLICK_FAIL(check_transfer_dest_tablets_(tx_start_transfer_in_info, for_replay))) { } else if (CLICK_FAIL(check_transfer_dest_tablets_(tx_start_transfer_in_info, for_replay))) {
LOG_WARN("failed to check transfer dest tablets", K(ret), K(tx_start_transfer_in_info)); LOG_WARN("failed to check transfer dest tablets", K(ret), K(tx_start_transfer_in_info));
} else if (CLICK_FAIL(check_transfer_ls_migration_status_(tx_start_transfer_in_info))) {
LOG_WARN("failed to check transfer ls migration status", K(ret), K(tx_start_transfer_in_info));
} else if (CLICK_FAIL(create_transfer_in_tablets_(scn, for_replay, tx_start_transfer_in_info, ctx))) { } else if (CLICK_FAIL(create_transfer_in_tablets_(scn, for_replay, tx_start_transfer_in_info, ctx))) {
LOG_WARN("failed to create transfer in tablets", K(ret), K(tx_start_transfer_in_info)); LOG_WARN("failed to create transfer in tablets", K(ret), K(tx_start_transfer_in_info));
} }

1
src/storage/tablet/ob_tablet_start_transfer_mds_helper.h
View File

@ -192,6 +192,7 @@ private:
bool &can_skip); bool &can_skip);
static int set_dest_ls_rebuild_( static int set_dest_ls_rebuild_(
const share::ObLSID &dest_ls_id); const share::ObLSID &dest_ls_id);
static int check_transfer_ls_migration_status_(const ObTXStartTransferInInfo &tx_start_transfer_in_info);
private: private:
DISALLOW_COPY_AND_ASSIGN(ObTabletStartTransferInHelper); DISALLOW_COPY_AND_ASSIGN(ObTabletStartTransferInHelper);