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

plumb ctx for container removal spanno (#750)

Browse Source 
these were just dangling off on the side, took some plumbing work but not so
bad
This commit is contained in:
Reed Allman
2018-02-08 22:48:23 -08:00
committed by Tolga Ceylan
parent c36c627b93
commit 27179ddf54
3 changed files with 24 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
api/agent/agent.go
View File

@@ -248,7 +248,7 @@ func (a *agent) submit(ctx context.Context, call *call) error {
return transformTimeout(err, true)
}
defer slot.Close() // notify our slot is free once we're done
defer slot.Close(ctx) // notify our slot is free once we're done
err = call.Start(ctx)
if err != nil {
@@ -447,7 +447,7 @@ func (a *agent) waitHot(ctx context.Context, call *call) (Slot, error) {
case s := <-ch:
if s.acquireSlot() {
if s.slot.Error() != nil {
s.slot.Close()
s.slot.Close(ctx)
return nil, s.slot.Error()
}
return s.slot, nil
@@ -493,7 +493,7 @@ func (a *agent) launchCold(ctx context.Context, call *call) (Slot, error) {
select {
case s := <-ch:
if s.Error() != nil {
s.Close()
s.Close(ctx)
return nil, s.Error()
}
return s, nil
@@ -537,11 +537,13 @@ func (s *coldSlot) exec(ctx context.Context, call *call) error {
return ctx.Err()
}
func (s *coldSlot) Close() error {
func (s *coldSlot) Close(ctx context.Context) error {
if s.cookie != nil {
// call this from here so that in exec we don't have to eat container
// removal latency
s.cookie.Close(context.Background()) // ensure container removal, separate ctx
// NOTE ensure container removal, no ctx timeout
ctx = opentracing.ContextWithSpan(context.Background(), opentracing.SpanFromContext(ctx))
s.cookie.Close(ctx)
}
if s.tok != nil {
s.tok.Close()
@@ -557,7 +559,7 @@ type hotSlot struct {
err error
}
func (s *hotSlot) Close() error {
func (s *hotSlot) Close(ctx context.Context) error {
close(s.done)
return nil
}
@@ -643,7 +645,7 @@ func (a *agent) prepCold(ctx context.Context, call *call, tok ResourceToken, ch
select {
case ch <- slot:
case <-ctx.Done():
slot.Close()
slot.Close(ctx)
}
}
@@ -689,7 +691,7 @@ func (a *agent) runHot(ctx context.Context, call *call, tok ResourceToken, state
call.slots.queueSlot(&hotSlot{done: make(chan struct{}), err: err})
return
}
defer cookie.Close(context.Background()) // ensure container removal, separate ctx
defer cookie.Close(ctx) // NOTE ensure this ctx doesn't time out
waiter, err := cookie.Run(ctx)
if err != nil {
@@ -768,7 +770,7 @@ func (a *agent) runHot(ctx context.Context, call *call, tok ResourceToken, state
// if we can eject token, that means we are here due to
// abort/shutdown/timeout, attempt to eject and terminate,
// otherwise continue processing the request
if call.slots.ejectSlot(s) {
if call.slots.ejectSlot(ctx, s) {
return
}