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

disk management: set more specific type for nvme

Browse Source 
some users are confused, and it's nicer to have the more specific
type presented here.

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
This commit is contained in:
Thomas Lamprecht
2020-10-09 18:06:33 +02:00
parent d5c80a5bd5
commit 4731eb1118
2 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
PVE/Diskmanage.pm
View File

@ -464,6 +464,11 @@ sub is_iscsi {
return 0; return 0;
} }
my sub is_ssdlike {
my ($type) = @_;
return $type eq 'ssd' || $type eq 'nvme';
}
sub get_disks { sub get_disks {
my ($disks, $nosmart) = @_; my ($disks, $nosmart) = @_;
my $disklist = {}; my $disklist = {};
@ -533,6 +538,7 @@ sub get_disks {
if ($sysdata->{rotational} == 0) { if ($sysdata->{rotational} == 0) {
$type = 'ssd'; $type = 'ssd';
$type = 'nvme' if $dev =~ m/^nvme\d+n\d+$/;
$data->{rpm} = 0; $data->{rpm} = 0;
} elsif ($sysdata->{rotational} == 1) { } elsif ($sysdata->{rotational} == 1) {
if ($data->{rpm} != -1) { if ($data->{rpm} != -1) {
@ -548,10 +554,10 @@ sub get_disks {
if (!$nosmart) { if (!$nosmart) {
eval { eval {
my $smartdata = get_smart_data($devpath, ($type ne 'ssd')); my $smartdata = get_smart_data($devpath, !is_ssdlike($type));
$health = $smartdata->{health} if $smartdata->{health}; $health = $smartdata->{health} if $smartdata->{health};
if ($type eq 'ssd') { if (is_ssdlike($type)) {
# if we have an ssd we try to get the wearout indicator # if we have an ssd we try to get the wearout indicator
my $wearval = get_wear_leveling_info($smartdata, $data->{model} || $sysdata->{model}); my $wearval = get_wear_leveling_info($smartdata, $data->{model} || $sysdata->{model});
$wearout = $wearval if defined($wearval); $wearout = $wearval if defined($wearval);

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

@ -11,6 +11,6 @@
"devpath" : "/dev/nvme0n1", "devpath" : "/dev/nvme0n1",
"gpt" : 0, "gpt" : 0,
"wwn" : "unknown", "wwn" : "unknown",
"type" : "ssd" "type" : "nvme"
} }
} }