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

fix max_ls_id not fix during upgrade from 4.1 to 4.2

Browse Source
This commit is contained in:
maosy
2023-09-12 10:10:23 +00:00
committed by ob-robot
parent cb75499e77
commit 59f56db956
2 changed files with 20 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
src/share/ob_upgrade_utils.cpp
View File

@ -818,8 +818,6 @@ int ObUpgradeFor4100Processor::post_upgrade()
LOG_WARN("fail to check inner stat", KR(ret));
} else if (OB_FAIL(recompile_all_views_and_synonyms(tenant_id))) {
LOG_WARN("fail to init rewrite rule version", K(ret), K(tenant_id));
} else if (OB_FAIL(post_upgrade_for_max_ls_id_())) {//TODO for 4200 upgrade
LOG_WARN("failed to update max ls id", KR(ret));
}
return ret;
}
@ -973,7 +971,24 @@ int ObUpgradeFor4100Processor::recompile_all_views_and_synonyms(const uint64_t t
}
/* =========== 4100 upgrade processor end ============= */
int ObUpgradeFor4100Processor::post_upgrade_for_max_ls_id_()
int ObUpgradeFor4200Processor::post_upgrade()
{
int ret = OB_SUCCESS;
if (OB_FAIL(check_inner_stat())) {
LOG_WARN("fail to check inner stat", KR(ret));
} else if (OB_FAIL(post_upgrade_for_grant_create_database_link_priv())) {
LOG_WARN("grant create database link failed", K(ret));
} else if (OB_FAIL(post_upgrade_for_grant_drop_database_link_priv())) {
LOG_WARN("grant drop database link failed", K(ret));
} else if (OB_FAIL(post_upgrade_for_heartbeat_and_server_zone_op_service())) {
LOG_WARN("post upgrade for heartbeat and server zone op service failed", KR(ret));
} else if (OB_FAIL(post_upgrade_for_max_ls_id_())) {
LOG_WARN("failed to update max ls id", KR(ret));
}
return ret;
}
int ObUpgradeFor4200Processor::post_upgrade_for_max_ls_id_()
{
int ret = OB_SUCCESS;
if (OB_ISNULL(sql_proxy_) || !is_valid_tenant_id(tenant_id_)) {
@ -1005,21 +1020,6 @@ int ObUpgradeFor4100Processor::post_upgrade_for_max_ls_id_()
return ret;
}
int ObUpgradeFor4200Processor::post_upgrade()
{
int ret = OB_SUCCESS;
if (OB_FAIL(check_inner_stat())) {
LOG_WARN("fail to check inner stat", KR(ret));
} else if (OB_FAIL(post_upgrade_for_grant_create_database_link_priv())) {
LOG_WARN("grant create database link failed", K(ret));
} else if (OB_FAIL(post_upgrade_for_grant_drop_database_link_priv())) {
LOG_WARN("grant drop database link failed", K(ret));
} else if (OB_FAIL(post_upgrade_for_heartbeat_and_server_zone_op_service())) {
LOG_WARN("post upgrade for heartbeat and server zone op service failed", KR(ret));
}
return ret;
}
int ObUpgradeFor4200Processor::post_upgrade_for_grant_create_database_link_priv()
{
int ret = OB_SUCCESS;

4
src/share/ob_upgrade_utils.h
View File

@ -189,8 +189,6 @@ private:
int post_upgrade_for_backup();
int init_rewrite_rule_version(const uint64_t tenant_id);
static int recompile_all_views_and_synonyms(const uint64_t tenant_id);
//TODO upgrade for 4200
int post_upgrade_for_max_ls_id_();
};
DEF_SIMPLE_UPGRARD_PROCESSER(4, 1, 0, 1)
@ -207,6 +205,8 @@ private:
int post_upgrade_for_grant_create_database_link_priv();
int post_upgrade_for_grant_drop_database_link_priv();
int post_upgrade_for_heartbeat_and_server_zone_op_service();
int post_upgrade_for_max_ls_id_();
};
DEF_SIMPLE_UPGRARD_PROCESSER(4, 2, 1, 0)