修复部署锁获取失败事务终态
锁获取、锁归属写入或锁阶段持久化失败时,主动释放已取得的锁并写入 rolled_back 或 recovery_required,避免部署事务永久停留在 pending。
This commit is contained in:
parent
aed2e5a6a6
commit
1fad8db453
@ -239,21 +239,6 @@ func (s *Service) deployOne(ctx context.Context, server Server, artifact Artifac
|
|||||||
releaseLocks()
|
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 {
|
persistTransaction := func(persistContext context.Context, phase string) error {
|
||||||
if !transactionEnabled {
|
if !transactionEnabled {
|
||||||
return nil
|
return nil
|
||||||
@ -272,9 +257,36 @@ func (s *Service) deployOne(ctx context.Context, server Server, artifact Artifac
|
|||||||
result.Message += fmt.Sprintf(";保存部署事务最终状态失败:%v", err)
|
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 {
|
if err := persistTransaction(ctx, TransactionPhaseLocked); err != nil {
|
||||||
result.FailureCode = FailureUnavailable
|
result.FailureCode = FailureUnavailable
|
||||||
result.Message = fmt.Sprintf("保存部署锁阶段失败:%v", err)
|
result.Message = fmt.Sprintf("保存部署锁阶段失败:%v", err)
|
||||||
|
finalizeLockAcquisitionFailure()
|
||||||
return result
|
return result
|
||||||
}
|
}
|
||||||
backups := make([]backupFile, 0, len(paths))
|
backups := make([]backupFile, 0, len(paths))
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user