]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commit
Merge pull request #2650 from ceph/wip-9128
authorSamuel Just <sam.just@inktank.com>
Wed, 8 Oct 2014 18:04:42 +0000 (11:04 -0700)
committerSamuel Just <sam.just@inktank.com>
Wed, 8 Oct 2014 18:04:42 +0000 (11:04 -0700)
commit4a5af139123e9f6fce03452d1cea2dbae9446d57
tree26cf77e12cd2c5a29f6f6fe72f15680cb3b90d78
parente684abcb3fbbda5701907ca47ec4d15d56c192f1
parent6aba0ab9a8bc52bf07fd1cfd1dfd0f1915c8bd26
Merge pull request #2650 from ceph/wip-9128

Add reset_tp_timeout in long loop in add_source_info for suicide timeout

Reviewed-by: Samuel Just <sam.just@inktank.com>
src/osd/OSD.cc
src/osd/PG.cc
src/osd/PG.h