Skip to content
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

Jump to bottom

Side-step pending deletes check #30571

Merged
merged 8 commits into from May 15, 2018
Merged

Side-step pending deletes check #30571

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
05663e4
Side-step pending deletes check
s1monw May 14, 2018
a7bce4b
apply feedback
s1monw May 14, 2018
43759e2
invert condition
s1monw May 14, 2018
883f14c
Unskip rest tests
jasontedor May 14, 2018
e365f78
Merge branch 'master' into issues/30416_1
s1monw May 14, 2018
5771a26
fix it
s1monw May 14, 2018
224a5d2
Merge branch 'master' into issues/30416_1
s1monw May 15, 2018
7ba7b16
skip 7.0 feature in mutli cluster tests
s1monw May 15, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
11 changes: 11 additions & 0 deletions server/src/main/java/org/elasticsearch/index/store/Store.java
View file
Open in desktop
Expand Up @@ -759,6 +759,17 @@ private void innerClose() throws IOException {
public String toString() {
return "store(" + in.toString() + ")";
}

@Override
public boolean checkPendingDeletions() throws IOException {
if (super.checkPendingDeletions() == false) {
deletesLogger.debug("directory has still pending deletes");
Copy link
Contributor

Choose a reason for hiding this comment

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

should we warn rather than debug?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

fair enough.

}
// we skip this check since our IW usage always goes forward.
// we still might run into situations where we have pending deletes ie. in shrink / split case
// and that will cause issues on windows since we open multiple IW instance one after another during the split/shrink recovery
return false;
}
}

/**
Expand Down
2 changes: 0 additions & 2 deletions server/src/test/java/org/elasticsearch/action/admin/indices/create/ShrinkIndexIT.java
View file
Open in desktop
Expand Up @@ -23,7 +23,6 @@
import org.apache.lucene.search.SortField;
import org.apache.lucene.search.SortedSetSelector;
import org.apache.lucene.search.SortedSetSortField;
import org.apache.lucene.util.LuceneTestCase.AwaitsFix;
import org.elasticsearch.Version;
import org.elasticsearch.action.admin.cluster.reroute.ClusterRerouteResponse;
import org.elasticsearch.action.admin.cluster.state.ClusterStateRequest;
Expand Down Expand Up @@ -77,7 +76,6 @@
import static org.hamcrest.Matchers.equalTo;
import static org.hamcrest.Matchers.greaterThanOrEqualTo;

@AwaitsFix(bugUrl = "https://github.com/elastic/elasticsearch/issues/30416")
public class ShrinkIndexIT extends ESIntegTestCase {

@Override
Expand Down
2 changes: 0 additions & 2 deletions server/src/test/java/org/elasticsearch/action/admin/indices/create/SplitIndexIT.java
View file
Open in desktop
Expand Up @@ -24,7 +24,6 @@
import org.apache.lucene.search.SortedSetSelector;
import org.apache.lucene.search.SortedSetSortField;
import org.apache.lucene.search.join.ScoreMode;
import org.apache.lucene.util.LuceneTestCase;
import org.elasticsearch.Version;
import org.elasticsearch.action.admin.cluster.state.ClusterStateRequest;
import org.elasticsearch.action.admin.cluster.state.ClusterStateResponse;
Expand Down Expand Up @@ -81,7 +80,6 @@
import static org.hamcrest.Matchers.greaterThanOrEqualTo;


@LuceneTestCase.AwaitsFix(bugUrl = "https://github.com/elastic/elasticsearch/issues/30416")
public class SplitIndexIT extends ESIntegTestCase {

@Override
Expand Down