Skip to content

fix: keep polling a resource after its fetcher failed and allow re-registering one absent from the cache #3668

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
csviri wants to merge 1 commit into
base: next
Choose a base branch
from
Draft

fix: keep polling a resource after its fetcher failed and allow re-registering one absent from the cache #3668

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 11 additions & 3 deletions ...vaoperatorsdk/operator/processing/event/source/polling/PerResourcePollingEventSource.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,10 +148,18 @@ public void run() {
var primary = primaryResourceCache.get(primaryID);
if (primary.isEmpty()) {
log.warn("No resource in cache for resource ID: {}", primaryID);
// no new execution is scheduled in this case, an on delete event should be received shortly
// no new execution is scheduled in this case, an on delete event should be received
// shortly;
// the entry is dropped so that it can't block a registration of a recreated resource
scheduledFutures.remove(primaryID);
} else {
var actualResources = primary.map(p -> getAndCacheResource(p, false));
scheduleNextExecution(primary.get(), actualResources.orElse(null));
Set<R> actualResources = null;
try {
actualResources = getAndCacheResource(primary.get(), false);
} catch (RuntimeException e) {
log.error("Error during polling resources for: {}", primaryID, e);
}
scheduleNextExecution(primary.get(), actualResources);
}
}
}
Expand Down
27 changes: 27 additions & 0 deletions ...eratorsdk/operator/processing/event/source/polling/PerResourcePollingEventSourceTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,33 @@ void pollsTheResourceAfterAwareOfIt() {
});
}

@Test
void keepsPollingAfterTheFetcherFailed() {
when(supplier.fetchResources(any()))
.thenThrow(new IllegalStateException("temporary failure"))
.thenReturn(Set.of(SampleExternalResource.testResource1()));

source.onResourceCreated(testCustomResource);

await()
.untilAsserted(() -> verify(supplier, atLeast(3)).fetchResources(eq(testCustomResource)));
}

@Test
void resourceAbsentFromTheCacheCanBeRegisteredAgain() {
when(resourceCache.get(any())).thenReturn(Optional.empty());
source.onResourceCreated(testCustomResource);
await()
.pollDelay(Duration.ofMillis(2 * PERIOD))
.untilAsserted(() -> verify(supplier, never()).fetchResources(any()));

when(resourceCache.get(any())).thenReturn(Optional.of(testCustomResource));
source.onResourceUpdated(testCustomResource, testCustomResource);

await()
.untilAsserted(() -> verify(supplier, atLeast(1)).fetchResources(eq(testCustomResource)));
}

@Test
void registeringTaskOnAPredicate() {
setUpSource(
Expand Down
Loading