]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commit
projects / ceph.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(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)
commit211cd6388bb021fb70e9a06d84e2753a2049af0b
tree52d1db171be25d0c211e5e5d707a58e5a9b9ce65tree | snapshot
parent88ec550112c128dacc70047ee0208f4ec1d0be60commit | diff
parent2011377c379c9d53a3a0a693a7874fc330278898commit | diff
Merge PR #23512 into master

* 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>
src/osd/OSD.cc diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.