feat(rollout): honor primaryUpdateMethod when adding PVCs by jsilvela · Pull Request #9720 · cloudnative-pg/cloudnative-pg

jsilvela · 2026-01-14T14:59:29Z

Currently, when upgrading a cluster to add a new tablespace or set
a dedicated WAL volume, the configured choice of
primaryUpdateMethod is ignored, and primary restart is forced.
This PR enables cluster upgrade for these cases to proceed with
primary switchover if so configured.

Closes #5564
Closes #5484

github-actions · 2026-01-14T14:59:41Z

❗ By default, the pull request is configured to backport to all release branches.

To stop backporting this pr, remove the label: backport-requested ◀️ or add the label 'do not backport'
To stop backporting this pr to a certain release branch, remove the specific branch label: release-x.y

jsilvela · 2026-01-14T15:05:01Z

/test depth=push test_level=4 feature_type=basic

github-actions · 2026-01-14T15:05:16Z

@jsilvela, here's the link to the E2E on CNPG workflow run: https://github.com/cloudnative-pg/cloudnative-pg/actions/runs/20998879371

jsilvela · 2026-01-14T17:28:25Z

/test depth=push test_level=4 feature_type=basic

github-actions · 2026-01-14T17:28:36Z

@jsilvela, here's the link to the E2E on CNPG workflow run: https://github.com/cloudnative-pg/cloudnative-pg/actions/runs/21003605175

jsilvela · 2026-01-23T15:25:43Z

/test depth=push test_level=4 feature_type=storage

github-actions · 2026-01-23T15:25:55Z

@jsilvela, here's the link to the E2E on CNPG workflow run: https://github.com/cloudnative-pg/cloudnative-pg/actions/runs/21291363627

jsilvela · 2026-01-23T17:01:01Z

/test

github-actions · 2026-01-23T17:01:15Z

@jsilvela, here's the link to the E2E on CNPG workflow run: https://github.com/cloudnative-pg/cloudnative-pg/actions/runs/21294268184

internal/controller/cluster_upgrade.go

Signed-off-by: Jaime Silvela <[email protected]>

Refactor arePVCsForTablespaceHealthy into buildPVCChecker that builds the healthy PVC lookup map once per reconciliation instead of per-tablespace. Downgrade log level from Warning to Info since unhealthy PVCs during rollout are an expected transient state. Add direct unit tests for the PVC checker covering edge cases (all healthy, partial, empty instances, no healthy PVCs). Signed-off-by: Armando Ruocco <[email protected]>

Rename AssertPrimaryWasUpdated to AssertPrimaryUpdateMethod and fix trailing space in tablespace creation log message. Signed-off-by: Marco Nenciarini <[email protected]>

Replace struct parameters with the string names actually used, and move podList.LogStatus to the caller. Signed-off-by: Marco Nenciarini <[email protected]>

Separate AssertClusterIsReady into its own By block in the switchover context to match the restart context structure. Signed-off-by: Marco Nenciarini <[email protected]>

mnencia · 2026-02-19T13:56:10Z

/test

github-actions · 2026-02-19T13:56:20Z

@mnencia, here's the link to the E2E on CNPG workflow run: https://github.com/cloudnative-pg/cloudnative-pg/actions/runs/22184688312

mnencia · 2026-02-19T16:30:26Z

/ok-to-merge E2E failed for a network error.

Only createTablespaceAction needs the PVC health check. Store it as a field instead of polluting the tablespaceReconcilerStep interface with a parameter ignored by the other implementations. Signed-off-by: Marco Nenciarini <[email protected]>

mnencia · 2026-02-19T17:16:17Z

/test

github-actions · 2026-02-19T17:16:30Z

@mnencia, here's the link to the E2E on CNPG workflow run: https://github.com/cloudnative-pg/cloudnative-pg/actions/runs/22192195550

Currently, when upgrading a cluster to add a new tablespace or set a dedicated WAL volume, the configured choice of `primaryUpdateMethod` is ignored, and primary restart is forced. This PR enables cluster upgrade for these cases to proceed with primary switchover if so configured. Closes #5564 Closes #5484 Signed-off-by: Jaime Silvela <[email protected]> Signed-off-by: Armando Ruocco <[email protected]> Signed-off-by: Marco Nenciarini <[email protected]> Co-authored-by: Armando Ruocco <[email protected]> Co-authored-by: Marco Nenciarini <[email protected]> (cherry picked from commit 9d216d2)

jsilvela requested review from a team, NiccoloFei and litaocdl as code owners January 14, 2026 14:59

jsilvela marked this pull request as draft January 14, 2026 14:59

dosubot bot added the size:L This PR changes 100-499 lines, ignoring generated files. label Jan 14, 2026

cnpg-bot added backport-requested ◀️ This pull request should be backported to all supported releases release-1.25 release-1.27 release-1.28 labels Jan 14, 2026

dosubot bot added the enhancement 🪄 New feature or request label Jan 14, 2026

cnpg-bot added the ok to merge 👌 This PR can be merged label Jan 14, 2026

jsilvela changed the title ~~feat: enable primary switchover when adding new tablespaces~~ feat(tablespaces): enable primary switchover when adding new tablespaces Jan 14, 2026

jsilvela changed the title ~~feat(tablespaces): enable primary switchover when adding new tablespaces~~ feat: enable primary switchover when upgrading a cluster for PVC volume or tablespaces Jan 26, 2026

jsilvela changed the title ~~feat: enable primary switchover when upgrading a cluster for PVC volume or tablespaces~~ feat: enable primary switchover on cluster upgrade due to addition of tablespace or WAL volume Jan 26, 2026

jsilvela marked this pull request as ready for review January 26, 2026 15:56

dosubot bot added size:XL This PR changes 500-999 lines, ignoring generated files. and removed size:L This PR changes 100-499 lines, ignoring generated files. labels Jan 26, 2026

jsilvela force-pushed the dev/5564 branch from 68128d5 to 01da220 Compare January 26, 2026 15:56

jsilvela commented Jan 26, 2026

View reviewed changes

internal/controller/cluster_upgrade.go Show resolved Hide resolved

jsilvela commented Jan 26, 2026

View reviewed changes

internal/controller/cluster_upgrade.go Outdated Show resolved Hide resolved

jsilvela mentioned this pull request Jan 26, 2026

fix: primary is not switchover when adding wal storage #5486

Closed

jsilvela added 4 commits February 19, 2026 14:46

chore: simplify rollout representation

b71f0cc

Signed-off-by: Jaime Silvela <[email protected]>

chore: add unit test, clarify flow

64f7964

Signed-off-by: Jaime Silvela <[email protected]>

test: clarify Tablespaces e2e test

08ef9fc

Signed-off-by: Jaime Silvela <[email protected]>

chore: go back to original switchover behavior

4fad5d6

Signed-off-by: Jaime Silvela <[email protected]>

mnencia force-pushed the dev/5564 branch from afbcc33 to ab14559 Compare February 19, 2026 13:46

jsilvela and others added 6 commits February 19, 2026 14:53

Apply suggestion from @jsilvela

86002de

Signed-off-by: Jaime Silvela <[email protected]>

Apply suggestion from @jsilvela

9ac44d0

Signed-off-by: Jaime Silvela <[email protected]>

chore: minor cleanups from review

6db94ec

Rename AssertPrimaryWasUpdated to AssertPrimaryUpdateMethod and fix trailing space in tablespace creation log message. Signed-off-by: Marco Nenciarini <[email protected]>

refactor: simplify switchPrimary parameter list

1ec0d1d

Replace struct parameters with the string names actually used, and move podList.LogStatus to the caller. Signed-off-by: Marco Nenciarini <[email protected]>

test: align e2e tablespace test structure between contexts

b5b1a4a

Separate AssertClusterIsReady into its own By block in the switchover context to match the restart context structure. Signed-off-by: Marco Nenciarini <[email protected]>

mnencia force-pushed the dev/5564 branch from 88f1091 to b5b1a4a Compare February 19, 2026 13:54

mnencia approved these changes Feb 19, 2026

View reviewed changes

mnencia linked an issue Feb 19, 2026 that may be closed by this pull request

[Bug]: primary pod is not switchover when add new wal volume #5484

Closed

4 tasks

mnencia removed the ok to merge 👌 This PR can be merged label Feb 19, 2026

cnpg-bot added the ok to merge 👌 This PR can be merged label Feb 19, 2026

mnencia changed the title ~~feat: enable primary switchover on cluster upgrade due to addition of a tablespace or WAL volume~~ feat(rollout): honor primaryUpdateMethod when adding PVCs Feb 19, 2026

mnencia merged commit 9d216d2 into main Feb 19, 2026
35 checks passed

mnencia deleted the dev/5564 branch February 19, 2026 19:58

This was referenced Feb 19, 2026

Backport failure for pull request 9720 #10025

Closed

Backport failure for pull request 9720 #10030

Closed

Conversation

jsilvela commented Jan 14, 2026 • edited by mnencia Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

github-actions bot commented Jan 14, 2026

Uh oh!

jsilvela commented Jan 14, 2026

Uh oh!

github-actions bot commented Jan 14, 2026

Uh oh!

jsilvela commented Jan 14, 2026

Uh oh!

github-actions bot commented Jan 14, 2026

Uh oh!

jsilvela commented Jan 23, 2026

Uh oh!

github-actions bot commented Jan 23, 2026

Uh oh!

jsilvela commented Jan 23, 2026

Uh oh!

github-actions bot commented Jan 23, 2026

Uh oh!

Uh oh!

Uh oh!

mnencia commented Feb 19, 2026

Uh oh!

github-actions bot commented Feb 19, 2026

Uh oh!

mnencia commented Feb 19, 2026

Uh oh!

mnencia commented Feb 19, 2026

Uh oh!

github-actions bot commented Feb 19, 2026

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

jsilvela commented Jan 14, 2026 •

edited by mnencia

Loading