]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commit
osd/OSDMapMapping: fix spurious threadpool timeout errors 44546/head
authorSage Weil <sage@newdream.net>
Mon, 6 Dec 2021 18:12:50 +0000 (13:12 -0500)
committerCory Snyder <csnyder@iland.com>
Fri, 4 Feb 2022 09:52:30 +0000 (04:52 -0500)
commit5f404d5741a91c580e96f12e947ea78cd8bc9309
tree93f2adafc74cb07036c68be78c87bc8b553d81d3
parentb78870188b9f298f2d65594d7afb6e2019bff155
osd/OSDMapMapping: fix spurious threadpool timeout errors

We were passing a grace of zero seconds to our temporary work queue, which
led to the HeartbeatMap issuing cpu_tp timeout errors to the log.  By using
a non-zero grace period we can avoid these.  Use the same default grace
we use for the workqueue itself when it goes to sleep.

Fixes: https://tracker.ceph.com/issues/53506
Signed-off-by: Sage Weil <sage@newdream.net>
(cherry picked from commit 30ac5e79352839e285ec2eef6d603226d9071db4)

Conflicts:
src/osd/OSDMapMapping.h

Cherry-pick notes:
- Octopus was passing integer 0 as WorkQueue time_t args vs. ceph::timespan::zero()
src/common/WorkQueue.cc
src/osd/OSDMapMapping.h