Skip to content

Commit 4265e94

Browse files
committed
Volume auto-grow naming updates
Certain variables make the behavior of the volume auto-grow code unclear. This updates variables and adds a comment to better indicate the behavior in question.
1 parent b890b7b commit 4265e94

File tree

1 file changed

+16
-15
lines changed

1 file changed

+16
-15
lines changed

internal/controller/postgrescluster/autogrow.go

Lines changed: 16 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -160,12 +160,13 @@ func (r *Reconciler) setVolumeSize(ctx context.Context, cluster *v1beta1.Postgre
160160
// Otherwise, if the feature gate is not enabled, do not autogrow.
161161
} else if feature.Enabled(ctx, feature.AutoGrowVolumes) {
162162

163-
// determine the appropriate volume request based on what's set in the status
164-
if dpv, err := getDesiredVolumeSize(
163+
// Determine the appropriate volume request based on what's set in the status.
164+
// Note: request size set by reference.
165+
if badDesiredVolumeRequest, err := getDesiredVolumeSize(
165166
cluster, volumeType, host, volumeRequestSize,
166167
); err != nil {
167168
log.Error(err, "For "+cluster.Name+"/"+host+
168-
": Unable to parse "+volumeType+" volume request: "+dpv)
169+
": Unable to parse "+volumeType+" volume request: "+badDesiredVolumeRequest)
169170
}
170171

171172
// If the volume request size is greater than or equal to the limit and the
@@ -204,15 +205,15 @@ func getDesiredVolumeSize(cluster *v1beta1.PostgresCluster,
204205
case volumeType == "pgData":
205206
for i := range cluster.Status.InstanceSets {
206207
if instanceSpecName == cluster.Status.InstanceSets[i].Name {
207-
for _, dpv := range cluster.Status.InstanceSets[i].DesiredPGDataVolume {
208-
if dpv != "" {
209-
desiredRequest, err := resource.ParseQuantity(dpv)
208+
for _, desiredRequestString := range cluster.Status.InstanceSets[i].DesiredPGDataVolume {
209+
if desiredRequestString != "" {
210+
desiredRequest, err := resource.ParseQuantity(desiredRequestString)
210211
if err == nil {
211212
if desiredRequest.Value() > volumeRequestSize.Value() {
212213
*volumeRequestSize = desiredRequest
213214
}
214215
} else {
215-
return dpv, err
216+
return desiredRequestString, err
216217
}
217218
}
218219
}
@@ -222,15 +223,15 @@ func getDesiredVolumeSize(cluster *v1beta1.PostgresCluster,
222223
case volumeType == "pgWAL":
223224
for i := range cluster.Status.InstanceSets {
224225
if instanceSpecName == cluster.Status.InstanceSets[i].Name {
225-
for _, dpv := range cluster.Status.InstanceSets[i].DesiredPGWALVolume {
226-
if dpv != "" {
227-
desiredRequest, err := resource.ParseQuantity(dpv)
226+
for _, desiredRequestString := range cluster.Status.InstanceSets[i].DesiredPGWALVolume {
227+
if desiredRequestString != "" {
228+
desiredRequest, err := resource.ParseQuantity(desiredRequestString)
228229
if err == nil {
229230
if desiredRequest.Value() > volumeRequestSize.Value() {
230231
*volumeRequestSize = desiredRequest
231232
}
232233
} else {
233-
return dpv, err
234+
return desiredRequestString, err
234235
}
235236
}
236237
}
@@ -246,15 +247,15 @@ func getDesiredVolumeSize(cluster *v1beta1.PostgresCluster,
246247
}
247248
for i := range cluster.Status.PGBackRest.Repos {
248249
if volumeType == cluster.Status.PGBackRest.Repos[i].Name {
249-
dpv := cluster.Status.PGBackRest.Repos[i].DesiredRepoVolume
250-
if dpv != "" {
251-
desiredRequest, err := resource.ParseQuantity(dpv)
250+
desiredRequestString := cluster.Status.PGBackRest.Repos[i].DesiredRepoVolume
251+
if desiredRequestString != "" {
252+
desiredRequest, err := resource.ParseQuantity(desiredRequestString)
252253
if err == nil {
253254
if desiredRequest.Value() > volumeRequestSize.Value() {
254255
*volumeRequestSize = desiredRequest
255256
}
256257
} else {
257-
return dpv, err
258+
return desiredRequestString, err
258259
}
259260
}
260261
}

0 commit comments

Comments
 (0)