Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions internal/controller/postgrescluster/autogrow.go
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,11 @@ func (r *Reconciler) storeDesiredRequest(
return ""
}

// if the volume exists but the limit is not set, do not return the new value
if !*limitSet {
return desiredRequestBackup
}

if *limitSet && current.Value() > previous.Value() {
r.Recorder.Eventf(cluster, corev1.EventTypeNormal, "VolumeAutoGrow",
"%s volume expansion to %v requested for %s/%s.",
Expand Down
6 changes: 3 additions & 3 deletions internal/controller/postgrescluster/autogrow_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ func TestStoreDesiredRequest(t *testing.T) {
}, {
tcName: "PGData-NoLimitNoEvent",
Voltype: "pgData", host: "blue",
desiredRequest: "1Gi", desiredRequestBackup: "", expectedValue: "1Gi",
desiredRequest: "1Gi", desiredRequestBackup: "", expectedValue: "",
expectedNumEvents: 0, expectedNumLogs: 0,
}, {
tcName: "PGData-BadBackupRequest",
Expand Down Expand Up @@ -142,7 +142,7 @@ func TestStoreDesiredRequest(t *testing.T) {
}, {
tcName: "PGWAL-NoLimitNoEvent",
Voltype: "pgWAL", host: "blue",
desiredRequest: "1Gi", desiredRequestBackup: "", expectedValue: "1Gi",
desiredRequest: "1Gi", desiredRequestBackup: "", expectedValue: "",
expectedNumEvents: 0, expectedNumLogs: 0,
}, {
tcName: "PGWAL-NoVolumeDefined",
Expand Down Expand Up @@ -176,7 +176,7 @@ func TestStoreDesiredRequest(t *testing.T) {
}, {
tcName: "Repo-NoLimitNoEvent",
Voltype: "repo2", host: "repo-host",
desiredRequest: "1Gi", desiredRequestBackup: "", expectedValue: "1Gi",
desiredRequest: "1Gi", desiredRequestBackup: "", expectedValue: "",
expectedNumEvents: 0, expectedNumLogs: 0,
}, {
tcName: "Repo-NoRepoDefined",
Expand Down
22 changes: 17 additions & 5 deletions internal/controller/postgrescluster/instance.go
Original file line number Diff line number Diff line change
Expand Up @@ -370,14 +370,26 @@ func (r *Reconciler) observeInstances(
// If autogrow is enabled, determine the desired volume size for each instance
// now that all the pod annotations have been collected. This final value will be
// checked to ensure that the value from the annotations can be parsed to a valid
// value. Otherwise the previous value, if available, will be used.
// value. Otherwise the previous value, if available, will be used. If a limit is
// not defined for the given volume and an empty string has been returned, nothing
// will be stored in the status.
if autogrow {
for _, instance := range observed.bySet[name] {
status.DesiredPGDataVolume[instance.Name] = r.storeDesiredRequest(ctx, cluster, "pgData",
name, status.DesiredPGDataVolume[instance.Name], previousPGDataDesiredRequests[instance.Name])
if pgDataRequest := r.storeDesiredRequest(
ctx, cluster, "pgData", name,
status.DesiredPGDataVolume[instance.Name],
previousPGDataDesiredRequests[instance.Name],
); pgDataRequest != "" {
status.DesiredPGDataVolume[instance.Name] = pgDataRequest
}

status.DesiredPGWALVolume[instance.Name] = r.storeDesiredRequest(ctx, cluster, "pgWAL",
name, status.DesiredPGWALVolume[instance.Name], previousPGWALDesiredRequests[instance.Name])
if pgWALRequest := r.storeDesiredRequest(
ctx, cluster, "pgWAL", name,
status.DesiredPGWALVolume[instance.Name],
previousPGWALDesiredRequests[instance.Name],
); pgWALRequest != "" {
status.DesiredPGWALVolume[instance.Name] = pgWALRequest
}
}
}

Expand Down
Loading