]> git.apps.os.sepia.ceph.com Git - ceph.git/commit
OSD: add recovery_wq suicide timeout
authorSamuel Just <sjust@redhat.com>
Wed, 6 May 2015 17:50:19 +0000 (10:50 -0700)
committerAbhishek Lekshmanan <abhishek.lekshmanan@ril.com>
Wed, 15 Jul 2015 16:33:24 +0000 (22:03 +0530)
commit11575832a37ea247a8febe912b3058f51a464ab6
treed953fa6509855fb8a1b8abfc508c705023fff5b0
parenta82b4505848c09ad0094768c886f2015bdaa1148
OSD: add recovery_wq suicide timeout

Signed-off-by: Samuel Just <sjust@redhat.com>
(cherry picked from commit 85311b656852af75bfbbc6699f92fc6aa233c316)

Conflicts: src/common/config_opts.h

There was a merge conflict due to introduction of `osd_recovery_sleep`
which was introduced in #3829
src/common/config_opts.h
src/osd/OSD.cc
src/osd/OSD.h