Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
5 changes: 5 additions & 0 deletions docs/changelog/139966.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
pr: 139966
summary: "[Inference API] Fix auth exception listener not called bug"
area: Inference
type: bug
issues: []
Original file line number Diff line number Diff line change
Expand Up @@ -116,6 +116,7 @@ public void getAuthorization(ActionListener<ElasticInferenceServiceAuthorization
} catch (Exception e) {
logger.warn(Strings.format("Retrieving the authorization information encountered an exception: %s", e));
requestCompleteLatch.countDown();
listener.onFailure(e);
}
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,9 @@
import static org.hamcrest.Matchers.instanceOf;
import static org.hamcrest.Matchers.is;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.anyString;
import static org.mockito.Mockito.doAnswer;
import static org.mockito.Mockito.doThrow;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
Expand Down Expand Up @@ -161,6 +163,44 @@ private void queueWebServerResponsesForRetries(String responseJson) {
}
}

public void testGetAuthorization_ReturnsFailure_WhenExceptionOccurs() throws IOException {
var senderFactory = HttpRequestSenderTests.createSenderFactory(threadPool, clientManager);
var eisGatewayUrl = getUrl(webServer);

var exceptionToThrow = new IllegalStateException("exception");
var logger = mock(Logger.class);
doThrow(exceptionToThrow).when(logger).debug(anyString());

var authHandler = new ElasticInferenceServiceAuthorizationRequestHandler(eisGatewayUrl, threadPool, logger);

try (var sender = senderFactory.createSender()) {
String responseJson = """
{
"models": [
{
"model_name": "model-a",
"task_types": ["embed/text/sparse", "chat"]
},
{
"model_name": "model-b",
"task_types": ["embed/text/dense"]
}
]
}
""";

webServer.enqueue(new MockResponse().setResponseCode(200).setBody(responseJson));

PlainActionFuture<ElasticInferenceServiceAuthorizationModel> listener = new PlainActionFuture<>();
authHandler.getAuthorization(listener, sender);

var exception = expectThrows(IllegalStateException.class, () -> listener.actionGet(TIMEOUT));
assertThat(exception, is(exceptionToThrow));

assertThat(webServer.requests().size(), is(0));
}
}

public void testGetAuthorization_ReturnsAValidResponse() throws IOException {
var senderFactory = HttpRequestSenderTests.createSenderFactory(threadPool, clientManager);
var eisGatewayUrl = getUrl(webServer);
Expand Down