[UPGRADE] Make sure data_version persisted before create unit

This commit is contained in:
tino247
2024-01-05 06:12:44 +00:00
committed by ob-robot
parent 734048f5a2
commit eb103e94b0
7 changed files with 165 additions and 37 deletions

View File

@ -24430,7 +24430,8 @@ int ObDDLService::create_tenant_schema(
compat_mode,
pools, user_tenant_id,
false/*is_bootstrap*/,
arg.source_tenant_id_))) {
arg.source_tenant_id_,
false/*check_data_version*/))) {
LOG_WARN("grant_pools_to_tenant failed", KR(ret), K(arg), K(pools), K(user_tenant_id));
}
LOG_INFO("[CREATE_TENANT] STEP 1.2. finish grant pools", KR(ret), K(user_tenant_id),
@ -26423,7 +26424,8 @@ int ObDDLService::modify_and_cal_resource_pool_diff(
LOG_WARN("fail to grant pool", K(ret), K(diff_pools));
} else if (OB_FAIL(unit_mgr_->grant_pools(
trans, new_ug_id_array, compat_mode, diff_pools, tenant_id,
false/*is_bootstrap*/, OB_INVALID_TENANT_ID/*source_tenant_id*/))) {
false/*is_bootstrap*/, OB_INVALID_TENANT_ID/*source_tenant_id*/,
true/*check_data_version*/))) {
LOG_WARN("fail to grant pools", K(ret));
}
} else if (new_pool_name_list.count() + 1 == old_pool_name_list.count()) {