diff --git a/deps/oblib/src/rpc/pnio/io/eloop.c b/deps/oblib/src/rpc/pnio/io/eloop.c index 42be26653..828f80ecc 100644 --- a/deps/oblib/src/rpc/pnio/io/eloop.c +++ b/deps/oblib/src/rpc/pnio/io/eloop.c @@ -80,7 +80,7 @@ static void sock_destroy(sock_t* s) { static void eloop_handle_sock_event(sock_t* s) { int err = 0; if (skt(s, ERR) || skt(s, HUP)) { - rk_info("sock destroy: sock=%p, connection=%s, err=%d", s, T2S(sock_fd, s->fd), err); + rk_info("sock destroy: sock=%p, connection=%s, s->mask=0x%x", s, T2S(sock_fd, s->fd), s->mask); sock_destroy(s); } else if (0 == (err = s->handle_event(s))) { // yield diff --git a/deps/oblib/src/rpc/pnio/io/rate_limit.c b/deps/oblib/src/rpc/pnio/io/rate_limit.c index 7f4c60a53..5f548a19a 100644 --- a/deps/oblib/src/rpc/pnio/io/rate_limit.c +++ b/deps/oblib/src/rpc/pnio/io/rate_limit.c @@ -65,7 +65,10 @@ static int rl_timerfd_handle_event(rl_timerfd_t* s) { } } else { // read data - int64_t avail_bytes = 65536; // read only up to 64k once + int64_t avail_bytes = rl->bw * 0.1 + 1; + if (avail_bytes > 65536) { + avail_bytes = 65536; // read only up to 64k once + } int64_t temp_bytes = avail_bytes; int rl_err = 0; dlink_t* last_dlink = rl_queue->prev; diff --git a/src/observer/net/ob_ingress_bw_alloc_service.cpp b/src/observer/net/ob_ingress_bw_alloc_service.cpp index b2076a8a7..430b9a8ae 100644 --- a/src/observer/net/ob_ingress_bw_alloc_service.cpp +++ b/src/observer/net/ob_ingress_bw_alloc_service.cpp @@ -114,6 +114,7 @@ int ObNetEndpointIngressManager::collect_predict_bw(ObNetEndpointKVArray &update const ObNetEndpointKey &endpoint_key = delete_keys[i]; if (OB_FAIL(ingress_plan_map_.erase_refactored(endpoint_key))) { LOG_ERROR("failed to erase endpoint", K(ret), K(endpoint_key)); + ret = OB_SUCCESS; // ignore error } } }