Use Gitaly long timeout for resolving conflicts (!65394) · Merge requests · GitLab.org / GitLab

Stan Hu requested to merge sh-use-gitaly-long-timeout-resolve-conflicts into master Jul 04, 2021

Currently the ResolveConflicts RPC can take over 30 seconds to run. When push rules are enabled, the /api/v4/internal/allowed currently takes about 30 seconds for the gitlab-org/gitlab repository. In addition, with Gitaly Cluster, since refs updates happen in a transaction, all nodes also have to acknowledge the ref update for this RPC to finish successfully. This can add even more time.

Until we solve #335134 (closed), let's bump the timeout from 30 to 60 seconds to allow for this RPC to do all its work.

Edited Jul 04, 2021 by Stan Hu

Use Gitaly long timeout for resolving conflicts

Merge request reports