]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
osd: add created_ceph_version meta 49144/head
authorAlex Marangone <amarangone@digitalocean.com>
Tue, 4 Oct 2022 15:21:56 +0000 (08:21 -0700)
committerESASHIKA Kaoru <kaoru-esashika@cybozu.co.jp>
Wed, 30 Nov 2022 01:38:15 +0000 (01:38 +0000)
Fixes: https://tracker.ceph.com/issues/57515
Signed-off-by: Alex Marangone <amarangone@digitalocean.com>
(cherry picked from commit ec6379c296ead7b20a253ccc8ddf691bde712200)

src/osd/OSD.cc

index 6ae75ecd29b2002616376e4b20622aa62684a5ee..cfa64d9448ebc2a5e5dcc377c319b1a39595ea35 100644 (file)
@@ -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<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()) {