@@ -30,6 +30,7 @@ import (
3030 apierrors "k8s.io/apimachinery/pkg/api/errors"
3131 "k8s.io/client-go/tools/cache"
3232 "k8s.io/klog/v2"
33+ "k8s.io/utils/ptr"
3334)
3435
3536const (
@@ -40,8 +41,6 @@ const (
4041
4142// The return value bool is only used as a sentinel value when function returns without actually performing modification
4243func (ctrl * modifyController ) modify (pvc * v1.PersistentVolumeClaim , pv * v1.PersistentVolume ) (* v1.PersistentVolumeClaim , * v1.PersistentVolume , error , bool ) {
43- pvcSpecVacName := pvc .Spec .VolumeAttributesClassName
44- curVacName := pvc .Status .CurrentVolumeAttributesClassName
4544 pvcKey , err := cache .MetaNamespaceKeyFunc (pvc )
4645 if err != nil {
4746 return pvc , pv , err , false
@@ -53,59 +52,69 @@ func (ctrl *modifyController) modify(pvc *v1.PersistentVolumeClaim, pv *v1.Persi
5352 return pvc , pv , delayModificationErr , false
5453 }
5554
56- if pvcSpecVacName != nil && curVacName == nil {
57- // First time adding VAC to a PVC
58- return ctrl .validateVACAndModifyVolumeWithTarget (pvc , pv )
59- } else if pvcSpecVacName != nil && curVacName != nil && * pvcSpecVacName != * curVacName {
60- // Check if PVC in uncertain state
61- _ , inUncertainState := ctrl .uncertainPVCs .Load (pvcKey )
62- if ! inUncertainState {
63- klog .V (3 ).InfoS ("previous operation on the PVC failed with a final error, retrying" )
64- return ctrl .validateVACAndModifyVolumeWithTarget (pvc , pv )
65- } else {
66- vac , err := ctrl .vacLister .Get (* pvcSpecVacName )
67- if err != nil {
68- if apierrors .IsNotFound (err ) {
69- ctrl .eventRecorder .Eventf (pvc , v1 .EventTypeWarning , util .VolumeModifyFailed , "VAC " + * pvcSpecVacName + " does not exist." )
70- }
71- return pvc , pv , err , false
72- }
73- return ctrl .controllerModifyVolumeWithTarget (pvc , pv , vac , pvcSpecVacName )
55+ pvcSpecVacName := ptr .Deref (pvc .Spec .VolumeAttributesClassName , "" )
56+ curVacName := ptr .Deref (pvc .Status .CurrentVolumeAttributesClassName , "" )
57+ if pvc .Status .ModifyVolumeStatus == nil && pvcSpecVacName == curVacName {
58+ // No modification required, already reached target state
59+ return pvc , pv , nil , false
60+ }
61+
62+ if pvcSpecVacName == "" &&
63+ (pvc .Status .ModifyVolumeStatus == nil || pvc .Status .ModifyVolumeStatus .Status == v1 .PersistentVolumeClaimModifyVolumeInfeasible ) {
64+ // User don't care the target state, and we've reached a relatively stable state. Just keep it here.
65+ // Note: APIServer generally not allowing setting pvcSpecVacName to empty when curVacName is not empty.
66+ klog .V (4 ).InfoS ("stop reconcile for rolled back PVC" , "PV" , klog .KObj (pv ))
67+ return pvc , pv , nil , false
68+ }
69+
70+ // Check if we should change our target
71+ _ , inUncertainState := ctrl .uncertainPVCs .Load (pvcKey )
72+ if inUncertainState || pvcSpecVacName == "" {
73+ vac , err := ctrl .getTargetVAC (pvc )
74+ if err != nil {
75+ return pvc , pv , err , false
7476 }
77+ return ctrl .controllerModifyVolumeWithTarget (pvc , pv , vac )
7578 }
7679
77- // No modification required
78- return pvc , pv , nil , false
80+ return ctrl .validateVACAndModifyVolumeWithTarget (pvc , pv )
81+ }
82+
83+ func (ctrl * modifyController ) getTargetVAC (pvc * v1.PersistentVolumeClaim ) (* storagev1beta1.VolumeAttributesClass , error ) {
84+ pvcSpecVacName := * pvc .Spec .VolumeAttributesClassName
85+ vac , err := ctrl .vacLister .Get (pvcSpecVacName )
86+ // Check if pvcSpecVac is valid and exist
87+ if err != nil {
88+ if apierrors .IsNotFound (err ) {
89+ ctrl .eventRecorder .Eventf (pvc , v1 .EventTypeWarning , util .VolumeModifyFailed , "VAC " + pvcSpecVacName + " does not exist." )
90+ }
91+ return nil , fmt .Errorf ("get VAC with vac name %s in VACInformer cache failed: %w" , pvcSpecVacName , err )
92+ }
93+ return vac , nil
7994}
8095
8196// func validateVACAndModifyVolumeWithTarget validate the VAC. The function sets pvc.Status.ModifyVolumeStatus
8297// to Pending if VAC does not exist and proceeds to trigger ModifyVolume if VAC exists
8398func (ctrl * modifyController ) validateVACAndModifyVolumeWithTarget (
8499 pvc * v1.PersistentVolumeClaim ,
85100 pv * v1.PersistentVolume ) (* v1.PersistentVolumeClaim , * v1.PersistentVolume , error , bool ) {
86- // The controller only triggers ModifyVolume if pvcSpecVacName is not nil nor empty
87- pvcSpecVacName := pvc .Spec .VolumeAttributesClassName
88- // Check if pvcSpecVac is valid and exist
89- vac , err := ctrl .vacLister .Get (* pvcSpecVacName )
90- if err == nil {
91- // Mark pvc.Status.ModifyVolumeStatus as in progress
92- pvc , err = ctrl .markControllerModifyVolumeStatus (pvc , v1 .PersistentVolumeClaimModifyVolumeInProgress , nil )
93- if err != nil {
94- return pvc , pv , err , false
95- }
96- // Record an event to indicate that external resizer is modifying this volume.
97- ctrl .eventRecorder .Event (pvc , v1 .EventTypeNormal , util .VolumeModify ,
98- fmt .Sprintf ("external resizer is modifying volume %s with vac %s" , pvc .Name , * pvcSpecVacName ))
99- return ctrl .controllerModifyVolumeWithTarget (pvc , pv , vac , pvcSpecVacName )
100- } else {
101- if apierrors .IsNotFound (err ) {
102- ctrl .eventRecorder .Eventf (pvc , v1 .EventTypeWarning , util .VolumeModifyFailed , "VAC " + * pvcSpecVacName + " does not exist." )
103- }
104- klog .Errorf ("Get VAC with vac name %s in VACInformer cache failed: %v" , * pvcSpecVacName , err )
101+
102+ vac , err := ctrl .getTargetVAC (pvc )
103+ if err != nil {
105104 // Mark pvc.Status.ModifyVolumeStatus as pending
106105 pvc , err = ctrl .markControllerModifyVolumeStatus (pvc , v1 .PersistentVolumeClaimModifyVolumePending , nil )
107106 return pvc , pv , err , false
108107 }
108+
109+ // Mark pvc.Status.ModifyVolumeStatus as in progress
110+ pvc , err = ctrl .markControllerModifyVolumeStatus (pvc , v1 .PersistentVolumeClaimModifyVolumeInProgress , nil )
111+ if err != nil {
112+ return pvc , pv , err , false
113+ }
114+ // Record an event to indicate that external resizer is modifying this volume.
115+ ctrl .eventRecorder .Event (pvc , v1 .EventTypeNormal , util .VolumeModify ,
116+ fmt .Sprintf ("external resizer is modifying volume %s with vac %s" , pvc .Name , vac .Name ))
117+ return ctrl .controllerModifyVolumeWithTarget (pvc , pv , vac )
109118}
110119
111120// func controllerModifyVolumeWithTarget trigger the CSI ControllerModifyVolume API call
@@ -114,11 +123,11 @@ func (ctrl *modifyController) controllerModifyVolumeWithTarget(
114123 pvc * v1.PersistentVolumeClaim ,
115124 pv * v1.PersistentVolume ,
116125 vacObj * storagev1beta1.VolumeAttributesClass ,
117- pvcSpecVacName * string ) (* v1.PersistentVolumeClaim , * v1.PersistentVolume , error , bool ) {
126+ ) (* v1.PersistentVolumeClaim , * v1.PersistentVolume , error , bool ) {
118127 var err error
119128 pvc , pv , err = ctrl .callModifyVolumeOnPlugin (pvc , pv , vacObj )
120129 if err == nil {
121- klog .V (4 ).Infof ("Update volumeAttributesClass of PV %q to %s succeeded" , pv .Name , * pvcSpecVacName )
130+ klog .V (4 ).Infof ("Update volumeAttributesClass of PV %q to %s succeeded" , pv .Name , vacObj . Name )
122131 // Record an event to indicate that modify operation is successful.
123132 ctrl .eventRecorder .Eventf (pvc , v1 .EventTypeNormal , util .VolumeModifySuccess , fmt .Sprintf ("external resizer modified volume %s with vac %s successfully" , pvc .Name , vacObj .Name ))
124133 return pvc , pv , nil , true
0 commit comments