From eb7e2ae25fd525d93d893e66364280920f75d458 Mon Sep 17 00:00:00 2001
From: Jon Marius Venstad <venstad@gmail.com>
Date: Mon, 8 Nov 2021 08:06:24 +0100
Subject: Remove early acks after abort again

---
 .../document/restapi/resource/DocumentV1ApiHandler.java      | 12 +-----------
 1 file changed, 1 insertion(+), 11 deletions(-)

(limited to 'vespaclient-container-plugin')

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 9d1b1b966aa..a102e8fffd4 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
@@ -594,7 +594,6 @@ public class DocumentV1ApiHandler extends AbstractRequestHandler {
         private final AtomicLong documentsWritten = new AtomicLong();
         private final AtomicLong documentsFlushed = new AtomicLong();
         private final AtomicLong documentsAcked = new AtomicLong();
-        private final AtomicBoolean ackAll = new AtomicBoolean();
         private boolean documentsDone = false;
         private boolean first = true;
         private ContentChannel channel;
@@ -731,13 +730,8 @@ public class DocumentV1ApiHandler extends AbstractRequestHandler {
             }
         }
 
-        void ackAll() {
-            ackAll.set(true);
-            ackDocuments();
-        }
-
         void ackDocuments() {
-            while (documentsAcked.incrementAndGet() <= documentsFlushed.get() + FLUSH_SIZE || ackAll.get()) {
+            while (documentsAcked.incrementAndGet() <= documentsFlushed.get() + FLUSH_SIZE) {
                 CompletionHandler ack = acks.poll();
                 if (ack != null)
                     ack.completed();
@@ -1275,10 +1269,6 @@ public class DocumentV1ApiHandler extends AbstractRequestHandler {
                     });
 
                 }
-                @Override public void abort() {
-                    super.abort();
-                    response.ackAll();
-                }
             };
             if (parameters.getRemoteDataHandler() == null) {
                 parameters.setLocalDataHandler(new VisitorDataHandler() {
-- 
cgit v1.2.3