Internal server error creating blender-addons PR with base branch blender:blender-v3.6-release and personal fork as the branch to pull from #61

New Issue

Thomas Barlow · 2023-06-09T19:27:34+02:00

Thomas Barlow commented

2023-06-09 19:27:34 +02:00

As of about June 9th 00:00 (UTC+1), I have been unable to directly create a pull request in the https://projects.blender.org/blender/blender-addons repository where the base branch is blender-v3.6-release and the branch to pull from is any branch from my fork of the blender-addons repository. Attempting to do so brings me to a 500 internal server error page.

In isolation, I can set the branch to merge into to blender:blender-v3.6-release or the branch to pull from to a branch from my fork, but not both at the same time.

The same issue occurs if I set blender:blender-v3.5-release as the base branch, but the issue does not occur if I set blender:blender-v3.4-release as the base branch

Creating PRs in the https://projects.blender.org/blender/blender repository with the same setup works without issue.

I previously successfully made a PR with the base branch set to blender:blender-v3.6-release on June 8th 23:12 (UTC+1), so it was working not long beforehand: blender/blender-addons#104681
It could be unrelated, but projects.blender.org was very slow around June 9th 00:00 (UTC+1).

The steps are that I take are:

Create a new PR
Set the branch to merge into to blender:blender-v3.6-release
Set the branch to pull from to any branch from my Mysteryem fork.

Which then changes the url to the below and gives me to a 500 internal server error page:
https://projects.blender.org/blender/blender-addons/compare/blender-v3.6-release...Mysteryem/blender-addons:104669_pr

I tried creating a branch with minimal changes to see if it was a problem with a commit in my branch and I've tried creating the PR by logging into a different web browser.

It's possible to work around this issue by creating the PR with the base branch set to main and then changing the base branch in the created PR afterwards.

As of about June 9th 00:00 (UTC+1), I have been unable to directly create a pull request in the https://projects.blender.org/blender/blender-addons repository where the base branch is `blender-v3.6-release` and the branch to pull from is any branch from my fork of the blender-addons repository. Attempting to do so brings me to a 500 internal server error page. In isolation, I can set the branch to merge into to `blender:blender-v3.6-release` or the branch to pull from to a branch from my fork, but not both at the same time. The same issue occurs if I set `blender:blender-v3.5-release` as the base branch, but the issue does not occur if I set `blender:blender-v3.4-release` as the base branch Creating PRs in the https://projects.blender.org/blender/blender repository with the same setup works without issue. I previously successfully made a PR with the base branch set to `blender:blender-v3.6-release` on June 8th 23:12 (UTC+1), so it was working not long beforehand: https://projects.blender.org/blender/blender-addons/pulls/104681 It could be unrelated, but projects.blender.org was very slow around June 9th 00:00 (UTC+1). The steps are that I take are: 1. Create a new PR 1. Set the branch to merge into to `blender:blender-v3.6-release` 1. Set the branch to pull from to any branch from my `Mysteryem` fork. ![image](/attachments/7200db78-f2b8-49f2-b382-50d398025375) Which then changes the url to the below and gives me to a 500 internal server error page: https://projects.blender.org/blender/blender-addons/compare/blender-v3.6-release...Mysteryem/blender-addons:104669_pr ![image](/attachments/fb99e764-c353-4f1d-ba89-cdbcf8b2298b) I tried creating a branch with minimal changes to see if it was a problem with a commit in my branch and I've tried creating the PR by logging into a different web browser. It's possible to work around this issue by creating the PR with the base branch set to `main` and then changing the base branch in the created PR afterwards.

image.png

16 KiB

image.png

28 KiB

Brecht Van Lommel commented

2023-06-11 20:37:29 +02:00

It seems to happen for some forked repositories but not others.

Fails:
https://projects.blender.org/blender/blender/compare/blender-v3.6-release...LukasStockner/blender:glass-albedo-fix
Works:
https://projects.blender.org/blender/blender/compare/blender-v3.6-release...brecht/blender:with-gtests-default

From looking at trace logging, it appears that GetMergeBase in modules/git/repo_compare.go is not returning tmpBaseName when it should. That's possible when there is an error in git fetch, however manually running the git fetch command does not give an error.

I will add some logging to figure out what the error is, since it's silently ignored and not logged now.

It seems to happen for some forked repositories but not others. Fails: https://projects.blender.org/blender/blender/compare/blender-v3.6-release...LukasStockner/blender:glass-albedo-fix Works: https://projects.blender.org/blender/blender/compare/blender-v3.6-release...brecht/blender:with-gtests-default From looking at trace logging, it appears that `GetMergeBase` in `modules/git/repo_compare.go` is not returning `tmpBaseName` when it should. That's possible when there is an error in git fetch, however manually running the git fetch command does not give an error. I will add some logging to figure out what the error is, since it's silently ignored and not logged now.

Brecht Van Lommel commented

2023-07-19 17:45:27 +02:00

This appears to be due to commit-graph-chain.lock files that should not exist, probably same underlying cause as:
https://github.com/go-gitea/gitea/issues/22578

This appears to be due to `commit-graph-chain.lock` files that should not exist, probably same underlying cause as: https://github.com/go-gitea/gitea/issues/22578

Brecht Van Lommel commented

2023-07-19 18:27:14 +02:00

We deployed a workaround now.

Brecht Van Lommel closed this issue

2023-07-19 18:27:14 +02:00

Sign in to join this conversation.