RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-01-01 08:32:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

crimson/osd: initialize OSDriver in SnapMapper::record_purged_snaps()

Browse Source 
Signed-off-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
This commit is contained in:
Radoslaw Zarzynski 2022-11-18 15:53:38 +00:00
parent 6f7ed37496
commit 3da8d3f69c
2 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/osd/SnapMapper.cc
View File

@ -585,13 +585,10 @@ void SnapMapper::make_purged_snap_key_value(
int SnapMapper::_lookup_purged_snap(
CephContext *cct,
ObjectStore *store,
ObjectStore::CollectionHandle& ch,
const ghobject_t& hoid,
OSDriver& backend,
int64_t pool, snapid_t snap,
snapid_t *begin, snapid_t *end)
{
OSDriver backend(store, ch, hoid);
string k = make_purged_snap_key(pool, snap);
std::pair<std::string, ceph::buffer::list> kv;
if (auto ret = backend.get_next_or_current(k, &kv); ret == -ENOENT) {
@ -628,6 +625,7 @@ void SnapMapper::record_purged_snaps(
map<epoch_t,mempool::osdmap::map<int64_t,snap_interval_set_t>> purged_snaps)
{
dout(10) << __func__ << " purged_snaps " << purged_snaps << dendl;
OSDriver backend(store, ch, hoid);
map<string,ceph::buffer::list> m;
set<string> rm;
for (auto& [epoch, bypool] : purged_snaps) {
@ -640,9 +638,9 @@ void SnapMapper::record_purged_snaps(
snapid_t end = i.get_end();
snapid_t before_begin, before_end;
snapid_t after_begin, after_end;
int b = _lookup_purged_snap(cct, store, ch, hoid,
int b = _lookup_purged_snap(cct, backend,
pool, begin - 1, &before_begin, &before_end);
int a = _lookup_purged_snap(cct, store, ch, hoid,
int a = _lookup_purged_snap(cct, backend,
pool, end, &after_begin, &after_end);
if (!b && !a) {
dout(10) << __func__

4
src/osd/SnapMapper.h
View File

@ -212,9 +212,7 @@ public:
private:
static int _lookup_purged_snap(
CephContext *cct,
ObjectStore *store,
ObjectStore::CollectionHandle& ch,
const ghobject_t& hoid,
OSDriver& backend,
int64_t pool, snapid_t snap,
snapid_t *begin, snapid_t *end);
static void make_purged_snap_key_value(