Skip to content

Commit 7611c14

Browse files
committed
log msg
Signed-off-by: Attila Mészáros <[email protected]>
1 parent 45d4d09 commit 7611c14

File tree

2 files changed

+7
-6
lines changed

2 files changed

+7
-6
lines changed

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

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -253,18 +253,20 @@ public Set<R> getSecondaryResources(P primary) {
253253
// that we did not receive yet an event in the informer so the index would not
254254
// be updated. However, before reading it from temp IDs the event arrives and erases
255255
// the temp index. So in case of Add not id would be found.
256+
var sid = resourceIdToString(primaryID);
256257
var temporalIds =
257258
temporaryResourceCache
258259
.getTemporalPrimaryToSecondaryIndex()
259260
.getSecondaryResources(primaryID);
260-
var resources = byIndex(PRIMARY_TO_SECONDARY_INDEX_NAME, resourceIdToString(primaryID));
261+
var resources = byIndex(PRIMARY_TO_SECONDARY_INDEX_NAME, sid);
261262

262263
log.debug(
263264
"Using informer primary to secondary index to find secondary resources for primary name:"
264-
+ " {} namespace: {}. Found number {}",
265+
+ " {} namespace: {}. Found number {}, String id: {}",
265266
primary.getMetadata().getName(),
266267
primary.getMetadata().getNamespace(),
267-
resources.size());
268+
resources.size(),
269+
sid);
268270

269271
log.debug("Complementary ids: {}", temporalIds);
270272
var res =

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

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ public synchronized void putResource(T newResource, String previousResourceVersi
9393
}
9494
var resourceId = ResourceID.fromResource(newResource);
9595
var cachedResource = managedInformerEventSource.get(resourceId).orElse(null);
96-
temporalPrimaryToSecondaryIndex.explicitAddOrUpdate(newResource);
96+
9797
boolean moveAhead = false;
9898
if (previousResourceVersion == null && cachedResource == null) {
9999
if (tombstones.contains(newResource.getMetadata().getUid())) {
@@ -107,7 +107,6 @@ public synchronized void putResource(T newResource, String previousResourceVersi
107107
// consider
108108
moveAhead = true;
109109
}
110-
111110
if (moveAhead
112111
|| (cachedResource != null
113112
&& (cachedResource
@@ -119,7 +118,7 @@ public synchronized void putResource(T newResource, String previousResourceVersi
119118
"Temporarily moving ahead to target version {} for resource id: {}",
120119
newResource.getMetadata().getResourceVersion(),
121120
resourceId);
122-
121+
temporalPrimaryToSecondaryIndex.explicitAddOrUpdate(newResource);
123122
cache.put(resourceId, newResource);
124123
} else if (cache.remove(resourceId) != null) {
125124
log.debug("Removed an obsolete resource from cache for id: {}", resourceId);

0 commit comments

Comments
 (0)