]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
osd: expose osdspec_affinity to osd_metadata 35588/head
authorJoshua Schmid <jschmid@suse.de>
Tue, 16 Jun 2020 09:37:01 +0000 (11:37 +0200)
committerJoshua Schmid <jschmid@suse.de>
Tue, 16 Jun 2020 09:37:01 +0000 (11:37 +0200)
Signed-off-by: Joshua Schmid <jschmid@suse.de>
src/osd/OSD.cc

index 2d2b89561a6fd2cd8831dafc7ca083271785d40c..b5a2b7fbed5f22cf91bbc2f603001aa573be2518 100644 (file)
@@ -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);