]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commit
Merge pull request #15635 from dzafman/wip-13837
authorJosh Durgin <jdurgin@redhat.com>
Wed, 28 Jun 2017 19:32:04 +0000 (12:32 -0700)
committerGitHub <noreply@github.com>
Wed, 28 Jun 2017 19:32:04 +0000 (12:32 -0700)
commit27569da06ed3f2ac77a8b1cd724542720ba7ca70
tree460fc47427aaca0f0d23457cfafebdee8581c302
parent1530b3400fc642a14da004d2d9592931f704df1b
parent640c00456c926f2344fbf0e024568d4c19a6f3a2
Merge pull request #15635 from dzafman/wip-13837

osd: Corrupt objects stop snaptrim and mark pg snaptrim_error

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
src/mon/PGMap.cc
src/osd/PG.cc
src/osd/PrimaryLogPG.cc
src/osd/osd_types.cc