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

[CP] Fix ls rebuild failed and restart set ls migration status none bug

Browse Source
This commit is contained in:
godyangfight
2023-02-15 11:44:39 +00:00
committed by ob-robot
parent 719e871b92
commit 5bf5e1b1d4
3 changed files with 3 additions and 3 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

@ -148,7 +148,7 @@ int ObMigrationStatusHelper::trans_fail_status(const ObMigrationStatus &cur_stat
break;
}
case OB_MIGRATION_STATUS_REBUILD: {
fail_status = OB_MIGRATION_STATUS_NONE;
fail_status = OB_MIGRATION_STATUS_REBUILD;
break;
}
case OB_MIGRATION_STATUS_CHANGE: {

2
src/storage/ls/ob_ls.cpp
View File

@ -1217,7 +1217,7 @@ int ObLS::finish_slog_replay()
if (OB_FAIL(get_migration_status(current_migration_status))) {
LOG_WARN("failed to get migration status", K(ret), KPC(this));
} else if (OB_FAIL(ObMigrationStatusHelper::trans_fail_status(current_migration_status,
} else if (OB_FAIL(ObMigrationStatusHelper::trans_reboot_status(current_migration_status,
new_migration_status))) {
LOG_WARN("failed to trans fail status", K(ret), K(current_migration_status),
K(new_migration_status));

2
src/storage/ls/ob_ls_tablet_service.cpp
View File

@ -3127,7 +3127,7 @@ int ObLSTabletService::rebuild_create_tablet(
OB_FAIL(migrate_update_tablet(mig_tablet_param))) {
LOG_WARN("failed to rebuild create tablet", K(ret), K(tablet_id), K(mig_tablet_param));
} else if (b_exist && keep_old) {
if (OB_FAIL(check_and_get_tablet(tablet_id, old_tablet_handle))) {
if (OB_FAIL(check_and_get_tablet(tablet_id, old_tablet_handle, ObTabletCommon::NO_CHECK_GET_TABLET_TIMEOUT_US))) {
LOG_WARN("failed to check and get tablet", K(ret), K(tablet_id));
} else if (OB_UNLIKELY(old_tablet_handle.get_obj()->get_tablet_meta().has_next_tablet_)) {
ret = OB_ERR_UNEXPECTED;