alihan/fn-serverless
1
0
Fork 0
mirror of https://github.com/fnproject/fn.git synced 2022-10-28 21:29:17 +03:00
Code Issues Packages Projects Releases Wiki Activity

fn: cancellations in WaitAsyncResource (#694)

Browse Source 
* fn: cancellations in WaitAsyncResource

Added go context with cancel to wait async resource. Although
today, the only case for cancellation is shutdown, this cleans
up agent shutdown a little bit.

* fn: locked broadcast to avoid missed wake-ups

* fn: removed ctx arg to WaitAsyncResource and startDequeuer

This is confusing and unnecessary.
This commit is contained in:
Tolga Ceylan
2018-01-17 16:08:54 -08:00
committed by GitHub
parent 7c74c2fe88
commit 5a7778a656
6 changed files with 41 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
api/agent/slots_test.go
View File

@@ -47,7 +47,7 @@ func TestSlotQueueBasic1(t *testing.T) {
obj := NewSlotQueue(slotName)
outChan, cancel := obj.startDequeuer(context.Background())
outChan, cancel := obj.startDequeuer()
select {
case z := <-outChan:
t.Fatalf("Should not get anything from queue: %#v", z)
@@ -92,7 +92,7 @@ func TestSlotQueueBasic1(t *testing.T) {
t.Fatalf("Shouldn't be able to eject slotToken: %#v", tokens[5])
}
outChan, cancel = obj.startDequeuer(context.Background())
outChan, cancel = obj.startDequeuer()
// now we should get 8
select {
@@ -162,7 +162,7 @@ func TestSlotQueueBasic2(t *testing.T) {
t.Fatalf("Should be idle")
}
outChan, cancel := obj.startDequeuer(context.Background())
outChan, cancel := obj.startDequeuer()
select {
case z := <-outChan:
t.Fatalf("Should not get anything from queue: %#v", z)
@@ -248,7 +248,7 @@ func TestSlotQueueBasic3(t *testing.T) {
slotName := "test3"
obj := NewSlotQueue(slotName)
_, cancel1 := obj.startDequeuer(context.Background())
_, cancel1 := obj.startDequeuer()
slot1 := NewTestSlot(1)
slot2 := NewTestSlot(2)
@@ -259,7 +259,7 @@ func TestSlotQueueBasic3(t *testing.T) {
// to cause a requeue. This should cause [1, 2] ordering to [2, 1]
cancel1()
outChan, cancel2 := obj.startDequeuer(context.Background())
outChan, cancel2 := obj.startDequeuer()
// we should get '2' since cancel1() reordered the queue
select {
@@ -303,7 +303,7 @@ func TestSlotQueueBasic3(t *testing.T) {
wg.Add(goMax)
for i := 0; i < goMax; i += 1 {
go func(id int) {
ch, cancl := obj.startDequeuer(context.Background())
ch, cancl := obj.startDequeuer()
defer cancl()
defer wg.Done()