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

backup upgrade compatibility related fixes

Browse Source
This commit is contained in:
hamstersox
2023-03-14 07:13:34 +00:00
committed by ob-robot
parent 312db5a0f2
commit 6d4641c7bc
2 changed files with 22 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/share/ob_upgrade_utils.cpp
View File

@ -787,6 +787,8 @@ int ObUpgradeFor4100Processor::post_upgrade()
LOG_WARN("fail to check inner stat", KR(ret));
} else if (OB_FAIL(post_upgrade_for_srs())) {
LOG_WARN("post upgrade for srs failed", K(ret));
} else if (OB_FAIL(post_upgrade_for_backup())) {
LOG_WARN("post upgrade for backup failed", K(ret));
} else if (OB_FAIL(init_rewrite_rule_version(tenant_id))) {
LOG_WARN("fail to check inner stat", KR(ret));
} else if (OB_FAIL(recompile_all_views_and_synonyms(tenant_id))) {
@ -840,6 +842,25 @@ int ObUpgradeFor4100Processor::post_upgrade_for_srs()
LOG_INFO("add tenant srs finish", K(ret), K(tenant_id_), K(affected_rows), "cost", ObTimeUtility::current_time() - start);
return ret;
}
int ObUpgradeFor4100Processor::post_upgrade_for_backup()
{
int ret = OB_SUCCESS;
ObSqlString sql;
int64_t start = ObTimeUtility::current_time();
int64_t affected_rows = 0;
if (is_meta_tenant(tenant_id_)) {
if (OB_FAIL(sql.assign_fmt("UPDATE %s SET CLUSTER_VERSION = '4.0.0.0' WHERE CLUSTER_VERSION = ''", OB_ALL_BACKUP_SET_FILES_TNAME))) {
LOG_WARN("sql assign failed", K(ret));
} else if (OB_FAIL(sql_proxy_->write(tenant_id_, sql.ptr(), affected_rows))) {
LOG_WARN("execute sql failed", K(ret), K(sql));
} else {
LOG_TRACE("execute sql", KR(ret), K(tenant_id_), K(sql), K(affected_rows));
}
LOG_INFO("update backup cluster version finish", K(ret), K(tenant_id_), K(affected_rows), "cost", ObTimeUtility::current_time() - start);
}
return ret;
}
int ObUpgradeFor4100Processor::recompile_all_views_and_synonyms(const uint64_t tenant_id)
{

1
src/share/ob_upgrade_utils.h
View File

@ -184,6 +184,7 @@ public:
virtual int post_upgrade() override;
private:
int post_upgrade_for_srs();
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);
};