Compare commits

...

2 Commits

Author SHA1 Message Date
d3151795f1 补充部署锁冲突事务回归测试
覆盖无锁持有和部分锁持有两种冲突场景,验证事务最终状态、已有锁保护以及本次锁清理。
2026-10-01 13:09:11 +08:00
1fad8db453 修复部署锁获取失败事务终态
锁获取、锁归属写入或锁阶段持久化失败时,主动释放已取得的锁并写入 rolled_back 或 recovery_required,避免部署事务永久停留在 pending。
2026-10-01 13:05:13 +08:00
2 changed files with 89 additions and 15 deletions

View File

@ -239,21 +239,6 @@ func (s *Service) deployOne(ctx context.Context, server Server, artifact Artifac
releaseLocks()
}
}()
for _, lockPath := range lockPaths {
if err := client.Lock(ctx, lockPath); err != nil {
result.FailureCode = FailureLock
result.Message = fmt.Sprintf("无法取得部署锁 %s,可能存在并发部署或遗留锁;未修改当前证书,请人工核查:%v", lockPath, err)
return result
}
heldLocks = append(heldLocks, lockPath)
if transactionEnabled {
if err := client.(EvidenceClient).CreateOwnedLock(ctx, lockPath, journalRecord.Evidence.LockToken); err != nil {
result.FailureCode = FailureUnavailable
result.Message = fmt.Sprintf("保存部署锁归属失败:%v", err)
return result
}
}
}
persistTransaction := func(persistContext context.Context, phase string) error {
if !transactionEnabled {
return nil
@ -272,9 +257,36 @@ func (s *Service) deployOne(ctx context.Context, server Server, artifact Artifac
result.Message += fmt.Sprintf(";保存部署事务最终状态失败:%v", err)
}
}
finalizeLockAcquisitionFailure := func() {
releaseLocks()
status := TransactionStatusRolledBack
if len(heldLocks) > 0 || result.FailureCode == FailureLockRelease {
retainLocks = true
status = TransactionStatusRecoveryRequired
}
finishTransaction(status, result.Message)
}
for _, lockPath := range lockPaths {
if err := client.Lock(ctx, lockPath); err != nil {
result.FailureCode = FailureLock
result.Message = fmt.Sprintf("无法取得部署锁 %s,可能存在并发部署或遗留锁;未修改当前证书,请人工核查:%v", lockPath, err)
finalizeLockAcquisitionFailure()
return result
}
heldLocks = append(heldLocks, lockPath)
if transactionEnabled {
if err := client.(EvidenceClient).CreateOwnedLock(ctx, lockPath, journalRecord.Evidence.LockToken); err != nil {
result.FailureCode = FailureUnavailable
result.Message = fmt.Sprintf("保存部署锁归属失败:%v", err)
finalizeLockAcquisitionFailure()
return result
}
}
}
if err := persistTransaction(ctx, TransactionPhaseLocked); err != nil {
result.FailureCode = FailureUnavailable
result.Message = fmt.Sprintf("保存部署锁阶段失败:%v", err)
finalizeLockAcquisitionFailure()
return result
}
backups := make([]backupFile, 0, len(paths))

View File

@ -109,3 +109,65 @@ func TestRecoverPendingKeepsUnprovableState(t *testing.T) {
t.Fatalf("未记录人工核查状态:%+v", journal.updated)
}
}
func TestDeployLockConflictFinalizesTransaction(t *testing.T) {
server := testServer("lock-conflict").Normalize()
client := newMemoryClient()
blockedLock := server.CertificatePath + ".scert-lock"
client.files[blockedLock] = memoryFile{}
journal := &memoryTransactionJournal{}
service := NewServiceWithJournal(memoryFactory{clients: map[string]*memoryClient{server.ID: client}}, journal)
ctx := WithTransactionContext(t.Context(), TransactionContext{TaskID: "task", AttemptID: "attempt", AttemptNumber: 1})
report := service.Deploy(ctx, []Target{{Server: server}}, testArtifact(t))
if report.Status != "failed" || len(report.Results) != 1 || report.Results[0].FailureCode != FailureLock {
t.Fatalf("锁冲突应失败:%+v", report)
}
if len(journal.finished) != 1 || journal.finished[0].status != TransactionStatusRolledBack {
t.Fatalf("锁冲突后必须完成回滚事务:%+v", journal.finished)
}
if _, ok := client.files[blockedLock]; !ok {
t.Fatal("已有锁不能被清理")
}
for _, path := range []string{server.CertificatePath, server.CertificateChainPath, server.PrivateKeyPath} {
lockPath := path + ".scert-lock"
if lockPath != blockedLock {
if _, ok := client.files[lockPath]; ok {
t.Fatalf("锁冲突失败后不应残留本次锁:%s", lockPath)
}
}
}
}
func TestDeployPartialLockConflictReleasesOwnedLocks(t *testing.T) {
server := testServer("partial-lock-conflict").Normalize()
client := newMemoryClient()
blockedLock := server.PrivateKeyPath + ".scert-lock"
client.files[blockedLock] = memoryFile{}
journal := &memoryTransactionJournal{}
service := NewServiceWithJournal(memoryFactory{clients: map[string]*memoryClient{server.ID: client}}, journal)
ctx := WithTransactionContext(t.Context(), TransactionContext{TaskID: "task", AttemptID: "attempt", AttemptNumber: 1})
report := service.Deploy(ctx, []Target{{Server: server}}, testArtifact(t))
if report.Status != "failed" || len(report.Results) != 1 || report.Results[0].FailureCode != FailureLock {
t.Fatalf("部分锁冲突应失败:%+v", report)
}
if len(journal.finished) != 1 || journal.finished[0].status != TransactionStatusRolledBack {
t.Fatalf("部分锁冲突后必须完成回滚事务:%+v", journal.finished)
}
if _, ok := client.files[blockedLock]; !ok {
t.Fatal("已有锁不能被清理")
}
for _, path := range []string{server.CertificatePath, server.CertificateChainPath, server.PrivateKeyPath} {
lockPath := path + ".scert-lock"
if lockPath == blockedLock {
continue
}
if _, ok := client.files[lockPath]; ok {
t.Fatalf("部分锁冲突失败后不应残留本次锁:%s", lockPath)
}
if _, ok := client.files[lockPath+"/owner"]; ok {
t.Fatalf("部分锁冲突失败后不应残留锁归属:%s", lockPath)
}
}
}