Skip to content

Commit

Permalink
fix error of setting negative value for containerLogMaxSize
Browse files Browse the repository at this point in the history
  • Loading branch information
CaoDonghui123 committed Jun 7, 2021
1 parent f1bbe35 commit cb3a300
Showing 1 changed file with 4 additions and 3 deletions.
7 changes: 4 additions & 3 deletions pkg/kubelet/logs/container_log_manager.go
Expand Up @@ -138,9 +138,6 @@ func parseMaxSize(size string) (int64, error) {
if !ok {
return 0, fmt.Errorf("invalid max log size")
}
if maxSize < 0 {
return 0, fmt.Errorf("negative max log size %d", maxSize)
}
return maxSize, nil
}

Expand All @@ -161,6 +158,10 @@ func NewContainerLogManager(runtimeService internalapi.RuntimeService, osInterfa
if err != nil {
return nil, fmt.Errorf("failed to parse container log max size %q: %v", maxSize, err)
}
// Negative number means to disable container log rotation
if parsedMaxSize < 0 {
return NewStubContainerLogManager(), nil
}
// policy LogRotatePolicy
return &containerLogManager{
osInterface: osInterface,
Expand Down

0 comments on commit cb3a300

Please sign in to comment.