Skip to content

Fix test create and restore searchable snapshot #89745

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
idegtiarenko merged 2 commits into from
Sep 1, 2022
Merged

Fix test create and restore searchable snapshot #89745

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6cf34b1
Reword assertions
idegtiarenko Aug 31, 2022
708d56f
Increase a waiting time
idegtiarenko Aug 31, 2022
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
13 changes: 7 additions & 6 deletions ...ava/org/elasticsearch/xpack/searchablesnapshots/BaseSearchableSnapshotsIntegTestCase.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,7 @@
import static org.hamcrest.Matchers.equalTo;
import static org.hamcrest.Matchers.greaterThanOrEqualTo;
import static org.hamcrest.Matchers.instanceOf;
import static org.hamcrest.Matchers.is;
import static org.hamcrest.Matchers.not;

@ESIntegTestCase.ClusterScope(supportsDedicatedMasters = false, numClientNodes = 0)
Expand Down Expand Up @@ -246,18 +247,18 @@ protected void assertShardFolders(String indexName, boolean snapshotDirectory) t
translogExists
);
assertThat(
snapshotDirectory ? "Snapshot directory doesn't exist" : "Snapshot directory shouldn't exist",
snapshotDirectory,
not(indexExists)
snapshotDirectory ? "Index file should not exist" : "Index file should exist",
indexExists,
not(snapshotDirectory)
);
assertTrue("Translog doesn't exist", translogExists);
assertThat("Translog should exist", translogExists, is(true));
Copy link
Contributor Author

@idegtiarenko idegtiarenko Aug 31, 2022

Choose a reason for hiding this comment

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

Above rewords assertions messages to remove negation

try (Stream<Path> dir = Files.list(shardPath.resolveTranslog())) {
final long translogFiles = dir.filter(path -> path.getFileName().toString().contains("translog")).count();
if (snapshotDirectory) {
assertEquals("There should be 2 translog files for a snapshot directory", 2L, translogFiles);
assertThat("There should be 2 translog files for a snapshot directory", translogFiles, equalTo(2L));
} else {
assertThat(
"There should be 2+ translog files non a non-snapshot directory",
"There should be 2+ translog files for a non-snapshot directory",
translogFiles,
greaterThanOrEqualTo(2L)
);
Expand Down
3 changes: 2 additions & 1 deletion ...rTest/java/org/elasticsearch/xpack/searchablesnapshots/SearchableSnapshotsIntegTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,7 @@
import java.util.Map;
import java.util.concurrent.BrokenBarrierException;
import java.util.concurrent.CyclicBarrier;
import java.util.concurrent.TimeUnit;
import java.util.stream.Collectors;
import java.util.stream.IntStream;

Expand Down Expand Up @@ -254,7 +255,7 @@ public void testCreateAndRestoreSearchableSnapshot() throws Exception {
assertSearchableSnapshotStats(restoredIndexName, cacheEnabled, nonCachedExtensions);

ensureGreen(restoredIndexName);
assertBusy(() -> assertShardFolders(restoredIndexName, true));
assertBusy(() -> assertShardFolders(restoredIndexName, true), 30, TimeUnit.SECONDS);
Copy link
Contributor Author

@idegtiarenko idegtiarenko Aug 31, 2022

Choose a reason for hiding this comment

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

This is consistent with another change: #84942

Copy link
Contributor Author

@idegtiarenko idegtiarenko Sep 1, 2022

Choose a reason for hiding this comment

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

It looks like this reproduces only if we close the index (eg index files are kept on the disk) and we reuse the same index name for the mounted index. This is likely resulting in files not cleaned in time.


assertThat(
client().admin()
Expand Down