yesBad/pve-storage
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix missing osd info for osd 0

Browse Source 
0 is falsy, we have to check for definedness
also adapt the tests so we test for this

Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>
This commit is contained in:
Dominik Csapak
2019-07-03 08:43:12 +02:00
committed by Thomas Lamprecht
parent 099bb9a389
commit 35ccd3d004
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
PVE/Diskmanage.pm
View File

@ -602,7 +602,7 @@ sub get_disks {
$journal_count += $ceph_volume->{journal} // 0; $journal_count += $ceph_volume->{journal} // 0;
$db_count += $ceph_volume->{db} // 0; $db_count += $ceph_volume->{db} // 0;
$wal_count += $ceph_volume->{wal} // 0; $wal_count += $ceph_volume->{wal} // 0;
if ($ceph_volume->{osdid}) { if (defined($ceph_volume->{osdid})) {
$osdid = $ceph_volume->{osdid}; $osdid = $ceph_volume->{osdid};
$bluestore = 1 if $ceph_volume->{bluestore}; $bluestore = 1 if $ceph_volume->{bluestore};
} }

2
test/disk_tests/usages/disklist_expected.json
View File

@ -151,6 +151,6 @@
"rpm" : 0, "rpm" : 0,
"bluestore": 0, "bluestore": 0,
"type" : "hdd", "type" : "hdd",
"osdid" : 2 "osdid" : 0
} }
} }

2
test/disk_tests/usages/lvs
View File

@ -1,4 +1,4 @@
/dev/sdg(0);osd-block-01234;ceph.osd_id=1 /dev/sdg(0);osd-block-01234;ceph.osd_id=1
/dev/sdh(0);osd-journal-01234;ceph.osd_id=1 /dev/sdh(0);osd-journal-01234;ceph.osd_id=1
/dev/sdi(0);osd-db-01234;ceph.osd_id=1 /dev/sdi(0);osd-db-01234;ceph.osd_id=1
/dev/sdj(0);osd-data-01234;ceph.osd_id=2 /dev/sdj(0);osd-data-01234;ceph.osd_id=0