vbatts/cri-o
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request #979 from mrunalp/log_size_min

Browse source 
Make sure log-size-max is atleast as big as read buffer
This commit is contained in:
Daniel J Walsh 2017-10-06 09:23:48 -04:00 committed by GitHub
commit e5d2c0af5f
3 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
cmd/crio/main.go
View file

@ -40,6 +40,11 @@ func validateConfig(config *server.Config) error {
return fmt.Errorf("Unrecognized image volume type specified")
}
// This needs to match the read buffer size in conmon
if config.LogSizeMax >= 0 && config.LogSizeMax < 8192 {
return fmt.Errorf("log size max should be negative or >= 8192")
}
return nil
}

3
docs/crio.8.md
View file

@ -106,7 +106,8 @@ set the CPU profile file path
Set the format used by logs ('text' (default), or 'json') (default: "text")
**--log-size-max**=""
Maximum log size in bytes for a container (default: -1 (no limit))
Maximum log size in bytes for a container (default: -1 (no limit)).
If it is positive, it must be >= 8192 (to match/exceed conmon read buffer).
**--pause-command**=""
Path to the pause executable in the pause image (default: "/pause")

1
docs/crio.conf.5.md
View file

@ -81,6 +81,7 @@ Example:
**log_size_max**=""
Maximum sized allowed for the container log file (default: -1)
Negative numbers indicate that no size limit is imposed.
If it is positive, it must be >= 8192 (to match/exceed conmon read buffer).
The file is truncated and re-opened so the limit is never exceeded.
**pids_limit**=""