RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-02-23 02:57:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #42076 from liu-chunmei/crimson-pgnls

Browse Source 
crimson: fix pgnls exception

Reviewed-by: Kefu Chai <kchai@redhat.com>
This commit is contained in:
Kefu Chai 2021-06-29 15:10:48 +08:00 committed by GitHub
commit f91183d986
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/crimson/osd/osd_operations/client_request.cc
View File

@ -87,6 +87,9 @@ seastar::future<> ClientRequest::start()
return interruptor::with_interruption([this, pgref]() mutable {
epoch_t same_interval_since = pgref->get_interval_start_epoch();
logger().debug("{} same_interval_since: {}", *this, same_interval_since);
if (m->finish_decode()) {
m->clear_payload();
}
const bool has_pg_op = is_pg_op();
auto interruptible_do_op = interruptor::wrap_function([=] {
PG &pg = *pgref;
@ -108,9 +111,6 @@ seastar::future<> ClientRequest::start()
}).then_interruptible([this,
has_pg_op,
pgref=std::move(pgref)]() mutable {
if (m->finish_decode()) {
m->clear_payload();
}
return (has_pg_op ?
process_pg_op(pgref) :
process_op(pgref));