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

ceph-disk: allow using a regular file as a journal #11619

Merged
merged 1 commit into from Oct 26, 2016
Merged

ceph-disk: allow using a regular file as a journal #11619

merged 1 commit into from Oct 26, 2016

Conversation

ghost
Copy link

@ghost ghost commented Oct 24, 2016

@ghost ghost added bug-fix core labels Oct 24, 2016
Because of a missing return, ceph-disk prepare would fail if given a
regular file as a journal. If the journal file does not exist, ceph-disk
will create it but fail to ensure that the ceph user owns it. The
symlink to the journal file is not set when the journal file is
specified on the command line and the journal file does not exist at
all. The ceph-osd daemon will silently create it as a file but it will
not be the file given in argument.

Add a test case to verify using a regular file as a journal works as
expected.

Fixes: http://tracker.ceph.com/issues/17662

Signed-off-by: Jayashree Candadai <jayaajay@indiana.edu>
Signed-off-by: Loic Dachary <ldachary@redhat.com>
@ghost ghost changed the title ceph-disk: missing return when a file is used for journal ceph-disk: allow using a regular file as a journal Oct 24, 2016
@ghost
Copy link
Author

ghost commented Oct 25, 2016

jenkins test this please (general jenkins failure)

@ghost
Copy link
Author

ghost commented Oct 25, 2016

teuthology-suite -k distro --verbose --suite ceph-disk --suite-branch master --ceph wip-17662-ceph-disk --machine-type vps --priority 101 machine_types/vps.yaml

@ghost ghost assigned cbodley Oct 25, 2016
@ghost
Copy link
Author

ghost commented Oct 25, 2016

@cbodley would you mind reviewing this ? I'm asking because you took an interest into this. But feel free to decline and I'll ask someone else ;-) Note that it passed the ceph-disk suite above.

@ghost ghost unassigned cbodley Oct 25, 2016
@ghost
Copy link
Author

ghost commented Oct 25, 2016

@tchaikov if you have time to review this quickly it could make it to 10.2.4. Otherwise it's not a big deal: it has been there for some time now anyway :-)

@ghost ghost assigned tchaikov Oct 25, 2016
@tchaikov tchaikov merged commit ed9b0d3 into ceph:master Oct 26, 2016
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
3 participants