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

crimson/osd: convert seastarized PGLog from OmapIterator to omap_get_values()

Browse Source 
Signed-off-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
This commit is contained in:
Radoslaw Zarzynski 2022-10-06 20:27:47 +00:00
parent edaee4b654
commit 4df5cf6961
1 changed files with 26 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
src/osd/PGLog.cc
View File

@ -1092,24 +1092,24 @@ namespace {
std::optional<std::string> next;
void process_entry(crimson::os::FuturizedStore::OmapIteratorRef &p) {
if (p->key()[0] == '_')
void process_entry(const auto& key, const auto& value) {
if (key[0] == '_')
return;
//Copy ceph::buffer::list before creating iterator
auto bl = p->value();
auto bl = value;
auto bp = bl.cbegin();
if (p->key() == "divergent_priors") {
if (key == "divergent_priors") {
decode(divergent_priors, bp);
ldpp_dout(dpp, 20) << "read_log_and_missing " << divergent_priors.size()
<< " divergent_priors" << dendl;
ceph_assert("crimson shouldn't have had divergent_priors" == 0);
} else if (p->key() == "can_rollback_to") {
} else if (key == "can_rollback_to") {
decode(on_disk_can_rollback_to, bp);
} else if (p->key() == "rollback_info_trimmed_to") {
} else if (key == "rollback_info_trimmed_to") {
decode(on_disk_rollback_info_trimmed_to, bp);
} else if (p->key() == "may_include_deletes_in_missing") {
} else if (key == "may_include_deletes_in_missing") {
missing.may_include_deletes = true;
} else if (p->key().substr(0, 7) == std::string("missing")) {
} else if (key.substr(0, 7) == std::string("missing")) {
hobject_t oid;
pg_missing_item item;
decode(oid, bp);
@ -1118,7 +1118,7 @@ namespace {
ceph_assert(missing.may_include_deletes);
}
missing.add(oid, std::move(item));
} else if (p->key().substr(0, 4) == std::string("dup_")) {
} else if (key.substr(0, 4) == std::string("dup_")) {
pg_log_dup_t dup;
decode(dup, bp);
if (!dups.empty()) {
@ -1146,12 +1146,23 @@ namespace {
on_disk_can_rollback_to = info.last_update;
missing.may_include_deletes = false;
return store.get_omap_iterator(ch, pgmeta_oid).then([this](auto iter) {
return seastar::do_until([iter] { return !iter->valid(); },
[iter, this]() mutable {
process_entry(iter);
return iter->next();
});
return seastar::repeat([ch=std::move(ch),
pgmeta_oid=std::move(pgmeta_oid),
start=std::make_optional<std::string>(),
this]() mutable {
return store.omap_get_values(
ch, pgmeta_oid, start
).safe_then([this, &start](const auto& ret) mutable {
const auto& [done, kvs] = ret;
for (const auto& [key, value] : kvs) {
process_entry(key, value);
// I trust the compiler will optimize this out
start = key;
}
return seastar::make_ready_future<seastar::stop_iteration>(
done ? seastar::stop_iteration::yes : seastar::stop_iteration::no
);
}, crimson::os::FuturizedStore::read_errorator::assert_all{});
}).then([this] {
if (info.pgid.is_no_shard()) {
// replicated pool pg does not persist this key