So, I was able to resolve this issue. I had to increase the Puma Worker Timeout and Gitaly Timeouts.
This actually goes back to a previous issue I was having where I increased the Puma Worker and Gitaly Timeouts. Only this time I was much more drastic with the values:
-
puma['worker_timeout'] = 120
TOpuma['worker_timeout'] = 300
in/etc/gitlab/gitlab.rb
- Gitaly Default Timeout Period:
114
TO285
- Gitaly Fast Timeout Period:
114
TO285
- Medium Timeout Period:
114
TO285
CPU usage is up from around 30% to 60% when a Merge Request is being created, but Memory Usage is still about the same.
Now, I’m not completely out of the woods yet: with this Merge Request, I do have Checking if merge request can be merged…
on-loop, which has been a re-occurring issue I’ve been having.
In the past I was able to just Close and then Re-open a large Merge Request to either receive the There are merge conflicts
message or the green Merge button, but not for this particular Merge Request.
EDIT: Actually, I just resolved the Merge Loop error as well. See this post.