被代理的 WeKnora 收到 SIGTERM 会先关监听再 exit(1),在途请求被切断。 排空改到真正的连接入口:闸门停止接客、等在途连接归零、写 drain.json 并 exit 0;协调器只认这条证据,写者退出码只作记录。 顺带修掉维护占用的一条死锁:释放后的窗口此前不能被新作业接管, 等于第一次同步之后谁也再进不去;持有中的窗口仍只允许原作业重入。
This commit is contained in:
@@ -72,7 +72,10 @@ ON CONFLICT (scope) DO UPDATE SET
|
||||
note = EXCLUDED.note,
|
||||
updated_at = EXCLUDED.updated_at,
|
||||
released_at = NULL
|
||||
WHERE library_maintenance.owner_job_id = EXCLUDED.owner_job_id
|
||||
-- 已经释放的窗口允许被新作业接管(否则第一个同步之后谁也再进不去);
|
||||
-- 仍在持有的窗口只允许原作业重入。
|
||||
WHERE library_maintenance.released_at IS NOT NULL
|
||||
OR library_maintenance.owner_job_id = EXCLUDED.owner_job_id
|
||||
RETURNING `+maintenanceColumns,
|
||||
item.Scope, item.OwnerJobID, item.TargetIdentity, level, item.TargetFingerprint, string(raw),
|
||||
ingress, item.State, item.OriginalServiceState, item.Note, now.UTC())
|
||||
|
||||
@@ -0,0 +1,73 @@
|
||||
package postgres
|
||||
|
||||
import (
|
||||
"context"
|
||||
"errors"
|
||||
"os"
|
||||
"testing"
|
||||
"time"
|
||||
|
||||
"github.com/jackc/pgx/v5/pgxpool"
|
||||
)
|
||||
|
||||
// 维护占用的生命周期必须只有一条规则:
|
||||
// - 正在持有的窗口只允许原作业重入,别的作业一律拒绝;
|
||||
// - 已经释放的窗口必须能被新作业接管,否则"第一次同步之后谁也再进不去"。
|
||||
func TestLibraryMaintenanceOwnershipAcrossRelease(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)
|
||||
now := time.Now().UTC()
|
||||
|
||||
first, err := store.AcquireLibraryMaintenance(ctx, LibraryMaintenance{
|
||||
Scope: "internal", OwnerJobID: "job-1", TargetIdentity: "instance=kgmaint",
|
||||
Level: "instance", TargetFingerprint: "fp", Services: []string{"app"},
|
||||
IngressState: "unknown", State: "acquired", OriginalServiceState: "app=running",
|
||||
Note: "test",
|
||||
}, now)
|
||||
if err != nil {
|
||||
t.Fatalf("first acquire: %v", err)
|
||||
}
|
||||
if first.Level != "instance" || len(first.Services) != 1 || first.Services[0] != "app" {
|
||||
t.Fatalf("acquired row lost identity: %+v", first)
|
||||
}
|
||||
|
||||
// 同一作业重入(接管)必须成功。
|
||||
if _, err := store.AcquireLibraryMaintenance(ctx, LibraryMaintenance{
|
||||
Scope: "internal", OwnerJobID: "job-1", State: "applying", Level: "instance",
|
||||
}, now.Add(time.Second)); err != nil {
|
||||
t.Fatalf("same owner re-entry rejected: %v", err)
|
||||
}
|
||||
// 另一个作业在持有期间必须被拒。
|
||||
if _, err := store.AcquireLibraryMaintenance(ctx, LibraryMaintenance{
|
||||
Scope: "internal", OwnerJobID: "job-2", State: "acquired", Level: "instance",
|
||||
}, now.Add(time.Second)); !errors.Is(err, ErrMaintenanceHeld) {
|
||||
t.Fatalf("second owner during hold: err=%v", err)
|
||||
}
|
||||
|
||||
if err := store.ReleaseLibraryMaintenance(ctx, "internal", "job-1", now.Add(2*time.Second)); err != nil {
|
||||
t.Fatalf("release: %v", err)
|
||||
}
|
||||
second, err := store.AcquireLibraryMaintenance(ctx, LibraryMaintenance{
|
||||
Scope: "internal", OwnerJobID: "job-2", TargetIdentity: "instance=kgmaint",
|
||||
Level: "instance", TargetFingerprint: "fp2", Services: []string{"app"},
|
||||
IngressState: "unknown", State: "acquired", Note: "second",
|
||||
}, now.Add(3*time.Second))
|
||||
if err != nil {
|
||||
t.Fatalf("acquire after release: %v", err)
|
||||
}
|
||||
if second.OwnerJobID != "job-2" || second.ReleasedAt != nil || second.TargetFingerprint != "fp2" {
|
||||
t.Fatalf("released window not re-acquired cleanly: %+v", second)
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user