Skip to content

Commit 7bfe8b5

Browse files
committed
ES hangs connection when parent is not specified in bulk index, closes elastic#641.
1 parent cdbfcb5 commit 7bfe8b5

File tree

1 file changed

+14
-0
lines changed

1 file changed

+14
-0
lines changed

modules/elasticsearch/src/main/java/org/elasticsearch/action/bulk/TransportBulkAction.java

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -207,6 +207,20 @@ private void executeBulk(final BulkRequest bulkRequest, final ActionListener<Bul
207207
}
208208
}
209209

210+
if (requestsByShard.isEmpty()) {
211+
// all failures, no shards to process, send a response
212+
if (bulkRequest.listenerThreaded()) {
213+
threadPool.execute(new Runnable() {
214+
@Override public void run() {
215+
listener.onResponse(new BulkResponse(responses, System.currentTimeMillis() - startTime));
216+
}
217+
});
218+
} else {
219+
listener.onResponse(new BulkResponse(responses, System.currentTimeMillis() - startTime));
220+
}
221+
return;
222+
}
223+
210224
final AtomicInteger counter = new AtomicInteger(requestsByShard.size());
211225
for (Map.Entry<ShardId, List<BulkItemRequest>> entry : requestsByShard.entrySet()) {
212226
final ShardId shardId = entry.getKey();

0 commit comments

Comments
 (0)