Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

backup: Fix deadlock #1835

Merged
merged 1 commit into from Jun 9, 2018
Merged

backup: Fix deadlock #1835

merged 1 commit into from Jun 9, 2018

Conversation

fd0
Copy link
Member

@fd0 fd0 commented Jun 9, 2018

When the archiver is faster than the scanner, restic deadlocks. This
commit adds a finished channel to the struct in ui/backup.go so that
scanner results are ignored when the archiver is already finished.

Closes #1834

When the archiver is faster than the scanner, restic deadlocks. This
commit adds a `finished` channel to the struct in `ui/backup.go` so that
scanner results are ignored when the archiver is already finished.

Closes #1834
@fd0 fd0 mentioned this pull request Jun 9, 2018
@codecov-io
Copy link

Codecov Report

Merging #1835 into master will decrease coverage by 0.18%.
The diff coverage is 0%.

Impacted file tree graph

@@            Coverage Diff             @@
##           master    #1835      +/-   ##
==========================================
- Coverage   51.14%   50.95%   -0.19%     
==========================================
  Files         167      167              
  Lines       12915    12921       +6     
==========================================
- Hits         6605     6584      -21     
- Misses       5311     5340      +29     
+ Partials      999      997       -2
Impacted Files Coverage Δ
internal/archiver/scanner.go 67.85% <0%> (-5.22%) ⬇️
internal/ui/backup.go 0% <0%> (ø) ⬆️
internal/checker/checker.go 63.82% <0%> (-3.83%) ⬇️
internal/backend/rclone/backend.go 64.32% <0%> (-1.76%) ⬇️
cmd/restic/global.go 27.37% <0%> (-0.87%) ⬇️
internal/archiver/file_saver.go 85.96% <0%> (+1.75%) ⬆️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update ab37c60...c44e808. Read the comment docs.

@fd0 fd0 merged commit c44e808 into master Jun 9, 2018
fd0 added a commit that referenced this pull request Jun 9, 2018
@fd0 fd0 deleted the fix-1834 branch June 9, 2018 12:31
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants