Fix PostgreSQL DelayedSubscriber timezone query bug#53
Merged
m110 merged 1 commit intoThreeDotsLabs:masterfrom Oct 28, 2025
Merged
Conversation
Member
|
Thank you @AlfandiMario! 🤝 |
Contributor
|
@m110 I think |
This file contains hidden or 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
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 #631 ThreeDotsLabs/watermill#631
Motivation / Background
This PR fixes a timezone query bug in the PostgreSQL DelayedSubscriber (and DelayedRequeuer) where messages with expired
_watermill_delayed_untiltimestamps aren't republished when the server timezone differs from UTC (e.g., GMT+7). The issue causes failed messages to stay stuck in the queue indefinitely.Root cause: The query uses
NOW() AT TIME ZONE 'UTC', which strips timezone info and interprets timestamps in the local server timezone, leading to incorrect comparisons. This breaks delayed requeuing in non-UTC environments.Fixes #631.
Details
pkg/sql/delayed_postgresql.go(line 87), removeAT TIME ZONE 'UTC'from the WHERE clause.(metadata->>'_watermill_delayed_until')::timestamptz < NOW() AT TIME ZONE 'UTC'(metadata->>'_watermill_delayed_until')::timestamptz < NOW()timestamptzcomparisons in UTC internally, soNOW()(atimestamptz) compares correctly against stored UTC timestamps without manual conversion.Alternative approaches considered (if applicable)
None—removing the timezone clause is the simplest, idiomatic fix. Adding explicit UTC casting (e.g.,
NOW() AT TIME ZONE 'UTC') was considered but rejected as it reintroduces the bug. Over-engineering with config options for timezones would violate KISS.Checklist
make test_shortand fullmake testwith Docker.)