gian/incus-mirror
1
0
Fork 0
mirror of https://github.com/lxc/incus synced 2026-08-02 05:26:46 +00:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

incus/client: Fix panic when cancelling

Browse Source 
Closes #3471

Signed-off-by: Stéphane Graber <stgraber@stgraber.org>
This commit is contained in:
Stéphane Graber 2026-06-09 15:36:10 -04:00
parent 489d2b6694
commit 1793e43589
No known key found for this signature in database
GPG Key ID: C638974D64792D67
1 changed files with 26 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
client/operations.go
View File

@ -22,7 +22,15 @@ type operation struct {
handlerLock sync.Mutex
skipListener bool
chActive chan bool
chActive chan bool
chActiveOnce sync.Once
}
// closeChActive closes the chActive channel exactly once.
func (op *operation) closeChActive() {
op.chActiveOnce.Do(func() {
close(op.chActive)
})
}
// AddHandler adds a function to be called whenever an event is received.
@ -162,6 +170,18 @@ func (op *operation) WaitContext(ctx context.Context) error {
select {
case <-ctx.Done():
// Tear down the listener, cancel the server-side operation and unblock the monitor.
op.handlerLock.Lock()
if op.listener != nil {
op.listener.Disconnect()
op.listener = nil
}
op.handlerLock.Unlock()
_ = op.Cancel()
op.closeChActive()
return ctx.Err()
case <-op.chActive:
}
@ -231,14 +251,14 @@ func (op *operation) setupListener() error {
if op.StatusCode.IsFinal() {
op.listener.Disconnect()
op.listener = nil
close(op.chActive)
op.closeChActive()
return
}
})
if err != nil {
op.listener.Disconnect()
op.listener = nil
close(op.chActive)
op.closeChActive()
close(chReady)
return err
@ -266,7 +286,7 @@ func (op *operation) setupListener() error {
op.handlerLock.Lock()
if op.listener != nil {
op.Err = listener.err.Error()
close(op.chActive)
op.closeChActive()
}
op.handlerLock.Unlock()
@ -280,7 +300,7 @@ func (op *operation) setupListener() error {
if err != nil {
op.listener.Disconnect()
op.listener = nil
close(op.chActive)
op.closeChActive()
close(chReady)
return err
@ -290,7 +310,7 @@ func (op *operation) setupListener() error {
if op.StatusCode.IsFinal() {
op.listener.Disconnect()
op.listener = nil
close(op.chActive)
op.closeChActive()
close(chReady)
if op.Err != "" {