From 522c7b5dedfc706fb5d4260431f9a8daa722fb31 Mon Sep 17 00:00:00 2001 From: Valerij Fredriksen Date: Fri, 21 Apr 2023 14:43:08 +0200 Subject: Code review fixes --- .../controller/restapi/application/ApplicationApiHandler.java | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'controller-server/src/main/java/com/yahoo') diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiHandler.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiHandler.java index 29fb095d8b5..d5029d2d8a5 100644 --- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiHandler.java +++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiHandler.java @@ -2050,10 +2050,9 @@ public class ApplicationApiHandler extends AuditLoggingRequestHandler { else numInitial++; } - if ((numInitial > 0 && numNoReport > 0) || - (numReadied > 0 && (numNoReport > 0 || numInitial > 0 || numDropped > 0)) || - (numStarted > 0 && (numInitial > 0 || numDropped > 0))) - return ErrorResponse.conflict("Inconsistent state, try restarting drop documents again"); + if (numInitial + numDropped > 0 && numNoReport + numReadied + numStarted > 0) + return ErrorResponse.conflict("Last dropping of documents may have failed to clear all documents due " + + "to concurrent topology changes, consider retrying"); Slime slime = new Slime(); Cursor root = slime.setObject(); -- cgit v1.2.3