github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-09 12:07:47 +00:00
Code Issues Projects Releases Wiki Activity

cleanup unneeded if block

Browse Source
This commit is contained in:
Pingan2017 2018-08-30 17:18:56 +08:00
parent 8aea674681
commit 2f1284bc34
2 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkg/kubelet/cm/cgroup_manager_linux.go
View File

@ -204,18 +204,16 @@ func NewCgroupManager(cs *CgroupSubsystems, cgroupDriver string) CgroupManager {
func (m *cgroupManagerImpl) Name(name CgroupName) string { func (m *cgroupManagerImpl) Name(name CgroupName) string {
if m.adapter.cgroupManagerType == libcontainerSystemd { if m.adapter.cgroupManagerType == libcontainerSystemd {
return name.ToSystemd() return name.ToSystemd()
} else {
return name.ToCgroupfs()
} }
return name.ToCgroupfs()
} }
// CgroupName converts the literal cgroupfs name on the host to an internal identifier. // CgroupName converts the literal cgroupfs name on the host to an internal identifier.
func (m *cgroupManagerImpl) CgroupName(name string) CgroupName { func (m *cgroupManagerImpl) CgroupName(name string) CgroupName {
if m.adapter.cgroupManagerType == libcontainerSystemd { if m.adapter.cgroupManagerType == libcontainerSystemd {
return ParseSystemdToCgroupName(name) return ParseSystemdToCgroupName(name)
} else {
return ParseCgroupfsToCgroupName(name)
} }
return ParseCgroupfsToCgroupName(name)
} }
// buildCgroupPaths builds a path to each cgroup subsystem for the specified name. // buildCgroupPaths builds a path to each cgroup subsystem for the specified name.

3
pkg/kubelet/cm/pod_container_manager_linux.go
View File

@ -136,9 +136,8 @@ func (m *podContainerManagerImpl) killOnePid(pid int) error {
// also does this. // also does this.
glog.V(3).Infof("process with pid %v no longer exists", pid) glog.V(3).Infof("process with pid %v no longer exists", pid)
return nil return nil
} else {
return err
} }
return err
} }
return nil return nil
} }