From e4dd001eec7f2e488615c10a94b4f86cd5ee5a9d Mon Sep 17 00:00:00 2001 From: hermes Date: Fri, 20 Nov 2026 19:07:01 +0800 Subject: [PATCH] =?UTF-8?q?feat(zhiyi):=20=E8=A7=A3=E5=89=96=E7=BA=BF=20v1?= =?UTF-8?q?.0-safe=20=E2=80=94=20=E6=8B=92=E7=BB=9D=E6=97=B6=E6=89=93?= =?UTF-8?q?=E5=8D=B0=E5=9C=A8=E9=A3=9E=E8=BF=9E=E6=8E=A5=E7=BB=84=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 动机:636 次 connection cap 拒绝至今不知填座者身份。 现有日志只记溢出(谁被拒),永不记水位(64 席上坐着谁)。 改法(零行为变更,纯日志): - ServerState 加 inflight: Mutex> - InflightGuard RAII:handle_client 解析 msg_type 后 +1,返回/panic 归还 - accept 拒绝分支打印 composition 直方图 用途:明晚 02 时饱和自我记录,09:05 闸线直接读出填座者身份。 v1.1(cap 或限流)的形状由这份读数裁定。 未做:HEAVY_CONN_MAX(等读数)、HEAVY_READ_WAIT_MS(B 已撤) --- rust/src/main.rs | 51 +++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 48 insertions(+), 3 deletions(-) diff --git a/rust/src/main.rs b/rust/src/main.rs index 321f655..45fbc93 100644 --- a/rust/src/main.rs +++ b/rust/src/main.rs @@ -31,7 +31,7 @@ use quality_backtrace::{QualityBacktracer, QualitySample}; use report::{ConsolidationReport, DashboardSnapshot, ReportGenerator}; use std::path::Path; use std::sync::atomic::{AtomicBool, AtomicUsize, Ordering}; -use std::sync::Arc; +use std::sync::{Arc, Mutex}; // ─── 风暴守卫 + 健康探针(t_89d22fc8, 2026-10-16 22:42 事故)──────────────── // 事故链:触发器 30s 循环在「触发器状态重置后」同秒发 cluster_only+full+full ⇒ @@ -385,6 +385,37 @@ struct ServerState { /// 重读准入信号量(方案① t_690cc333):限制并发重读(search>1000/forget_window/ /// scan_all/scan_deleted)的内存无界叠加。N 默认 2,env ZHIYI_HEAVY_READ_CONCURRENCY 可调。 heavy_read: HeavyReadGate, + /// 2026-11-20 P0 解剖线:在飞连接按 msgtype 的组成直方图。 + /// 动机:现有日志只记溢出(谁被拒),永不记水位(64 席上坐着谁)—— + /// 02:16:35-02:59:55 的 636 次拒绝至今不知填座者身份。拒绝时打印本快照, + /// 让明晚的饱和自我记录。零行为变更(只读快照 + 一行 eprintln)。 + inflight: Mutex>, +} + +/// 解剖线 RAII:进入 handle_client 时 +1,离开时 -1(含 panic 展开)。 +struct InflightGuard<'a> { + map: &'a Mutex>, + key: String, +} +impl<'a> InflightGuard<'a> { + fn new(map: &'a Mutex>, key: String) -> Self { + if let Ok(mut m) = map.lock() { + *m.entry(key.clone()).or_insert(0) += 1; + } + Self { map, key } + } +} +impl Drop for InflightGuard<'_> { + fn drop(&mut self) { + if let Ok(mut m) = self.map.lock() { + if let Some(n) = m.get_mut(&self.key) { + *n = n.saturating_sub(1); + if *n == 0 { + m.remove(&self.key); + } + } + } + } } /// Unix Socket 服务端 @@ -417,6 +448,7 @@ fn run_socket_server(socket_path: &str, args: &Args) { let state = Arc::new(ServerState { encoder, heavy_read: HeavyReadGate::new(n), + inflight: Mutex::new(HashMap::new()), }); let conn_limit = conn_permits(); let conn_in_flight = Arc::new(AtomicUsize::new(0)); @@ -448,9 +480,20 @@ fn run_socket_server(socket_path: &str, args: &Args) { let permit = match conn_try_acquire(&conn_in_flight, conn_limit) { Some(p) => p, None => { + // 2026-11-20 P0 解剖线:拒绝时打印在飞连接组成(水位计) + // 动机:636 次拒绝至今不知填座者身份;溢流痕迹 → 水位计。 + let (snap, tot) = match st.inflight.lock() { + Ok(m) => { + let mut v: Vec<(String, usize)> = + m.iter().map(|(k, n)| (k.clone(), *n)).collect(); + v.sort_by(|a, b| b.1.cmp(&a.1)); + (v, m.values().sum::()) + } + Err(_) => (Vec::new(), 0), + }; eprintln!( - "[zhiyi] connection cap {} reached: reject (heavy_conn_busy)", - conn_limit + "[zhiyi] connection cap {} reached: reject (heavy_conn_busy) | inflight total={} composition={:?}", + conn_limit, tot, snap ); // 直接回一个 JSON 错误给客户端(对齐 Go rpc() 的读 deadline) let mut stream = stream; @@ -491,6 +534,8 @@ fn handle_client(mut stream: UnixStream, args: &Args, lancedb: LanceDBOps, state }; let msg_type = msg["type"].as_str().unwrap_or("consolidate"); + // 2026-11-20 P0 解剖线:登记在飞连接(RAII,函数返回/panic 都归还) + let _inflight_guard = InflightGuard::new(&st.inflight, msg_type.to_string()); eprintln!( "[zhiyi] msg type = {:?}, raw keys = {:?}", msg_type,