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

disable fail whale logs (#768)

Browse Source 
we have been getting these from attach all this time and never needed these
anyway.

I ran cpu profiles of dockerd and this was 90% of docker cpu usage (json
logs). woot. this will reduce i/o quite a bit, and we don't have to worry
about them taking up any disk space either.

from tests i get about 50% speedup with these off. the hunt continues...
This commit is contained in:
Reed Allman
2018-02-13 17:45:11 -08:00
committed by GitHub
parent eebb9ae4e7
commit 1a1250e5ea
1 changed files with 2 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
api/agent/drivers/docker/docker.go
View File

@@ -150,10 +150,7 @@ func (drv *DockerDriver) Prepare(ctx context.Context, task drivers.ContainerTask
// turn off logs since we're collecting them from attach // turn off logs since we're collecting them from attach
HostConfig: &docker.HostConfig{ HostConfig: &docker.HostConfig{
LogConfig: docker.LogConfig{ LogConfig: docker.LogConfig{
Type: "json-file", // o/w attach does not work Type: "none",
Config: map[string]string{
"max-size": "1m",
},
}, },
}, },
Context: ctx, Context: ctx,
@@ -351,7 +348,7 @@ func (drv *DockerDriver) run(ctx context.Context, container string, task drivers
waiter, err := drv.docker.AttachToContainerNonBlocking(ctx, docker.AttachToContainerOptions{ waiter, err := drv.docker.AttachToContainerNonBlocking(ctx, docker.AttachToContainerOptions{
Container: container, OutputStream: mwOut, ErrorStream: mwErr, Container: container, OutputStream: mwOut, ErrorStream: mwErr,
Stream: true, Logs: true, Stdout: true, Stderr: true, Stream: true, Stdout: true, Stderr: true,
Stdin: true, InputStream: task.Input()}) Stdin: true, InputStream: task.Input()})
if err != nil && ctx.Err() == nil { if err != nil && ctx.Err() == nil {
// ignore if ctx has errored, rewrite status lay below // ignore if ctx has errored, rewrite status lay below