Merge pull request #14712 from vespa-engine/jonmv/expose-insufficient-storage-in-async-doc-v1

Separate error code for insufficient storage

4 files changed, 26 insertions, 1 deletions

diff --git a/vespaclient-container-plugin/src/main/java/com/yahoo/document/restapi/DocumentOperationExecutor.java b/vespaclient-container-plugin/src/main/java/com/yahoo/document/restapi/DocumentOperationExecutor.java
index 8b0c966c46f..d56c8c1524e 100644
--- a/vespaclient-container-plugin/src/main/java/com/yahoo/document/restapi/DocumentOperationExecutor.java
+++ b/vespaclient-container-plugin/src/main/java/com/yahoo/document/restapi/DocumentOperationExecutor.java
@@ -52,8 +52,9 @@ public interface DocumentOperationExecutor {
         NOT_FOUND,
         PRECONDITION_FAILED,
         BAD_REQUEST,
+        ERROR,
         TIMEOUT,
-        ERROR;
+        INSUFFICIENT_STORAGE;
     }
 
 
diff --git a/vespaclient-container-plugin/src/main/java/com/yahoo/document/restapi/DocumentOperationExecutorImpl.java b/vespaclient-container-plugin/src/main/java/com/yahoo/document/restapi/DocumentOperationExecutorImpl.java
index 72e28d15e4b..7074d363316 100644
--- a/vespaclient-container-plugin/src/main/java/com/yahoo/document/restapi/DocumentOperationExecutorImpl.java
+++ b/vespaclient-container-plugin/src/main/java/com/yahoo/document/restapi/DocumentOperationExecutorImpl.java
@@ -55,6 +55,7 @@ import java.util.stream.Stream;
 
 import static com.yahoo.document.restapi.DocumentOperationExecutor.ErrorType.BAD_REQUEST;
 import static com.yahoo.document.restapi.DocumentOperationExecutor.ErrorType.ERROR;
+import static com.yahoo.document.restapi.DocumentOperationExecutor.ErrorType.INSUFFICIENT_STORAGE;
 import static com.yahoo.document.restapi.DocumentOperationExecutor.ErrorType.NOT_FOUND;
 import static com.yahoo.document.restapi.DocumentOperationExecutor.ErrorType.OVERLOAD;
 import static com.yahoo.document.restapi.DocumentOperationExecutor.ErrorType.PRECONDITION_FAILED;
@@ -272,6 +273,8 @@ public class DocumentOperationExecutorImpl implements DocumentOperationExecutor
                 return NOT_FOUND;
             case CONDITION_FAILED:
                 return PRECONDITION_FAILED;
+            case INSUFFICIENT_STORAGE:
+                return INSUFFICIENT_STORAGE;
             default:
                 log.log(WARNING, "Unexpected response outcome: " + outcome);
             case ERROR: // intentional fallthrough
diff --git a/vespaclient-container-plugin/src/main/java/com/yahoo/document/restapi/resource/DocumentV1ApiHandler.java b/vespaclient-container-plugin/src/main/java/com/yahoo/document/restapi/resource/DocumentV1ApiHandler.java
index ea99c5bf762..2754d7ee627 100644
--- a/vespaclient-container-plugin/src/main/java/com/yahoo/document/restapi/resource/DocumentV1ApiHandler.java
+++ b/vespaclient-container-plugin/src/main/java/com/yahoo/document/restapi/resource/DocumentV1ApiHandler.java
@@ -350,6 +350,9 @@ public class DocumentV1ApiHandler extends AbstractRequestHandler {
             case TIMEOUT:
                 timeout(request, message, root, handler);
                 break;
+            case INSUFFICIENT_STORAGE:
+                insufficientStorage(request, message, root, handler);
+                break;
             default:
                 log.log(WARNING, "Unexpected error type '" + type + "'");
             case ERROR: // intentional fallthrough
@@ -441,6 +444,12 @@ public class DocumentV1ApiHandler extends AbstractRequestHandler {
         return respond(Response.Status.GATEWAY_TIMEOUT, root, handler);
     }
 
+    private static ContentChannel insufficientStorage(HttpRequest request, String message, Cursor root, ResponseHandler handler) {
+        log.log(FINE, () -> "Insufficient storage for " + request.getMethod() + " " + request.getUri().getRawPath() + ": " + message);
+        root.setString("message", message);
+        return respond(Response.Status.INSUFFICIENT_STORAGE, root, handler);
+    }
+
     private static ContentChannel respond(Inspector root, ResponseHandler handler) {
         return respond(200, root, handler);
     }
diff --git a/vespaclient-container-plugin/src/test/java/com/yahoo/document/restapi/resource/DocumentV1ApiTest.java b/vespaclient-container-plugin/src/test/java/com/yahoo/document/restapi/resource/DocumentV1ApiTest.java
index 9554fa0a913..c6b611ed3c7 100644
--- a/vespaclient-container-plugin/src/test/java/com/yahoo/document/restapi/resource/DocumentV1ApiTest.java
+++ b/vespaclient-container-plugin/src/test/java/com/yahoo/document/restapi/resource/DocumentV1ApiTest.java
@@ -37,6 +37,7 @@ import java.util.Optional;
 
 import static com.yahoo.document.restapi.DocumentOperationExecutor.ErrorType.BAD_REQUEST;
 import static com.yahoo.document.restapi.DocumentOperationExecutor.ErrorType.ERROR;
+import static com.yahoo.document.restapi.DocumentOperationExecutor.ErrorType.INSUFFICIENT_STORAGE;
 import static com.yahoo.document.restapi.DocumentOperationExecutor.ErrorType.OVERLOAD;
 import static com.yahoo.document.restapi.DocumentOperationExecutor.ErrorType.PRECONDITION_FAILED;
 import static com.yahoo.document.restapi.DocumentOperationExecutor.ErrorType.TIMEOUT;
@@ -309,6 +310,17 @@ public class DocumentV1ApiTest {
                        response.readAll());
         assertEquals(504, response.getStatus());
 
+        // INSUFFICIENT_STORAGE is a 504
+        response = driver.sendRequest("http://localhost/document/v1/space/music/number/1/two");
+        executor.lastOperationContext().error(INSUFFICIENT_STORAGE, "disk full");
+        assertSameJson("{" +
+                       "  \"pathId\": \"/document/v1/space/music/number/1/two\"," +
+                       "  \"id\": \"id:space:music:n=1:two\"," +
+                       "  \"message\": \"disk full\"" +
+                       "}",
+                       response.readAll());
+        assertEquals(507, response.getStatus());
+
         // OVERLOAD is a 429
         response = driver.sendRequest("http://localhost/document/v1/space/music/number/1/two");
         executor.lastOperationContext().error(OVERLOAD, "overload");