Skip to content

Commit a810ac9

Browse files
committed
further simplifying
1 parent 91cec06 commit a810ac9

File tree

1 file changed

+3
-23
lines changed

1 file changed

+3
-23
lines changed

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

Lines changed: 3 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -87,39 +87,19 @@ public synchronized void putAddedResource(T newResource) {
8787
public synchronized void putResource(T newResource, String previousResourceVersion) {
8888
var resourceId = ResourceID.fromResource(newResource);
8989

90-
var cachedResource = managedInformerEventSource.get(resourceId).orElse(null);
91-
92-
boolean moveAhead = false;
9390
String latest = managedInformerEventSource.getLastSyncResourceVersion(resourceId.getNamespace()).orElse(null);
94-
if (latest != null && latest > newResource.getMetadata().getResourceVersion()) {
91+
if (latest != null && latest >= newResource.getMetadata().getResourceVersion()) {
9592
log.debug(
96-
"Won't move backwards for {}: resourceVersion {}, latest {}",
93+
"Resource {}: resourceVersion {} is not later than latest {}",
9794
resourceId,
9895
newResource.getMetadata().getResourceVersion(),
9996
latest);
100-
return;
101-
}
102-
103-
if (previousResourceVersion == null && cachedResource == null) {
104-
// we can skip further checks as this is a simple add and there's no previous entry to
105-
// consider
106-
moveAhead = true;
107-
}
108-
109-
if (moveAhead
110-
|| (cachedResource != null
111-
&& (cachedResource
112-
.getMetadata()
113-
.getResourceVersion()
114-
.equals(previousResourceVersion))
115-
|| isLaterResourceVersion(resourceId, newResource, cachedResource))) {
97+
} else {
11698
log.debug(
11799
"Temporarily moving ahead to target version {} for resource id: {}",
118100
newResource.getMetadata().getResourceVersion(),
119101
resourceId);
120102
cache.put(resourceId, newResource);
121-
} else if (cache.remove(resourceId) != null) {
122-
log.debug("Removed an obsolete resource from cache for id: {}", resourceId);
123103
}
124104
}
125105

0 commit comments

Comments
 (0)