Skip to content

Commit 66b9665

Browse files
committed
remove interval doublecheck
Signed-off-by: Attila Mészáros <a_meszaros@apple.com>
1 parent 771049d commit 66b9665

File tree

1 file changed

+16
-20
lines changed

1 file changed

+16
-20
lines changed

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

Lines changed: 16 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,6 @@ public class TemporaryResourceCache<T extends HasMetadata> {
6262
private final boolean comparableResourceVersions;
6363

6464
private final long obsoleteResourceCheckInterval;
65-
private volatile long lastObsoleteResourceCheck = System.currentTimeMillis();
6665
private final ManagedInformerEventSource<T, ?, ?> managedInformerEventSource;
6766

6867
public enum EventHandling {
@@ -234,25 +233,22 @@ private String getLatestResourceVersion(String namespace) {
234233
* explicitly add resources to this cache. Those are cleaned up by this check.
235234
*/
236235
private void checkObsoleteResources() {
237-
if (System.currentTimeMillis() >= lastObsoleteResourceCheck + obsoleteResourceCheckInterval) {
238-
lastObsoleteResourceCheck = System.currentTimeMillis();
239-
log.debug("Checking for obsolete resources.");
240-
var iterator = cache.entrySet().iterator();
241-
while (iterator.hasNext()) {
242-
var e = iterator.next();
243-
if (ReconcilerUtilsInternal.compareResourceVersions(
244-
e.getValue().getMetadata().getResourceVersion(),
245-
getLatestResourceVersion(e.getValue().getMetadata().getNamespace()))
246-
< 0
247-
// making sure we have the situation where resource is missing from the cache
248-
&& managedInformerEventSource
249-
.manager()
250-
.get(ResourceID.fromResource(e.getValue()))
251-
.isEmpty()) {
252-
iterator.remove();
253-
managedInformerEventSource.handleEvent(ResourceAction.DELETED, e.getValue(), null, true);
254-
log.debug("Removing obsolete resource with ID: {}", e.getKey());
255-
}
236+
log.debug("Checking for obsolete resources.");
237+
var iterator = cache.entrySet().iterator();
238+
while (iterator.hasNext()) {
239+
var e = iterator.next();
240+
if (ReconcilerUtilsInternal.compareResourceVersions(
241+
e.getValue().getMetadata().getResourceVersion(),
242+
getLatestResourceVersion(e.getValue().getMetadata().getNamespace()))
243+
< 0
244+
// making sure we have the situation where resource is missing from the cache
245+
&& managedInformerEventSource
246+
.manager()
247+
.get(ResourceID.fromResource(e.getValue()))
248+
.isEmpty()) {
249+
iterator.remove();
250+
managedInformerEventSource.handleEvent(ResourceAction.DELETED, e.getValue(), null, true);
251+
log.debug("Removing obsolete resource with ID: {}", e.getKey());
256252
}
257253
}
258254
}

0 commit comments

Comments
 (0)