From: Sage Weil <sage@redhat.com>
Date: Thu, 21 Nov 2019 22:19:17 +0000 (-0600)
Subject: os/bluestore/KernelDevice: get rid of 'nvme' type
X-Git-Tag: v15.1.0~787^2~2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=4515299568a605f837662523a341189bad15f25b;p=ceph.git

os/bluestore/KernelDevice: get rid of 'nvme' type

We are either 'hdd' or 'ssd' based on the rotational flag.  Previously,
we would try to distinguish between an nvme vs SATA/SAS ssd and set the
class to 'nvme'.  This was misguided--the interface is not important and
has no direct bearing on the device performance.  Moreover, the HDD
manufacturers are planning to produce rotation HDDs that use the nvme
interface instead of SATA/SAS.

So, drop this.

This may be somewhat disruptive to clusters where we were detecting
nvme but now are not.  However, the good news is that this doesn't seem
to trigger for real deployments because LVM breaks the is_nvme()
method.

Signed-off-by: Sage Weil <sage@redhat.com>
---

diff --git a/src/os/bluestore/KernelDevice.cc b/src/os/bluestore/KernelDevice.cc
index 53a78cdbe18..de638661399 100644
--- a/src/os/bluestore/KernelDevice.cc
+++ b/src/os/bluestore/KernelDevice.cc
@@ -326,9 +326,6 @@ int KernelDevice::collect_metadata(const string& prefix, map<string,string> *pm)
     blkdev.serial(buffer, sizeof(buffer));
     (*pm)[prefix + "serial"] = buffer;
 
-    if (blkdev.is_nvme())
-      (*pm)[prefix + "type"] = "nvme";
-
     // numa
     int node;
     r = blkdev.get_numa_node(&node);