From 1faf5137ea53adee61e7c0aac4940a39ec832139 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A7=9A=E7=AB=A0=E6=B5=A9?= Date: Thu, 29 Oct 2026 05:02:10 +0800 Subject: [PATCH] =?UTF-8?q?fix(libraryctl):=20=E7=94=A8=E5=AE=8C=E6=95=B4?= =?UTF-8?q?=E5=AE=B9=E5=99=A8=20ID=20=E5=88=A4=E5=AE=9A=E5=86=99=E5=85=A5?= =?UTF-8?q?=E8=80=85=E5=BD=92=E5=B1=9E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit `docker ps -q` 默认输出 12 位短 ID,与 declared 里的 64 位 ID 永不相等, 结果连已声明的写入者都被判成"未声明的并发写入者",封存永远开不了窗。 改用 --no-trunc 并按前缀双向匹配。 --- cmd/libraryctl/main.go | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/cmd/libraryctl/main.go b/cmd/libraryctl/main.go index f21a60e..d99803c 100644 --- a/cmd/libraryctl/main.go +++ b/cmd/libraryctl/main.go @@ -816,12 +816,14 @@ func writerImageIDs(ctx context.Context, items []libraryfreeze.Service) ([]strin func checkNoUndeclaredWriter(ctx context.Context, images []string, declared map[string]bool, sourceProject string, source map[string]string) error { for _, image := range images { - out, err := dockerOutput(ctx, "ps", "-q", "--filter", "ancestor="+image) + // 必须 --no-trunc:`docker ps` 默认只给 12 位短 ID,和 declared 里的 + // 64 位容器 ID 永远不相等——那样连"已声明的写入者"都会被判成未声明。 + out, err := dockerOutput(ctx, "ps", "-aq", "--no-trunc", "--filter", "ancestor="+image) if err != nil { return err } for _, id := range strings.Fields(out) { - if declared[id] { + if declaredWriter(declared, id) { continue } project, err := dockerOutput(ctx, "inspect", "--format", `{{index .Config.Labels "com.docker.compose.project"}}`, id) @@ -840,6 +842,20 @@ func checkNoUndeclaredWriter(ctx context.Context, images []string, declared map[ return nil } +// declaredWriter 同时接受完整 ID 与短 ID:证据里两种写法都出现过, +// 只比一种会把同一容器判成两个身份。 +func declaredWriter(declared map[string]bool, id string) bool { + if declared[id] { + return true + } + for key := range declared { + if strings.HasPrefix(key, id) || strings.HasPrefix(id, key) { + return true + } + } + return false +} + // sourceTargetOf 只取"写到哪儿"的身份:同一个数据库或同一个队列才是真冲突。 func sourceTargetOf(env map[string]string) map[string]string { return map[string]string{