Fixes

Author: Tim-Brooks

server/src/main/java/org/elasticsearch/action/bulk/IncrementalBulkService.java

@@ -203,10 +203,12 @@ public void onFailure(Exception e) {
 
         @Override
         public void close() {
-            closed = true;
-            coordinatingOperation.close();
-            releasables.forEach(Releasable::close);
-            releasables.clear();
+            if (closed == false) {
+                closed = true;
+                coordinatingOperation.close();
+                releasables.forEach(Releasable::close);
+                releasables.clear();
+            }
         }
 
         private void shortCircuitDueToTopLevelFailure(List<DocWriteRequest<?>> items, Releasable releasable) {

server/src/main/java/org/elasticsearch/rest/action/document/RestBulkAction.java

@@ -247,7 +247,9 @@ public void handleChunk(RestChannel channel, ReleasableBytesReference chunk, boo
         @Override
         public void streamClose() {
             assert Transports.assertTransportThread();
-            shortCircuit();
+            if (shortCircuited == false) {
+                shortCircuit();
+            }
         }
 
         private void shortCircuit() {