Skip to content

Commit 62af67c

Browse files
committed
updating obsolete event handling
1 parent 2c2433f commit 62af67c

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
@@ -93,7 +93,7 @@ public void onDeleteEvent(T resource, boolean unknownState) {
9393
}
9494

9595
/**
96-
* @return true if the resourceVersion was already known and not skipped for event filtering
96+
* @return true if the resourceVersion was obsolete
9797
*/
9898
public boolean onAddOrUpdateEvent(T resource) {
9999
return onEvent(resource, false, false);
@@ -115,7 +115,7 @@ private synchronized boolean onEvent(T resource, boolean unknownState, boolean d
115115
latestResourceVersion = resource.getMetadata().getResourceVersion();
116116
}
117117
var cached = cache.get(resourceId);
118-
boolean filterEvent = false;
118+
boolean obsoleteEvent = false;
119119
int comp = 0;
120120
if (cached != null) {
121121
comp = ReconcileUtils.validateAndCompareResourceVersions(resource, cached);
@@ -124,9 +124,9 @@ private synchronized boolean onEvent(T resource, boolean unknownState, boolean d
124124
// we propagate event only for our update or newer other can be discarded since we know we
125125
// will receive
126126
// additional event
127-
filterEvent = false;
127+
obsoleteEvent = comp == 0;
128128
} else {
129-
filterEvent = true;
129+
obsoleteEvent = true;
130130
}
131131
}
132132
var ed = activeUpdates.get(resourceId);
@@ -138,7 +138,7 @@ private synchronized boolean onEvent(T resource, boolean unknownState, boolean d
138138
ResourceAction.UPDATED, resourceId, resource)); // todo true action
139139
return true;
140140
} else {
141-
return filterEvent;
141+
return obsoleteEvent;
142142
}
143143
}
144144

0 commit comments

Comments
 (0)