cmd/mbf: close on cancel completion
All checks were successful
Test / Create distribution (push) Successful in 1m3s
Test / Sandbox (push) Successful in 2m55s
Test / Hakurei (push) Successful in 3m52s
Test / ShareFS (push) Successful in 3m57s
Test / Sandbox (race detector) (push) Successful in 5m20s
Test / Hakurei (race detector) (push) Successful in 6m29s
Test / Flake checks (push) Successful in 1m21s
All checks were successful
Test / Create distribution (push) Successful in 1m3s
Test / Sandbox (push) Successful in 2m55s
Test / Hakurei (push) Successful in 3m52s
Test / ShareFS (push) Successful in 3m57s
Test / Sandbox (race detector) (push) Successful in 5m20s
Test / Hakurei (race detector) (push) Successful in 6m29s
Test / Flake checks (push) Successful in 1m21s
Like the previous change, this enables synchronisation on the client side via epoll. Signed-off-by: Ophestra <cat@gensokyo.uk>
This commit is contained in:
@@ -99,10 +99,9 @@ func cancelIdent(
|
|||||||
var ident pkg.ID
|
var ident pkg.ID
|
||||||
if _, err := io.ReadFull(conn, ident[:]); err != nil {
|
if _, err := io.ReadFull(conn, ident[:]); err != nil {
|
||||||
return nil, false, errors.Join(err, conn.Close())
|
return nil, false, errors.Join(err, conn.Close())
|
||||||
} else if err = conn.Close(); err != nil {
|
|
||||||
return nil, false, err
|
|
||||||
}
|
}
|
||||||
return &ident, cache.Cancel(unique.Make(ident)), nil
|
ok := cache.Cancel(unique.Make(ident))
|
||||||
|
return &ident, ok, conn.Close()
|
||||||
}
|
}
|
||||||
|
|
||||||
// serve services connections from a [net.UnixListener].
|
// serve services connections from a [net.UnixListener].
|
||||||
@@ -324,7 +323,10 @@ func cancelRemote(
|
|||||||
} else if n != len(id) {
|
} else if n != len(id) {
|
||||||
return errors.Join(io.ErrShortWrite, conn.Close())
|
return errors.Join(io.ErrShortWrite, conn.Close())
|
||||||
}
|
}
|
||||||
return conn.Close()
|
if _, err = conn.Read(make([]byte, 1)); err == io.EOF {
|
||||||
|
err = nil
|
||||||
|
}
|
||||||
|
return errors.Join(err, conn.Close())
|
||||||
}
|
}
|
||||||
|
|
||||||
// abortRemote aborts all [pkg.Artifact] curing on a daemon.
|
// abortRemote aborts all [pkg.Artifact] curing on a daemon.
|
||||||
|
|||||||
Reference in New Issue
Block a user