os/filestore/FileJournal: fail out if FileJournal is not block device… #11146
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
… or regular file otherwise JournalingFileStore will assert when deleting FileJournal which still has the non block/regular file opened. Fixes: http://tracker.ceph.com/issues/17307 Signed-off-by: Kefu Chai <kchai@redhat.com>
|
👍 |
dzafman
reviewed
Jul 21, 2017
| @@ -134,6 +138,7 @@ int FileJournal::_open(bool forwrite, bool create) | |||
|
|
|||
| out_fd: | |||
| VOID_TEMP_FAILURE_RETRY(::close(fd)); | |||
| fd = -1; | |||
There was a problem hiding this comment.
@tchaikov This one line is really the fix. but the other changes improve the error output.
There was a problem hiding this comment.
thanks for helping me understand this fix.
There was a problem hiding this comment.
I led you astray. Actually, the open doesn't fail, so without the S_ISREG check, it would crash later upon read failure.
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.
… or regular file
otherwise JournalingFileStore will assert when deleting FileJournal
which still has the non block/regular file opened.
Fixes: http://tracker.ceph.com/issues/17307
Signed-off-by: Kefu Chai kchai@redhat.com