Skip to content

Commit 6060af0

Browse files
committed
wip
Signed-off-by: Attila Mészáros <a_meszaros@apple.com>
1 parent ec96713 commit 6060af0

File tree

1 file changed

+8
-6
lines changed

1 file changed

+8
-6
lines changed

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

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -193,7 +193,7 @@ public synchronized void putResource(T newResource) {
193193
//
194194
// this also prevents resurrecting recently deleted entities for which the delete event
195195
// has already been processed
196-
var latestRV = getLatestResourceVersion(newResource.getMetadata().getNamespace());
196+
var latestRV = getLastSyncResourceVersion(newResource.getMetadata().getNamespace());
197197
if (latestRV != null
198198
&& ReconcilerUtilsInternal.compareResourceVersions(
199199
latestRV, newResource.getMetadata().getResourceVersion())
@@ -219,7 +219,7 @@ public synchronized void putResource(T newResource) {
219219
}
220220
}
221221

222-
private String getLatestResourceVersion(String namespace) {
222+
private String getLastSyncResourceVersion(String namespace) {
223223
return managedInformerEventSource.manager().lastSyncResourceVersion(namespace);
224224
}
225225

@@ -235,10 +235,12 @@ private void checkGhostResources() {
235235
var iterator = cache.entrySet().iterator();
236236
while (iterator.hasNext()) {
237237
var e = iterator.next();
238-
if (ReconcilerUtilsInternal.compareResourceVersions(
239-
e.getValue().getMetadata().getResourceVersion(),
240-
getLatestResourceVersion(e.getValue().getMetadata().getNamespace()))
241-
< 0
238+
var latestResourceVersion =
239+
getLastSyncResourceVersion(e.getValue().getMetadata().getNamespace());
240+
if ((latestResourceVersion == null
241+
|| ReconcilerUtilsInternal.compareResourceVersions(
242+
e.getValue().getMetadata().getResourceVersion(), latestResourceVersion)
243+
< 0)
242244
// making sure we have the situation where resource is missing from the cache
243245
&& managedInformerEventSource
244246
.manager()

0 commit comments

Comments
 (0)