github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-29 06:27:05 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #77429 from tedyu/container-linux-err

Browse Source 
Avoid unnecessary concatenation of errors
This commit is contained in:
Kubernetes Prow Robot 2019-07-11 14:33:08 -07:00 committed by GitHub
commit f0d1b10092
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
pkg/kubelet/cm/container_manager_linux.go
View File

@ -833,16 +833,12 @@ func getContainer(pid int) (string, error) {
//
func ensureSystemCgroups(rootCgroupPath string, manager *fs.Manager) error {
// Move non-kernel PIDs to the system container.
attemptsRemaining := 10
var errs []error
for attemptsRemaining >= 0 {
// Only keep errors on latest attempt.
errs = []error{}
attemptsRemaining--
// Only keep errors on latest attempt.
var finalErr error
for i := 0; i <= 10; i++ {
allPids, err := cmutil.GetPids(rootCgroupPath)
if err != nil {
errs = append(errs, fmt.Errorf("failed to list PIDs for root: %v", err))
finalErr = fmt.Errorf("failed to list PIDs for root: %v", err)
continue
}
@ -859,23 +855,20 @@ func ensureSystemCgroups(rootCgroupPath string, manager *fs.Manager) error {
// Check if we have moved all the non-kernel PIDs.
if len(pids) == 0 {
break
return nil
}
klog.Infof("Moving non-kernel processes: %v", pids)
for _, pid := range pids {
err := manager.Apply(pid)
if err != nil {
errs = append(errs, fmt.Errorf("failed to move PID %d into the system container %q: %v", pid, manager.Cgroups.Name, err))
finalErr = fmt.Errorf("failed to move PID %d into the system container %q: %v", pid, manager.Cgroups.Name, err)
}
}
}
if attemptsRemaining < 0 {
errs = append(errs, fmt.Errorf("ran out of attempts to create system containers %q", manager.Cgroups.Name))
}
return utilerrors.NewAggregate(errs)
return finalErr
}
// Determines whether the specified PID is a kernel PID.