提交 1e7414d5 编写于 作者: G godyangfight 提交者: ob-robot

Fix ls rebuild failed and restart set ls migration status none bug

上级 1e110aeb
......@@ -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: {
......
......@@ -1090,7 +1090,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));
......
......@@ -2830,7 +2830,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;
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册