Skip to content
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
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
3 changes: 0 additions & 3 deletions muted-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -376,9 +376,6 @@ tests:
- class: org.elasticsearch.xpack.esql.action.CrossClustersCancellationIT
method: testCancelSkipUnavailable
issue: https://github.com/elastic/elasticsearch/issues/121631
- class: org.elasticsearch.upgrades.UpgradeClusterClientYamlTestSuiteIT
method: test {p0=mixed_cluster/110_enrich/Enrich stats query smoke test for mixed cluster}
issue: https://github.com/elastic/elasticsearch/issues/121642
- class: org.elasticsearch.search.CrossClusterSearchUnavailableClusterIT
method: testSearchSkipUnavailable
issue: https://github.com/elastic/elasticsearch/issues/121497
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -41,12 +41,23 @@ protected LocalClusterStateRequest(TimeValue masterTimeout) {
*/
@UpdateForV10(owner = UpdateForV10.Owner.DISTRIBUTED_COORDINATION)
protected LocalClusterStateRequest(StreamInput in) throws IOException {
this(in, true);
}

/**
* This constructor exists solely for BwC purposes. It should exclusively be used by requests that used to extend
* {@link org.elasticsearch.action.support.master.MasterNodeReadRequest} and still need to be able to serialize incoming request.
*/
@UpdateForV10(owner = UpdateForV10.Owner.DISTRIBUTED_COORDINATION)
protected LocalClusterStateRequest(StreamInput in, boolean readLocal) throws IOException {
super(in);
masterTimeout = in.readTimeValue();
if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_15_0)) {
in.readVLong();
}
in.readBoolean();
if (readLocal) {
in.readBoolean();
}
}

@Override
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,8 @@ public Request(TimeValue masterNodeTimeout) {
*/
@UpdateForV10(owner = UpdateForV10.Owner.DATA_MANAGEMENT)
public Request(StreamInput in) throws IOException {
super(in);
// This request extended MasterNodeRequest instead of MasterNodeReadRequest, meaning that it didn't serialize the `local` field.
super(in, false);
}

@Override
Expand Down