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 add device_id to inventory listing #25349

Merged
merged 2 commits into from Dec 4, 2018

Conversation

Projects
None yet
3 participants
@alfredodeza
Copy link
Contributor

alfredodeza commented Nov 30, 2018

This PR changes the device_id implementation from using ID_SERIAL to ID_MODEL + _ + ID_SERIAL_SHORT (1) and adds an equivalent python implementation to ceph-volume (2).

  1. The reasoning is that the new implementation seem more reliable. ID_SERIAL often contains the model and serial, but sometimes only the serial.

  2. The python implementation is not equivalent yet for the FreeBSD case. In C++ this uses sysfs and ioctl with a (Free?)BSD specific constant. I'm not sure yet of the same call can be made with python's ioctl implementation. If so this should also be a RFC if we should move this to python/ceph-volume and call it from C++ to avoid the duplicate implementation.

Fixes: https://tracker.ceph.com/issues/37083
Backport of: #25201

jan--f added some commits Nov 21, 2018

ceph-volume: add device_id field to inventory output
This intends to mimic the C++ implementation in src/common/blkdev.cc.

Signed-off-by: Jan Fajerski <jfajerski@suse.com>
(cherry picked from commit 41da5e9)
ceph-volume: add test for disk.udevadm_property
Signed-off-by: Jan Fajerski <jfajerski@suse.com>
(cherry picked from commit 58316e3)

@ceph-jenkins ceph-jenkins added this to the mimic milestone Nov 30, 2018

@alfredodeza alfredodeza requested a review from jan--f Nov 30, 2018

@jan--f

jan--f approved these changes Dec 3, 2018

@alfredodeza alfredodeza merged commit 802ee23 into ceph:mimic Dec 4, 2018

36 of 37 checks passed

ceph-volume simple testing centos7-bluestore-activate 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 OK
Details
ceph-volume batch testing centos7-bluestore-mixed_type_dmcrypt OK
Details
ceph-volume batch testing centos7-bluestore-single_type OK
Details
ceph-volume batch testing centos7-bluestore-single_type_dmcrypt OK
Details
ceph-volume batch testing centos7-filestore-mixed_type OK
Details
ceph-volume batch testing centos7-filestore-mixed_type_dmcrypt OK
Details
ceph-volume batch testing centos7-filestore-single_type OK
Details
ceph-volume batch testing centos7-filestore-single_type_dmcrypt OK
Details
ceph-volume batch testing xenial-bluestore-single_type OK
Details
ceph-volume batch testing xenial-bluestore-single_type_dmcrypt OK
Details
ceph-volume batch testing xenial-filestore-single_type OK
Details
ceph-volume batch testing xenial-filestore-single_type_dmcrypt OK
Details
ceph-volume lvm testing centos7-bluestore-create OK
Details
ceph-volume lvm testing centos7-bluestore-dmcrypt OK
Details
ceph-volume lvm testing centos7-filestore-create OK
Details
ceph-volume lvm testing centos7-filestore-dmcrypt OK
Details
ceph-volume lvm testing xenial-bluestore-create OK
Details
ceph-volume lvm testing xenial-bluestore-dmcrypt OK
Details
ceph-volume lvm testing xenial-filestore-create OK
Details
ceph-volume lvm testing xenial-filestore-dmcrypt OK
Details
ceph-volume simple testing centos7-bluestore-dmcrypt_luks OK
Details
ceph-volume simple testing centos7-bluestore-dmcrypt_plain OK
Details
ceph-volume simple testing centos7-filestore-activate OK
Details
ceph-volume simple testing centos7-filestore-dmcrypt_luks OK
Details
ceph-volume simple testing centos7-filestore-dmcrypt_plain OK
Details
ceph-volume simple testing xenial-bluestore-activate OK
Details
ceph-volume simple testing xenial-bluestore-dmcrypt_luks OK
Details
ceph-volume simple testing xenial-bluestore-dmcrypt_plain OK
Details
ceph-volume simple testing xenial-filestore-activate OK
Details
ceph-volume simple testing xenial-filestore-dmcrypt_luks OK
Details
ceph-volume simple testing xenial-filestore-dmcrypt_plain OK
Details
ceph-volume tox tests OK
Details
make check make check succeeded
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment