Add patroni param master start timeout

Signed-off-by: drivebyer <[email protected]>

charts/postgres-operator/crds/postgresqls.yaml

@@ -340,6 +340,8 @@ spec:
  type: string
  retry_timeout:
  type: integer
+ master_start_timeout:
+ type: integer
  slots:
  type: object
  additionalProperties:

docs/reference/cluster_manifest.md

@@ -339,7 +339,11 @@ explanation of `ttl` and `loop_wait` parameters.
  [here](https://patroni.readthedocs.io/en/master/dcs_failsafe_mode.html) for more details.
  This feature is included since Patroni 3.0.0. Hence, check the container
  image in use if this feature is included in the used Patroni version. The
- default is set to `false`. Optional. 
+ default is set to `false`. Optional.
+
+* **master_start_timeout**
+ Patroni `master_start_timeout` parameter value. The default is set by the 
+ Spilo Docker image. Optional.
 
 ## Postgres container resources
 

e2e/tests/test_e2e.py

@@ -408,6 +408,7 @@ def test_config_update(self):
  "ttl": 29,
  "loop_wait": 9,
  "retry_timeout": 9,
+ "master_start_timeout": 400,
  "synchronous_mode": True,
  "failsafe_mode": True,
  }
@@ -434,6 +435,8 @@ def compare_config():
  "loop_wait not updated")
  self.assertEqual(desired_config["retry_timeout"], effective_config["retry_timeout"],
  "retry_timeout not updated")
+ self.assertEqual(desired_config["master_start_timeout"], effective_config["master_start_timeout"],
+ "master_start_timeout not updated")
  self.assertEqual(desired_config["synchronous_mode"], effective_config["synchronous_mode"],
  "synchronous_mode not updated")
  self.assertEqual(desired_config["failsafe_mode"], effective_config["failsafe_mode"],

manifests/complete-postgres-manifest.yaml

@@ -129,6 +129,7 @@ spec:
  ttl: 30
  loop_wait: 10
  retry_timeout: 10
+ master_start_timeout: 300
  synchronous_mode: false
  synchronous_mode_strict: false
  synchronous_node_count: 1

manifests/postgresql.crd.yaml

@@ -338,6 +338,8 @@ spec:
  type: string
  retry_timeout:
  type: integer
+ master_start_timeout:
+ type: integer
  slots:
  type: object
  additionalProperties:

pkg/apis/acid.zalan.do/v1/postgresql_type.go

@@ -170,6 +170,7 @@ type Patroni struct {
  TTL uint32 `json:"ttl,omitempty"`
  LoopWait uint32 `json:"loop_wait,omitempty"`
  RetryTimeout uint32 `json:"retry_timeout,omitempty"`
+ MasterStartTimeout uint32 `json:"master_start_timeout,omitempty"`
  MaximumLagOnFailover float32 `json:"maximum_lag_on_failover,omitempty"` // float32 because https://github.com/kubernetes/kubernetes/issues/30213
  Slots map[string]map[string]string `json:"slots,omitempty"`
  SynchronousMode bool `json:"synchronous_mode,omitempty"`

pkg/cluster/k8sres.go

@@ -54,6 +54,7 @@ type patroniDCS struct {
  TTL uint32 `json:"ttl,omitempty"`
  LoopWait uint32 `json:"loop_wait,omitempty"`
  RetryTimeout uint32 `json:"retry_timeout,omitempty"`
+ MasterStartTimeout uint32 `json:"master_start_timeout,omitempty"`
  MaximumLagOnFailover float32 `json:"maximum_lag_on_failover,omitempty"`
  SynchronousMode bool `json:"synchronous_mode,omitempty"`
  SynchronousModeStrict bool `json:"synchronous_mode_strict,omitempty"`
@@ -382,6 +383,9 @@ PatroniInitDBParams:
  if patroni.RetryTimeout != 0 {
  config.Bootstrap.DCS.RetryTimeout = patroni.RetryTimeout
  }
+ if patroni.MasterStartTimeout != 0 {
+ config.Bootstrap.DCS.MasterStartTimeout = patroni.MasterStartTimeout
+ }
  if patroni.TTL != 0 {
  config.Bootstrap.DCS.TTL = patroni.TTL
  }

pkg/cluster/k8sres_test.go

@@ -95,6 +95,7 @@ func TestGenerateSpiloJSONConfiguration(t *testing.T) {
  TTL: 30,
  LoopWait: 10,
  RetryTimeout: 10,
+ MasterStartTimeout: 200,
  MaximumLagOnFailover: 33554432,
  SynchronousMode: true,
  SynchronousModeStrict: true,
@@ -107,7 +108,7 @@ func TestGenerateSpiloJSONConfiguration(t *testing.T) {
  PamRoleName: "zalandos",
  },
  },
- result: `{"postgresql":{"bin_dir":"/usr/lib/postgresql/15/bin","pg_hba":["hostssl all all 0.0.0.0/0 md5","host all all 0.0.0.0/0 md5"]},"bootstrap":{"initdb":[{"auth-host":"md5"},{"auth-local":"trust"},"data-checksums",{"encoding":"UTF8"},{"locale":"en_US.UTF-8"}],"users":{"zalandos":{"password":"","options":["CREATEDB","NOLOGIN"]}},"dcs":{"ttl":30,"loop_wait":10,"retry_timeout":10,"maximum_lag_on_failover":33554432,"synchronous_mode":true,"synchronous_mode_strict":true,"synchronous_node_count":1,"slots":{"permanent_logical_1":{"database":"foo","plugin":"pgoutput","type":"logical"}},"failsafe_mode":true}}}`,
+ result: `{"postgresql":{"bin_dir":"/usr/lib/postgresql/15/bin","pg_hba":["hostssl all all 0.0.0.0/0 md5","host all all 0.0.0.0/0 md5"]},"bootstrap":{"initdb":[{"auth-host":"md5"},{"auth-local":"trust"},"data-checksums",{"encoding":"UTF8"},{"locale":"en_US.UTF-8"}],"users":{"zalandos":{"password":"","options":["CREATEDB","NOLOGIN"]}},"dcs":{"ttl":30,"loop_wait":10,"retry_timeout":10,"master_start_timeout":200,"maximum_lag_on_failover":33554432,"synchronous_mode":true,"synchronous_mode_strict":true,"synchronous_node_count":1,"slots":{"permanent_logical_1":{"database":"foo","plugin":"pgoutput","type":"logical"}},"failsafe_mode":true}}}`,
  },
  {
  subtest: "Patroni failsafe_mode configured globally",

pkg/cluster/sync.go

@@ -604,6 +604,9 @@ func (c *Cluster) checkAndSetGlobalPostgreSQLConfiguration(pod *v1.Pod, effectiv
  if desiredPatroniConfig.RetryTimeout > 0 && desiredPatroniConfig.RetryTimeout != effectivePatroniConfig.RetryTimeout {
  configToSet["retry_timeout"] = desiredPatroniConfig.RetryTimeout
  }
+ if desiredPatroniConfig.MasterStartTimeout > 0 && desiredPatroniConfig.MasterStartTimeout != effectivePatroniConfig.MasterStartTimeout {
+ configToSet["master_start_timeout"] = desiredPatroniConfig.MasterStartTimeout
+ }
  if desiredPatroniConfig.SynchronousMode != effectivePatroniConfig.SynchronousMode {
  configToSet["synchronous_mode"] = desiredPatroniConfig.SynchronousMode
  }