Skip to content

[test] Fix SimpleBlocksIT testConcurrentAddBlock #123019

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

Closed
wants to merge 6 commits into from
Closed

[test] Fix SimpleBlocksIT testConcurrentAddBlock #123019

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
4d87d7d
[test] Check that requests for adding an index block in parallel are …
arteam Feb 20, 2025
e5c2c13
[CI] Auto commit changes from spotless
Feb 20, 2025
be6421d
Merge branch 'main' into check-add-block-is-acked
arteam Feb 20, 2025
1334312
Wrap assertAcked in assertBusy
arteam Feb 20, 2025
24e2f81
Merge branch 'main' into check-add-block-is-acked
arteam Feb 20, 2025
9b4e4a1
Merge branch 'main' into check-add-block-is-acked
arteam Feb 26, 2025
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
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -259,9 +259,6 @@ tests:
- class: org.elasticsearch.smoketest.SmokeTestMonitoringWithSecurityIT
method: testHTTPExporterWithSSL
issue: https://github.com/elastic/elasticsearch/issues/122220
- class: org.elasticsearch.blocks.SimpleBlocksIT
method: testConcurrentAddBlock
issue: https://github.com/elastic/elasticsearch/issues/122324
- class: org.elasticsearch.smoketest.DocsClientYamlTestSuiteIT
method: test {yaml=reference/cat/health/cat-health-example}
issue: https://github.com/elastic/elasticsearch/issues/122335
Expand Down
4 changes: 3 additions & 1 deletion server/src/internalClusterTest/java/org/elasticsearch/blocks/SimpleBlocksIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -405,11 +405,13 @@ public void testConcurrentAddBlock() throws InterruptedException, ExecutionExcep
try {
startInParallel(threadCount, i -> {
try {
indicesAdmin().prepareAddBlock(block, indexName).get();
assertBusy(() -> assertAcked(indicesAdmin().prepareAddBlock(block, indexName).get()));
assertIndexHasBlock(block, indexName);
} catch (final ClusterBlockException e) {
assertThat(e.blocks(), hasSize(1));
assertTrue(e.blocks().stream().allMatch(b -> b.id() == block.getBlock().id()));
} catch (Exception e) {
throw new RuntimeException("Unable to ack an index block request", e);
}
});
assertIndexHasBlock(block, indexName);
Expand Down