fix(maintenance): timezone handling offset issue #981
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
|
(just a heads-up - fairly new to golang, so let me know if there's any more go-typical ways of handling things) |
2 tasks
TwiN
requested changes
Jan 29, 2025
config/maintenance/maintenance.go
Outdated
Comment on lines
114
to
122
|
|
||
| adjustedDate := now.Day() | ||
| if now.Hour() < int(c.durationToStartFromMidnight.Hours()) { | ||
| // if time in maintenance window is later than now, treat it as yesterday | ||
| adjustedDate-- | ||
| } | ||
| // Set to midnight prior to adding duration | ||
| dayWhereMaintenancePeriodWouldStart = time.Date(now.Year(), now.Month(), adjustedDate, 0, 0, 0, 0, now.Location()) | ||
|
|
|
I also just realised I can remove the separate variable definition for |
TwiN
changed the title
TwiN
approved these changes
Jan 29, 2025
Codecov ReportAll modified and coverable lines are covered by tests ✅
Additional details and impacted files@@ Coverage Diff @@
## master #981 +/- ##
=======================================
Coverage 75.86% 75.86%
=======================================
Files 74 74
Lines 6758 6758
=======================================
Hits 5127 5127
Misses 1325 1325
Partials 306 306 ☔ View full report in Codecov by Sentry. |
|
@alexmaras Thank you for the contribution! |
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.
Summary
Fixes an issue with the timezone handling in Maintenance blocks
#911
The problem was with using Truncate, which always operates in UTC. Switching to constructing the date from component parts (
0, 0, 0, 0for midnight) fixes this issue and makes the time always midnight for the timezone the maintenance window refers to.I've added a test for this too - the previous test didn't catch the problem because it was only an hour out from UTC, and the window covered a 2 hour period. I've using UTC+8 (Australia/Perth) for a large enough gap to catch the issue. This test fails without the code changes, and passes now.
Checklist
README.md, if applicable. (Not applicable - bugfixing existing behavior)