forked from elastic/elasticsearch
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'main' into disable_ml_on_macos_x86_64
- Loading branch information
Showing
60 changed files
with
3,539 additions
and
524 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -7,6 +7,9 @@ | |
| { | ||
| "branch": "8.16" | ||
| }, | ||
| { | ||
| "branch": "8.17" | ||
| }, | ||
| { | ||
| "branch": "8.x" | ||
| }, | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,5 @@ | ||
| pr: 116765 | ||
| summary: Metrics for incremental bulk splits | ||
| area: Distributed | ||
| type: enhancement | ||
| issues: [] |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,6 @@ | ||
| pr: 117182 | ||
| summary: Change synthetic source logic for `constant_keyword` | ||
| area: Mapping | ||
| type: bug | ||
| issues: | ||
| - 117083 |
152 changes: 152 additions & 0 deletions
152
...terTest/java/org/elasticsearch/datastreams/action/ReindexDataStreamTransportActionIT.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,152 @@ | ||
| /* | ||
| * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one | ||
| * or more contributor license agreements. Licensed under the "Elastic License | ||
| * 2.0", the "GNU Affero General Public License v3.0 only", and the "Server Side | ||
| * Public License v 1"; you may not use this file except in compliance with, at | ||
| * your election, the "Elastic License 2.0", the "GNU Affero General Public | ||
| * License v3.0 only", or the "Server Side Public License, v 1". | ||
| */ | ||
|
|
||
| package org.elasticsearch.datastreams.action; | ||
|
|
||
| import org.elasticsearch.ResourceNotFoundException; | ||
| import org.elasticsearch.action.ActionListener; | ||
| import org.elasticsearch.action.ActionType; | ||
| import org.elasticsearch.action.DocWriteRequest; | ||
| import org.elasticsearch.action.DocWriteResponse; | ||
| import org.elasticsearch.action.admin.indices.rollover.RolloverRequestBuilder; | ||
| import org.elasticsearch.action.admin.indices.template.put.TransportPutComposableIndexTemplateAction; | ||
| import org.elasticsearch.action.datastreams.CreateDataStreamAction; | ||
| import org.elasticsearch.action.datastreams.ReindexDataStreamAction; | ||
| import org.elasticsearch.action.datastreams.ReindexDataStreamAction.ReindexDataStreamRequest; | ||
| import org.elasticsearch.action.datastreams.ReindexDataStreamAction.ReindexDataStreamResponse; | ||
| import org.elasticsearch.action.index.IndexRequest; | ||
| import org.elasticsearch.action.support.master.AcknowledgedResponse; | ||
| import org.elasticsearch.cluster.metadata.ComposableIndexTemplate; | ||
| import org.elasticsearch.cluster.metadata.Template; | ||
| import org.elasticsearch.datastreams.DataStreamsPlugin; | ||
| import org.elasticsearch.datastreams.task.ReindexDataStreamTask; | ||
| import org.elasticsearch.plugins.Plugin; | ||
| import org.elasticsearch.tasks.CancellableTask; | ||
| import org.elasticsearch.tasks.TaskManager; | ||
| import org.elasticsearch.test.ESIntegTestCase; | ||
| import org.elasticsearch.transport.TransportService; | ||
| import org.elasticsearch.xcontent.XContentType; | ||
|
|
||
| import java.util.Collection; | ||
| import java.util.List; | ||
| import java.util.Locale; | ||
| import java.util.Map; | ||
| import java.util.Optional; | ||
| import java.util.concurrent.CountDownLatch; | ||
| import java.util.concurrent.atomic.AtomicReference; | ||
|
|
||
| import static org.hamcrest.Matchers.equalTo; | ||
| import static org.hamcrest.Matchers.is; | ||
|
|
||
| public class ReindexDataStreamTransportActionIT extends ESIntegTestCase { | ||
|
|
||
| @Override | ||
| protected Collection<Class<? extends Plugin>> nodePlugins() { | ||
| return List.of(DataStreamsPlugin.class); | ||
| } | ||
|
|
||
| public void testNonExistentDataStream() { | ||
| String nonExistentDataStreamName = randomAlphaOfLength(50); | ||
| ReindexDataStreamRequest reindexDataStreamRequest = new ReindexDataStreamRequest(nonExistentDataStreamName); | ||
| assertThrows( | ||
| ResourceNotFoundException.class, | ||
| () -> client().execute(new ActionType<ReindexDataStreamResponse>(ReindexDataStreamAction.NAME), reindexDataStreamRequest) | ||
| .actionGet() | ||
| ); | ||
| } | ||
|
|
||
| public void testAlreadyUpToDateDataStream() throws Exception { | ||
| String dataStreamName = randomAlphaOfLength(50).toLowerCase(Locale.ROOT); | ||
| ReindexDataStreamRequest reindexDataStreamRequest = new ReindexDataStreamRequest(dataStreamName); | ||
| createDataStream(dataStreamName); | ||
| ReindexDataStreamResponse response = client().execute( | ||
| new ActionType<ReindexDataStreamResponse>(ReindexDataStreamAction.NAME), | ||
| reindexDataStreamRequest | ||
| ).actionGet(); | ||
| String persistentTaskId = response.getTaskId(); | ||
| assertThat(persistentTaskId, equalTo("reindex-data-stream-" + dataStreamName)); | ||
| AtomicReference<ReindexDataStreamTask> runningTask = new AtomicReference<>(); | ||
| for (TransportService transportService : internalCluster().getInstances(TransportService.class)) { | ||
| TaskManager taskManager = transportService.getTaskManager(); | ||
| Map<Long, CancellableTask> tasksMap = taskManager.getCancellableTasks(); | ||
| Optional<Map.Entry<Long, CancellableTask>> optionalTask = taskManager.getCancellableTasks() | ||
| .entrySet() | ||
| .stream() | ||
| .filter(entry -> entry.getValue().getType().equals("persistent")) | ||
| .filter( | ||
| entry -> entry.getValue() instanceof ReindexDataStreamTask | ||
| && persistentTaskId.equals((((ReindexDataStreamTask) entry.getValue()).getPersistentTaskId())) | ||
| ) | ||
| .findAny(); | ||
| optionalTask.ifPresent( | ||
| longCancellableTaskEntry -> runningTask.compareAndSet(null, (ReindexDataStreamTask) longCancellableTaskEntry.getValue()) | ||
| ); | ||
| } | ||
| ReindexDataStreamTask task = runningTask.get(); | ||
| assertNotNull(task); | ||
| assertThat(task.getStatus().complete(), equalTo(true)); | ||
| assertNull(task.getStatus().exception()); | ||
| assertThat(task.getStatus().pending(), equalTo(0)); | ||
| assertThat(task.getStatus().inProgress(), equalTo(0)); | ||
| assertThat(task.getStatus().errors().size(), equalTo(0)); | ||
| } | ||
|
|
||
| private void createDataStream(String dataStreamName) { | ||
| final TransportPutComposableIndexTemplateAction.Request putComposableTemplateRequest = | ||
| new TransportPutComposableIndexTemplateAction.Request("my-template"); | ||
| putComposableTemplateRequest.indexTemplate( | ||
| ComposableIndexTemplate.builder() | ||
| .indexPatterns(List.of(dataStreamName)) | ||
| .dataStreamTemplate(new ComposableIndexTemplate.DataStreamTemplate(false, false)) | ||
| .template(Template.builder().build()) | ||
| .build() | ||
| ); | ||
| final AcknowledgedResponse putComposableTemplateResponse = safeGet( | ||
| client().execute(TransportPutComposableIndexTemplateAction.TYPE, putComposableTemplateRequest) | ||
| ); | ||
| assertThat(putComposableTemplateResponse.isAcknowledged(), is(true)); | ||
|
|
||
| final CreateDataStreamAction.Request createDataStreamRequest = new CreateDataStreamAction.Request( | ||
| TEST_REQUEST_TIMEOUT, | ||
| TEST_REQUEST_TIMEOUT, | ||
| dataStreamName | ||
| ); | ||
| final AcknowledgedResponse createDataStreamResponse = safeGet( | ||
| client().execute(CreateDataStreamAction.INSTANCE, createDataStreamRequest) | ||
| ); | ||
| assertThat(createDataStreamResponse.isAcknowledged(), is(true)); | ||
| indexDocs(dataStreamName); | ||
| safeGet(new RolloverRequestBuilder(client()).setRolloverTarget(dataStreamName).lazy(false).execute()); | ||
| indexDocs(dataStreamName); | ||
| safeGet(new RolloverRequestBuilder(client()).setRolloverTarget(dataStreamName).lazy(false).execute()); | ||
| } | ||
|
|
||
| private void indexDocs(String dataStreamName) { | ||
| int docs = randomIntBetween(5, 10); | ||
| CountDownLatch countDownLatch = new CountDownLatch(docs); | ||
| for (int i = 0; i < docs; i++) { | ||
| var indexRequest = new IndexRequest(dataStreamName).opType(DocWriteRequest.OpType.CREATE); | ||
| final String doc = "{ \"@timestamp\": \"2099-05-06T16:21:15.000Z\", \"message\": \"something cool happened\" }"; | ||
| indexRequest.source(doc, XContentType.JSON); | ||
| client().index(indexRequest, new ActionListener<>() { | ||
| @Override | ||
| public void onResponse(DocWriteResponse docWriteResponse) { | ||
| countDownLatch.countDown(); | ||
| } | ||
|
|
||
| @Override | ||
| public void onFailure(Exception e) { | ||
| fail("Indexing request should have succeeded eventually, failed with " + e.getMessage()); | ||
| } | ||
| }); | ||
| } | ||
| safeAwait(countDownLatch); | ||
| } | ||
|
|
||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.