mirror
/
restic
mirror of https://github.com/restic/restic.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #3152 from MichaelEischer/fix-backup-background-hang 

backup: Fix shutdown hang when running in the background on linux
This commit is contained in:
Alexander Neumann 2020-12-06 21:16:00 +01:00 committed by GitHub
parent 0d5b764f90 401ef92c5f
commit b58799d83a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
changelog/unreleased/pull-3152 Normal file
View File

@ -0,0 +1,8 @@
Bugfix: On Linux `backup` hangs during exit when run as a background job
On Linux, when running in the background restic failed to stop the terminal
output of the `backup` command after it had completed. This caused restic to
hang until moved to the foreground. This has been fixed.
https://github.com/restic/restic/pull/3152
https://forum.restic.net/t/restic-alpine-container-cron-hangs-epoll-pwait/3334

6
internal/ui/termstatus/status.go
View File

@ -96,11 +96,9 @@ func (t *Terminal) run(ctx context.Context) {
for { for {
select { select {
case <-ctx.Done(): case <-ctx.Done():
if IsProcessBackground(t.fd) { if !IsProcessBackground(t.fd) {
// ignore all messages, do nothing, we are in the background process group
continue
}
t.undoStatus(len(status)) t.undoStatus(len(status))
}
return return