Fix Workerpool deadlock (#10283)

* Prevent deadlock on boost * Force a boost in testchannelqueue
go-gitea · Feb 15, 2020 · 8898674 · 8898674
1 parent 15614a8
commit 8898674
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/modules/queue/queue_channel_test.go b/modules/queue/queue_channel_test.go
@@ -26,16 +26,19 @@ func TestChannelQueue(t *testing.T) {
 	queue, err := NewChannelQueue(handle,
 		ChannelQueueConfiguration{
 			WorkerPoolConfiguration: WorkerPoolConfiguration{
-				QueueLength:  20,
+				QueueLength:  0,
 				MaxWorkers:   10,
 				BlockTimeout: 1 * time.Second,
 				BoostTimeout: 5 * time.Minute,
 				BoostWorkers: 5,
 			},
-			Workers: 1,
+			Workers: 0,
+			Name:    "TestChannelQueue",
 		}, &testData{})
 	assert.NoError(t, err)
 
+	assert.Equal(t, queue.(*ChannelQueue).WorkerPool.boostWorkers, 5)
+
 	go queue.Run(nilFn, nilFn)
 
 	test1 := testData{"A", 1}

diff --git a/modules/queue/workerpool.go b/modules/queue/workerpool.go
@@ -132,8 +132,8 @@ func (p *WorkerPool) pushBoost(data Data) {
 				p.blockTimeout /= 2
 				p.lock.Unlock()
 			}()
-			p.addWorkers(ctx, boost)
 			p.lock.Unlock()
+			p.addWorkers(ctx, boost)
 			p.dataChan <- data
 		}
 	}