From: Sage Weil <sage@redhat.com>
Date: Thu, 3 Jan 2019 20:31:22 +0000 (-0600)
Subject: os/bluestore/KernelDevice: report numa info for each device
X-Git-Tag: v14.1.0~436^2~6
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=d4128db10e25a43217b442707afb6b58863753c1;p=ceph.git

os/bluestore/KernelDevice: report numa info for each device

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

diff --git a/src/os/bluestore/KernelDevice.cc b/src/os/bluestore/KernelDevice.cc
index f2ab52e3603..7008cad8115 100644
--- a/src/os/bluestore/KernelDevice.cc
+++ b/src/os/bluestore/KernelDevice.cc
@@ -29,6 +29,7 @@
 #endif
 #include "common/debug.h"
 #include "common/align.h"
+#include "common/numa.h"
 
 #define dout_context cct
 #define dout_subsys ceph_subsys_bdev
@@ -305,6 +306,13 @@ int KernelDevice::collect_metadata(const string& prefix, map<string,string> *pm)
 
     if (blkdev.is_nvme())
       (*pm)[prefix + "type"] = "nvme";
+
+    // numa
+    int node;
+    r = blkdev.get_numa_node(&node);
+    if (r >= 0) {
+      (*pm)[prefix + "numa_node"] = stringify(node);
+    }
   } else {
     (*pm)[prefix + "access_mode"] = "file";
     (*pm)[prefix + "path"] = path;