Skip to content

Return 503 for unavailable downstream service #4230

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
king-407 wants to merge 1 commit into
base: main
Choose a base branch
from
+22 −1
Open

Return 503 for unavailable downstream service #4230

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
13 changes: 13 additions & 0 deletions ...er-webflux/src/main/java/org/springframework/cloud/gateway/filter/NettyRoutingFilter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,9 @@

package org.springframework.cloud.gateway.filter;

import java.net.ConnectException;
import java.net.URI;
import java.net.UnknownHostException;
import java.time.Duration;
import java.util.List;
import java.util.Objects;
Expand Down Expand Up @@ -199,9 +201,20 @@ public Mono<Void> filter(ServerWebExchange exchange, GatewayFilterChain chain) {
th -> new ResponseStatusException(HttpStatus.GATEWAY_TIMEOUT, th.getMessage(), th));
}

responseFlux = responseFlux.onErrorMap(NettyRoutingFilter::isUnavailable,
th -> new ResponseStatusException(HttpStatus.SERVICE_UNAVAILABLE, th.getMessage(), th));

return responseFlux.then(chain.filter(exchange));
}

private static boolean isUnavailable(Throwable throwable) {
if (throwable instanceof ConnectException || throwable instanceof UnknownHostException) {
return true;
}
Throwable cause = throwable.getCause();
return cause != null && cause != throwable && isUnavailable(cause);
}

protected ByteBuf getByteBuf(DataBuffer dataBuffer) {
if (dataBuffer instanceof NettyDataBuffer) {
NettyDataBuffer buffer = (NettyDataBuffer) dataBuffer;
Expand Down
10 changes: 9 additions & 1 deletion ...est/java/org/springframework/cloud/gateway/filter/NettyRoutingFilterIntegrationTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,8 +125,16 @@ public void shouldApplyConnectTimeoutPerRoute() {
.uri("/connect/delay/2")
.exchange()
.expectStatus()
.isEqualTo(HttpStatus.INTERNAL_SERVER_ERROR)
.isEqualTo(HttpStatus.SERVICE_UNAVAILABLE)
.expectBody()
.jsonPath("$.status")
.isEqualTo(String.valueOf(HttpStatus.SERVICE_UNAVAILABLE.value()))
.jsonPath("$.error")
.isEqualTo(HttpStatus.SERVICE_UNAVAILABLE.getReasonPhrase())
.jsonPath("$.path")
.isEqualTo("/connect/delay/2")
.jsonPath("$.message")
.exists()
.jsonPath("$.message")
.value(containsString("Connection refused"));

Expand Down