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

fix mysqltest use db failed && modify dataversion for start_servers

Browse Source
This commit is contained in:
obdev 2024-08-22 08:51:22 +00:00 committed by ob-robot
parent cd124403e2
commit ba068fff43
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/rootserver/ob_server_zone_op_service.cpp
View File

@ -314,7 +314,9 @@ int ObServerZoneOpService::start_servers(
if (OB_FAIL(ObServerTableOperator::get(*GCTX.sql_proxy_, server, server_info))) {
// make sure the server is in whitelist, then send rpc
LOG_WARN("fail to get server_info", KR(ret), K(server));
} else if (sys_tenant_data_version >= DATA_VERSION_4_3_2_0) {
} else if ((sys_tenant_data_version >= MOCK_DATA_VERSION_4_2_5_0
&& sys_tenant_data_version < DATA_VERSION_4_3_0_0)
|| sys_tenant_data_version >= DATA_VERSION_4_3_2_0) {
int64_t timeout = ctx.get_timeout();
const int64_t ERR_MSG_BUF_LEN = OB_MAX_SERVER_ADDR_SIZE + 150;
char disk_error_server_err_msg[ERR_MSG_BUF_LEN] = "";

3
src/share/ob_all_server_tracer.cpp
View File

@ -429,8 +429,7 @@ int ObServerTraceMap::get_alive_and_not_stopped_servers(const ObZone &zone, ObIA
const ObAddr &server = server_info.get_server();
if ((server_info.get_zone() == zone || zone.is_empty())
&& !server_info.is_stopped()
&& server_info.is_alive()
&& server_info.in_service()) {
&& server_info.is_alive()) {
if (OB_FAIL(server_list.push_back(server))) {
LOG_WARN("fail to push an element into server_list", KR(ret), K(server));
}