From cde6e2e72b2496f6078414202cc8baf9f26a98ba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=BB=84=E8=87=AA=E8=BE=BE?= <980324341@qq.com> Date: Fri, 9 Oct 2026 23:34:00 +0800 Subject: [PATCH] =?UTF-8?q?=E5=90=8E=E7=AB=AF(=E5=9B=9B=E9=9D=A29=E5=88=86?= =?UTF-8?q?=E6=89=B9=E6=AC=A1):=20=E7=89=88=E6=9C=AC=E5=9C=B0=E6=9D=BF?= =?UTF-8?q?=E8=87=AA=E8=BF=B0=E5=B9=B6=E6=8E=92=20ASCII=20=E5=B7=A1?= =?UTF-8?q?=E6=A3=80=E6=A0=87=E7=AD=BE=EF=BC=8C=E9=94=81=E8=B7=B3=E8=BF=87?= =?UTF-8?q?=20javadoc=20=E8=AE=A1=E6=95=B0=E6=94=B9=E5=9B=9E=E5=AE=9E?= =?UTF-8?q?=E6=B5=8B=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - ClientVersionGuardFilter 4 条中文自述旁并排 [client-version-floor]:中文签名在容器日志 换编码后整条 grep 失效,巡检只认 ASCII;判定逻辑与响应体一字未改 - ClientVersionFloorConfigTest 加第 10 例:逐行钉"带中文自述必须并排 ASCII 标签", 并含"内存里摘掉一处就掉数"的非零对照(mvn 实跑 tests=10 failures=0 errors=0) - LockSkipWitness javadoc 的 27 处/12 文件是旧数,按本轮实扫改成 28 处/11 个文件 --- .../aiimage/common/util/LockSkipWitness.java | 2 +- .../config/ClientVersionGuardFilter.java | 8 ++--- .../config/ClientVersionFloorConfigTest.java | 35 +++++++++++++++++++ 3 files changed, 40 insertions(+), 5 deletions(-) diff --git a/backend-java/src/main/java/com/nanri/aiimage/common/util/LockSkipWitness.java b/backend-java/src/main/java/com/nanri/aiimage/common/util/LockSkipWitness.java index a1f495611..595795fdd 100644 --- a/backend-java/src/main/java/com/nanri/aiimage/common/util/LockSkipWitness.java +++ b/backend-java/src/main/java/com/nanri/aiimage/common/util/LockSkipWitness.java @@ -17,7 +17,7 @@ import java.util.concurrent.atomic.AtomicLong; /** * 分布式锁「没拿到就跳过」的可聚合出口(2026-10-09 评审「稳定 5.5」项)。 * - *

此前 {@code if (lockHandle == null) { continue; }} 在全树有 27 处(12 个文件), + *

此前 {@code if (lockHandle == null) { continue; }} 在全树有 28 处(11 个文件), * 一处日志都不留。表现是:巡检任务每轮都跑、锁竞争越激烈被跳过的任务越多,而现网看不出任何痕迹 * ——卡死任务没被收尾、结果作业没被续跑,日志里连一行都没有,只能靠人肉反推。跟 * {@code TaskFileJobPublisher} 的 MQ 降级是同一个病:那条已经补了 {@code task.file.job.mq.degraded} diff --git a/backend-java/src/main/java/com/nanri/aiimage/config/ClientVersionGuardFilter.java b/backend-java/src/main/java/com/nanri/aiimage/config/ClientVersionGuardFilter.java index 41620b2b5..f6f62d8fa 100644 --- a/backend-java/src/main/java/com/nanri/aiimage/config/ClientVersionGuardFilter.java +++ b/backend-java/src/main/java/com/nanri/aiimage/config/ClientVersionGuardFilter.java @@ -128,17 +128,17 @@ public class ClientVersionGuardFilter extends OncePerRequestFilter { @PostConstruct void reportFloorState() { if (!isConfigured()) { - log.warn("[版本地板] 启动自检:min-supported-version 未配置 ⇒ 闸门惰性,逐请求跳过," + log.warn("[client-version-floor] [版本地板] 启动自检:min-supported-version 未配置 ⇒ 闸门惰性,逐请求跳过," + "现网装机版本分布没有任何记账数据(enforce={} rejectUnreported={})", enforce, rejectUnreported); return; } if (parse(minSupportedVersion) == null) { - log.warn("[版本地板] 启动自检:min-supported-version=\"{}\" 解析不出数字段 ⇒ 全部上报按 " + log.warn("[client-version-floor] [版本地板] 启动自检:min-supported-version=\"{}\" 解析不出数字段 ⇒ 全部上报按 " + "unparsable 记账、永不拒绝,请把配置改回点分数字版本", minSupportedVersion); return; } - log.info("[版本地板] 启动自检:最低支持版本={} enforce={}({})rejectUnreported={}", + log.info("[client-version-floor] [版本地板] 启动自检:最低支持版本={} enforce={}({})rejectUnreported={}", minSupportedVersion.trim(), enforce, enforce ? "真拒绝:低于地板的装机会被挡在业务之前" : "记账模式:只计数与打日志,业务响应不变", rejectUnreported); @@ -163,7 +163,7 @@ public class ClientVersionGuardFilter extends OncePerRequestFilter { if (firstWitness(verdict, reported)) { // 一次配置变更会被每个在跑的客户端逐请求命中:这里按 (verdict, version) 去重, // 量交给指标,日志只留第一条(与 10-06 通知放大的处置同一口径)。 - log.warn("[版本地板] {} {} 自报版本={} 最低支持={} verdict={} enforce={} —— {}", + log.warn("[client-version-floor] [版本地板] {} {} 自报版本={} 最低支持={} verdict={} enforce={} —— {}", request.getMethod(), uri, reported, minSupportedVersion.trim(), verdict, enforce, enforce ? "本次已拒绝" : "记账模式,暂不拒绝"); } diff --git a/backend-java/src/test/java/com/nanri/aiimage/config/ClientVersionFloorConfigTest.java b/backend-java/src/test/java/com/nanri/aiimage/config/ClientVersionFloorConfigTest.java index eae9d34bb..b33e7ac71 100644 --- a/backend-java/src/test/java/com/nanri/aiimage/config/ClientVersionFloorConfigTest.java +++ b/backend-java/src/test/java/com/nanri/aiimage/config/ClientVersionFloorConfigTest.java @@ -5,6 +5,7 @@ import static org.assertj.core.api.Assertions.assertThat; import ch.qos.logback.classic.Logger; import ch.qos.logback.classic.spi.ILoggingEvent; import ch.qos.logback.core.read.ListAppender; +import com.nanri.aiimage.testutil.SourceScan; import io.micrometer.core.instrument.Counter; import io.micrometer.core.instrument.simple.SimpleMeterRegistry; import java.io.InputStream; @@ -238,6 +239,40 @@ class ClientVersionFloorConfigTest { } } + /** + * 巡检锚点必须是 ASCII:日志级别再对、写得再清楚,容器日志换了编码之后 grep 抓不到就等于没上线。 + * 所以每条中文自述旁边都并排一条 {@code [client-version-floor]},这条判据钉的是"并排"这件事本身 + * ——摘掉任意一处都要红,而不是只数一遍总数(总数会被注释喂,故先剥注释)。 + */ + @Test + void everyFloorLogCarriesTheAsciiPatrolTag() { + String body = SourceScan.withoutComments(SourceScan.sourceText("ClientVersionGuardFilter.java")); + int cnTag = countIn(body, "[版本地板]"); + int asciiTag = countIn(body, "[client-version-floor]"); + assertThat(cnTag).as("剥掉注释后含中文自述标签的 log 语句数,改动措辞或搬文件都会让这里不等于 4").isEqualTo(4); + assertThat(asciiTag).as("ASCII 巡检标签条数必须与中文标签一致").isEqualTo(cnTag); + for (String line : body.split("\n")) { + if (line.contains("[版本地板]")) { + assertThat(line).as("这一行只带了中文标签,巡检那条 grep 就抓不到它") + .contains("[client-version-floor]"); + } + } + // 非零对照:在内存里摘掉一处 ASCII 标签,上面"条数一致"必须不再成立 + String cut = body.replaceFirst(Pattern.quote("[client-version-floor] "), ""); + assertThat(countIn(cut, "[client-version-floor]")).as("摘掉一处后计数应变成 3,否则这条判据是恒真的") + .isEqualTo(cnTag - 1); + } + + private static int countIn(String text, String needle) { + int at = 0; + int hits = 0; + while ((at = text.indexOf(needle, at)) >= 0) { + hits++; + at += needle.length(); + } + return hits; + } + // ---------------------------------------------------------------- 助手 private ClientVersionGuardFilter filter(String minVersion, boolean enforce, boolean rejectUnreported,