Merge pull request #4485 from vespa-engine/bergum/same-doc-operation-ordering

Fix per doc-id race with multiple document updates against same document

1 files changed, 7 insertions, 3 deletions

diff --git a/vespa-http-client/src/main/java/com/yahoo/vespa/http/client/core/operationProcessor/OperationProcessor.java b/vespa-http-client/src/main/java/com/yahoo/vespa/http/client/core/operationProcessor/OperationProcessor.java
index 0a9fe72552c..5907694f55a 100644
--- a/vespa-http-client/src/main/java/com/yahoo/vespa/http/client/core/operationProcessor/OperationProcessor.java
+++ b/vespa-http-client/src/main/java/com/yahoo/vespa/http/client/core/operationProcessor/OperationProcessor.java
@@ -177,10 +177,14 @@ public class OperationProcessor {
             docSendInfoByOperationId.remove(endpointResult.getOperationId());
 
             String documentId = documentSendInfo.getDocument().getDocumentId();
-            inflightDocumentIds.remove(documentId);
-
+            /**
+             * If we got a pending operation against this document
+             * dont't remove it from inflightDocuments and send blocked document operation
+             */
             List<Document> blockedDocuments = blockedDocumentsByDocumentId.get(documentId);
-            if (! blockedDocuments.isEmpty()) {
+            if (blockedDocuments.isEmpty()) {
+                inflightDocumentIds.remove(documentId);
+            } else {
                 sendToClusters(blockedDocuments.remove(0));
             }
             return result;