Graceful: Cancel Process on monitor pages & HammerTime (#9213)

* Graceful: Create callbacks to with contexts

* Graceful: Say when Gitea is completely finished

* Graceful: Git and Process within HammerTime

Force all git commands to terminate at HammerTime
Force all process commands to terminate at HammerTime
Move almost all git processes to run as git Commands

* Graceful: Always Hammer after Shutdown

* ProcessManager: Add cancel functionality

* Fix tests

* Make sure that process.Manager.Kill() cancels

* Make threadsafe access to Processes and remove own unused Kill

* Remove cmd from the process manager as it is no longer used

* the default context is the correct context

* get rid of double till
This commit is contained in:
zeripath 2019-11-30 08:40:22 -06:00 committed by Lauris BH
parent 8f8c250ddb
commit 60c5339042
21 changed files with 536 additions and 198 deletions

View file

@ -197,6 +197,7 @@ func runWeb(ctx *cli.Context) error {
log.Info("HTTP Listener: %s Closed", listenAddr) log.Info("HTTP Listener: %s Closed", listenAddr)
graceful.Manager.WaitForServers() graceful.Manager.WaitForServers()
graceful.Manager.WaitForTerminate() graceful.Manager.WaitForTerminate()
log.Info("PID: %d Gitea Web Finished", os.Getpid())
log.Close() log.Close()
return nil return nil
} }

View file

@ -18,7 +18,6 @@ import (
"code.gitea.io/gitea/modules/git" "code.gitea.io/gitea/modules/git"
"code.gitea.io/gitea/modules/log" "code.gitea.io/gitea/modules/log"
"code.gitea.io/gitea/modules/process"
"code.gitea.io/gitea/modules/setting" "code.gitea.io/gitea/modules/setting"
api "code.gitea.io/gitea/modules/structs" api "code.gitea.io/gitea/modules/structs"
"code.gitea.io/gitea/modules/sync" "code.gitea.io/gitea/modules/sync"
@ -536,16 +535,13 @@ func (pr *PullRequest) getMergeCommit() (*git.Commit, error) {
headFile := pr.GetGitRefName() headFile := pr.GetGitRefName()
// Check if a pull request is merged into BaseBranch // Check if a pull request is merged into BaseBranch
_, stderr, err := process.GetManager().ExecDirEnv(-1, "", fmt.Sprintf("isMerged (git merge-base --is-ancestor): %d", pr.BaseRepo.ID), _, err := git.NewCommand("merge-base", "--is-ancestor", headFile, pr.BaseBranch).RunInDirWithEnv(pr.BaseRepo.RepoPath(), []string{"GIT_INDEX_FILE=" + indexTmpPath, "GIT_DIR=" + pr.BaseRepo.RepoPath()})
[]string{"GIT_INDEX_FILE=" + indexTmpPath, "GIT_DIR=" + pr.BaseRepo.RepoPath()},
git.GitExecutable, "merge-base", "--is-ancestor", headFile, pr.BaseBranch)
if err != nil { if err != nil {
// Errors are signaled by a non-zero status that is not 1 // Errors are signaled by a non-zero status that is not 1
if strings.Contains(err.Error(), "exit status 1") { if strings.Contains(err.Error(), "exit status 1") {
return nil, nil return nil, nil
} }
return nil, fmt.Errorf("git merge-base --is-ancestor: %v %v", stderr, err) return nil, fmt.Errorf("git merge-base --is-ancestor: %v", err)
} }
commitIDBytes, err := ioutil.ReadFile(pr.BaseRepo.RepoPath() + "/" + headFile) commitIDBytes, err := ioutil.ReadFile(pr.BaseRepo.RepoPath() + "/" + headFile)
@ -559,11 +555,9 @@ func (pr *PullRequest) getMergeCommit() (*git.Commit, error) {
cmd := commitID[:40] + ".." + pr.BaseBranch cmd := commitID[:40] + ".." + pr.BaseBranch
// Get the commit from BaseBranch where the pull request got merged // Get the commit from BaseBranch where the pull request got merged
mergeCommit, stderr, err := process.GetManager().ExecDirEnv(-1, "", fmt.Sprintf("isMerged (git rev-list --ancestry-path --merges --reverse): %d", pr.BaseRepo.ID), mergeCommit, err := git.NewCommand("rev-list", "--ancestry-path", "--merges", "--reverse", cmd).RunInDirWithEnv("", []string{"GIT_INDEX_FILE=" + indexTmpPath, "GIT_DIR=" + pr.BaseRepo.RepoPath()})
[]string{"GIT_INDEX_FILE=" + indexTmpPath, "GIT_DIR=" + pr.BaseRepo.RepoPath()},
git.GitExecutable, "rev-list", "--ancestry-path", "--merges", "--reverse", cmd)
if err != nil { if err != nil {
return nil, fmt.Errorf("git rev-list --ancestry-path --merges --reverse: %v %v", stderr, err) return nil, fmt.Errorf("git rev-list --ancestry-path --merges --reverse: %v", err)
} else if len(mergeCommit) < 40 { } else if len(mergeCommit) < 40 {
// PR was fast-forwarded, so just use last commit of PR // PR was fast-forwarded, so just use last commit of PR
mergeCommit = commitID[:40] mergeCommit = commitID[:40]
@ -621,12 +615,9 @@ func (pr *PullRequest) testPatch(e Engine) (err error) {
indexTmpPath := filepath.Join(os.TempDir(), "gitea-"+pr.BaseRepo.Name+"-"+strconv.Itoa(time.Now().Nanosecond())) indexTmpPath := filepath.Join(os.TempDir(), "gitea-"+pr.BaseRepo.Name+"-"+strconv.Itoa(time.Now().Nanosecond()))
defer os.Remove(indexTmpPath) defer os.Remove(indexTmpPath)
var stderr string _, err = git.NewCommand("read-tree", pr.BaseBranch).RunInDirWithEnv("", []string{"GIT_DIR=" + pr.BaseRepo.RepoPath(), "GIT_INDEX_FILE=" + indexTmpPath})
_, stderr, err = process.GetManager().ExecDirEnv(-1, "", fmt.Sprintf("testPatch (git read-tree): %d", pr.BaseRepo.ID),
[]string{"GIT_DIR=" + pr.BaseRepo.RepoPath(), "GIT_INDEX_FILE=" + indexTmpPath},
git.GitExecutable, "read-tree", pr.BaseBranch)
if err != nil { if err != nil {
return fmt.Errorf("git read-tree --index-output=%s %s: %v - %s", indexTmpPath, pr.BaseBranch, err, stderr) return fmt.Errorf("git read-tree --index-output=%s %s: %v", indexTmpPath, pr.BaseBranch, err)
} }
prUnit, err := pr.BaseRepo.getUnit(e, UnitTypePullRequests) prUnit, err := pr.BaseRepo.getUnit(e, UnitTypePullRequests)
@ -642,9 +633,15 @@ func (pr *PullRequest) testPatch(e Engine) (err error) {
args = append(args, patchPath) args = append(args, patchPath)
pr.ConflictedFiles = []string{} pr.ConflictedFiles = []string{}
_, stderr, err = process.GetManager().ExecDirEnv(-1, "", fmt.Sprintf("testPatch (git apply --check): %d", pr.BaseRepo.ID), stderrBuilder := new(strings.Builder)
err = git.NewCommand(args...).RunInDirTimeoutEnvPipeline(
[]string{"GIT_INDEX_FILE=" + indexTmpPath, "GIT_DIR=" + pr.BaseRepo.RepoPath()}, []string{"GIT_INDEX_FILE=" + indexTmpPath, "GIT_DIR=" + pr.BaseRepo.RepoPath()},
git.GitExecutable, args...) -1,
"",
nil,
stderrBuilder)
stderr := stderrBuilder.String()
if err != nil { if err != nil {
for i := range patchConflicts { for i := range patchConflicts {
if strings.Contains(stderr, patchConflicts[i]) { if strings.Contains(stderr, patchConflicts[i]) {

View file

@ -30,7 +30,6 @@ import (
"code.gitea.io/gitea/modules/log" "code.gitea.io/gitea/modules/log"
"code.gitea.io/gitea/modules/markup" "code.gitea.io/gitea/modules/markup"
"code.gitea.io/gitea/modules/options" "code.gitea.io/gitea/modules/options"
"code.gitea.io/gitea/modules/process"
"code.gitea.io/gitea/modules/setting" "code.gitea.io/gitea/modules/setting"
"code.gitea.io/gitea/modules/structs" "code.gitea.io/gitea/modules/structs"
api "code.gitea.io/gitea/modules/structs" api "code.gitea.io/gitea/modules/structs"
@ -1202,11 +1201,11 @@ func initRepoCommit(tmpPath string, u *User) (err error) {
"GIT_COMMITTER_DATE="+commitTimeStr, "GIT_COMMITTER_DATE="+commitTimeStr,
) )
var stderr string if stdout, err := git.NewCommand("add", "--all").
if _, stderr, err = process.GetManager().ExecDir(-1, SetDescription(fmt.Sprintf("initRepoCommit (git add): %s", tmpPath)).
tmpPath, fmt.Sprintf("initRepoCommit (git add): %s", tmpPath), RunInDir(tmpPath); err != nil {
git.GitExecutable, "add", "--all"); err != nil { log.Error("git add --all failed: Stdout: %s\nError: %v", stdout, err)
return fmt.Errorf("git add: %s", stderr) return fmt.Errorf("git add --all: %v", err)
} }
binVersion, err := git.BinVersion() binVersion, err := git.BinVersion()
@ -1228,18 +1227,20 @@ func initRepoCommit(tmpPath string, u *User) (err error) {
} }
} }
if _, stderr, err = process.GetManager().ExecDirEnv(-1, if stdout, err := git.NewCommand(args...).
tmpPath, fmt.Sprintf("initRepoCommit (git commit): %s", tmpPath), SetDescription(fmt.Sprintf("initRepoCommit (git commit): %s", tmpPath)).
env, RunInDirWithEnv(tmpPath, env); err != nil {
git.GitExecutable, args...); err != nil { log.Error("Failed to commit: %v: Stdout: %s\nError: %v", args, stdout, err)
return fmt.Errorf("git commit: %s", stderr) return fmt.Errorf("git commit: %v", err)
} }
if _, stderr, err = process.GetManager().ExecDir(-1, if stdout, err := git.NewCommand("push", "origin", "master").
tmpPath, fmt.Sprintf("initRepoCommit (git push): %s", tmpPath), SetDescription(fmt.Sprintf("initRepoCommit (git push): %s", tmpPath)).
git.GitExecutable, "push", "origin", "master"); err != nil { RunInDir(tmpPath); err != nil {
return fmt.Errorf("git push: %s", stderr) log.Error("Failed to push back to master: Stdout: %s\nError: %v", stdout, err)
return fmt.Errorf("git push: %v", err)
} }
return nil return nil
} }
@ -1297,14 +1298,11 @@ func prepareRepoCommit(e Engine, repo *Repository, tmpDir, repoPath string, opts
) )
// Clone to temporary path and do the init commit. // Clone to temporary path and do the init commit.
_, stderr, err := process.GetManager().ExecDirEnv( if stdout, err := git.NewCommand("clone", repoPath, tmpDir).
-1, "", SetDescription(fmt.Sprintf("initRepository (git clone): %s to %s", repoPath, tmpDir)).
fmt.Sprintf("initRepository(git clone): %s", repoPath), RunInDirWithEnv("", env); err != nil {
env, log.Error("Failed to clone from %v into %s: stdout: %s\nError: %v", repo, tmpDir, stdout, err)
git.GitExecutable, "clone", repoPath, tmpDir, return fmt.Errorf("git clone: %v", err)
)
if err != nil {
return fmt.Errorf("git clone: %v - %s", err, stderr)
} }
// README // README
@ -1584,11 +1582,11 @@ func CreateRepository(doer, u *User, opts CreateRepoOptions) (_ *Repository, err
} }
} }
_, stderr, err := process.GetManager().ExecDir(-1, if stdout, err := git.NewCommand("update-server-info").
repoPath, fmt.Sprintf("CreateRepository(git update-server-info): %s", repoPath), SetDescription(fmt.Sprintf("CreateRepository(git update-server-info): %s", repoPath)).
git.GitExecutable, "update-server-info") RunInDir(repoPath); err != nil {
if err != nil { log.Error("CreateRepitory(git update-server-info) in %v: Stdout: %s\nError: %v", repo, stdout, err)
return nil, errors.New("CreateRepository(git update-server-info): " + stderr) return nil, fmt.Errorf("CreateRepository(git update-server-info): %v", err)
} }
} }
@ -2422,12 +2420,13 @@ func GitGcRepos() error {
if err := repo.GetOwner(); err != nil { if err := repo.GetOwner(); err != nil {
return err return err
} }
_, stderr, err := process.GetManager().ExecDir( if stdout, err := git.NewCommand(args...).
SetDescription(fmt.Sprintf("Repository Garbage Collection: %s", repo.FullName())).
RunInDirTimeout(
time.Duration(setting.Git.Timeout.GC)*time.Second, time.Duration(setting.Git.Timeout.GC)*time.Second,
RepoPath(repo.Owner.Name, repo.Name), "Repository garbage collection", RepoPath(repo.Owner.Name, repo.Name)); err != nil {
git.GitExecutable, args...) log.Error("Repository garbage collection failed for %v. Stdout: %s\nError: %v", repo, stdout, err)
if err != nil { return fmt.Errorf("Repository garbage collection failed: Error: %v", err)
return fmt.Errorf("%v: %v", err, stderr)
} }
return nil return nil
}) })
@ -2647,18 +2646,19 @@ func ForkRepository(doer, owner *User, oldRepo *Repository, name, desc string) (
} }
repoPath := RepoPath(owner.Name, repo.Name) repoPath := RepoPath(owner.Name, repo.Name)
_, stderr, err := process.GetManager().ExecTimeout(10*time.Minute, if stdout, err := git.NewCommand(
fmt.Sprintf("ForkRepository(git clone): %s/%s", owner.Name, repo.Name), "clone", "--bare", oldRepo.repoPath(sess), repoPath).
git.GitExecutable, "clone", "--bare", oldRepo.repoPath(sess), repoPath) SetDescription(fmt.Sprintf("ForkRepository(git clone): %s to %s", oldRepo.FullName(), repo.FullName())).
if err != nil { RunInDirTimeout(10*time.Minute, ""); err != nil {
return nil, fmt.Errorf("git clone: %v", stderr) log.Error("Fork Repository (git clone) Failed for %v (from %v):\nStdout: %s\nError: %v", repo, oldRepo, stdout, err)
return nil, fmt.Errorf("git clone: %v", err)
} }
_, stderr, err = process.GetManager().ExecDir(-1, if stdout, err := git.NewCommand("update-server-info").
repoPath, fmt.Sprintf("ForkRepository(git update-server-info): %s", repoPath), SetDescription(fmt.Sprintf("ForkRepository(git update-server-info): %s", repo.FullName())).
git.GitExecutable, "update-server-info") RunInDir(repoPath); err != nil {
if err != nil { log.Error("Fork Repository (git update-server-info) failed for %v:\nStdout: %s\nError: %v", repo, stdout, err)
return nil, fmt.Errorf("git update-server-info: %v", stderr) return nil, fmt.Errorf("git update-server-info: %v", err)
} }
if err = createDelegateHooks(repoPath); err != nil { if err = createDelegateHooks(repoPath); err != nil {

View file

@ -16,7 +16,6 @@ import (
"code.gitea.io/gitea/modules/git" "code.gitea.io/gitea/modules/git"
"code.gitea.io/gitea/modules/log" "code.gitea.io/gitea/modules/log"
"code.gitea.io/gitea/modules/process"
"code.gitea.io/gitea/modules/util" "code.gitea.io/gitea/modules/util"
"github.com/gobwas/glob" "github.com/gobwas/glob"
@ -168,14 +167,11 @@ func generateRepoCommit(e Engine, repo, templateRepo, generateRepo *Repository,
} }
repoPath := repo.repoPath(e) repoPath := repo.repoPath(e)
_, stderr, err := process.GetManager().ExecDirEnv( if stdout, err := git.NewCommand("remote", "add", "origin", repoPath).
-1, tmpDir, SetDescription(fmt.Sprintf("generateRepoCommit (git remote add): %s to %s", templateRepoPath, tmpDir)).
fmt.Sprintf("generateRepoCommit(git remote add): %s", repoPath), RunInDirWithEnv(tmpDir, env); err != nil {
env, log.Error("Unable to add %v as remote origin to temporary repo to %s: stdout %s\nError: %v", repo, tmpDir, stdout, err)
git.GitExecutable, "remote", "add", "origin", repoPath, return fmt.Errorf("git remote add: %v", err)
)
if err != nil {
return fmt.Errorf("git remote add: %v - %s", err, stderr)
} }
return initRepoCommit(tmpDir, repo.Owner) return initRepoCommit(tmpDir, repo.Owner)

View file

@ -6,6 +6,7 @@ package git
import ( import (
"bufio" "bufio"
"context"
"fmt" "fmt"
"io" "io"
"os" "os"
@ -28,6 +29,7 @@ type BlameReader struct {
output io.ReadCloser output io.ReadCloser
scanner *bufio.Scanner scanner *bufio.Scanner
lastSha *string lastSha *string
cancel context.CancelFunc
} }
var shaLineRegex = regexp.MustCompile("^([a-z0-9]{40})") var shaLineRegex = regexp.MustCompile("^([a-z0-9]{40})")
@ -76,7 +78,8 @@ func (r *BlameReader) NextPart() (*BlamePart, error) {
// Close BlameReader - don't run NextPart after invoking that // Close BlameReader - don't run NextPart after invoking that
func (r *BlameReader) Close() error { func (r *BlameReader) Close() error {
process.GetManager().Remove(r.pid) defer process.GetManager().Remove(r.pid)
defer r.cancel()
if err := r.cmd.Wait(); err != nil { if err := r.cmd.Wait(); err != nil {
return fmt.Errorf("Wait: %v", err) return fmt.Errorf("Wait: %v", err)
@ -97,20 +100,24 @@ func CreateBlameReader(repoPath, commitID, file string) (*BlameReader, error) {
} }
func createBlameReader(dir string, command ...string) (*BlameReader, error) { func createBlameReader(dir string, command ...string) (*BlameReader, error) {
cmd := exec.Command(command[0], command[1:]...) // FIXME: graceful: This should have a timeout
ctx, cancel := context.WithCancel(DefaultContext)
cmd := exec.CommandContext(ctx, command[0], command[1:]...)
cmd.Dir = dir cmd.Dir = dir
cmd.Stderr = os.Stderr cmd.Stderr = os.Stderr
stdout, err := cmd.StdoutPipe() stdout, err := cmd.StdoutPipe()
if err != nil { if err != nil {
defer cancel()
return nil, fmt.Errorf("StdoutPipe: %v", err) return nil, fmt.Errorf("StdoutPipe: %v", err)
} }
if err = cmd.Start(); err != nil { if err = cmd.Start(); err != nil {
defer cancel()
return nil, fmt.Errorf("Start: %v", err) return nil, fmt.Errorf("Start: %v", err)
} }
pid := process.GetManager().Add(fmt.Sprintf("GetBlame [repo_path: %s]", dir), cmd) pid := process.GetManager().Add(fmt.Sprintf("GetBlame [repo_path: %s]", dir), cancel)
scanner := bufio.NewScanner(stdout) scanner := bufio.NewScanner(stdout)
@ -120,5 +127,6 @@ func createBlameReader(dir string, command ...string) (*BlameReader, error) {
stdout, stdout,
scanner, scanner,
nil, nil,
cancel,
}, nil }, nil
} }

View file

@ -32,6 +32,8 @@ const DefaultLocale = "C"
type Command struct { type Command struct {
name string name string
args []string args []string
parentContext context.Context
desc string
} }
func (c *Command) String() string { func (c *Command) String() string {
@ -49,6 +51,7 @@ func NewCommand(args ...string) *Command {
return &Command{ return &Command{
name: GitExecutable, name: GitExecutable,
args: append(cargs, args...), args: append(cargs, args...),
parentContext: DefaultContext,
} }
} }
@ -57,9 +60,23 @@ func NewCommandNoGlobals(args ...string) *Command {
return &Command{ return &Command{
name: GitExecutable, name: GitExecutable,
args: args, args: args,
parentContext: DefaultContext,
} }
} }
// SetParentContext sets the parent context for this command
func (c *Command) SetParentContext(ctx context.Context) *Command {
c.parentContext = ctx
return c
}
// SetDescription sets the description for this command which be returned on
// c.String()
func (c *Command) SetDescription(desc string) *Command {
c.desc = desc
return c
}
// AddArguments adds new argument(s) to the command. // AddArguments adds new argument(s) to the command.
func (c *Command) AddArguments(args ...string) *Command { func (c *Command) AddArguments(args ...string) *Command {
c.args = append(c.args, args...) c.args = append(c.args, args...)
@ -92,7 +109,7 @@ func (c *Command) RunInDirTimeoutEnvFullPipelineFunc(env []string, timeout time.
log("%s: %v", dir, c) log("%s: %v", dir, c)
} }
ctx, cancel := context.WithTimeout(context.Background(), timeout) ctx, cancel := context.WithTimeout(c.parentContext, timeout)
defer cancel() defer cancel()
cmd := exec.CommandContext(ctx, c.name, c.args...) cmd := exec.CommandContext(ctx, c.name, c.args...)
@ -110,7 +127,11 @@ func (c *Command) RunInDirTimeoutEnvFullPipelineFunc(env []string, timeout time.
return err return err
} }
pid := process.GetManager().Add(fmt.Sprintf("%s %s %s [repo_path: %s]", GitExecutable, c.name, strings.Join(c.args, " "), dir), cmd) desc := c.desc
if desc == "" {
desc = fmt.Sprintf("%s %s %s [repo_path: %s]", GitExecutable, c.name, strings.Join(c.args, " "), dir)
}
pid := process.GetManager().Add(desc, cancel)
defer process.GetManager().Remove(pid) defer process.GetManager().Remove(pid)
if fn != nil { if fn != nil {

View file

@ -6,6 +6,7 @@
package git package git
import ( import (
"context"
"fmt" "fmt"
"os/exec" "os/exec"
"runtime" "runtime"
@ -35,6 +36,9 @@ var (
// Could be updated to an absolute path while initialization // Could be updated to an absolute path while initialization
GitExecutable = "git" GitExecutable = "git"
// DefaultContext is the default context to run git commands in
DefaultContext = context.Background()
gitVersion string gitVersion string
) )

View file

@ -0,0 +1,90 @@
// Copyright 2019 The Gitea Authors. All rights reserved.
// Use of this source code is governed by a MIT-style
// license that can be found in the LICENSE file.
package graceful
import (
"context"
"fmt"
"time"
)
// Errors for context.Err()
var (
ErrShutdown = fmt.Errorf("Graceful Manager called Shutdown")
ErrHammer = fmt.Errorf("Graceful Manager called Hammer")
ErrTerminate = fmt.Errorf("Graceful Manager called Terminate")
)
// ChannelContext is a context that wraps a channel and error as a context
type ChannelContext struct {
done <-chan struct{}
err error
}
// NewChannelContext creates a ChannelContext from a channel and error
func NewChannelContext(done <-chan struct{}, err error) *ChannelContext {
return &ChannelContext{
done: done,
err: err,
}
}
// Deadline returns the time when work done on behalf of this context
// should be canceled. There is no Deadline for a ChannelContext
func (ctx *ChannelContext) Deadline() (deadline time.Time, ok bool) {
return
}
// Done returns the channel provided at the creation of this context.
// When closed, work done on behalf of this context should be canceled.
func (ctx *ChannelContext) Done() <-chan struct{} {
return ctx.done
}
// Err returns nil, if Done is not closed. If Done is closed,
// Err returns the error provided at the creation of this context
func (ctx *ChannelContext) Err() error {
select {
case <-ctx.done:
return ctx.err
default:
return nil
}
}
// Value returns nil for all calls as no values are or can be associated with this context
func (ctx *ChannelContext) Value(key interface{}) interface{} {
return nil
}
// ShutdownContext returns a context.Context that is Done at shutdown
// Callers using this context should ensure that they are registered as a running server
// in order that they are waited for.
func (g *gracefulManager) ShutdownContext() context.Context {
return &ChannelContext{
done: g.IsShutdown(),
err: ErrShutdown,
}
}
// HammerContext returns a context.Context that is Done at hammer
// Callers using this context should ensure that they are registered as a running server
// in order that they are waited for.
func (g *gracefulManager) HammerContext() context.Context {
return &ChannelContext{
done: g.IsHammer(),
err: ErrHammer,
}
}
// TerminateContext returns a context.Context that is Done at terminate
// Callers using this context should ensure that they are registered as a terminating server
// in order that they are waited for.
func (g *gracefulManager) TerminateContext() context.Context {
return &ChannelContext{
done: g.IsTerminate(),
err: ErrTerminate,
}
}

View file

@ -5,9 +5,12 @@
package graceful package graceful
import ( import (
"context"
"time" "time"
"code.gitea.io/gitea/modules/git"
"code.gitea.io/gitea/modules/log" "code.gitea.io/gitea/modules/log"
"code.gitea.io/gitea/modules/process"
"code.gitea.io/gitea/modules/setting" "code.gitea.io/gitea/modules/setting"
) )
@ -34,9 +37,110 @@ const numberOfServersToCreate = 3
var Manager *gracefulManager var Manager *gracefulManager
func init() { func init() {
Manager = newGracefulManager() Manager = newGracefulManager(context.Background())
// Set the git default context to the HammerContext
git.DefaultContext = Manager.HammerContext()
// Set the process default context to the HammerContext
process.DefaultContext = Manager.HammerContext()
} }
// CallbackWithContext is combined runnable and context to watch to see if the caller has finished
type CallbackWithContext func(ctx context.Context, callback func())
// RunnableWithShutdownFns is a runnable with functions to run at shutdown and terminate
// After the callback to atShutdown is called and is complete, the main function must return.
// Similarly the callback function provided to atTerminate must return once termination is complete.
// Please note that use of the atShutdown and atTerminate callbacks will create go-routines that will wait till their respective signals
// - users must therefore be careful to only call these as necessary.
// If run is not expected to run indefinitely RunWithShutdownChan is likely to be more appropriate.
type RunnableWithShutdownFns func(atShutdown, atTerminate func(context.Context, func()))
// RunWithShutdownFns takes a function that has both atShutdown and atTerminate callbacks
// After the callback to atShutdown is called and is complete, the main function must return.
// Similarly the callback function provided to atTerminate must return once termination is complete.
// Please note that use of the atShutdown and atTerminate callbacks will create go-routines that will wait till their respective signals
// - users must therefore be careful to only call these as necessary.
// If run is not expected to run indefinitely RunWithShutdownChan is likely to be more appropriate.
func (g *gracefulManager) RunWithShutdownFns(run RunnableWithShutdownFns) {
g.runningServerWaitGroup.Add(1)
defer g.runningServerWaitGroup.Done()
run(func(ctx context.Context, atShutdown func()) {
go func() {
select {
case <-g.IsShutdown():
atShutdown()
case <-ctx.Done():
return
}
}()
}, func(ctx context.Context, atTerminate func()) {
g.RunAtTerminate(ctx, atTerminate)
})
}
// RunnableWithShutdownChan is a runnable with functions to run at shutdown and terminate.
// After the atShutdown channel is closed, the main function must return once shutdown is complete.
// (Optionally IsHammer may be waited for instead however, this should be avoided if possible.)
// The callback function provided to atTerminate must return once termination is complete.
// Please note that use of the atTerminate function will create a go-routine that will wait till terminate - users must therefore be careful to only call this as necessary.
type RunnableWithShutdownChan func(atShutdown <-chan struct{}, atTerminate CallbackWithContext)
// RunWithShutdownChan takes a function that has channel to watch for shutdown and atTerminate callbacks
// After the atShutdown channel is closed, the main function must return once shutdown is complete.
// (Optionally IsHammer may be waited for instead however, this should be avoided if possible.)
// The callback function provided to atTerminate must return once termination is complete.
// Please note that use of the atTerminate function will create a go-routine that will wait till terminate - users must therefore be careful to only call this as necessary.
func (g *gracefulManager) RunWithShutdownChan(run RunnableWithShutdownChan) {
g.runningServerWaitGroup.Add(1)
defer g.runningServerWaitGroup.Done()
run(g.IsShutdown(), func(ctx context.Context, atTerminate func()) {
g.RunAtTerminate(ctx, atTerminate)
})
}
// RunWithShutdownContext takes a function that has a context to watch for shutdown.
// After the provided context is Done(), the main function must return once shutdown is complete.
// (Optionally the HammerContext may be obtained and waited for however, this should be avoided if possible.)
func (g *gracefulManager) RunWithShutdownContext(run func(context.Context)) {
g.runningServerWaitGroup.Add(1)
defer g.runningServerWaitGroup.Done()
run(g.ShutdownContext())
}
// RunAtTerminate adds to the terminate wait group and creates a go-routine to run the provided function at termination
func (g *gracefulManager) RunAtTerminate(ctx context.Context, terminate func()) {
g.terminateWaitGroup.Add(1)
go func() {
select {
case <-g.IsTerminate():
terminate()
case <-ctx.Done():
}
g.terminateWaitGroup.Done()
}()
}
// RunAtShutdown creates a go-routine to run the provided function at shutdown
func (g *gracefulManager) RunAtShutdown(ctx context.Context, shutdown func()) {
go func() {
select {
case <-g.IsShutdown():
shutdown()
case <-ctx.Done():
}
}()
}
// RunAtHammer creates a go-routine to run the provided function at shutdown
func (g *gracefulManager) RunAtHammer(ctx context.Context, hammer func()) {
go func() {
select {
case <-g.IsHammer():
hammer()
case <-ctx.Done():
}
}()
}
func (g *gracefulManager) doShutdown() { func (g *gracefulManager) doShutdown() {
if !g.setStateTransition(stateRunning, stateShuttingDown) { if !g.setStateTransition(stateRunning, stateShuttingDown) {
return return
@ -50,6 +154,8 @@ func (g *gracefulManager) doShutdown() {
} }
go func() { go func() {
g.WaitForServers() g.WaitForServers()
// Mop up any remaining unclosed events.
g.doHammerTime(0)
<-time.After(1 * time.Second) <-time.After(1 * time.Second)
g.doTerminate() g.doTerminate()
}() }()

View file

@ -7,6 +7,7 @@
package graceful package graceful
import ( import (
"context"
"errors" "errors"
"os" "os"
"os/signal" "os/signal"
@ -31,19 +32,19 @@ type gracefulManager struct {
terminateWaitGroup sync.WaitGroup terminateWaitGroup sync.WaitGroup
} }
func newGracefulManager() *gracefulManager { func newGracefulManager(ctx context.Context) *gracefulManager {
manager := &gracefulManager{ manager := &gracefulManager{
isChild: len(os.Getenv(listenFDs)) > 0 && os.Getppid() > 1, isChild: len(os.Getenv(listenFDs)) > 0 && os.Getppid() > 1,
lock: &sync.RWMutex{}, lock: &sync.RWMutex{},
} }
manager.createServerWaitGroup.Add(numberOfServersToCreate) manager.createServerWaitGroup.Add(numberOfServersToCreate)
manager.Run() manager.Run(ctx)
return manager return manager
} }
func (g *gracefulManager) Run() { func (g *gracefulManager) Run(ctx context.Context) {
g.setState(stateRunning) g.setState(stateRunning)
go g.handleSignals() go g.handleSignals(ctx)
c := make(chan struct{}) c := make(chan struct{})
go func() { go func() {
defer close(c) defer close(c)
@ -69,9 +70,7 @@ func (g *gracefulManager) Run() {
} }
} }
func (g *gracefulManager) handleSignals() { func (g *gracefulManager) handleSignals(ctx context.Context) {
var sig os.Signal
signalChannel := make(chan os.Signal, 1) signalChannel := make(chan os.Signal, 1)
signal.Notify( signal.Notify(
@ -86,7 +85,8 @@ func (g *gracefulManager) handleSignals() {
pid := syscall.Getpid() pid := syscall.Getpid()
for { for {
sig = <-signalChannel select {
case sig := <-signalChannel:
switch sig { switch sig {
case syscall.SIGHUP: case syscall.SIGHUP:
if setting.GracefulRestartable { if setting.GracefulRestartable {
@ -116,6 +116,10 @@ func (g *gracefulManager) handleSignals() {
default: default:
log.Info("PID %d. Received %v.", pid, sig) log.Info("PID %d. Received %v.", pid, sig)
} }
case <-ctx.Done():
log.Warn("PID: %d. Background context for manager closed - %v - Shutting down...", pid, ctx.Err())
g.doShutdown()
}
} }
} }

View file

@ -8,6 +8,7 @@
package graceful package graceful
import ( import (
"context"
"os" "os"
"strconv" "strconv"
"sync" "sync"
@ -29,6 +30,7 @@ const (
) )
type gracefulManager struct { type gracefulManager struct {
ctx context.Context
isChild bool isChild bool
lock *sync.RWMutex lock *sync.RWMutex
state state state state
@ -40,10 +42,11 @@ type gracefulManager struct {
terminateWaitGroup sync.WaitGroup terminateWaitGroup sync.WaitGroup
} }
func newGracefulManager() *gracefulManager { func newGracefulManager(ctx context.Context) *gracefulManager {
manager := &gracefulManager{ manager := &gracefulManager{
isChild: false, isChild: false,
lock: &sync.RWMutex{}, lock: &sync.RWMutex{},
ctx: ctx,
} }
manager.createServerWaitGroup.Add(numberOfServersToCreate) manager.createServerWaitGroup.Add(numberOfServersToCreate)
manager.Run() manager.Run()
@ -89,7 +92,13 @@ func (g *gracefulManager) Execute(args []string, changes <-chan svc.ChangeReques
waitTime := 30 * time.Second waitTime := 30 * time.Second
loop: loop:
for change := range changes { for {
select {
case <-g.ctx.Done():
g.doShutdown()
waitTime += setting.GracefulHammerTime
break loop
case change := <-changes:
switch change.Cmd { switch change.Cmd {
case svc.Interrogate: case svc.Interrogate:
status <- change.CurrentStatus status <- change.CurrentStatus
@ -105,7 +114,7 @@ loop:
log.Debug("Unexpected control request: %v", change.Cmd) log.Debug("Unexpected control request: %v", change.Cmd)
} }
} }
}
status <- svc.Status{ status <- svc.Status{
State: svc.StopPending, State: svc.StopPending,
WaitHint: uint32(waitTime / time.Millisecond), WaitHint: uint32(waitTime / time.Millisecond),

View file

@ -12,6 +12,7 @@ import (
"fmt" "fmt"
"io" "io"
"os/exec" "os/exec"
"sort"
"sync" "sync"
"time" "time"
) )
@ -24,14 +25,17 @@ var (
// ErrExecTimeout represent a timeout error // ErrExecTimeout represent a timeout error
ErrExecTimeout = errors.New("Process execution timeout") ErrExecTimeout = errors.New("Process execution timeout")
manager *Manager manager *Manager
// DefaultContext is the default context to run processing commands in
DefaultContext = context.Background()
) )
// Process represents a working process inherit from Gogs. // Process represents a working process inheriting from Gitea.
type Process struct { type Process struct {
PID int64 // Process ID, not system one. PID int64 // Process ID, not system one.
Description string Description string
Start time.Time Start time.Time
Cmd *exec.Cmd Cancel context.CancelFunc
} }
// Manager knows about all processes and counts PIDs. // Manager knows about all processes and counts PIDs.
@ -39,28 +43,28 @@ type Manager struct {
mutex sync.Mutex mutex sync.Mutex
counter int64 counter int64
Processes map[int64]*Process processes map[int64]*Process
} }
// GetManager returns a Manager and initializes one as singleton if there's none yet // GetManager returns a Manager and initializes one as singleton if there's none yet
func GetManager() *Manager { func GetManager() *Manager {
if manager == nil { if manager == nil {
manager = &Manager{ manager = &Manager{
Processes: make(map[int64]*Process), processes: make(map[int64]*Process),
} }
} }
return manager return manager
} }
// Add a process to the ProcessManager and returns its PID. // Add a process to the ProcessManager and returns its PID.
func (pm *Manager) Add(description string, cmd *exec.Cmd) int64 { func (pm *Manager) Add(description string, cancel context.CancelFunc) int64 {
pm.mutex.Lock() pm.mutex.Lock()
pid := pm.counter + 1 pid := pm.counter + 1
pm.Processes[pid] = &Process{ pm.processes[pid] = &Process{
PID: pid, PID: pid,
Description: description, Description: description,
Start: time.Now(), Start: time.Now(),
Cmd: cmd, Cancel: cancel,
} }
pm.counter = pid pm.counter = pid
pm.mutex.Unlock() pm.mutex.Unlock()
@ -71,10 +75,32 @@ func (pm *Manager) Add(description string, cmd *exec.Cmd) int64 {
// Remove a process from the ProcessManager. // Remove a process from the ProcessManager.
func (pm *Manager) Remove(pid int64) { func (pm *Manager) Remove(pid int64) {
pm.mutex.Lock() pm.mutex.Lock()
delete(pm.Processes, pid) delete(pm.processes, pid)
pm.mutex.Unlock() pm.mutex.Unlock()
} }
// Cancel a process in the ProcessManager.
func (pm *Manager) Cancel(pid int64) {
pm.mutex.Lock()
process, ok := pm.processes[pid]
pm.mutex.Unlock()
if ok {
process.Cancel()
}
}
// Processes gets the processes in a thread safe manner
func (pm *Manager) Processes() []*Process {
pm.mutex.Lock()
processes := make([]*Process, 0, len(pm.processes))
for _, process := range pm.processes {
processes = append(processes, process)
}
pm.mutex.Unlock()
sort.Sort(processList(processes))
return processes
}
// Exec a command and use the default timeout. // Exec a command and use the default timeout.
func (pm *Manager) Exec(desc, cmdName string, args ...string) (string, string, error) { func (pm *Manager) Exec(desc, cmdName string, args ...string) (string, string, error) {
return pm.ExecDir(-1, "", desc, cmdName, args...) return pm.ExecDir(-1, "", desc, cmdName, args...)
@ -110,7 +136,7 @@ func (pm *Manager) ExecDirEnvStdIn(timeout time.Duration, dir, desc string, env
stdOut := new(bytes.Buffer) stdOut := new(bytes.Buffer)
stdErr := new(bytes.Buffer) stdErr := new(bytes.Buffer)
ctx, cancel := context.WithTimeout(context.Background(), timeout) ctx, cancel := context.WithTimeout(DefaultContext, timeout)
defer cancel() defer cancel()
cmd := exec.CommandContext(ctx, cmdName, args...) cmd := exec.CommandContext(ctx, cmdName, args...)
@ -126,7 +152,7 @@ func (pm *Manager) ExecDirEnvStdIn(timeout time.Duration, dir, desc string, env
return "", "", err return "", "", err
} }
pid := pm.Add(desc, cmd) pid := pm.Add(desc, cancel)
err := cmd.Wait() err := cmd.Wait()
pm.Remove(pid) pm.Remove(pid)
@ -137,21 +163,16 @@ func (pm *Manager) ExecDirEnvStdIn(timeout time.Duration, dir, desc string, env
return stdOut.String(), stdErr.String(), err return stdOut.String(), stdErr.String(), err
} }
// Kill and remove a process from list. type processList []*Process
func (pm *Manager) Kill(pid int64) error {
if proc, exists := pm.Processes[pid]; exists { func (l processList) Len() int {
pm.mutex.Lock() return len(l)
if proc.Cmd != nil &&
proc.Cmd.Process != nil &&
proc.Cmd.ProcessState != nil &&
!proc.Cmd.ProcessState.Exited() {
if err := proc.Cmd.Process.Kill(); err != nil {
return fmt.Errorf("failed to kill process(%d/%s): %v", pid, proc.Description, err)
}
}
delete(pm.Processes, pid)
pm.mutex.Unlock()
} }
return nil func (l processList) Less(i, j int) bool {
return l[i].PID < l[j].PID
}
func (l processList) Swap(i, j int) {
l[i], l[j] = l[j], l[i]
} }

View file

@ -1,7 +1,7 @@
package process package process
import ( import (
"os/exec" "context"
"testing" "testing"
"time" "time"
@ -9,27 +9,42 @@ import (
) )
func TestManager_Add(t *testing.T) { func TestManager_Add(t *testing.T) {
pm := Manager{Processes: make(map[int64]*Process)} pm := Manager{processes: make(map[int64]*Process)}
pid := pm.Add("foo", exec.Command("foo")) pid := pm.Add("foo", nil)
assert.Equal(t, int64(1), pid, "expected to get pid 1 got %d", pid) assert.Equal(t, int64(1), pid, "expected to get pid 1 got %d", pid)
pid = pm.Add("bar", exec.Command("bar")) pid = pm.Add("bar", nil)
assert.Equal(t, int64(2), pid, "expected to get pid 2 got %d", pid) assert.Equal(t, int64(2), pid, "expected to get pid 2 got %d", pid)
} }
func TestManager_Remove(t *testing.T) { func TestManager_Cancel(t *testing.T) {
pm := Manager{Processes: make(map[int64]*Process)} pm := Manager{processes: make(map[int64]*Process)}
pid1 := pm.Add("foo", exec.Command("foo")) ctx, cancel := context.WithCancel(context.Background())
pid := pm.Add("foo", cancel)
pm.Cancel(pid)
select {
case <-ctx.Done():
default:
assert.Fail(t, "Cancel should cancel the provided context")
}
}
func TestManager_Remove(t *testing.T) {
pm := Manager{processes: make(map[int64]*Process)}
pid1 := pm.Add("foo", nil)
assert.Equal(t, int64(1), pid1, "expected to get pid 1 got %d", pid1) assert.Equal(t, int64(1), pid1, "expected to get pid 1 got %d", pid1)
pid2 := pm.Add("bar", exec.Command("bar")) pid2 := pm.Add("bar", nil)
assert.Equal(t, int64(2), pid2, "expected to get pid 2 got %d", pid2) assert.Equal(t, int64(2), pid2, "expected to get pid 2 got %d", pid2)
pm.Remove(pid2) pm.Remove(pid2)
_, exists := pm.Processes[pid2] _, exists := pm.processes[pid2]
assert.False(t, exists, "PID %d is in the list but shouldn't", pid2) assert.False(t, exists, "PID %d is in the list but shouldn't", pid2)
} }

View file

@ -1999,6 +1999,9 @@ monitor.process = Running Processes
monitor.desc = Description monitor.desc = Description
monitor.start = Start Time monitor.start = Start Time
monitor.execute_time = Execution Time monitor.execute_time = Execution Time
monitor.process.cancel = Cancel process
monitor.process.cancel_desc = Cancelling a process may cause data loss
monitor.process.cancel_notices = Cancel: <strong>%s</strong>?
notices.system_notice_list = System Notices notices.system_notice_list = System Notices
notices.view_detail_header = View Notice Details notices.view_detail_header = View Notice Details

View file

@ -352,7 +352,16 @@ func Monitor(ctx *context.Context) {
ctx.Data["Title"] = ctx.Tr("admin.monitor") ctx.Data["Title"] = ctx.Tr("admin.monitor")
ctx.Data["PageIsAdmin"] = true ctx.Data["PageIsAdmin"] = true
ctx.Data["PageIsAdminMonitor"] = true ctx.Data["PageIsAdminMonitor"] = true
ctx.Data["Processes"] = process.GetManager().Processes ctx.Data["Processes"] = process.GetManager().Processes()
ctx.Data["Entries"] = cron.ListTasks() ctx.Data["Entries"] = cron.ListTasks()
ctx.HTML(200, tplMonitor) ctx.HTML(200, tplMonitor)
} }
// MonitorCancel cancels a process
func MonitorCancel(ctx *context.Context) {
pid := ctx.ParamsInt64("pid")
process.GetManager().Cancel(pid)
ctx.JSON(200, map[string]interface{}{
"redirect": ctx.Repo.RepoLink + "/admin/monitor",
})
}

View file

@ -8,6 +8,7 @@ package repo
import ( import (
"bytes" "bytes"
"compress/gzip" "compress/gzip"
gocontext "context"
"fmt" "fmt"
"net/http" "net/http"
"os" "os"
@ -24,6 +25,7 @@ import (
"code.gitea.io/gitea/modules/context" "code.gitea.io/gitea/modules/context"
"code.gitea.io/gitea/modules/git" "code.gitea.io/gitea/modules/git"
"code.gitea.io/gitea/modules/log" "code.gitea.io/gitea/modules/log"
"code.gitea.io/gitea/modules/process"
"code.gitea.io/gitea/modules/setting" "code.gitea.io/gitea/modules/setting"
"code.gitea.io/gitea/modules/timeutil" "code.gitea.io/gitea/modules/timeutil"
) )
@ -463,8 +465,10 @@ func serviceRPC(h serviceHandler, service string) {
// set this for allow pre-receive and post-receive execute // set this for allow pre-receive and post-receive execute
h.environ = append(h.environ, "SSH_ORIGINAL_COMMAND="+service) h.environ = append(h.environ, "SSH_ORIGINAL_COMMAND="+service)
ctx, cancel := gocontext.WithCancel(git.DefaultContext)
defer cancel()
var stderr bytes.Buffer var stderr bytes.Buffer
cmd := exec.Command(git.GitExecutable, service, "--stateless-rpc", h.dir) cmd := exec.CommandContext(ctx, git.GitExecutable, service, "--stateless-rpc", h.dir)
cmd.Dir = h.dir cmd.Dir = h.dir
if service == "receive-pack" { if service == "receive-pack" {
cmd.Env = append(os.Environ(), h.environ...) cmd.Env = append(os.Environ(), h.environ...)
@ -472,6 +476,10 @@ func serviceRPC(h serviceHandler, service string) {
cmd.Stdout = h.w cmd.Stdout = h.w
cmd.Stdin = reqBody cmd.Stdin = reqBody
cmd.Stderr = &stderr cmd.Stderr = &stderr
pid := process.GetManager().Add(fmt.Sprintf("%s %s %s [repo_path: %s]", git.GitExecutable, service, "--stateless-rpc", h.dir), cancel)
defer process.GetManager().Remove(pid)
if err := cmd.Run(); err != nil { if err := cmd.Run(); err != nil {
log.Error("Fail to serve RPC(%s): %v - %s", service, err, stderr.String()) log.Error("Fail to serve RPC(%s): %v - %s", service, err, stderr.String())
return return

View file

@ -422,6 +422,7 @@ func RegisterRoutes(m *macaron.Macaron) {
m.Get("/config", admin.Config) m.Get("/config", admin.Config)
m.Post("/config/test_mail", admin.SendTestMail) m.Post("/config/test_mail", admin.SendTestMail)
m.Get("/monitor", admin.Monitor) m.Get("/monitor", admin.Monitor)
m.Post("/monitor/cancel/:pid", admin.MonitorCancel)
m.Group("/users", func() { m.Group("/users", func() {
m.Get("", admin.Users) m.Get("", admin.Users)

View file

@ -8,6 +8,7 @@ package gitdiff
import ( import (
"bufio" "bufio"
"bytes" "bytes"
"context"
"fmt" "fmt"
"html" "html"
"html/template" "html/template"
@ -825,9 +826,12 @@ func GetDiffRangeWithWhitespaceBehavior(repoPath, beforeCommitID, afterCommitID
return nil, err return nil, err
} }
// FIXME: graceful: These commands should likely have a timeout
ctx, cancel := context.WithCancel(git.DefaultContext)
defer cancel()
var cmd *exec.Cmd var cmd *exec.Cmd
if len(beforeCommitID) == 0 && commit.ParentCount() == 0 { if len(beforeCommitID) == 0 && commit.ParentCount() == 0 {
cmd = exec.Command(git.GitExecutable, "show", afterCommitID) cmd = exec.CommandContext(ctx, git.GitExecutable, "show", afterCommitID)
} else { } else {
actualBeforeCommitID := beforeCommitID actualBeforeCommitID := beforeCommitID
if len(actualBeforeCommitID) == 0 { if len(actualBeforeCommitID) == 0 {
@ -840,7 +844,7 @@ func GetDiffRangeWithWhitespaceBehavior(repoPath, beforeCommitID, afterCommitID
} }
diffArgs = append(diffArgs, actualBeforeCommitID) diffArgs = append(diffArgs, actualBeforeCommitID)
diffArgs = append(diffArgs, afterCommitID) diffArgs = append(diffArgs, afterCommitID)
cmd = exec.Command(git.GitExecutable, diffArgs...) cmd = exec.CommandContext(ctx, git.GitExecutable, diffArgs...)
beforeCommitID = actualBeforeCommitID beforeCommitID = actualBeforeCommitID
} }
cmd.Dir = repoPath cmd.Dir = repoPath
@ -855,7 +859,7 @@ func GetDiffRangeWithWhitespaceBehavior(repoPath, beforeCommitID, afterCommitID
return nil, fmt.Errorf("Start: %v", err) return nil, fmt.Errorf("Start: %v", err)
} }
pid := process.GetManager().Add(fmt.Sprintf("GetDiffRange [repo_path: %s]", repoPath), cmd) pid := process.GetManager().Add(fmt.Sprintf("GetDiffRange [repo_path: %s]", repoPath), cancel)
defer process.GetManager().Remove(pid) defer process.GetManager().Remove(pid)
diff, err := ParsePatch(maxLines, maxLineCharacters, maxFiles, stdout) diff, err := ParsePatch(maxLines, maxLineCharacters, maxFiles, stdout)
@ -908,27 +912,31 @@ func GetRawDiffForFile(repoPath, startCommit, endCommit string, diffType RawDiff
if len(file) > 0 { if len(file) > 0 {
fileArgs = append(fileArgs, "--", file) fileArgs = append(fileArgs, "--", file)
} }
// FIXME: graceful: These commands should have a timeout
ctx, cancel := context.WithCancel(git.DefaultContext)
defer cancel()
var cmd *exec.Cmd var cmd *exec.Cmd
switch diffType { switch diffType {
case RawDiffNormal: case RawDiffNormal:
if len(startCommit) != 0 { if len(startCommit) != 0 {
cmd = exec.Command(git.GitExecutable, append([]string{"diff", "-M", startCommit, endCommit}, fileArgs...)...) cmd = exec.CommandContext(ctx, git.GitExecutable, append([]string{"diff", "-M", startCommit, endCommit}, fileArgs...)...)
} else if commit.ParentCount() == 0 { } else if commit.ParentCount() == 0 {
cmd = exec.Command(git.GitExecutable, append([]string{"show", endCommit}, fileArgs...)...) cmd = exec.CommandContext(ctx, git.GitExecutable, append([]string{"show", endCommit}, fileArgs...)...)
} else { } else {
c, _ := commit.Parent(0) c, _ := commit.Parent(0)
cmd = exec.Command(git.GitExecutable, append([]string{"diff", "-M", c.ID.String(), endCommit}, fileArgs...)...) cmd = exec.CommandContext(ctx, git.GitExecutable, append([]string{"diff", "-M", c.ID.String(), endCommit}, fileArgs...)...)
} }
case RawDiffPatch: case RawDiffPatch:
if len(startCommit) != 0 { if len(startCommit) != 0 {
query := fmt.Sprintf("%s...%s", endCommit, startCommit) query := fmt.Sprintf("%s...%s", endCommit, startCommit)
cmd = exec.Command(git.GitExecutable, append([]string{"format-patch", "--no-signature", "--stdout", "--root", query}, fileArgs...)...) cmd = exec.CommandContext(ctx, git.GitExecutable, append([]string{"format-patch", "--no-signature", "--stdout", "--root", query}, fileArgs...)...)
} else if commit.ParentCount() == 0 { } else if commit.ParentCount() == 0 {
cmd = exec.Command(git.GitExecutable, append([]string{"format-patch", "--no-signature", "--stdout", "--root", endCommit}, fileArgs...)...) cmd = exec.CommandContext(ctx, git.GitExecutable, append([]string{"format-patch", "--no-signature", "--stdout", "--root", endCommit}, fileArgs...)...)
} else { } else {
c, _ := commit.Parent(0) c, _ := commit.Parent(0)
query := fmt.Sprintf("%s...%s", endCommit, c.ID.String()) query := fmt.Sprintf("%s...%s", endCommit, c.ID.String())
cmd = exec.Command(git.GitExecutable, append([]string{"format-patch", "--no-signature", "--stdout", query}, fileArgs...)...) cmd = exec.CommandContext(ctx, git.GitExecutable, append([]string{"format-patch", "--no-signature", "--stdout", query}, fileArgs...)...)
} }
default: default:
return fmt.Errorf("invalid diffType: %s", diffType) return fmt.Errorf("invalid diffType: %s", diffType)
@ -939,6 +947,9 @@ func GetRawDiffForFile(repoPath, startCommit, endCommit string, diffType RawDiff
cmd.Dir = repoPath cmd.Dir = repoPath
cmd.Stdout = writer cmd.Stdout = writer
cmd.Stderr = stderr cmd.Stderr = stderr
pid := process.GetManager().Add(fmt.Sprintf("GetRawDiffForFile: [repo_path: %s]", repoPath), cancel)
defer process.GetManager().Remove(pid)
if err = cmd.Run(); err != nil { if err = cmd.Run(); err != nil {
return fmt.Errorf("Run: %v - %s", err, stderr) return fmt.Errorf("Run: %v - %s", err, stderr)
} }

View file

@ -15,7 +15,6 @@ import (
"code.gitea.io/gitea/modules/git" "code.gitea.io/gitea/modules/git"
"code.gitea.io/gitea/modules/log" "code.gitea.io/gitea/modules/log"
"code.gitea.io/gitea/modules/notification" "code.gitea.io/gitea/modules/notification"
"code.gitea.io/gitea/modules/process"
"code.gitea.io/gitea/modules/setting" "code.gitea.io/gitea/modules/setting"
"code.gitea.io/gitea/modules/sync" "code.gitea.io/gitea/modules/sync"
"code.gitea.io/gitea/modules/timeutil" "code.gitea.io/gitea/modules/timeutil"
@ -172,25 +171,36 @@ func runSync(m *models.Mirror) ([]*mirrorSyncResult, bool) {
gitArgs = append(gitArgs, "--prune") gitArgs = append(gitArgs, "--prune")
} }
_, stderr, err := process.GetManager().ExecDir( stdoutBuilder := strings.Builder{}
timeout, repoPath, fmt.Sprintf("Mirror.runSync: %s", repoPath), stderrBuilder := strings.Builder{}
git.GitExecutable, gitArgs...) if err := git.NewCommand(gitArgs...).
if err != nil { SetDescription(fmt.Sprintf("Mirror.runSync: %s", m.Repo.FullName())).
RunInDirTimeoutPipeline(timeout, repoPath, &stdoutBuilder, &stderrBuilder); err != nil {
stdout := stdoutBuilder.String()
stderr := stderrBuilder.String()
// sanitize the output, since it may contain the remote address, which may // sanitize the output, since it may contain the remote address, which may
// contain a password // contain a password
message, err := sanitizeOutput(stderr, repoPath) stderrMessage, sanitizeErr := sanitizeOutput(stderr, repoPath)
if err != nil { if sanitizeErr != nil {
log.Error("sanitizeOutput: %v", err) log.Error("sanitizeOutput failed on stderr: %v", sanitizeErr)
log.Error("Failed to update mirror repository %v:\nStdout: %s\nStderr: %s\nErr: %v", m.Repo, stdout, stderr, err)
return nil, false return nil, false
} }
desc := fmt.Sprintf("Failed to update mirror repository '%s': %s", repoPath, message) stdoutMessage, err := sanitizeOutput(stdout, repoPath)
log.Error(desc) if err != nil {
log.Error("sanitizeOutput failed: %v", sanitizeErr)
log.Error("Failed to update mirror repository %v:\nStdout: %s\nStderr: %s\nErr: %v", m.Repo, stdout, stderrMessage, err)
return nil, false
}
log.Error("Failed to update mirror repository %v:\nStdout: %s\nStderr: %s\nErr: %v", m.Repo, stdoutMessage, stderrMessage, err)
desc := fmt.Sprintf("Failed to update mirror repository '%s': %s", repoPath, stderrMessage)
if err = models.CreateRepositoryNotice(desc); err != nil { if err = models.CreateRepositoryNotice(desc); err != nil {
log.Error("CreateRepositoryNotice: %v", err) log.Error("CreateRepositoryNotice: %v", err)
} }
return nil, false return nil, false
} }
output := stderr output := stderrBuilder.String()
gitRepo, err := git.OpenRepository(repoPath) gitRepo, err := git.OpenRepository(repoPath)
if err != nil { if err != nil {
@ -208,18 +218,30 @@ func runSync(m *models.Mirror) ([]*mirrorSyncResult, bool) {
} }
if m.Repo.HasWiki() { if m.Repo.HasWiki() {
if _, stderr, err := process.GetManager().ExecDir( stderrBuilder.Reset()
timeout, wikiPath, fmt.Sprintf("Mirror.runSync: %s", wikiPath), stdoutBuilder.Reset()
git.GitExecutable, "remote", "update", "--prune"); err != nil { if err := git.NewCommand("remote", "update", "--prune").
SetDescription(fmt.Sprintf("Mirror.runSync Wiki: %s ", m.Repo.FullName())).
RunInDirTimeoutPipeline(timeout, wikiPath, &stdoutBuilder, &stderrBuilder); err != nil {
stdout := stdoutBuilder.String()
stderr := stderrBuilder.String()
// sanitize the output, since it may contain the remote address, which may // sanitize the output, since it may contain the remote address, which may
// contain a password // contain a password
message, err := sanitizeOutput(stderr, wikiPath) stderrMessage, sanitizeErr := sanitizeOutput(stderr, repoPath)
if err != nil { if sanitizeErr != nil {
log.Error("sanitizeOutput: %v", err) log.Error("sanitizeOutput failed on stderr: %v", sanitizeErr)
log.Error("Failed to update mirror repository wiki %v:\nStdout: %s\nStderr: %s\nErr: %v", m.Repo, stdout, stderr, err)
return nil, false return nil, false
} }
desc := fmt.Sprintf("Failed to update mirror wiki repository '%s': %s", wikiPath, message) stdoutMessage, err := sanitizeOutput(stdout, repoPath)
log.Error(desc) if err != nil {
log.Error("sanitizeOutput failed: %v", sanitizeErr)
log.Error("Failed to update mirror repository wiki %v:\nStdout: %s\nStderr: %s\nErr: %v", m.Repo, stdout, stderrMessage, err)
return nil, false
}
log.Error("Failed to update mirror repository wiki %v:\nStdout: %s\nStderr: %s\nErr: %v", m.Repo, stdoutMessage, stderrMessage, err)
desc := fmt.Sprintf("Failed to update mirror repository wiki '%s': %s", wikiPath, stderrMessage)
if err = models.CreateRepositoryNotice(desc); err != nil { if err = models.CreateRepositoryNotice(desc); err != nil {
log.Error("CreateRepositoryNotice: %v", err) log.Error("CreateRepositoryNotice: %v", err)
} }

View file

@ -13,7 +13,6 @@ import (
"code.gitea.io/gitea/modules/git" "code.gitea.io/gitea/modules/git"
"code.gitea.io/gitea/modules/log" "code.gitea.io/gitea/modules/log"
"code.gitea.io/gitea/modules/notification" "code.gitea.io/gitea/modules/notification"
"code.gitea.io/gitea/modules/process"
"code.gitea.io/gitea/modules/timeutil" "code.gitea.io/gitea/modules/timeutil"
) )
@ -128,11 +127,11 @@ func DeleteReleaseByID(id int64, doer *models.User, delTag bool) error {
} }
if delTag { if delTag {
_, stderr, err := process.GetManager().ExecDir(-1, repo.RepoPath(), if stdout, err := git.NewCommand("tag", "-d", rel.TagName).
fmt.Sprintf("DeleteReleaseByID (git tag -d): %d", rel.ID), SetDescription(fmt.Sprintf("DeleteReleaseByID (git tag -d): %d", rel.ID)).
git.GitExecutable, "tag", "-d", rel.TagName) RunInDir(repo.RepoPath()); err != nil && !strings.Contains(err.Error(), "not found") {
if err != nil && !strings.Contains(stderr, "not found") { log.Error("DeleteReleaseByID (git tag -d): %d in %v Failed:\nStdout: %s\nError: %v", rel.ID, repo, stdout, err)
return fmt.Errorf("git tag -d: %v - %s", err, stderr) return fmt.Errorf("git tag -d: %v", err)
} }
if err := models.DeleteReleaseByID(id); err != nil { if err := models.DeleteReleaseByID(id); err != nil {

View file

@ -42,6 +42,7 @@
<th>{{.i18n.Tr "admin.monitor.desc"}}</th> <th>{{.i18n.Tr "admin.monitor.desc"}}</th>
<th>{{.i18n.Tr "admin.monitor.start"}}</th> <th>{{.i18n.Tr "admin.monitor.start"}}</th>
<th>{{.i18n.Tr "admin.monitor.execute_time"}}</th> <th>{{.i18n.Tr "admin.monitor.execute_time"}}</th>
<th></th>
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
@ -51,6 +52,7 @@
<td>{{.Description}}</td> <td>{{.Description}}</td>
<td>{{DateFmtLong .Start}}</td> <td>{{DateFmtLong .Start}}</td>
<td>{{TimeSince .Start $.Lang}}</td> <td>{{TimeSince .Start $.Lang}}</td>
<td><a class="delete-button" href="" data-url="{{$.Link}}/cancel/{{.PID}}" data-id="{{.PID}}" data-name="{{.Description}}"><i class="close icon text red"></i></a></td>
</tr> </tr>
{{end}} {{end}}
</tbody> </tbody>
@ -58,4 +60,15 @@
</div> </div>
</div> </div>
</div> </div>
<div class="ui small basic delete modal">
<div class="ui icon header">
<i class="close icon"></i>
{{.i18n.Tr "admin.monitor.process.cancel"}}
</div>
<div class="content">
<p>{{$.i18n.Tr "admin.monitor.process.cancel_notices" `<span class="name"></span>` | Safe}}</p>
<p>{{$.i18n.Tr "admin.monitor.process.cancel_desc"}}</p>
</div>
{{template "base/delete_modal_actions" .}}
</div>
{{template "base/footer" .}} {{template "base/footer" .}}