public_git
/
postgres-operator
mirror of https://github.com/zalando/postgres-operator.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Address code review by @zerg-junior

This commit is contained in:
Oleksii Kliukin 2018-05-23 11:36:38 +02:00
parent f5550c337b
commit e84ecb1d03
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pkg/cluster/k8sres.go
View File

@ -225,10 +225,10 @@ PatroniInitDBParams:
localParameters := make(map[string]string) localParameters := make(map[string]string)
bootstrapParameters := make(map[string]string) bootstrapParameters := make(map[string]string)
for param, val := range pg.Parameters { for param, val := range pg.Parameters {
if !isBootstrapOnlyParameter(param) { if isBootstrapOnlyParameter(param) {
localParameters[param] = val
} else {
bootstrapParameters[param] = val bootstrapParameters[param] = val
} else {
localParameters[param] = val
} }
} }
if len(localParameters) > 0 { if len(localParameters) > 0 {
@ -296,6 +296,9 @@ func (c *Cluster) tolerations(tolerationsSpec *[]v1.Toleration) []v1.Toleration
return []v1.Toleration{} return []v1.Toleration{}
} }
// isBootstrapOnlyParameter checks asgainst special Patroni bootstrap parameters.
// Those parameters must go to the bootstrap/dcs/postgresql/parameters section.
// See http://patroni.readthedocs.io/en/latest/dynamic_configuration.html.
func isBootstrapOnlyParameter(param string) bool { func isBootstrapOnlyParameter(param string) bool {
return param == "max_connections" || return param == "max_connections" ||
param == "max_locks_per_transaction" || param == "max_locks_per_transaction" ||