Skip to content

[Backport release-1.5] fix(mariadb): widen startup probe budget so bootstrap cannot be killed - #3364

Merged
myasnikovdaniil merged 1 commit into
release-1.5from
backport-3344-to-release-1.5
Aug 4, 2026
Merged

myasnikovdaniil merged 1 commit into
release-1.5from
backport-3344-to-release-1.5

Conversation

@github-actions

Copy link
Copy Markdown

Description

Backport of #3344 to release-1.5.

@github-actions

Copy link
Copy Markdown
Author

Please cherry-pick the changes locally and resolve any conflicts.

git fetch origin backport-3344-to-release-1.5
git worktree add --checkout .worktree/backport-3344-to-release-1.5 backport-3344-to-release-1.5
cd .worktree/backport-3344-to-release-1.5
git reset --hard HEAD^
git cherry-pick -x 1e4a1522913aaada1d9df7ed364d87f08b2ef713
git push --force-with-lease

Backport of #3344 onto release-1.5.

The bot's cherry-pick imported hack/e2e-chainsaw/mariadb/chainsaw-test.yaml
whole, because release-1.5 has no such file: the app suite here is still
BATS, and the Chainsaw port landed with #2826 on main only. That file is
dropped and its widening applied to the gate that actually runs on this
branch instead.

That gate needed the change more than the chainsaw one did. In
hack/e2e-apps/mariadb.bats both tests wait 80s for an endpoint address to
appear, and an address appears only once a replica has cleared its startup
then readiness probe. This commit raises the startup budget to 310s, so an
80s ceiling would fail runs the probe was still willing to wait for --
importing the chainsaw file and leaving the BATS suite alone would have
turned the fix into an e2e failure. Both waits go to 600s, matching the
10m the upstream chainsaw assert uses and for the same reason.

packages/apps/mariadb/Makefile gains the `test:` target. It is absent on
release-1.5 -- it arrived with #3071, which was not backported -- and
hack/helm-unit-tests.sh discovers suites by probing for that target, so
without it the backported tests/startup_probe_test.yaml would never be
executed by `make unit-tests`.

Verified locally: 4 assertions in tests/startup_probe_test.yaml pass.

Assisted-By: Claude <[email protected]>
Signed-off-by: Myasnikov Daniil <[email protected]>
(cherry picked from commit a37715062e5da24e54956f075dd2d6417c4dff2e)
@myasnikovdaniil
myasnikovdaniil force-pushed the backport-3344-to-release-1.5 branch from a5deb52 to d2cf83c Compare July 31, 2026 05:28
@github-actions github-actions Bot added area/database Issues or PRs related to managed databases (postgres, mariadb, redis, etcd, kafka, clickhouse) area/release Issues or PRs related to release tooling (changelog, backport, release pipeline) kind/bug Categorizes issue or PR as related to a bug size/M This PR changes 30-99 lines, ignoring generated files labels Jul 31, 2026
@myasnikovdaniil
myasnikovdaniil marked this pull request as ready for review August 4, 2026 08:27
@gemini-code-assist

Copy link
Copy Markdown
Contributor

Caution

The consumer version of Gemini Code Assist on GitHub has been sunset. All code review activity has officially ceased.

@dosubot dosubot Bot added the kind/backport-previous Categorizes issue or PR as requiring a backport to the previous release line label Aug 4, 2026
@myasnikovdaniil
myasnikovdaniil merged commit f68b1d6 into release-1.5 Aug 4, 2026
10 checks passed
@myasnikovdaniil
myasnikovdaniil deleted the backport-3344-to-release-1.5 branch August 4, 2026 08:30
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

area/database Issues or PRs related to managed databases (postgres, mariadb, redis, etcd, kafka, clickhouse) area/release Issues or PRs related to release tooling (changelog, backport, release pipeline) kind/backport-previous Categorizes issue or PR as requiring a backport to the previous release line kind/bug Categorizes issue or PR as related to a bug size/M This PR changes 30-99 lines, ignoring generated files

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant