]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge pull request #59564 from Matan-B/wip-matanb-crimson-osd-release
authorMatan Breizman <mbreizma@redhat.com>
Thu, 12 Sep 2024 10:42:11 +0000 (13:42 +0300)
committerGitHub <noreply@github.com>
Thu, 12 Sep 2024 10:42:11 +0000 (13:42 +0300)
crimson/osd: write require_osd_release only when needed

Reviewed-by: Samuel Just <sjust@redhat.com>
1  2 
src/crimson/osd/osd.cc
src/crimson/osd/osd.h

Simple merge
index 8f2661f5bff12748fe4a60284506f5c675ad0a7d,a4a81554094f1578ec804d7069f409a23ac20bcb..de39d80827494831b2e11f7215f7db59e0cfb6e1
@@@ -232,8 -232,10 +232,10 @@@ private
      Ref<MOSDPGUpdateLogMissingReply> m);
  
  private:
 -  crimson::common::Gated gate;
 +  crimson::common::gate_per_shard gate;
  
+   ceph_release_t last_require_osd_release{ceph_release_t::unknown};
    seastar::promise<> stop_acked;
    void got_stop_ack() {
      stop_acked.set_value();