Proxmox/pve-storage
5
0
Fork 0
mirror of git://git.proxmox.com/git/pve-storage.git synced 2025-02-10 13:57:38 +03:00
Code Releases Activity

(finally) fix #1099: return disklist correctly

Browse Source 
in get_disks, when called with a parameter 'cciss/cXdY', we replaced
the '/' with '!' so that we can properly poll the information
about it from /sys/block/

but we have to replace the '!' with '/' again in our result list,
because the caller does not know anything about it and fails, because
the original dev is not in the list

Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>
This commit is contained in:
Dominik Csapak 2017-11-08 09:01:58 +01:00 committed by Fabian Grünbichler
parent caf67736d9
commit fc7c0e0504
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
PVE/Diskmanage.pm
View File

@ -456,6 +456,14 @@ sub get_disks {
$used = 'ZFS' if $zfslist->{$devpath};
# we replaced cciss/ with cciss! above
# but in the result we need cciss/ again
# because the caller might want to check the
# result again with the original parameter
if ($dev =~ m|^cciss!|) {
$dev =~ s|^cciss!|cciss/|;
}
$disklist->{$dev} = {
vendor => $sysdata->{vendor},
model => $data->{model} || $sysdata->{model},

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

@ -1,5 +1,5 @@
{
"cciss!c0d0" : {
"cciss/c0d0" : {
"wearout" : "N/A",
"vendor" : "HP",
"rpm" : -1,