fix: Prevent short time endless loop in expire_timer (backport #1303)#1305
fix: Prevent short time endless loop in expire_timer (backport #1303)#1305mergify[bot] wants to merge 1 commit into
Conversation
|
Cherry-pick of 927a33e has failed: To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally |
| } | ||
| } | ||
|
|
||
| >>>>>>> 927a33e (fix: Prevent short time endless loop in expire_timer (#1303)) |
There was a problem hiding this comment.
this part of the PR is ABI breaking and different from how action goal expiration was handled in Jazzy. We can remove this part and backport the rest of the changes to Jazzy (and Kilted as well, in combination with the action goal expiration backport)
There was a problem hiding this comment.
@skyegalaxy or @jmachowinski: would one of you want to take care of this?
* fix: Prevent short time endless loop in expire_timer There were multiple bugs in this area: - The expire of goals and the re computation of the expire period had a < vs <= issue, leading to goals not expiring, while the period for the next expire was compute as 0 leading to a direct recall of the expire timer. In combination with sim time this lead to 100% CPU spikes. - The period of the expire timer was changed after the reset of the timer, leading to an incorrect next call time of the timer. - The timer was not canceled after the expire event was issued Signed-off-by: Janosch Machowinski <J.Machowinski@cellumation.com> * chore: Removed unneeded line Signed-off-by: Janosch Machowinski <J.Machowinski@cellumation.com> --------- Signed-off-by: Janosch Machowinski <J.Machowinski@cellumation.com> Co-authored-by: Janosch Machowinski <J.Machowinski@cellumation.com> (cherry picked from commit 927a33e) resolve merge conflicts Signed-off-by: Skyler Medeiros <skye@polymathrobotics.com>
dae1c1b to
884f64d
Compare
|
Pulls: #1305 |
|
CI failures in rhel seem unrelated, and are near identical to the rhel CI failures from this completely unrelated PR ros2/rclcpp#3157 |
There were multiple bugs in this area:
This is an automatic backport of pull request #1303 done by [Mergify](https://mergify.com).