diff --git a/pkg/controller/volume/attachdetach/cache/actual_state_of_world.go b/pkg/controller/volume/attachdetach/cache/actual_state_of_world.go index e848bd87e10..f056c25e07f 100644 --- a/pkg/controller/volume/attachdetach/cache/actual_state_of_world.go +++ b/pkg/controller/volume/attachdetach/cache/actual_state_of_world.go @@ -23,10 +23,11 @@ package cache import ( "fmt" - "k8s.io/apimachinery/pkg/api/resource" "sync" "time" + "k8s.io/apimachinery/pkg/api/resource" + "k8s.io/klog/v2" v1 "k8s.io/api/core/v1" @@ -583,8 +584,8 @@ func (asw *actualStateOfWorld) GetAttachState( } // SetVolumeClaimSize sets size of the volume. But this function should not be used from attach_detach controller. -func (asw *actualStateOfWorld) SetVolumeClaimSize(volumeName v1.UniqueVolumeName, claimSize *resource.Quantity) { - klog.V(5).Infof("NO-OP") +func (asw *actualStateOfWorld) InitializeClaimSize(volumeName v1.UniqueVolumeName, claimSize *resource.Quantity) { + klog.V(5).Infof("no-op InitializeClaimSize call in attach-detach controller.") } func (asw *actualStateOfWorld) GetAttachedVolumes() []AttachedVolume { diff --git a/pkg/kubelet/volumemanager/cache/actual_state_of_world.go b/pkg/kubelet/volumemanager/cache/actual_state_of_world.go index 0d0164156f9..38b96457593 100644 --- a/pkg/kubelet/volumemanager/cache/actual_state_of_world.go +++ b/pkg/kubelet/volumemanager/cache/actual_state_of_world.go @@ -599,7 +599,7 @@ func (asw *actualStateOfWorld) SetDeviceMountState( return nil } -func (asw *actualStateOfWorld) SetVolumeClaimSize(volumeName v1.UniqueVolumeName, claimSize *resource.Quantity) { +func (asw *actualStateOfWorld) InitializeClaimSize(volumeName v1.UniqueVolumeName, claimSize *resource.Quantity) { asw.Lock() defer asw.Unlock() diff --git a/pkg/kubelet/volumemanager/populator/desired_state_of_world_populator.go b/pkg/kubelet/volumemanager/populator/desired_state_of_world_populator.go index bf1f0a17536..78c304b15eb 100644 --- a/pkg/kubelet/volumemanager/populator/desired_state_of_world_populator.go +++ b/pkg/kubelet/volumemanager/populator/desired_state_of_world_populator.go @@ -371,7 +371,7 @@ func (dswp *desiredStateOfWorldPopulator) checkVolumeFSResize( dswp.desiredStateOfWorld.UpdatePersistentVolumeSize(uniqueVolumeName, pvCap) // in case the actualStateOfWorld was rebuild after kubelet restart ensure that claimSize is set to accurate value - dswp.actualStateOfWorld.SetVolumeClaimSize(uniqueVolumeName, pvcStatusCap) + dswp.actualStateOfWorld.InitializeClaimSize(uniqueVolumeName, pvcStatusCap) } func getUniqueVolumeName( diff --git a/pkg/volume/util/operationexecutor/operation_executor.go b/pkg/volume/util/operationexecutor/operation_executor.go index b50314c913c..77ae3705b42 100644 --- a/pkg/volume/util/operationexecutor/operation_executor.go +++ b/pkg/volume/util/operationexecutor/operation_executor.go @@ -246,8 +246,8 @@ type ActualStateOfWorldAttacherUpdater interface { // the node's volumesToReportAsAttached list) AddVolumeToReportAsAttached(volumeName v1.UniqueVolumeName, nodeName types.NodeName) - // SetVolumeClaimSize sets pvc claim size by reading pvc.Status.Capacity - SetVolumeClaimSize(volumeName v1.UniqueVolumeName, claimSize *resource.Quantity) + // InitializeClaimSize sets pvc claim size by reading pvc.Status.Capacity + InitializeClaimSize(volumeName v1.UniqueVolumeName, claimSize *resource.Quantity) } // VolumeLogger defines a set of operations for generating volume-related logging and error msgs diff --git a/pkg/volume/util/operationexecutor/operation_generator.go b/pkg/volume/util/operationexecutor/operation_generator.go index d3a83f65378..cddd3624d06 100644 --- a/pkg/volume/util/operationexecutor/operation_generator.go +++ b/pkg/volume/util/operationexecutor/operation_generator.go @@ -1507,7 +1507,7 @@ func (og *operationGenerator) GenerateVerifyControllerAttachedVolumeFunc( eventErr, detailedErr := volumeToMount.GenerateError("VerifyControllerAttachedVolume.MarkVolumeAsAttachedByUniqueVolumeName failed", addVolumeNodeErr) return volumetypes.NewOperationContext(eventErr, detailedErr, migrated) } - actualStateOfWorld.SetVolumeClaimSize(volumeToMount.VolumeName, claimSize) + actualStateOfWorld.InitializeClaimSize(volumeToMount.VolumeName, claimSize) return volumetypes.NewOperationContext(nil, nil, migrated) } @@ -1548,7 +1548,7 @@ func (og *operationGenerator) GenerateVerifyControllerAttachedVolumeFunc( eventErr, detailedErr := volumeToMount.GenerateError("VerifyControllerAttachedVolume.MarkVolumeAsAttached failed", addVolumeNodeErr) return volumetypes.NewOperationContext(eventErr, detailedErr, migrated) } - actualStateOfWorld.SetVolumeClaimSize(volumeToMount.VolumeName, claimSize) + actualStateOfWorld.InitializeClaimSize(volumeToMount.VolumeName, claimSize) return volumetypes.NewOperationContext(nil, nil, migrated) } }