-
Notifications
You must be signed in to change notification settings - Fork 775
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
[21314] Improve resilience against clock adjustments (backport #5018) #5189
base: 2.14.x
Are you sure you want to change the base?
Conversation
Cherry-pick of ccc690c 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 |
0eed014
to
bef43f7
Compare
bef43f7
to
8b67465
Compare
8b67465
to
a4eb611
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Please fix uncrustify
@Mergifyio rebase |
* Use steady_clock instead of high_resolution_clock for status checks (high_resolution_clock might not be steady depending on STL impl) Signed-off-by: Matthias Schneider <ma30002000@yahoo.de> * Use steady_clock instead for system_clock for calculating timeouts Signed-off-by: Matthias Schneider <ma30002000@yahoo.de> * Use correct clock's duration for duration_cast Signed-off-by: Matthias Schneider <ma30002000@yahoo.de> * Use Time_t::now() Signed-off-by: Matthias Schneider <ma30002000@yahoo.de> * Fix build. Signed-off-by: Miguel Company <miguelcompany@eprosima.com> * Refs #21314. Refactor on DataWriterImpl. Signed-off-by: Miguel Company <miguelcompany@eprosima.com> * Refs #21314. Refactor on DataReaderImpl. Signed-off-by: Miguel Company <miguelcompany@eprosima.com> * Refs #21314. Refactor on StatefulWriter. Signed-off-by: Miguel Company <miguelcompany@eprosima.com> * Refs #21314. Protect current_time_since_unix_epoch against clock adjustments. Signed-off-by: Miguel Company <miguelcompany@eprosima.com> * Revert "Use steady_clock instead of high_resolution_clock for status checks (high_resolution_clock might not be steady depending on STL impl)" This reverts commit d69eb91. --------- Signed-off-by: Matthias Schneider <ma30002000@yahoo.de> Signed-off-by: Miguel Company <miguelcompany@eprosima.com> Co-authored-by: Miguel Company <miguelcompany@eprosima.com> (cherry picked from commit ccc690c)
Signed-off-by: JesusPoderoso <jesuspoderoso@eprosima.com>
Signed-off-by: JesusPoderoso <jesuspoderoso@eprosima.com>
Signed-off-by: JesusPoderoso <jesuspoderoso@eprosima.com>
✅ Branch has been successfully rebased |
c7a222a
to
b235fd6
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM with green CI
Description
When investigating a system undergoing larger system clock adjustments, I noticed that in some places, std::chrono::system_clock and std::chrono::high_resolution_clock are used for handling timeouts and status check intervals.
However, std::chrono::system_clock is definitely not steady, and std::chrono::high_resolution_clock is not steady quite often (see cppreference).
When undergoing clock adjustments (manually or due to clock server synchronization), timeouts and status checks might no longer be triggered when relying on timestamps based on std::chrono::system_clock.
@Mergifyio backport 2.14.x 2.10.x
Contributor Checklist
Commit messages follow the project guidelines.
The code follows the style guidelines of this project.
Tests that thoroughly check the new feature have been added/Regression tests checking the bug and its fix have been added; the added tests pass locally
N/A Any new/modified methods have been properly documented using Doxygen.
N/A Any new configuration API has an equivalent XML API (with the corresponding XSD extension)
Changes are backport compatible: they do NOT break ABI nor change library core behavior.
Changes are API compatible.
N/A New feature has been added to the
versions.md
file (if applicable).N/A New feature has been documented/Current behavior is correctly described in the documentation.
Applicable backports have been included in the description.
Reviewer Checklist
This is an automatic backport of pull request #5018 done by [Mergify](https://mergify.com).