mirror of
https://github.com/fnproject/fn.git
synced 2022-10-28 21:29:17 +03:00
3ff28163db
prior to this patch we were allowing 256MB for every function run, just because that was the default for the docker driver and we were not using the memory field on any given route configuration. this fixes that, now docker containers will get the correct memory limit passed into the container from the route. the default is still 128. there is also an env var now, `MEMORY_MB` that is set on each function call, see the linked issue below for rationale. closes #186 ran the given function code from #186, and now i only see allocations up to 32MB before the function is killed. yay. notes: there is no max for memory. for open source fn i'm not sure we want to cap it, really. in the services repo we probably should add a cap before prod. since we don't know any given fn server's ram, we can't try to make sure the setting on any given route is something that can even be run. remove envconfig & bytefmt this updates the glide.yaml file to remove the unused deps, but trying to install fresh is broken atm so i couldn't remove from vendor/, going to fix separately (next update we just won't get these). also changed the skip dir to be the cli dir now that its name has changed (related to brokenness). fix how ram slots were being allocated. integer division is significantly slower than subtraction.
106 lines
3.1 KiB
Go
106 lines
3.1 KiB
Go
package runner
|
|
|
|
import (
|
|
"context"
|
|
"encoding/json"
|
|
"io"
|
|
"os"
|
|
"os/user"
|
|
"path/filepath"
|
|
"time"
|
|
|
|
"github.com/docker/cli/cli/config/configfile"
|
|
"github.com/fnproject/fn/api/runner/drivers"
|
|
"github.com/fnproject/fn/api/runner/protocol"
|
|
"github.com/fnproject/fn/api/runner/task"
|
|
docker "github.com/fsouza/go-dockerclient"
|
|
)
|
|
|
|
var registries dockerRegistries
|
|
|
|
func init() {
|
|
// TODO this is docker specific. and the docker client is capable of doing this, remove & test
|
|
|
|
// Attempt to fetch it from an environment variable
|
|
regsettings := os.Getenv("DOCKER_AUTH")
|
|
|
|
if regsettings == "" {
|
|
u, err := user.Current()
|
|
if err == nil {
|
|
var config configfile.ConfigFile
|
|
cfile, err := os.Open(filepath.Join(u.HomeDir, ".docker", "config.json"))
|
|
if err != nil {
|
|
return
|
|
}
|
|
err = config.LoadFromReader(cfile)
|
|
if err != nil {
|
|
return
|
|
}
|
|
|
|
var regs []dockerRegistry
|
|
for _, auth := range config.AuthConfigs {
|
|
regs = append(regs, dockerRegistry{
|
|
Username: auth.Username,
|
|
Password: auth.Password,
|
|
Name: auth.ServerAddress,
|
|
})
|
|
}
|
|
|
|
registries = dockerRegistries(regs)
|
|
}
|
|
} else {
|
|
// If we have settings, unmarshal them
|
|
json.Unmarshal([]byte(regsettings), ®istries)
|
|
}
|
|
|
|
}
|
|
|
|
// TODO task.Config should implement the interface. this is sad :(
|
|
// implements drivers.ContainerTask
|
|
type containerTask struct {
|
|
ctx context.Context
|
|
cfg *task.Config
|
|
canRun chan bool
|
|
}
|
|
|
|
func (t *containerTask) EnvVars() map[string]string {
|
|
if protocol.IsStreamable(protocol.Protocol(t.cfg.Format)) {
|
|
return t.cfg.BaseEnv
|
|
}
|
|
return t.cfg.Env
|
|
}
|
|
|
|
func (t *containerTask) Labels() map[string]string {
|
|
// TODO this seems inaccurate? is this used by anyone (dev or not)?
|
|
return map[string]string{"LogName": t.cfg.AppName}
|
|
}
|
|
|
|
func (t *containerTask) Command() string { return "" }
|
|
func (t *containerTask) Input() io.Reader { return t.cfg.Stdin }
|
|
func (t *containerTask) Id() string { return t.cfg.ID }
|
|
func (t *containerTask) Image() string { return t.cfg.Image }
|
|
func (t *containerTask) Timeout() time.Duration { return t.cfg.Timeout }
|
|
func (t *containerTask) Logger() (io.Writer, io.Writer) { return t.cfg.Stdout, t.cfg.Stderr }
|
|
func (t *containerTask) Volumes() [][2]string { return [][2]string{} }
|
|
func (t *containerTask) Memory() uint64 { return t.cfg.Memory * 1024 * 1024 } // convert MB
|
|
func (t *containerTask) WorkDir() string { return "" }
|
|
func (t *containerTask) Close() {}
|
|
func (t *containerTask) WriteStat(drivers.Stat) {}
|
|
|
|
// Implementing the docker.AuthConfiguration interface. Pulling in
|
|
// the docker repo password from environment variables
|
|
func (t *containerTask) DockerAuth() (docker.AuthConfiguration, error) {
|
|
reg, _, _ := drivers.ParseImage(t.Image())
|
|
authconfig := docker.AuthConfiguration{}
|
|
|
|
if customAuth := registries.Find(reg); customAuth != nil {
|
|
authconfig = docker.AuthConfiguration{
|
|
Password: customAuth.Password,
|
|
ServerAddress: customAuth.Name,
|
|
Username: customAuth.Username,
|
|
}
|
|
}
|
|
|
|
return authconfig, nil
|
|
}
|