Skip to content

Commit f414063

Browse files
committed
updating obsolete event handling
1 parent be8f5f7 commit f414063

File tree

2 files changed

+8
-7
lines changed

2 files changed

+8
-7
lines changed

operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/event/source/controller/ControllerEventSource.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,7 @@ public synchronized void start() {
8181
}
8282
}
8383

84+
@Override
8485
public synchronized void handleEvent(
8586
ResourceAction action,
8687
T resource,
@@ -137,8 +138,8 @@ private boolean isAcceptedByFilters(ResourceAction action, T resource, T oldReso
137138

138139
@Override
139140
public void onAdd(T resource) {
140-
var knownResourceVersion = temporaryResourceCache.onAddOrUpdateEvent(resource);
141-
handleEvent(ResourceAction.ADDED, resource, null, null, knownResourceVersion);
141+
var obsoleteResourceVersion = temporaryResourceCache.onAddOrUpdateEvent(resource);
142+
handleEvent(ResourceAction.ADDED, resource, null, null, obsoleteResourceVersion);
142143
}
143144

144145
@Override

operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/event/source/informer/TemporaryResourceCache.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ public void onDeleteEvent(T resource, boolean unknownState) {
9999
}
100100

101101
/**
102-
* @return true if the resourceVersion was already known and not skipped for event filtering
102+
* @return true if the resourceVersion was obsolete
103103
*/
104104
public boolean onAddOrUpdateEvent(T resource) {
105105
return onEvent(resource, false, false);
@@ -121,7 +121,7 @@ private synchronized boolean onEvent(T resource, boolean unknownState, boolean d
121121
latestResourceVersion = resource.getMetadata().getResourceVersion();
122122
}
123123
var cached = cache.get(resourceId);
124-
boolean filterEvent = false;
124+
boolean obsoleteEvent = false;
125125
int comp = 0;
126126
if (cached != null) {
127127
comp = ReconcileUtils.validateAndCompareResourceVersions(resource, cached);
@@ -130,9 +130,9 @@ private synchronized boolean onEvent(T resource, boolean unknownState, boolean d
130130
// we propagate event only for our update or newer other can be discarded since we know we
131131
// will receive
132132
// additional event
133-
filterEvent = false;
133+
obsoleteEvent = comp == 0;
134134
} else {
135-
filterEvent = true;
135+
obsoleteEvent = true;
136136
}
137137
}
138138
var ed = activeUpdates.get(resourceId);
@@ -149,7 +149,7 @@ private synchronized boolean onEvent(T resource, boolean unknownState, boolean d
149149
return true;
150150
}
151151
} else {
152-
return filterEvent;
152+
return obsoleteEvent;
153153
}
154154
}
155155

0 commit comments

Comments
 (0)