Use request timeout for git service rpc (#20689)

This enables git.Command's Run to optionally use the given context directly so its deadline will be respected. Otherwise, it falls back to the previous behavior of using the supplied timeout or a default timeout value of 360 seconds.

repo's serviceRPC() calls now use the context's deadline (which is unset/unlimited) instead of the default 6-minute timeout. This means that large repo clones will no longer arbitrarily time out on the upload-pack step, and pushes can take longer than 6 minutes on the receive-pack step.

Fixes #20680

Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com>

diff --git a/modules/git/command.go b/modules/git/command.go
index a1bacbb707a2565dabb0fc5f07fbbf55fb734f3b..b24d32dbe87436d39e081b2119222baa1f6599b7 100644 (file)
--- a/modules/git/command.go
+++ b/modules/git/command.go
@@ -95,14 +95,15 @@ func (c *Command) AddArguments(args ...string) *Command {
        return c
 }
 
-// RunOpts represents parameters to run the command
+// RunOpts represents parameters to run the command. If UseContextTimeout is specified, then Timeout is ignored.
 type RunOpts struct {
-       Env            []string
-       Timeout        time.Duration
-       Dir            string
-       Stdout, Stderr io.Writer
-       Stdin          io.Reader
-       PipelineFunc   func(context.Context, context.CancelFunc) error
+       Env               []string
+       Timeout           time.Duration
+       UseContextTimeout bool
+       Dir               string
+       Stdout, Stderr    io.Writer
+       Stdin             io.Reader
+       PipelineFunc      func(context.Context, context.CancelFunc) error
 }
 
 func commonBaseEnvs() []string {
@@ -171,7 +172,15 @@ func (c *Command) Run(opts *RunOpts) error {
                desc = fmt.Sprintf("%s %s [repo_path: %s]", c.name, strings.Join(args, " "), opts.Dir)
        }
 
-       ctx, cancel, finished := process.GetManager().AddContextTimeout(c.parentContext, opts.Timeout, desc)
+       var ctx context.Context
+       var cancel context.CancelFunc
+       var finished context.CancelFunc
+
+       if opts.UseContextTimeout {
+               ctx, cancel, finished = process.GetManager().AddContext(c.parentContext, desc)
+       } else {
+               ctx, cancel, finished = process.GetManager().AddContextTimeout(c.parentContext, opts.Timeout, desc)
+       }
        defer finished()
 
        cmd := exec.CommandContext(ctx, c.name, c.args...)

diff --git a/routers/web/repo/http.go b/routers/web/repo/http.go
index 6a85bca16b2f5d7a00f86510588c77ab778a7646..5aa2bcd13471be242871741a9138ab2bb45758ff 100644 (file)
--- a/routers/web/repo/http.go
+++ b/routers/web/repo/http.go
@@ -474,11 +474,12 @@ func serviceRPC(ctx gocontext.Context, h serviceHandler, service string) {
        cmd := git.NewCommand(h.r.Context(), service, "--stateless-rpc", h.dir)
        cmd.SetDescription(fmt.Sprintf("%s %s %s [repo_path: %s]", git.GitExecutable, service, "--stateless-rpc", h.dir))
        if err := cmd.Run(&git.RunOpts{
-               Dir:    h.dir,
-               Env:    append(os.Environ(), h.environ...),
-               Stdout: h.w,
-               Stdin:  reqBody,
-               Stderr: &stderr,
+               Dir:               h.dir,
+               Env:               append(os.Environ(), h.environ...),
+               Stdout:            h.w,
+               Stdin:             reqBody,
+               Stderr:            &stderr,
+               UseContextTimeout: true,
        }); err != nil {
                if err.Error() != "signal: killed" {
                        log.Error("Fail to serve RPC(%s) in %s: %v - %s", service, h.dir, err, stderr.String())