Allow for limited wallclock rollback #2785
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
mrBliss
force-pushed
the
mrBliss/fix-2781
branch
from
4f82e4d to
9d9f70d
Compare
mrBliss
commented
Dec 2, 2020
ouroboros-consensus/src/Ouroboros/Consensus/BlockchainTime/WallClock/Simple.hs
Outdated
Show resolved
Hide resolved
ouroboros-consensus/src/Ouroboros/Consensus/BlockchainTime/WallClock/HardFork.hs
Outdated
Show resolved
Hide resolved
ouroboros-consensus-test/test-consensus/Test/Consensus/BlockchainTime/Simple.hs
Outdated
Show resolved
Hide resolved
ouroboros-consensus-test/test-consensus/Test/Consensus/BlockchainTime/Simple.hs
Outdated
Show resolved
Hide resolved
ouroboros-consensus-test/test-consensus/Test/Consensus/BlockchainTime/Simple.hs
Outdated
Show resolved
Hide resolved
edsko
approved these changes
Dec 2, 2020
mrBliss
force-pushed
the
mrBliss/fix-2781
branch
from
9d9f70d to
fe4641d
Compare
|
bors merge |
iohk-bors bot
added a commit
that referenced
this pull request
Dec 2, 2020
2785: Allow for limited wallclock rollback r=mrBliss a=mrBliss Fixes #2781. By default, we will allow the system clock to roll back three seconds to account for time changes because of NTP. When this happens, `TraceSystemClockMovedBack` will be traced. Not that the current slot won't decrease, we'll just stay in the same slot longer. When the system clock rolls back more than three seconds, we still shut down with the fatal `SystemClockMovedBack` exception. Co-authored-by: Thomas Winant <[email protected]>
|
Build failed: |
Both were isomorphic up to the time used (`UTCTime` vs `RelativeTime`). Generalise `TraceBlockchainTimeEvent` over the time and use that in both places.
mrBliss
force-pushed
the
mrBliss/fix-2781
branch
from
fe4641d to
8f01308
Compare
|
bors merge |
|
Build succeeded: |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes #2781.
By default, we will allow the system clock to roll back three seconds to account for time changes because of NTP. When this happens,
TraceSystemClockMovedBackwill be traced. Not that the current slot won't decrease, we'll just stay in the same slot longer.When the system clock rolls back more than three seconds, we still shut down with the fatal
SystemClockMovedBackexception.