Skip to content

Work around testFilterByTags failure #125109

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

Merged
merged 4 commits into from
Mar 19, 2025
Merged

Work around testFilterByTags failure #125109

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
04101f8
Work around `testFilterByTags` failure
DaveCTurner Mar 18, 2025
32ed811
Merge branch 'main' into 2025/03/18/workaround-testFilterByTags-failure
DaveCTurner Mar 19, 2025
a426c8e
Unmute test again
DaveCTurner Mar 19, 2025
f8d5575
Merge branch 'main' into 2025/03/18/workaround-testFilterByTags-failure
DaveCTurner Mar 19, 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 @@ -402,9 +402,6 @@ tests:
- class: org.elasticsearch.xpack.ilm.DataStreamAndIndexLifecycleMixingTests
method: testGetDataStreamResponse
issue: https://github.com/elastic/elasticsearch/issues/125083
- class: org.elasticsearch.discovery.ec2.Ec2DiscoveryTests
method: testFilterByTags
issue: https://github.com/elastic/elasticsearch/issues/125090
- class: org.elasticsearch.threadpool.ScalingThreadPoolTests
method: testScalingThreadPoolConfiguration
issue: https://github.com/elastic/elasticsearch/issues/125142
Expand Down
3 changes: 2 additions & 1 deletion plugins/discovery-ec2/src/test/java/org/elasticsearch/discovery/ec2/Ec2DiscoveryTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,8 @@ protected List<TransportAddress> buildDynamicHosts(Settings nodeSettings, int no
final String[] params = request.split("&");
Arrays.stream(params).filter(entry -> entry.startsWith("Filter.") && entry.contains("=tag%3A")).forEach(entry -> {
final int startIndex = "Filter.".length();
final int filterId = Integer.parseInt(entry.substring(startIndex, entry.indexOf(".", startIndex)));
// TODO ensure the filterId is an ASCII int when https://github.com/aws/aws-sdk-java-v2/issues/5968 fixed
final var filterId = entry.substring(startIndex, entry.indexOf(".", startIndex));
tagsIncluded.put(
entry.substring(entry.indexOf("=tag%3A") + "=tag%3A".length()),
Arrays.stream(params)
Expand Down
Loading