Skip to content
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

Improve manual forward port jobs #1052

Open
3 of 4 tasks
xmo-odoo opened this issue Feb 12, 2025 · 0 comments
Open
3 of 4 tasks

Improve manual forward port jobs #1052

xmo-odoo opened this issue Feb 12, 2025 · 0 comments

Comments

@xmo-odoo
Copy link
Collaborator

xmo-odoo commented Feb 12, 2025

Complements #1051

Currently if there are issues with forward ports I create forward port batches by hand, however this is a very raw / low level job, and creating objects by hand does not necessarily uphold all the implicit invariants which can cause issues:

  • When trying to force a followup, if there are detached forward ports triggering from the source batch seems to not work, might need to find the latest forward port on the sequence (which might be on the branch we just disabled)

  • If a batch keeps failing e.g. because it's a duplicate and the previous version is already merged the fw will keep trying and failing forever.

    • Might be a good idea to add some backoff.
    • Make into mail.thread and add failure note so the information is not hidden in the logs.
    • Maybe add more extensive backoff on failure (not just a constant backoff).
  • Can create a double port via batches, not entirely sure how (probably because duplication is checked before creating the batch, once the batch is created there's basically no check)

  • Maybe create a "force port" action on the PR which can do all the right things and we stop creating forwardport batches by hand?

@github-project-automation github-project-automation bot moved this to ideas in Mergebot Feb 14, 2025
@xmo-odoo xmo-odoo moved this from ideas to done in Mergebot Feb 14, 2025
xmo-odoo added a commit that referenced this issue Feb 14, 2025
In the case where multiple batch completions are triggered (see 3
commits earlier) one of the issues is that the "already ported" check
is incorrect, as it checks the (source, target) pair against the PR
used to trigger the completion check. That PR *should* be the one PR
which was just added to a batch, but if one of its descendants is used
to re-trigger a port then the dupe check fails and we try to port the
thing again.

Remember to deref' the subject's source in order to perform the dupe
check, as well as set the source for the forwardport we create.

Fixes #1052
xmo-odoo added a commit that referenced this issue Feb 14, 2025
Hit issues where this didn't seem to work after deactivating 17.2 and
trying to recover from the autoport being broken (see previous
commits), but apparently this says everything works just fine so
╮( ̄▽ ̄"")╭

Fixes #1052
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
Status: done
Development

No branches or pull requests

1 participant