Skip to content

Fix undefined method `head_commit_sha' for nil:NilClass

Shinya Maeda requested to merge fix-head-commit-sha-exception into master

What does this MR do?

It seems merge_request_diff association is not found even though a merge request has been persisted. Because of that, we see that diff_head_sha raises an exception thus ended up in hammering sidekiq jobs.

I suspect this could happen when postgres replication lag is unstable. We should check the persistency of merge_request_diff in the method to properly fall back to gitaly call in such edge cases.

This MR is fixing https://sentry.gitlab.net/gitlab/gitlabcom/issues/1037137/?query=head_commit_sha.

close #35210 (closed)

Screenshots

Does this MR meet the acceptance criteria?

Conformity

Availability and Testing

Security

If this MR contains changes to processing or storing of credentials or tokens, authorization and authentication methods and other items described in the security review guidelines:

  • [-] Label as security and @ mention @gitlab-com/gl-security/appsec
  • [-] The MR includes necessary changes to maintain consistency between UI, API, email, or other methods
  • [-] Security reports checked/validated by a reviewer from the AppSec team
Edited by Shinya Maeda

Merge request reports