Repository navigation
Conversation
Hive-Run: hivecommons#15088 Hive-Plan: contributor-lane auto-promotion search reduction Hive-Spec: issue-15088#acceptance-criteria Co-authored-by: Danathar <6772335+Danathar@users.noreply.github.com> Signed-off-by: Karibhou <157208370+Karibhou@users.noreply.github.com>
Open PR overlap checkBase branch: Conflicts are checked with every PR merged onto the current tip of
|
There was a problem hiding this comment.
Read the diff against the tree at 2d184d9, plus the sweep loop and callers. This looks correct to me.
- The cache map is created once per sweep in
SweepContributorLaneAutoMerges(automerge_contributor_lane.go:401) and the sweep walks repos/PRs serially (:402,:421), so the unsynchronised map is safe. Callers outside the sweep getcache == niland fall through to the pre-existing path unchanged. - With a cache present the query now includes the PR's own repo (
:835) and filters it out at return (:892-899); that is what lets a later PR by the same author in a different repo reuse the result correctly. A failed search is cached asnil(:871,:881), so one 403 per author per sweep is the ceiling β which is exactly the secondary-rate-limit scenario in #15088. - Bot skip at
:630([bot]suffix or the App's own login) short-circuits before any search, matching thegithub-actions[bot]case the issue reports.
Suggestion only, not a defect: TestContributorPromotionSearchCachePerSweep exercises contributorCleanMergedHistory directly with a hand-built ctx; a test through SweepContributorLaneAutoMerges would also pin that the sweep actually installs the cache at :401.
β hive: agent=reviewer backend=copilot model=claude-fable-5.1 copilot=1.0.88
There was a problem hiding this comment.
Read the diff against the tree at 2d184d9, plus the call chain from SweepContributorLaneAutoMerges down. Looks correct to me.
- The per-sweep cache survives the trip to
contributorMergedRepos:SweepContributorLaneAutoMergeswrapsctxatautomerge_contributor_lane.go:401, andmergeDecisionPriority(automerge_sweep.go:518-523) derives from that ctx rather than replacing it, soadmitContributorβcontributorCleanMergedHistoryβcontributorMergedRepossees the map. - In cached mode the PR's own repo is deliberately kept in the search (
:835) so the entry is author-wide, and it is filtered back out on both the hit (:819-826) and fill (:892-900) paths β callers still get "other repos" as before. Out-of-sweep callers (cache == nil) keep the old per-call behaviour unchanged. - A failed search is stored as
nilfor the rest of the sweep (:871,:881), so one 403 no longer turns into a retry per PR by that author β which is the behaviour #15088 was asking for. Worth knowing as an operator: a transient search failure now sticks for the whole sweep, not just one PR. - The
[bot]/ App-login skip at:630sits before the history call, so bot authors reach zeroSearch.Issues, matching the issue's first acceptance criterion;TestContributorPromotionSkipsBotsandTestContributorPromotionSearchCachePerSweepcover (a), (b), (c) from the issue's test plan.
No defects found.
β hive: agent=reviewer-2 backend=copilot model=claude-fable-5.1 copilot=1.0.88
|
Ready for a human merge: verdict approved @2d184d9, 56/56 checks green, DCO yes, soak 30m0s elapsed. Blocked only by The hive never approves on your behalf: |
|
/hive decision supersede now: adopt #15090 in supersede mode, preserving the author's commits and sign-off; do not wait for the grace deadline Rationale: the contributor is offline; adoption in supersede mode keeps the work moving (#13975). Hive decided: Close this PR and open a fresh hive-authored PR with the same commits. Decided by the hive at @clubanderson's request as the owner's delegate under the owner-delegate policy (rule |
The merge-gate pill (#15084) read an issue row's lane reason β 'open PR #15090 covers it (PR at 060-reviewed)' β as a gate reason and drew it as the pill's detail, a two-line clipped label on every issue whose PR sat at the gate. The pill is now the stage word plus a gate fact only; the issue row reads the gate from the nested PR it mirrors so it agrees with the PR sub-row, and the cover reason leads the glyph tooltip instead. Fixes #15101 Signed-off-by: Andrew Anderson <andy@clubanderson.com>
|
/lgtm Posted by @clubanderson from the Hive dashboard; the merge gate decides from here. |
|
@hivecommons-hive[bot]: changing LGTM is restricted to collaborators DetailsIn response to this:
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. |
|
/approve Posted by @clubanderson from the Hive dashboard; the merge gate decides from here. |
|
[APPROVALNOTIFIER] This PR is NOT APPROVED This pull-request has been approved by: hivecommons-hive[bot] The full list of commands accepted by this bot can be found here. DetailsNeeds approval from an approver in each of these files:Approvers can indicate their approval by writing |
|
@Karibhou the hive has adopted this PR ( |
|
Superseded by #15125 (hive re-authored this PR with the same commits and sign-off; it will be merged there). Closing to keep one active PR per issue. |
Summary
Fixes #15088
Validation
gofmt -lon changed Go files andgit diff --checkpassed.β hive: backend=codex