git724/forgejo
1
0
Fork 0
Code Issues Pull requests 3 Projects 1 Releases Packages Wiki Activity

Fix Workerpool deadlock (#10283)

Browse source 
* Prevent deadlock on boost

* Force a boost in testchannelqueue
This commit is contained in:
zeripath 2020-02-15 18:44:58 +00:00 • committed by GitHub
commit 88986746d5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

7
modules/queue/queue_channel_test.go
View file

@ -26,16 +26,19 @@ func TestChannelQueue(t *testing.T) {
queue, err := NewChannelQueue(handle, queue, err := NewChannelQueue(handle,
ChannelQueueConfiguration{ ChannelQueueConfiguration{
WorkerPoolConfiguration: WorkerPoolConfiguration{ WorkerPoolConfiguration: WorkerPoolConfiguration{
QueueLength: 20, QueueLength: 0,
MaxWorkers: 10, MaxWorkers: 10,
BlockTimeout: 1 * time.Second, BlockTimeout: 1 * time.Second,
BoostTimeout: 5 * time.Minute, BoostTimeout: 5 * time.Minute,
BoostWorkers: 5, BoostWorkers: 5,
}, },
Workers: 1, Workers: 0,
Name: "TestChannelQueue",
}, &testData{}) }, &testData{})
assert.NoError(t, err) assert.NoError(t, err)
assert.Equal(t, queue.(*ChannelQueue).WorkerPool.boostWorkers, 5)
go queue.Run(nilFn, nilFn) go queue.Run(nilFn, nilFn)
test1 := testData{"A", 1} test1 := testData{"A", 1}

2
modules/queue/workerpool.go
View file

@ -132,8 +132,8 @@ func (p *WorkerPool) pushBoost(data Data) {
p.blockTimeout /= 2 p.blockTimeout /= 2
p.lock.Unlock() p.lock.Unlock()
}() }()
p.addWorkers(ctx, boost)
p.lock.Unlock() p.lock.Unlock()
p.addWorkers(ctx, boost)
p.dataChan <- data p.dataChan <- data
} }
} }