ceph-osd: infer objectstore type of 'type' file is missing#26720
Merged
liewegas merged 1 commit intoceph:masterfrom Mar 2, 2019
Merged
ceph-osd: infer objectstore type of 'type' file is missing#26720liewegas merged 1 commit intoceph:masterfrom
liewegas merged 1 commit intoceph:masterfrom
Conversation
alfredodeza
reviewed
Mar 1, 2019
| ::close(fd); | ||
| } else { | ||
| // hrm, infer the type | ||
| snprintf(fn, sizeof(fn), "%s/current", data_path.c_str()); |
Contributor
There was a problem hiding this comment.
what we do in ceph-volume is check for the presence of journal. Is checking for the current/ directory a better way?
Member
Author
There was a problem hiding this comment.
Both are required, so I think it doesn't matter.
alfredodeza
approved these changes
Mar 1, 2019
The current value of osd_objectstore should have no bearing--we should rely on the state in front of us. - If there is a directory called current/, assume filestore. - If there is a symlink called block, assume bluestore. - If we see none of those, fail. Fixes: http://tracker.ceph.com/issues/38517 Signed-off-by: Sage Weil <sage@redhat.com>
neha-ojha
approved these changes
Mar 2, 2019
liewegas
added a commit
that referenced
this pull request
Mar 2, 2019
* refs/pull/26720/head: ceph-osd: infer objectstore type of 'type' file is missing Reviewed-by: Alfredo Deza <adeza@redhat.com> Reviewed-by: Neha Ojha <nojha@redhat.com>
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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.
The current value of osd_objectstore should have no bearing--we should
rely on the state in front of us.
Fixes: http://tracker.ceph.com/issues/38517
Signed-off-by: Sage Weil sage@redhat.com