Merge pull request #36590 from vespa-engine/bjormel/return-Request-Timeout-on-UncheckedTimeoutException

Return `Request-Timeout` on `UncheckedTimeoutException`

Author: hmusum

configserver/src/main/java/com/yahoo/vespa/config/server/http/HttpHandler.java

@@ -1,6 +1,7 @@
 // Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.vespa.config.server.http;
 
+import com.yahoo.concurrent.UncheckedTimeoutException;
 import com.yahoo.config.provision.ApplicationLockException;
 import com.yahoo.config.provision.CertificateNotReadyException;
 import com.yahoo.config.provision.NodeAllocationException;
@@ -59,7 +60,7 @@ public HttpResponse handle(HttpRequest request) {
             return HttpErrorResponse.internalServerError(getMessage(e, request));
         } catch (UnknownVespaVersionException e) {
             return HttpErrorResponse.unknownVespaVersion(getMessage(e, request));
-        } catch (RequestTimeoutException e) {
+        } catch (RequestTimeoutException | UncheckedTimeoutException e) {
             return HttpErrorResponse.requestTimeout(getMessage(e, request));
         } catch (ApplicationLockException e) {
             return HttpErrorResponse.applicationLockFailure(getMessage(e, request));

configserver/src/test/java/com/yahoo/vespa/config/server/http/v2/SessionPrepareHandlerTest.java

@@ -262,6 +262,21 @@ public void test_that_nullpointerexception_gives_internal_server_error() throws
         assertEquals(exceptionMessage, data.get().field("message").asString());
     }
 
+    @Test
+    public void test_that_unchecked_timeout_exception_gives_request_timeout() throws IOException {
+        long sessionId = createSession(applicationId());
+        String exceptionMessage = "prepare timed out after build models step";
+        FailingSessionPrepareHandler handler = new FailingSessionPrepareHandler(SessionPrepareHandler.testContext(),
+                                                                                applicationRepository,
+                                                                                configserverConfig,
+                                                                                new UncheckedTimeoutException(exceptionMessage));
+        HttpResponse response = handler.handle(createTestRequest(pathPrefix, HttpRequest.Method.PUT, Cmd.PREPARED, sessionId));
+        assertEquals(408, response.getStatus());
+        Slime data = getData(response);
+        assertEquals(HttpErrorResponse.ErrorCode.REQUEST_TIMEOUT.name(), data.get().field("error-code").asString());
+        assertEquals(exceptionMessage, data.get().field("message").asString());
+    }
+
     @Test
     public void test_application_lock_failure() throws IOException {
         String exceptionMessage = "Timed out after waiting PT1M to acquire lock '/provision/v1/locks/foo/bar/default'";