From fdb00bb573b1fce05024adb9aab0bff5e64ad033 Mon Sep 17 00:00:00 2001 From: Xuehan Xu Date: Tue, 29 Dec 2020 15:19:52 +0800 Subject: [PATCH] crimson/osd: make sure PGBackend's modification operations not change osd_op state Signed-off-by: Xuehan Xu --- src/crimson/osd/pg_backend.cc | 8 ++++---- src/crimson/osd/pg_backend.h | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/crimson/osd/pg_backend.cc b/src/crimson/osd/pg_backend.cc index 558fc7dba0b..39a9f8f187d 100644 --- a/src/crimson/osd/pg_backend.cc +++ b/src/crimson/osd/pg_backend.cc @@ -738,7 +738,7 @@ PGBackend::list_objects(const hobject_t& start, uint64_t limit) const seastar::future<> PGBackend::setxattr( ObjectState& os, - OSDOp& osd_op, + const OSDOp& osd_op, ceph::os::Transaction& txn) { if (local_conf()->osd_max_attr_size > 0 && @@ -826,7 +826,7 @@ PGBackend::get_attr_errorator::future<> PGBackend::get_xattrs( PGBackend::rm_xattr_ertr::future<> PGBackend::rm_xattr( ObjectState& os, - OSDOp& osd_op, + const OSDOp& osd_op, ceph::os::Transaction& txn) { if (__builtin_expect(stopping, false)) { @@ -1059,7 +1059,7 @@ PGBackend::omap_get_vals_by_keys( seastar::future<> PGBackend::omap_set_vals( ObjectState& os, - OSDOp& osd_op, + const OSDOp& osd_op, ceph::os::Transaction& txn, osd_op_params_t& osd_op_params) { @@ -1104,7 +1104,7 @@ seastar::future<> PGBackend::omap_set_header( seastar::future<> PGBackend::omap_remove_range( ObjectState& os, - OSDOp& osd_op, + const OSDOp& osd_op, ceph::os::Transaction& txn) { std::string key_begin, key_end; diff --git a/src/crimson/osd/pg_backend.h b/src/crimson/osd/pg_backend.h index cd2fe897d27..303a24022f7 100644 --- a/src/crimson/osd/pg_backend.h +++ b/src/crimson/osd/pg_backend.h @@ -132,7 +132,7 @@ public: uint64_t limit) const; seastar::future<> setxattr( ObjectState& os, - OSDOp& osd_op, + const OSDOp& osd_op, ceph::os::Transaction& trans); using get_attr_errorator = crimson::os::FuturizedStore::get_attr_errorator; get_attr_errorator::future<> getxattr( @@ -147,7 +147,7 @@ public: using rm_xattr_ertr = crimson::errorator; rm_xattr_ertr::future<> rm_xattr( ObjectState& os, - OSDOp& osd_op, + const OSDOp& osd_op, ceph::os::Transaction& trans); seastar::future stat( CollectionRef c, @@ -170,7 +170,7 @@ public: OSDOp& osd_op) const; seastar::future<> omap_set_vals( ObjectState& os, - OSDOp& osd_op, + const OSDOp& osd_op, ceph::os::Transaction& trans, osd_op_params_t& osd_op_params); seastar::future omap_get_header( @@ -185,7 +185,7 @@ public: ceph::os::Transaction& trans); seastar::future<> omap_remove_range( ObjectState& os, - OSDOp& osd_op, + const OSDOp& osd_op, ceph::os::Transaction& trans); using omap_clear_ertr = crimson::errorator; omap_clear_ertr::future<> omap_clear( -- 2.47.3