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

add error to call model (#539)

Browse Source 
* add error to call model

closes #331

previously, for async this error was being masked completely even if it was
something useful like the image not existing. for sync, the error was returned
in the http request but now it's also being stored. this error itself can
cover a lot of landscape, it could be an error in getting a slot, pulling an
image, running a container, among other things. anyway, no longer being
masked. we can likely improve it in certain cases we run into in the future,
but it's open ended at the moment and not being masked like some errors in
sync http request returns (503 non-models.APIError) for now.

* tucks in callTrigger stuff to keep api clean
* adds swagger
* adds migration
* adds tests for datastore and agent to ensure behavior

* pull images before tests are ran

* gofmt migrations file
This commit is contained in:
Reed Allman
2017-11-28 11:21:39 -06:00
committed by GitHub
parent 10e17b1c4d
commit 892c843d87
11 changed files with 178 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
api/agent/call.go
View File

@@ -30,13 +30,13 @@ type Call interface {
// etc.
// TODO Start and End can likely be unexported as they are only used in the agent,
// and on a type which is constructed in a specific agent. meh.
Start(ctx context.Context, t callTrigger) error
Start(ctx context.Context) error
// End will be called immediately after attempting a call execution,
// regardless of whether the execution failed or not. An error will be passed
// to End, which if nil indicates a successful execution. Any error returned
// from End will be returned as the error from Submit.
End(ctx context.Context, err error, t callTrigger) error
End(ctx context.Context, err error) error
}
// TODO build w/o closures... lazy
@@ -251,6 +251,7 @@ func (a *agent) GetCall(opts ...CallOpt) (Call, error) {
c.ds = a.ds
c.ls = a.ls
c.mq = a.mq
c.ct = a
ctx, _ := common.LoggerWithFields(c.req.Context(),
logrus.Fields{"id": c.ID, "app": c.AppName, "route": c.Path})
@@ -277,11 +278,12 @@ type call struct {
w io.Writer
req *http.Request
stderr io.ReadWriteCloser
ct callTrigger
}
func (c *call) Model() *models.Call { return c.Call }
func (c *call) Start(ctx context.Context, t callTrigger) error {
func (c *call) Start(ctx context.Context) error {
span, ctx := opentracing.StartSpanFromContext(ctx, "agent_call_start")
defer span.Finish()
@@ -320,7 +322,7 @@ func (c *call) Start(ctx context.Context, t callTrigger) error {
}
}
err := t.fireBeforeCall(ctx, c.Model())
err := c.ct.fireBeforeCall(ctx, c.Model())
if err != nil {
return fmt.Errorf("BeforeCall: %v", err)
}
@@ -328,7 +330,7 @@ func (c *call) Start(ctx context.Context, t callTrigger) error {
return nil
}
func (c *call) End(ctx context.Context, errIn error, t callTrigger) error {
func (c *call) End(ctx context.Context, errIn error) error {
span, ctx := opentracing.StartSpanFromContext(ctx, "agent_call_end")
defer span.Finish()
@@ -340,8 +342,8 @@ func (c *call) End(ctx context.Context, errIn error, t callTrigger) error {
case context.DeadlineExceeded:
c.Status = "timeout"
default:
// XXX (reed): should we append the error to logs? Error field? (TR) yes, think so, otherwise it's lost looks like?
c.Status = "error"
c.Error = errIn.Error()
}
if c.Type == models.TypeAsync {
@@ -366,11 +368,12 @@ func (c *call) End(ctx context.Context, errIn error, t callTrigger) error {
// NOTE call this after InsertLog or the buffer will get reset
c.stderr.Close()
err := t.fireAfterCall(ctx, c.Model())
if err != nil {
if err := c.ct.fireAfterCall(ctx, c.Model()); err != nil {
return fmt.Errorf("AfterCall: %v", err)
}
return errIn
return errIn // original error, important for use in sync call returns
}
func toEnvName(envtype, name string) string {