Skip to content

fix: propagate event when resource is marked for deletion #3397

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

Draft
csviri wants to merge 1 commit into
base: main
Choose a base branch
from
+20 −2
Draft

fix: propagate event when resource is marked for deletion #3397

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
8 changes: 7 additions & 1 deletion ...java/io/javaoperatorsdk/operator/processing/event/source/informer/EventFilterDetails.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ class EventFilterDetails {
private int activeUpdates = 0;
private ResourceEvent lastEvent;
private String lastOwnUpdatedResourceVersion;
private boolean becameMarkedForDeletion = false;

public void increaseActiveUpdates() {
activeUpdates = activeUpdates + 1;
Expand Down Expand Up @@ -56,7 +57,8 @@ public void setLastEvent(ResourceEvent event) {

public Optional<ResourceEvent> getLatestEventAfterLastUpdateEvent() {
if (lastEvent != null
&& (lastOwnUpdatedResourceVersion == null
&& (becameMarkedForDeletion
|| lastOwnUpdatedResourceVersion == null
|| ReconcilerUtilsInternal.compareResourceVersions(
lastEvent.getResource().orElseThrow().getMetadata().getResourceVersion(),
lastOwnUpdatedResourceVersion)
Expand All @@ -69,4 +71,8 @@ public Optional<ResourceEvent> getLatestEventAfterLastUpdateEvent() {
public int getActiveUpdates() {
return activeUpdates;
}

public void setBecameMarkedForDeletion(boolean becameMarkedForDeletion) {
this.becameMarkedForDeletion = becameMarkedForDeletion;
}
}
14 changes: 13 additions & 1 deletion .../io/javaoperatorsdk/operator/processing/event/source/informer/TemporaryResourceCache.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,6 +132,9 @@ private synchronized EventHandling onEvent(
}
var cached = cache.get(resourceId);
EventHandling result = EventHandling.NEW;
// todo do this just for the primary resource?
boolean becameMarkedForDeletion =
resourceBecameMarkedForDeletion(prevResourceVersion, resource);
if (cached != null) {
int comp = ReconcilerUtilsInternal.compareResourceVersions(resource, cached);
if (comp >= 0 || unknownState) {
Expand All @@ -155,9 +158,12 @@ private synchronized EventHandling onEvent(
delete
? new ResourceDeleteEvent(ResourceAction.DELETED, resourceId, resource, unknownState)
: new ExtendedResourceEvent(action, resourceId, resource, prevResourceVersion));
if (becameMarkedForDeletion) {
ed.setBecameMarkedForDeletion(true);
}
return EventHandling.DEFER;
} else {
return result;
return becameMarkedForDeletion ? EventHandling.NEW : result;
}
}

Expand Down Expand Up @@ -274,4 +280,10 @@ synchronized boolean isEmpty() {
synchronized Map<ResourceID, T> getResources() {
return Collections.unmodifiableMap(cache);
}

private boolean resourceBecameMarkedForDeletion(T prevResource, T newResource) {
return prevResource != null
&& !prevResource.isMarkedForDeletion()
&& newResource.isMarkedForDeletion();
}
}
Loading