Skip to content

Consider server timezone on _get_timezone_offset instead of django's settings #886

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.

Sign up for GitHub

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

Merged
merged 7 commits into from
May 10, 2025
Merged

Consider server timezone on _get_timezone_offset instead of django's settings #886

Changes from 6 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
4526bd9
Scheduler shouldnt ignore specific times on crontab
iwalucas May 5, 2025
b6e39f6
Use aware_now to get server's timezone rather than using django's
iwalucas May 5, 2025
040df6b
Update schedulers.py
iwalucas May 6, 2025
b257a3c
Update schedulers.py
iwalucas May 6, 2025
fca14a2
Update schedulers.py
iwalucas May 7, 2025
068e88e
Update django_celery_beat/schedulers.py
auvipy May 7, 2025
70d34ac
adding tests
iwalucas May 8, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions django_celery_beat/schedulers.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@
from django.db.models import Case, F, IntegerField, Q, When
from django.db.models.functions import Cast
from django.db.utils import DatabaseError, InterfaceError
from django.utils import timezone
from kombu.utils.encoding import safe_repr, safe_str
from kombu.utils.json import dumps, loads

Expand Down Expand Up @@ -364,7 +363,9 @@ def _get_timezone_offset(self, timezone_name):
int: The hour offset
"""
# Get server timezone
server_tz = timezone.get_current_timezone()
server_time = aware_now()
# Use server_time.tzinfo directly if it is already a ZoneInfo instance
server_tz = server_time.tzinfo if isinstance(server_time.tzinfo, ZoneInfo) else ZoneInfo(str(server_time.tzinfo))
Copy link

@jennifer-richards jennifer-richards May 7, 2025 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The tzinfo class does not define __str__. It would be better to use server_time.tzinfo.tzname() which is guaranteed to exist.

There's no guarantee ZoneInfo will know what to do with the tzname(), though, so this won't work with obscure timezone implementations. (Edit: or with obscure zones not known to ZoneInfo. Either of these cases will probably break Django, so I don't think that this is a problem, just pointing it out.)

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I would request to come with a better solution for this in a separate PR, as going to merge this for a hhotfix

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this change caused our environment to stop dispatching tasks #894 - this should not have been a patch upgrade

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

since you state in the docs that changing the timezone needs manual work https://django-celery-beat.readthedocs.io/en/latest/#important-warning-about-time-zones

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@alirafiei75 can you also have a look into this please?

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

locally it is working - on the server, even if i update the server timezone to Europe/Berlin from UTC it doesn't work

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@FabianClemenz We wrote some tests to make sure that timezone differences do not affect the tasks running. Can you check them and if possible add a failing test so that I can check what is the expectation? (so then I can fix it)
There was a serious bug in 2.8 and some of the developers that had the problem reviewed the PR #879 and you can see the comments.

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@alirafiei75 i try to get time for that

For now

  • On server date returns utc timezone
  • Going into docker container, timezone.now() shows utc timezone, timezone.get_current_timezone() shows Europe/Berlin
  • this is also on containers working
  • datetime.now() shows Europe/Berlin

Maybe this line is the error? Getting the current time via datetime instead of timezone?

django-celery-beat/django_celery_beat/schedulers.py

Line 503 in 673dbc5

current_time = datetime.datetime.now()

image

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

localtime of beat shows time in Europe/Berlin - no matter what timezone the server is in

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Maybe this line is the error? Getting the current time via datetime instead of timezone?

This could not be the problem as it is not used anywhere else and just the timedelta matters and as long as both current_time and _last_full_sync are calculated in the same way, there won't be a problem.


if isinstance(timezone_name, ZoneInfo):
timezone_name = timezone_name.key
Expand Down