RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-03-11 02:39:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

crimson/osd: use seastar:do_until() when appropriate

Browse Source 
a plain boolean is easier to understand than
`seastar::stop_iteration::yes`.

Signed-off-by: Kefu Chai <kchai@redhat.com>
This commit is contained in:
Kefu Chai 2020-11-04 20:59:54 +08:00
parent f891bf385d
commit 011734d064
2 changed files with 22 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
src/crimson/osd/replicated_recovery_backend.cc
View File

@ -530,31 +530,37 @@ ReplicatedRecoveryBackend::read_omap_for_push_op(
}
return omap_iter->lower_bound(progress.omap_recovered_to).then(
[omap_iter, &new_progress, &max_len, push_op] {
return seastar::repeat([omap_iter, &new_progress, &max_len, push_op] {
return seastar::do_until([omap_iter, &new_progress, max_len, push_op] {
if (!omap_iter->valid()) {
new_progress.omap_complete = true;
return seastar::make_ready_future<seastar::stop_iteration>(
seastar::stop_iteration::yes);
return true;
}
unsigned entry_size = omap_iter->key().size() + omap_iter->value().length();
if (!push_op->omap_entries.empty() &&
((crimson::common::local_conf()->osd_recovery_max_omap_entries_per_chunk > 0 &&
(push_op->omap_entries.size() >=
crimson::common::local_conf()->osd_recovery_max_omap_entries_per_chunk)) ||
max_len <= entry_size)) {
if (push_op->omap_entries.empty()) {
return false;
}
if (const uint64_t entries_per_chunk =
crimson::common::local_conf()->osd_recovery_max_omap_entries_per_chunk;
entries_per_chunk > 0 &&
push_op->omap_entries.size() >= entries_per_chunk) {
new_progress.omap_recovered_to = omap_iter->key();
return seastar::make_ready_future<seastar::stop_iteration>(
seastar::stop_iteration::yes);
return true;
}
if (omap_iter->key().size() + omap_iter->value().length() > max_len) {
new_progress.omap_recovered_to = omap_iter->key();
return true;
}
return false;
},
[omap_iter, &max_len, push_op] {
push_op->omap_entries.emplace(omap_iter->key(), omap_iter->value());
if (entry_size >= max_len) {
if (const uint64_t entry_size =
omap_iter->key().size() + omap_iter->value().length() > max_len;
entry_size >= max_len) {
max_len -= entry_size;
} else {
max_len = 0;
}
return omap_iter->next().then([] {
return seastar::stop_iteration::no;
});
return omap_iter->next();
});
});
});

2
src/osd/PGLog.h
View File

@ -1747,7 +1747,7 @@ public:
seastar::stop_iteration::yes);
}
process_entry(iter);
return iter->next().then([] {
return iter->next().then([](int) {
return seastar::stop_iteration::no;
});
});