diff options
| author | Sami Hiltunen <shiltunen@gitlab.com> | 2021-08-24 18:23:34 +0300 |
|---|---|---|
| committer | Sami Hiltunen <shiltunen@gitlab.com> | 2021-08-24 18:23:34 +0300 |
| commit | b24f90930cb18c26d85301aca3c887598806bd42 (patch) | |
| tree | 19c76449b3e26615c5831196693ab2eee1697543 | |
| parent | 0b8fa6eb7dafa519aba4e95cd6e3a16c3c435436 (diff) | |
| parent | 4a2ac0ed486f088fd34fdbeddef0c73cdec77e12 (diff) | |
Merge branch 'pks-datastore-fix-timezone-bug' into 'master'
datastore: Fix acknowledgement of stale jobs considering timezones
See merge request gitlab-org/gitaly!3784
| -rw-r--r-- | internal/praefect/datastore/queue.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/internal/praefect/datastore/queue.go b/internal/praefect/datastore/queue.go index 9e21da9a9..dcff2567e 100644 --- a/internal/praefect/datastore/queue.go +++ b/internal/praefect/datastore/queue.go @@ -475,7 +475,7 @@ func (rq PostgresReplicationEventQueue) StartHealthUpdate(ctx context.Context, t func (rq PostgresReplicationEventQueue) AcknowledgeStale(ctx context.Context, staleAfter time.Duration) error { query := ` WITH stale_job_lock AS ( - DELETE FROM replication_queue_job_lock WHERE triggered_at < NOW() - INTERVAL '1 MILLISECOND' * $1 + DELETE FROM replication_queue_job_lock WHERE triggered_at < NOW() AT TIME ZONE 'UTC' - INTERVAL '1 MILLISECOND' * $1 RETURNING job_id, lock_id ) , update_job AS ( |