github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-08 11:38:15 +00:00
Code Issues Projects Releases Wiki Activity

continue searching on bad size and add tests for bad size&mode

Browse Source
This commit is contained in:
Matthew Wong 2016-08-17 10:42:52 -04:00
parent fe817674ab
commit 6486576f56
2 changed files with 23 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/controller/volume/persistentvolume/index.go
View File

@ -119,11 +119,11 @@ func (pvIndex *persistentVolumeOrderedIndex) findByClaim(claim *api.PersistentVo
if isVolumeBoundToClaim(volume, claim) { if isVolumeBoundToClaim(volume, claim) {
// this claim and volume are pre-bound; return // this claim and volume are pre-bound; return
// the volume if the size request is satisfied, // the volume if the size request is satisfied,
// otherwise leave the claim pending // otherwise continue searching for a match
volumeQty := volume.Spec.Capacity[api.ResourceStorage] volumeQty := volume.Spec.Capacity[api.ResourceStorage]
volumeSize := volumeQty.Value() volumeSize := volumeQty.Value()
if volumeSize < requestedSize { if volumeSize < requestedSize {
return nil, nil continue
} }
return volume, nil return volume, nil
} }

21
pkg/controller/volume/persistentvolume/index_test.go
View File

@ -610,11 +610,16 @@ func TestFindingPreboundVolumes(t *testing.T) {
pv1 := testVolume("pv1", "1Gi") pv1 := testVolume("pv1", "1Gi")
pv5 := testVolume("pv5", "5Gi") pv5 := testVolume("pv5", "5Gi")
pv8 := testVolume("pv8", "8Gi") pv8 := testVolume("pv8", "8Gi")
pvBadSize := testVolume("pvBadSize", "1Mi")
pvBadMode := testVolume("pvBadMode", "1Gi")
pvBadMode.Spec.AccessModes = []api.PersistentVolumeAccessMode{api.ReadOnlyMany}
index := newPersistentVolumeOrderedIndex() index := newPersistentVolumeOrderedIndex()
index.store.Add(pv1) index.store.Add(pv1)
index.store.Add(pv5) index.store.Add(pv5)
index.store.Add(pv8) index.store.Add(pv8)
index.store.Add(pvBadSize)
index.store.Add(pvBadMode)
// expected exact match on size // expected exact match on size
volume, _ := index.findBestMatchForClaim(claim) volume, _ := index.findBestMatchForClaim(claim)
@ -636,6 +641,22 @@ func TestFindingPreboundVolumes(t *testing.T) {
if volume.Name != pv8.Name { if volume.Name != pv8.Name {
t.Errorf("Expected %s but got volume %s instead", pv8.Name, volume.Name) t.Errorf("Expected %s but got volume %s instead", pv8.Name, volume.Name)
} }
// pretend the volume with too small a size is pre-bound to the claim. should get the exact match.
pv8.Spec.ClaimRef = nil
pvBadSize.Spec.ClaimRef = claimRef
volume, _ = index.findBestMatchForClaim(claim)
if volume.Name != pv1.Name {
t.Errorf("Expected %s but got volume %s instead", pv1.Name, volume.Name)
}
// pretend the volume without the right access mode is pre-bound to the claim. should get the exact match.
pvBadSize.Spec.ClaimRef = nil
pvBadMode.Spec.ClaimRef = claimRef
volume, _ = index.findBestMatchForClaim(claim)
if volume.Name != pv1.Name {
t.Errorf("Expected %s but got volume %s instead", pv1.Name, volume.Name)
}
} }
// byCapacity is used to order volumes by ascending storage size // byCapacity is used to order volumes by ascending storage size