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

If the zfs command failed then the command hung. by calling maniwg.Do… #467

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions backup/backup.go
Original file line number Diff line number Diff line change
Expand Up @@ -373,6 +373,8 @@ func Backup(pctx context.Context, jobInfo *files.JobInfo) error {
case fileBuffer <- true:
}
case <-ctx.Done():
log.AppLogger.Debugf("manifest copy: ctx.Done(): err = %v", ctx.Err())
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

concern: I'm not sure this is the correct spot for this - line 287 should trigger above should any error raise from the underlying zfs backup stream, perhaps actually we should add this to line 300 while waiting to pass along the volume?

Also looking through here, line 358 may also warrant a call to maniwg.Done()...

Perhaps a larger issue here is all the corner cases this method of sync'ing between goroutines has and addressing the TODO below on line 385.

maniwg.Done()
return ctx.Err()
}
}
Expand Down