Always use transaction in JSONFile.Save() #1724
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
| @@ -131,9 +153,35 @@ func newJSONFileTransaction(f *JSONFile) (*jsonFileTransaction, error) { | |||
| } | |||
|
|
|||
| func (f *JSONFile) Save() error { | |||
| tx, txCreated, err := f.getOrMakeTx() | |||
There was a problem hiding this comment.
Can this function be simplified at all? since it's only a 3-liner, maybe don't use a defer?
There was a problem hiding this comment.
wouldn't we want Abort to be called if Commit fails?
There was a problem hiding this comment.
Absolutely, but can't we do that in the error case of save?
There was a problem hiding this comment.
But the Commit happens in capital Save() if it creates a transaction.
|
If |
|
It is removed from the ConfigWriter interface. |
|
PTAL |
|
👍 |
If one exists, it will be used, otherwise a transaction will be created and used around the save() call. Also, this removes Save() from ConfigWriter interface and cleans up unnecessary usage of Save() outside config.go.
save() uses f.tx.tmpname exclusively
patrickxb
force-pushed
the
patrickxb/CORE-2354
branch
from
c74d61c to
5184f5f
Compare
jzila
pushed a commit
that referenced
this pull request
Jan 5, 2019
…ot a dir (#1724) * return ErrNotExist if a non-final path element exists but is not a dir * jzila is a firefighter
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.
If one exists, it will be used, otherwise a transaction
will be created and used around the save() call.
Also, this removes Save() from ConfigWriter interface
and cleans up unnecessary usage of Save() outside config.go.
PTAL @maxtaco