Skip to content

[Test] Fix SharedBlobCacheServiceTests.testGetMultiThreaded #112322

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
henningandersen merged 3 commits into from
Aug 30, 2024
Merged

[Test] Fix SharedBlobCacheServiceTests.testGetMultiThreaded #112322

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2fd8481
[Test] Fix SharedBlobCacheServiceTests.testGetMultiThreaded
ywangd Aug 29, 2024
7f50458
move assertion
ywangd Aug 30, 2024
f658108
Merge remote-tracking branch 'origin/main' into es-112314-fix
ywangd Aug 30, 2024
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 @@ -154,9 +154,6 @@ tests:
- class: org.elasticsearch.search.retriever.rankdoc.RankDocsSortBuilderTests
method: testEqualsAndHashcode
issue: https://github.com/elastic/elasticsearch/issues/112312
- class: org.elasticsearch.blobcache.shared.SharedBlobCacheServiceTests
method: testGetMultiThreaded
issue: https://github.com/elastic/elasticsearch/issues/112314
- class: org.elasticsearch.search.retriever.RankDocRetrieverBuilderIT
method: testRankDocsRetrieverWithCollapse
issue: https://github.com/elastic/elasticsearch/issues/112254
Expand Down
3 changes: 1 addition & 2 deletions ...b-cache/src/test/java/org/elasticsearch/blobcache/shared/SharedBlobCacheServiceTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -444,7 +444,6 @@ public void testMassiveDecay() throws IOException {
* Exercise SharedBlobCacheService#get in multiple threads to trigger any assertion errors.
* @throws IOException
*/
@AwaitsFix(bugUrl = "https://github.com/elastic/elasticsearch/issues/112305")
public void testGetMultiThreaded() throws IOException {
final int threads = between(2, 10);
final int regionCount = between(1, 20);
Expand Down Expand Up @@ -494,11 +493,11 @@ public void testGetMultiThreaded() throws IOException {
assert allowAlreadyClosed || e.getMessage().equals("evicted during free region allocation") : e;
throw e;
}
assertTrue(cacheFileRegion.testOnlyNonVolatileIO() != null || cacheFileRegion.isEvicted());
if (incRef && cacheFileRegion.tryIncRef()) {
if (yield[i] == 0) {
Thread.yield();
}
assertNotNull(cacheFileRegion.testOnlyNonVolatileIO());
cacheFileRegion.decRef();
}
if (evict[i] == 0) {
Expand Down