Skip to content

Fix SearchableSnapshotsBlobStoreCacheIntegTests.testBlobStoreCache #78616

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 3 commits into from
Oct 7, 2021
Merged

Fix SearchableSnapshotsBlobStoreCacheIntegTests.testBlobStoreCache #78616

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d4e0e4d
Fix SearchableSnapshotsBlobStoreCacheIntegTests.testBlobStoreCache
tlrx Oct 4, 2021
d810603
feedback
tlrx Oct 7, 2021
6747ff0
Merge branch 'master' into fix-78512
tlrx Oct 7, 2021
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
6 changes: 4 additions & 2 deletions ...rch/xpack/searchablesnapshots/cache/blob/SearchableSnapshotsBlobStoreCacheIntegTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,7 @@
import java.util.Collection;
import java.util.List;
import java.util.Locale;
import java.util.concurrent.TimeUnit;

import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertAcked;
import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertHitCount;
Expand Down Expand Up @@ -327,8 +328,9 @@ public Settings onNodeStopped(String nodeName) throws Exception {
logger.info("--> verifying number of documents in index [{}]", restoredAgainIndex);
assertHitCount(client().prepareSearch(restoredAgainIndex).setSize(0).setTrackTotalHits(true).get(), numberOfDocs);

logger.info("--> deleting indices, maintenance service should clean up snapshot blob cache index");
logger.info("--> deleting indices, maintenance service should clean up [{}] docs in system index", numberOfCachedBlobs);
assertAcked(client().admin().indices().prepareDelete("restored-*"));

assertBusy(() -> {
refreshSystemIndex();
assertHitCount(
Expand All @@ -338,7 +340,7 @@ public Settings onNodeStopped(String nodeName) throws Exception {
.get(),
0L
);
});
}, 30L, TimeUnit.SECONDS);
Copy link
Contributor

@henningandersen henningandersen Oct 6, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

OK, this might help, but can we perhaps log numberOfCachedBlobs before this assert busy such that we can see if it was trying to delete entries but was simply slow or if it did not even start on it?

Copy link
Member Author

@tlrx tlrx Oct 7, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Added the numberOfCachedBlobs in the log message before deleting all remaining mounted indices.

}

private void checkNoBlobStoreAccess() {
Expand Down