]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge pull request #52204 from xxhdx1985126/wip-61825
authorSamuel Just <sjust@redhat.com>
Mon, 28 Aug 2023 17:07:02 +0000 (10:07 -0700)
committerGitHub <noreply@github.com>
Mon, 28 Aug 2023 17:07:02 +0000 (10:07 -0700)
crimson/osd/object_context: consider clones found as long as they're in SnapSet::clones

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

index eb1d2cedda9685bac0abed61ab8bb2a137b0e78a,4a32b567cd4680c1d7feb0408d3fd9e3d492860c..e4a1b04df142fa39da427734bc28a319a021c14f
@@@ -108,10 -117,12 +117,12 @@@ SnapTrimEvent::with_pg
        return seastar::now();
      }).then_interruptible([this] {
        return enter_stage<interruptor>(
 -        pp().get_obc);
 +        client_pp().get_obc);
+     }).then_interruptible([this] {
+       return pg->snaptrim_mutex.lock(*this);
      }).then_interruptible([this] {
        return enter_stage<interruptor>(
 -        pp().process);
 +        client_pp().process);
      }).then_interruptible([&shard_services, this] {
        return interruptor::async([this] {
          std::vector<hobject_t> to_trim;