This commit is contained in:
Alexey 2026-03-31 19:42:07 +03:00
parent 780546a680
commit 3df274caa6
No known key found for this signature in database
2 changed files with 17 additions and 12 deletions

View File

@ -1199,9 +1199,13 @@ where
user = %user, user = %user,
"Middle-relay pressure eviction for idle-candidate session" "Middle-relay pressure eviction for idle-candidate session"
); );
let _ = let _ = enqueue_c2me_command(
enqueue_c2me_command(&c2me_tx, C2MeCommand::Close, c2me_send_timeout, stats.as_ref()) &c2me_tx,
.await; C2MeCommand::Close,
c2me_send_timeout,
stats.as_ref(),
)
.await;
main_result = Err(ProxyError::Proxy( main_result = Err(ProxyError::Proxy(
"middle-relay session evicted under pressure (idle-candidate)".to_string(), "middle-relay session evicted under pressure (idle-candidate)".to_string(),
)); ));
@ -1220,9 +1224,13 @@ where
"Cutover affected middle session, closing client connection" "Cutover affected middle session, closing client connection"
); );
tokio::time::sleep(delay).await; tokio::time::sleep(delay).await;
let _ = let _ = enqueue_c2me_command(
enqueue_c2me_command(&c2me_tx, C2MeCommand::Close, c2me_send_timeout, stats.as_ref()) &c2me_tx,
.await; C2MeCommand::Close,
c2me_send_timeout,
stats.as_ref(),
)
.await;
main_result = Err(ProxyError::Proxy(ROUTE_SWITCH_ERROR_MSG.to_string())); main_result = Err(ProxyError::Proxy(ROUTE_SWITCH_ERROR_MSG.to_string()));
break; break;
} }

View File

@ -1436,8 +1436,7 @@ impl Stats {
pub fn increment_me_c2me_send_full_total(&self) { pub fn increment_me_c2me_send_full_total(&self) {
if self.telemetry_me_allows_normal() { if self.telemetry_me_allows_normal() {
self.me_c2me_send_full_total self.me_c2me_send_full_total.fetch_add(1, Ordering::Relaxed);
.fetch_add(1, Ordering::Relaxed);
} }
} }
@ -1838,13 +1837,11 @@ impl Stats {
} }
pub fn get_me_c2me_send_high_water_total(&self) -> u64 { pub fn get_me_c2me_send_high_water_total(&self) -> u64 {
self.me_c2me_send_high_water_total self.me_c2me_send_high_water_total.load(Ordering::Relaxed)
.load(Ordering::Relaxed)
} }
pub fn get_me_c2me_send_timeout_total(&self) -> u64 { pub fn get_me_c2me_send_timeout_total(&self) -> u64 {
self.me_c2me_send_timeout_total self.me_c2me_send_timeout_total.load(Ordering::Relaxed)
.load(Ordering::Relaxed)
} }
pub fn get_me_d2c_batch_timeout_armed_total(&self) -> u64 { pub fn get_me_d2c_batch_timeout_armed_total(&self) -> u64 {
self.me_d2c_batch_timeout_armed_total self.me_d2c_batch_timeout_armed_total