fix: Prevent excessive reconciliation when timeout disabled #9202

vdemeester · 2025-12-03T10:23:47Z

Changes

Stop immediate requeue loops when default-timeout-minutes is "0"
Remove redundant hasCondition checks (Knative already deduplicates)

This adds an e2e tests that looks at pipeline logs to see how much reconciler loop there is. If you run it before the fix, it would count more than 1500 reconciler loop, whereas with the fix, only about 10.

/cc @afrittoli @pritidesai @tektoncd/core-maintainers

It took me a while to figure out, and I got some help from Claude (AI) to write the tests. The previous behavior seemed very weird as well, with no timeout, we would, re-queue instantly, which is.. madness 🙃

/kind bug

Fixes #8495

This could be a good candidate to be backported.

Submitter Checklist

As the author of this PR, please check off the items in this checklist:

Has Docs if any changes are user facing, including updates to minimum requirements e.g. Kubernetes version bumps
Has Tests included if any functionality added or changed
pre-commit Passed
Follows the commit message standard
Meets the Tekton contributor standards (including functionality, content, code)
Has a kind label. You can add one by adding a comment on this PR that contains /kind <type>. Valid types are bug, cleanup, design, documentation, feature, flake, misc, question, tep
Release notes block below has been updated with any user facing changes (API changes, bug fixes, changes requiring upgrade notices or deprecation warnings). See some examples of good release notes.
Release notes contains the string "action required" if the change requires additional action from users switching to the new release

Release Notes

Fix an issue where there was excessive reconciliation in case of no timeout on TaskRun or PipelineRun.

vdemeester · 2025-12-03T14:32:22Z

/hold
Getting help from Claude to figure out the e2e failures 😅 Will remove the hold once I get greens

twoGiants

Great job for the fix 😸 👍. My brain got challenged understanding the timeout order... 🧠 ⚡. It looks good though! I would just keep the code a bit more consistent, will aid in future understanding.

See my comments below.

pkg/reconciler/pipelinerun/pipelinerun.go

- Stop immediate requeue loops when default-timeout-minutes is "0" - Remove redundant hasCondition checks (Knative already deduplicates) This adds an e2e tests that looks at pipeline logs to see how much reconciler loop there is. If you run it before the fix, it would count more than 1500 reconciler loop, whereas with the fix, only about 10. Signed-off-by: Vincent Demeester <[email protected]> Co-Authored-By: Claude <[email protected]>

vdemeester · 2025-12-09T10:20:17Z

@twoGiants I changed a bit the if/else chains to make it.. less weird.. hopefully it's more readable.

vdemeester · 2025-12-18T08:27:27Z

/hold cancel

vdemeester · 2025-12-18T10:36:15Z

/retest

twoGiants

Looks good! 😸 👍

I would just add a category the tests => parallel and return early in a if.

/approve
/lgtm

twoGiants · 2025-12-23T08:42:17Z

pkg/reconciler/pipelinerun/pipelinerun.go

+				if timeout != config.NoTimeoutDuration {
+					waitTime := timeout - elapsed
+					if finallyWaitTime < waitTime {
+						waitTime = finallyWaitTime


Suggested change

waitTime = finallyWaitTime

return controller.NewRequeueAfter(finallyWaitTime)

twoGiants · 2025-12-23T08:48:09Z

test/excessive_reconciliation_test.go

+// With the fix, reconciliations should stay well below 20 (typically around 10 or less).
+//
+// This test validates the fix by counting actual reconciliations from controller logs.
+func TestPipelineRunExcessiveReconciliation(t *testing.T) {


Categorize the test as a parallel test following the new categorization logic.

tekton-robot · 2025-12-23T08:53:55Z

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: twoGiants

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Details

Needs approval from an approver in each of these files:

~~OWNERS~~ [twoGiants]

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@test

Use early returns in timeout handling for better code consistency and readability throughout the reconciliation logic. Add missing @test:execution=parallel annotation to the excessive reconciliation e2e test for proper test categorization. Addresses review feedback from PR tektoncd#9202.

@test

Use early returns in timeout handling for better code consistency and readability throughout the reconciliation logic. Add missing @test:execution=parallel annotation to the excessive reconciliation e2e test for proper test categorization. Addresses review feedback from PR #9202.

@test

Use early returns in timeout handling for better code consistency and readability throughout the reconciliation logic. Add missing @test:execution=parallel annotation to the excessive reconciliation e2e test for proper test categorization. Addresses review feedback from PR tektoncd#9202.

@test

Use early returns in timeout handling for better code consistency and readability throughout the reconciliation logic. Add missing @test:execution=parallel annotation to the excessive reconciliation e2e test for proper test categorization. Addresses review feedback from PR tektoncd#9202.

vdemeester · 2026-01-26T14:54:38Z

/cherry-pick release-v1.6.x release-v1.3.x release-v1.0.x

tekton-robot · 2026-01-26T14:55:16Z

✅ Cherry-pick to release-v1.3.x successful!

A new pull request has been created to cherry-pick this change to release-v1.3.x.

Please review and merge the cherry-pick PR.

tekton-robot · 2026-01-26T14:55:16Z

✅ Cherry-pick to release-v1.6.x successful!

A new pull request has been created to cherry-pick this change to release-v1.6.x.

Please review and merge the cherry-pick PR.

tekton-robot · 2026-01-26T14:55:41Z

✅ Cherry-pick to release-v1.0.x successful!

A new pull request has been created to cherry-pick this change to release-v1.0.x.

Please review and merge the cherry-pick PR.

Bump Go version to 1.24.0 to enable t.Context() usage in tests, which was introduced in Go 1.24. This is required for the cherry-pick of tektoncd#9202 (excessive reconciliation fix) to work on the release-v1.0.x branch. Co-Authored-By: Claude Opus 4.5 <[email protected]>

Bump Go version to 1.24.0 to enable t.Context() usage in tests, which was introduced in Go 1.24. This is required for the cherry-pick of #9202 (excessive reconciliation fix) to work on the release-v1.0.x branch. Co-Authored-By: Claude Opus 4.5 <[email protected]>

vdemeester · 2026-01-30T15:19:08Z

/cherry-pick release-v1.0.x

tekton-robot · 2026-01-30T16:09:39Z

❌ Cherry-pick to release-v1.0.x failed!

The automatic cherry-pick to release-v1.0.x failed.

Output:

🤖 Starting cherry-pick process...
Fetching PR #9202 information...
Found merge commit: 84d32b509c85cd08567edf3e3bd86d42a20dfb40
PR title: fix: Prevent excessive reconciliation when timeout disabled
Fetching target branch: release-v1.0.x...
From https://github.com/tektoncd/pipeline
 * branch                release-v1.0.x -> FETCH_HEAD
Checking for existing cherry-pick PR...
Creating cherry-pick branch: cherry-pick-9202-to-release-v1.0.x...
Switched to a new branch 'cherry-pick-9202-to-release-v1.0.x'
branch 'cherry-pick-9202-to-release-v1.0.x' set up to track 'origin/release-v1.0.x'.
Fetching commits from PR #9202...
Found 1 commit(s) to cherry-pick
Cherry-picking commit 1/1: 9d13377dd086adc318f481b02494eefaf0694892...
fatal: bad object 9d13377dd086adc318f481b02494eefaf0694892
❌ ERROR: Cherry-pick failed for commit 9d13377dd086adc318f481b02494eefaf0694892 due to conflicts or other errors

Next steps:

Check the action logs for complete details
If the PR is not merged, merge it first and try again
If there are conflicts, you'll need to manually cherry-pick this PR

waveywaves · 2026-02-03T16:08:58Z

/cherry-pick release-v1.3.x

tekton-robot · 2026-02-03T16:09:36Z

❌ Cherry-pick to release-v1.3.x failed!

The automatic cherry-pick to release-v1.3.x failed.

Output:

🤖 Starting cherry-pick process...
Fetching PR #9202 information...
Found merge commit: 84d32b509c85cd08567edf3e3bd86d42a20dfb40
PR title: fix: Prevent excessive reconciliation when timeout disabled
Fetching target branch: release-v1.3.x...
From https://github.com/tektoncd/pipeline
 * branch                release-v1.3.x -> FETCH_HEAD
Checking for existing cherry-pick PR...
Creating cherry-pick branch: cherry-pick-9202-to-release-v1.3.x...
Switched to a new branch 'cherry-pick-9202-to-release-v1.3.x'
branch 'cherry-pick-9202-to-release-v1.3.x' set up to track 'origin/release-v1.3.x'.
Fetching commits from PR #9202...
Found 1 commit(s) to cherry-pick
Cherry-picking commit 1/1: 9d13377dd086adc318f481b02494eefaf0694892...
fatal: bad object 9d13377dd086adc318f481b02494eefaf0694892
❌ ERROR: Cherry-pick failed for commit 9d13377dd086adc318f481b02494eefaf0694892 due to conflicts or other errors

Next steps:

Check the action logs for complete details
If the PR is not merged, merge it first and try again
If there are conflicts, you'll need to manually cherry-pick this PR

waveywaves · 2026-02-03T16:11:15Z

/cherry-pick release-v1.3.x

tekton-robot · 2026-02-03T16:11:53Z

❌ Cherry-pick to release-v1.3.x failed!

The automatic cherry-pick to release-v1.3.x failed.

Output:

🤖 Starting cherry-pick process...
Fetching PR #9202 information...
Found merge commit: 84d32b509c85cd08567edf3e3bd86d42a20dfb40
PR title: fix: Prevent excessive reconciliation when timeout disabled
Fetching target branch: release-v1.3.x...
From https://github.com/tektoncd/pipeline
 * branch                release-v1.3.x -> FETCH_HEAD
Checking for existing cherry-pick PR...
Creating cherry-pick branch: cherry-pick-9202-to-release-v1.3.x...
Switched to a new branch 'cherry-pick-9202-to-release-v1.3.x'
branch 'cherry-pick-9202-to-release-v1.3.x' set up to track 'origin/release-v1.3.x'.
Fetching commits from PR #9202...
Found 1 commit(s) to cherry-pick
Cherry-picking commit 1/1: 9d13377dd086adc318f481b02494eefaf0694892...
fatal: bad object 9d13377dd086adc318f481b02494eefaf0694892
❌ ERROR: Cherry-pick failed for commit 9d13377dd086adc318f481b02494eefaf0694892 due to conflicts or other errors

Next steps:

Check the action logs for complete details
If the PR is not merged, merge it first and try again
If there are conflicts, you'll need to manually cherry-pick this PR

vdemeester · 2026-02-03T16:13:35Z

arf, we probably need to do it manually ? 🤔 or something is fishy...

github-project-automation bot added this to Tekton Community Roadmap Dec 3, 2025

github-project-automation bot moved this to Todo in Tekton Community Roadmap Dec 3, 2025

tekton-robot requested a review from afrittoli December 3, 2025 10:23

tekton-robot added release-note Denotes a PR that will be considered when it comes time to generate release notes. kind/bug Categorizes issue or PR as related to a bug. labels Dec 3, 2025

tekton-robot requested review from a team and pritidesai December 3, 2025 10:23

tekton-robot added the size/L Denotes a PR that changes 100-499 lines, ignoring generated files. label Dec 3, 2025

vdemeester added this to the v1.8.0 milestone Dec 3, 2025

vdemeester force-pushed the fix-8495-excessive-reconciliation branch from c99df33 to 70e919d Compare December 3, 2025 11:57

tekton-robot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Dec 3, 2025

twoGiants reviewed Dec 3, 2025

View reviewed changes

vdemeester force-pushed the fix-8495-excessive-reconciliation branch from 661ed4e to 9d13377 Compare December 9, 2025 10:13

tekton-robot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Dec 18, 2025

twoGiants approved these changes Dec 23, 2025

View reviewed changes

tekton-robot assigned twoGiants Dec 23, 2025

tekton-robot added the lgtm Indicates that a PR is ready to be merged. label Dec 23, 2025

tekton-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Dec 23, 2025

tekton-robot merged commit 84d32b5 into tektoncd:main Dec 23, 2025
38 of 39 checks passed

github-project-automation bot moved this from Todo to Done in Tekton Community Roadmap Dec 23, 2025

vdemeester deleted the fix-8495-excessive-reconciliation branch December 23, 2025 10:45

vdemeester mentioned this pull request Dec 23, 2025

Improve code consistency and fix missing test annotation #9266

Merged

8 tasks

vdemeester modified the milestones: v1.8.0, v1.9.0 (LTS) Jan 26, 2026

This was referenced Jan 26, 2026

[cherry-pick: release-v1.3.x] fix: Prevent excessive reconciliation when timeout disabled #9302

Closed

[cherry-pick: release-v1.6.x] fix: Prevent excessive reconciliation when timeout disabled #9303

Merged

tekton-robot mentioned this pull request Jan 26, 2026

[cherry-pick: release-v1.0.x] fix: Prevent excessive reconciliation when timeout disabled #9304

Closed

8 tasks

vdemeester mentioned this pull request Jan 28, 2026

[release-v1.0.x] build: bump Go version to 1.24.0 and fix e2e test infrastructure #9318

Merged

8 tasks

	waitTime = finallyWaitTime
	return controller.NewRequeueAfter(finallyWaitTime)

fix: Prevent excessive reconciliation when timeout disabled #9202

fix: Prevent excessive reconciliation when timeout disabled #9202

Conversation

vdemeester commented Dec 3, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Changes

Submitter Checklist

Release Notes

Uh oh!

vdemeester commented Dec 3, 2025

Uh oh!

twoGiants left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

vdemeester commented Dec 9, 2025

Uh oh!

vdemeester commented Dec 18, 2025

Uh oh!

vdemeester commented Dec 18, 2025

Uh oh!

twoGiants left a comment • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

twoGiants Dec 23, 2025

Choose a reason for hiding this comment

Uh oh!

twoGiants Dec 23, 2025

Choose a reason for hiding this comment

Uh oh!

tekton-robot commented Dec 23, 2025

Uh oh!

Uh oh!

vdemeester commented Jan 26, 2026

Uh oh!

tekton-robot commented Jan 26, 2026

Uh oh!

tekton-robot commented Jan 26, 2026

Uh oh!

tekton-robot commented Jan 26, 2026

Uh oh!

vdemeester commented Jan 30, 2026

Uh oh!

tekton-robot commented Jan 30, 2026

Uh oh!

waveywaves commented Feb 3, 2026

Uh oh!

tekton-robot commented Feb 3, 2026

Uh oh!

waveywaves commented Feb 3, 2026

Uh oh!

tekton-robot commented Feb 3, 2026

Uh oh!

vdemeester commented Feb 3, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

vdemeester commented Dec 3, 2025 •

edited

Loading

twoGiants left a comment •

edited

Loading