Skip to content

Move routing calculation #79394

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

Merged
elasticsearchmachine merged 11 commits into from
Oct 27, 2021
Merged

Move routing calculation #79394

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
5f7b114
Move routing calculation
nik9000 Oct 18, 2021
be98eef
Merge branch 'master' into index_routing_from_source_clean_1
nik9000 Oct 18, 2021
4b647dd
Merge commit '4e09186b3d3a20e97e44713d4200b22bc3cec332' into index_ro…
nik9000 Oct 27, 2021
e7f88b4
format
nik9000 Oct 27, 2021
30f769a
Merge commit '12ad399c488f0cc60e19b5e1b29c6d569cb4351a' into index_ro…
nik9000 Oct 27, 2021
b1068e4
Merge branch 'master' into index_routing_from_source_clean_1
nik9000 Oct 27, 2021
cac2f2e
Drop extra
nik9000 Oct 27, 2021
b994266
Assert
nik9000 Oct 27, 2021
43949b0
Merge branch 'master' into index_routing_from_source_clean_1
nik9000 Oct 27, 2021
bac79b1
Spotless
nik9000 Oct 27, 2021
69e5c77
Remove dropped
nik9000 Oct 27, 2021
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
6 changes: 6 additions & 0 deletions server/src/main/java/org/elasticsearch/action/DocWriteRequest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
import org.elasticsearch.action.index.IndexRequest;
import org.elasticsearch.action.support.IndicesOptions;
import org.elasticsearch.action.update.UpdateRequest;
import org.elasticsearch.cluster.routing.IndexRouting;
import org.elasticsearch.common.io.stream.StreamInput;
import org.elasticsearch.common.io.stream.StreamOutput;
import org.elasticsearch.common.lucene.uid.Versions;
Expand Down Expand Up @@ -140,6 +141,11 @@ public interface DocWriteRequest<T> extends IndicesRequest, Accountable {
*/
boolean isRequireAlias();

/**
* Pick the appropriate shard id to receive this request.
*/
int route(IndexRouting indexRouting);

/**
* Requested operation type to perform on the document
*/
Expand Down
10 changes: 1 addition & 9 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 @@ -525,7 +525,6 @@ protected void doRun() {

IndexRouting indexRouting = concreteIndices.routing(concreteIndex);

int shardId;
switch (docWriteRequest.opType()) {
case CREATE:
case INDEX:
Expand All @@ -534,24 +533,17 @@ protected void doRun() {
IndexRequest indexRequest = (IndexRequest) docWriteRequest;
indexRequest.resolveRouting(metadata);
indexRequest.process();
shardId = indexRouting.indexShard(
docWriteRequest.id(),
docWriteRequest.routing(),
indexRequest.getContentType(),
indexRequest.source()
);
break;
case UPDATE:
docWriteRequest.routing(metadata.resolveWriteIndexRouting(docWriteRequest.routing(), docWriteRequest.index()));
shardId = indexRouting.updateShard(docWriteRequest.id(), docWriteRequest.routing());
break;
case DELETE:
docWriteRequest.routing(metadata.resolveWriteIndexRouting(docWriteRequest.routing(), docWriteRequest.index()));
shardId = indexRouting.deleteShard(docWriteRequest.id(), docWriteRequest.routing());
break;
default:
throw new AssertionError("request type not supported: [" + docWriteRequest.opType() + "]");
}
int shardId = docWriteRequest.route(indexRouting);
List<BulkItemRequest> shardRequests = requestsByShard.computeIfAbsent(
new ShardId(concreteIndex, shardId),
shard -> new ArrayList<>()
Expand Down
6 changes: 6 additions & 0 deletions server/src/main/java/org/elasticsearch/action/delete/DeleteRequest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
import org.elasticsearch.action.CompositeIndicesRequest;
import org.elasticsearch.action.DocWriteRequest;
import org.elasticsearch.action.support.replication.ReplicatedWriteRequest;
import org.elasticsearch.cluster.routing.IndexRouting;
import org.elasticsearch.common.Strings;
import org.elasticsearch.common.io.stream.StreamInput;
import org.elasticsearch.common.io.stream.StreamOutput;
Expand Down Expand Up @@ -232,6 +233,11 @@ public boolean isRequireAlias() {
return false;
}

@Override
public int route(IndexRouting indexRouting) {
return indexRouting.deleteShard(id, routing);
}

@Override
public void writeTo(StreamOutput out) throws IOException {
super.writeTo(out);
Expand Down
7 changes: 7 additions & 0 deletions server/src/main/java/org/elasticsearch/action/index/IndexRequest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
import org.elasticsearch.action.support.replication.ReplicationRequest;
import org.elasticsearch.client.Requests;
import org.elasticsearch.cluster.metadata.Metadata;
import org.elasticsearch.cluster.routing.IndexRouting;
import org.elasticsearch.common.UUIDs;
import org.elasticsearch.common.bytes.BytesArray;
import org.elasticsearch.common.bytes.BytesReference;
Expand Down Expand Up @@ -722,6 +723,12 @@ public boolean isRequireAlias() {
return requireAlias;
}

@Override
public int route(IndexRouting indexRouting) {
Copy link
Copy Markdown
Contributor

@henningandersen henningandersen Oct 27, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Maybe add comment here that resolveRouting and process must be called prior to this.

Also I think we can cement parts of that by asserting that id != null?

Copy link
Copy Markdown
Member Author

@nik9000 nik9000 Oct 27, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍

I'd sort of been hoping to fold those two methods together. But that is a thing for another time.

assert id != null : "route must be called after process";
return indexRouting.indexShard(id, routing, contentType, source);
}

public IndexRequest setRequireAlias(boolean requireAlias) {
this.requireAlias = requireAlias;
return this;
Expand Down
6 changes: 6 additions & 0 deletions server/src/main/java/org/elasticsearch/action/update/UpdateRequest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
import org.elasticsearch.action.support.WriteRequest;
import org.elasticsearch.action.support.replication.ReplicationRequest;
import org.elasticsearch.action.support.single.instance.InstanceShardOperationRequest;
import org.elasticsearch.cluster.routing.IndexRouting;
import org.elasticsearch.common.Strings;
import org.elasticsearch.common.bytes.BytesReference;
import org.elasticsearch.common.io.stream.StreamInput;
Expand Down Expand Up @@ -830,6 +831,11 @@ public boolean isRequireAlias() {
return requireAlias;
}

@Override
public int route(IndexRouting indexRouting) {
return indexRouting.updateShard(id, routing);
}

public UpdateRequest setRequireAlias(boolean requireAlias) {
this.requireAlias = requireAlias;
return this;
Expand Down