github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-28 22:17:14 +00:00
Code Issues Projects Releases Wiki Activity

check existing size before querying new size from api-server

Browse Source
This commit is contained in:
Hemant Kumar 2022-03-25 10:08:55 -04:00
parent 1809094389
commit a99466ca86
4 changed files with 21 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pkg/controller/volume/attachdetach/cache/actual_state_of_world.go vendored
View File

@ -588,6 +588,11 @@ func (asw *actualStateOfWorld) InitializeClaimSize(volumeName v1.UniqueVolumeNam
klog.V(5).Infof("no-op InitializeClaimSize call in attach-detach controller.") klog.V(5).Infof("no-op InitializeClaimSize call in attach-detach controller.")
} }
func (asw *actualStateOfWorld) GetClaimSize(volumeName v1.UniqueVolumeName) *resource.Quantity {
// not needed in attach-detach controller
return nil
}
func (asw *actualStateOfWorld) GetAttachedVolumes() []AttachedVolume { func (asw *actualStateOfWorld) GetAttachedVolumes() []AttachedVolume {
asw.RLock() asw.RLock()
defer asw.RUnlock() defer asw.RUnlock()

11
pkg/kubelet/volumemanager/cache/actual_state_of_world.go vendored
View File

@ -613,6 +613,17 @@ func (asw *actualStateOfWorld) InitializeClaimSize(volumeName v1.UniqueVolumeNam
} }
} }
func (asw *actualStateOfWorld) GetClaimSize(volumeName v1.UniqueVolumeName) *resource.Quantity {
asw.RLock()
defer asw.RUnlock()
volumeObj, ok := asw.attachedVolumes[volumeName]
if ok {
return volumeObj.persistentVolumeSize
}
return nil
}
func (asw *actualStateOfWorld) DeletePodFromVolume( func (asw *actualStateOfWorld) DeletePodFromVolume(
podName volumetypes.UniquePodName, volumeName v1.UniqueVolumeName) error { podName volumetypes.UniquePodName, volumeName v1.UniqueVolumeName) error {
asw.Lock() asw.Lock()

2
pkg/volume/util/operationexecutor/operation_executor.go
View File

@ -248,6 +248,8 @@ type ActualStateOfWorldAttacherUpdater interface {
// InitializeClaimSize sets pvc claim size by reading pvc.Status.Capacity // InitializeClaimSize sets pvc claim size by reading pvc.Status.Capacity
InitializeClaimSize(volumeName v1.UniqueVolumeName, claimSize *resource.Quantity) InitializeClaimSize(volumeName v1.UniqueVolumeName, claimSize *resource.Quantity)
GetClaimSize(volumeName v1.UniqueVolumeName) *resource.Quantity
} }
// VolumeLogger defines a set of operations for generating volume-related logging and error msgs // VolumeLogger defines a set of operations for generating volume-related logging and error msgs

5
pkg/volume/util/operationexecutor/operation_generator.go
View File

@ -1480,9 +1480,10 @@ func (og *operationGenerator) GenerateVerifyControllerAttachedVolumeFunc(
verifyControllerAttachedVolumeFunc := func() volumetypes.OperationContext { verifyControllerAttachedVolumeFunc := func() volumetypes.OperationContext {
migrated := getMigratedStatusBySpec(volumeToMount.VolumeSpec) migrated := getMigratedStatusBySpec(volumeToMount.VolumeSpec)
var claimSize *resource.Quantity claimSize := actualStateOfWorld.GetClaimSize(volumeToMount.VolumeName)
if volumeToMount.VolumeSpec.PersistentVolume != nil { // only fetch claimSize if it was not set previously
if volumeToMount.VolumeSpec.PersistentVolume != nil && claimSize == nil {
pv := volumeToMount.VolumeSpec.PersistentVolume pv := volumeToMount.VolumeSpec.PersistentVolume
pvc, err := og.kubeClient.CoreV1().PersistentVolumeClaims(pv.Spec.ClaimRef.Namespace).Get(context.TODO(), pv.Spec.ClaimRef.Name, metav1.GetOptions{}) pvc, err := og.kubeClient.CoreV1().PersistentVolumeClaims(pv.Spec.ClaimRef.Namespace).Get(context.TODO(), pv.Spec.ClaimRef.Name, metav1.GetOptions{})
if err != nil { if err != nil {