TRT-2799: syncPRStatus: Fix SHA mismatch bug (MergeCommitSHA vs Head.SHA)

[openshift-trt-agent]

Summary

Fixes the SHA mismatch bug in syncPRStatus (TRT-2799).

Since January 2023 (commit d4932de0b), syncPRStatus compared MergeCommitSHA (the merge commit GitHub creates when merging a PR) against prow_pull_requests.SHA (the PR head commit from prow job specs). These are fundamentally different commits and almost never match, so merged_at was never set via this code path. This left 82% of prow_pull_requests rows with merged_at IS NULL.

Changes

• pkg/dataloader/prowloader/github/github.go: Added MergedPR type and ListRecentlyMergedPRs method that returns recently merged PRs with Head.SHA (the correct PR head commit SHA) instead of MergeCommitSHA. Uses the same lazy closedCache population as the existing IsPrRecentlyMerged.

• pkg/dataloader/prowloader/prow.go: Rewrote syncPRStatus from a per-PR loop with per-row DB saves to a batch pipeline:

  1. Query distinct (org, repo) from prow_pull_requests WHERE merged_at IS NULL
  2. For each repo, call ListRecentlyMergedPRs to get merged PRs with Head.SHA
  3. COPY all merged PR data to a temp table via CopyToTempTable
  4. Bulk UPDATE prow_pull_requests SET merged_at where sha matches
  5. Bulk DELETE FROM pull_request_comments for merged PRs (risk analysis cleanup)

• pkg/dataloader/prowloader/github/github_test.go: Added TestClient_ListRecentlyMergedPRs verifying that the method returns Head.SHA (not MergeCommitSHA), filters out unmerged and headless PRs, and uses the cache on subsequent calls.

Test plan

• go vet ./pkg/dataloader/prowloader/... passes
• go test ./pkg/... passes (all Go unit tests)
• TestClient_ListRecentlyMergedPRs verifies Head.SHA is returned, not MergeCommitSHA
• golangci-lint reports 0 issues
• gofmt -w applied to all changed files

---

Generated with Claude Code

[openshift-merge-bot]

Pipeline controller notification
This repo is configured to use the pipeline controller. Second-stage tests will be triggered either automatically or after lgtm label is added, depending on the repository configuration. The pipeline controller will automatically detect which contexts are required and will utilize /test Prow commands to trigger the second stage.

For optional jobs, comment /test ? to see a list of all defined jobs. To trigger manually all jobs from second stage use /pipeline required command.

This repository is configured in: automatic mode

[openshift-ci-robot]

@openshift-trt-agent[bot]: This pull request references TRT-2799 which is a valid jira issue.

Warning: The referenced jira issue has an invalid target version for the target branch this PR targets: expected the bug to target the "5.0.0" version, but no target version was set.

Details

In response to this:

Summary

Fixes the SHA mismatch bug in syncPRStatus (TRT-2799).

Since January 2023 (commit d4932de0b), syncPRStatus compared MergeCommitSHA (the merge commit GitHub creates when merging a PR) against prow_pull_requests.SHA (the PR head commit from prow job specs). These are fundamentally different commits and almost never match, so merged_at was never set via this code path. This left 82% of prow_pull_requests rows with merged_at IS NULL.

Changes

• pkg/dataloader/prowloader/github/github.go: Added MergedPR type and ListRecentlyMergedPRs method that returns recently merged PRs with Head.SHA (the correct PR head commit SHA) instead of MergeCommitSHA. Uses the same lazy closedCache population as the existing IsPrRecentlyMerged.

• pkg/dataloader/prowloader/prow.go: Rewrote syncPRStatus from a per-PR loop with per-row DB saves to a batch pipeline:

1. Query distinct (org, repo) from prow_pull_requests WHERE merged_at IS NULL
2. For each repo, call ListRecentlyMergedPRs to get merged PRs with Head.SHA
3. COPY all merged PR data to a temp table via CopyToTempTable
4. Bulk UPDATE prow_pull_requests SET merged_at where sha matches
5. Bulk DELETE FROM pull_request_comments for merged PRs (risk analysis cleanup)

• pkg/dataloader/prowloader/github/github_test.go: Added TestClient_ListRecentlyMergedPRs verifying that the method returns Head.SHA (not MergeCommitSHA), filters out unmerged and headless PRs, and uses the cache on subsequent calls.

Test plan

• go vet ./pkg/dataloader/prowloader/... passes
• go test ./pkg/... passes (all Go unit tests)
• TestClient_ListRecentlyMergedPRs verifies Head.SHA is returned, not MergeCommitSHA
• golangci-lint reports 0 issues
• gofmt -w applied to all changed files

---

Generated with Claude Code

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 openshift-eng/jira-lifecycle-plugin repository.

[openshift-ci]

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by: openshift-trt-agent[bot]
Once this PR has been reviewed and has the lgtm label, please assign deepsm007 for approval. For more information see the Code Review Process.

The full list of commands accepted by this bot can be found here.

Details

Needs approval from an approver in each of these files:

• OWNERS

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

[openshift-ci]

Hi @openshift-trt-agent[bot]. Thanks for your PR.

I'm waiting for a openshift 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.