Skip to content
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

Jump to bottom

feat(error-handling): return status 504 instead of 500 for triplestore timeout exception (DEV-749) #2046

Merged
merged 6 commits into from Apr 26, 2022
Merged

feat(error-handling): return status 504 instead of 500 for triplestore timeout exception (DEV-749) #2046

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
de7282d
feat: return 504 for triplestore timeout exception
BalduinLandolt Apr 21, 2022
e0ca005
docs: document new timeout error code
BalduinLandolt Apr 21, 2022
bebf6bd
feat: more error handling to get timeouts
BalduinLandolt Apr 21, 2022
d43f400
refactor: remove unnecessary log
BalduinLandolt Apr 25, 2022
f9542d9
feat: ensure timeout is correctly handled even if fuseki aborts durin…
BalduinLandolt Apr 26, 2022
8fee133
Merge branch 'main' into wip/DEV-749-return-specific-statuscode-for-t…
BalduinLandolt Apr 26, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 2 additions & 0 deletions docs/03-apis/api-v2/query-language.md
View file
Open in desktop
Expand Up @@ -73,6 +73,8 @@ HTTP POST to http://host/v2/searchextended/count
The response to a count query request is an object with one predicate,
`http://schema.org/numberOfItems`, with an integer value.

If a gravsearch query times out, a `504 Gateway Timeout` will be returned.

## Gravsearch and API Schemas

A Gravsearch query can be written in either of the two
Expand Down
7 changes: 4 additions & 3 deletions webapi/src/main/scala/org/knora/webapi/http/status/ApiStatusCodesV2.scala
View file
Open in desktop
Expand Up @@ -31,9 +31,10 @@ object ApiStatusCodesV2 {
case RequestRejectedException(_) => StatusCodes.BadRequest

// Subclasses of InternalServerException (which must be last in this group)
case UpdateNotPerformedException(_) => StatusCodes.Conflict
case InternalServerException(_) => StatusCodes.InternalServerError
case _ => StatusCodes.InternalServerError
case UpdateNotPerformedException(_) => StatusCodes.Conflict
case TriplestoreTimeoutException(_, _) => StatusCodes.GatewayTimeout
case InternalServerException(_) => StatusCodes.InternalServerError
case _ => StatusCodes.InternalServerError
}

}
13 changes: 9 additions & 4 deletions webapi/src/main/scala/org/knora/webapi/store/triplestore/http/HttpTriplestoreConnector.scala
View file
Open in desktop
Expand Up @@ -965,10 +965,11 @@ class HttpTriplestoreConnector extends Actor with ActorLogging with Instrumentat
Option(response.getEntity)
.map(responseEntity => EntityUtils.toString(responseEntity, StandardCharsets.UTF_8)) match {
case Some(responseEntityStr) =>
log.error(s"Triplestore responded with HTTP code $statusCode: $responseEntityStr")
throw TriplestoreResponseException(
s"Triplestore responded with HTTP code $statusCode: $responseEntityStr"
)
val msg = s"Triplestore responded with HTTP code $statusCode: $responseEntityStr"
log.error(msg)
if (statusCode == 503 && responseEntityStr.contains("Query timed out"))
throw TriplestoreTimeoutException(msg)
else throw TriplestoreResponseException(msg)

case None =>
log.error(s"Triplestore responded with HTTP code $statusCode")
Expand All @@ -995,6 +996,10 @@ class HttpTriplestoreConnector extends Actor with ActorLogging with Instrumentat
log.error(socketTimeoutException, message)
throw TriplestoreTimeoutException(message = message, e = socketTimeoutException, log = log)

case timeout: TriplestoreTimeoutException =>
log.warning("Can not recover from Triplestore Timeout")
throw timeout

case notFound: NotFoundException => throw notFound

case e: Exception =>
Expand Down