Skip to content

A dropped IndexRequest should return an IndexResponse, not an UpdateResponse #100012

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 2 commits into from
Closed

A dropped IndexRequest should return an IndexResponse, not an UpdateResponse #100012

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b357de4
A dropped IndexRequest should return an IndexResponse, not an UpdateR…
romseygeek Sep 28, 2023
1cab3ba
Need to set shard info to avoid an NPE
romseygeek Sep 28, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 10 additions & 14 deletions server/src/main/java/org/elasticsearch/action/bulk/TransportBulkAction.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,13 +26,13 @@
import org.elasticsearch.action.admin.indices.create.CreateIndexRequest;
import org.elasticsearch.action.admin.indices.create.CreateIndexResponse;
import org.elasticsearch.action.index.IndexRequest;
import org.elasticsearch.action.index.IndexResponse;
import org.elasticsearch.action.ingest.IngestActionForwarder;
import org.elasticsearch.action.support.ActionFilters;
import org.elasticsearch.action.support.HandledTransportAction;
import org.elasticsearch.action.support.WriteResponse;
import org.elasticsearch.action.support.replication.ReplicationResponse;
import org.elasticsearch.action.update.UpdateRequest;
import org.elasticsearch.action.update.UpdateResponse;
import org.elasticsearch.client.internal.node.NodeClient;
import org.elasticsearch.cluster.ClusterState;
import org.elasticsearch.cluster.ClusterStateObserver;
Expand Down Expand Up @@ -932,20 +932,16 @@ synchronized void markItemAsDropped(int slot) {
IndexRequest indexRequest = getIndexWriteRequest(bulkRequest.requests().get(slot));
failedSlots.set(slot);
final String id = indexRequest.id() == null ? DROPPED_ITEM_WITH_AUTO_GENERATED_ID : indexRequest.id();
itemResponses.add(
BulkItemResponse.success(
slot,
indexRequest.opType(),
new UpdateResponse(
new ShardId(indexRequest.index(), IndexMetadata.INDEX_UUID_NA_VALUE, 0),
id,
SequenceNumbers.UNASSIGNED_SEQ_NO,
SequenceNumbers.UNASSIGNED_PRIMARY_TERM,
indexRequest.version(),
DocWriteResponse.Result.NOOP
)
)
IndexResponse ir = new IndexResponse(
new ShardId(indexRequest.index(), IndexMetadata.INDEX_UUID_NA_VALUE, 0),
id,
SequenceNumbers.UNASSIGNED_SEQ_NO,
SequenceNumbers.UNASSIGNED_PRIMARY_TERM,
indexRequest.version(),
DocWriteResponse.Result.NOOP
);
ir.setShardInfo(new ReplicationResponse.ShardInfo(0, 0));
itemResponses.add(BulkItemResponse.success(slot, indexRequest.opType(), ir));
}

synchronized void markItemAsFailed(int slot, Exception e) {
Expand Down
8 changes: 4 additions & 4 deletions server/src/main/java/org/elasticsearch/action/index/IndexResponse.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,12 +39,12 @@ public IndexResponse(ShardId shardId, String id, long seqNo, long primaryTerm, l
this(shardId, id, seqNo, primaryTerm, version, created ? Result.CREATED : Result.UPDATED);
}

private IndexResponse(ShardId shardId, String id, long seqNo, long primaryTerm, long version, Result result) {
super(shardId, id, seqNo, primaryTerm, version, assertCreatedOrUpdated(result));
public IndexResponse(ShardId shardId, String id, long seqNo, long primaryTerm, long version, Result result) {
super(shardId, id, seqNo, primaryTerm, version, assertCreatedOrUpdatedOrNoop(result));
}

private static Result assertCreatedOrUpdated(Result result) {
assert result == Result.CREATED || result == Result.UPDATED;
private static Result assertCreatedOrUpdatedOrNoop(Result result) {
assert result == Result.CREATED || result == Result.UPDATED || result == Result.NOOP;
return result;
}

Expand Down