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

mimic: ceph-volume: more mimic backports #29631

Merged
merged 10 commits into from Aug 14, 2019
Merged

Conversation

@jan--f
Copy link
Member

jan--f commented Aug 13, 2019

This adds two commits of #25429 that where left out in #26013, not sure why.
This backports #26826

Unit tests are expected to have failures until #29602 was merged.

alfredodeza and others added 10 commits Dec 6, 2018
Signed-off-by: Alfredo Deza <adeza@redhat.com>
(cherry picked from commit 8955ec1)

Conflicts:
	src/ceph-volume/ceph_volume/tests/functional/simple/centos7/filestore/activate/test.yml
        remove with_items key
Signed-off-by: Alfredo Deza <adeza@redhat.com>
(cherry picked from commit f53f67c)
This is used to retrieve a list of osd ids from the currently
running ceph-osd systemd units.

Signed-off-by: Andrew Schoen <aschoen@redhat.com>
(cherry picked from commit 15d20e2)
If no argument is passed to `ceph-volume simple scan` it will
inspect any running osds and scan them if they were created by
ceph-disk.

Signed-off-by: Andrew Schoen <aschoen@redhat.com>
(cherry picked from commit 28e454e)
Signed-off-by: Andrew Schoen <aschoen@redhat.com>
(cherry picked from commit 7cb098b)
Signed-off-by: Andrew Schoen <aschoen@redhat.com>
(cherry picked from commit f7943ef)
In a couple of the functional tests for simple we should run `simple
scan` without any arguments and `simple activate --all` to increase
the test coverage. We want to test pointing at a diretory and scanning
all running OSDs.

Signed-off-by: Andrew Schoen <aschoen@redhat.com>
(cherry picked from commit 87c33f1)
Without this the functional testinfra tests try to run when we
are intending to only run the unit tests.

Signed-off-by: Andrew Schoen <aschoen@redhat.com>
(cherry picked from commit 1881f38)
This test is no longer valid because `simple scan`
without any arguments will now attempt to scan all
running OSDs.

Signed-off-by: Andrew Schoen <aschoen@redhat.com>
(cherry picked from commit b59dcd0)
Makes systemd.systemctl.get_running_osds more resilient to output
that doesn't match what we're expecting to parse. This also handles
the case of a nonzero exit status by retuning an empty list.

Signed-off-by: Andrew Schoen <aschoen@redhat.com>
(cherry picked from commit f3707f1)
@jan--f jan--f added the ceph-volume label Aug 13, 2019
@jan--f jan--f added this to the mimic milestone Aug 13, 2019
@jan--f jan--f requested a review from alfredodeza Aug 13, 2019
@jan--f

This comment has been minimized.

Copy link
Member Author

jan--f commented Aug 13, 2019

jenkins test ceph-volume all

@alfredodeza

This comment has been minimized.

Copy link
Contributor

alfredodeza commented Aug 13, 2019

@jan--f are you expecting the failures with simple here? The zapping is failing:

RuntimeError: Unable to find any LV for zapping OSD: 1
@jan--f

This comment has been minimized.

Copy link
Member Author

jan--f commented Aug 13, 2019

@alfredodeza not expecting a failure. I simply backported two missing commits from #25429 that were creating a conflict. Seems like this should work, as lvm zap is (almost) the same between master and mimic. Looking for yet missing backports.

@alfredodeza

This comment has been minimized.

Copy link
Contributor

alfredodeza commented Aug 13, 2019

jenkins test ceph-volume simple all

@alfredodeza

This comment has been minimized.

Copy link
Contributor

alfredodeza commented Aug 13, 2019

I think I know why these are failing and why they passed in master. The simple tests aren't run in master because they require ceph-disk, so these tests are skipped. The test.yml changes are including lvm zap by OSD ID which is only meant to be done for LVM OSDs and not for ceph-disk OSDs.

It is not possible for ceph-volume to zap by OSD ID that was created by ceph-disk. I think that we should remove the lvm zap calls from all the simple test cases

@jan--f

This comment has been minimized.

Copy link
Member Author

jan--f commented Aug 14, 2019

Right, though enabling ceph-volume to zap ceph-disk osds is a wanted feature. In any case I'will merge this and fix the tests on master and backport.

@jan--f jan--f merged commit a00991a into ceph:mimic Aug 14, 2019
24 of 40 checks passed
24 of 40 checks passed
ceph-volume batch testing centos7-bluestore-mixed_type ceph-volume batch centos7-bluestore-mixed_type failed
Details
ceph-volume batch testing centos7-bluestore-mixed_type_dmcrypt ceph-volume batch centos7-bluestore-mixed_type_dmcrypt failed
Details
ceph-volume batch testing centos7-filestore-mixed_type ceph-volume batch centos7-filestore-mixed_type failed
Details
ceph-volume batch testing centos7-filestore-mixed_type_dmcrypt ceph-volume batch centos7-filestore-mixed_type_dmcrypt failed
Details
ceph-volume simple testing centos7-bluestore-activate ceph-volume simple centos7-bluestore-activate failed
Details
ceph-volume simple testing centos7-bluestore-dmcrypt_luks ceph-volume simple centos7-bluestore-dmcrypt_luks failed
Details
ceph-volume simple testing centos7-bluestore-dmcrypt_plain ceph-volume simple centos7-bluestore-dmcrypt_plain failed
Details
ceph-volume simple testing centos7-filestore-activate ceph-volume simple centos7-filestore-activate failed
Details
ceph-volume simple testing centos7-filestore-dmcrypt_luks ceph-volume simple centos7-filestore-dmcrypt_luks failed
Details
ceph-volume simple testing centos7-filestore-dmcrypt_plain ceph-volume simple centos7-filestore-dmcrypt_plain failed
Details
ceph-volume simple testing xenial-bluestore-activate ceph-volume simple xenial-bluestore-activate failed
Details
ceph-volume simple testing xenial-bluestore-dmcrypt_luks ceph-volume simple xenial-bluestore-dmcrypt_luks failed
Details
ceph-volume simple testing xenial-bluestore-dmcrypt_plain ceph-volume simple xenial-bluestore-dmcrypt_plain failed
Details
ceph-volume simple testing xenial-filestore-activate ceph-volume simple xenial-filestore-activate failed
Details
ceph-volume simple testing xenial-filestore-dmcrypt_luks ceph-volume simple xenial-filestore-dmcrypt_luks failed
Details
ceph-volume simple testing xenial-filestore-dmcrypt_plain ceph-volume simple xenial-filestore-dmcrypt_plain failed
Details
Docs: build check OK - docs built
Details
Signed-off-by all commits in this PR are signed
Details
Unmodified Submodules submodules for project are unmodified
Details
ceph-volume batch testing centos7-bluestore-mixed_type_dmcrypt_explicit ceph-volume batch centos7-bluestore-mixed_type_dmcrypt_explicit OK
Details
ceph-volume batch testing centos7-bluestore-mixed_type_explicit ceph-volume batch centos7-bluestore-mixed_type_explicit OK
Details
ceph-volume batch testing centos7-bluestore-single_type ceph-volume batch centos7-bluestore-single_type OK
Details
ceph-volume batch testing centos7-bluestore-single_type_dmcrypt ceph-volume batch centos7-bluestore-single_type_dmcrypt OK
Details
ceph-volume batch testing centos7-filestore-mixed_type_dmcrypt_explicit ceph-volume batch centos7-filestore-mixed_type_dmcrypt_explicit OK
Details
ceph-volume batch testing centos7-filestore-mixed_type_explicit ceph-volume batch centos7-filestore-mixed_type_explicit OK
Details
ceph-volume batch testing centos7-filestore-single_type ceph-volume batch centos7-filestore-single_type OK
Details
ceph-volume batch testing centos7-filestore-single_type_dmcrypt ceph-volume batch centos7-filestore-single_type_dmcrypt OK
Details
ceph-volume batch testing xenial-bluestore-single_type ceph-volume batch xenial-bluestore-single_type OK
Details
ceph-volume batch testing xenial-bluestore-single_type_dmcrypt ceph-volume batch xenial-bluestore-single_type_dmcrypt OK
Details
ceph-volume batch testing xenial-filestore-single_type ceph-volume batch xenial-filestore-single_type OK
Details
ceph-volume batch testing xenial-filestore-single_type_dmcrypt ceph-volume batch xenial-filestore-single_type_dmcrypt OK
Details
ceph-volume lvm testing centos7-bluestore-create ceph-volume lvm centos7-bluestore-create OK
Details
ceph-volume lvm testing centos7-bluestore-dmcrypt ceph-volume lvm centos7-bluestore-dmcrypt OK
Details
ceph-volume lvm testing centos7-filestore-create ceph-volume lvm centos7-filestore-create OK
Details
ceph-volume lvm testing centos7-filestore-dmcrypt ceph-volume lvm centos7-filestore-dmcrypt OK
Details
ceph-volume lvm testing xenial-bluestore-create ceph-volume lvm xenial-bluestore-create OK
Details
ceph-volume lvm testing xenial-bluestore-dmcrypt ceph-volume lvm xenial-bluestore-dmcrypt OK
Details
ceph-volume lvm testing xenial-filestore-create ceph-volume lvm xenial-filestore-create OK
Details
ceph-volume lvm testing xenial-filestore-dmcrypt ceph-volume lvm xenial-filestore-dmcrypt OK
Details
make check make check succeeded
Details
@smithfarm smithfarm changed the title ceph-volume: more mimic backports mimic: ceph-volume: more mimic backports Aug 27, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
3 participants
You can’t perform that action at this time.