From: Kefu Chai <kchai@redhat.com>
Date: Tue, 1 Dec 2020 15:58:45 +0000 (+0800)
Subject: Merge pull request #38219 from rzarzynski/wip-crimson-restore-obs
X-Git-Tag: v17.0.0~461
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=02c06942f4e002fe749fbf97394fe11b0b20d146;p=ceph-ci.git

Merge pull request #38219 from rzarzynski/wip-crimson-restore-obs

crimson: conditionally reload ObjectState if execution fails

Reviewed-by: Samuel Just <sjust@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
---

02c06942f4e002fe749fbf97394fe11b0b20d146
diff --cc src/crimson/osd/pg.h
index d81d81f8f79,2e061c4e1da..f7db6ba6cda
--- a/src/crimson/osd/pg.h
+++ b/src/crimson/osd/pg.h
@@@ -500,12 -501,14 +501,15 @@@ public
    load_obc_ertr::future<crimson::osd::ObjectContextRef>
    load_head_obc(ObjectContextRef obc);
  
+   load_obc_ertr::future<>
+   reload_obc(crimson::osd::ObjectContext& obc) const;
+ 
  public:
 -  using with_obc_func_t = std::function<seastar::future<> (ObjectContextRef)>;
 +  using with_obc_func_t =
 +    std::function<load_obc_ertr::future<> (ObjectContextRef)>;
  
    template<RWState::State State>
 -  seastar::future<> with_head_obc(hobject_t oid, with_obc_func_t&& func);
 +  load_obc_ertr::future<> with_head_obc(hobject_t oid, with_obc_func_t&& func);
  
    load_obc_ertr::future<> with_locked_obc(
      Ref<MOSDOp> &m,