]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commit
Merge pull request #4136 from XinzeChi/wip-pg-delete-sleep
authorSamuel Just <sam.just@inktank.com>
Thu, 9 Apr 2015 18:21:37 +0000 (11:21 -0700)
committerSamuel Just <sam.just@inktank.com>
Thu, 9 Apr 2015 18:21:37 +0000 (11:21 -0700)
commit7ae9e6bc150eec702ca17a7c27659e32770d8807
tree4f73f994a863992468ca8596951e169b31279ef6
parentc8f662cba3a3902b5b08186c330737b64806bcb9
parent3cffbbef05c088bc367a890e6c9bcee9f32af0dd
Merge pull request #4136 from XinzeChi/wip-pg-delete-sleep

osd: return fast if PG::deleting is true in snap_trimmer and PG::scrub

Reviewed-by: Sage Weil <sage@redhat.com>
src/osd/PG.cc
src/osd/ReplicatedPG.cc