Retry shard movements during ESQL query #126653
There are no files selected for viewing
This file contains hidden or 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: 126653 | ||
| summary: Retry shard movements during ESQL query | ||
| area: ES|QL | ||
| type: enhancement | ||
| issues: [] |
This file contains hidden or 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 hidden or 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 hidden or 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 hidden or 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,159 @@ | ||
| /* | ||
| * 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; you may not use this file except in compliance with the Elastic License | ||
| * 2.0. | ||
| */ | ||
|
|
||
| package org.elasticsearch.xpack.esql.plugin; | ||
|
|
||
| import org.elasticsearch.action.index.IndexRequest; | ||
| import org.elasticsearch.action.support.WriteRequest; | ||
| import org.elasticsearch.cluster.metadata.IndexMetadata; | ||
| import org.elasticsearch.common.settings.Settings; | ||
| import org.elasticsearch.common.util.CollectionUtils; | ||
| import org.elasticsearch.compute.operator.exchange.ExchangeService; | ||
| import org.elasticsearch.plugins.Plugin; | ||
| import org.elasticsearch.test.transport.MockTransportService; | ||
| import org.elasticsearch.transport.TransportService; | ||
| import org.elasticsearch.xpack.esql.action.AbstractEsqlIntegTestCase; | ||
| import org.elasticsearch.xpack.esql.action.EsqlQueryResponse; | ||
|
|
||
| import java.util.Collection; | ||
| import java.util.concurrent.atomic.AtomicBoolean; | ||
| import java.util.concurrent.atomic.LongAdder; | ||
|
|
||
| import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertAcked; | ||
| import static org.elasticsearch.xpack.esql.EsqlTestUtils.as; | ||
| import static org.elasticsearch.xpack.esql.EsqlTestUtils.getValuesList; | ||
| import static org.hamcrest.Matchers.greaterThan; | ||
| import static org.hamcrest.Matchers.hasSize; | ||
|
|
||
| public class DataNodeRequestSenderIT extends AbstractEsqlIntegTestCase { | ||
|
There was a problem hiding this comment. Can we make this test similar to SearchWhileRelocatingIT? We continue running ES|QL on one thread while moving shards back and forth between two sets of nodes. |
||
|
|
||
| @Override | ||
| protected Collection<Class<? extends Plugin>> nodePlugins() { | ||
| return CollectionUtils.appendToCopy(super.nodePlugins(), MockTransportService.TestPlugin.class); | ||
| } | ||
|
|
||
| public void testSearchWhileRelocating() throws InterruptedException { | ||
| internalCluster().ensureAtLeastNumDataNodes(3); | ||
| var primaries = randomIntBetween(1, 10); | ||
| var replicas = randomIntBetween(0, 1); | ||
|
|
||
| indicesAdmin().prepareCreate("index-1").setSettings(indexSettings(primaries, replicas)).get(); | ||
|
|
||
| var docs = randomIntBetween(10, 100); | ||
| var bulk = client().prepareBulk("index-1").setRefreshPolicy(WriteRequest.RefreshPolicy.IMMEDIATE); | ||
| for (int i = 0; i < docs; i++) { | ||
| bulk.add(new IndexRequest().source("key", "value-1")); | ||
| } | ||
| bulk.get(); | ||
|
|
||
| // start background searches | ||
| var stopped = new AtomicBoolean(false); | ||
| var queries = new LongAdder(); | ||
| var threads = new Thread[randomIntBetween(1, 5)]; | ||
| for (int i = 0; i < threads.length; i++) { | ||
| threads[i] = new Thread(() -> { | ||
| while (stopped.get() == false) { | ||
| try (EsqlQueryResponse resp = run("FROM index-1")) { | ||
| assertThat(getValuesList(resp), hasSize(docs)); | ||
| } | ||
| queries.increment(); | ||
| } | ||
| }); | ||
| } | ||
| for (Thread thread : threads) { | ||
| thread.start(); | ||
| } | ||
|
|
||
| // start shard movements | ||
| var rounds = randomIntBetween(1, 10); | ||
| var names = internalCluster().getNodeNames(); | ||
| for (int i = 0; i < rounds; i++) { | ||
| for (String name : names) { | ||
| client().admin() | ||
| .cluster() | ||
| .prepareUpdateSettings(TEST_REQUEST_TIMEOUT, TEST_REQUEST_TIMEOUT) | ||
| .setPersistentSettings(Settings.builder().put("cluster.routing.allocation.exclude._name", name)) | ||
| .get(); | ||
|
|
||
| ensureGreen("index-1"); | ||
| Thread.yield(); | ||
| } | ||
| } | ||
|
|
||
| stopped.set(true); | ||
| for (Thread thread : threads) { | ||
| thread.join(10_000); | ||
| } | ||
|
|
||
| client().admin() | ||
| .cluster() | ||
| .prepareUpdateSettings(TEST_REQUEST_TIMEOUT, TEST_REQUEST_TIMEOUT) | ||
| .setPersistentSettings(Settings.builder().putNull("cluster.routing.allocation.exclude._name")) | ||
| .get(); | ||
| assertThat(queries.sum(), greaterThan((long) threads.length)); | ||
| } | ||
|
|
||
| public void testRetryOnShardMovement() { | ||
| internalCluster().ensureAtLeastNumDataNodes(2); | ||
|
|
||
| assertAcked( | ||
| client().admin() | ||
| .indices() | ||
| .prepareCreate("index-1") | ||
| .setSettings( | ||
| Settings.builder().put(IndexMetadata.SETTING_NUMBER_OF_SHARDS, 1).put(IndexMetadata.SETTING_NUMBER_OF_REPLICAS, 0) | ||
| ) | ||
| ); | ||
| assertAcked( | ||
| client().admin() | ||
| .indices() | ||
| .prepareCreate("index-2") | ||
| .setSettings( | ||
| Settings.builder().put(IndexMetadata.SETTING_NUMBER_OF_SHARDS, 1).put(IndexMetadata.SETTING_NUMBER_OF_REPLICAS, 0) | ||
| ) | ||
| ); | ||
| client().prepareBulk("index-1") | ||
| .setRefreshPolicy(WriteRequest.RefreshPolicy.IMMEDIATE) | ||
| .add(new IndexRequest().source("key", "value-1")) | ||
| .get(); | ||
| client().prepareBulk("index-2") | ||
| .setRefreshPolicy(WriteRequest.RefreshPolicy.IMMEDIATE) | ||
| .add(new IndexRequest().source("key", "value-2")) | ||
| .get(); | ||
|
|
||
| var shouldMove = new AtomicBoolean(true); | ||
|
|
||
| for (TransportService transportService : internalCluster().getInstances(TransportService.class)) { | ||
| as(transportService, MockTransportService.class).addRequestHandlingBehavior( | ||
| ExchangeService.OPEN_EXCHANGE_ACTION_NAME, | ||
| (handler, request, channel, task) -> { | ||
| // move index shard | ||
| if (shouldMove.compareAndSet(true, false)) { | ||
| var currentShardNodeId = clusterService().state() | ||
| .routingTable() | ||
| .index("index-1") | ||
| .shard(0) | ||
| .primaryShard() | ||
| .currentNodeId(); | ||
|
There was a problem hiding this comment. I need to check if this could be replaced by a proper API call instead |
||
| assertAcked( | ||
| client().admin() | ||
| .indices() | ||
| .prepareUpdateSettings("index-1") | ||
| .setSettings(Settings.builder().put("index.routing.allocation.exclude._id", currentShardNodeId)) | ||
| ); | ||
| ensureGreen("index-1"); | ||
| } | ||
| // execute data node request | ||
| handler.messageReceived(request, channel, task); | ||
| } | ||
| ); | ||
| } | ||
|
|
||
| try (EsqlQueryResponse resp = run("FROM " + randomFrom("index-1,index-2", "index-*"))) { | ||
| assertThat(getValuesList(resp), hasSize(2)); | ||
|
There was a problem hiding this comment. Do we send back the node id that we ran the driver on when we There was a problem hiding this comment. I would like to avoid it. We do not really know source for each row nor where shards are currently allocated to. |
||
| } | ||
| } | ||
| } | ||
This file contains hidden or 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 hidden or 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.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
left over?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yeap, looks like a leftover after merging 2adb36e#diff-e9bf1f63e5fb1069f6fd3e4a7fb3b1fa44ff67a60c10dd9bb5f74caa40f2f3e3