Skip to content

Commit 0bc8b7e

Browse files
authored
Merge pull request noobaa#1743 from dannyzaken/danny-fixes
Handle shared_buffers value when there are no memory requests
2 parents dbc3099 + 97a3478 commit 0bc8b7e

File tree

1 file changed

+8
-3
lines changed

1 file changed

+8
-3
lines changed

pkg/system/db_reconciler.go

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -572,9 +572,14 @@ func (r *Reconciler) setPostgresConfig() {
572572
// a reasonable value for shared_buffers when mem>1GB is 25% of the total memory (https://www.postgresql.org/docs/9.1/runtime-config-resource.html)
573573
// if resources are not specified, we will use the default value
574574
if r.NooBaa.Spec.DBResources != nil {
575-
requiredDBMemMB := r.NooBaa.Spec.DBSpec.DBResources.Requests.Memory().ScaledValue(resource.Mega)
576-
sharedBuffersMB := requiredDBMemMB / 4
577-
desiredParameters["shared_buffers"] = fmt.Sprintf("%dMB", sharedBuffersMB)
575+
// if memory is not specified, set shared_buffers to 1GB
576+
if r.NooBaa.Spec.DBSpec.DBResources.Requests == nil || r.NooBaa.Spec.DBSpec.DBResources.Requests.Memory() == nil {
577+
desiredParameters["shared_buffers"] = "1GB"
578+
} else {
579+
requiredDBMemMB := r.NooBaa.Spec.DBSpec.DBResources.Requests.Memory().ScaledValue(resource.Mega)
580+
sharedBuffersMB := requiredDBMemMB / 4
581+
desiredParameters["shared_buffers"] = fmt.Sprintf("%dMB", sharedBuffersMB)
582+
}
578583
}
579584

580585
// set any parameters from DBSpec.DBConf in overrideParameters

0 commit comments

Comments
 (0)