lourenco/mgmt
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

etcd: Workaround possible rare deadlock

Browse Source 
This code is terrible, but maybe this is good enough for now.
This commit is contained in:
James Shubin
2025-03-11 03:51:05 -04:00
parent 17b859d0d7
commit 1cb9648b08
1 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
etcd/client/simple.go
View File

@@ -462,6 +462,9 @@ func (obj *Simple) ComplexWatcher(ctx context.Context, path string, opts ...etcd
select { // send the error select { // send the error
case eventsChan <- data: case eventsChan <- data:
case <-ctx.Done(): case <-ctx.Done():
if count > 0 { // XXX: hack
wg.Done()
}
return return
} }
continue // channel should close shortly continue // channel should close shortly
@@ -481,6 +484,9 @@ func (obj *Simple) ComplexWatcher(ctx context.Context, path string, opts ...etcd
select { // send the event select { // send the event
case eventsChan <- data: case eventsChan <- data:
case <-ctx.Done(): case <-ctx.Done():
if count > 0 { // XXX: hack
wg.Done()
}
return return
} }
} }