]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
osd: add created_ceph_version meta 48298/head
authorAlex Marangone <amarangone@digitalocean.com>
Tue, 4 Oct 2022 15:21:56 +0000 (08:21 -0700)
committerAlex Marangone <amarangone@digitalocean.com>
Wed, 5 Oct 2022 15:31:25 +0000 (08:31 -0700)
Fixes: https://tracker.ceph.com/issues/57515
Signed-off-by: Alex Marangone <amarangone@digitalocean.com>
src/osd/OSD.cc

index 61cadfbb1d378d7f18ac034dd1750cd91fc97fd0..dc3f7f5da8bd2dc8e8e397a72ac0a811e632410e 100644 (file)
@@ -2130,6 +2130,10 @@ int OSD::write_meta(CephContext *cct, ObjectStore *store, uuid_d& cluster_fsid,
       return r;
   }
 
+  r = store->write_meta("ceph_version_when_created", pretty_version_to_str());
+  if (r < 0)
+    return r;
+
   ostringstream created_at;
   utime_t now = ceph_clock_now();
   now.gmtime(created_at);
@@ -6741,6 +6745,12 @@ void OSD::_collect_metadata(map<string,string> *pm)
     osdspec_affinity = "";
   }
   (*pm)["osdspec_affinity"] = osdspec_affinity;
+  string ceph_version_when_created;
+  r = store->read_meta("ceph_version_when_created", &ceph_version_when_created);
+  if (r <0 || ceph_version_when_created.empty()) {
+    ceph_version_when_created = "";
+  }
+  (*pm)["ceph_version_when_created"] = ceph_version_when_created;
   string created_at;
   r = store->read_meta("created_at", &created_at);
   if (r < 0 || created_at.empty()) {