From ba068fff43ac7a83c3d18182f4200898c728b8a4 Mon Sep 17 00:00:00 2001 From: obdev Date: Thu, 22 Aug 2024 08:51:22 +0000 Subject: [PATCH] fix mysqltest use db failed && modify dataversion for start_servers --- src/rootserver/ob_server_zone_op_service.cpp | 4 +++- src/share/ob_all_server_tracer.cpp | 3 +-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/rootserver/ob_server_zone_op_service.cpp b/src/rootserver/ob_server_zone_op_service.cpp index 76b02a3e5..1d472a83f 100644 --- a/src/rootserver/ob_server_zone_op_service.cpp +++ b/src/rootserver/ob_server_zone_op_service.cpp @@ -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] = ""; diff --git a/src/share/ob_all_server_tracer.cpp b/src/share/ob_all_server_tracer.cpp index a4d625d99..fde89defc 100644 --- a/src/share/ob_all_server_tracer.cpp +++ b/src/share/ob_all_server_tracer.cpp @@ -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)); }