aboutsummaryrefslogtreecommitdiffstats
path: root/vespaclient-container-plugin
diff options
context:
space:
mode:
authorJon Marius Venstad <venstad@gmail.com>2021-11-08 08:06:24 +0100
committerJon Marius Venstad <venstad@gmail.com>2021-11-08 08:06:24 +0100
commiteb7e2ae25fd525d93d893e66364280920f75d458 (patch)
tree184123e1d5c88fe5f514d6728156b8c69c2b0a76 /vespaclient-container-plugin
parent4a1572d2b8e91d51127419f72ebfda6d5d8005fc (diff)
Remove early acks after abort again
Diffstat (limited to 'vespaclient-container-plugin')
-rw-r--r--vespaclient-container-plugin/src/main/java/com/yahoo/document/restapi/resource/DocumentV1ApiHandler.java12
1 files changed, 1 insertions, 11 deletions
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() {