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

[FEAT MERGE] New upgrade framework for 4.x

Browse Source
This commit is contained in:
tino247
2022-12-29 11:40:25 +00:00
committed by ob-robot
parent b39b8c45f0
commit a6098ccbc6
106 changed files with 6140 additions and 3227 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/observer/ob_server.cpp
View File

@ -217,8 +217,8 @@ int ObServer::init(const ObServerOptions &opts, const ObPLogWriterCfg &log_cfg)
LOG_ERROR("init pre setting failed", KR(ret));
} else if (OB_FAIL(init_global_context())) {
LOG_ERROR("init global context failed", KR(ret));
} else if (OB_FAIL(init_cluster_version())) {
LOG_ERROR("init cluster version failed", KR(ret));
} else if (OB_FAIL(init_version())) {
LOG_ERROR("init version failed", KR(ret));
} else if (OB_FAIL(init_sql_proxy())) {
LOG_ERROR("init sql connection pool failed", KR(ret));
} else if (OB_FAIL(init_io())) {
@ -2028,9 +2028,9 @@ int ObServer::init_global_context()
return ret;
}
int ObServer::init_cluster_version()
int ObServer::init_version()
{
return ObClusterVersion::get_instance().init(&config_);
return ObClusterVersion::get_instance().init(&config_, &tenant_config_mgr_);
}
int ObServer::init_ts_mgr()