Skip to content

fix: processor issue with cleanup resources #2049

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 2 commits into from
Sep 8, 2023
Merged

fix: processor issue with cleanup resources #2049

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2fd77e0
fix: processor issue with cleanup resources
csviri Sep 8, 2023
870a6f9
revert small change
csviri Sep 8, 2023
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
3 changes: 3 additions & 0 deletions ...ework-core/src/main/java/io/javaoperatorsdk/operator/processing/event/EventProcessor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,6 +97,9 @@ public synchronized void handleEvent(Event event) {
metrics.receivedEvent(event, metricsMetadata);
handleEventMarking(event, state);
if (!this.running) {
if (state.deleteEventPresent()) {
cleanupForDeletedEvent(state.getId());
}
// events are received and marked, but will be processed when started, see start() method.
log.debug("Skipping event: {} because the event processor is not started", event);
return;
Expand Down
15 changes: 15 additions & 0 deletions ...k-core/src/test/java/io/javaoperatorsdk/operator/processing/event/EventProcessorTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -452,6 +452,21 @@ void executionOfReconciliationShouldNotStartIfProcessorStopped() throws Interrup
.handleExecution(any());
}

@Test
void cleansUpForDeleteEventEvenIfProcessorNotStarted() {
ResourceID resourceID = new ResourceID("test1", "default");

eventProcessor =
spy(new EventProcessor(controllerConfiguration(null, rateLimiterMock),
reconciliationDispatcherMock,
eventSourceManagerMock, null));

eventProcessor.handleEvent(prepareCREvent(resourceID));
eventProcessor.handleEvent(new ResourceEvent(ResourceAction.DELETED, resourceID, null));
eventProcessor.handleEvent(prepareCREvent(resourceID));
// no exception thrown
}

private ResourceID eventAlreadyUnderProcessing() {
when(reconciliationDispatcherMock.handleExecution(any()))
.then(
Expand Down