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

fix server bw limit unset

Browse Source
This commit is contained in:
zhjc1124
2023-05-16 03:11:18 +00:00
committed by ob-robot
parent 7a69923d04
commit 12d40dfdfc
2 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/observer/net/ob_ingress_bw_alloc_service.cpp
View File

@ -393,10 +393,9 @@ void ObIngressBWAllocService::follower_task()
ret = OB_NOT_INIT; ret = OB_NOT_INIT;
COMMON_LOG(WARN, "not init", K(ret), K(is_inited_)); COMMON_LOG(WARN, "not init", K(ret), K(is_inited_));
} else if (server_standby_bw > 0) { } else if (server_standby_bw > 0) {
// do nothing, reload _server_standby_fetch_log_bandwidth_limit in ObSrvNetworkFrame::reload_config() if (OB_FAIL(obrpc::global_poc_server.update_server_standby_fetch_log_bandwidth_limit(server_standby_bw))) {
// if (OB_FAIL(obrpc::global_poc_server.update_server_standby_fetch_log_bandwidth_limit(server_standby_bw))) { COMMON_LOG(WARN, "Failed to set server-level standby fetchlog bandwidth limit");
// COMMON_LOG(WARN, "Failed to set server-level standby fetchlog bandwidth limit"); }
// }
} else if (GCONF.standby_fetch_log_bandwidth_limit == 0) { } else if (GCONF.standby_fetch_log_bandwidth_limit == 0) {
// unlimited // unlimited
if (OB_FAIL(obrpc::global_poc_server.update_server_standby_fetch_log_bandwidth_limit(RATE_UNLIMITED))) { if (OB_FAIL(obrpc::global_poc_server.update_server_standby_fetch_log_bandwidth_limit(RATE_UNLIMITED))) {

10
src/observer/ob_srv_network_frame.cpp
View File

@ -250,7 +250,6 @@ int ObSrvNetworkFrame::reload_config()
int32_t tcp_keepintvl = static_cast<int>(GCONF.tcp_keepintvl); int32_t tcp_keepintvl = static_cast<int>(GCONF.tcp_keepintvl);
int32_t tcp_keepcnt = static_cast<int>(GCONF.tcp_keepcnt); int32_t tcp_keepcnt = static_cast<int>(GCONF.tcp_keepcnt);
int32_t user_timeout = static_cast<int>(GCONF.dead_socket_detection_timeout); int32_t user_timeout = static_cast<int>(GCONF.dead_socket_detection_timeout);
int64_t server_standby_bw = static_cast<int64_t>(GCONF._server_standby_fetch_log_bandwidth_limit);
if (GCONF._enable_easy_keepalive) { if (GCONF._enable_easy_keepalive) {
enable_easy_keepalive = 1; enable_easy_keepalive = 1;
@ -280,8 +279,6 @@ int ObSrvNetworkFrame::reload_config()
tcp_keepidle, tcp_keepintvl, tcp_keepidle, tcp_keepintvl,
tcp_keepcnt))) { tcp_keepcnt))) {
LOG_WARN("Failed to set sql tcp keepalive parameters for sql nio server", K(ret)); LOG_WARN("Failed to set sql tcp keepalive parameters for sql nio server", K(ret));
} else if (OB_FAIL(obrpc::global_poc_server.update_server_standby_fetch_log_bandwidth_limit(server_standby_bw))) {
LOG_WARN("Failed to set server-level standby fetchlog bandwidth limit");
} }
return ret; return ret;
} }
@ -644,6 +641,13 @@ int ObSrvNetworkFrame::net_endpoint_predict_ingress(const ObNetEndpointKey &endp
int ObSrvNetworkFrame::net_endpoint_set_ingress(const ObNetEndpointKey &endpoint_key, int64_t assigned_bw) int ObSrvNetworkFrame::net_endpoint_set_ingress(const ObNetEndpointKey &endpoint_key, int64_t assigned_bw)
{ {
int ret = OB_SUCCESS; int ret = OB_SUCCESS;
if ((int64_t)GCONF._server_standby_fetch_log_bandwidth_limit > 0) {
} else if (GCONF.standby_fetch_log_bandwidth_limit == 0) {
// unlimited
if (OB_FAIL(obrpc::global_poc_server.update_server_standby_fetch_log_bandwidth_limit(RATE_UNLIMITED))) {
COMMON_LOG(WARN, "Failed to set server-level standby fetchlog bandwidth limit");
}
}
if (OB_UNLIKELY(assigned_bw == -1)) { if (OB_UNLIKELY(assigned_bw == -1)) {
ret = OB_INVALID_CONFIG; ret = OB_INVALID_CONFIG;
LOG_WARN("assigned bandwidtth is invalid", K(ret), K(endpoint_key), K(assigned_bw)); LOG_WARN("assigned bandwidtth is invalid", K(ret), K(endpoint_key), K(assigned_bw));