Merge pull request ceph#56875 from xxhdx1985126/wip-65474

Matan-B · web-flow · commit 185dd394a4a8 · 2024-04-21T12:39:07.000+03:00
crimson/osd/osd_meta: load incremental osdmap from "inc_osdmap.XXX"

Reviewed-by: Samuel Just &lt;sjust@redhat.com&gt;
Reviewed-by: Matan Breizman &lt;mbreizma@redhat.com&gt;
diff --git a/src/crimson/osd/osd_meta.cc b/src/crimson/osd/osd_meta.cc
@@ -54,7 +54,7 @@ seastar::future<bufferlist> OSDMeta::load_map(epoch_t e)
 read_errorator::future<ceph::bufferlist> OSDMeta::load_inc_map(epoch_t e)
 {
   return store.read(coll,
-                    osdmap_oid(e), 0, 0,
+                    inc_osdmap_oid(e), 0, 0,
                     CEPH_OSD_OP_FLAG_FADVISE_WILLNEED);
 }
 

Original file line number	Diff line number	Diff line change
`@@ -54,7 +54,7 @@ seastar::future<bufferlist> OSDMeta::load_map(epoch_t e)`
`54`	`54`	`read_errorator::future<ceph::bufferlist> OSDMeta::load_inc_map(epoch_t e)`
`55`	`55`	`{`
`56`	`56`	`return store.read(coll,`
`57`		`- osdmap_oid(e), 0, 0,`
	`57`	`+ inc_osdmap_oid(e), 0, 0,`
`58`	`58`	`CEPH_OSD_OP_FLAG_FADVISE_WILLNEED);`
`59`	`59`	`}`
`60`	`60`