@@ -156,12 +156,13 @@ func (r *Reconciler) setVolumeSize(ctx context.Context, cluster *v1beta1.Postgre
156156 // Otherwise, if the feature gate is not enabled, do not autogrow.
157157 } else if feature .Enabled (ctx , feature .AutoGrowVolumes ) {
158158
159- // determine the appropriate volume request based on what's set in the status
160- if dpv , err := getDesiredVolumeSize (
159+ // Determine the appropriate volume request based on what's set in the status.
160+ // Note: request size set by reference.
161+ if badDesiredVolumeRequest , err := getDesiredVolumeSize (
161162 cluster , volumeType , host , volumeRequestSize ,
162163 ); err != nil {
163164 log .Error (err , "For " + cluster .Name + "/" + host +
164- ": Unable to parse " + volumeType + " volume request: " + dpv )
165+ ": Unable to parse " + volumeType + " volume request: " + badDesiredVolumeRequest )
165166 }
166167
167168 // If the volume request size is greater than or equal to the limit and the
@@ -203,15 +204,15 @@ func getDesiredVolumeSize(cluster *v1beta1.PostgresCluster,
203204 case volumeType == "pgData" :
204205 for i := range cluster .Status .InstanceSets {
205206 if instanceSpecName == cluster .Status .InstanceSets [i ].Name {
206- for _ , dpv := range cluster .Status .InstanceSets [i ].DesiredPGDataVolume {
207- if dpv != "" {
208- desiredRequest , err := resource .ParseQuantity (dpv )
207+ for _ , desiredRequestString := range cluster .Status .InstanceSets [i ].DesiredPGDataVolume {
208+ if desiredRequestString != "" {
209+ desiredRequest , err := resource .ParseQuantity (desiredRequestString )
209210 if err == nil {
210211 if desiredRequest .Value () > volumeRequestSize .Value () {
211212 * volumeRequestSize = desiredRequest
212213 }
213214 } else {
214- return dpv , err
215+ return desiredRequestString , err
215216 }
216217 }
217218 }
@@ -221,15 +222,15 @@ func getDesiredVolumeSize(cluster *v1beta1.PostgresCluster,
221222 case volumeType == "pgWAL" :
222223 for i := range cluster .Status .InstanceSets {
223224 if instanceSpecName == cluster .Status .InstanceSets [i ].Name {
224- for _ , dpv := range cluster .Status .InstanceSets [i ].DesiredPGWALVolume {
225- if dpv != "" {
226- desiredRequest , err := resource .ParseQuantity (dpv )
225+ for _ , desiredRequestString := range cluster .Status .InstanceSets [i ].DesiredPGWALVolume {
226+ if desiredRequestString != "" {
227+ desiredRequest , err := resource .ParseQuantity (desiredRequestString )
227228 if err == nil {
228229 if desiredRequest .Value () > volumeRequestSize .Value () {
229230 * volumeRequestSize = desiredRequest
230231 }
231232 } else {
232- return dpv , err
233+ return desiredRequestString , err
233234 }
234235 }
235236 }
@@ -245,15 +246,15 @@ func getDesiredVolumeSize(cluster *v1beta1.PostgresCluster,
245246 }
246247 for i := range cluster .Status .PGBackRest .Repos {
247248 if volumeType == cluster .Status .PGBackRest .Repos [i ].Name {
248- dpv := cluster .Status .PGBackRest .Repos [i ].DesiredRepoVolume
249- if dpv != "" {
250- desiredRequest , err := resource .ParseQuantity (dpv )
249+ desiredRequestString := cluster .Status .PGBackRest .Repos [i ].DesiredRepoVolume
250+ if desiredRequestString != "" {
251+ desiredRequest , err := resource .ParseQuantity (desiredRequestString )
251252 if err == nil {
252253 if desiredRequest .Value () > volumeRequestSize .Value () {
253254 * volumeRequestSize = desiredRequest
254255 }
255256 } else {
256- return dpv , err
257+ return desiredRequestString , err
257258 }
258259 }
259260 }
0 commit comments