Skip to content

fix(e2e): retry lock verification read to handle auto_init race #1614

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.

Sign up for GitHub

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

Merged
ralphbean merged 1 commit into from
Jun 1, 2026
+22 −7
Merged

fix(e2e): retry lock verification read to handle auto_init race #1614

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
29 changes: 22 additions & 7 deletions e2e/admin/lock.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,15 +148,30 @@ func tryCreateLock(ctx context.Context, client forge.Client, org, runID string,
}

// Verify we actually got the lock (handle race between two creators).
content, err := client.GetFileContent(ctx, org, lockRepo, "README.md")
if err != nil {
return false, fmt.Errorf("verifying lock: %w", err)
}
if strings.TrimSpace(string(content)) == runID {
logf("[e2e-lock] Lock acquired (run: %s)", truncateUUID(runID))
return true, nil
// Retry the read because GitHub's auto_init may serve stale default
// README content ("# e2e-lock") briefly after CreateOrUpdateFile succeeds.
for i := range 5 {
if i > 0 {
select {
case <-time.After(time.Duration(i+1) * time.Second):
case <-ctx.Done():
return false, ctx.Err()
}
}
content, err := client.GetFileContent(ctx, org, lockRepo, "README.md")
if err != nil {
return false, fmt.Errorf("verifying lock: %w", err)
}
holder := strings.TrimSpace(string(content))
if holder == runID {
logf("[e2e-lock] Lock acquired (run: %s)", truncateUUID(runID))
return true, nil
}
logf("[e2e-lock] Verification read %d/5: got %q, expected %s (auto_init race?)", i+1, truncateUUID(holder), truncateUUID(runID))
}

// After retries, still not our content — genuinely lost the race.
content, _ := client.GetFileContent(ctx, org, lockRepo, "README.md")
logf("[e2e-lock] Lost lock race for %s/%s (holder: %s)", org, lockRepo, truncateUUID(strings.TrimSpace(string(content))))
return false, nil
}
Expand Down
Loading