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

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 4 commits
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.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 2 additions & 5 deletions rest-api-spec/src/main/resources/rest-api-spec/test/indices.split/10_basic.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,11 +107,8 @@ setup:
---
"Split from 1 to N":
- skip:
# when re-enabling uncomment the below skips
version: "all"
reason: "AwaitsFix'ing, see https://github.com/elastic/elasticsearch/issues/30503"
# version: " - 6.99.99"
# reason: expects warnings that pre-7.0.0 will not send
version: " - 6.99.99"
reason: expects warnings that pre-7.0.0 will not send
features: "warnings"
- do:
indices.create:
Expand Down
7 changes: 2 additions & 5 deletions rest-api-spec/src/main/resources/rest-api-spec/test/indices.split/20_source_mapping.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,8 @@
---
"Split index ignores target template mapping":
- skip:
# when re-enabling uncomment the below skips
version: "all"
reason: "AwaitsFix'ing, see https://github.com/elastic/elasticsearch/issues/30503"
# version: " - 6.99.99"
# reason: expects warnings that pre-7.0.0 will not send
version: " - 6.99.99"
reason: expects warnings that pre-7.0.0 will not send
features: "warnings"

# create index
Expand Down
15 changes: 13 additions & 2 deletions server/src/main/java/org/elasticsearch/index/store/Store.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -731,13 +731,13 @@ static final class StoreDirectory extends FilterDirectory {

private final Logger deletesLogger;

StoreDirectory(Directory delegateDirectory, Logger deletesLogger) throws IOException {
StoreDirectory(Directory delegateDirectory, Logger deletesLogger) {
super(delegateDirectory);
this.deletesLogger = deletesLogger;
}

@Override
public void close() throws IOException {
public void close() {
assert false : "Nobody should close this directory except of the Store itself";
}

Expand All @@ -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()) {
deletesLogger.warn("directory has still pending deletes");
}
// 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
Original file line number Diff line number Diff line change
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
Original file line number Diff line number Diff line change
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