Skip to content

Fixing DatabaseNodeServiceIT testNonGzippedDatabase and testGzippedDatabase race condition #115463

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 5 commits into from
Oct 25, 2024
Merged

Fixing DatabaseNodeServiceIT testNonGzippedDatabase and testGzippedDatabase race condition #115463

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
3c95a38
Fixing DatabaseNodeServiceIT testNonGzippedDatabase and testGzippedDa…
masseyke Oct 23, 2024
3752fc3
Merge branch 'main' into pull/115463
joegallo Oct 25, 2024
ba4c737
Fix a typo
joegallo Oct 25, 2024
356f4bc
Move the assertBusy to the whole stanza
joegallo Oct 25, 2024
187ebe2
There's no need to modify the src anymore
joegallo Oct 25, 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
28 changes: 20 additions & 8 deletions ...ip/src/internalClusterTest/java/org/elasticsearch/ingest/geoip/DatabaseNodeServiceIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,15 +46,21 @@ public class DatabaseNodeServiceIT extends AbstractGeoIpIT {
public void testNonGzippedDatabase() throws Exception {
String databaseType = "GeoLite2-Country";
String databaseFileName = databaseType + ".mmdb";
// making the dabase name unique so we know we're not using another one:
// making the database name unique so we know we're not using another one:
String databaseName = randomAlphaOfLength(20) + "-" + databaseFileName;
byte[] mmdbBytes = getBytesForFile(databaseFileName);
final DatabaseNodeService databaseNodeService = internalCluster().getInstance(DatabaseNodeService.class);
assertNull(databaseNodeService.getDatabase(databaseName));
int numChunks = indexData(databaseName, mmdbBytes);
retrieveDatabase(databaseNodeService, databaseName, mmdbBytes, numChunks);
assertBusy(() -> assertNotNull(databaseNodeService.getDatabase(databaseName)));
assertValidDatabase(databaseNodeService, databaseName, databaseType);
/*
* If DatabaseNodeService::checkDatabases runs it will sometimes (rarely) remove the database we are using in this test while we
* are trying to assert things about it. So if it does then we 'just' try again.
*/
assertBusy(() -> {
retrieveDatabase(databaseNodeService, databaseName, mmdbBytes, numChunks);
assertNotNull(databaseNodeService.getDatabase(databaseName));
assertValidDatabase(databaseNodeService, databaseName, databaseType);
});
}

/*
Expand All @@ -64,16 +70,22 @@ public void testNonGzippedDatabase() throws Exception {
public void testGzippedDatabase() throws Exception {
String databaseType = "GeoLite2-Country";
String databaseFileName = databaseType + ".mmdb";
// making the dabase name unique so we know we're not using another one:
// making the database name unique so we know we're not using another one:
String databaseName = randomAlphaOfLength(20) + "-" + databaseFileName;
byte[] mmdbBytes = getBytesForFile(databaseFileName);
byte[] gzipBytes = gzipFileBytes(databaseName, mmdbBytes);
final DatabaseNodeService databaseNodeService = internalCluster().getInstance(DatabaseNodeService.class);
assertNull(databaseNodeService.getDatabase(databaseName));
int numChunks = indexData(databaseName, gzipBytes);
retrieveDatabase(databaseNodeService, databaseName, gzipBytes, numChunks);
assertBusy(() -> assertNotNull(databaseNodeService.getDatabase(databaseName)));
assertValidDatabase(databaseNodeService, databaseName, databaseType);
/*
* If DatabaseNodeService::checkDatabases runs it will sometimes (rarely) remove the database we are using in this test while we
* are trying to assert things about it. So if it does then we 'just' try again.
*/
assertBusy(() -> {
retrieveDatabase(databaseNodeService, databaseName, gzipBytes, numChunks);
assertNotNull(databaseNodeService.getDatabase(databaseName));
assertValidDatabase(databaseNodeService, databaseName, databaseType);
});
}

/*
Expand Down
6 changes: 0 additions & 6 deletions muted-tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -182,12 +182,6 @@ tests:
- class: org.elasticsearch.xpack.esql.qa.mixed.MixedClusterEsqlSpecIT
method: test {categorize.Categorize SYNC}
issue: https://github.com/elastic/elasticsearch/issues/113722
- class: org.elasticsearch.ingest.geoip.DatabaseNodeServiceIT
method: testNonGzippedDatabase
issue: https://github.com/elastic/elasticsearch/issues/113821
- class: org.elasticsearch.ingest.geoip.DatabaseNodeServiceIT
method: testGzippedDatabase
issue: https://github.com/elastic/elasticsearch/issues/113752
- class: org.elasticsearch.threadpool.SimpleThreadPoolIT
method: testThreadPoolMetrics
issue: https://github.com/elastic/elasticsearch/issues/108320
Expand Down