]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commit
ceph-disk: allow using a regular file as a journal 11619/head
authorJayashree Candadai <jayaajay@indiana.edu>
Fri, 21 Oct 2016 17:52:05 +0000 (13:52 -0400)
committerLoic Dachary <ldachary@redhat.com>
Mon, 24 Oct 2016 13:58:31 +0000 (15:58 +0200)
commitdb917d50eb5f86a07a5487e130f46a6b1d27672a
treef053c0c17b04f4ad6c1bf4363ed2b20c4f3916ee
parent3b35f2d010561932a477ba7c1a3a87caf47a206e
ceph-disk: allow using a regular file as a journal

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>
qa/workunits/ceph-disk/ceph-disk-test.py
src/ceph-disk/ceph_disk/main.py