From: Alex Marangone Date: Tue, 4 Oct 2022 15:21:56 +0000 (-0700) Subject: osd: add created_ceph_version meta X-Git-Tag: v16.2.11~73^2 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F49144%2Fhead;p=ceph.git osd: add created_ceph_version meta Fixes: https://tracker.ceph.com/issues/57515 Signed-off-by: Alex Marangone (cherry picked from commit ec6379c296ead7b20a253ccc8ddf691bde712200) --- diff --git a/src/osd/OSD.cc b/src/osd/OSD.cc index 6ae75ecd29b2..cfa64d9448eb 100644 --- a/src/osd/OSD.cc +++ b/src/osd/OSD.cc @@ -2215,6 +2215,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); @@ -6724,6 +6728,12 @@ void OSD::_collect_metadata(map *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()) {