From 72ea9726e7073d5c4cbb8b459cfef0cd1c48e38d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A7=9A=E7=AB=A0=E6=B5=A9?= Date: Fri, 30 Oct 2026 01:33:45 +0800 Subject: [PATCH] =?UTF-8?q?fix(library):=20=E7=BB=B4=E6=8A=A4=E7=AA=97?= =?UTF-8?q?=E5=8F=A3=E8=B5=B7=E5=A7=8B=E6=97=B6=E9=97=B4=E5=8F=AA=E5=B1=9E?= =?UTF-8?q?=E4=BA=8E=E6=9C=AC=E6=AC=A1=E5=8D=A0=E7=94=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit acquired_at 没进 ON CONFLICT DO UPDATE,于是第一次建立基线写下的时间再也不会变: 恢复作业 16:59 才开窗口,页面却显示 13:37。库级与实例级是两份 SQL,都要改成 "同一作业重入(崩溃接管)保留旧值,新作业接管用本次时间"。 真实 PostgreSQL 用例覆盖两者:首开、同作业重入、释放后新作业接管、持有期间他人被拒。 --- .../postgres/library_instance_maintenance.go | 6 + .../platform/postgres/library_maintenance.go | 8 ++ ...ary_maintenance_window_integration_test.go | 107 ++++++++++++++++++ 3 files changed, 121 insertions(+) create mode 100644 internal/platform/postgres/library_maintenance_window_integration_test.go diff --git a/internal/platform/postgres/library_instance_maintenance.go b/internal/platform/postgres/library_instance_maintenance.go index 8b82cc5..a7847b4 100644 --- a/internal/platform/postgres/library_instance_maintenance.go +++ b/internal/platform/postgres/library_instance_maintenance.go @@ -75,6 +75,12 @@ ON CONFLICT (instance) DO UPDATE SET ELSE EXCLUDED.original_service_state END, note = EXCLUDED.note, + -- 同 scope 的那一份:起始时间只属于当前这次占用,同一作业重入才保留旧值。 + acquired_at = CASE + WHEN library_instance_maintenance.owner_job_id = EXCLUDED.owner_job_id + THEN library_instance_maintenance.acquired_at + ELSE EXCLUDED.acquired_at + END, updated_at = EXCLUDED.updated_at, released_at = NULL WHERE library_instance_maintenance.released_at IS NOT NULL diff --git a/internal/platform/postgres/library_maintenance.go b/internal/platform/postgres/library_maintenance.go index 72db8aa..38df731 100644 --- a/internal/platform/postgres/library_maintenance.go +++ b/internal/platform/postgres/library_maintenance.go @@ -89,6 +89,14 @@ ON CONFLICT (scope) DO UPDATE SET ELSE EXCLUDED.original_service_state END, note = EXCLUDED.note, + -- 窗口的"起始时间"属于**这次**占用:只有同一作业重入(崩溃接管)才保留第一次的 + -- 时间。少了这一条,页面会一直显示第一次建立基线时的 acquired_at,让人以为 + -- 当前这个窗口从那时起就没释放过。 + acquired_at = CASE + WHEN library_maintenance.owner_job_id = EXCLUDED.owner_job_id + THEN library_maintenance.acquired_at + ELSE EXCLUDED.acquired_at + END, updated_at = EXCLUDED.updated_at, released_at = NULL -- 已经释放的窗口允许被新作业接管(否则第一个同步之后谁也再进不去); diff --git a/internal/platform/postgres/library_maintenance_window_integration_test.go b/internal/platform/postgres/library_maintenance_window_integration_test.go new file mode 100644 index 0000000..2577dda --- /dev/null +++ b/internal/platform/postgres/library_maintenance_window_integration_test.go @@ -0,0 +1,107 @@ +package postgres + +import ( + "context" + "errors" + "os" + "testing" + "time" + + "github.com/jackc/pgx/v5/pgxpool" +) + +// 维护窗口的"起始时间"必须属于**当前这次占用**。 +// +// 真实缺陷:acquired_at 没进 ON CONFLICT 的更新列表,于是第一次建立基线时写下的 +// 时间再也不会变——恢复作业明明 16:59 才开窗口,页面却显示 13:37(那次基线), +// 让人以为窗口从基线起就一直没释放。 +// +// 同时必须保住崩溃接管的语义:同一个 owner_job_id 重入不能刷新时间,否则"这次 +// 窗口开了多久"会被重入抹掉。库级与实例级两份 SQL 都要验,它们是两份实现。 +func TestMaintenanceAcquiredAtBelongsToCurrentWindow(t *testing.T) { + databaseURL := isolatedIntegrationDatabaseURL(t, os.Getenv("TEST_DATABASE_URL")) + if databaseURL == "" { + t.Skip("TEST_DATABASE_URL is not set") + } + ctx := context.Background() + pool, err := pgxpool.New(ctx, databaseURL) + if err != nil { + t.Fatalf("connect: %v", err) + } + defer pool.Close() + if err := ApplyMigrations(ctx, pool); err != nil { + t.Fatalf("migrate: %v", err) + } + store := NewStore(pool) + t1 := time.Date(2026, 10, 29, 13, 37, 38, 0, time.UTC) + t2 := t1.Add(3*time.Hour + 21*time.Minute) + t3 := t2.Add(2 * time.Second) + + library := func(owner string) LibraryMaintenance { + return LibraryMaintenance{Scope: "internal", OwnerJobID: owner, TargetIdentity: "scope=internal", + Level: "instance", State: "acquired", IngressState: "open", Services: []string{"app"}} + } + + // 1) 第一个作业开窗口。 + first, err := store.AcquireLibraryMaintenance(ctx, library("libbase-1"), t1) + if err != nil { + t.Fatalf("first acquire: %v", err) + } + if !first.AcquiredAt.Equal(t1) { + t.Fatalf("first acquired_at = %s, want %s", first.AcquiredAt, t1) + } + // 2) 同一作业重入(崩溃接管):时间保持第一次的,不能刷成"刚刚"。 + reentered, err := store.AcquireLibraryMaintenance(ctx, library("libbase-1"), t2) + if err != nil { + t.Fatalf("reenter: %v", err) + } + if !reentered.AcquiredAt.Equal(t1) { + t.Fatalf("reentry must keep the first acquired_at: got %s want %s", reentered.AcquiredAt, t1) + } + // 3) 释放后新作业接管:起始时间必须换成本次。 + if err := store.ReleaseLibraryMaintenance(ctx, "internal", "libbase-1", t2); err != nil { + t.Fatalf("release: %v", err) + } + second, err := store.AcquireLibraryMaintenance(ctx, library("librestore-1"), t3) + if err != nil { + t.Fatalf("second acquire: %v", err) + } + if !second.AcquiredAt.Equal(t3) { + t.Fatalf("new owner must reset acquired_at: got %s want %s", second.AcquiredAt, t3) + } + if second.ReleasedAt != nil { + t.Fatalf("takeover must clear released_at: %+v", second.ReleasedAt) + } + // 4) 仍持有期间别的作业一律拒绝(不能靠刷新时间绕过互斥)。 + if _, err := store.AcquireLibraryMaintenance(ctx, library("libsync-9"), t3); !errors.Is(err, ErrMaintenanceHeld) { + t.Fatalf("foreign acquire while held: err=%v", err) + } + + // 实例级是另一份 SQL:同样两条语义都要成立。 + t4 := t3.Add(time.Minute) + t5 := t4.Add(time.Hour) + t6 := t5.Add(time.Second) + instance := func(owner string) LibraryInstanceMaintenance { + return LibraryInstanceMaintenance{Instance: "kgseal-app", OwnerJobID: owner, OwnerScope: "internal", + TargetFingerprint: "fp", Level: "instance", Services: []string{"app"}, IngressState: "open", State: "acquired"} + } + if _, err := store.AcquireInstanceMaintenance(ctx, instance("libbase-1"), t4); err != nil { + t.Fatalf("instance first acquire: %v", err) + } + if again, err := store.AcquireInstanceMaintenance(ctx, instance("libbase-1"), t5); err != nil { + t.Fatalf("instance reenter: %v", err) + } else if !again.AcquiredAt.Equal(t4) { + t.Fatalf("instance reentry must keep acquired_at: got %s want %s", again.AcquiredAt, t4) + } + if err := store.ReleaseInstanceMaintenance(ctx, "kgseal-app", "libbase-1", t5); err != nil { + t.Fatalf("instance release: %v", err) + } + if taken, err := store.AcquireInstanceMaintenance(ctx, instance("librestore-1"), t6); err != nil { + t.Fatalf("instance second acquire: %v", err) + } else if !taken.AcquiredAt.Equal(t6) { + t.Fatalf("instance new owner must reset acquired_at: got %s want %s", taken.AcquiredAt, t6) + } + if _, err := store.AcquireInstanceMaintenance(ctx, instance("libsync-9"), t6); !errors.Is(err, ErrMaintenanceHeld) { + t.Fatalf("instance foreign acquire while held: err=%v", err) + } +}