mirror of
https://github.com/fnproject/fn.git
synced 2022-10-28 21:29:17 +03:00
* functions: add bounded concurrency * functions: plug runners to sync and async interfaces * functions: update documentation about the new env var * functions: fix test flakiness * functions: the runner is self-regulated, no need to set a number of runners * functions: push the execution to the background on incoming requests * functions: ensure async tasks are always on * functions: add prioritization to tasks consumption Ensure that Sync tasks are consumed before Async tasks. Also, fixes termination races problems for free. * functions: remove stale comments * functions: improve mem availability calculation * functions: parallel run for async tasks * functions: check for memory availability before pulling async task * functions: comment about rnr.hasAvailableMemory and sync.Cond * functions: implement memory check for async runners using Cond vars * functions: code grooming - remove unnecessary goroutines - fix stale docs - reorganize import group * Revert "functions: implement memory check for async runners using Cond vars" This reverts commit 922e64032201a177c03ce6a46240925e3d35430d. * Revert "functions: comment about rnr.hasAvailableMemory and sync.Cond" This reverts commit 49ad7d52d341f12da9603b1a1df9d145871f0e0a. * functions: set a minimum memory availability for sync * functions: simplify the implementation by removing the priority queue * functions: code grooming - code deduplication - review waitgroups Waits
111 lines
3.2 KiB
Go
111 lines
3.2 KiB
Go
package server
|
|
|
|
import (
|
|
"bytes"
|
|
"context"
|
|
"fmt"
|
|
"net/http"
|
|
"sync"
|
|
"testing"
|
|
|
|
"github.com/gin-gonic/gin"
|
|
"github.com/iron-io/functions/api/datastore"
|
|
"github.com/iron-io/functions/api/models"
|
|
"github.com/iron-io/functions/api/mqs"
|
|
"github.com/iron-io/runner/common"
|
|
)
|
|
|
|
func testRouterAsync(s *Server, enqueueFunc models.Enqueue) *gin.Engine {
|
|
r := s.Router
|
|
r.Use(gin.Logger())
|
|
ctx := context.Background()
|
|
r.Use(func(c *gin.Context) {
|
|
ctx, _ := common.LoggerWithFields(ctx, extractFields(c))
|
|
c.Set("ctx", ctx)
|
|
c.Next()
|
|
})
|
|
s.bindHandlers()
|
|
return r
|
|
}
|
|
|
|
func TestRouteRunnerAsyncExecution(t *testing.T) {
|
|
t.Skip()
|
|
tasks := mockTasksConduit()
|
|
|
|
// todo: I broke how this test works trying to clean up the code a bit. Is there a better way to do this test rather than having to override the default route behavior?
|
|
s := New(&datastore.Mock{
|
|
FakeApps: []*models.App{
|
|
{Name: "myapp", Config: map[string]string{"app": "true"}},
|
|
},
|
|
FakeRoutes: []*models.Route{
|
|
{Type: "async", Path: "/myroute", AppName: "myapp", Image: "iron/hello", Config: map[string]string{"test": "true"}},
|
|
{Type: "async", Path: "/myerror", AppName: "myapp", Image: "iron/error", Config: map[string]string{"test": "true"}},
|
|
{Type: "async", Path: "/myroute/:param", AppName: "myapp", Image: "iron/hello", Config: map[string]string{"test": "true"}},
|
|
},
|
|
}, &mqs.Mock{}, testRunner(t), tasks)
|
|
|
|
for i, test := range []struct {
|
|
path string
|
|
body string
|
|
headers map[string][]string
|
|
expectedCode int
|
|
expectedEnv map[string]string
|
|
}{
|
|
{"/r/myapp/myroute", ``, map[string][]string{}, http.StatusOK, map[string]string{"TEST": "true", "APP": "true"}},
|
|
{
|
|
"/r/myapp/myroute/1",
|
|
``,
|
|
map[string][]string{"X-Function": []string{"test"}},
|
|
http.StatusOK,
|
|
map[string]string{
|
|
"TEST": "true",
|
|
"APP": "true",
|
|
"PARAM_PARAM": "1",
|
|
"HEADER_X_FUNCTION": "test",
|
|
},
|
|
},
|
|
{"/r/myapp/myerror", ``, map[string][]string{}, http.StatusOK, map[string]string{"TEST": "true", "APP": "true"}},
|
|
{"/r/myapp/myroute", `{ "name": "test" }`, map[string][]string{}, http.StatusOK, map[string]string{"TEST": "true", "APP": "true"}},
|
|
} {
|
|
body := bytes.NewBuffer([]byte(test.body))
|
|
|
|
var wg sync.WaitGroup
|
|
|
|
wg.Add(1)
|
|
fmt.Println("About to start router")
|
|
router := testRouterAsync(s, func(task *models.Task) (*models.Task, error) {
|
|
if test.body != task.Payload {
|
|
t.Errorf("Test %d: Expected task Payload to be the same as the test body", i)
|
|
}
|
|
|
|
if test.expectedEnv != nil {
|
|
for name, value := range test.expectedEnv {
|
|
if value != task.EnvVars[name] {
|
|
t.Errorf("Test %d: Expected header `%s` to be `%s` but was `%s`",
|
|
i, name, value, task.EnvVars[name])
|
|
}
|
|
}
|
|
}
|
|
|
|
wg.Done()
|
|
return task, nil
|
|
})
|
|
|
|
fmt.Println("makeing requests")
|
|
req, rec := newRouterRequest(t, "POST", test.path, body)
|
|
for name, value := range test.headers {
|
|
req.Header.Set(name, value[0])
|
|
}
|
|
fmt.Println("About to start router2")
|
|
router.ServeHTTP(rec, req)
|
|
fmt.Println("after servehttp")
|
|
|
|
if rec.Code != test.expectedCode {
|
|
t.Errorf("Test %d: Expected status code to be %d but was %d",
|
|
i, test.expectedCode, rec.Code)
|
|
}
|
|
|
|
wg.Wait()
|
|
}
|
|
}
|