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

better error message on too-large chunked response [risk: low] #686

Merged
merged 2 commits into from
Nov 14, 2018
Merged

better error message on too-large chunked response [risk: low] #686

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c2be226
better error message on too-large chunked response
davidangb Nov 12, 2018
3119d7c
more human-readable size value
davidangb Nov 13, 2018
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: 6 additions & 0 deletions src/main/scala/org/broadinstitute/dsde/firecloud/FireCloudConfig.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -196,4 +196,10 @@ object FireCloudConfig {
val entityWorkspaceName: Option[String] = if (metrics.hasPath("entityWorkspaceName")) Some(metrics.getString("entityWorkspaceName")) else None
val libraryNamespaces: List[String] = metrics.getStringList("libraryWorkspaceNamespace").asScala.toList
}

object Spray {
private val spray = config.getConfig("spray")
// grab a copy of this Spray setting to use when displaying an error message
lazy val chunkLimit = spray.getString("can.client.response-chunk-aggregation-limit")
}
}
13 changes: 12 additions & 1 deletion src/main/scala/org/broadinstitute/dsde/firecloud/HttpClient.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,11 @@ object HttpClient {

case class PerformExternalRequest(requestCompression: Boolean, request: HttpRequest)

lazy val chunkLimitDisplay = FireCloudConfig.Spray.chunkLimit
.replace("m", "MB")
.replace("k", "KB")


def props(requestContext: RequestContext): Props = Props(new HttpClient(requestContext))

def createJsonHttpEntity(json: String) = {
Expand Down Expand Up @@ -63,8 +68,14 @@ class HttpClient (requestContext: RequestContext) extends Actor
case Success(response) =>
log.debug("Got response: " + response)
context.parent ! RequestComplete(response)
case Failure(re:RuntimeException) if re.getMessage.startsWith("sendReceive doesn't support chunked responses") =>
val message = s"The response payload was over ${HttpClient.chunkLimitDisplay} and cannot be processed. " +
s"Original request url: ${externalRequest.uri.toString}"
val customException = new FireCloudException(message, re)
log.error(message, customException)
context.parent ! RequestCompleteWithErrorReport(InternalServerError, message, customException)
case Failure(error) =>
val message = s"External request failed to ${externalRequest.uri.toString()}"
val message = s"External request failed to ${externalRequest.uri.toString()} - ${error.getMessage}"
val customException = new FireCloudException(message, error)

log.error(message, customException)
Expand Down