Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions changelog.d/fixed-18059-contributor-unsearchable-warn.md
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
- Contributor-lane auto-promotion now warns once per refused author and once per refused repository when GitHub's search cannot see a repository, instead of once per author × repository pair, so one invisible repository or one unsearchable author no longer floods WARN and self-reports as a repeated unclassified error (#18059).
29 changes: 22 additions & 7 deletions src/pkg/github/automerge/automerge_contributor_unsearchable.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,12 @@ import (
// TTL lets a repaired repository or account come back without a restart.
const contributorUnsearchableTTL = time.Hour

// contributorUnsearchableMessage is logged once per (author, repository)
// pair per process at WARN, then at Debug.
// contributorUnsearchableMessage is logged at WARN only for a refusal whose
// author and searched repository have both not been warned for yet in this
// process, then at Debug. Keying the WARN by pair let one invisible
// repository warn once for every contributor (or one unsearchable author once
// for every hive repository), which the self-report classifier counted as a
// repeated unclassified error (hivecommons/hive#18059).
const contributorUnsearchableMessage = "contributor-lane auto-promotion search cannot see repository for this author; leaving it out of the hive-wide count"

// searchQueryUnsearchable reports whether err is GitHub's 422 Validation
Expand All @@ -45,20 +49,31 @@ func (c *Engine) contributorSearchSkips(author string, ref contributorRepoRef) b
}

// noteContributorUnsearchable records that GitHub refused to search ref for
// author, so the next contributorUnsearchableTTL of sweeps leave it out. The
// first refusal for a pair logs at WARN; a refusal again after the TTL logs
// at Debug, so a permanently unsearchable pair is not a repeated warning.
// author, so the next contributorUnsearchableTTL of sweeps leave it out. A
// refusal logs at WARN only when neither its author nor its searched
// repository has warned before in this process; every other refusal —
// another author for the same invisible repository, another repository for
// the same unsearchable author, or the same pair again after the TTL — logs
// at Debug, so the warnings stay bounded by the distinct causes rather than
// growing with authors × repositories.
func (c *Engine) noteContributorUnsearchable(owner, repo, author string, ref contributorRepoRef, err error) {
key := contributorUnsearchableKey(author, ref)
authorKey := "author:" + strings.ToLower(author)
repoKey := "repo:" + strings.ToLower(ref.Owner+"/"+ref.Repo)
c.contributorUnsearchableMu.Lock()
if c.contributorUnsearchable == nil || len(c.contributorUnsearchable) > 4096 {
c.contributorUnsearchable = map[string]time.Time{}
}
_, seen := c.contributorUnsearchable[key]
if c.contributorUnsearchableWarned == nil || len(c.contributorUnsearchableWarned) > 4096 {
c.contributorUnsearchableWarned = map[string]bool{}
}
c.contributorUnsearchable[key] = c.clock().Add(contributorUnsearchableTTL)
warned := c.contributorUnsearchableWarned[authorKey] || c.contributorUnsearchableWarned[repoKey]
c.contributorUnsearchableWarned[authorKey] = true
c.contributorUnsearchableWarned[repoKey] = true
c.contributorUnsearchableMu.Unlock()
args := []any{"repo", owner + "/" + repo, "author", author, "searched_repo", ref.Owner + "/" + ref.Repo, "retry_after", contributorUnsearchableTTL, "error", err}
if seen {
if warned {
c.debug(contributorUnsearchableMessage, args...)
return
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@ package automerge
import (
"bytes"
"context"
"errors"
"fmt"
"log/slog"
"strings"
"testing"
Expand Down Expand Up @@ -72,3 +74,68 @@ func TestContributorMergedReposRemembersUnsearchableRepository(t *testing.T) {
t.Fatalf("warning should name the refused repository:\n%s", out)
}
}

// Regression for hivecommons/hive#18059: one author refused for several
// repositories, and several authors refused for the same repository, warn
// once in total instead of once per (author, repository) pair — the pair
// product flooded WARN (15 in 10m on one hive) and self-reported as an
// unclassified repeated error. Every refusal is still remembered per pair.
func TestContributorUnsearchableWarnsOncePerAuthorAndRepository(t *testing.T) {
fx := validContributorFixture()
fx.unsearchable = map[string]bool{"acme/docs": true, "acme/homebrew-hive": true}
api := newContributorLaneAPI(t, &fx)
defer api.Close()
var logs bytes.Buffer
clock := &contributorLaneClock{at: time.Date(2026, 11, 13, 3, 0, 0, 0, time.UTC)}
engine := newContributorLaneEngineRepos(api.URL, []string{"widget", "hive", "docs", "homebrew-hive"}, defaultContributorLanePolicy(), clock, Options{
Logger: slog.New(slog.NewTextHandler(&logs, &slog.HandlerOptions{Level: slog.LevelWarn})),
})
authors := []string{contributorLaneTestAuthor, "thatguywob", "another-dev"}
for _, author := range authors {
engine.contributorMergedRepos(context.Background(), "acme", "widget", author)
}

out := logs.String()
if n := strings.Count(out, contributorUnsearchableMessage); n != 1 {
t.Fatalf("unsearchable warning logged %d times for %d authors × 2 refused repositories, want 1:\n%s", n, len(authors), out)
}
for _, author := range authors {
for _, refused := range []string{"docs", "homebrew-hive"} {
if !engine.contributorSearchSkips(author, contributorRepoRef{Owner: "acme", Repo: refused}) {
t.Fatalf("refusal of acme/%s for %s was not remembered", refused, author)
}
}
}
}

// The pair TTL map and the WARN-dedup map are each bounded at 4096 entries:
// a map holding exactly 4096 is kept, and only one past the cap is reset, so
// the cap is the documented size and not one entry fewer.
func TestNoteContributorUnsearchableResetsOnlyPastCap(t *testing.T) {
const capacity = 4096
engine := &Engine{
contributorUnsearchable: map[string]time.Time{},
contributorUnsearchableWarned: map[string]bool{},
}
for i := 0; i < capacity; i++ {
engine.contributorUnsearchable[fmt.Sprintf("filler-%d", i)] = time.Time{}
engine.contributorUnsearchableWarned[fmt.Sprintf("filler-%d", i)] = true
}
refusal := errors.New("422")

engine.noteContributorUnsearchable("acme", "widget", "first-dev", contributorRepoRef{Owner: "acme", Repo: "docs"}, refusal)
if got := len(engine.contributorUnsearchable); got != capacity+1 {
t.Fatalf("pair map at the cap: len = %d, want %d (kept, new pair added)", got, capacity+1)
}
if got := len(engine.contributorUnsearchableWarned); got != capacity+2 {
t.Fatalf("warned map at the cap: len = %d, want %d (kept, author and repo added)", got, capacity+2)
}

engine.noteContributorUnsearchable("acme", "widget", "second-dev", contributorRepoRef{Owner: "acme", Repo: "wiki"}, refusal)
if got := len(engine.contributorUnsearchable); got != 1 {
t.Fatalf("pair map past the cap: len = %d, want 1 (reset, new pair added)", got)
}
if got := len(engine.contributorUnsearchableWarned); got != 2 {
t.Fatalf("warned map past the cap: len = %d, want 2 (reset, author and repo added)", got)
}
}
8 changes: 6 additions & 2 deletions src/pkg/github/automerge/automerge_sweep.go
Original file line number Diff line number Diff line change
Expand Up @@ -297,8 +297,12 @@ type Engine struct {
// contributorUnsearchable maps author|owner/repo to the time until which
// contributorMergedRepos leaves that pair out of its search, after
// GitHub refused to search it (see automerge_contributor_unsearchable.go).
contributorUnsearchableMu sync.Mutex
contributorUnsearchable map[string]time.Time
// contributorUnsearchableWarned holds the "author:<login>" and
// "repo:<owner/repo>" keys a refusal has already warned for, so the
// author × repository product logs WARN at most once per side.
contributorUnsearchableMu sync.Mutex
contributorUnsearchable map[string]time.Time
contributorUnsearchableWarned map[string]bool

mergerAuthzMu sync.RWMutex
// humanReturnChecked remembers, per PR key, the head whose worn
Expand Down
Loading