Skip to content

fix(qdrant): keep GitHub collection discovery pending after a validation interrupt #243

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

Open
detail-app wants to merge 1 commit into
base: dev
Choose a base branch
from
Open

fix(qdrant): keep GitHub collection discovery pending after a validation interrupt #243

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
6 changes: 2 additions & 4 deletions src/main/java/com/williamcallahan/javachat/config/QdrantGitHubCollectionDiscovery.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -290,7 +290,8 @@ private void validateGitHubCollection(
ListenableFuture<CollectionInfo> collectionInfoRequest,
int expectedDimensions,
String denseVectorName,
String sparseVectorName) {
String sparseVectorName)
throws InterruptedException {
try {
CollectionInfo collectionInfo = collectionInfoRequest.get(GRPC_TIMEOUT_SECONDS, TimeUnit.SECONDS);

Expand Down Expand Up @@ -345,9 +346,6 @@ private void validateGitHubCollection(
+ payloadIndex.getKey() + "'");
}
}
} catch (InterruptedException _) {
Thread.currentThread().interrupt();
throw new IllegalStateException("GitHub collection validation interrupted for '" + collectionName + "'");
} catch (ExecutionException executionException) {
if (isTransientGrpcFailure(executionException.getCause())) {
throw new GitHubDiscoveryUnavailableException(
Expand Down
80 changes: 80 additions & 0 deletions src/test/java/com/williamcallahan/javachat/config/QdrantGitHubCollectionDiscoveryTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -191,6 +191,86 @@ void discoveryCancelsCollectionListingAfterLocalTimeout()
assertEquals("pending", discovery.discoveryHealth().getDetails().get("githubCollectionDiscovery"));
}

@Test
void interruptionDuringValidationStaysPending() throws InterruptedException, ExecutionException, TimeoutException {
QdrantClient qdrantClient = mock(QdrantClient.class);
EmbeddingClient embeddingClient = mock(EmbeddingClient.class);
String activeCollection = GENERATION_PREFIX + "openai-java-chat";
when(qdrantClient.listCollectionsAsync(any(java.time.Duration.class)))
.thenReturn(Futures.immediateFuture(java.util.List.of(activeCollection)));
ListenableFuture<CollectionInfo> collectionInfoRequest = mock();
when(qdrantClient.getCollectionInfoAsync(activeCollection)).thenReturn(collectionInfoRequest);
when(embeddingClient.dimensions()).thenReturn(EMBEDDING_DIMENSIONS);
when(collectionInfoRequest.get(anyLong(), eq(TimeUnit.SECONDS)))
.thenThrow(new InterruptedException("validation interrupted"));
when(collectionInfoRequest.isDone()).thenReturn(false);

QdrantGitHubCollectionDiscovery discovery =
new QdrantGitHubCollectionDiscovery(qdrantClient, embeddingClient, new AppProperties());
discovery.discoverGitHubCollections();

verify(collectionInfoRequest).cancel(true);
assertEquals(java.util.List.of(), discovery.getDiscoveredCollections());
assertEquals(Status.DOWN, discovery.discoveryHealth().getStatus());
assertEquals("pending", discovery.discoveryHealth().getDetails().get("githubCollectionDiscovery"));
}

@Test
void interruptionDuringValidationRecoversOnRetry()
throws InterruptedException, ExecutionException, TimeoutException {
QdrantClient qdrantClient = mock(QdrantClient.class);
EmbeddingClient embeddingClient = mock(EmbeddingClient.class);
String activeCollection = GENERATION_PREFIX + "openai-java-chat";
ListenableFuture<CollectionInfo> interruptedCollectionInfoRequest = mock();
when(qdrantClient.listCollectionsAsync(any(java.time.Duration.class)))
.thenReturn(Futures.immediateFuture(java.util.List.of(activeCollection)));
when(qdrantClient.getCollectionInfoAsync(activeCollection))
.thenReturn(interruptedCollectionInfoRequest)
.thenReturn(Futures.immediateFuture(validCollectionInfo(EMBEDDING_DIMENSIONS)));
when(embeddingClient.dimensions()).thenReturn(EMBEDDING_DIMENSIONS);
when(interruptedCollectionInfoRequest.get(anyLong(), eq(TimeUnit.SECONDS)))
.thenThrow(new InterruptedException("validation interrupted"));
when(interruptedCollectionInfoRequest.isDone()).thenReturn(false);

QdrantGitHubCollectionDiscovery discovery =
new QdrantGitHubCollectionDiscovery(qdrantClient, embeddingClient, new AppProperties());
discovery.discoverGitHubCollections();
assertEquals(Status.DOWN, discovery.discoveryHealth().getStatus());
assertEquals("pending", discovery.discoveryHealth().getDetails().get("githubCollectionDiscovery"));
Thread.interrupted();

discovery.retryPendingDiscovery();
assertEquals(java.util.List.of(activeCollection), discovery.getDiscoveredCollections());
assertEquals(Status.UP, discovery.discoveryHealth().getStatus());
assertEquals("ready", discovery.discoveryHealth().getDetails().get("githubCollectionDiscovery"));
}

@Test
void interruptionDuringValidationRestoresInterruptStatus()
throws InterruptedException, ExecutionException, TimeoutException {
QdrantClient qdrantClient = mock(QdrantClient.class);
EmbeddingClient embeddingClient = mock(EmbeddingClient.class);
String activeCollection = GENERATION_PREFIX + "openai-java-chat";
when(qdrantClient.listCollectionsAsync(any(java.time.Duration.class)))
.thenReturn(Futures.immediateFuture(java.util.List.of(activeCollection)));
ListenableFuture<CollectionInfo> collectionInfoRequest = mock();
when(qdrantClient.getCollectionInfoAsync(activeCollection)).thenReturn(collectionInfoRequest);
when(embeddingClient.dimensions()).thenReturn(EMBEDDING_DIMENSIONS);
when(collectionInfoRequest.get(anyLong(), eq(TimeUnit.SECONDS)))
.thenThrow(new InterruptedException("validation interrupted"));
when(collectionInfoRequest.isDone()).thenReturn(false);

QdrantGitHubCollectionDiscovery discovery =
new QdrantGitHubCollectionDiscovery(qdrantClient, embeddingClient, new AppProperties());
try {
discovery.discoverGitHubCollections();
assertTrue(Thread.currentThread().isInterrupted());
} finally {
Thread.interrupted();
}
assertEquals("pending", discovery.discoveryHealth().getDetails().get("githubCollectionDiscovery"));
}

private static CollectionInfo validCollectionInfo(int denseDimensions) {
VectorParamsMap vectorParams = VectorParamsMap.newBuilder()
.putMap(
Expand Down