diff options
author | Haakon Dybdahl <dybis@users.noreply.github.com> | 2017-01-26 12:17:25 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-01-26 12:17:25 +0100 |
commit | 18c8300ba9d3574400a54624cb40b698dc10467a (patch) | |
tree | 1e04496c6236c974850095de3824e9d96e24c419 /vespaclient-container-plugin | |
parent | 0b3a1b088dbe245b4b3e1cb8736ee9b6f21bdce2 (diff) | |
parent | 29e2f5bcd58d287bc6e18cac7247801f1945f52d (diff) |
Merge pull request #1610 from yahoo/dybdahl/silent-upgrade-3
Reduce number of error codes over http api, not yet live.
Diffstat (limited to 'vespaclient-container-plugin')
-rw-r--r-- | vespaclient-container-plugin/src/main/java/com/yahoo/vespa/http/server/ClientFeederV3.java | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/vespaclient-container-plugin/src/main/java/com/yahoo/vespa/http/server/ClientFeederV3.java b/vespaclient-container-plugin/src/main/java/com/yahoo/vespa/http/server/ClientFeederV3.java index d27ebc551d9..301b81f040c 100644 --- a/vespaclient-container-plugin/src/main/java/com/yahoo/vespa/http/server/ClientFeederV3.java +++ b/vespaclient-container-plugin/src/main/java/com/yahoo/vespa/http/server/ClientFeederV3.java @@ -133,7 +133,7 @@ class ClientFeederV3 { * We try 10 for now. This should only kick in with very massive feeding to few gateway nodes. */ if (feederSettings.denyIfBusy && threadsAvailableForFeeding.get() < -10) { - return new ErrorHttpResponse(429, "Gateway overloaded"); + return new ErrorHttpResponse(getOverloadReturnCode(request), "Gateway overloaded"); } InputStream inputStream = StreamReaderV3.unzipStreamIfNeeded(request); @@ -166,6 +166,13 @@ class ClientFeederV3 { } } + private int getOverloadReturnCode(HttpRequest request) { + if (request.getHeader(Headers.SILENTUPGRADE) != null ) { + return 299; + } + return 429; + } + private Optional<DocumentOperationMessageV3> pullMessageFromRequest( FeederSettings settings, InputStream requestInputStream, BlockingQueue<OperationStatus> repliesFromOldMessages) { while (true) { |