]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
projects / ceph.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c8f662c 3cffbbe)
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)
osd: return fast if PG::deleting is true in snap_trimmer and PG::scrub

Reviewed-by: Sage Weil <sage@redhat.com>
1  2 
src/osd/PG.cc patch | diff1 | diff2 | blob | history
src/osd/ReplicatedPG.cc patch | diff1 | diff2 | blob | history

diff --cc src/osd/PG.cc
Simple merge
diff --cc src/osd/ReplicatedPG.cc
Simple merge
Unnamed repository; edit this file 'description' to name the repository.