jprdonnelly/kestra
1
0
Fork 0
mirror of https://github.com/kestra-io/kestra.git synced 2025-12-19 09:50:29 -05:00
Code Issues Packages Projects Releases Wiki Activity

fix(executions): query ExecutionDelay to UTC to avoid any offset error

Browse Source 
Related-to: kestra-io/kestra-ee#6143
This commit is contained in:
Florian Hussonnois
2025-12-17 11:36:55 +01:00
committed by Florian Hussonnois
parent 352d4eb194
commit 4b3419bc15
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
jdbc/src/main/java/io/kestra/jdbc/runner/AbstractJdbcExecutionDelayStorage.java
View File

@@ -7,6 +7,8 @@ import org.jooq.Record1;
import org.jooq.SelectConditionStep; import org.jooq.SelectConditionStep;
import org.jooq.impl.DSL; import org.jooq.impl.DSL;
import java.time.LocalDateTime;
import java.time.ZoneOffset;
import java.time.ZonedDateTime; import java.time.ZonedDateTime;
import java.util.Map; import java.util.Map;
import java.util.function.Consumer; import java.util.function.Consumer;
@@ -20,6 +22,9 @@ public abstract class AbstractJdbcExecutionDelayStorage extends AbstractJdbcRepo
public void get(Consumer<ExecutionDelay> consumer) { public void get(Consumer<ExecutionDelay> consumer) {
ZonedDateTime now = ZonedDateTime.now(); ZonedDateTime now = ZonedDateTime.now();
// 'date' column in the table is in UTC
// convert 'now' to UTC LocalDateTime to avoid any timezone/offset interpretation by the database.
LocalDateTime localDateTimeNow = now.withZoneSameInstant(ZoneOffset.UTC).toLocalDateTime();
this.jdbcRepository this.jdbcRepository
.getDslContextWrapper() .getDslContextWrapper()
@@ -28,9 +33,7 @@ public abstract class AbstractJdbcExecutionDelayStorage extends AbstractJdbcRepo
.using(configuration) .using(configuration)
.select(AbstractJdbcRepository.field("value")) .select(AbstractJdbcRepository.field("value"))
.from(this.jdbcRepository.getTable()) .from(this.jdbcRepository.getTable())
.where( .where(AbstractJdbcRepository.field("date").lessOrEqual(localDateTimeNow))
AbstractJdbcRepository.field("date").lessOrEqual(now.toOffsetDateTime())
)
.forUpdate() .forUpdate()
.skipLocked(); .skipLocked();