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

Fix the log stream replica GC when the log stream is deleted

Browse Source
This commit is contained in:
WenJinyu
2023-07-28 08:12:23 +00:00
committed by ob-robot
parent 3401904226
commit 51f0a0a8ec
2 changed files with 12 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -331,6 +331,7 @@ int ObMigrationStatusHelper::check_transfer_dest_ls_status_for_ls_gc(
const ObLSID &transfer_ls_id,
const ObTabletID &tablet_id,
const bool not_in_member_list_scene,
const ObMigrationStatus &cur_migration_status,
bool &allow_gc)
{
int ret = OB_SUCCESS;
@ -338,7 +339,7 @@ int ObMigrationStatusHelper::check_transfer_dest_ls_status_for_ls_gc(
ObLS *dest_ls = nullptr;
ObLSHandle ls_handle;
allow_gc = false;
ObMigrationStatus migration_status = ObMigrationStatus::OB_MIGRATION_STATUS_MAX;
ObMigrationStatus dest_ls_status = ObMigrationStatus::OB_MIGRATION_STATUS_MAX;
if (!transfer_ls_id.is_valid()) {
ret = OB_INVALID_ARGUMENT;
LOG_WARN("ls id is invalid", K(ret), K(transfer_ls_id));
@ -356,15 +357,15 @@ int ObMigrationStatusHelper::check_transfer_dest_ls_status_for_ls_gc(
} else if (OB_ISNULL(dest_ls = ls_handle.get_ls())) {
ret = OB_ERR_UNEXPECTED;
LOG_WARN("ls should not be NULL", K(ret), KP(dest_ls), K(transfer_ls_id));
} else if (OB_FAIL(dest_ls->get_migration_status(migration_status))) {
} else if (OB_FAIL(dest_ls->get_migration_status(dest_ls_status))) {
LOG_WARN("failed to get migration status", K(ret), KPC(dest_ls));
} else if (ObMigrationStatus::OB_MIGRATION_STATUS_NONE != migration_status
&& ObMigrationStatus::OB_MIGRATION_STATUS_MIGRATE_WAIT != migration_status
&& ObMigrationStatus::OB_MIGRATION_STATUS_ADD_WAIT != migration_status
&& ObMigrationStatus::OB_MIGRATION_STATUS_REBUILD_WAIT != migration_status) {
} else if (ObMigrationStatus::OB_MIGRATION_STATUS_NONE != dest_ls_status
&& ObMigrationStatus::OB_MIGRATION_STATUS_MIGRATE_WAIT != dest_ls_status
&& ObMigrationStatus::OB_MIGRATION_STATUS_ADD_WAIT != dest_ls_status
&& ObMigrationStatus::OB_MIGRATION_STATUS_REBUILD_WAIT != dest_ls_status) {
allow_gc = true;
LOG_INFO("transfer dest ls check transfer status passed", K(ret), K(transfer_ls_id), K(migration_status));
} else if (not_in_member_list_scene) {
LOG_INFO("transfer dest ls check transfer status passed", K(ret), K(transfer_ls_id), K(dest_ls_status), K(cur_migration_status));
} else if (not_in_member_list_scene || ObMigrationStatus::OB_MIGRATION_STATUS_GC == cur_migration_status) {
if (OB_FAIL(check_transfer_dest_tablet_for_ls_gc(dest_ls, tablet_id, allow_gc))) {
LOG_WARN("failed to check transfer dest tablet", K(ret), KPC(dest_ls), K(tablet_id));
}
@ -459,11 +460,11 @@ int ObMigrationStatusHelper::check_ls_transfer_tablet_(
&& ObTabletStatus::TRANSFER_OUT_DELETED != user_data.tablet_status_) {
// do nothing
} else if (OB_FAIL(check_transfer_dest_ls_status_for_ls_gc(
user_data.transfer_ls_id_, tablet->get_tablet_meta().tablet_id_, not_in_member_list_scene, allow_gc))) {
user_data.transfer_ls_id_, tablet->get_tablet_meta().tablet_id_, not_in_member_list_scene, migration_status, allow_gc))) {
LOG_WARN("failed to check ls transfer tablet", K(ret), K(ls), K(user_data));
} else if (!allow_gc) {
LOG_INFO("The ls is not allowed to be GC because it is also dependent on other ls", K(user_data),
K(ls_id), "tablet_id", tablet->get_tablet_meta().tablet_id_);
K(ls_id), "tablet_id", tablet->get_tablet_meta().tablet_id_, K(migration_status), K(not_in_member_list_scene));
break;
}
}

1
src/storage/high_availability/ob_storage_ha_struct.h
View File

@ -108,6 +108,7 @@ private:
const share::ObLSID &transfer_ls_id,
const ObTabletID &tablet_id,
const bool not_in_member_list_scene,
const ObMigrationStatus &cur_status,
bool &allow_gc);
static int check_transfer_dest_tablet_for_ls_gc(ObLS *ls, const ObTabletID &tablet_id, bool &allow_gc);
static bool check_migration_status_is_fail_(const ObMigrationStatus &cur_status);