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

Fix ls rebuild check tenant gc condition bug

Browse Source
This commit is contained in:
godyangfight
2024-01-23 15:12:48 +00:00
committed by ob-robot
parent a0c157ebd7
commit cdb676058d
4 changed files with 16 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/storage/high_availability/ob_ls_complete_migration.cpp
View File

@ -329,7 +329,7 @@ int ObLSCompleteMigrationDagNet::trans_rebuild_fail_status_(
bool is_valid_member = true; bool is_valid_member = true;
bool is_ls_deleted = false; bool is_ls_deleted = false;
new_migration_status = ObMigrationStatus::OB_MIGRATION_STATUS_MAX; new_migration_status = ObMigrationStatus::OB_MIGRATION_STATUS_MAX;
bool is_tenant_dropping_or_dropped = false; bool is_tenant_dropped = false;
if (!ObMigrationStatusHelper::is_valid(current_migration_status)) { if (!ObMigrationStatusHelper::is_valid(current_migration_status)) {
ret = OB_INVALID_ARGUMENT; ret = OB_INVALID_ARGUMENT;
LOG_WARN("current migration status is invalid", K(ret), K(current_migration_status)); LOG_WARN("current migration status is invalid", K(ret), K(current_migration_status));
@ -348,12 +348,12 @@ int ObLSCompleteMigrationDagNet::trans_rebuild_fail_status_(
is_ls_deleted = false; // reset value if fail is_ls_deleted = false; // reset value if fail
LOG_WARN("failed to get ls status from inner table", K(ret), K(tmp_ret), K(ls)); LOG_WARN("failed to get ls status from inner table", K(ret), K(tmp_ret), K(ls));
} }
if (OB_TMP_FAIL(check_tenant_is_dropping_or_dropped_(is_tenant_dropping_or_dropped))) { if (OB_TMP_FAIL(check_tenant_is_dropped_(is_tenant_dropped))) {
is_tenant_dropping_or_dropped = false; is_tenant_dropped = false;
LOG_WARN("failed to check tenant is droppping or dropped", K(ret), K(tmp_ret), K(ctx_)); LOG_WARN("failed to check tenant is droppping or dropped", K(ret), K(tmp_ret), K(ctx_));
} }
if (FAILEDx(ObMigrationStatusHelper::trans_rebuild_fail_status( if (FAILEDx(ObMigrationStatusHelper::trans_rebuild_fail_status(
current_migration_status, is_valid_member, is_ls_deleted, is_tenant_dropping_or_dropped, new_migration_status))) { current_migration_status, is_valid_member, is_ls_deleted, is_tenant_dropped, new_migration_status))) {
LOG_WARN("failed to trans rebuild fail status", K(ret), K(ctx_)); LOG_WARN("failed to trans rebuild fail status", K(ret), K(ctx_));
} }
} }
@ -522,13 +522,13 @@ int ObLSCompleteMigrationDagNet::report_ls_meta_table_(ObLS *ls)
return ret; return ret;
} }
int ObLSCompleteMigrationDagNet::check_tenant_is_dropping_or_dropped_( int ObLSCompleteMigrationDagNet::check_tenant_is_dropped_(
bool &is_tenant_dropping_or_dropped) bool &is_tenant_dropped)
{ {
int ret = OB_SUCCESS; int ret = OB_SUCCESS;
schema::ObMultiVersionSchemaService *schema_service = GCTX.schema_service_; schema::ObMultiVersionSchemaService *schema_service = GCTX.schema_service_;
schema::ObSchemaGetterGuard guard; schema::ObSchemaGetterGuard guard;
is_tenant_dropping_or_dropped = false; is_tenant_dropped = false;
const ObTenantSchema *tenant_schema = nullptr; const ObTenantSchema *tenant_schema = nullptr;
if (OB_ISNULL(schema_service)) { if (OB_ISNULL(schema_service)) {
@ -536,18 +536,10 @@ int ObLSCompleteMigrationDagNet::check_tenant_is_dropping_or_dropped_(
CLOG_LOG(WARN, "schema_service is nullptr", KR(ret)); CLOG_LOG(WARN, "schema_service is nullptr", KR(ret));
} else if (OB_FAIL(schema_service->get_tenant_schema_guard(OB_SYS_TENANT_ID, guard))) { } else if (OB_FAIL(schema_service->get_tenant_schema_guard(OB_SYS_TENANT_ID, guard))) {
LOG_WARN("fail to get schema guard", KR(ret), K(ctx_)); LOG_WARN("fail to get schema guard", KR(ret), K(ctx_));
} else if (OB_FAIL(guard.get_tenant_info(ctx_.tenant_id_, tenant_schema))) { } else if (OB_FAIL(guard.check_if_tenant_has_been_dropped(ctx_.tenant_id_, is_tenant_dropped))) {
LOG_WARN("get tenant info failed", KR(ret), K(ctx_));
} else if (OB_ISNULL(tenant_schema)) {
// Double check the tenant status to avoid any potential problems in the schema module.
if (OB_FAIL(guard.check_if_tenant_has_been_dropped(ctx_.tenant_id_, is_tenant_dropping_or_dropped))) {
LOG_WARN("fail to check if tenant has been dropped", KR(ret), K(ctx_)); LOG_WARN("fail to check if tenant has been dropped", KR(ret), K(ctx_));
} else { } else if (is_tenant_dropped) {
LOG_INFO("tenant info is nullptr, check the tenant status", LOG_INFO("tenant is already dropped", K(ctx_), K(is_tenant_dropped));
K(ctx_), K(is_tenant_dropping_or_dropped));
}
} else {
is_tenant_dropping_or_dropped = tenant_schema->is_dropping();
} }
return ret; return ret;
} }

4
src/storage/high_availability/ob_ls_complete_migration.h
View File

@ -99,8 +99,8 @@ private:
ObLS &ls, ObLS &ls,
const ObMigrationStatus &current_migration_status, const ObMigrationStatus &current_migration_status,
ObMigrationStatus &new_migration_status); ObMigrationStatus &new_migration_status);
int check_tenant_is_dropping_or_dropped_( int check_tenant_is_dropped_(
bool &is_tenant_dropping_or_dropped); bool &is_tenan_dropped);
private: private:
bool is_inited_; bool is_inited_;

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

@ -786,7 +786,7 @@ int ObMigrationStatusHelper::trans_rebuild_fail_status(
const ObMigrationStatus &cur_status, const ObMigrationStatus &cur_status,
const bool is_in_member_list, const bool is_in_member_list,
const bool is_ls_deleted, const bool is_ls_deleted,
const bool is_tenant_dropping_or_dropped, const bool is_tenant_dropped,
ObMigrationStatus &fail_status) ObMigrationStatus &fail_status)
{ {
int ret = OB_SUCCESS; int ret = OB_SUCCESS;
@ -795,7 +795,7 @@ int ObMigrationStatusHelper::trans_rebuild_fail_status(
if (OB_MIGRATION_STATUS_REBUILD != cur_status && OB_MIGRATION_STATUS_REBUILD_WAIT != cur_status) { if (OB_MIGRATION_STATUS_REBUILD != cur_status && OB_MIGRATION_STATUS_REBUILD_WAIT != cur_status) {
ret = OB_INVALID_ARGUMENT; ret = OB_INVALID_ARGUMENT;
LOG_WARN("invalid args", K(ret), K(cur_status)); LOG_WARN("invalid args", K(ret), K(cur_status));
} else if (is_tenant_dropping_or_dropped || !is_in_member_list || is_ls_deleted) { } else if (is_tenant_dropped || !is_in_member_list || is_ls_deleted) {
fail_status = OB_MIGRATION_STATUS_REBUILD_FAIL; fail_status = OB_MIGRATION_STATUS_REBUILD_FAIL;
} else { } else {
fail_status = OB_MIGRATION_STATUS_REBUILD; fail_status = OB_MIGRATION_STATUS_REBUILD;

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

@ -93,7 +93,7 @@ public:
const ObMigrationStatus &cur_status, const ObMigrationStatus &cur_status,
const bool is_in_member_list, const bool is_in_member_list,
const bool is_ls_deleted, const bool is_ls_deleted,
const bool is_tenant_dropping_or_dropped, const bool is_tenant_dropped,
ObMigrationStatus &fail_status); ObMigrationStatus &fail_status);
static int check_migration_in_final_state( static int check_migration_in_final_state(
const ObMigrationStatus &status, const ObMigrationStatus &status,