Skip to content

Commit 480d87d

Browse files
thecoopthecoop
authored
Merge branch '9.2' into 9.2-lucene_10_3_1
2 parents 879e245 + 6558c0e commit 480d87d

File tree

99 files changed

+742
-684
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

99 files changed

+742
-684
lines changed

‎docs/changelog/136119.yaml‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
pr: 136119
2+
summary: Fix logsdb settings provider mapping filters
3+
area: Logs
4+
type: bug
5+
issues:
6+
- 136107

‎server/src/internalClusterTest/java/org/elasticsearch/readiness/ReadinessClusterIT.java‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,6 @@ protected Collection<Class<? extends Plugin>> getMockPlugins() {
106106
return Collections.unmodifiableList(plugins);
107107
}
108108

109-
@AwaitsFix(bugUrl = "https://github.com/elastic/elasticsearch/issues/108613")
110109
public void testReadinessDuringRestarts() throws Exception {
111110
internalCluster().setBootstrapMasterNodeIndex(0);
112111
writeFileSettings(testJSON);
@@ -258,7 +257,7 @@ public void testNotReadyOnBadFileSettings() throws Exception {
258257

259258
FileSettingsService masterFileSettingsService = internalCluster().getInstance(FileSettingsService.class, masterNode);
260259

261-
assertTrue(masterFileSettingsService.watching());
260+
assertBusy(() -> assertTrue(masterFileSettingsService.watching()));
262261
assertFalse(dataFileSettingsService.watching());
263262

264263
boolean awaitSuccessful = savedClusterState.await(20, TimeUnit.SECONDS);
@@ -315,7 +314,7 @@ public void testReadyWhenMissingFileSettings() throws Exception {
315314

316315
FileSettingsService masterFileSettingsService = internalCluster().getInstance(FileSettingsService.class, masterNode);
317316

318-
assertTrue(masterFileSettingsService.watching());
317+
assertBusy(() -> assertTrue(masterFileSettingsService.watching()));
319318

320319
boolean awaitSuccessful = savedClusterState.v1().await(20, TimeUnit.SECONDS);
321320
assertTrue(awaitSuccessful);
@@ -369,7 +368,7 @@ public void testReadyAfterCorrectFileSettings() throws Exception {
369368

370369
FileSettingsService masterFileSettingsService = internalCluster().getInstance(FileSettingsService.class, masterNode);
371370

372-
assertTrue(masterFileSettingsService.watching());
371+
assertBusy(() -> assertTrue(masterFileSettingsService.watching()));
373372
assertFalse(dataFileSettingsService.watching());
374373

375374
boolean awaitSuccessful = savedClusterState.v1().await(20, TimeUnit.SECONDS);

‎server/src/main/java/org/elasticsearch/TransportVersions.java‎

Lines changed: 0 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -140,38 +140,6 @@ static TransportVersion def(int id) {
140140
public static final TransportVersion TIMEOUT_GET_PARAM_FOR_RESOLVE_CLUSTER = def(8_838_0_00);
141141
public static final TransportVersion INFERENCE_REQUEST_ADAPTIVE_RATE_LIMITING = def(8_839_0_00);
142142
public static final TransportVersion ML_INFERENCE_IBM_WATSONX_RERANK_ADDED = def(8_840_0_00);
143-
public static final TransportVersion ESQL_PROFILE_ASYNC_NANOS = def(9_007_00_0);
144-
public static final TransportVersion ESQL_LOOKUP_JOIN_SOURCE_TEXT = def(9_008_0_00);
145-
public static final TransportVersion SLM_UNHEALTHY_IF_NO_SNAPSHOT_WITHIN = def(9_010_0_00);
146-
public static final TransportVersion REMOVE_REPOSITORY_CONFLICT_MESSAGE = def(9_012_0_00);
147-
public static final TransportVersion ESQL_SERIALIZE_SOURCE_FUNCTIONS_WARNINGS = def(9_016_0_00);
148-
public static final TransportVersion ESQL_DRIVER_NODE_DESCRIPTION = def(9_017_0_00);
149-
public static final TransportVersion MULTI_PROJECT = def(9_018_0_00);
150-
public static final TransportVersion UNASSIGENEDINFO_RESHARD_ADDED = def(9_022_0_00);
151-
public static final TransportVersion MAX_OPERATION_SIZE_REJECTIONS_ADDED = def(9_024_0_00);
152-
public static final TransportVersion ESQL_THREAD_NAME_IN_DRIVER_PROFILE = def(9_027_0_00);
153-
public static final TransportVersion INDEX_RESHARDING_METADATA = def(9_031_0_00);
154-
public static final TransportVersion INDEXING_STATS_INCLUDES_RECENT_WRITE_LOAD = def(9_034_0_00);
155-
public static final TransportVersion INDEX_METADATA_INCLUDES_RECENT_WRITE_LOAD = def(9_036_0_00);
156-
public static final TransportVersion PROJECT_ID_IN_SNAPSHOT = def(9_040_0_00);
157-
public static final TransportVersion INDEX_STATS_AND_METADATA_INCLUDE_PEAK_WRITE_LOAD = def(9_041_0_00);
158-
public static final TransportVersion ESQL_REMOVE_AGGREGATE_TYPE = def(9_045_0_00);
159-
public static final TransportVersion ADD_PROJECT_ID_TO_DSL_ERROR_INFO = def(9_046_0_00);
160-
public static final TransportVersion REPO_ANALYSIS_COPY_BLOB = def(9_048_0_00);
161-
public static final TransportVersion DEAD_ESQL_DOCUMENTS_FOUND_AND_VALUES_LOADED = def(9_052_0_00);
162-
public static final TransportVersion DEAD_BATCHED_QUERY_EXECUTION_DELAYABLE_WRITABLE = def(9_053_0_00);
163-
public static final TransportVersion BATCHED_QUERY_EXECUTION_DELAYABLE_WRITABLE = def(9_057_0_00);
164-
public static final TransportVersion COMPRESS_DELAYABLE_WRITEABLE = def(9_059_0_00);
165-
public static final TransportVersion SYNONYMS_REFRESH_PARAM = def(9_060_0_00);
166-
public static final TransportVersion DOC_FIELDS_AS_LIST = def(9_061_0_00);
167-
public static final TransportVersion DENSE_VECTOR_OFF_HEAP_STATS = def(9_062_00_0);
168-
public static final TransportVersion PROJECT_METADATA_SETTINGS = def(9_066_0_00);
169-
public static final TransportVersion WRITE_LOAD_INCLUDES_BUFFER_WRITES = def(9_070_0_00);
170-
public static final TransportVersion FILE_SETTINGS_HEALTH_INFO = def(9_072_0_00);
171-
public static final TransportVersion ESQL_FIELD_ATTRIBUTE_DROP_TYPE = def(9_075_0_00);
172-
public static final TransportVersion ESQL_TIME_SERIES_SOURCE_STATUS = def(9_076_0_00);
173-
public static final TransportVersion NODES_STATS_SUPPORTS_MULTI_PROJECT = def(9_079_0_00);
174-
public static final TransportVersion ESQL_LIMIT_ROW_SIZE = def(9_085_0_00);
175143

176144
/*
177145
* STOP! READ THIS FIRST! No, really,

‎server/src/main/java/org/elasticsearch/action/search/QueryPhaseResultConsumer.java‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
import org.apache.logging.log4j.LogManager;
1313
import org.apache.logging.log4j.Logger;
1414
import org.apache.lucene.search.TopDocs;
15-
import org.elasticsearch.TransportVersions;
15+
import org.elasticsearch.TransportVersion;
1616
import org.elasticsearch.action.search.SearchPhaseController.TopDocsStats;
1717
import org.elasticsearch.common.breaker.CircuitBreaker;
1818
import org.elasticsearch.common.breaker.CircuitBreakingException;
@@ -668,9 +668,13 @@ record MergeResult(
668668
long estimatedSize
669669
) implements Writeable {
670670

671+
private static final TransportVersion BATCHED_QUERY_EXECUTION_DELAYABLE_WRITEABLE = TransportVersion.fromName(
672+
"batched_query_execution_delayable_writeable"
673+
);
674+
671675
static MergeResult readFrom(StreamInput in) throws IOException {
672676
return new MergeResult(List.of(), Lucene.readTopDocsIncludingShardIndex(in), in.readOptionalWriteable(i -> {
673-
if (i.getTransportVersion().onOrAfter(TransportVersions.BATCHED_QUERY_EXECUTION_DELAYABLE_WRITABLE)) {
677+
if (i.getTransportVersion().supports(BATCHED_QUERY_EXECUTION_DELAYABLE_WRITEABLE)) {
674678
return DelayableWriteable.delayed(InternalAggregations::readFrom, i);
675679
} else {
676680
return DelayableWriteable.referencing(InternalAggregations.readFrom(i));
@@ -684,9 +688,7 @@ public void writeTo(StreamOutput out) throws IOException {
684688
out.writeOptionalWriteable(
685689
reducedAggs == null
686690
? null
687-
: (out.getTransportVersion().onOrAfter(TransportVersions.BATCHED_QUERY_EXECUTION_DELAYABLE_WRITABLE)
688-
? reducedAggs
689-
: reducedAggs.expand())
691+
: (out.getTransportVersion().supports(BATCHED_QUERY_EXECUTION_DELAYABLE_WRITEABLE) ? reducedAggs : reducedAggs.expand())
690692
);
691693
out.writeVLong(estimatedSize);
692694
}

‎server/src/main/java/org/elasticsearch/action/synonyms/DeleteSynonymRuleAction.java‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99

1010
package org.elasticsearch.action.synonyms;
1111

12-
import org.elasticsearch.TransportVersions;
12+
import org.elasticsearch.TransportVersion;
1313
import org.elasticsearch.action.ActionRequestValidationException;
1414
import org.elasticsearch.action.ActionType;
1515
import org.elasticsearch.action.LegacyActionRequest;
@@ -31,6 +31,9 @@ public DeleteSynonymRuleAction() {
3131
}
3232

3333
public static class Request extends LegacyActionRequest {
34+
35+
private static final TransportVersion SYNONYMS_REFRESH_PARAM = TransportVersion.fromName("synonyms_refresh_param");
36+
3437
private final String synonymsSetId;
3538
private final String synonymRuleId;
3639
private final boolean refresh;
@@ -39,7 +42,7 @@ public Request(StreamInput in) throws IOException {
3942
super(in);
4043
this.synonymsSetId = in.readString();
4144
this.synonymRuleId = in.readString();
42-
if (in.getTransportVersion().onOrAfter(TransportVersions.SYNONYMS_REFRESH_PARAM)) {
45+
if (in.getTransportVersion().supports(SYNONYMS_REFRESH_PARAM)) {
4346
this.refresh = in.readBoolean();
4447
} else {
4548
this.refresh = true;
@@ -70,7 +73,7 @@ public void writeTo(StreamOutput out) throws IOException {
7073
super.writeTo(out);
7174
out.writeString(synonymsSetId);
7275
out.writeString(synonymRuleId);
73-
if (out.getTransportVersion().onOrAfter(TransportVersions.SYNONYMS_REFRESH_PARAM)) {
76+
if (out.getTransportVersion().supports(SYNONYMS_REFRESH_PARAM)) {
7477
out.writeBoolean(refresh);
7578
}
7679
}

‎server/src/main/java/org/elasticsearch/action/synonyms/PutSynonymRuleAction.java‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99

1010
package org.elasticsearch.action.synonyms;
1111

12-
import org.elasticsearch.TransportVersions;
12+
import org.elasticsearch.TransportVersion;
1313
import org.elasticsearch.action.ActionRequestValidationException;
1414
import org.elasticsearch.action.ActionType;
1515
import org.elasticsearch.action.LegacyActionRequest;
@@ -40,6 +40,9 @@ public PutSynonymRuleAction() {
4040
}
4141

4242
public static class Request extends LegacyActionRequest {
43+
44+
private static final TransportVersion SYNONYMS_REFRESH_PARAM = TransportVersion.fromName("synonyms_refresh_param");
45+
4346
private final String synonymsSetId;
4447
private final SynonymRule synonymRule;
4548
private final boolean refresh;
@@ -59,7 +62,7 @@ public Request(StreamInput in) throws IOException {
5962
super(in);
6063
this.synonymsSetId = in.readString();
6164
this.synonymRule = new SynonymRule(in);
62-
if (in.getTransportVersion().onOrAfter(TransportVersions.SYNONYMS_REFRESH_PARAM)) {
65+
if (in.getTransportVersion().supports(SYNONYMS_REFRESH_PARAM)) {
6366
this.refresh = in.readBoolean();
6467
} else {
6568
this.refresh = true;
@@ -105,7 +108,7 @@ public void writeTo(StreamOutput out) throws IOException {
105108
super.writeTo(out);
106109
out.writeString(synonymsSetId);
107110
synonymRule.writeTo(out);
108-
if (out.getTransportVersion().onOrAfter(TransportVersions.SYNONYMS_REFRESH_PARAM)) {
111+
if (out.getTransportVersion().supports(SYNONYMS_REFRESH_PARAM)) {
109112
out.writeBoolean(refresh);
110113
}
111114
}

‎server/src/main/java/org/elasticsearch/action/synonyms/PutSynonymsAction.java‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99

1010
package org.elasticsearch.action.synonyms;
1111

12-
import org.elasticsearch.TransportVersions;
12+
import org.elasticsearch.TransportVersion;
1313
import org.elasticsearch.action.ActionRequestValidationException;
1414
import org.elasticsearch.action.ActionType;
1515
import org.elasticsearch.action.LegacyActionRequest;
@@ -57,11 +57,13 @@ public static class Request extends LegacyActionRequest {
5757
PARSER.declareObjectArray(ConstructingObjectParser.constructorArg(), (p, c) -> SynonymRule.fromXContent(p), SYNONYMS_SET_FIELD);
5858
}
5959

60+
private static final TransportVersion SYNONYMS_REFRESH_PARAM = TransportVersion.fromName("synonyms_refresh_param");
61+
6062
public Request(StreamInput in) throws IOException {
6163
super(in);
6264
this.synonymsSetId = in.readString();
6365
this.synonymRules = in.readArray(SynonymRule::new, SynonymRule[]::new);
64-
if (in.getTransportVersion().onOrAfter(TransportVersions.SYNONYMS_REFRESH_PARAM)) {
66+
if (in.getTransportVersion().supports(SYNONYMS_REFRESH_PARAM)) {
6567
this.refresh = in.readBoolean();
6668
} else {
6769
this.refresh = false;
@@ -104,7 +106,7 @@ public void writeTo(StreamOutput out) throws IOException {
104106
super.writeTo(out);
105107
out.writeString(synonymsSetId);
106108
out.writeArray(synonymRules);
107-
if (out.getTransportVersion().onOrAfter(TransportVersions.SYNONYMS_REFRESH_PARAM)) {
109+
if (out.getTransportVersion().supports(SYNONYMS_REFRESH_PARAM)) {
108110
out.writeBoolean(refresh);
109111
}
110112
}

‎server/src/main/java/org/elasticsearch/action/synonyms/SynonymUpdateResponse.java‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99

1010
package org.elasticsearch.action.synonyms;
1111

12-
import org.elasticsearch.TransportVersions;
12+
import org.elasticsearch.TransportVersion;
1313
import org.elasticsearch.action.ActionResponse;
1414
import org.elasticsearch.action.admin.indices.analyze.ReloadAnalyzersResponse;
1515
import org.elasticsearch.common.io.stream.StreamInput;
@@ -32,12 +32,14 @@ public class SynonymUpdateResponse extends ActionResponse implements ToXContentO
3232
public static final String RELOAD_ANALYZERS_DETAILS_FIELD = "reload_analyzers_details";
3333
static final ReloadAnalyzersResponse EMPTY_RELOAD_ANALYZER_RESPONSE = new ReloadAnalyzersResponse(0, 0, 0, List.of(), Map.of());
3434

35+
private static final TransportVersion SYNONYMS_REFRESH_PARAM = TransportVersion.fromName("synonyms_refresh_param");
36+
3537
private final UpdateSynonymsResultStatus updateStatus;
3638
private final ReloadAnalyzersResponse reloadAnalyzersResponse;
3739

3840
public SynonymUpdateResponse(StreamInput in) throws IOException {
3941
this.updateStatus = in.readEnum(UpdateSynonymsResultStatus.class);
40-
if (in.getTransportVersion().onOrAfter(TransportVersions.SYNONYMS_REFRESH_PARAM)) {
42+
if (in.getTransportVersion().supports(SYNONYMS_REFRESH_PARAM)) {
4143
this.reloadAnalyzersResponse = in.readOptionalWriteable(ReloadAnalyzersResponse::new);
4244
} else {
4345
this.reloadAnalyzersResponse = new ReloadAnalyzersResponse(in);
@@ -72,7 +74,7 @@ public XContentBuilder toXContent(XContentBuilder builder, Params params) throws
7274
@Override
7375
public void writeTo(StreamOutput out) throws IOException {
7476
out.writeEnum(updateStatus);
75-
if (out.getTransportVersion().onOrAfter(TransportVersions.SYNONYMS_REFRESH_PARAM)) {
77+
if (out.getTransportVersion().supports(SYNONYMS_REFRESH_PARAM)) {
7678
out.writeOptionalWriteable(reloadAnalyzersResponse);
7779
} else {
7880
if (reloadAnalyzersResponse == null) {

‎server/src/main/java/org/elasticsearch/cluster/ClusterState.java‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -159,6 +159,8 @@ public CompatibilityVersions read(StreamInput in, String key) throws IOException
159159

160160
public static final long UNKNOWN_VERSION = -1;
161161

162+
private static final TransportVersion MULTI_PROJECT = TransportVersion.fromName("multi_project");
163+
162164
/**
163165
* Monotonically increasing on (and therefore uniquely identifies) <i>committed</i> states. However sometimes a state is created/applied
164166
* without committing it, for instance to add a {@link NoMasterBlockService#getNoMasterBlock}.
@@ -1291,7 +1293,7 @@ public static ClusterState readFrom(StreamInput in, DiscoveryNode localNode) thr
12911293
builder.version = in.readLong();
12921294
builder.uuid = in.readString();
12931295
builder.metadata = Metadata.readFrom(in);
1294-
if (in.getTransportVersion().onOrAfter(TransportVersions.MULTI_PROJECT)) {
1296+
if (in.getTransportVersion().supports(MULTI_PROJECT)) {
12951297
builder.routingTable = GlobalRoutingTable.readFrom(in);
12961298
} else {
12971299
final RoutingTable rt = RoutingTable.readFrom(in);
@@ -1317,7 +1319,7 @@ public void writeTo(StreamOutput out) throws IOException {
13171319
out.writeLong(version);
13181320
out.writeString(stateUUID);
13191321
metadata.writeTo(out);
1320-
if (out.getTransportVersion().onOrAfter(TransportVersions.MULTI_PROJECT)) {
1322+
if (out.getTransportVersion().supports(MULTI_PROJECT)) {
13211323
routingTable.writeTo(out);
13221324
} else {
13231325
routingTable.getRoutingTable().writeTo(out);

‎server/src/main/java/org/elasticsearch/cluster/SnapshotsInProgress.java‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1812,6 +1812,8 @@ public void writeTo(StreamOutput out) throws IOException {
18121812

18131813
private static final class SnapshotInProgressDiff implements NamedDiff<Custom> {
18141814

1815+
private static final TransportVersion PROJECT_ID_IN_SNAPSHOT = TransportVersion.fromName("project_id_in_snapshot");
1816+
18151817
private final SnapshotsInProgress after;
18161818

18171819
private final DiffableUtils.MapDiff<ProjectRepo, ByRepo, Map<ProjectRepo, ByRepo>> mapDiff;
@@ -1824,7 +1826,7 @@ private static final class SnapshotInProgressDiff implements NamedDiff<Custom> {
18241826
}
18251827

18261828
SnapshotInProgressDiff(StreamInput in) throws IOException {
1827-
if (in.getTransportVersion().before(TransportVersions.PROJECT_ID_IN_SNAPSHOT)) {
1829+
if (in.getTransportVersion().supports(PROJECT_ID_IN_SNAPSHOT) == false) {
18281830
final var oldMapDiff = DiffableUtils.readJdkMapDiff(
18291831
in,
18301832
DiffableUtils.getStringKeySerializer(),
@@ -1875,13 +1877,13 @@ public String getWriteableName() {
18751877
public void writeTo(StreamOutput out) throws IOException {
18761878
assert after != null : "should only write instances that were diffed from this node's state";
18771879
if (out.getTransportVersion().onOrAfter(DIFFABLE_VERSION)) {
1878-
if (out.getTransportVersion().before(TransportVersions.PROJECT_ID_IN_SNAPSHOT)) {
1880+
if (out.getTransportVersion().supports(PROJECT_ID_IN_SNAPSHOT) == false) {
18791881
DiffableUtils.jdkMapDiffWithUpdatedKeys(mapDiff, projectRepo -> {
18801882
if (ProjectId.DEFAULT.equals(projectRepo.projectId()) == false) {
18811883
final var message = "Cannot write instance with non-default project id "
18821884
+ projectRepo.projectId()
18831885
+ " to version before "
1884-
+ TransportVersions.PROJECT_ID_IN_SNAPSHOT;
1886+
+ PROJECT_ID_IN_SNAPSHOT;
18851887
assert false : message;
18861888
throw new IllegalArgumentException(message);
18871889
}

0 commit comments

Comments
 (0)