Skip to content
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

fix(scheduler): delete trigger when flow is not found #7366

Merged
merged 1 commit into from
Feb 13, 2025
Merged

fix(scheduler): delete trigger when flow is not found #7366

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
9 changes: 9 additions & 0 deletions core/src/main/java/io/kestra/core/models/flows/Flow.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
import io.kestra.core.models.tasks.Task;
import io.kestra.core.models.tasks.retrys.AbstractRetry;
import io.kestra.core.models.triggers.AbstractTrigger;
import io.kestra.core.models.triggers.Trigger;
import io.kestra.core.models.validations.ManualConstraintViolation;
import io.kestra.core.serializers.JacksonMapper;
import io.kestra.core.serializers.ListOrMapOfLabelDeserializer;
Expand Down Expand Up @@ -176,6 +177,14 @@ public static String uidWithoutRevision(String tenantId, String namespace, Strin
);
}

public static String uid(Trigger trigger) {
return IdUtils.fromParts(
trigger.getTenantId(),
trigger.getNamespace(),
trigger.getFlowId()
);
}

public static String uidWithoutRevision(Execution execution) {
return IdUtils.fromParts(
execution.getTenantId(),
Expand Down
15 changes: 13 additions & 2 deletions core/src/main/java/io/kestra/core/schedulers/AbstractScheduler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
import io.kestra.core.utils.Either;
import io.kestra.core.utils.IdUtils;
import io.kestra.core.utils.ListUtils;
import io.kestra.core.models.triggers.RecoverMissedSchedules;
import io.kestra.core.models.flows.Flow;
import io.micronaut.context.ApplicationContext;
import io.micronaut.context.event.ApplicationEventPublisher;
import io.micronaut.inject.qualifiers.Qualifiers;
Expand Down Expand Up @@ -70,7 +70,8 @@ public abstract class AbstractScheduler implements Scheduler, Service {
private final QueueInterface<WorkerJob> workerTaskQueue;
private final WorkerTriggerResultQueueInterface workerTriggerResultQueue;
private final QueueInterface<ExecutionKilled> executionKilledQueue;
@SuppressWarnings("rawtypes") private final Optional<QueueInterface> clusterEventQueue;
@SuppressWarnings("rawtypes")
private final Optional<QueueInterface> clusterEventQueue;
protected final FlowListenersInterface flowListeners;
private final RunContextFactory runContextFactory;
private final RunContextInitializer runContextInitializer;
Expand Down Expand Up @@ -408,6 +409,16 @@ private Duration interval(AbstractTrigger abstractTrigger) {
private List<FlowWithTriggers> computeSchedulable(List<FlowWithSource> flows, List<Trigger> triggerContextsToEvaluate, ScheduleContextInterface scheduleContext) {
List<String> flowToKeep = triggerContextsToEvaluate.stream().map(Trigger::getFlowId).toList();

triggerContextsToEvaluate.stream()
.filter(trigger -> !flows.stream().map(FlowWithSource::uidWithoutRevision).toList().contains(Flow.uid(trigger)))
.forEach(trigger -> {
try {
this.triggerState.delete(trigger);
} catch (QueueException e) {
log.error("Unable to delete the trigger: {}.{}.{}", trigger.getNamespace(), trigger.getFlowId(), trigger.getTriggerId(), e);
}
});

return flows
.stream()
.filter(flow -> flowToKeep.contains(flow.getId()))
Expand Down
6 changes: 5 additions & 1 deletion core/src/main/java/io/kestra/core/schedulers/SchedulerTriggerStateInterface.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
import io.kestra.core.models.triggers.AbstractTrigger;
import io.kestra.core.models.triggers.Trigger;
import io.kestra.core.models.triggers.TriggerContext;
import io.kestra.core.queues.QueueException;
import jakarta.validation.ConstraintViolationException;

import java.time.ZonedDateTime;
Expand All @@ -25,7 +26,10 @@ public interface SchedulerTriggerStateInterface {

Trigger update(Flow flow, AbstractTrigger abstractTrigger, ConditionContext conditionContext) throws Exception;


/**
* QueueException required for Kafka implementation
*/
void delete(Trigger trigger) throws QueueException;
/**
* Used by the JDBC implementation: find triggers in all tenants.
*/
Expand Down
5 changes: 5 additions & 0 deletions jdbc/src/main/java/io/kestra/jdbc/runner/JdbcSchedulerTriggerState.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
import io.kestra.core.models.triggers.AbstractTrigger;
import io.kestra.core.models.triggers.Trigger;
import io.kestra.core.models.triggers.TriggerContext;
import io.kestra.core.queues.QueueException;
import io.kestra.core.schedulers.ScheduleContextInterface;
import io.kestra.core.schedulers.SchedulerTriggerStateInterface;
import io.kestra.jdbc.repository.AbstractJdbcTriggerRepository;
Expand Down Expand Up @@ -77,6 +78,10 @@ public Trigger update(Flow flow, AbstractTrigger abstractTrigger, ConditionConte
return this.triggerRepository.update(flow, abstractTrigger, conditionContext);
}

public void delete(Trigger trigger) throws QueueException {
this.triggerRepository.delete(trigger);
}

@Override
public List<Trigger> findByNextExecutionDateReadyForAllTenants(ZonedDateTime now, ScheduleContextInterface scheduleContext) {
return this.triggerRepository.findByNextExecutionDateReadyForAllTenants(now, scheduleContext);
Expand Down
Loading