From: Joshua Schmid <jschmid@suse.de>
Date: Tue, 16 Jun 2020 09:37:01 +0000 (+0200)
Subject: osd: expose osdspec_affinity to osd_metadata
X-Git-Tag: v16.1.0~1996^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=e96eacfc9a6b13ae7279cd2fd9a5a973ee8266a2;p=ceph.git

osd: expose osdspec_affinity to osd_metadata

Signed-off-by: Joshua Schmid <jschmid@suse.de>
---

diff --git a/src/osd/OSD.cc b/src/osd/OSD.cc
index 2d2b89561a6f..b5a2b7fbed5f 100644
--- a/src/osd/OSD.cc
+++ b/src/osd/OSD.cc
@@ -6536,6 +6536,12 @@ void OSD::_collect_metadata(map<string,string> *pm)
   (*pm)["rotational"] = store_is_rotational ? "1" : "0";
   (*pm)["journal_rotational"] = journal_is_rotational ? "1" : "0";
   (*pm)["default_device_class"] = store->get_default_device_class();
+  string osdspec_affinity;
+  int r = store->read_meta("osdspec_affinity", &osdspec_affinity);
+  if (r < 0 || osdspec_affinity.empty()) {
+    osdspec_affinity = "";
+  }
+  (*pm)["osdspec_affinity"] = osdspec_affinity;
   store->collect_metadata(pm);
 
   collect_sys_info(pm, cct);