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

fix some recover table bugs

Browse Source
This commit is contained in:
hamstersox
2023-09-15 11:10:24 +00:00
committed by ob-robot
parent 8f7ed1a53f
commit 47089d3931
11 changed files with 167 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
src/share/restore/ob_import_util.cpp
View File

@ -152,4 +152,53 @@ int ObImportTableUtil::get_tenant_name_case_mode(const uint64_t tenant_id, ObNam
LOG_WARN("faield to get tenant schema guard", K(ret), K(tenant_id));
}
return ret;
}
}
int ObImportTableUtil::check_is_recover_table_aux_tenant(
share::schema::ObMultiVersionSchemaService &schema_service,
const uint64_t tenant_id,
bool &is_recover_table_aux_tenant)
{
int ret = OB_SUCCESS;
schema::ObSchemaGetterGuard guard;
const schema::ObTenantSchema *tenant_schema = nullptr;
is_recover_table_aux_tenant = false;
if (!is_valid_tenant_id(tenant_id)) {
ret = OB_INVALID_ARGUMENT;
LOG_WARN("invalid tenant id", K(ret), K(tenant_id));
} else if (!is_user_tenant(tenant_id)) { // skip sys tenant and meta tenant
} else if (OB_FAIL(schema_service.get_tenant_schema_guard(OB_SYS_TENANT_ID, guard))) {
LOG_WARN("failed to get tenant schema guard", K(tenant_id), K(ret));
} else if (OB_FAIL(guard.get_tenant_info(tenant_id, tenant_schema))) {
LOG_WARN("failed to get tenant info", K(ret), K(tenant_id));
} else if (OB_ISNULL(tenant_schema)) {
ret = OB_ERR_UNEXPECTED;
LOG_WARN("tenant schema must not be nullptr", K(ret));
} else if (OB_FAIL(check_is_recover_table_aux_tenant_name(tenant_schema->get_tenant_name_str(),
is_recover_table_aux_tenant))) {
LOG_WARN("failed to check is recover table aux tenant name", K(ret));
}
return ret;
}
int ObImportTableUtil::check_is_recover_table_aux_tenant_name(
const ObString &tenant_name,
bool &is_recover_table_aux_tenant)
{
int ret = OB_SUCCESS;
int64_t timestamp = 0;
is_recover_table_aux_tenant = false;
char buf[OB_MAX_TENANT_NAME_LENGTH] = "";
const ObString AUX_TENANT_NAME_PREFIX("AUX_RECOVER$");
if (tenant_name.length() > OB_MAX_TENANT_NAME_LENGTH || tenant_name.empty()) {
ret = OB_INVALID_ARGUMENT;
LOG_WARN("invalid tenant name", K(ret), K(tenant_name));
} else if (!tenant_name.prefix_match(AUX_TENANT_NAME_PREFIX)) {
// not recover table aux tenant, skip
} else if (1 != sscanf(tenant_name.ptr(), "AUX_RECOVER$%ld%s", &timestamp, buf)) {
// not recover table aux tenant, skip
} else {
is_recover_table_aux_tenant = true;
}
return ret;
}

3
src/share/restore/ob_import_util.h
View File

@ -33,6 +33,9 @@ static int check_tablegroup_exist(share::schema::ObMultiVersionSchemaService &sc
static int check_tablespace_exist(share::schema::ObMultiVersionSchemaService &schema_service,
uint64_t tenant_id, const ObString &tablespace, bool &is_exist);
static int get_tenant_name_case_mode(const uint64_t tenant_id, ObNameCaseMode &name_case_mode);
static int check_is_recover_table_aux_tenant(
share::schema::ObMultiVersionSchemaService &schema_service, const uint64_t tenant_id, bool &is_recover_table_aux_tenant);
static int check_is_recover_table_aux_tenant_name(const ObString &tenant_name, bool &is_recover_table_aux_tenant);
};
}