Skip to content

Conversation

@walteh
Copy link
Contributor

@walteh walteh commented May 30, 2025

Problem: The 10s timeout channel is created inside the retry loop, making it impossible for it to fire (the 1s case always wins the select). So the helper retries forever.

Solution: Move timeout := time.After(10 * time.Second) outside the loop and watch the single channel in the select, so the helper returns an error after any failure beyond 10s overall.

Example of current behavior: A fast‑failing read of /var/db/dhcpd_leases causes retryIPFromMAC to continue forever without returning an error.

Note: No functional impact on production code, but it prevents local test runs from hanging and is much easier to debug.

Summary by Sourcery

Extract the 10s timeout channel out of the retry loops in test VM helpers to enforce an overall timeout and prevent infinite retries during testing.

Bug Fixes:

  • Ensure retryIPFromMAC and retrySSHDial return an error after 10 seconds by moving the timeout channel outside the loop

Tests:

  • Prevent local test runs from hanging by enforcing a single timeout across retries in test helpers

@sourcery-ai
Copy link

sourcery-ai bot commented May 30, 2025

Reviewer's Guide

Moved the 10s timeout channel initialization outside retry loops in helper functions to ensure the overall timeout fires once instead of being reset each iteration.

File-Level Changes

Change Details Files
Moved timeout channel initialization outside retry loops
  • Declare timeout := time.After(10 * time.Second) before loop in retryIPFromMAC
  • Replace inline time.After(10 * time.Second) case with <-timeout in retryIPFromMAC
  • Declare timeout := time.After(10 * time.Second) before loop in retrySSHDial
  • Replace inline time.After(10 * time.Second) case with <-timeout in retrySSHDial
test/vm_helpers.go

Tips and commands

Interacting with Sourcery

  • Trigger a new review: Comment @sourcery-ai review on the pull request.
  • Continue discussions: Reply directly to Sourcery's review comments.
  • Generate a GitHub issue from a review comment: Ask Sourcery to create an
    issue from a review comment by replying to it. You can also reply to a
    review comment with @sourcery-ai issue to create an issue from it.
  • Generate a pull request title: Write @sourcery-ai anywhere in the pull
    request title to generate a title at any time. You can also comment
    @sourcery-ai title on the pull request to (re-)generate the title at any time.
  • Generate a pull request summary: Write @sourcery-ai summary anywhere in
    the pull request body to generate a PR summary at any time exactly where you
    want it. You can also comment @sourcery-ai summary on the pull request to
    (re-)generate the summary at any time.
  • Generate reviewer's guide: Comment @sourcery-ai guide on the pull
    request to (re-)generate the reviewer's guide at any time.
  • Resolve all Sourcery comments: Comment @sourcery-ai resolve on the
    pull request to resolve all Sourcery comments. Useful if you've already
    addressed all the comments and don't want to see them anymore.
  • Dismiss all Sourcery reviews: Comment @sourcery-ai dismiss on the pull
    request to dismiss all existing Sourcery reviews. Especially useful if you
    want to start fresh with a new review - don't forget to comment
    @sourcery-ai review to trigger a new review!

Customizing Your Experience

Access your dashboard to:

  • Enable or disable review features such as the Sourcery-generated pull request
    summary, the reviewer's guide, and others.
  • Change the review language.
  • Add, remove or edit custom review instructions.
  • Adjust other review settings.

Getting Help

@openshift-ci
Copy link

openshift-ci bot commented May 30, 2025

Hi @walteh. Thanks for your PR.

I'm waiting for a crc-org member to verify that this patch is reasonable to test. If it is, they should reply with /ok-to-test on its own line. Until that is done, I will not automatically test new commits in this PR, but the usual testing commands by org members will still work. Regular contributors should join the org to skip this step.

Once the patch is verified, the new status will be reflected by the ok-to-test label.

I understand the commands that are listed here.

Details

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

Copy link

@sourcery-ai sourcery-ai bot left a comment

Choose a reason for hiding this comment

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

Hey @walteh - I've reviewed your changes and they look great!

Here's what I looked at during the review
  • 🟢 General issues: all looks good
  • 🟢 Security: all looks good
  • 🟢 Testing: all looks good
  • 🟢 Documentation: all looks good

Sourcery is free for open source - if you like our reviews please consider sharing them ✨
Help me be more useful! Please click 👍 or 👎 on each comment and I'll use the feedback to improve your reviews.

Copy link
Collaborator

@cfergeau cfergeau left a comment

Choose a reason for hiding this comment

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

Good catch!
/lgtm

@cfergeau
Copy link
Collaborator

cfergeau commented Jun 2, 2025

/ok-to-test
/approve

@openshift-ci
Copy link

openshift-ci bot commented Jun 2, 2025

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: cfergeau

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:

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

@openshift-ci openshift-ci bot added the approved label Jun 2, 2025
@openshift-merge-bot openshift-merge-bot bot merged commit a4d45a8 into crc-org:main Jun 2, 2025
5 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants