chanbackup: always close SCB file after reading #4456
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
cfromknecht
reviewed
Jul 9, 2020
chanbackup/backupfile.go
Outdated
| @@ -161,6 +161,9 @@ func (b *MultiFile) ExtractMulti(keyChain keychain.KeyRing) (*Multi, error) { | |||
| if err != nil { | |||
| return nil, err | |||
| } | |||
| if err := b.mainFile.Close(); err != nil { | |||
There was a problem hiding this comment.
Any reason to not use ioutil.ReadFile?
There was a problem hiding this comment.
Switched to use ioutil.ReadFile confirmed that it uses a defer close internally.
Roasbeef
force-pushed
the
windows-scb-close
branch
from
95f8dfb to
fdd74e7
Compare
In this commit, we fix a bug introduced with the recent bug fix for SCB state+fail combination. On windwos a rename operation will fail is the fail one is attempting to rename is still open. Therefore we need to close the file after we read the contents, to ensure the follow up rename operations once the channel state changes will succeed. We do this by using `ioutil.ReadFile`, which will always clsoe the file after reading. Fixes lightningnetwork#4450.
Roasbeef
force-pushed
the
windows-scb-close
branch
from
fdd74e7 to
c58be56
Compare
wpaulino
approved these changes
Jul 13, 2020
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
In this commit, we fix a bug introduced with the recent bug fix for SCB
state+fail combination. On windwos a rename operation will fail is the
fail one is attempting to rename is still open. Therefore we need to
close the file after we read the contents, to ensure the follow up
rename operations once the channel state changes will succeed.
Fixes #4450.