Skip to content

Fix flaky PruneFileCacheIT #19710

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 1 commit into from
Oct 22, 2025
Merged

Fix flaky PruneFileCacheIT #19710

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
16 changes: 8 additions & 8 deletions ...ernalClusterTest/java/org/opensearch/action/admin/cluster/filecache/PruneFileCacheIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,11 +83,11 @@ public void testPruneCacheWithRealData() throws Exception {
}

assertBusy(() -> {
long usage = getFileCacheUsage();
long usage = getFileCacheUsage(client);
assertTrue("Cache should be populated after index access", usage > 0);
}, 30, TimeUnit.SECONDS);

long usageBefore = getFileCacheUsage();
long usageBefore = getFileCacheUsage(client);
logger.info("--> File cache usage before prune: {} bytes", usageBefore);
assertTrue("File cache should have data before prune", usageBefore > 0);

Expand All @@ -109,7 +109,7 @@ public void testPruneCacheWithRealData() throws Exception {
assertTrue("Should have pruned bytes", response.getTotalPrunedBytes() > 0);

// Verify cache usage after prune
long usageAfter = getFileCacheUsage();
long usageAfter = getFileCacheUsage(client);
logger.info("--> File cache usage after prune: {} bytes", usageAfter);

// Cache should be reduced (might not be zero if files are still referenced)
Expand Down Expand Up @@ -148,11 +148,11 @@ public void testPruneResponseMetrics() throws Exception {
assertDocCount(restoredIndexName, 100L);

assertBusy(() -> {
long usage = getFileCacheUsage();
long usage = getFileCacheUsage(client);
assertTrue("Cache should be populated", usage > 0);
}, 30, TimeUnit.SECONDS);

long usageBefore = getFileCacheUsage();
long usageBefore = getFileCacheUsage(client);

PruneFileCacheRequest request = new PruneFileCacheRequest();
PlainActionFuture<PruneFileCacheResponse> future = new PlainActionFuture<>();
Expand All @@ -170,7 +170,7 @@ public void testPruneResponseMetrics() throws Exception {
assertTrue("Node should have cache capacity", nodeResponse.getCacheCapacity() > 0);
assertTrue("Node should report pruned bytes", nodeResponse.getPrunedBytes() >= 0);

long usageAfter = getFileCacheUsage();
long usageAfter = getFileCacheUsage(client);
long expectedPruned = usageBefore - usageAfter;
assertEquals("Response should match actual cache reduction", expectedPruned, response.getTotalPrunedBytes());
}
Expand Down Expand Up @@ -261,8 +261,8 @@ private void assertRemoteSnapshotIndexSettings(Client client, String... indexNam
/**
* Returns total file cache usage across all warm nodes in bytes.
*/
private long getFileCacheUsage() {
NodesStatsResponse response = client().admin().cluster().nodesStats(new NodesStatsRequest().all()).actionGet();
private long getFileCacheUsage(Client client) {
NodesStatsResponse response = client.admin().cluster().nodesStats(new NodesStatsRequest().all()).actionGet();

long totalUsage = 0L;
for (NodeStats stats : response.getNodes()) {
Expand Down
Loading