Skip to content

FV: Extend timeout for dataplane apply after config restart. #10729

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from

Conversation

fasaxc
Copy link
Member

@fasaxc fasaxc commented Jul 25, 2025

Description

Have seen this flake in enterprise tests.

Related issues/PRs

Todos

  • Tests
  • Documentation
  • Release note

Release Note

TBD

Reminder for the reviewer

Make sure that this PR has the correct labels and milestone set.

Every PR needs one docs-* label.

  • docs-pr-required: This change requires a change to the documentation that has not been completed yet.
  • docs-completed: This change has all necessary documentation completed.
  • docs-not-required: This change has no user-facing impact and requires no docs.

Every PR needs one release-note-* label.

  • release-note-required: This PR has user-facing changes. Most PRs should have this label.
  • release-note-not-required: This PR has no user-facing changes.

Other optional labels:

  • cherry-pick-candidate: This PR should be cherry-picked to an earlier release. For bug fixes only.
  • needs-operator-pr: This PR is related to install and requires a corresponding change to the operator.

Have seen this flake in enterprise tests.
@Copilot Copilot AI review requested due to automatic review settings July 25, 2025 10:17
@fasaxc fasaxc requested a review from a team as a code owner July 25, 2025 10:17
@fasaxc fasaxc added docs-not-required Docs not required for this change release-note-not-required Change has no user-facing impact labels Jul 25, 2025
@marvin-tigera marvin-tigera added this to the Calico v3.31.0 milestone Jul 25, 2025
Copy link
Contributor

@Copilot Copilot AI left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pull Request Overview

This PR extends the timeout for waiting for Felix dataplane apply operations after configuration restarts to address test flakiness. The change increases the timeout from the default (2s) to 5 seconds with 100ms polling intervals.

  • Added explicit timeout and polling interval parameters to the Eventually assertion
  • Added descriptive error message for better debugging when the assertion fails

@@ -246,7 +246,8 @@ func waitForFelixInSync(felix *infrastructure.Felix) {
// And then we should see at least one apply to the dataplane.
Eventually(func() (int, error) {
return metrics.GetFelixMetricInt(felix.IP, "felix_int_dataplane_apply_time_seconds_count")
}).Should(BeNumerically(">", 0))
}, "5s", "100ms").Should(BeNumerically(">", 0),
Copy link
Preview

Copilot AI Jul 25, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

[nitpick] Consider using named constants for the timeout and polling interval values ("5s" and "100ms") to improve maintainability and make it easier to adjust these values consistently across the test suite if needed.

Suggested change
}, "5s", "100ms").Should(BeNumerically(">", 0),
}, DefaultTimeout, PollingInterval).Should(BeNumerically(">", 0),

Copilot uses AI. Check for mistakes.

@fasaxc fasaxc added the flake-fix This PR fixes a test flake; we may want to backport it. label Jul 25, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
docs-not-required Docs not required for this change flake-fix This PR fixes a test flake; we may want to backport it. release-note-not-required Change has no user-facing impact
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants