fix missing osd info for osd 0

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>

diff --git a/PVE/Diskmanage.pm b/PVE/Diskmanage.pm
index 41158f4843df2e7be5e3a967feabd0ac0179e643..f446269b10fb53fcc85304e94037fc4d9f72d03d 100644 (file)
--- a/PVE/Diskmanage.pm
+++ b/PVE/Diskmanage.pm
@@ -602,7 +602,7 @@ sub get_disks {
            $journal_count += $ceph_volume->{journal} // 0;
            $db_count += $ceph_volume->{db} // 0;
            $wal_count += $ceph_volume->{wal} // 0;
-           if ($ceph_volume->{osdid}) {
+           if (defined($ceph_volume->{osdid})) {
                $osdid = $ceph_volume->{osdid};
                $bluestore = 1 if $ceph_volume->{bluestore};
            }

diff --git a/test/disk_tests/usages/disklist_expected.json b/test/disk_tests/usages/disklist_expected.json
index 4f9f5cc3d523aeee4724b04f4723e82e1b0c8007..9829339c9b1e343097cf52fe5ba666c7819018b1 100644 (file)
--- a/test/disk_tests/usages/disklist_expected.json
+++ b/test/disk_tests/usages/disklist_expected.json
@@ -151,6 +151,6 @@
        "rpm" : 0,
        "bluestore": 0,
        "type" : "hdd",
-       "osdid" : 2
+       "osdid" : 0
     }
 }

diff --git a/test/disk_tests/usages/lvs b/test/disk_tests/usages/lvs
index b3fad43ca33e74cbf85141aded156de4697150ea..393dcd3d20efe685547eb1292b98cb81228541f3 100644 (file)
--- a/test/disk_tests/usages/lvs
+++ b/test/disk_tests/usages/lvs
@@ -1,4 +1,4 @@
 /dev/sdg(0);osd-block-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/sdj(0);osd-data-01234;ceph.osd_id=2
+/dev/sdj(0);osd-data-01234;ceph.osd_id=0