]> git.apps.os.sepia.ceph.com Git - ceph.git/commit
ceph-disk: allow using a regular file as a journal 11657/head
authorJayashree Candadai <jayaajay@indiana.edu>
Fri, 21 Oct 2016 17:52:05 +0000 (13:52 -0400)
committerLoic Dachary <ldachary@redhat.com>
Wed, 26 Oct 2016 09:29:40 +0000 (11:29 +0200)
commitcd99a642a088c7cd010e45a81d6680cdfca16ca6
tree6734adc5b173c68ef3d71272afcd391a14dc79e8
parenta80040230cddc395809d2323392c87a4a1fef923
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>
(cherry picked from commit db917d50eb5f86a07a5487e130f46a6b1d27672a)
qa/workunits/ceph-disk/ceph-disk-test.py
src/ceph-disk/ceph_disk/main.py