readdb: fix deadlock in Run method
In runservice readdb Run method we could end with a deadlock if two of the goroutines that call HandleEvents.* try to write to the errCh at the same time before the errCh is read. If this happens one of the two will be blocked on writing to the channel but the read won't happen since it'll blocked by wg.Wait(). Fix this doing: * use a buffered channel large as the number of executed goroutines. * create a new errCh at every loop (so we'll ignore later errors after the first one) Note: we could also use a non blocking send to avoid this situation but we should also start the wg.Wait before the goroutines or earlier errors could be lost causing another kind of hang.
This commit is contained in:
parent
ea3e0d1d7c
commit
85876310af
|
@ -424,7 +424,6 @@ func (r *ReadDB) Run(ctx context.Context) error {
|
|||
}
|
||||
r.SetInitialized(true)
|
||||
|
||||
errCh := make(chan error)
|
||||
for {
|
||||
for {
|
||||
initialized := r.IsInitialized()
|
||||
|
@ -441,6 +440,7 @@ func (r *ReadDB) Run(ctx context.Context) error {
|
|||
time.Sleep(1 * time.Second)
|
||||
}
|
||||
|
||||
errCh := make(chan error, 1)
|
||||
ctx, cancel := context.WithCancel(ctx)
|
||||
wg := &sync.WaitGroup{}
|
||||
|
||||
|
|
|
@ -274,7 +274,6 @@ func (r *ReadDB) Run(ctx context.Context) error {
|
|||
}
|
||||
r.SetInitialized(true)
|
||||
|
||||
errCh := make(chan error)
|
||||
for {
|
||||
for {
|
||||
initialized := r.IsInitialized()
|
||||
|
@ -291,6 +290,7 @@ func (r *ReadDB) Run(ctx context.Context) error {
|
|||
time.Sleep(1 * time.Second)
|
||||
}
|
||||
|
||||
errCh := make(chan error, 2)
|
||||
ctx, cancel := context.WithCancel(ctx)
|
||||
wg := &sync.WaitGroup{}
|
||||
|
||||
|
|
Loading…
Reference in New Issue