]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
projects / ceph.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 88ec550 2011377)
Merge PR #23512 into master
authorSage Weil <sage@redhat.com>
Mon, 13 Aug 2018 18:00:46 +0000 (13:00 -0500)
committerSage Weil <sage@redhat.com>
Mon, 13 Aug 2018 18:00:46 +0000 (13:00 -0500)
* refs/pull/23512/head:
osd: vary tick interval +/- 5% to avoid scrub livelocks
osd: tick at OSD_TICK_INTERVAL, not heartbeat interval

Reviewed-by: Brad Hubbard <bhubbard@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
1  2 
src/osd/OSD.cc patch | diff1 | diff2 | blob | history

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