diff options
| -rw-r--r-- | configserver/src/main/java/com/yahoo/vespa/config/server/http/v2/ApplicationApiHandler.java | 11 | ||||
| -rw-r--r-- | dependency-versions/pom.xml | 2 |
2 files changed, 7 insertions, 6 deletions
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/http/v2/ApplicationApiHandler.java b/configserver/src/main/java/com/yahoo/vespa/config/server/http/v2/ApplicationApiHandler.java index ade63e8c90c..29f2125ac3c 100644 --- a/configserver/src/main/java/com/yahoo/vespa/config/server/http/v2/ApplicationApiHandler.java +++ b/configserver/src/main/java/com/yahoo/vespa/config/server/http/v2/ApplicationApiHandler.java @@ -93,12 +93,13 @@ public class ApplicationApiHandler extends SessionHandler { PartItem appPackagePart = parts.get(MULTIPART_APPLICATION_PACKAGE); compressedStream = createFromCompressedStream(appPackagePart.data(), appPackagePart.contentType(), maxApplicationPackageSize); } catch (IOException e) { - // Multipart exception happens when controller abandons the request due to other exceptions while deploying. - log.log(e instanceof MultiPartFormParser.MultiPartException ? FINE : WARNING, - "Unable to parse multipart in deploy from tenant '" + tenantName.value() + "': " + Exceptions.toMessageString(e)); - var message = "Deploy request from '" + tenantName.value() + "' contains invalid data: " + e.getMessage(); - log.log(INFO, message + ", parts: " + parts, e); + if (e instanceof MultiPartFormParser.MultiPartException) + log.log(INFO, "Unable to parse multipart in deploy from tenant '" + tenantName.value() + "': " + + Exceptions.toMessageString(e) + ". This is usually caused by controller abandoning request " + + "while streaming data to config server"); + else + log.log(INFO, message + ", parts: " + parts, e); throw new BadRequestException(message); } } else { diff --git a/dependency-versions/pom.xml b/dependency-versions/pom.xml index fa292a5b819..78c85607ea3 100644 --- a/dependency-versions/pom.xml +++ b/dependency-versions/pom.xml @@ -34,7 +34,7 @@ <!-- DO NOT UPGRADE THESE TO A NEW MAJOR VERSION WITHOUT CHECKING FOR BINARY COMPATIBILITY --> <aopalliance.vespa.version>1.0</aopalliance.vespa.version> <commons-logging.vespa.version>1.2</commons-logging.vespa.version> <!-- This version is exported by jdisc via jcl-over-slf4j. --> - <error-prone-annotations.vespa.version>2.22.0</error-prone-annotations.vespa.version> + <error-prone-annotations.vespa.version>2.23.0</error-prone-annotations.vespa.version> <guava.vespa.version>32.1.3-jre</guava.vespa.version> <guice.vespa.version>6.0.0</guice.vespa.version> <jackson2.vespa.version>2.15.3</jackson2.vespa.version> |