security/hakurei
security/hakurei
6
3
Fork 0
Code Issues 6 Pull Requests Actions Packages Projects Releases 7 Wiki Activity

internal/outcome/process: nil-safe unlock when failing to lock
All checks were successful
Test / Create distribution (push) Successful in 32s
Details
Test / Hpkg (push) Successful in 4m13s
Details
Test / Sandbox (push) Successful in 2m10s
Details
Test / Hakurei (push) Successful in 3m9s
Details
Test / Sandbox (race detector) (push) Successful in 4m7s
Details
Test / Hakurei (race detector) (push) Successful in 4m57s
Details
Test / Flake checks (push) Successful in 1m26s
Details

Browse Source 
This also prints a debug message which might be useful.

Signed-off-by: Ophestra <cat@gensokyo.uk>
This commit is contained in:
Ophestra 2025-11-02 11:47:51 +09:00
parent e7161f8e61
commit f5274067f6
Signed by: cat
SSH Key Fingerprint: SHA256:gQ67O0enBZ7UdZypgtspB2FDM1g3GVw8nX0XSdcFw8Q
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
internal/outcome/process.go
View File

@ -4,7 +4,6 @@ import (
"context" "context"
"encoding/gob" "encoding/gob"
"errors" "errors"
"iter"
"math" "math"
"os" "os"
"os/exec" "os/exec"
@ -237,13 +236,15 @@ func (k *outcome) main(msg message.Msg) {
// this state transition to processFinal only // this state transition to processFinal only
processState = processFinal processState = processFinal
unlock, err := handle.Lock() unlock := func() { msg.Verbose("skipping unlock as lock was not successfully acquired") }
if err != nil { if f, err := handle.Lock(); err != nil {
perror(err, "acquire lock on store segment") perror(err, "acquire lock on store segment")
} else {
unlock = f
} }
if entryHandle != nil { if entryHandle != nil {
if err = entryHandle.Destroy(); err != nil { if err := entryHandle.Destroy(); err != nil {
perror(err, "destroy state entry") perror(err, "destroy state entry")
} }
} }
@ -251,8 +252,7 @@ func (k *outcome) main(msg message.Msg) {
if isBeforeRevert { if isBeforeRevert {
ec := system.Process ec := system.Process
var entries iter.Seq[*store.EntryHandle] if entries, _, err := handle.Entries(); err != nil {
if entries, _, err = handle.Entries(); err != nil {
// it is impossible to continue from this point, // it is impossible to continue from this point,
// per-process state will be reverted to limit damage // per-process state will be reverted to limit damage
perror(err, "read store segment entries") perror(err, "read store segment entries")
@ -287,7 +287,7 @@ func (k *outcome) main(msg message.Msg) {
} }
} }
if err = k.sys.Revert((*system.Criteria)(&ec)); err != nil { if err := k.sys.Revert((*system.Criteria)(&ec)); err != nil {
var joinError interface { var joinError interface {
Unwrap() []error Unwrap() []error
error error