ceph-disk: make journal setup conditional on osd backend #4238
Conversation
Signed-off-by: Sage Weil <sage@redhat.com>
Completes OSD side of #9580 Signed-off-by: Sage Weil <sage@redhat.com>
|
@dachary can you take a look at this when you have time? FWIW we can test these scenarios explicitly by doing 'osd_objectstore = keyvaluestore' and 'enable experimental unrecoverable data corrupting features = keyvaluestore' in ceph.conf. the goal is that for these backends (and memstore, and eventually newstore) ceph-disk will Do The Right Thing and not create any journal |
|
SUCCESS: the output of run-make-check.sh on centos-7 for 4ab60ec is http://paste2.org/bE7z8hnx |
Sent from 
| @@ -1487,6 +1507,9 @@ def main_prepare(args): | |||
| if stat.S_ISBLK(dmode): | |||
| verify_not_in_use(args.data, True) | |||
|
|
|||
| if args.journal and not allows_journal: | |||
| raise Error('journal specified by not allowed by osd backend') | |||
- If the journal is required, require it. - If the journal is not allowed, do not allow one to be specified - If the journal is not wanted, to not set one up by default when none is provided. See #9580 Signed-off-by: Sage Weil <sage@redhat.com>
| def check_journal_reqs(args): | ||
| _, allows_journal = command([ | ||
| 'ceph-osd', '--check-allows-journal', | ||
| '-i', '0', |
There was a problem hiding this comment.
Should all these be hardcoded to 0 ?
I see elsewhere in the script there are calls to ceph-osd that say this argument is ignored...
There was a problem hiding this comment.
|
I'll add a test to src/test/ceph-disk.sh to verify it works as expected. Since needs_journal is for future use only, do you think it would be better to use needs_journal in ceph-disk or just remove it (and add it when it's needed) ? |
|
It's probably harmless but it would be less confusing if ceph-osd --mkfs was called without the --osd-journal argument when relevant ( https://ceph.com/git/?p=ceph.git;a=blob;f=src/ceph-disk#l1722 ) |
ghost
mentioned this pull request
|
Dropping the --osd-journal is kind of tedious because we don't have the journal arg/flag in the last few caller frames. :( |
|
SUCCESS: the output of run-make-check.sh on centos-7 for 250e4e9 is http://paste2.org/aUJOAdzN |
Signed-off-by: Loic Dachary <ldachary@redhat.com>
The tests explicitly return on error when relevant. Add two error cases: * detect when the allocation of a loop device fails. * in the outer loop, return immediately if one of the test fails Signed-off-by: Loic Dachary <ldachary@redhat.com>
Address all possible failure cases, when ceph-disk.sh completes or when it starts with leftover from a previous interrupted run. It is assumed that ceph-disk.sh will crash at any point. * umount all mount points that belong to ceph-disk.sh (check the absolute path of the directory) * dmsetup remove all device mapper nodes found to hold a loop device that ceph-disks.sh no longer uses * losetup --detach all loop devices that ceph-disks.sh no longer uses Signed-off-by: Loic Dachary <ldachary@redhat.com>
Move test_activate_dev to test_setup_dev_and_run and make it run the function given in argument. test_activate_dev calls test_setup_dev_and_run and no longer needs to implement device allocation or destruction. Signed-off-by: Loic Dachary <ldachary@redhat.com>
The activate_dmcrypt_plain_dev_body and activate_dmcrypt_dev_body functions are almost identical, merge them and differentiate with an argument. Signed-off-by: Loic Dachary <ldachary@redhat.com>
Instead of duplicating the device construction / destruction logic for dmcrypt tests, use test_setup_dev_and_run to do it. It is now able to recover from devmapper leftover which may occur when a cryptsetup test fails. Signed-off-by: Loic Dachary <ldachary@redhat.com>
Add the test_pool_read_write function to share the rados put / get test that demonstrate the osd that has been created can actually be used. Use it from the both the regular device and dmcrypt tests. Signed-off-by: Loic Dachary <ldachary@redhat.com>
Add a test for the activation of the memstore objectstore and verify that it works without specifying a journal. Signed-off-by: Loic Dachary <ldachary@redhat.com>
tests for ceph-disk: make journal setup conditional on osd backend
liewegas
changed the title
|
SUCCESS: the output of run-make-check.sh on centos-7 for 29755b3 is http://paste2.org/J37PPdwW |
ceph-disk: make journal setup conditional on osd backend Reviewed-by: Travis Rhoden <trhoden@redhat.com> Reviewed-by: Loic Dachary <ldachary@redhat.com>
ghost
merged commit 
|
@dachary ， i think this pr is very useful in practise, but i doubt wether it will be backported to hammer? |
No description provided.