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

[CP] Fix schema & upgrade related problems

Browse Source
This commit is contained in:
tino247
2022-12-13 13:07:55 +00:00
committed by ob-robot
parent 4c7cfd9120
commit e603b2fe6a
8 changed files with 30 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/share/schema/ob_multi_version_schema_service.cpp
View File

@ -2309,7 +2309,7 @@ int ObMultiVersionSchemaService::refresh_and_add_schema(const ObIArray<uint64_t>
// Ensure that the memory on the stack requested during the refresh schema process also uses the default 500 tenant
ObArenaAllocator allocator(ObModIds::OB_MODULE_PAGE_ALLOCATOR, OB_MALLOC_BIG_BLOCK_SIZE, OB_SERVER_TENANT_ID);
schema_stack_allocator() = &allocator;
ObSchemaStackAllocatorGuard guard(&allocator);
ObArray<uint64_t> all_tenant_ids;
if (OB_FAIL(ret)) {
@ -2358,7 +2358,6 @@ int ObMultiVersionSchemaService::refresh_and_add_schema(const ObIArray<uint64_t>
}
}
}
schema_stack_allocator() = nullptr;
};
CREATE_WITH_TEMP_ENTITY_P(!ObSchemaService::g_liboblog_mode_, RESOURCE_OWNER, common::OB_SERVER_TENANT_ID)
{
@ -2465,7 +2464,7 @@ int ObMultiVersionSchemaService::auto_switch_mode_and_refresh_schema(
auto func = [&]() {
// Ensure that the memory on the stack requested during the refresh schema process also uses the default 500 tenant
ObArenaAllocator allocator(ObModIds::OB_MODULE_PAGE_ALLOCATOR, OB_MALLOC_BIG_BLOCK_SIZE, OB_SERVER_TENANT_ID);
schema_stack_allocator() = &allocator;
ObSchemaStackAllocatorGuard guard(&allocator);
bool need_refresh_schema = true; // The schema needs to be refreshed by default
// If the user configures expected_schema_version, first obtain the latest schema version.
@ -2568,7 +2567,6 @@ int ObMultiVersionSchemaService::auto_switch_mode_and_refresh_schema(
}
}
}
schema_stack_allocator() = nullptr;
};
if (OB_SUCCESS == ret) {