Shiloh/githaven
Shiloh/githaven
1
0
Fork 1
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Immediately Hammer if second kill is sent (#18823)

Browse Source 
Currently Gitea will wait for HammerTime or nice shutdown if kill -1 or kill -2
is sent. We should just immediately hammer if there is a second kill.

Signed-off-by: Andrew Thornton <art27@cantab.net>
This commit is contained in:
zeripath 2022-02-19 16:36:25 +00:00 committed by GitHub
parent 4b3ebda0e7
commit 83c9035971
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
modules/graceful/manager.go
View File

@ -193,6 +193,7 @@ func (g *Manager) RunAtHammer(hammer func()) {
func (g *Manager) doShutdown() { func (g *Manager) doShutdown() {
if !g.setStateTransition(stateRunning, stateShuttingDown) { if !g.setStateTransition(stateRunning, stateShuttingDown) {
g.DoImmediateHammer()
return return
} }
g.lock.Lock() g.lock.Lock()

6
modules/graceful/manager_unix.go
View File

@ -168,9 +168,13 @@ func (g *Manager) DoGracefulRestart() {
if setting.GracefulRestartable { if setting.GracefulRestartable {
log.Info("PID: %d. Forking...", os.Getpid()) log.Info("PID: %d. Forking...", os.Getpid())
err := g.doFork() err := g.doFork()
if err != nil && err.Error() != "another process already forked. Ignoring this one" { if err != nil {
if err.Error() == "another process already forked. Ignoring this one" {
g.DoImmediateHammer()
} else {
log.Error("Error whilst forking from PID: %d : %v", os.Getpid(), err) log.Error("Error whilst forking from PID: %d : %v", os.Getpid(), err)
} }
}
} else { } else {
log.Info("PID: %d. Not set restartable. Shutting down...", os.Getpid()) log.Info("PID: %d. Not set restartable. Shutting down...", os.Getpid())