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

Merge pull request #28536 from kubernetes/revert-28176-inode-check-dep

Browse Source 
Automatic merge from submit-queue

Revert "Declare out of disk when there is no free inodes"

Reverts kubernetes/kubernetes#28176

Fixes #28481
This commit is contained in:
k8s-merge-robot 2016-07-06 17:59:17 -07:00 committed by GitHub
commit 52e8d4f5cd
3 changed files with 44 additions and 102 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pkg/kubelet/disk_manager.go
View File

@ -50,7 +50,6 @@ type fsInfo struct {
Capacity int64
Available int64
Timestamp time.Time
InodesFree int64
}
type realDiskSpaceManager struct {
@ -79,7 +78,6 @@ func (dm *realDiskSpaceManager) getFsInfo(fsType string, f func() (cadvisorapi.F
fsi.Usage = int64(fs.Usage)
fsi.Capacity = int64(fs.Capacity)
fsi.Available = int64(fs.Available)
fsi.InodesFree = int64(fs.InodesFree)
dm.cachedInfo[fsType] = fsi
}
return fsi, nil
@ -104,14 +102,11 @@ func (dm *realDiskSpaceManager) isSpaceAvailable(fsType string, threshold int, f
if fsInfo.Available < 0 {
return true, fmt.Errorf("wrong available space for %q: %+v", fsType, fsInfo)
}
if fsInfo.Available < int64(threshold)*mb {
glog.Infof("Running out of space on disk for %q: available %d MB, threshold %d MB", fsType, fsInfo.Available/mb, threshold)
return false, nil
}
if fsInfo.InodesFree == 0 {
glog.Infof("Running out of inodes for %q", fsType)
return false, nil
}
return true, nil
}

57
pkg/kubelet/disk_manager_test.go
View File

@ -65,12 +65,10 @@ func TestSpaceAvailable(t *testing.T) {
Usage: 400 * mb,
Capacity: 1000 * mb,
Available: 600 * mb,
InodesFree: 5,
}, nil)
mockCadvisor.On("RootFsInfo").Return(cadvisorapi.FsInfo{
Usage: 9 * mb,
Capacity: 10 * mb,
InodesFree: 5,
}, nil)
ok, err := dm.IsRuntimeDiskSpaceAvailable()
@ -83,7 +81,7 @@ func TestSpaceAvailable(t *testing.T) {
}
// TestIsRuntimeDiskSpaceAvailableWithSpace verifies IsRuntimeDiskSpaceAvailable results when
// space and inodes are available.
// space is available.
func TestIsRuntimeDiskSpaceAvailableWithSpace(t *testing.T) {
assert, policy, mockCadvisor := setUp(t)
dm, err := newDiskSpaceManager(mockCadvisor, policy)
@ -94,7 +92,6 @@ func TestIsRuntimeDiskSpaceAvailableWithSpace(t *testing.T) {
Usage: 9500 * mb,
Capacity: 10000 * mb,
Available: 500 * mb,
InodesFree: 10,
}, nil)
ok, err := dm.IsRuntimeDiskSpaceAvailable()
@ -111,27 +108,6 @@ func TestIsRuntimeDiskSpaceAvailableWithoutSpace(t *testing.T) {
Usage: 999 * mb,
Capacity: 1000 * mb,
Available: 1 * mb,
InodesFree: 10,
}, nil)
dm, err := newDiskSpaceManager(mockCadvisor, policy)
require.NoError(t, err)
ok, err := dm.IsRuntimeDiskSpaceAvailable()
assert.NoError(err)
assert.False(ok)
}
// TestIsRuntimeDiskSpaceAvailableWithoutInode verifies IsRuntimeDiskSpaceAvailable results when
// inode is not available.
func TestIsRuntimeDiskSpaceAvailableWithoutInode(t *testing.T) {
// 1MB available
assert, policy, mockCadvisor := setUp(t)
mockCadvisor.On("ImagesFsInfo").Return(cadvisorapi.FsInfo{
Usage: 999 * mb,
Capacity: 1000 * mb,
Available: 500 * mb,
InodesFree: 0,
}, nil)
dm, err := newDiskSpaceManager(mockCadvisor, policy)
@ -143,7 +119,7 @@ func TestIsRuntimeDiskSpaceAvailableWithoutInode(t *testing.T) {
}
// TestIsRootDiskSpaceAvailableWithSpace verifies IsRootDiskSpaceAvailable results when
// space and inodes are available.
// space is available.
func TestIsRootDiskSpaceAvailableWithSpace(t *testing.T) {
assert, policy, mockCadvisor := setUp(t)
policy.RootFreeDiskMB = 10
@ -155,7 +131,6 @@ func TestIsRootDiskSpaceAvailableWithSpace(t *testing.T) {
Usage: 1 * mb,
Capacity: 1000 * mb,
Available: 999 * mb,
InodesFree: 10,
}, nil)
ok, err := dm.IsRootDiskSpaceAvailable()
@ -176,28 +151,6 @@ func TestIsRootDiskSpaceAvailableWithoutSpace(t *testing.T) {
Usage: 990 * mb,
Capacity: 1000 * mb,
Available: 9 * mb,
InodesFree: 10,
}, nil)
ok, err := dm.IsRootDiskSpaceAvailable()
assert.NoError(err)
assert.False(ok)
}
// TestIsRootDiskSpaceAvailableWithoutInode verifies IsRootDiskSpaceAvailable results when
// inode is not available.
func TestIsRootDiskSpaceAvailableWithoutInode(t *testing.T) {
assert, policy, mockCadvisor := setUp(t)
policy.RootFreeDiskMB = 10
dm, err := newDiskSpaceManager(mockCadvisor, policy)
assert.NoError(err)
// 9MB available
mockCadvisor.On("RootFsInfo").Return(cadvisorapi.FsInfo{
Usage: 990 * mb,
Capacity: 1000 * mb,
Available: 500 * mb,
InodesFree: 0,
}, nil)
ok, err := dm.IsRootDiskSpaceAvailable()
@ -215,13 +168,11 @@ func TestCache(t *testing.T) {
Usage: 400 * mb,
Capacity: 1000 * mb,
Available: 300 * mb,
InodesFree: 10,
}, nil).Once()
mockCadvisor.On("RootFsInfo").Return(cadvisorapi.FsInfo{
Usage: 500 * mb,
Capacity: 1000 * mb,
Available: 500 * mb,
InodesFree: 5,
}, nil).Once()
// Initial calls which should be recorded in mockCadvisor
@ -276,7 +227,6 @@ func Test_getFsInfo(t *testing.T) {
Usage: 10 * mb,
Capacity: 100 * mb,
Available: 90 * mb,
InodesFree: 5,
}, nil).Once()
dm := &realDiskSpaceManager{
@ -295,7 +245,6 @@ func Test_getFsInfo(t *testing.T) {
Usage: 9 * mb,
Capacity: 100 * mb,
Available: 9 * mb,
InodesFree: 5,
}, nil).Once()
dm = &realDiskSpaceManager{
@ -312,7 +261,6 @@ func Test_getFsInfo(t *testing.T) {
Usage: 9 * mb,
Capacity: 10 * mb,
Available: 500 * mb,
InodesFree: 5,
}, nil).Once()
dm = &realDiskSpaceManager{
@ -330,7 +278,6 @@ func Test_getFsInfo(t *testing.T) {
Usage: 9 * mb,
Capacity: 0,
Available: 500 * mb,
InodesFree: 5,
}, nil).Once()
dm = &realDiskSpaceManager{

4
pkg/kubelet/kubelet_test.go
View File

@ -2695,8 +2695,8 @@ func TestValidateContainerLogStatus(t *testing.T) {
// sufficient disk space or it is out of disk, depending on the capacity, availability and
// threshold values.
func updateDiskSpacePolicy(kubelet *Kubelet, mockCadvisor *cadvisortest.Mock, rootCap, dockerCap, rootAvail, dockerAvail uint64, rootThreshold, dockerThreshold int) error {
dockerimagesFsInfo := cadvisorapiv2.FsInfo{Capacity: rootCap * mb, Available: rootAvail * mb, InodesFree: 5}
rootFsInfo := cadvisorapiv2.FsInfo{Capacity: dockerCap * mb, Available: dockerAvail * mb, InodesFree: 5}
dockerimagesFsInfo := cadvisorapiv2.FsInfo{Capacity: rootCap * mb, Available: rootAvail * mb}
rootFsInfo := cadvisorapiv2.FsInfo{Capacity: dockerCap * mb, Available: dockerAvail * mb}
mockCadvisor.On("ImagesFsInfo").Return(dockerimagesFsInfo, nil)
mockCadvisor.On("RootFsInfo").Return(rootFsInfo, nil)